From 0ec5d11f7121ecc3611dd275adafd3fb283129ce Mon Sep 17 00:00:00 2001 From: Florian Mettetal Date: Sat, 22 Apr 2017 19:58:44 -0700 Subject: [PATCH 1/2] webpack2 soft changes for PRs 142 144 145 --- .nvmrc | 1 + README.md | 5 ++++ package.json | 66 ++++++++++++++++++++++++++-------------------------- 3 files changed, 39 insertions(+), 33 deletions(-) create mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..5a33ecb --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +6.10 diff --git a/README.md b/README.md index 1664bd4..8d5cf34 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,11 @@ git checkout webpack2 ## Running Crater doesn't start a Mongo dev database, before running, you must start one by running `mongod` in a separate shell. +### Requirements +- install meteor: https://www.meteor.com/install
+- install node version 6 - (on OSX you can use node version manager to [auto change to node6 using .nvmrc](https://github.com/creationix/nvm#calling-nvm-use-automatically-in-a-directory-with-a-nvmrc-file))
+- install mongodb - for OSX: [https://docs.mongodb.com/manual/tutorial/install-mongodb-on-os-x/](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-os-x/) + ### Dev mode *Note*: dev mode only renders a basic page on the server side; only prod mode and the built app render your routes diff --git a/package.json b/package.json index a719305..fedfd78 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,33 @@ { "name": "crater", + "author": "Andy Edwards ", + "version": "2.0.0-alpha.0", + "license": "ISC", + "description": "Meteor(/React) app skeleton that runs your app code with pure Webpack/Babel instead of isobuild", + "repository": { + "type": "git", + "url": "git+https://github.com/jedwards1211/crater.git" + }, + "homepage": "https://github.com/jedwards1211/crater#readme", + "bugs": { + "url": "https://github.com/jedwards1211/crater/issues" + }, + "keywords": [ + "meteor", + "babel", + "webpack", + "react", + "crater" + ], + "main": "index.js", + "nyc": { + "include": [ + "src/**/*.js", + "scripts/**/*.js" + ], + "sourceMap": false, + "instrument": false + }, "scripts": { "start": "babel-node scripts/start.js", "debug": "babel-node scripts/debug.js", @@ -25,6 +53,10 @@ "lint:fix": "eslint --fix *.js src scripts test util webpack", "lint:watch": "esw -w *.js src scripts test util webpack" }, + "pre-commit": [ + "lint", + "flow" + ], "dependencies": { "babel-runtime": "^6.11.6", "bcrypt": "^0.8.7", @@ -42,11 +74,6 @@ "redux": "^3.5.2", "redux-immutablejs": "0.0.8" }, - "version": "2.0.0-alpha.0", - "main": "index.js", - "author": "Andy Edwards ", - "license": "ISC", - "description": "Meteor(/React) app skeleton that runs your app code with pure Webpack/Babel instead of isobuild", "devDependencies": { "assets-webpack-plugin": "^3.4.0", "async-child-process": "^1.0.0", @@ -111,32 +138,5 @@ "webpack-dev-middleware": "^1.7.0", "webpack-hot-middleware": "^2.12.2", "webpack-node-externals": "^1.3.3" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/jedwards1211/crater.git" - }, - "keywords": [ - "meteor", - "babel", - "webpack", - "react", - "crater" - ], - "bugs": { - "url": "https://github.com/jedwards1211/crater/issues" - }, - "homepage": "https://github.com/jedwards1211/crater#readme", - "nyc": { - "include": [ - "src/**/*.js", - "scripts/**/*.js" - ], - "sourceMap": false, - "instrument": false - }, - "pre-commit": [ - "lint", - "flow" - ] + } } From f051aaa834e75ec1d1d53ad63a9267e039de4518 Mon Sep 17 00:00:00 2001 From: Florian Mettetal Date: Sat, 22 Apr 2017 21:21:00 -0700 Subject: [PATCH 2/2] upgrade packages 20170422 --- package.json | 106 +++++++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index fedfd78..76f5b4a 100644 --- a/package.json +++ b/package.json @@ -59,84 +59,84 @@ ], "dependencies": { "babel-runtime": "^6.11.6", - "bcrypt": "^0.8.7", - "debug": "^2.2.0", + "bcrypt": "^1.0.2", + "debug": "^2.5.2", "es6-promisify": "^5.0.0", "express": "^4.14.0", "immutable": "^3.8.1", - "meteor-node-stubs": "~0.2.0", - "react": "^15.3.1", - "react-dom": "^15.3.1", + "meteor-node-stubs": "^0.2.6", + "react": "^15.5.4", + "react-dom": "^15.5.4", "react-dom-stream": "^0.5.1", - "react-redux": "^4.4.5", - "react-router": "^2.7.0", - "react-router-redux": "^4.0.5", + "react-redux": "^5.0.4", + "react-router": "^3.0.5", + "react-router-redux": "^4.0.8", "redux": "^3.5.2", "redux-immutablejs": "0.0.8" }, "devDependencies": { - "assets-webpack-plugin": "^3.4.0", - "async-child-process": "^1.0.0", - "babel-cli": "^6.14.0", - "babel-core": "^6.14.0", - "babel-eslint": "^7.0.0", - "babel-loader": "^6.2.5", + "assets-webpack-plugin": "^3.5.1", + "async-child-process": "^1.1.1", + "babel-cli": "^6.24.1", + "babel-core": "^6.24.1", + "babel-eslint": "^7.2.3", + "babel-loader": "^6.4.1", "babel-plugin-add-module-exports": "^0.2.1", - "babel-plugin-istanbul": "^2.0.3", + "babel-plugin-istanbul": "^3.1.2", "babel-plugin-meteor-imports": "^1.0.3", - "babel-plugin-transform-runtime": "^6.12.0", - "babel-preset-es2015": "^6.14.0", + "babel-plugin-transform-runtime": "^6.23.0", + "babel-preset-es2015": "^6.24.1", "babel-preset-es2015-node5": "^1.2.0", "babel-preset-flow": "^1.0.0", - "babel-preset-react": "^6.11.1", - "babel-preset-stage-1": "^6.13.0", - "babel-register": "^6.14.0", + "babel-preset-react": "^6.24.1", + "babel-preset-stage-1": "^6.24.1", + "babel-register": "^6.24.1", "chai": "^3.5.0", - "coveralls": "^2.11.14", - "crater-util": "^1.1.7", - "cross-spawn": "^4.0.0", - "css-loader": "^0.25.0", - "dotenv": "^2.0.0", + "coveralls": "^2.13.0", + "crater-util": "^1.2.2", + "cross-spawn": "^5.1.0", + "css-loader": "^0.28.0", + "dotenv": "^3.0.0", "empty": "^0.10.1", - "es6-promise": "^4.0.3", - "eslint": "^3.5.0", - "eslint-plugin-babel": "^3.3.0", - "eslint-plugin-flowtype": "^2.17.1", - "eslint-plugin-react": "^6.2.1", - "eslint-watch": "^2.1.14", + "es6-promise": "^4.1.0", + "eslint": "^3.19.0", + "eslint-plugin-babel": "^4.1.1", + "eslint-plugin-flowtype": "^2.32.1", + "eslint-plugin-react": "^6.10.3", + "eslint-watch": "^3.1.0", "extract-text-webpack-plugin": "^2.1.0", "file-loader": "^0.9.0", - "flow-bin": "^0.33.0", - "flow-watch": "^1.0.0", - "glob": "^7.0.6", + "flow-bin": "^0.44.2", + "flow-watch": "^1.1.1", + "glob": "^7.1.1", "happypack": "^3.0.3", - "http-proxy": "^1.14.0", + "http-proxy": "^1.16.2", "istanbul": "^0.4.5", "json-loader": "^0.5.4", "meteor-imports-webpack-plugin": "^2.0.4", "mkdirp": "^0.5.1", - "mocha": "^3.0.2", - "node-inspector": "^0.12.8", - "nyc": "^8.3.2", - "phantomjs-prebuilt": "^2.1.12", + "mocha": "^3.2.0", + "node-inspector": "^0.12.10", + "nyc": "^8.4.0", + "phantomjs-prebuilt": "^2.1.14", "postcss-loader": "^0.13.0", "postcss-modules-values": "^1.2.2", - "pre-commit": "^1.1.3", - "progress-bar-webpack-plugin": "^1.9.0", + "pre-commit": "^1.2.2", + "progress-bar-webpack-plugin": "^1.9.3", "raw-loader": "^0.5.1", - "react-hot-loader": "^3.0.0-beta.2", - "redux-logger": "^2.6.1", - "rimraf": "^2.5.4", + "react-hot-loader": "^3.0.0-beta.6", + "redux-logger": "^2.10.2", + "rimraf": "^2.6.1", "smart-restart": "^1.1.1", - "style-loader": "^0.13.1", - "url-loader": "^0.5.7", - "wdio-mocha-framework": "^0.4.0", + "style-loader": "^0.13.2", + "url-loader": "^0.5.8", + "wdio-mocha-framework": "^0.5.10", "wdio-phantomjs-service": "^0.2.2", - "wdio-spec-reporter": "0.0.3", - "webdriverio": "^4.2.11", - "webpack": "^2.3.2", - "webpack-dev-middleware": "^1.7.0", - "webpack-hot-middleware": "^2.12.2", - "webpack-node-externals": "^1.3.3" + "wdio-spec-reporter": "^0.1.0", + "webdriverio": "^4.7.1", + "webpack": "^2.4.1", + "webpack-dev-middleware": "^1.10.2", + "webpack-hot-middleware": "^2.18.0", + "webpack-node-externals": "^1.5.4" } }