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
This commit is contained in:
Thomas Etter 2021-08-10 16:43:42 +02:00 committed by GitHub
parent 4770fab854
commit 2ccdbd9337
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 241 additions and 171 deletions

View File

@ -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",

View File

@ -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"
}
}

View File

@ -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"
}
}

View File

@ -21,5 +21,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -21,5 +21,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -21,5 +21,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -21,5 +21,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -21,5 +21,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -169,7 +169,7 @@ pub fn run() -> Result<(), JsValue> {
".png'>",
" ",
]
.concat();
.concat();
let temp = ((&parsed["main"]["temp"]).to_owned().as_f64().unwrap() - 273.15) as i64;
let content = [src, temp.to_string()].concat();

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
syncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -1,17 +1,17 @@
{
"scripts": {
"build": "webpack",
"serve": "webpack-dev-server"
"serve" : "webpack serve"
},
"dependencies": {
"webxr": "./pkg"
},
"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"
}
}

View File

@ -23,5 +23,8 @@ module.exports = {
TextEncoder: ['text-encoding', 'TextEncoder']
})
],
mode: 'development'
mode: 'development',
experiments: {
asyncWebAssembly: true
}
};

View File

@ -1,4 +1,4 @@
import * as wasm from "webxr";
import * as wasm from "./pkg";
var xrApp = new wasm.XrApp();
xrApp.init()