Merge pull request #27 from combine/feature/cross-platform-support

Feature/cross platform support

Author: calvinl

.nvmrc

@@ -1 +1 @@
-v6.9.1
+v7.2.1

package.json

@@ -12,26 +12,91 @@
     "url": "https://github.com/combine/universal-react-redux.git"
   },
   "engines": {
-    "node": "6.2.1",
+    "node": "7.x.x",
     "npm": "3.x.x"
   },
   "scripts": {
-    "start": "yarn run dev:build && yarn run dev:start",
+    "start": "better-npm-run dev:build && better-npm-run dev:start",
+    "dev:start": "better-npm-run dev:start",
+    "dev:start:server": "better-npm-run dev:start:server",
+    "dev:start:client": "better-npm-run dev:start:client",
+    "dev:build": "better-npm-run dev:build",
+    "prod:build": "better-npm-run prod:build",
+    "prod:start": "better-npm-run prod:start ",
+    "test": "better-npm-run test",
+    "test:all": "better-npm-run test:all",
+    "test:watch": "better-npm-run test:watch",
+    "test:all:watch": "better-npm-run test:all:watch",
+    "lint": "better-npm-run lint",
+    "postinstall": "node ./postinstall.js"
+  },
+  "betterScripts": {
     "dev:start": "yarn run dev:start:client & yarn run dev:start:server",
-    "dev:start:server": "NODE_ENV=development yarn run nodemon server",
-    "dev:start:client": "NODE_ENV=development yarn run babel-node webpack/development.hot",
-    "dev:build": "NODE_ENV=development $(yarn bin)/babel-node $(yarn bin)/webpack --progress --colors --display-error-details --config webpack/development.js",
-    "prod:build": "NODE_ENV=production $(yarn bin)/babel-node $(yarn bin)/webpack -p --optimize-dedupe --config webpack/production.js",
-    "prod:start": "NODE_ENV=production pm2 start server --name='callai'",
-    "test": "yarn run mocha --recursive --compilers js:babel-register",
-    "test:all": "yarn run mocha --recursive --compilers js:babel-register $(find . -path ./node_modules -prune -o -name '*.test.js' -print)",
-    "test:watch": "npm test -- --watch",
-    "test:all:watch": "yarn run mocha --recursive --compilers js:babel-register $(find . -path ./node_modules -prune -o -name '*.test.js' -print) --watch",
-    "lint": "yarn run eslint --ext .js,.jsx .",
-    "postinstall": "if [ \"$NODE_ENV\" = \"production\" ]; then yarn run prod:build; fi"
+    "dev:start:server": {
+      "command": "yarn run nodemon server",
+      "env": {
+        "NODE_ENV": "development"
+      }
+    },
+    "dev:start:client": {
+      "command": "yarn run babel-node -- webpack/development.hot",
+      "env": {
+        "NODE_ENV": "development"
+      }
+    },
+    "dev:build": {
+      "command": "yarn run babel-node -- ./script/build webpack/development.js",
+      "env": {
+        "NODE_ENV": "development"
+      }
+    },
+    "prod:build": {
+      "command": "yarn run babel-node -- ./script/build webpack/production.js",
+      "env": {
+        "NODE_ENV": "production"
+      }
+    },
+    "prod:start": {
+      "command": "pm2 start server --name='universal-react-redux'",
+      "env": {
+        "NODE_ENV": "production"
+      }
+    },
+    "test": {
+      "command": "yarn run mocha --recursive --compilers js:babel-register",
+      "env": {
+        "NODE_ENV": "test"
+      }
+    },
+    "test:all": {
+      "command": "yarn run mocha --recursive --compilers js:babel-register $(find . -path ./node_modules -prune -o -name '*.test.js' -print)",
+      "env": {
+        "NODE_ENV": "test"
+      }
+    },
+    "test:watch": {
+      "command": "yarn run test -- --watch",
+      "env": {
+        "NODE_ENV": "test"
+      }
+    },
+    "test:all:watch": {
+      "command": "yarn run test:all -- --watch",
+      "env": {
+        "NODE_ENV": "test"
+      }
+    },
+    "lint": {
+      "command": "yarn run eslint --ext .js,.jsx .",
+      "env": {
+        "NODE_ENV": "test"
+      }
+    }
   },
   "devDependencies": {
     "babel-eslint": "7.1.1",
+    "better-npm-run": "^0.0.13",
+    "debug": "^2.6.0",
     "eslint": "3.11.1",
     "eslint-loader": "1.6.1",
     "eslint-plugin-react": "6.7.1",
@@ -95,7 +160,7 @@
     "serve-static": "1.11.1",
     "style-loader": "0.13.1",
     "url-loader": "0.5.7",
-    "webpack": "2.1.0-beta.27",
+    "webpack": "2.1.0-beta.28",
     "webpack-isomorphic-tools": "2.6.4"
   }
 }

postinstall.js

@@ -0,0 +1,15 @@
+const exec = require('child_process').exec;
+
+// For cross-platform postinstalls, use a node script to execute any
+// post-install tasks rather than using a bash script since that wouldn't work
+// on Windows.
+if (process.env.NODE_ENV === 'production') {
+  exec('yarn run prod:build', (error, stdout, stderr) => {
+    if (error) {
+      console.error(`exec error: ${error}`);
+      return;
+    }
+    console.log(`stdout: ${stdout}`);
+    console.log(`stderr: ${stderr}`);
+  });
+}

script/build.js

@@ -0,0 +1,38 @@
+import webpack from 'webpack';
+import ProgressPlugin from 'webpack/lib/ProgressPlugin';
+
+const args = process.argv.splice(2);
+const configFilePath = `${__dirname}/../${args[0]}`;
+const debug = require('debug')(args[0]);
+const configFile = require(configFilePath).default;
+const compiler = webpack(configFile);
+
+const handleSoftErrors = (errors) => {
+  debug('There were some errors with compilation.');
+  debug(errors);
+};
+
+const handleWarnings = (warnings) => {
+  debug('There were some warnings with compilation.');
+  debug(warnings);
+};
+
+compiler.apply(new ProgressPlugin({ profile: true }));
+
+compiler.run((err, stats) => {
+  if (err || stats.hasErrors()) {
+    debug('There was a fatal error with webpack.');
+    debug(err);
+    return;
+  }
+
+  const jsonStats = stats.toJson();
+
+  if (jsonStats.errors.length > 0) {
+    return handleSoftErrors(jsonStats.errors);
+  }
+
+  if (jsonStats.warnings.length > 0) {
+    return handleWarnings(jsonStats.warnings);
+  }
+});

webpack/development.js

@@ -40,10 +40,10 @@ export default {
     ...baseConfig.plugins,
     ...plugins
   ],
-  module: Object.assign({}, baseConfig.module, {
+  module: { ...baseConfig.module, ...{
     rules: [
       ...baseConfig.module.rules,
       ...loaders
     ]
-  })
+  }}
 };

webpack/production.js

@@ -35,26 +35,25 @@ const loaders = [
     })
   },
   {
-    test: /\.js$/,
+    test: /\.jsx$|\.js$/,
     loader: 'babel-loader',
-    rules: ['babel'],
     exclude: /node_modules/
   }
 ];
 
 export default {
   ...baseConfig,
-  output: Object.assign({}, baseConfig.output, {
+  output: { ...baseConfig.output, ...{
     filename: '[name].[hash].js'
-  }),
+  }},
   plugins: [
     ...baseConfig.plugins,
     ...plugins
   ],
-  module: Object.assign({}, baseConfig.module, {
+  module: { ...baseConfig.module, ...{
     rules: [
       ...baseConfig.module.rules,
       ...loaders
     ]
-  })
+  }}
 };