Skip to content

Commit

Permalink
Upgrade the webpack-based examples' npm dependencies (move to webpack…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
thomasetter committed Aug 10, 2021
1 parent 4770fab commit 2ccdbd9
Show file tree
Hide file tree
Showing 50 changed files with 241 additions and 171 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ members = [
"examples/wasm-in-wasm-imports",
"examples/wasm-in-web-worker",
"examples/wasm2js",
"examples/weather_report",
"examples/webaudio",
"examples/webgl",
"examples/webrtc_datachannel",
Expand Down
14 changes: 7 additions & 7 deletions _package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"scripts": {
"build": "webpack -p",
"serve": "webpack-dev-server -p"
"build": "webpack",
"serve": "webpack serve"
},
"devDependencies": {
"@wasm-tool/wasm-pack-plugin": "1.0.1",
"html-webpack-plugin": "^3.2.0",
"@wasm-tool/wasm-pack-plugin": "1.5.0",
"html-webpack-plugin": "^5.3.2",
"text-encoding": "^0.7.0",
"webpack": "^4.29.4",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
"webpack": "^5.49.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2"
}
}
14 changes: 7 additions & 7 deletions examples/add/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"scripts": {
"build": "webpack -p",
"serve": "webpack-dev-server -p"
"build": "webpack",
"serve" : "webpack serve"
},
"devDependencies": {
"@wasm-tool/wasm-pack-plugin": "1.0.1",
"html-webpack-plugin": "^3.2.0",
"@wasm-tool/wasm-pack-plugin": "1.5.0",
"html-webpack-plugin": "^5.3.2",
"text-encoding": "^0.7.0",
"webpack": "^4.29.4",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
"webpack": "^5.49.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2"
}
}
5 changes: 4 additions & 1 deletion examples/add/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};
12 changes: 6 additions & 6 deletions examples/canvas/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"scripts": {
"build": "webpack",
"serve": "webpack-dev-server"
"serve" : "webpack serve"
},
"devDependencies": {
"@wasm-tool/wasm-pack-plugin": "1.0.1",
"@wasm-tool/wasm-pack-plugin": "1.5.0",
"text-encoding": "^0.7.0",
"html-webpack-plugin": "^3.2.0",
"webpack": "^4.29.4",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
"html-webpack-plugin": "^5.3.2",
"webpack": "^5.49.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2"
}
}
5 changes: 4 additions & 1 deletion examples/canvas/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};
12 changes: 6 additions & 6 deletions examples/char/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"scripts": {
"build": "webpack",
"serve": "webpack-dev-server"
"serve" : "webpack serve"
},
"devDependencies": {
"@wasm-tool/wasm-pack-plugin": "1.0.1",
"@wasm-tool/wasm-pack-plugin": "1.5.0",
"text-encoding": "^0.7.0",
"html-webpack-plugin": "^3.2.0",
"webpack": "^4.29.4",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
"html-webpack-plugin": "^5.3.2",
"webpack": "^5.49.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2"
}
}
5 changes: 4 additions & 1 deletion examples/char/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};
12 changes: 6 additions & 6 deletions examples/closures/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"scripts": {
"build": "webpack",
"serve": "webpack-dev-server"
"serve" : "webpack serve"
},
"devDependencies": {
"@wasm-tool/wasm-pack-plugin": "1.0.1",
"@wasm-tool/wasm-pack-plugin": "1.5.0",
"text-encoding": "^0.7.0",
"html-webpack-plugin": "^3.2.0",
"webpack": "^4.29.4",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
"html-webpack-plugin": "^5.3.2",
"webpack": "^5.49.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2"
}
}
5 changes: 4 additions & 1 deletion examples/closures/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};
12 changes: 6 additions & 6 deletions examples/console_log/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"scripts": {
"build": "webpack",
"serve": "webpack-dev-server"
"serve" : "webpack serve"
},
"devDependencies": {
"@wasm-tool/wasm-pack-plugin": "1.0.1",
"@wasm-tool/wasm-pack-plugin": "1.5.0",
"text-encoding": "^0.7.0",
"html-webpack-plugin": "^3.2.0",
"webpack": "^4.29.4",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
"html-webpack-plugin": "^5.3.2",
"webpack": "^5.49.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2"
}
}
5 changes: 4 additions & 1 deletion examples/console_log/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};
12 changes: 6 additions & 6 deletions examples/dom/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"scripts": {
"build": "webpack",
"serve": "webpack-dev-server"
"serve" : "webpack serve"
},
"devDependencies": {
"@wasm-tool/wasm-pack-plugin": "1.0.1",
"@wasm-tool/wasm-pack-plugin": "1.5.0",
"text-encoding": "^0.7.0",
"html-webpack-plugin": "^3.2.0",
"webpack": "^4.29.4",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
"html-webpack-plugin": "^5.3.2",
"webpack": "^5.49.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2"
}
}
5 changes: 4 additions & 1 deletion examples/dom/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};
12 changes: 6 additions & 6 deletions examples/duck-typed-interfaces/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"scripts": {
"build": "webpack",
"serve": "webpack-dev-server"
"serve" : "webpack serve"
},
"devDependencies": {
"@wasm-tool/wasm-pack-plugin": "1.0.1",
"@wasm-tool/wasm-pack-plugin": "1.5.0",
"text-encoding": "^0.7.0",
"html-webpack-plugin": "^3.2.0",
"webpack": "^4.29.4",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
"html-webpack-plugin": "^5.3.2",
"webpack": "^5.49.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2"
}
}
5 changes: 4 additions & 1 deletion examples/duck-typed-interfaces/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};
12 changes: 6 additions & 6 deletions examples/fetch/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"scripts": {
"build": "webpack",
"serve": "webpack-dev-server"
"serve" : "webpack serve"
},
"devDependencies": {
"@wasm-tool/wasm-pack-plugin": "1.0.1",
"@wasm-tool/wasm-pack-plugin": "1.5.0",
"text-encoding": "^0.7.0",
"html-webpack-plugin": "^3.2.0",
"webpack": "^4.29.4",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
"html-webpack-plugin": "^5.3.2",
"webpack": "^5.49.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2"
}
}
5 changes: 4 additions & 1 deletion examples/fetch/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};
12 changes: 6 additions & 6 deletions examples/guide-supported-types-examples/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"scripts": {
"build": "webpack",
"serve": "webpack-dev-server"
"serve" : "webpack serve"
},
"devDependencies": {
"@wasm-tool/wasm-pack-plugin": "1.0.1",
"@wasm-tool/wasm-pack-plugin": "1.5.0",
"text-encoding": "^0.7.0",
"html-webpack-plugin": "^3.2.0",
"webpack": "^4.29.4",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
"html-webpack-plugin": "^5.3.2",
"webpack": "^5.49.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2"
}
}
5 changes: 4 additions & 1 deletion examples/guide-supported-types-examples/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};
12 changes: 6 additions & 6 deletions examples/hello_world/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"scripts": {
"build": "webpack",
"serve": "webpack-dev-server"
"serve" : "webpack serve"
},
"devDependencies": {
"@wasm-tool/wasm-pack-plugin": "1.0.1",
"@wasm-tool/wasm-pack-plugin": "1.5.0",
"text-encoding": "^0.7.0",
"html-webpack-plugin": "^3.2.0",
"webpack": "^4.29.4",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
"html-webpack-plugin": "^5.3.2",
"webpack": "^5.49.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2"
}
}
5 changes: 4 additions & 1 deletion examples/hello_world/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};
12 changes: 6 additions & 6 deletions examples/import_js/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"scripts": {
"build": "webpack",
"serve": "webpack-dev-server"
"serve" : "webpack serve"
},
"devDependencies": {
"@wasm-tool/wasm-pack-plugin": "1.0.1",
"@wasm-tool/wasm-pack-plugin": "1.5.0",
"text-encoding": "^0.7.0",
"html-webpack-plugin": "^3.2.0",
"webpack": "^4.29.4",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
"html-webpack-plugin": "^5.3.2",
"webpack": "^5.49.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2"
}
}
5 changes: 4 additions & 1 deletion examples/import_js/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};
12 changes: 6 additions & 6 deletions examples/julia_set/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"scripts": {
"build": "webpack",
"serve": "webpack-dev-server"
"serve" : "webpack serve"
},
"devDependencies": {
"@wasm-tool/wasm-pack-plugin": "1.0.1",
"@wasm-tool/wasm-pack-plugin": "1.5.0",
"text-encoding": "^0.7.0",
"html-webpack-plugin": "^3.2.0",
"webpack": "^4.29.4",
"webpack-cli": "^3.1.1",
"webpack-dev-server": "^3.1.0"
"html-webpack-plugin": "^5.3.2",
"webpack": "^5.49.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2"
}
}
Loading

0 comments on commit 2ccdbd9

Please sign in to comment.