Merge branch 'master' into xterm
* master: (62 commits) 1.4.3 Disable ia32 linux releases (#2164) Fixed writing composed characters (#2158) Doc: Add yarn install to contribute instructions (#2117) Change "Close Session" shortcut on Linux/Windows (#2160) Notice for plugins (#2114) Updated dependencies to the latest version (#2146) 1.4.2 Reverted class names to as they were before (#2139) 1.4.1 AppVeyor environment variables are now on the platform (#2137) Brought back the icon for closing tabs (#2136) Brought back keymap documentation to the website (#2133) 1.4.0 Don't build on master, except for releases (#2132) Ensured that `async-retry` is added to the bundle (#2131) Ensure correct update channel is displayed in About window (#2130) Retry loading it if config doesn't exist in auto updater (#2129) Write contents of default config to hyper.js (#2128) Use a string for setting the update channel (#2127) ...
This commit is contained in:
CHaBou
commit
944f9d7e89
52 changed files with 129442 additions and 2306 deletions
77
package.json
77
package.json
|
|
@ -1,19 +1,19 @@
|
|||
{
|
||||
"repository": "zeit/hyper",
|
||||
"scripts": {
|
||||
"start": "echo 'please run `npm run dev` in one tab and then `npm run app` in another one'",
|
||||
"start": "echo 'please run `yarn run dev` in one tab and then `yarn run app` in another one'",
|
||||
"app": "electron app",
|
||||
"dev": "webpack -w",
|
||||
"build": "cross-env NODE_ENV=production webpack",
|
||||
"lint": "eslint .",
|
||||
"test": "npm run lint",
|
||||
"test": "yarn run lint",
|
||||
"test:unit": "ava test/unit",
|
||||
"test:unit:watch": "npm run test:unit -- --watch",
|
||||
"prepush": "npm test",
|
||||
"postinstall": "install-app-deps && npm run rebuild-node-pty",
|
||||
"test:unit:watch": "yarn run test:unit -- --watch",
|
||||
"prepush": "yarn test",
|
||||
"postinstall": "electron-builder install-app-deps && yarn run rebuild-node-pty",
|
||||
"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",
|
||||
"clean": "npm cache clear && rm -rf node_modules && rm -rf app/node_modules && rm -rf app/dist"
|
||||
"dist": "yarn run build && cross-env BABEL_ENV=production babel --out-file app/renderer/bundle.js --no-comments --minified app/renderer/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/renderer"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"plugins": [
|
||||
|
|
@ -86,27 +86,24 @@
|
|||
},
|
||||
"build": {
|
||||
"appId": "co.zeit.hyper",
|
||||
"asar": true,
|
||||
"extraResources": "./bin/yarn-standalone.js",
|
||||
"linux": {
|
||||
"target": [
|
||||
{
|
||||
"target": "deb",
|
||||
"arch": [
|
||||
"ia32",
|
||||
"x64"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target": "AppImage",
|
||||
"arch": [
|
||||
"ia32",
|
||||
"x64"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target": "rpm",
|
||||
"arch": [
|
||||
"ia32",
|
||||
"x64"
|
||||
]
|
||||
}
|
||||
|
|
@ -129,47 +126,47 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"aphrodite-simple": "0.4.1",
|
||||
"color": "0.11.4",
|
||||
"css-loader": "^0.28.4",
|
||||
"color": "2.0.0",
|
||||
"css-loader": "0.28.4",
|
||||
"hterm-umdjs": "1.1.3",
|
||||
"json-loader": "0.5.4",
|
||||
"json-loader": "0.5.7",
|
||||
"mousetrap": "1.6.1",
|
||||
"ms": "0.7.2",
|
||||
"ms": "2.0.0",
|
||||
"php-escape-shell": "1.0.0",
|
||||
"react": "15.5.4",
|
||||
"react": "15.6.1",
|
||||
"react-deep-force-update": "2.0.1",
|
||||
"react-dom": "15.5.4",
|
||||
"react-redux": "5.0.5",
|
||||
"redux": "3.6.0",
|
||||
"react-dom": "15.6.1",
|
||||
"react-redux": "5.0.6",
|
||||
"redux": "3.7.2",
|
||||
"redux-thunk": "2.2.0",
|
||||
"reselect": "3.0.1",
|
||||
"runes": "0.4.0",
|
||||
"seamless-immutable": "6.1.3",
|
||||
"semver": "5.3.0",
|
||||
"style-loader": "^0.18.2",
|
||||
"uuid": "3.0.1",
|
||||
"runes": "0.4.2",
|
||||
"seamless-immutable": "7.1.2",
|
||||
"semver": "5.4.1",
|
||||
"uuid": "3.1.0",
|
||||
"xterm": "2.8.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"asar": "0.13.0",
|
||||
"ava": "0.17.0",
|
||||
"babel-cli": "6.24.1",
|
||||
"babel-core": "6.24.1",
|
||||
"babel-loader": "7.0.0",
|
||||
"babel-preset-babili": "0.1.2",
|
||||
"ava": "0.22.0",
|
||||
"babel-cli": "6.26.0",
|
||||
"babel-core": "6.26.0",
|
||||
"babel-loader": "7.1.2",
|
||||
"babel-preset-babili": "0.1.4",
|
||||
"babel-preset-react": "6.24.1",
|
||||
"copy-webpack-plugin": "4.0.1",
|
||||
"cross-env": "5.0.0",
|
||||
"electron": "1.6.11",
|
||||
"electron-builder": "18.3.5",
|
||||
"electron-builder-squirrel-windows": "18.3.0",
|
||||
"cross-env": "5.0.5",
|
||||
"electron": "1.7.5",
|
||||
"electron-builder": "19.27.3",
|
||||
"electron-builder-squirrel-windows": "19.27.3",
|
||||
"electron-devtools-installer": "2.2.0",
|
||||
"electron-rebuild": "1.5.11",
|
||||
"eslint": "^3.19.0",
|
||||
"eslint-plugin-react": "^7.0.1",
|
||||
"husky": "0.13.4",
|
||||
"electron-rebuild": "1.6.0",
|
||||
"eslint": "3.19.0",
|
||||
"eslint-plugin-react": "7.3.0",
|
||||
"husky": "0.14.3",
|
||||
"node-gyp": "3.6.2",
|
||||
"redux-logger": "3.0.6",
|
||||
"spectron": "3.6.4",
|
||||
"webpack": "2.6.1"
|
||||
"spectron": "3.7.2",
|
||||
"style-loader": "0.18.2",
|
||||
"webpack": "3.5.5"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue