Skip to content

Commit 121baba

Browse files
authored
Merge pull request #21 from vidartf/updates
Update web dependencies
2 parents 725366c + 720fb35 commit 121baba

File tree

2 files changed

+25
-22
lines changed

2 files changed

+25
-22
lines changed

{{cookiecutter.github_project_name}}/package.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,32 +41,33 @@
4141
"watch:nbextension": "webpack --watch"
4242
},
4343
"dependencies": {
44-
"@jupyter-widgets/base": "^1.0.1"
44+
"@jupyter-widgets/base": "^1.1.10"
4545
},
4646
"devDependencies": {
4747
"@phosphor/application": "^1.5.0",
4848
"@phosphor/widgets": "^1.5.0",
4949
"@types/expect.js": "^0.3.29",
50-
"@types/mocha": "^2.2.41",
51-
"@types/node": "^8.0.17",
50+
"@types/mocha": "^5.2.0",
51+
"@types/node": "^10.0.9",
52+
"@types/three": "^0.91.13",
5253
"expect.js": "^0.3.1",
53-
"fs-extra": "^4.0.2",
54-
"json-loader": "^0.5.7",
55-
"karma": "^1.7.0",
54+
"fs-extra": "^6.0.1",
55+
"karma": "^2.0.2",
5656
"karma-chrome-launcher": "^2.2.0",
5757
"karma-firefox-launcher": "^1.0.1",
5858
"karma-ie-launcher": "^1.0.0",
5959
"karma-mocha": "^1.3.0",
6060
"karma-mocha-reporter": "^2.2.3",
6161
"karma-typescript": "^3.0.5",
6262
"mkdirp": "^0.5.1",
63-
"mocha": "^3.5.0",
64-
"npm-run-all": "^4.1.1",
63+
"mocha": "^5.1.1",
64+
"npm-run-all": "^4.1.3",
6565
"rimraf": "^2.6.2",
66-
"source-map-loader": "^0.2.1",
67-
"ts-loader": "^2.3.2",
68-
"typescript": "~2.4.2",
69-
"webpack": "^3.4.1"
66+
"source-map-loader": "^0.2.3",
67+
"ts-loader": "^4.3.0",
68+
"typescript": "~2.8.3",
69+
"webpack": "^4.8.3",
70+
"webpack-cli": "^2.1.3"
7071
},
7172
"jupyterlab": {
7273
"extension": "lib/plugin"
Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
var loaders = [
1+
// Custom webpack rules
2+
const rules = [
23
{ test: /\.ts$/, loader: 'ts-loader' },
3-
{ test: /\.json$/, loader: 'json-loader' },
4-
{ test: /\.js$/, loader: "source-map-loader" },
4+
{ test: /\.js$/, loader: 'source-map-loader' },
55
];
66

7+
// Packages that shouldn't be bundled but loaded at runtime
8+
const externals = ['@jupyter-widgets/base', 'three', 'jupyter-threejs'];
9+
710
module.exports = [
811
{
912
// Notebook extension
@@ -14,7 +17,7 @@ module.exports = [
1417
libraryTarget: 'amd'
1518
},
1619
module: {
17-
loaders: loaders
20+
rules: rules
1821
},
1922
devtool: 'source-map',
2023
externals: ['@jupyter-widgets/base'],
@@ -28,20 +31,19 @@ module.exports = [
2831
// embeddable bundle (e.g. for docs)
2932
entry: './src/index.ts',
3033
output: {
31-
filename: 'embed-bundle.js',
32-
path: __dirname + '/docs/source/_static',
33-
library: "{{ cookiecutter.npm_package_name }}",
34-
libraryTarget: 'amd'
34+
filename: 'embed-bundle.js',
35+
path: __dirname + '/docs/source/_static',
36+
library: "{{ cookiecutter.npm_package_name }}",
37+
libraryTarget: 'amd'
3538
},
3639
module: {
37-
loaders: loaders
40+
rules: rules
3841
},
3942
devtool: 'source-map',
4043
externals: ['@jupyter-widgets/base'],
4144
resolve: {
4245
// Add '.ts' and '.tsx' as resolvable extensions.
4346
extensions: [".webpack.js", ".web.js", ".ts", ".js"]
4447
},
45-
4648
},
4749
];

0 commit comments

Comments
 (0)