rustwasm/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/rustwasm/wasm-bindgen.git synced 2024-11-23 22:11:19 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use path dependencies in examples

Browse Source 
This commit updates all examples to not use `path` dependencies but
rather use versioned dependencies like would typically be found in the
wild. This should hopefully make the examples more copy-pastable and
less alien to onlookers!

The development of the examples remains the same where they continue to
use the `wasm-bindgen`, `js-sys`, `web-sys`, etc from in-tree. The
workspace-level `[patch]` section ensures that they use the in-tree
versions instead of the crates.io versions.
This commit is contained in:
Alex Crichton 2018-11-07 11:14:25 -08:00
parent ac6a230d83
commit 56400c3738
23 changed files with 60 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -83,3 +83,6 @@ members = [
[patch.crates-io]
wasm-bindgen = { path = '.' }
wasm-bindgen-futures = { path = 'crates/futures' }
js-sys = { path = 'crates/js-sys' }
web-sys = { path = 'crates/web-sys' }

4
examples/add/Cargo.toml
View File

@ -1,10 +1,10 @@
[package]
name = "add"
version = "0.1.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
authors = ["The wasm-bindgen Developers"]
[lib]
crate-type = ["cdylib"]
[dependencies]
wasm-bindgen = { path = "../.." }
wasm-bindgen = "0.2.27"

6
examples/canvas/Cargo.toml
View File

@ -7,11 +7,11 @@ authors = ["The wasm-bindgen Developers"]
crate-type = ["cdylib"]
[dependencies]
js-sys = { path = "../../crates/js-sys" }
wasm-bindgen = { path = "../.." }
js-sys = "0.3.4"
wasm-bindgen = "0.2.27"
[dependencies.web-sys]
path = "../../crates/web-sys"
version = "0.3.4"
features = [
'CanvasRenderingContext2d',
'Document',

8
examples/char/Cargo.toml
View File

@ -1,14 +1,10 @@
[package]
name = "char"
version = "0.1.0"
authors = ["Robert Masen <r@robertmasen.com>"]
authors = ["The wasm-bindgen Developers"]
[lib]
crate-type = ["cdylib"]
[dependencies]
# Here we're using a path dependency to use what's already in this repository,
# but you'd use the commented out version below if you're copying this into your
# project.
wasm-bindgen = { path = "../.." }
#wasm-bindgen = "0.2"
wasm-bindgen = "0.2.27"

8
examples/closures/Cargo.toml
View File

@ -1,17 +1,17 @@
[package]
name = "closures"
version = "0.1.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
authors = ["The wasm-bindgen Developers"]
[lib]
crate-type = ["cdylib"]
[dependencies]
wasm-bindgen = { path = "../.." }
js-sys = { path = "../../crates/js-sys" }
wasm-bindgen = "0.2.27"
js-sys = "0.3.4"
[dependencies.web-sys]
path = "../../crates/web-sys"
version = "0.3.4"
features = [
'CssStyleDeclaration',
'Document',

6
examples/console_log/Cargo.toml
View File

@ -1,11 +1,11 @@
[package]
name = "console_log"
version = "0.1.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
authors = ["The wasm-bindgen Developers"]
[lib]
crate-type = ["cdylib"]
[dependencies]
wasm-bindgen = { path = "../.." }
web-sys = { path = '../../crates/web-sys', features = ['console'] }
wasm-bindgen = "0.2.27"
web-sys = { version = "0.3.4", features = ['console'] }

4
examples/dom/Cargo.toml
View File

@ -7,10 +7,10 @@ authors = ["The wasm-bindgen Developers"]
crate-type = ["cdylib"]
[dependencies]
wasm-bindgen = { path = "../.." }
wasm-bindgen = "0.2.27"
[dependencies.web-sys]
path = '../../crates/web-sys'
version = "0.3.4"
features = [
'Document',
'Element',

2
examples/duck-typed-interfaces/Cargo.toml
View File

@ -7,4 +7,4 @@ authors = ["The wasm-bindgen Developers"]
crate-type = ["cdylib"]
[dependencies]
wasm-bindgen = { path = "../.." }
wasm-bindgen = "0.2.27"

8
examples/fetch/Cargo.toml
View File

@ -8,14 +8,14 @@ crate-type = ["cdylib"]
[dependencies]
futures = "0.1.20"
wasm-bindgen = { path = "../..", features = ["serde-serialize"] }
js-sys = { path = "../../crates/js-sys" }
wasm-bindgen-futures = { path = "../../crates/futures" }
wasm-bindgen = { version = "0.2.27", features = ["serde-serialize"] }
js-sys = "0.3.4"
wasm-bindgen-futures = "0.3.4"
serde = "^1.0.59"
serde_derive = "^1.0.59"
[dependencies.web-sys]
path = "../../crates/web-sys"
version = "0.3.4"
features = [
'Headers',
'Request',

4
examples/guide-supported-types-examples/Cargo.toml
View File

@ -1,10 +1,10 @@
[package]
name = "guide-supported-types-examples"
version = "0.1.0"
authors = ["Nick Fitzgerald <fitzgen@gmail.com>"]
authors = ["The wasm-bindgen Developers"]
[lib]
crate-type = ["cdylib"]
[dependencies]
wasm-bindgen = { path = "../.." }
wasm-bindgen = "0.2.27"

6
examples/hello_world/Cargo.toml
View File

@ -7,8 +7,4 @@ authors = ["The wasm-bindgen Developers"]
crate-type = ["cdylib"]
[dependencies]
# Here we're using a path dependency to use what's already in this repository,
# but you'd use the commented out version below if you're copying this into your
# project.
wasm-bindgen = { path = "../.." }
#wasm-bindgen = "0.2"
wasm-bindgen = "0.2.27"

4
examples/import_js/Cargo.toml
View File

@ -1,10 +1,10 @@
[package]
name = "import_js"
version = "0.1.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
authors = ["The wasm-bindgen Developers"]
[lib]
crate-type = ["cdylib"]
[dependencies]
wasm-bindgen = { path = "../.." }
wasm-bindgen = "0.2.27"

6
examples/julia_set/Cargo.toml
View File

@ -1,16 +1,16 @@
[package]
name = "julia_set"
version = "0.1.0"
authors = ["Marcin Baraniecki <marcinbar1@gmail.com>"]
authors = ["The wasm-bindgen Developers"]
[lib]
crate-type = ["cdylib"]
[dependencies]
wasm-bindgen = { path = "../.." }
wasm-bindgen = "0.2.27"
[dependencies.web-sys]
path = '../../crates/web-sys'
version = "0.3.4"
features = [
'ImageData',
'CanvasRenderingContext2d',

4
examples/no_modules/Cargo.toml
View File

@ -1,10 +1,10 @@
[package]
name = "no_modules"
version = "0.1.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
authors = ["The wasm-bindgen Developers"]
[lib]
crate-type = ["cdylib"]
[dependencies]
wasm-bindgen = { path = "../.." }
wasm-bindgen = "0.2.27"

6
examples/paint/Cargo.toml
View File

@ -7,11 +7,11 @@ authors = ["The wasm-bindgen Developers"]
crate-type = ["cdylib"]
[dependencies]
js-sys = { path = "../../crates/js-sys" }
wasm-bindgen = { path = "../.." }
js-sys = "0.3.4"
wasm-bindgen = "0.2.27"
[dependencies.web-sys]
path = "../../crates/web-sys"
version = "0.3.4"
features = [
'CanvasRenderingContext2d',
'CssStyleDeclaration',

4
examples/performance/Cargo.toml
View File

@ -7,9 +7,9 @@ authors = ["The wasm-bindgen Developers"]
crate-type = ["cdylib"]
[dependencies]
wasm-bindgen = { path = "../.." }
wasm-bindgen = "0.2.27"
humantime = "1"
[dependencies.web-sys]
path = '../../crates/web-sys'
version = "0.3.4"
features = ['Window', 'Performance', 'PerformanceTiming']

8
examples/raytrace-parallel/Cargo.toml
View File

@ -9,13 +9,13 @@ crate-type = ["cdylib"]
[dependencies]
console_error_panic_hook = "0.1"
futures = "0.1"
js-sys = { path = '../../crates/js-sys' }
js-sys = "0.3.4"
raytracer = { git = 'https://github.com/alexcrichton/raytracer', branch = 'update-deps' }
wasm-bindgen = { path = "../..", features = ['serde-serialize'] }
wasm-bindgen-futures = { path = '../../crates/futures' }
wasm-bindgen = { version = "0.2.27", features = ['serde-serialize'] }
wasm-bindgen-futures = "0.3.4"
[dependencies.web-sys]
path = '../../crates/web-sys'
version = "0.3.4"
features = [
'CanvasRenderingContext2d',
'ErrorEvent',

6
examples/todomvc/Cargo.toml
View File

@ -10,12 +10,12 @@ crate-type = ["cdylib"]
askama = "0.7.2"
[dependencies]
js-sys = { path = "../../crates/js-sys" }
wasm-bindgen = { path = "../../" }
js-sys = "0.3.4"
wasm-bindgen = "0.2.27"
askama = "0.7.2"
[dependencies.web-sys]
path = "../../crates/web-sys"
version = "0.3.4"
features = [
'console',
'CssStyleDeclaration',

6
examples/wasm-in-wasm/Cargo.toml
View File

@ -1,11 +1,11 @@
[package]
name = "wasm-in-wasm"
version = "0.1.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
authors = ["The wasm-bindgen Developers"]
[lib]
crate-type = ["cdylib"]
[dependencies]
wasm-bindgen = { path = "../.." }
js-sys = { path = "../../crates/js-sys" }
wasm-bindgen = "0.2.27"
js-sys = "0.3.4"

8
examples/wasm2js/Cargo.toml
View File

@ -1,14 +1,10 @@
[package]
name = "wasm2js"
version = "0.1.0"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
authors = ["The wasm-bindgen Developers"]
[lib]
crate-type = ["cdylib"]
[dependencies]
# Here we're using a path dependency to use what's already in this repository,
# but you'd use the commented out version below if you're copying this into your
# project.
wasm-bindgen = { path = "../.." }
#wasm-bindgen = "0.2"
wasm-bindgen = "0.2.27"

4
examples/webaudio/Cargo.toml
View File

@ -7,10 +7,10 @@ authors = ["The wasm-bindgen Developers"]
crate-type = ["cdylib"]
[dependencies]
wasm-bindgen = { path = "../.." }
wasm-bindgen = "0.2.27"
[dependencies.web-sys]
path = "../../crates/web-sys"
version = "0.3.4"
features = [
'AudioContext',
'AudioDestinationNode',

6
examples/webgl/Cargo.toml
View File

@ -7,11 +7,11 @@ authors = ["The wasm-bindgen Developers"]
crate-type = ["cdylib"]
[dependencies]
js-sys = { path = "../../crates/js-sys" }
wasm-bindgen = { path = "../.." }
js-sys = "0.3.4"
wasm-bindgen = "0.2.27"
[dependencies.web-sys]
path = "../../crates/web-sys"
version = "0.3.4"
features = [
'Document',
'Element',

5
publish.rs
View File

@ -57,13 +57,14 @@ fn main() {
let mut crates = Vec::new();
crates.push(read_crate("./Cargo.toml".as_ref()));
find_crates("crates".as_ref(), &mut crates);
find_crates("examples".as_ref(), &mut crates);
let pos = CRATES_TO_PUBLISH.iter()
.chain(CRATES_TO_AVOID_PUBLISH)
.enumerate()
.map(|(i, c)| (*c, i))
.collect::<HashMap<_, _>>();
crates.sort_by_key(|krate| pos[&krate.name[..]]);
crates.sort_by_key(|krate| pos.get(&krate.name[..]));
match &env::args().nth(1).expect("must have one argument")[..] {
"bump" => {
@ -90,6 +91,8 @@ fn find_crates(dir: &Path, dst: &mut Vec<Crate>) {
.any(|c| krate.name == *c)
{
dst.push(krate);
} else if dir.iter().any(|s| s == "examples") {
dst.push(krate);
} else {
panic!("failed to find {:?} in whitelist or blacklist", krate.name);
}