Merge pull request #123 from TrueCar/toddw/update-packages

update *all* of the packages

new/package.json

@@ -8,44 +8,45 @@
  "test": "echo \"Error: no test specified\" && exit 1"
  },
  "dependencies": {
- "babel-loader": "6.2.3",
- "babel-runtime": "6.5.0",
+ "babel-core": "6.7.6",
+ "babel-loader": "6.2.4",
+ "babel-runtime": "6.6.1",
  "babel-preset-stage-0": "6.5.0",
- "babel-preset-es2015": "6.5.0",
+ "babel-preset-es2015": "6.6.0",
  "babel-preset-react": "6.5.0",
- "css-loader": "0.23.0",
+ "css-loader": "0.23.1",
  "file-loader": "0.8.5",
- "gluestick-shared": "0.3.3",
- "history": "2.0.0",
+ "gluestick-shared": "0.3.4",
+ "history": "2.0.1",
  "json-loader": "0.5.4",
  "node-sass": "3.4.2",
- "radium": "0.17.0",
- "react": "0.14.6",
- "react-dom": "0.14.6",
- "react-redux": "4.0.6",
- "react-router": "2.0.0",
- "redux": "3.3.1",
- "sass-loader": "3.1.2",
- "style-loader": "0.13.0",
- "webpack": "1.12.8"
+ "radium": "0.17.1",
+ "react": "15.0.1",
+ "react-dom": "15.0.1",
+ "react-redux": "4.4.2",
+ "react-router": "2.1.0",
+ "redux": "3.4.0",
+ "sass-loader": "3.2.0",
+ "style-loader": "0.13.1",
+ "webpack": "1.12.15"
  },
  "author": "",
  "license": "ISC",
  "devDependencies": {
- "babel-eslint": "^5.0.0",
+ "babel-eslint": "6.0.2",
  "babel-istanbul-loader": "0.1.0",
- "babel-plugin-react-transform": "2.0.0",
+ "babel-plugin-react-transform": "2.0.2",
  "babel-plugin-transform-decorators-legacy": "1.3.4",
- "eslint": "2.2.0",
+ "eslint": "2.7.0",
  "eslint-plugin-react": "^4.2.0",
- "node-inspector": "0.12.6",
+ "node-inspector": "0.12.8",
  "react-hot-loader": "1.3.0",
- "react-transform-catch-errors": "1.0.0",
- "react-transform-hmr": "1.0.1",
- "redbox-react": "1.2.0",
- "webpack-hot-middleware": "2.5.0",
- "enzyme": "2.0.0",
- "react-addons-test-utils": "0.14.6"
+ "react-transform-catch-errors": "1.0.2",
+ "react-transform-hmr": "1.0.4",
+ "redbox-react": "1.2.3",
+ "webpack-hot-middleware": "2.10.0",
+ "enzyme": "2.2.0",
+ "react-addons-test-utils": "15.0.1"
  }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
  "name": "gluestick",
- "version": "0.3.12",
+ "version": "0.4.0",
  "description": "GlueStick is a command line interface for quickly developing universal web applications using React",
  "main": "src/cli-harmony.js",
  "bin": "src/cli-harmony.js",
@@ -31,69 +31,69 @@
  },
  "author": "Todd Williams <toddsurfs@icloud.com>",
  "dependencies": {
- "babel-cli": "6.6.5",
- "babel-core": "6.5.2",
- "babel-istanbul": "0.6.1",
- "babel-loader": "6.2.3",
- "babel-plugin-react-transform": "2.0.0",
+ "babel-cli": "6.7.5",
+ "babel-core": "6.7.6",
+ "babel-istanbul": "0.7.0",
+ "babel-loader": "6.2.4",
+ "babel-plugin-react-transform": "2.0.2",
  "babel-plugin-transform-decorators-legacy": "1.3.4",
- "babel-polyfill": "6.5.0",
- "babel-preset-es2015": "6.5.0",
+ "babel-polyfill": "6.7.4",
+ "babel-preset-es2015": "6.6.0",
  "babel-preset-react": "6.5.0",
  "babel-preset-stage-0": "6.5.0",
- "babel-runtime": "6.5.0",
- "chai": "3.4.1",
- "chalk": "1.1.1",
- "chokidar": "1.4.1",
+ "babel-runtime": "6.6.1",
+ "chai": "3.5.0",
+ "chalk": "1.1.3",
+ "chokidar": "1.4.3",
  "commander": "2.9.0",
- "cross-spawn": "2.1.5",
- "express": "4.13.3",
+ "cross-spawn": "2.2.2",
+ "express": "4.13.4",
  "express-http-proxy": "0.6.0",
- "extract-text-webpack-plugin": "0.9.1",
+ "extract-text-webpack-plugin": "1.0.1",
  "file-loader": "0.8.5",
- "fs-extra": "0.26.2",
- "gluestick-shared": "0.3.3",
- "history": "2.0.0",
- "inquirer": "0.11.0",
+ "fs-extra": "0.26.7",
+ "gluestick-shared": "0.3.4",
+ "history": "2.0.1",
+ "inquirer": "1.0.0",
  "json-loader": "0.5.4",
- "karma": "0.13.19",
+ "karma": "0.13.22",
  "karma-chai": "0.1.0",
- "karma-chrome-launcher": "0.2.1",
- "karma-coverage": "0.5.3",
+ "karma-chrome-launcher": "0.2.3",
+ "karma-coverage": "0.5.5",
  "karma-firefox-launcher": "0.1.7",
- "karma-mocha": "0.2.1",
+ "karma-mocha": "0.2.2",
  "karma-notify-reporter": "0.1.1",
  "karma-sinon": "1.0.4",
- "karma-sourcemap-loader": "0.3.6",
- "karma-spec-reporter": "0.0.23",
+ "karma-sourcemap-loader": "0.3.7",
+ "karma-spec-reporter": "0.0.26",
  "karma-webpack": "1.7.0",
  "match-media": "0.2.0",
  "mkdirp": "0.5.1",
- "mocha": "2.3.4",
+ "mocha": "2.4.5",
  "node-sass": "3.4.2",
  "pm2": "1.1.1",
- "pretty-error": "1.2.0",
- "radium": "0.17.0",
- "react": "0.14.6",
- "react-addons-test-utils": "0.14.3",
- "react-dom": "0.14.6",
+ "pretty-error": "2.0.0",
+ "radium": "0.17.1",
+ "react": "15.0.1",
+ "react-addons-test-utils": "15.0.1",
+ "react-dom": "15.0.1",
  "react-hot-loader": "1.3.0",
- "react-loader": "2.0.0",
- "react-router": "2.0.0",
- "react-transform-catch-errors": "1.0.0",
- "react-transform-hmr": "1.0.1",
- "redbox-react": "1.2.0",
- "rimraf": "2.5.1",
+ "react-loader": "2.2.0",
+ "react-router": "2.1.0",
+ "react-transform-catch-errors": "1.0.2",
+ "react-transform-hmr": "1.0.4",
+ "redbox-react": "1.2.3",
+ "rimraf": "2.5.2",
  "secure-handlebars": "1.2.0",
- "serialize-javascript": "1.1.2",
+ "serialize-javascript": "1.2.0",
  "sha1": "1.1.1",
- "sinon": "1.17.2",
+ "sinon": "1.17.3",
  "sorted-object": "2.0.0",
  "url-loader": "0.5.7",
- "webpack": "1.12.8",
- "webpack-dev-middleware": "1.3.0",
- "webpack-hot-middleware": "2.5.0",
- "webpack-isomorphic-tools": "2.2.37"
+ "webpack": "1.12.15",
+ "webpack-dev-middleware": "1.6.1",
+ "webpack-hot-middleware": "2.10.0",
+ "webpack-isomorphic-tools": "2.2.44"
  },
  "peerDependencies": {},
  "devDependencies": {

src/auto-upgrade/updateBabelConfig.js

@@ -35,7 +35,7 @@ export default function updateBabelConfig() {
  message: `${warn("The format of .babelrc is out of date. Would you like to automatically update it?")}`
  };
 
- inquirer.prompt([question], function (answers) {
+ inquirer.prompt([question]).then(function (answers) {
  if (!answers.confirm) {
  const latestConfig = fs.readFileSync(latestConfigPath);
  logger.info(`It is recommended that you update your .babelrc file. Here is an example file:\n${latestConfig}`);

src/auto-upgrade/updateConfig.js

@@ -32,7 +32,7 @@ export default function updateConfig () {
 ${chalk.yellow("Example:")}\n${chalk.cyan(exampleContents)}
 Would you like to try to automatically update it?`
  };
- inquirer.prompt([question], function (answers) {
+ inquirer.prompt([question]).then(function (answers) {
  if (!answers.confirm) return resolve();
  doUpgrade(appConfig, expectedLastLine, appConfigPath);
  resolve();

src/auto-upgrade/updatePackage.js

@@ -147,7 +147,7 @@ function promptModulesUpdate (mismatchedModules, done) {
 ${chalk.yellow(mismatchedModuleOutput)}
 Would you like to automatically update your project's dependencies to match the CLI?`
  };
- inquirer.prompt([question], function (answers) {
+ inquirer.prompt([question]).then(function (answers) {
  if (!answers.confirm) return done();
  performModulesUpdate(mismatchedModules, done);
  });
@@ -180,6 +180,7 @@ function performModulesUpdate (mismatchedModules, done) {
 
  // wipe the existing node_modules folder so we can have a clean start
  rimraf.sync(path.join(process.cwd(), "node_modules"));
+ spawn.sync("npm", ["cache", "clean"], {stdio: "inherit"});
  const npmInstall = spawn("npm" + postFix, ["install"], {stdio: "inherit"});
 
  npmInstall.on("close", () => {

src/commands/destroy.js

@@ -60,7 +60,7 @@ module.exports = async function (command, name) {
  name: "confirm",
  message: `You wanted to destroy ${filename(originalName)} but the generated name is ${filename(name)}.\nWould you like to continue with destroying ${filename(name)}?`
  };
- inquirer.prompt([question], function (answers) {
+ inquirer.prompt([question]).then(function (answers) {
  resolve(!!answers.confirm);
  });
  });

src/commands/new.js

@@ -37,7 +37,7 @@ module.exports = function (projectName) {
  name: "confirm",
  message: "Do you wish to continue?"
  };
- inquirer.prompt([question], function (answers) {
+ inquirer.prompt([question]).then(function (answers) {
  if (!answers.confirm) return;
  copyTo(process.cwd());
  return false;

src/lib/karmaConfig.js

@@ -68,6 +68,7 @@ export default {
  ]
  },
  externals: {
+ "react/addons": true,
  "react/lib/ExecutionEnvironment": true,
  "react/lib/ReactContext": true
  }