Merge pull request #6233 from bolt/hotfix/update-build-process

Updating and tweaking the build process.
bolt · Jan 8, 2017 · afcea54 · afcea54
2 parents a77e916 + 41d916f
commit afcea54
Show file tree

Hide file tree

Showing 7 changed files with 275 additions and 191 deletions.
diff --git a/app/src/README.md b/app/src/README.md
@@ -38,11 +38,10 @@ Quick Start
     brew install yarn
 ```
 
-
 #### Windows
 
-Download and install the MSI from [Yarn's site](https://yarnpkg.com/latest.msi)
-
+Download and install the MSI from [Yarn's site](https://yarnpkg.com/).
+Direct link: [latest.msi](https://yarnpkg.com/latest.msi).
 
 ### Install required components:
 
@@ -54,9 +53,16 @@ Download and install the MSI from [Yarn's site](https://yarnpkg.com/latest.msi)
 ### Rebuild CSS & JavaScript:
 
 ```
-    yarn run grunt updateLib
-    yarn run grunt prepareCkeditor 
-    yarn run grunt updateBolt
+    yarn run grunt build
+```
+
+### Updating dependencies to their latest versions:
+
+Use `ncu` to check for packages that have major updates, not caught by the regular update that respects SemVer. If you don't foresee problems, run `ncu -u`. Next, upgrade yarn:
+
+```
+    yarn upgrade --strict-semver
+    yarn install --strict-semver
 ```
 
 
@@ -66,6 +72,9 @@ Available grunt tasks
 - **`grunt`**<br> Starts the watch task that monitors the Javascript and Sass source files and
   automatically rebuilds `bolt.js`, `bolt.css` and `liveeditor.css` when changes are detected.
 
+- **`grunt build`**<br> Rebuild all JS and CSS assets. Basically runs
+  `updateLib`, `prepareCkeditor` and `updateBolt` sequentially.
+
 - **`grunt updateBolt`**<br> Manually starts a rebuild of `bolt.js`, `bolt.css` and
   `liveeditor.css`.
 
@@ -122,7 +131,7 @@ enable generation of sourcemaps looks like this:
 ### Pages
 
 For the linting tasks you have to define a list of pages to download to the
-`tmp/pages` folder. If it doesn't yet exist, create the file 
+`tmp/pages` folder. If it doesn't yet exist, create the file
 `app/src/grunt-local/pages.js`. A sample file to enable this task looks like this:
 
 ```javascript
@@ -260,7 +269,7 @@ You can override Bootlint options, e.g.:
 
 ### Htmllint
 
-If it doesn't yet exist, create the file `app/src/grunt-local/htmllint.js`. 
+If it doesn't yet exist, create the file `app/src/grunt-local/htmllint.js`.
 
 You can override Htmllint options, e.g.:
 

diff --git a/app/src/grunt/aliases.yml b/app/src/grunt/aliases.yml
@@ -2,6 +2,11 @@
 default:
     - watch
 
+build:
+    - updateLib
+    - prepareCkeditor
+    - updateBolt
+
 # UPDATE BOLT TASK:  Creates Bolts own css and js files
 updateBolt:
     - sass:boltCss

diff --git a/app/src/grunt/concat.js b/app/src/grunt/concat.js
@@ -100,7 +100,7 @@ module.exports = function (grunt, option) {
                 '<%= path.src.npm %>/select2/dist/js/select2.min.js',           //  62 kb
                 '<%= path.tmp %>/moment.min.js',                                //  35 kb
                 '<%= path.tmp %>/modernizr-custom.min.js',                      //   5 kb
-                '<%= path.tmp %>/select2.sortable.min.js'                           //   5 kb
+                '<%= path.tmp %>/select2.sortable.min.js'                       //   5 kb
             ],
             dest: '<%= path.dest.js %>/lib.js'
         },

diff --git a/app/src/package.json b/app/src/package.json
@@ -11,15 +11,24 @@
         "node": ">=5.0.0",
         "npm": ">=3.0.0"
     },
-    "devDependencies": {
-        "autoprefixer": "~6.5.3",
-        "blueimp-file-upload": "9.14.1",
+    "dependencies": {
+        "blueimp-file-upload": "9.14.2",
         "bootbox": "~4.4.0",
         "bootstrap-sass": "~3.3.7",
+        "font-awesome": "~4.7.0",
+        "jquery": "~2.2.4",
+        "jquery-formatdatetime": "~1.1.6",
+        "jquery.cookie": "~1.4.1",
+        "magnific-popup": "~1.1.0",
+        "modernizr": "~3.3.1",
+        "moment": "~2.17.0",
+        "select2": "~4.0.3"
+    },
+    "devDependencies": {
+        "autoprefixer": "~6.6.1",
         "css-mqpacker": "~5.0.1",
         "csswring": "~5.1.0",
         "deep-extend": "~0.4.1",
-        "font-awesome": "~4.7.0",
         "grunt": "~1.0.1",
         "grunt-bom-removal": "~1.0.1",
         "grunt-bootlint": "~0.10.1",
@@ -30,24 +39,17 @@
         "grunt-endline": "~0.6.1",
         "grunt-eol": "~1.1.3",
         "grunt-eslint": "~19.0.0",
-        "grunt-html": "~8.1.0",
+        "grunt-html": "~8.2.0",
         "grunt-jsdoc": "~2.1.0",
         "grunt-phpdocumentor": "~0.4.1",
         "grunt-postcss": "~0.8.0",
         "grunt-remove": "~0.1.0",
-        "jquery": "~2.2.4",
-        "jquery-formatdatetime": "~1.1.6",
-        "jquery.cookie": "~1.4.1",
         "load-grunt-config": "~0.19.2",
         "load-grunt-tasks": "~3.5.2",
-        "magnific-popup": "~1.1.0",
-        "modernizr": "~3.3.1",
-        "moment": "~2.17.0",
         "napa": "~2.3.0",
-        "node-sass": "~3.11.3",
+        "node-sass": "~4.1.1",
         "postcss-single-charset": "~1.0.0",
-        "request": "~2.79.0",
-        "select2": "~4.0.3"
+        "request": "~2.79.0"
     },
     "scripts": {
         "start": "grunt",