Skip to content

Commit a2c3fdf

Browse files
author
Marco Solazzi
committed
docs
1 parent dcd2205 commit a2c3fdf

File tree

1 file changed

+17
-27
lines changed

1 file changed

+17
-27
lines changed

README.md

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ WOK is a loosely opinionated boilerplate for web development built with flexibil
1111
* [Sass](http://sass-lang.com/) 3.4+ with [node-sass](https://github.com/sass/node-sass) and CSS [post-processing](https://github.com/postcss/postcss)
1212
* [BEM](http://blog.kaelig.fr/post/48196348743/fifty-shades-of-bem)-like naming convention
1313
* Em based media-queries via [sass-mq](https://github.com/sass-mq/sass-mq)
14+
* ES2015 support with [Babel](https://babeljs.io/) (polyfill loaded from CDN.js)
1415
* [Gulp.js](http://gulpjs.com/) build and deploy workflow
15-
* [Bower](http://bower.io/)
1616
* Development server and asset live-reload with [BrowserSync](http://www.browsersync.io/) and [Weinre](http://people.apache.org/~pmuellr/weinre/) remote debugging
1717
* Incremental deploy with [rsync](https://rsync.samba.org/) or [lftp](http://lftp.yar.ru/)
1818
* Remote backup / rollback (UNIX SSH environments only)
@@ -21,9 +21,7 @@ WOK is a loosely opinionated boilerplate for web development built with flexibil
2121

2222
## Requirements
2323

24-
* Node.js >= 4.0.0 (we strongly suggest to use something like [nvm](https://github.com/creationix/nvm))
25-
* npm3 (`npm install -g npm@3`)
26-
* bower (`npm install -g bower`)
24+
* Node.js >= 6.9.0 (we strongly suggest to use something like [nvm](https://github.com/creationix/nvm))
2725
* gulp cli (`npm install -g gulp`)
2826

2927
## Installation
@@ -34,32 +32,22 @@ Clone this repo:
3432

3533
From project root:
3634

37-
* `bower install` (vendors)
3835
* `npm install` (gulp deps)
3936

4037
### Linting
4138

4239
#### JavaScript linting
4340

44-
Wok comes with preconfigured [eslint](http://eslint.org/) linting based on the [airbnb base preset](https://www.npmjs.com/package/eslint-config-airbnb-base).
41+
Wok comes with pre-configured [eslint](http://eslint.org/) linting based on the [airbnb base preset](https://www.npmjs.com/package/eslint-config-airbnb-base).
4542
You can lint your JavaScript files by running: `gulp lint:js`.
4643

4744
If you want to use _in editor_ linting, please follow the setup instructions [your editor](http://eslint.org/docs/user-guide/integrations#editors)
4845

49-
*Note*: eslint preset expects ES6 syntax, anyway Wok doesn't provide any transpiler (ie: Babel) out of the box. The wiki provides recipes to use [webpack 1.x](https://github.com/fevrcoding/wok/wiki/Gulp:-webpack-and-ES6) or [Browserify](https://github.com/fevrcoding/wok/wiki/Gulp:-browserify-and-ES6)
50-
5146
#### SCSS linting
5247

53-
For **SCSS linting** you can choose [stylelint](http://stylelint.io/) or [scss-lint](https://github.com/brigade/scss-lint).
54-
The latter
55-
56-
Linting via **stylelint** is available as a gulp task: `gulp lint:scss`.
48+
Linting via **stylelint** is available as a gulp task: `gulp lint:styles`.
5749
Available editor extensions for in-editor linting are listed [here](http://stylelint.io/user-guide/complementary-tools/)
5850

59-
Linting via **scss-lint** requires [Ruby 2+](http://rubyinstaller.org/downloads/) installed on your system and the global scss-lint gem (`gem install scss_lint`)
60-
It's available as a npm script: `npm run scss-lint`.
61-
Available editor extensions for in-editor linting are listed [here](https://github.com/brigade/scss-lint#editor-integration) for your editor
62-
6351
## Configuration
6452

6553
On a plain HTML project, the default configuration should work just fine. On other setups you might need to tweak some paths/options:
@@ -83,7 +71,7 @@ Project sources are located into `application` folder. Don't edit files in `publ
8371
+ stylesheets #SASS files
8472
+ audio #audio files
8573
+ video #video files
86-
+ vendors #vendors packages installed by bower
74+
+ vendors #vendors packages not installed via npm
8775
documents #Markdown files or any other txt-like file to be included in HTMLs
8876
fixtures #JSON files
8977
views #HTML files
@@ -92,6 +80,12 @@ Project sources are located into `application` folder. Don't edit files in `publ
9280
index.nunj.html #Main views
9381
...
9482

83+
### JavaScript Development
84+
85+
Wok supports cross browser ES2015 by parsing individual source files with [Babel](https://babeljs.io/). To support old browsers polyfills are loaded via CDN.
86+
87+
To use ES2015 modules follow the [webpack2 recipe](https://github.com/fevrcoding/wok/wiki/Gulp:-webpack-and-ES6).
88+
9589
### View Templates
9690

9791
With Nunjucks you can setup extensible page templates. See [official docs](https://mozilla.github.io/nunjucks/templating.html#template-inheritance) for further details.
@@ -102,10 +96,6 @@ View partials in `application/views/partials` are rendered to `public` folder li
10296

10397
To limit performance issues, just first level sub-folders will be included in the parse process.
10498

105-
### Vendors
106-
107-
You may use [bower](http://bower.io/) to manage vendors. Installed packages will be stored into the `application/assets/vendors` folder. It's up to you to provide dev and dist configuration to deploy vendors' files to `public`.
108-
10999
### *More docs to come...*
110100

111101
## Building
@@ -131,13 +121,13 @@ By default WOK implements a simple set of deploy tasks requiring SSH remote acce
131121
To deploy and rollback with rsync first setup your remote hosts in `build/gulp-config/hosts.js`, then run:
132122

133123
#deploy to remote staging server. A backup of the deploy target folder (`paths.dist.root`) will be stored in `paths.backup`.
134-
gulp deploy --remotehost=staging
124+
gulp deploy --target=staging
135125

136126
#deploy a production build to remote production server
137-
gulp deploy --production --remotehost=production
127+
gulp deploy --production --target=production
138128

139129
#rollback to the previous version in the remote production server
140-
gulp remote --command=rollback --remotehost=production
130+
gulp remote --command=rollback --target=production
141131

142132
#### FTP
143133

@@ -154,12 +144,12 @@ When paired with Phing or other deployment systems, remember to set `buildOnly`
154144
### Other Gulp tasks
155145

156146
* `dev`: one time development build (also runs as default task)
157-
* `lint`: runs both JavaScript and SCSS linters
158-
* `bump`: bumps semver version of `package.json` and `bower.json` files. Accepts a `--type` parameter with value `major|minor|patch|prerelease`. Defaults to `patch`.
147+
* `lint`: runs both JavaScript and style linters
148+
* `bump`: bumps semver version of `package.json` file.
159149

160150
## Project Info
161151

162152
WOK was created by [Marco Solazzi](https://github.com/dwightjack) with contributions from [Matteo Guidotto](https://github.com/mguidotto) and [Umberto Quintarelli](https://github.com/quincia).
163153

164154
Original work Copyright © 2014 Intesys S.r.l., released under the MIT license.
165-
Modified work Copyright © 2015-2016 Marco Solazzi, released under the MIT license.
155+
Modified work Copyright © 2015-2017 Marco Solazzi, released under the MIT license.

0 commit comments

Comments
 (0)