Skip to content

Commit 6b4120b

Browse files
committed
Merge branch 'master' into dev
2 parents 8f4eaf4 + 8c75a9f commit 6b4120b

File tree

6 files changed

+25786
-307
lines changed

6 files changed

+25786
-307
lines changed

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ ehthumbs.db
160160
##########################################
161161

162162
# Ignore the `prod`, or build, folder generated by Gulp.
163-
/prod
163+
prod/
164164

165165
# Ignore the `node_modules` folder created by `npm install`.
166-
/node_modules
166+
node_modules/
167167

168168
# Ignore the `temp` folder, also generated by `gulp build`.
169-
/temp
169+
temp/

README.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
# A Gulp Task for HTML, Sass/CSS, and JavaScript
1+
# A Set of Gulp v4.0.0 Tasks for Creating Web Projects Using HTML, CSS/Sass, and JavaScript
22

3-
(v3.0.1)
3+
(v4.0.1)
44

55
---
66

77
## Installation
8-
You need to have Java installed before continuing, as the browser refresh module requires it. Additionally, all the required Node modules need to be installed before you can use this template. From the root folder of this project, type `npm install`. This will create a folder called `node_modules` and download the plugins listed under the `devDependencies` section in the `package.json` file. If you encounter an `ERR!` message about `EACCES`, then you’ll need to run the command as the super user: `sudo npm install`. Because the Gulp tasks amount to about 157MB, expect to wait.
8+
You need to have Java installed before continuing, as the browser refresh module requires it. Additionally, all the required Node modules need to be installed before you can use this template. From the root folder of this project, type `npm install`. This will create a folder called `node_modules` and download the plugins listed under the `devDependencies` section in the `package.json` file. If you encounter an `ERR!` message about `EACCES`, then you’ll need to run the command as the super user: `sudo npm install`. Because the Gulp tasks amount to about 112MB, expect to wait.
99

1010
## Tasks
11-
Typing `gulp --tasks`, or simply `gulp`, will provide you with a list of tasks included in `gulpfile.js`. Tasks such as `build` and `serve` invoke other tasks and are nested in the output of `gulp --tasks`.
11+
Typing `gulp --tasks`, or simply `gulp`, will provide you with a list of tasks included in `gulpfile.js`. Tasks such as `build` and `serve` invoke other tasks and are nested in the output of `gulp --tasks` and are executed in `<series>`.
1212

13-
Each task can be run on its own. For example, if all you want to do is validate your HTML, you can type `gulp validateHTML`, and if the task runs to completion without any messages, it means your HTML is valid and W3-compliant.
14-
15-
Above each task in the `gulpfile.js` file is an elaborate comment discussing what each task does.
13+
Each task can be run on its own. For example, if all you want to do is validate your HTML, you can type `gulp validateHTML`.
1614

1715
## Running the Project
1816
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`.
1917

20-
For development, run `gulp serve`, which runs multiple development-related tasks, then launches your default browser and listens for changes. Gulp keeps you informed via The Terminal. You can now work on your project as you normally would. Each time you save a file, your browser will refresh so you don’t have to.
18+
During development, run `gulp serve`, which runs multiple development-related tasks, then launches your default browser and reloads on file changes.
2119

2220
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.

config.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)