Skip to content

Commit e29f685

Browse files
committed
Resolve merge conflicts
2 parents 900fc53 + daed4a6 commit e29f685

File tree

6 files changed

+1316
-2773
lines changed

6 files changed

+1316
-2773
lines changed

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@ Each task can be run on its own. For example, if all you want to do is validate
1515
## Running the Project
1616
All your work must be added to the sub-folders under the `dev` folder: your markup in `html`, your Sass/CSS in `styles`, your JavaScript in `scripts`, and, your images in `img`.
1717

18-
During development, run `gulp serve`, which runs multiple development-related tasks, then launches your default browser and reloads on file changes.
18+
During development, run `gulp serve`, which runs multiple development-related tasks, then launches your default browser and reloads on file changes. Transpiled files (`.js` and `.css`) are written to the `temp` folder.
1919

2020
For production-ready projects, run `build`, which creates a folder called `prod`. This is the folder you’d upload to your server if you were going live with your project.
2121

2222
## Issues
23-
As of this writing, 14 Oct 2021, you’ll need to have [`stylelint` installed](https://stylelint.io/user-guide/get-started) to run `gulp-stylelint`, which is included in a task called `lintCSS`. However, there’s a bug in this project that, when adding the following to the `serve` task, the browser won’t reload on changes to CSS files.
23+
24+
* As of 22 February 2023, this project is currently not compatible with macOS Ventura (10.13).
25+
26+
* As of 14 October 2021, you’ll need to have [`stylelint` installed](https://stylelint.io/user-guide/get-started) to run `gulp-stylelint`, which is included in a task called `lintCSS`. However, there’s a bug in this project that, when adding the following to the `serve` task, the browser won’t reload on changes to CSS files.
2427

2528
```javascript
2629
watch(`dev/styles/**/*.css`, lintCSS)

dev/html/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<link rel="stylesheet" href="styles/main.css">
77
</head>
88
<body>
9+
<!-- “defer” tells the browser to execute the script after the document has been parsed. -->
910
<script src="scripts/app.js" defer></script>
1011
</body>
1112
</html>

dev/styles/css/main.css

Whitespace-only changes.

gulpfile.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ async function allBrowsers () {
5555
}
5656

5757
let validateHTML = () => {
58-
return src([
59-
`dev/html/*.html`,
60-
`dev/html/**/*.html`])
58+
return src([`dev/html/*.html`, `dev/html/**/*.html`])
6159
.pipe(htmlValidator(undefined));
6260
};
6361

@@ -83,7 +81,7 @@ let transpileJSForDev = () => {
8381
};
8482

8583
let compressHTML = () => {
86-
return src([`dev/html/*.html`,`dev/html/**/*.html`])
84+
return src([`dev/html/*.html`, `dev/html/**/*.html`])
8785
.pipe(htmlCompressor({collapseWhitespace: true}))
8886
.pipe(dest(`prod`));
8987
};

0 commit comments

Comments
 (0)