From 756d407fbc36ca1d960ea72a82e7fceaa6012fef Mon Sep 17 00:00:00 2001 From: Jake Marsh Date: Wed, 11 May 2016 21:04:18 -0700 Subject: [PATCH 1/5] bump node and npm versions --- .travis.yml | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e75615..cfb7328 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: -- '0.12.7' +- '4.2' branches: only: - master diff --git a/package.json b/package.json index 9279770..c6eef58 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,8 @@ ], "private": true, "engines": { - "node": "^0.12.x", - "npm": "^2.1.x" + "node": "^4.2.3", + "npm": "^2.14.7" }, "devDependencies": { "babel-core": "^6.3.15", From 2e61b00439ecb5193816c72ddd5a811302c7294f Mon Sep 17 00:00:00 2001 From: Jake Marsh Date: Wed, 11 May 2016 21:20:40 -0700 Subject: [PATCH 2/5] add node_env to npm scripts, move build script into npm --- README.md | 8 ++++---- package.json | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 4403de4..f06eb26 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ A boilerplate using ReactJS (along with React Router and RefluxJS), SASS, Gulp, 2. Run `npm install` from the root directory 3. Run `gulp dev` (may require installing Gulp globally `npm install gulp -g`) 4. Your browser will automatically be opened and directed to the browser-sync proxy address -5. To prepare assets for production, run the `gulp prod` task (Note: the production task does not fire up the browser-sync server, and won't provide you with browser-sync's live reloading. Simply use `gulp dev` during development. More information below) +5. To prepare assets for production, run the `npm run build` task (Note: the production task does not fire up the browser-sync server, and won't provide you with browser-sync's live reloading. Simply use `gulp dev` during development. More information below) Now that `gulp dev` is running, the server is up as well and serving files from the `/build` directory. Any changes in the `/app` directory will be automatically processed by Gulp and the changes will be injected to any open browsers pointed at the proxy address. @@ -35,7 +35,7 @@ Along with many Gulp libraries (these can be seen in either `package.json`, or a ### Running tests 1. If you haven't already, follow steps 1 & 2 above -2. If you haven't already run `gulp dev` or `gulp prod` at least once, run `gulp prod` +2. If you haven't already run `gulp dev` or `npm run build` at least once, run `npm run build` 3. Run all tests in the `__tests__/` directory with the `gulp test` command * A single file can be run by specifing an `-f` flag: `gulp test -f ` * In the `PATH_TO_TEST_FILE`, it is possible to omit the `__tests__/` prefix, as well as the `.test.js` suffix. They will be automatically added if not detected. @@ -151,7 +151,7 @@ Just one task is necessary for processing our SASS files, and that is `gulp-sass ##### Images -Any images placed within `/app/images` will be automatically copied to the `build/images` directory. If running `gulp prod`, they will also be compressed via imagemin. +Any images placed within `/app/images` will be automatically copied to the `build/images` directory. If running `npm run build`, they will also be compressed via imagemin. ##### Watching files @@ -159,6 +159,6 @@ All of the Gulp processes mentioned above are run automatically when any of the ##### Production Task -Just as there is the `gulp dev` task for development, there is also a `gulp prod` task for putting your project into a production-ready state. This will run each of the tasks, while also adding the image minification task discussed above. There is also an empty `gulp deploy` task that is included when running the production task. This deploy task can be fleshed out to automatically push your production-ready site to your hosting setup. +Just as there is the `gulp dev` task for development, there is also a `npm run build` task for putting your project into a production-ready state. This will run each of the tasks, while also adding the image minification task discussed above. There is also an empty `gulp deploy` task that is included when running the production task. This deploy task can be fleshed out to automatically push your production-ready site to your hosting setup. **Reminder:** When running the production task, gulp will not fire up the express server and serve your index.html. This task is designed to be run before the `deploy` step that may copy the files from `/build` to a production web server. diff --git a/package.json b/package.json index c6eef58..34b3c34 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,8 @@ "yargs": "^3.27.0" }, "scripts": { - "lint": "./node_modules/.bin/gulp lint", - "test": "./node_modules/.bin/gulp test" + "lint": "NODE_ENV=test ./node_modules/.bin/gulp lint", + "test": "NODE_ENV=test ./node_modules/.bin/gulp test", + "build": "NODE_ENV=production ./node_modules/.bin/gulp prod" } } From 5280672a8dd861da09ccde3fb174f361fd7c2c9c Mon Sep 17 00:00:00 2001 From: Jake Marsh Date: Wed, 11 May 2016 21:20:48 -0700 Subject: [PATCH 3/5] remove specified engine versions --- package.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package.json b/package.json index 34b3c34..f510e1d 100644 --- a/package.json +++ b/package.json @@ -14,11 +14,6 @@ "sass", "boilerplate" ], - "private": true, - "engines": { - "node": "^4.2.3", - "npm": "^2.14.7" - }, "devDependencies": { "babel-core": "^6.3.15", "babel-eslint": "^5.0.0-beta4", From 1ab3d798b6df7ce68061554dad3a93400a9f2a4a Mon Sep 17 00:00:00 2001 From: Jake Marsh Date: Wed, 11 May 2016 21:20:55 -0700 Subject: [PATCH 4/5] bump package version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f510e1d..a47970d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-rocket-boilerplate", - "version": "2.4.1", + "version": "2.5.0", "author": "Jake Marsh ", "description": "Boilerplate using React, Browserify, SASS, and Gulp.", "repository": { From 93a05a73e18a380b08b132efb72b26a64ff997a6 Mon Sep 17 00:00:00 2001 From: Jake Marsh Date: Wed, 11 May 2016 21:28:42 -0700 Subject: [PATCH 5/5] bump now-broken dependency packages --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a47970d..6bfafe3 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "gulp-mocha": "^2.1.3", "gulp-notify": "^2.2.0", "gulp-rename": "^1.2.2", - "gulp-sass": "^2.0.x", + "gulp-sass": "^2.3.1", "gulp-sourcemaps": "^1.5.2", "gulp-streamify": "0.0.5", "gulp-uglify": "^1.2.0", @@ -43,7 +43,7 @@ "history": "^1.17.0", "humps": "^1.0.0", "istanbul": "^0.4.0", - "jsdom": "3.1.2", + "jsdom": "^8.0.2", "lodash": "^3.10.0", "mocha": "^2.3.3", "react": "^0.14.x",