зеркало из https://github.com/docker/kitematic.git
upgrade package versions to fix the tests
This commit is contained in:
Родитель
052735cfef
Коммит
0fcd676164
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
"presets": [
|
||||
"env",
|
||||
"react"
|
||||
],
|
||||
"plugins": [
|
||||
"transform-runtime",
|
||||
"transform-async-to-generator"
|
||||
]
|
||||
}
|
|
@ -18,6 +18,7 @@ jobs:
|
|||
- checkout
|
||||
- run: npm install
|
||||
- run: npm test
|
||||
- run: npm run release:mac:build
|
||||
|
||||
workflows:
|
||||
version: 2
|
||||
|
|
17
Gruntfile.js
17
Gruntfile.js
|
@ -185,13 +185,6 @@ module.exports = function (grunt) {
|
|||
},
|
||||
},
|
||||
|
||||
rename: {
|
||||
installer: {
|
||||
src: 'dist/Setup.exe',
|
||||
dest: 'dist/' + BASENAME + 'Setup-' + packagejson.version + '-Windows-Alpha.exe'
|
||||
}
|
||||
},
|
||||
|
||||
// styles
|
||||
less: {
|
||||
options: {
|
||||
|
@ -207,12 +200,6 @@ module.exports = function (grunt) {
|
|||
|
||||
// javascript
|
||||
babel: {
|
||||
options: {
|
||||
sourceMap: 'inline',
|
||||
blacklist: 'regenerator',
|
||||
stage: 1,
|
||||
optional: ['asyncToGenerator']
|
||||
},
|
||||
dist: {
|
||||
files: [{
|
||||
expand: true,
|
||||
|
@ -284,7 +271,7 @@ module.exports = function (grunt) {
|
|||
},
|
||||
|
||||
// livereload
|
||||
watchChokidar: {
|
||||
watch: {
|
||||
options: {
|
||||
spawn: true
|
||||
},
|
||||
|
@ -423,7 +410,7 @@ module.exports = function (grunt) {
|
|||
grunt.loadNpmTasks('grunt-electron-installer-redhat');
|
||||
|
||||
grunt.registerTask('build', ['newer:babel', 'less', 'newer:copy:dev']);
|
||||
grunt.registerTask('default', ['build', 'shell:electron', 'watchChokidar']);
|
||||
grunt.registerTask('default', ['build', 'shell:electron', 'watch']);
|
||||
|
||||
grunt.registerTask('release:linux', [
|
||||
'clean:release', 'build', 'shell:linux_npm',
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
module.exports = {
|
||||
require: jest.genMockFunction(),
|
||||
match: jest.genMockFunction(),
|
||||
on: jest.genMockFunction()
|
||||
require: jest.fn(),
|
||||
match: jest.fn(),
|
||||
on: jest.fn()
|
||||
};
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
module.exports = {
|
||||
require: jest.genMockFunction(),
|
||||
match: jest.genMockFunction(),
|
||||
app: jest.genMockFunction(),
|
||||
remote: jest.genMockFunction(),
|
||||
dialog: jest.genMockFunction()
|
||||
require: jest.fn(),
|
||||
match: jest.fn(),
|
||||
app: jest.fn(),
|
||||
remote: jest.fn(),
|
||||
dialog: jest.fn()
|
||||
};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
module.exports = {
|
||||
require: jest.genMockFunction(),
|
||||
match: jest.genMockFunction()
|
||||
require: jest.fn(),
|
||||
match: jest.fn()
|
||||
};
|
||||
|
|
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
39
package.json
39
package.json
|
@ -22,10 +22,12 @@
|
|||
"release:debian:x64": "grunt release:debian:x64",
|
||||
"release:redhat:x32": "grunt release:redhat:x32",
|
||||
"release:redhat:x64": "grunt release:redhat:x64",
|
||||
"release:mac": "grunt release:mac && electron-builder --mac",
|
||||
"release:mac:build": "grunt release:mac",
|
||||
"release:mac:package": "electron-builder --mac",
|
||||
"release:mac": "npm run release:mac:build && npm run release:mac:package",
|
||||
"release:windows": "grunt release:windows",
|
||||
"start": "grunt",
|
||||
"start-dev": "npm run build && NODE_ENV=development grunt",
|
||||
"start-dev": "NODE_ENV=development grunt",
|
||||
"test": "jest -c jest-unit.json",
|
||||
"tslint": "tslint --fix --project ./tsconfig.json"
|
||||
},
|
||||
|
@ -36,6 +38,7 @@
|
|||
"ansi-to-html": "0.3.0",
|
||||
"any-promise": "0.1.0",
|
||||
"async": "1.5.2",
|
||||
"babel-polyfill": "^6.26.0",
|
||||
"bluebird": "3.5.1",
|
||||
"bugsnag-js": "2.5.0",
|
||||
"cached-request": "1.1.2",
|
||||
|
@ -55,7 +58,7 @@
|
|||
"react-bootstrap": "0.20.3",
|
||||
"react-retina-image": "1.3.3",
|
||||
"react-router": "0.13.6",
|
||||
"request": "2.83.0",
|
||||
"request": "^2.88.0",
|
||||
"request-progress": "0.3.1",
|
||||
"rimraf": "2.6.2",
|
||||
"underscore": "1.8.3",
|
||||
|
@ -64,8 +67,12 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"@types/react": "16.0.38",
|
||||
"babel": "5.8.38",
|
||||
"babel-cli": "^6.26.0",
|
||||
"babel-jest": "^23.6.0",
|
||||
"babel-plugin-transform-async-to-generator": "^6.24.1",
|
||||
"babel-plugin-transform-runtime": "^6.23.0",
|
||||
"babel-preset-env": "^1.7.0",
|
||||
"babel-preset-react": "^6.24.1",
|
||||
"electron": "1.8.8",
|
||||
"electron-builder": "^20.28.4",
|
||||
"electron-packager": "^12.1.1",
|
||||
|
@ -75,33 +82,27 @@
|
|||
"grunt-babel": "^7.0.0",
|
||||
"grunt-chmod": "1.1.1",
|
||||
"grunt-cli": "^1.3.1",
|
||||
"grunt-contrib-clean": "0.6.0",
|
||||
"grunt-contrib-clean": "^2.0.0",
|
||||
"grunt-contrib-compress": "^1.4.3",
|
||||
"grunt-contrib-copy": "0.8.2",
|
||||
"grunt-contrib-copy": "^1.0.0",
|
||||
"grunt-contrib-less": "^2.0.0",
|
||||
"grunt-contrib-watch-chokidar": "1.0.0",
|
||||
"grunt-curl": "2.4.1",
|
||||
"grunt-download-electron": "2.1.4",
|
||||
"grunt-contrib-watch": "^1.1.0",
|
||||
"grunt-electron": "^9.0.1",
|
||||
"grunt-electron-installer": "^2.1.0",
|
||||
"grunt-electron-packager": "0.2.1",
|
||||
"grunt-if-missing": "1.0.1",
|
||||
"grunt-newer": "1.3.0",
|
||||
"grunt-plistbuddy": "0.1.1",
|
||||
"grunt-prompt": "1.3.3",
|
||||
"grunt-rcedit": "0.3.4",
|
||||
"grunt-rename": "0.1.4",
|
||||
"grunt-shell": "1.3.1",
|
||||
"grunt-shell-spawn": "0.3.10",
|
||||
"grunt-plistbuddy": "^0.2.0",
|
||||
"grunt-rcedit": "^0.7.0",
|
||||
"grunt-shell": "^2.1.0",
|
||||
"jest-cli": "^23.6.0",
|
||||
"jsxhint": "0.15.1",
|
||||
"load-grunt-tasks": "3.5.2",
|
||||
"load-grunt-tasks": "^4.0.0",
|
||||
"minimatch": ">=3.0.4",
|
||||
"minimist": "1.2.0",
|
||||
"run-sequence": "1.2.2",
|
||||
"run-sequence": "^2.2.1",
|
||||
"shell-escape": "0.2.0",
|
||||
"source-map-support": "0.3.3",
|
||||
"tslint": "5.9.1",
|
||||
"tslint": "^5.11.0",
|
||||
"typescript": "2.7.2"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
require.main.paths.splice(0, 0, process.env.NODE_PATH);
|
||||
|
||||
import 'babel-polyfill';
|
||||
import electron from 'electron';
|
||||
const remote = electron.remote;
|
||||
const Menu = remote.Menu;
|
||||
|
|
|
@ -1 +1 @@
|
|||
require.requireActual('babel/polyfill');
|
||||
require.requireActual('babel-polyfill');
|
||||
|
|
Загрузка…
Ссылка в новой задаче