Skip to content

Commit

Permalink
Merge pull request #647 from slidewiki/npm-package-upgrades
Browse files Browse the repository at this point in the history
NPM Package Upgrades
  • Loading branch information
kadevgraaf authored Dec 4, 2017
2 parents 48c6a24 + fbe942f commit 6e153cc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 20 deletions.
27 changes: 12 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
"build:windows": "webpack --config ./webpack/prod.config.js && set NODE_ENV=production && set BABEL_ENV=production && npm start",
"build:nostart": "webpack --config ./webpack/prod.config.js",
"dev": "node ./webpack/dev-server.js",
"dev:dashboard": "DASHBOARD=1 webpack-dashboard -- webpack-dev-server --config ./webpack/dev-server.js",
"dev:windows:dashboard": "set HOST=127.0.0.1&& set PORT=3000&& set DASHBOARD=1&& webpack-dashboard -- webpack-dev-server --config ./webpack/dev-server.js",
"dev:windows": "set HOST=127.0.0.1&& set PORT=3000&& node ./webpack/dev-server.js",
"langs": "babel plugins/intl/translate.js | node",
"lint": "eslint --ignore-path .gitignore -c .eslintrc \"./**/*.js\"",
Expand Down Expand Up @@ -65,7 +63,7 @@
"csurf": "^1.9.0",
"crypt": "^0.0.2",
"debug": "^3.1.0",
"diff": "3.2.0",
"diff": "3.4.0",
"es5-shim": "^4.5.9",
"es6-shim": "^0.35.3",
"express": "^4.15.0",
Expand Down Expand Up @@ -108,10 +106,10 @@
"react-dnd": "^2.2.4",
"react-dnd-html5-backend": "^2.2.3",
"react-dom": "^15.4.2",
"react-dropzone": "^3.13.2",
"react-dropzone": "^4.2.2",
"react-edit-inline": "^1.0.8",
"react-google-recaptcha": "^0.8.1",
"react-hotkeys": "^0.9.0",
"react-hotkeys": "^0.10.0",
"react-image-cropper": "1.0.5",
"react-intl": "^2.2.3",
"react-intl-webpack-plugin": "0.0.3",
Expand All @@ -129,7 +127,6 @@
"smtp-connection": "^4.0.2",
"socket.io": "^2.0.3",
"striptags": "^2.1.1",
"style-loader": "^0.18.2",
"superagent": "^3.8.1",
"superagent-csrf": "^1.0.0",
"superagent-csrf-middleware": "^0.3.0",
Expand All @@ -147,15 +144,15 @@
"babel-plugin-react-intl": "^2.3.1",
"babel-plugin-syntax-decorators": "6.13.0",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-object-rest-spread": "6.23.0",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-react-constant-elements": "^6.23.0",
"babel-plugin-transform-react-inline-elements": "^6.22.0",
"babel-preset-es2015": "^6.22.0",
"babel-preset-react": "^6.23.0",
"babel-register": "^6.24.1",
"bundle-loader": "0.5.5",
"chai": "^4.0.2",
"coveralls": "^2.13.1",
"coveralls": "^3.0.0",
"enzyme": "3.1.0",
"enzyme-adapter-react-15": "1.0.2",
"css-loader": "^0.28.7",
Expand All @@ -165,21 +162,21 @@
"eslint-plugin-react": "^6.10.0",
"extract-text-webpack-plugin": "^2.0.0",
"file-loader": "^1.1.5",
"husky": "^0.13.2",
"istanbul": "1.0.0-alpha.2",
"jsdom": "^9.11.0",
"husky": "^0.14.3",
"istanbul": "0.4.5",
"jsdom": "^9.12.0",
"json-loader": "^0.5.4",
"mocha": "^3.2.0",
"mocha": "^4.0.1",
"napa": "^2.3.0",
"nodemon": "1.11.0",
"nodemon": "1.12.1",
"react-addons-test-utils": "^15.6.0",
"react-hot-loader": "1.3.1",
"react-test-renderer": "15.6.2",
"shelljs": "^0.7.8",
"sloc": "0.2.0",
"style-loader": "^0.19.0",
"url-loader": "^0.6.2",
"webpack": "^2.2.1",
"webpack-dashboard": "^0.4.0",
"webpack": "^3.8.1",
"webpack-dev-server": "^2.4.1",
"webpack-stats-plugin": "^0.1.5",
"webpack-vendor-chunk-plugin": "1.0.0",
Expand Down
5 changes: 0 additions & 5 deletions webpack/dev-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ let WebpackDevServer = require ('webpack-dev-server');
let webpack = require ('webpack');
let config = require ('./dev.config');
let shell = require ('shelljs');
let DashboardPlugin = require('webpack-dashboard/plugin');

const host = process.env.HOST ? process.env.HOST : '0.0.0.0';
const mainPort = process.env.PORT ? parseInt(process.env.PORT) : 3000;
Expand All @@ -27,10 +26,6 @@ const options = {
};

const compiler = webpack(config);
//enable webpack dashboard on-demand
if(process.env.DASHBOARD){
compiler.apply(new DashboardPlugin());
}
new WebpackDevServer(compiler, options).listen(mainPort, host, () => {
shell.env.PORT = shell.env.PORT || mainPort;
shell.exec('"./node_modules/.bin/nodemon" start.js -e js,jsx', () => {});
Expand Down

0 comments on commit 6e153cc

Please sign in to comment.