Skip to content

Commit 2ccdbd9

Browse files
thomasetterthomasetter
authored
Upgrade the webpack-based examples' npm dependencies (move to webpack 5) (#2651)
* Upgraded the webpack examples' npm dependencies which (among other things) upgrades them to webpack 5 For the weather_report, had to choose the syncWebAssembly experiment, whereas the rest works fine with asyncWebAssembly * Fix the weather report example compilation by adding it to the main workspace. This currently fails with: error: current package believes it's in a workspace when it's not: current: <project-root>/examples/weather_report/Cargo.toml workspace: <project-root>/Cargo.toml * Fix the build of the webxr example with webpack 5 * run cargo fmt
1 parent 4770fab commit 2ccdbd9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+241
-171
lines changed

‎Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ members = [
8282
"examples/wasm-in-wasm-imports",
8383
"examples/wasm-in-web-worker",
8484
"examples/wasm2js",
85+
"examples/weather_report",
8586
"examples/webaudio",
8687
"examples/webgl",
8788
"examples/webrtc_datachannel",

‎_package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"scripts": {
3-
"build": "webpack -p",
4-
"serve": "webpack-dev-server -p"
3+
"build": "webpack",
4+
"serve": "webpack serve"
55
},
66
"devDependencies": {
7-
"@wasm-tool/wasm-pack-plugin": "1.0.1",
8-
"html-webpack-plugin": "^3.2.0",
7+
"@wasm-tool/wasm-pack-plugin": "1.5.0",
8+
"html-webpack-plugin": "^5.3.2",
99
"text-encoding": "^0.7.0",
10-
"webpack": "^4.29.4",
11-
"webpack-cli": "^3.1.1",
12-
"webpack-dev-server": "^3.1.0"
10+
"webpack": "^5.49.0",
11+
"webpack-cli": "^4.7.2",
12+
"webpack-dev-server": "^3.11.2"
1313
}
1414
}

‎examples/add/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"scripts": {
3-
"build": "webpack -p",
4-
"serve": "webpack-dev-server -p"
3+
"build": "webpack",
4+
"serve" : "webpack serve"
55
},
66
"devDependencies": {
7-
"@wasm-tool/wasm-pack-plugin": "1.0.1",
8-
"html-webpack-plugin": "^3.2.0",
7+
"@wasm-tool/wasm-pack-plugin": "1.5.0",
8+
"html-webpack-plugin": "^5.3.2",
99
"text-encoding": "^0.7.0",
10-
"webpack": "^4.29.4",
11-
"webpack-cli": "^3.1.1",
12-
"webpack-dev-server": "^3.1.0"
10+
"webpack": "^5.49.0",
11+
"webpack-cli": "^4.7.2",
12+
"webpack-dev-server": "^3.11.2"
1313
}
1414
}

‎examples/add/webpack.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@ module.exports = {
2121
TextEncoder: ['text-encoding', 'TextEncoder']
2222
})
2323
],
24-
mode: 'development'
24+
mode: 'development',
25+
experiments: {
26+
asyncWebAssembly: true
27+
}
2528
};

‎examples/canvas/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"scripts": {
33
"build": "webpack",
4-
"serve": "webpack-dev-server"
4+
"serve" : "webpack serve"
55
},
66
"devDependencies": {
7-
"@wasm-tool/wasm-pack-plugin": "1.0.1",
7+
"@wasm-tool/wasm-pack-plugin": "1.5.0",
88
"text-encoding": "^0.7.0",
9-
"html-webpack-plugin": "^3.2.0",
10-
"webpack": "^4.29.4",
11-
"webpack-cli": "^3.1.1",
12-
"webpack-dev-server": "^3.1.0"
9+
"html-webpack-plugin": "^5.3.2",
10+
"webpack": "^5.49.0",
11+
"webpack-cli": "^4.7.2",
12+
"webpack-dev-server": "^3.11.2"
1313
}
1414
}

‎examples/canvas/webpack.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@ module.exports = {
2323
TextEncoder: ['text-encoding', 'TextEncoder']
2424
})
2525
],
26-
mode: 'development'
26+
mode: 'development',
27+
experiments: {
28+
asyncWebAssembly: true
29+
}
2730
};

‎examples/char/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"scripts": {
33
"build": "webpack",
4-
"serve": "webpack-dev-server"
4+
"serve" : "webpack serve"
55
},
66
"devDependencies": {
7-
"@wasm-tool/wasm-pack-plugin": "1.0.1",
7+
"@wasm-tool/wasm-pack-plugin": "1.5.0",
88
"text-encoding": "^0.7.0",
9-
"html-webpack-plugin": "^3.2.0",
10-
"webpack": "^4.29.4",
11-
"webpack-cli": "^3.1.1",
12-
"webpack-dev-server": "^3.1.0"
9+
"html-webpack-plugin": "^5.3.2",
10+
"webpack": "^5.49.0",
11+
"webpack-cli": "^4.7.2",
12+
"webpack-dev-server": "^3.11.2"
1313
}
1414
}

‎examples/char/webpack.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@ module.exports = {
2323
TextEncoder: ['text-encoding', 'TextEncoder']
2424
})
2525
],
26-
mode: 'development'
26+
mode: 'development',
27+
experiments: {
28+
asyncWebAssembly: true
29+
}
2730
};

‎examples/closures/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"scripts": {
33
"build": "webpack",
4-
"serve": "webpack-dev-server"
4+
"serve" : "webpack serve"
55
},
66
"devDependencies": {
7-
"@wasm-tool/wasm-pack-plugin": "1.0.1",
7+
"@wasm-tool/wasm-pack-plugin": "1.5.0",
88
"text-encoding": "^0.7.0",
9-
"html-webpack-plugin": "^3.2.0",
10-
"webpack": "^4.29.4",
11-
"webpack-cli": "^3.1.1",
12-
"webpack-dev-server": "^3.1.0"
9+
"html-webpack-plugin": "^5.3.2",
10+
"webpack": "^5.49.0",
11+
"webpack-cli": "^4.7.2",
12+
"webpack-dev-server": "^3.11.2"
1313
}
1414
}

‎examples/closures/webpack.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@ module.exports = {
2323
TextEncoder: ['text-encoding', 'TextEncoder']
2424
})
2525
],
26-
mode: 'development'
26+
mode: 'development',
27+
experiments: {
28+
asyncWebAssembly: true
29+
}
2730
};

‎examples/console_log/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"scripts": {
33
"build": "webpack",
4-
"serve": "webpack-dev-server"
4+
"serve" : "webpack serve"
55
},
66
"devDependencies": {
7-
"@wasm-tool/wasm-pack-plugin": "1.0.1",
7+
"@wasm-tool/wasm-pack-plugin": "1.5.0",
88
"text-encoding": "^0.7.0",
9-
"html-webpack-plugin": "^3.2.0",
10-
"webpack": "^4.29.4",
11-
"webpack-cli": "^3.1.1",
12-
"webpack-dev-server": "^3.1.0"
9+
"html-webpack-plugin": "^5.3.2",
10+
"webpack": "^5.49.0",
11+
"webpack-cli": "^4.7.2",
12+
"webpack-dev-server": "^3.11.2"
1313
}
1414
}

‎examples/console_log/webpack.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@ module.exports = {
2121
TextEncoder: ['text-encoding', 'TextEncoder']
2222
})
2323
],
24-
mode: 'development'
24+
mode: 'development',
25+
experiments: {
26+
asyncWebAssembly: true
27+
}
2528
};

‎examples/dom/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"scripts": {
33
"build": "webpack",
4-
"serve": "webpack-dev-server"
4+
"serve" : "webpack serve"
55
},
66
"devDependencies": {
7-
"@wasm-tool/wasm-pack-plugin": "1.0.1",
7+
"@wasm-tool/wasm-pack-plugin": "1.5.0",
88
"text-encoding": "^0.7.0",
9-
"html-webpack-plugin": "^3.2.0",
10-
"webpack": "^4.29.4",
11-
"webpack-cli": "^3.1.1",
12-
"webpack-dev-server": "^3.1.0"
9+
"html-webpack-plugin": "^5.3.2",
10+
"webpack": "^5.49.0",
11+
"webpack-cli": "^4.7.2",
12+
"webpack-dev-server": "^3.11.2"
1313
}
1414
}

‎examples/dom/webpack.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@ module.exports = {
2323
TextEncoder: ['text-encoding', 'TextEncoder']
2424
})
2525
],
26-
mode: 'development'
26+
mode: 'development',
27+
experiments: {
28+
asyncWebAssembly: true
29+
}
2730
};

‎examples/duck-typed-interfaces/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"scripts": {
33
"build": "webpack",
4-
"serve": "webpack-dev-server"
4+
"serve" : "webpack serve"
55
},
66
"devDependencies": {
7-
"@wasm-tool/wasm-pack-plugin": "1.0.1",
7+
"@wasm-tool/wasm-pack-plugin": "1.5.0",
88
"text-encoding": "^0.7.0",
9-
"html-webpack-plugin": "^3.2.0",
10-
"webpack": "^4.29.4",
11-
"webpack-cli": "^3.1.1",
12-
"webpack-dev-server": "^3.1.0"
9+
"html-webpack-plugin": "^5.3.2",
10+
"webpack": "^5.49.0",
11+
"webpack-cli": "^4.7.2",
12+
"webpack-dev-server": "^3.11.2"
1313
}
1414
}

‎examples/duck-typed-interfaces/webpack.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@ module.exports = {
2323
TextEncoder: ['text-encoding', 'TextEncoder']
2424
})
2525
],
26-
mode: 'development'
26+
mode: 'development',
27+
experiments: {
28+
asyncWebAssembly: true
29+
}
2730
};

‎examples/fetch/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"scripts": {
33
"build": "webpack",
4-
"serve": "webpack-dev-server"
4+
"serve" : "webpack serve"
55
},
66
"devDependencies": {
7-
"@wasm-tool/wasm-pack-plugin": "1.0.1",
7+
"@wasm-tool/wasm-pack-plugin": "1.5.0",
88
"text-encoding": "^0.7.0",
9-
"html-webpack-plugin": "^3.2.0",
10-
"webpack": "^4.29.4",
11-
"webpack-cli": "^3.1.1",
12-
"webpack-dev-server": "^3.1.0"
9+
"html-webpack-plugin": "^5.3.2",
10+
"webpack": "^5.49.0",
11+
"webpack-cli": "^4.7.2",
12+
"webpack-dev-server": "^3.11.2"
1313
}
1414
}

‎examples/fetch/webpack.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@ module.exports = {
2121
TextEncoder: ['text-encoding', 'TextEncoder']
2222
})
2323
],
24-
mode: 'development'
24+
mode: 'development',
25+
experiments: {
26+
asyncWebAssembly: true
27+
}
2528
};

‎examples/guide-supported-types-examples/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"scripts": {
33
"build": "webpack",
4-
"serve": "webpack-dev-server"
4+
"serve" : "webpack serve"
55
},
66
"devDependencies": {
7-
"@wasm-tool/wasm-pack-plugin": "1.0.1",
7+
"@wasm-tool/wasm-pack-plugin": "1.5.0",
88
"text-encoding": "^0.7.0",
9-
"html-webpack-plugin": "^3.2.0",
10-
"webpack": "^4.29.4",
11-
"webpack-cli": "^3.1.1",
12-
"webpack-dev-server": "^3.1.0"
9+
"html-webpack-plugin": "^5.3.2",
10+
"webpack": "^5.49.0",
11+
"webpack-cli": "^4.7.2",
12+
"webpack-dev-server": "^3.11.2"
1313
}
1414
}

‎examples/guide-supported-types-examples/webpack.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@ module.exports = {
2121
TextEncoder: ['text-encoding', 'TextEncoder']
2222
})
2323
],
24-
mode: 'development'
24+
mode: 'development',
25+
experiments: {
26+
asyncWebAssembly: true
27+
}
2528
};

‎examples/hello_world/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"scripts": {
33
"build": "webpack",
4-
"serve": "webpack-dev-server"
4+
"serve" : "webpack serve"
55
},
66
"devDependencies": {
7-
"@wasm-tool/wasm-pack-plugin": "1.0.1",
7+
"@wasm-tool/wasm-pack-plugin": "1.5.0",
88
"text-encoding": "^0.7.0",
9-
"html-webpack-plugin": "^3.2.0",
10-
"webpack": "^4.29.4",
11-
"webpack-cli": "^3.1.1",
12-
"webpack-dev-server": "^3.1.0"
9+
"html-webpack-plugin": "^5.3.2",
10+
"webpack": "^5.49.0",
11+
"webpack-cli": "^4.7.2",
12+
"webpack-dev-server": "^3.11.2"
1313
}
1414
}

‎examples/hello_world/webpack.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@ module.exports = {
2121
TextEncoder: ['text-encoding', 'TextEncoder']
2222
})
2323
],
24-
mode: 'development'
24+
mode: 'development',
25+
experiments: {
26+
asyncWebAssembly: true
27+
}
2528
};

‎examples/import_js/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"scripts": {
33
"build": "webpack",
4-
"serve": "webpack-dev-server"
4+
"serve" : "webpack serve"
55
},
66
"devDependencies": {
7-
"@wasm-tool/wasm-pack-plugin": "1.0.1",
7+
"@wasm-tool/wasm-pack-plugin": "1.5.0",
88
"text-encoding": "^0.7.0",
9-
"html-webpack-plugin": "^3.2.0",
10-
"webpack": "^4.29.4",
11-
"webpack-cli": "^3.1.1",
12-
"webpack-dev-server": "^3.1.0"
9+
"html-webpack-plugin": "^5.3.2",
10+
"webpack": "^5.49.0",
11+
"webpack-cli": "^4.7.2",
12+
"webpack-dev-server": "^3.11.2"
1313
}
1414
}

‎examples/import_js/webpack.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@ module.exports = {
2323
TextEncoder: ['text-encoding', 'TextEncoder']
2424
})
2525
],
26-
mode: 'development'
26+
mode: 'development',
27+
experiments: {
28+
asyncWebAssembly: true
29+
}
2730
};

‎examples/julia_set/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"scripts": {
33
"build": "webpack",
4-
"serve": "webpack-dev-server"
4+
"serve" : "webpack serve"
55
},
66
"devDependencies": {
7-
"@wasm-tool/wasm-pack-plugin": "1.0.1",
7+
"@wasm-tool/wasm-pack-plugin": "1.5.0",
88
"text-encoding": "^0.7.0",
9-
"html-webpack-plugin": "^3.2.0",
10-
"webpack": "^4.29.4",
11-
"webpack-cli": "^3.1.1",
12-
"webpack-dev-server": "^3.1.0"
9+
"html-webpack-plugin": "^5.3.2",
10+
"webpack": "^5.49.0",
11+
"webpack-cli": "^4.7.2",
12+
"webpack-dev-server": "^3.11.2"
1313
}
1414
}

0 commit comments

Comments
 (0)