Skip to content

Commit

Permalink
Merge pull request #6398 from jasongrout/upgrade
Browse files Browse the repository at this point in the history
Update a number of dependencies to the current version.
  • Loading branch information
ian-r-rose committed May 24, 2019
2 parents 4d1eeba + 1a0ed72 commit 5dae616
Show file tree
Hide file tree
Showing 117 changed files with 1,227 additions and 2,262 deletions.
32 changes: 16 additions & 16 deletions buildutils/package.json
Expand Up @@ -6,6 +6,10 @@
"bugs": {
"url": "https://github.com/jupyterlab/jupyterlab/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/jupyterlab.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",
"files": [
Expand All @@ -27,10 +31,6 @@
"directories": {
"lib": "lib/"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/jupyterlab.git"
},
"scripts": {
"build": "tsc",
"clean": "rimraf lib",
Expand All @@ -41,25 +41,25 @@
"@phosphor/coreutils": "^1.3.0",
"@yarnpkg/lockfile": "^1.1.0",
"child_process": "~1.0.2",
"commander": "~2.18.0",
"fs-extra": "~4.0.2",
"commander": "~2.20.0",
"fs-extra": "^8.0.1",
"glob": "~7.1.2",
"inquirer": "~3.3.0",
"inquirer": "^6.3.1",
"mini-css-extract-plugin": "~0.6.0",
"package-json": "~5.0.0",
"package-json": "^6.3.0",
"path": "~0.12.7",
"semver": "^5.5.0",
"sort-package-json": "~1.7.1",
"semver": "^6.1.0",
"sort-package-json": "~1.22.1",
"typescript": "~3.4.3",
"webpack": "~4.29.6"
"webpack": "^4.32.2"
},
"devDependencies": {
"@types/fs-extra": "~4.0.3",
"@types/glob": "~5.0.33",
"@types/inquirer": "0.0.36",
"@types/fs-extra": "^7.0.0",
"@types/glob": "^7.1.1",
"@types/inquirer": "^6.0.3",
"@types/mini-css-extract-plugin": "^0.2.0",
"@types/node": "~8.0.47",
"@types/webpack": "^4.4.27",
"@types/node": "^12.0.2",
"@types/webpack": "^4.4.32",
"rimraf": "~2.6.2"
}
}
2 changes: 1 addition & 1 deletion buildutils/src/create-package.ts
Expand Up @@ -8,7 +8,7 @@ import * as inquirer from 'inquirer';
import * as path from 'path';
import * as utils from './utils';

let questions = [
let questions: inquirer.Question[] = [
{
type: 'input',
name: 'name',
Expand Down
2 changes: 1 addition & 1 deletion buildutils/src/create-theme.ts
Expand Up @@ -8,7 +8,7 @@ import * as inquirer from 'inquirer';
import * as path from 'path';
import * as utils from './utils';

let questions = [
let questions: inquirer.Question[] = [
{
type: 'input',
name: 'name',
Expand Down
8 changes: 4 additions & 4 deletions buildutils/template/package.json
Expand Up @@ -6,6 +6,10 @@
"bugs": {
"url": "https://github.com/jupyterlab/jupyterlab/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/jupyterlab.git"
},
"license": "BSD-3-Clause",
"author": "Project Jupyter",
"files": [
Expand All @@ -18,10 +22,6 @@
"directories": {
"lib": "lib/"
},
"repository": {
"type": "git",
"url": "https://github.com/jupyterlab/jupyterlab.git"
},
"scripts": {
"build": "tsc",
"clean": "rimraf lib",
Expand Down
2 changes: 1 addition & 1 deletion buildutils/test-template/package.json
Expand Up @@ -15,7 +15,7 @@
"watch:src": "tsc -w --listEmittedFiles"
},
"devDependencies": {
"karma": "~2.0.4",
"karma": "^4.1.0",
"rimraf": "~2.6.2",
"typescript": "~3.4.3"
}
Expand Down
16 changes: 8 additions & 8 deletions dev_mode/package.json
Expand Up @@ -75,10 +75,10 @@
"@phosphor/signaling": "^1.2.2",
"@phosphor/widgets": "^1.6.0",
"ajv": "^6.5.5",
"codemirror": "~5.46.0",
"es6-promise": "~4.1.1",
"codemirror": "~5.47.0",
"es6-promise": "~4.2.6",
"json5": "^2.1.0",
"moment": "~2.21.0",
"moment": "^2.24.0",
"path-posix": "~1.0.0",
"react": "~16.8.4",
"react-dom": "~16.8.4",
Expand All @@ -89,23 +89,23 @@
"css-loader": "~2.1.1",
"duplicate-package-checker-webpack-plugin": "^3.0.0",
"file-loader": "~3.0.1",
"fs-extra": "~4.0.2",
"fs-extra": "^8.0.1",
"glob": "~7.1.2",
"handlebars": "~4.0.11",
"handlebars": "^4.1.2",
"html-loader": "~0.5.5",
"html-webpack-plugin": "~3.2.0",
"mini-css-extract-plugin": "~0.6.0",
"raw-loader": "~2.0.0",
"rimraf": "~2.6.2",
"sort-package-json": "~1.7.1",
"sort-package-json": "~1.22.1",
"source-map-loader": "~0.2.1",
"style-loader": "~0.23.1",
"svg-url-loader": "~2.3.2",
"svgo": "~1.2.1",
"svgo-loader": "~2.2.0",
"terser-webpack-plugin": "~1.2.3",
"terser-webpack-plugin": "^1.3.0",
"url-loader": "~1.1.2",
"webpack": "~4.29.6",
"webpack": "^4.32.2",
"webpack-cli": "^3.3.0",
"webpack-merge": "^4.2.1",
"webpack-visualizer-plugin": "^0.1.11",
Expand Down
10 changes: 5 additions & 5 deletions examples/app/package.json
Expand Up @@ -37,25 +37,25 @@
"@jupyterlab/theme-dark-extension": "^1.0.0-alpha.7",
"@jupyterlab/theme-light-extension": "^1.0.0-alpha.7",
"@jupyterlab/tooltip-extension": "^1.0.0-alpha.6",
"es6-promise": "~4.1.1"
"es6-promise": "~4.2.6"
},
"devDependencies": {
"css-loader": "~2.1.1",
"file-loader": "~3.0.1",
"fs-extra": "~4.0.2",
"fs-extra": "^8.0.1",
"glob": "~7.1.2",
"mini-css-extract-plugin": "~0.6.0",
"raw-loader": "~2.0.0",
"read-package-tree": "~5.1.6",
"read-package-tree": "^5.2.2",
"rimraf": "~2.6.2",
"style-loader": "~0.23.1",
"svg-url-loader": "~2.3.2",
"svgo": "~1.2.1",
"svgo-loader": "~2.2.0",
"url-loader": "~1.1.2",
"watch": "~1.0.2",
"webpack": "~4.29.6",
"webpack": "^4.32.2",
"webpack-cli": "^3.3.0",
"whatwg-fetch": "~2.0.3"
"whatwg-fetch": "^3.0.0"
}
}
6 changes: 3 additions & 3 deletions examples/cell/package.json
Expand Up @@ -17,7 +17,7 @@
"@jupyterlab/theme-light-extension": "^1.0.0-alpha.7",
"@phosphor/commands": "^1.6.1",
"@phosphor/widgets": "^1.6.0",
"es6-promise": "~4.1.1"
"es6-promise": "~4.2.6"
},
"devDependencies": {
"css-loader": "~2.1.1",
Expand All @@ -32,8 +32,8 @@
"typescript": "~3.4.3",
"url-loader": "~1.1.2",
"watch": "~1.0.2",
"webpack": "~4.29.6",
"webpack": "^4.32.2",
"webpack-cli": "^3.3.0",
"whatwg-fetch": "~2.0.3"
"whatwg-fetch": "^3.0.0"
}
}
8 changes: 4 additions & 4 deletions examples/console/package.json
Expand Up @@ -15,10 +15,10 @@
"@jupyterlab/theme-light-extension": "^1.0.0-alpha.7",
"@phosphor/commands": "^1.6.1",
"@phosphor/widgets": "^1.6.0",
"es6-promise": "~4.1.1"
"es6-promise": "~4.2.6"
},
"devDependencies": {
"@types/codemirror": "~0.0.74",
"@types/codemirror": "^0.0.74",
"css-loader": "~2.1.1",
"file-loader": "~3.0.1",
"mini-css-extract-plugin": "~0.6.0",
Expand All @@ -31,8 +31,8 @@
"typescript": "~3.4.3",
"url-loader": "~1.1.2",
"watch": "~1.0.2",
"webpack": "~4.29.6",
"webpack": "^4.32.2",
"webpack-cli": "^3.3.0",
"whatwg-fetch": "~2.0.3"
"whatwg-fetch": "^3.0.0"
}
}
8 changes: 4 additions & 4 deletions examples/filebrowser/package.json
Expand Up @@ -19,10 +19,10 @@
"@phosphor/algorithm": "^1.1.2",
"@phosphor/commands": "^1.6.1",
"@phosphor/widgets": "^1.6.0",
"es6-promise": "~4.1.1"
"es6-promise": "~4.2.6"
},
"devDependencies": {
"@types/codemirror": "~0.0.74",
"@types/codemirror": "^0.0.74",
"css-loader": "~2.1.1",
"file-loader": "~3.0.1",
"mini-css-extract-plugin": "~0.6.0",
Expand All @@ -35,8 +35,8 @@
"typescript": "~3.4.3",
"url-loader": "~1.1.2",
"watch": "~1.0.2",
"webpack": "~4.29.6",
"webpack": "^4.32.2",
"webpack-cli": "^3.3.0",
"whatwg-fetch": "~2.0.3"
"whatwg-fetch": "^3.0.0"
}
}
8 changes: 4 additions & 4 deletions examples/notebook/package.json
Expand Up @@ -20,10 +20,10 @@
"@jupyterlab/theme-light-extension": "^1.0.0-alpha.7",
"@phosphor/commands": "^1.6.1",
"@phosphor/widgets": "^1.6.0",
"es6-promise": "~4.1.1"
"es6-promise": "~4.2.6"
},
"devDependencies": {
"@types/codemirror": "~0.0.74",
"@types/codemirror": "^0.0.74",
"css-loader": "~2.1.1",
"file-loader": "~3.0.1",
"mini-css-extract-plugin": "~0.6.0",
Expand All @@ -36,8 +36,8 @@
"typescript": "~3.4.3",
"url-loader": "~1.1.2",
"watch": "~1.0.2",
"webpack": "~4.29.6",
"webpack": "^4.32.2",
"webpack-cli": "^3.3.0",
"whatwg-fetch": "~2.0.3"
"whatwg-fetch": "^3.0.0"
}
}
6 changes: 3 additions & 3 deletions examples/terminal/package.json
Expand Up @@ -12,7 +12,7 @@
"@jupyterlab/terminal": "^1.0.0-alpha.6",
"@jupyterlab/theme-light-extension": "^1.0.0-alpha.7",
"@phosphor/widgets": "^1.6.0",
"es6-promise": "~4.1.1"
"es6-promise": "~4.2.6"
},
"devDependencies": {
"css-loader": "~2.1.1",
Expand All @@ -27,8 +27,8 @@
"typescript": "~3.4.3",
"url-loader": "~1.1.2",
"watch": "~1.0.2",
"webpack": "~4.29.6",
"webpack": "^4.32.2",
"webpack-cli": "^3.3.0",
"whatwg-fetch": "~2.0.3"
"whatwg-fetch": "^3.0.0"
}
}
53 changes: 26 additions & 27 deletions package.json
@@ -1,7 +1,21 @@
{
"private": true,
"workspaces": [
"dev_mode",
"examples/*",
"packages/*",
"packages/services/examples/node",
"packages/services/examples/browser",
"packages/services/examples/typescript-browser-with-output",
"buildutils",
"buildutils/template",
"buildutils/test-template",
"tests",
"tests/test-*",
"testutils",
"jupyterlab/tests/mock_packages/extension"
],
"scripts": {
"pre-publish": "jlpm && cd buildutils && npm run build && cd .. && node buildutils/lib/prepublish.js",
"add:sibling": "node buildutils/lib/add-sibling.js",
"analyze": "jlpm run analyze:dev",
"analyze:dev": "cd dev_mode && jlpm run build --analyze && opn static/stats.html",
Expand Down Expand Up @@ -39,6 +53,9 @@
"lint": "jlpm && jlpm run prettier && jlpm run eslint && jlpm run tslint",
"lint:check": "jlpm run prettier:check && jlpm run eslint:check && jlpm run tslint:check",
"patch:release": "node buildutils/lib/patch-release.js",
"pre-publish": "jlpm && cd buildutils && npm run build && cd .. && node buildutils/lib/prepublish.js",
"prettier": "prettier --write '**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}'",
"prettier:check": "prettier --list-different '**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}'",
"publish:all": "jlpm run pre-publish && lerna publish --force-publish=* -m \"Publish\"",
"publish:next": "jlpm run pre-publish && lerna publish --npm-tag=next -m \"Publish with 'next' tag\"",
"publish:next:all": "jlpm run pre-publish && lerna publish --npm-tag=next --force-publish=* -m \"Publish with 'next' tag\"",
Expand All @@ -54,8 +71,6 @@
"test:ie": "lerna run test:ie --scope \"@jupyterlab/test-*\" --concurrency 1 --stream",
"tslint": "tslint --fix -c tslint.json --project tsconfigbase.json '**/*{.ts,.tsx}'",
"tslint:check": "tslint -c tslint.json --project tsconfigbase.json '**/*{.ts,.tsx}'",
"prettier": "prettier --write '**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}'",
"prettier:check": "prettier --list-different '**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}'",
"update:dependency": "node buildutils/lib/update-dependency.js --lerna",
"update:dist-tag": "node buildutils/lib/update-dist-tag.js --lerna",
"update:local": "node buildutils/lib/update-local.js",
Expand All @@ -67,42 +82,26 @@
"watch:main": "jlpm run watch",
"watch:packages": "python scripts/watch_packages.py"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged",
"pre-push": "jlpm run integrity"
}
},
"dependencies": {},
"devDependencies": {
"@types/mocha": "^5.2.6",
"eslint": "^5.16.0",
"eslint-config-prettier": "^4.1.0",
"eslint-plugin-prettier": "^3.0.1",
"husky": "^1.3.1",
"husky": "^2.3.0",
"lerna": "^3.13.2",
"lint-staged": "^8.1.5",
"opn-cli": "^4.1.0",
"prettier": "^1.17.0",
"tslint": "^5.15.0",
"tslint-config-prettier": "^1.18.0",
"tslint-plugin-prettier": "^2.0.1",
"tslint-react": "^4.0.0",
"yarn": "1.15.2"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged",
"pre-push": "jlpm run integrity"
}
},
"workspaces": [
"dev_mode",
"examples/*",
"packages/*",
"packages/services/examples/node",
"packages/services/examples/browser",
"packages/services/examples/typescript-browser-with-output",
"buildutils",
"buildutils/template",
"buildutils/test-template",
"tests",
"tests/test-*",
"testutils",
"jupyterlab/tests/mock_packages/extension"
]
}
}

0 comments on commit 5dae616

Please sign in to comment.