Dependency updates (#1958)

* Dependency updates

* update babel-loader, electron-builder, electron-builder-squirrel-windows

* update node-pty to 0.6.9

release notes: https://github.com/Tyriar/node-pty/releases

* update node-pty to 0.6.10

release notes: https://github.com/Tyriar/node-pty/releases/tag/0.6.10

* update electron-builder

* more dependency updates

* Update Electron and family

Electron release notes: https://github.com/electron/electron/releases/tag/v1.6.12

* Update redux to 3.7.2

* Update webpack to 3.x and enable ModuleConcatenation

Basically absorb PR #1967

* Update react and react-dom

* also absorb the changes of PR https://github.com/zeit/hyper/pull/2056
This commit is contained in:
Benjamin Staneck 2017-08-08 22:29:54 +02:00 committed by Philippe Potvin
parent eb85e14cbc
commit 263caa0659
5 changed files with 461 additions and 365 deletions

View file

@ -23,7 +23,7 @@
"mkdirp": "0.5.1", "mkdirp": "0.5.1",
"ms": "0.7.1", "ms": "0.7.1",
"node-fetch": "1.6.3", "node-fetch": "1.6.3",
"node-pty": "0.6.6", "node-pty": "0.6.10",
"semver": "5.3.0", "semver": "5.3.0",
"shell-env": "0.2.0", "shell-env": "0.2.0",
"uuid": "3.0.0", "uuid": "3.0.0",

View file

@ -263,9 +263,9 @@ node-fetch@1.6.3:
encoding "^0.1.11" encoding "^0.1.11"
is-stream "^1.0.1" is-stream "^1.0.1"
node-pty@0.6.6: node-pty@0.6.10:
version "0.6.6" version "0.6.10"
resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.6.6.tgz#7f507148f917aa809a714c2864d98f0e6d3afcd6" resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.6.10.tgz#b7d355bb2002d16e14c3c353e58c48f7ee131a67"
dependencies: dependencies:
nan "2.5.0" nan "2.5.0"

View file

@ -10,7 +10,7 @@
"test:unit": "ava test/unit", "test:unit": "ava test/unit",
"test:unit:watch": "npm run test:unit -- --watch", "test:unit:watch": "npm run test:unit -- --watch",
"prepush": "npm test", "prepush": "npm test",
"postinstall": "install-app-deps && npm run rebuild-node-pty", "postinstall": "electron-builder install-app-deps && npm run rebuild-node-pty",
"rebuild-node-pty": "electron-rebuild -f -w app/node_modules/node-pty -m app", "rebuild-node-pty": "electron-rebuild -f -w app/node_modules/node-pty -m app",
"dist": "npm run build && cross-env BABEL_ENV=production babel --out-file app/dist/bundle.js --no-comments --minified app/dist/bundle.js && build", "dist": "npm run build && cross-env BABEL_ENV=production babel --out-file app/dist/bundle.js --no-comments --minified app/dist/bundle.js && build",
"clean": "node ./bin/rimraf-standalone.js node_modules && node ./bin/rimraf-standalone.js ./app/node_modules && node ./bin/rimraf-standalone.js ./app/dist" "clean": "node ./bin/rimraf-standalone.js node_modules && node ./bin/rimraf-standalone.js ./app/node_modules && node ./bin/rimraf-standalone.js ./app/dist"
@ -122,40 +122,40 @@
"mousetrap": "1.6.1", "mousetrap": "1.6.1",
"ms": "0.7.2", "ms": "0.7.2",
"php-escape-shell": "1.0.0", "php-escape-shell": "1.0.0",
"react": "15.5.4", "react": "15.6.1",
"react-deep-force-update": "2.0.1", "react-deep-force-update": "2.0.1",
"react-dom": "15.5.4", "react-dom": "15.6.1",
"react-redux": "5.0.5", "react-redux": "5.0.5",
"redux": "3.6.0", "redux": "3.7.2",
"redux-thunk": "2.2.0", "redux-thunk": "2.2.0",
"reselect": "3.0.1", "reselect": "3.0.1",
"runes": "0.4.0", "runes": "0.4.2",
"seamless-immutable": "6.1.3", "seamless-immutable": "6.1.3",
"semver": "5.3.0", "semver": "5.4.1",
"uuid": "3.0.1" "uuid": "3.0.1"
}, },
"devDependencies": { "devDependencies": {
"asar": "0.13.0", "asar": "0.13.0",
"ava": "0.17.0", "ava": "0.17.0",
"babel-cli": "6.24.1", "babel-cli": "6.24.1",
"babel-core": "6.24.1", "babel-core": "6.25.0",
"babel-loader": "7.0.0", "babel-loader": "7.1.1",
"babel-preset-babili": "0.1.2", "babel-preset-babili": "0.1.4",
"babel-preset-react": "6.24.1", "babel-preset-react": "6.24.1",
"copy-webpack-plugin": "4.0.1", "copy-webpack-plugin": "4.0.1",
"cross-env": "5.0.0", "cross-env": "5.0.1",
"electron": "1.6.11", "electron": "1.6.12",
"electron-builder": "18.3.5", "electron-builder": "19.19.1",
"electron-builder-squirrel-windows": "18.3.0", "electron-builder-squirrel-windows": "19.19.1",
"electron-devtools-installer": "2.2.0", "electron-devtools-installer": "2.2.0",
"electron-rebuild": "1.5.11", "electron-rebuild": "1.6.0",
"eslint-config-xo-react": "0.10.0", "eslint-config-xo-react": "0.10.0",
"eslint-plugin-react": "6.7.1", "eslint-plugin-react": "6.7.1",
"husky": "0.13.4", "husky": "0.14.3",
"node-gyp": "3.6.2", "node-gyp": "3.6.2",
"redux-logger": "3.0.6", "redux-logger": "3.0.6",
"spectron": "3.6.4", "spectron": "3.6.4",
"webpack": "2.6.1", "webpack": "3.4.1",
"xo": "0.17.1" "xo": "0.17.1"
} }
} }

View file

@ -7,6 +7,9 @@ const nodeEnv = process.env.NODE_ENV || 'development';
const isProd = nodeEnv === 'production'; const isProd = nodeEnv === 'production';
module.exports = { module.exports = {
resolve: {
extensions: ['.js', '.jsx']
},
devtool: isProd ? 'hidden-source-map' : 'cheap-module-source-map', devtool: isProd ? 'hidden-source-map' : 'cheap-module-source-map',
entry: './lib/index.js', entry: './lib/index.js',
output: { output: {
@ -14,7 +17,7 @@ module.exports = {
filename: 'bundle.js' filename: 'bundle.js'
}, },
module: { module: {
loaders: [ rules: [
{ {
test: /\.(js|jsx)$/, test: /\.(js|jsx)$/,
exclude: /node_modules/, exclude: /node_modules/,
@ -32,6 +35,7 @@ module.exports = {
NODE_ENV: JSON.stringify(nodeEnv) NODE_ENV: JSON.stringify(nodeEnv)
} }
}), }),
new webpack.optimize.ModuleConcatenationPlugin(),
new Copy([ new Copy([
{ {
from: './assets', from: './assets',

780
yarn.lock

File diff suppressed because it is too large Load diff