Skip to content

Commit 584ffcc

Browse files
ibdafnaibdafna
authored
Merge pull request jupyter-widgets#3464 from jasongrout/publicpath
Update public path to auto, and update example configs
2 parents dc64e61 + 34d75c4 commit 584ffcc

File tree

21 files changed

+155
-288
lines changed

21 files changed

+155
-288
lines changed

‎examples/web1/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
"devDependencies": {
2424
"chai": "^4.0.0",
2525
"css-loader": "^6.5.1",
26-
"file-loader": "^6.2.0",
2726
"karma": "^6.3.3",
2827
"karma-chai": "^0.1.0",
2928
"karma-chrome-launcher": "^3.1.0",

‎examples/web1/webpack.config.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,14 @@ var webpack = require('webpack');
33

44
module.exports = {
55
mode: 'development',
6+
devtool: 'source-map',
67
entry: './index.js',
78
output: {
89
filename: 'index.built.js',
910
path: path.resolve(__dirname, 'built'),
10-
publicPath: 'built/',
1111
},
1212
module: {
13-
rules: [
14-
{ test: /\.css$/, use: ['style-loader', 'css-loader'] },
15-
// jquery-ui loads some images
16-
{ test: /\.(jpg|png|gif)$/, use: 'file-loader' },
17-
],
13+
rules: [{ test: /\.css$/i, use: ['style-loader', 'css-loader'] }],
1814
},
1915
plugins: [
2016
new webpack.DefinePlugin({

‎examples/web2/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require('@jupyter-widgets/controls/css/widgets.css');
77
require('font-awesome/css/font-awesome.css');
88

99
document.addEventListener('DOMContentLoaded', function (event) {
10-
var code = require('./widget_code.py').default;
10+
var code = require('./widget_code.py');
1111
var inputarea = document.getElementsByClassName('inputarea')[0];
1212
new CodeMirror(inputarea, {
1313
value: code,

‎examples/web2/package.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
2121
},
2222
"devDependencies": {
2323
"css-loader": "^6.5.1",
24-
"file-loader": "^6.2.0",
25-
"raw-loader": "^4.0.2",
2624
"style-loader": "^3.3.1",
27-
"url-loader": "^4.1.1",
2825
"webpack": "^5.65.0"
2926
}
3027
}

‎examples/web2/webpack.config.js‎

Lines changed: 5 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,60 +3,19 @@ var webpack = require('webpack');
33

44
module.exports = {
55
mode: 'development',
6+
devtool: 'source-map',
67
entry: './index.js',
78
output: {
89
filename: 'index.built.js',
910
path: path.resolve(__dirname, 'built'),
10-
publicPath: 'built/',
1111
},
1212
module: {
1313
rules: [
14-
{ test: /\.css$/, use: ['style-loader', 'css-loader'] },
15-
{ test: /\.py$/, use: 'raw-loader' },
16-
// jquery-ui loads some images
17-
{ test: /\.(jpg|png|gif)$/, use: 'file-loader' },
14+
{ test: /\.css$/i, use: ['style-loader', 'css-loader'] },
15+
{ test: /\.py$/i, type: 'asset/source' },
1816
// required to load font-awesome
19-
{
20-
test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/,
21-
use: {
22-
loader: 'url-loader',
23-
options: {
24-
limit: 10000,
25-
mimetype: 'application/font-woff',
26-
},
27-
},
28-
},
29-
{
30-
test: /\.woff(\?v=\d+\.\d+\.\d+)?$/,
31-
use: {
32-
loader: 'url-loader',
33-
options: {
34-
limit: 10000,
35-
mimetype: 'application/font-woff',
36-
},
37-
},
38-
},
39-
{
40-
test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/,
41-
use: {
42-
loader: 'url-loader',
43-
options: {
44-
limit: 10000,
45-
mimetype: 'application/octet-stream',
46-
},
47-
},
48-
},
49-
{ test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, use: 'file-loader' },
50-
{
51-
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
52-
use: {
53-
loader: 'url-loader',
54-
options: {
55-
limit: 10000,
56-
mimetype: 'image/svg+xml',
57-
},
58-
},
59-
},
17+
{ test: /\.(woff|woff2|eot|ttf|otf)$/i, type: 'asset/resource' },
18+
{ test: /\.svg$/i, type: 'asset' },
6019
],
6120
},
6221
plugins: [

‎examples/web3/package.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,10 @@
2626
"@types/codemirror": "^5.60.0",
2727
"@types/node": "^17.0.2",
2828
"css-loader": "^6.5.1",
29-
"file-loader": "^6.2.0",
3029
"fs-extra": "^10.0.0",
31-
"postcss": "^8.3.2",
32-
"postcss-cssnext": "^3.1.0",
33-
"postcss-import": "^14.0.2",
34-
"postcss-loader": "^6.1.0",
3530
"rimraf": "^3.0.2",
3631
"style-loader": "^3.3.1",
3732
"typescript": "~4.3.2",
38-
"url-loader": "^4.1.1",
3933
"webpack": "^5.65.0"
4034
}
4135
}

‎examples/web3/webpack.config.js‎

Lines changed: 4 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -4,90 +4,18 @@ const webpack = require('webpack');
44

55
module.exports = {
66
mode: 'development',
7+
devtool: 'source-map',
78
entry: './lib/index.js',
89
output: {
910
filename: 'index.built.js',
1011
path: path.resolve(__dirname, 'built'),
11-
publicPath: 'built/',
1212
},
1313
module: {
1414
rules: [
15-
{
16-
test: /\.css$/,
17-
use: [
18-
'style-loader',
19-
'css-loader',
20-
{
21-
loader: 'postcss-loader',
22-
options: {
23-
postcssOptions: {
24-
plugins: [
25-
postcss.plugin('delete-tilde', function () {
26-
return function (css) {
27-
css.walkAtRules('import', function (rule) {
28-
rule.params = rule.params.replace('~', '');
29-
});
30-
};
31-
}),
32-
postcss.plugin('prepend', function () {
33-
return function (css) {
34-
css.prepend(
35-
"@import '@jupyter-widgets/controls/css/labvariables.css';"
36-
);
37-
};
38-
}),
39-
require('postcss-import')(),
40-
require('postcss-cssnext')(),
41-
],
42-
},
43-
},
44-
},
45-
],
46-
},
47-
// jquery-ui loads some images
48-
{ test: /\.(jpg|png|gif)$/, use: 'file-loader' },
15+
{ test: /\.css$/i, use: ['style-loader', 'css-loader'] },
4916
// required to load font-awesome
50-
{
51-
test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/,
52-
use: {
53-
loader: 'url-loader',
54-
options: {
55-
limit: 10000,
56-
mimetype: 'application/font-woff',
57-
},
58-
},
59-
},
60-
{
61-
test: /\.woff(\?v=\d+\.\d+\.\d+)?$/,
62-
use: {
63-
loader: 'url-loader',
64-
options: {
65-
limit: 10000,
66-
mimetype: 'application/font-woff',
67-
},
68-
},
69-
},
70-
{
71-
test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/,
72-
use: {
73-
loader: 'url-loader',
74-
options: {
75-
limit: 10000,
76-
mimetype: 'application/octet-stream',
77-
},
78-
},
79-
},
80-
{ test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, use: 'file-loader' },
81-
{
82-
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
83-
use: {
84-
loader: 'url-loader',
85-
options: {
86-
limit: 10000,
87-
mimetype: 'image/svg+xml',
88-
},
89-
},
90-
},
17+
{ test: /\.(woff|woff2|eot|ttf|otf)$/i, type: 'asset/resource' },
18+
{ test: /\.svg$/i, type: 'asset' },
9119
],
9220
},
9321
plugins: [

‎examples/web4/README.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@ semver range. For example:
2020

2121
`<script src="https://cdn.jsdelivr.net/npm/@jupyter-widgets/html-manager@^0.8.0/dist/embed.js" crossorigin="anonymous"></script>`
2222

23+
The widget data in this example was generated from the following code:
24+
25+
```python
26+
from ipywidgets import VBox, jsdlink, IntSlider, Button
27+
28+
s1, s2 = IntSlider(max=200, value=100), IntSlider(value=40)
29+
b = Button(icon='legal')
30+
jsdlink((s1, 'value'), (s2, 'max'))
31+
VBox([s1, s2, b])
32+
```
33+
2334
## Try it
2435

2536
1. Start with a repository checkout, and run `yarn install` in the root directory.

0 commit comments

Comments
 (0)