Merge remote-tracking branch 'upstream/master' into prototype-inheritance

eggyal · eggyal · commit 0aa19afe5fce · 2019-09-01T02:09:32.000+01:00
diff --git a/_package.json b/_package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server -p"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "html-webpack-plugin": "^3.2.0",
     "text-encoding": "^0.7.0",
     "webpack": "^4.29.4",
diff --git a/examples/add/index.js b/examples/add/index.js
@@ -1,6 +1,6 @@
 // For more comments about what's going on here, check out the `hello_world`
 // example
-const rust = import('./pkg/add');
+const rust = import('./pkg');
 rust
   .then(m => alert('1 + 2 = ' + m.add(1, 2)))
   .catch(console.error);
diff --git a/examples/add/package.json b/examples/add/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server -p"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "html-webpack-plugin": "^3.2.0",
     "text-encoding": "^0.7.0",
     "webpack": "^4.29.4",
diff --git a/examples/canvas/index.js b/examples/canvas/index.js
@@ -1,4 +1,4 @@
 // For more comments about what's going on here, check out the `hello_world`
 // example.
-import('./pkg/canvas')
+import('./pkg')
   .catch(console.error);
diff --git a/examples/canvas/package.json b/examples/canvas/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/char/index.js b/examples/char/index.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-unused-vars */
 import { chars } from './chars-list.js';
-let imp = import('./pkg/char');
+let imp = import('./pkg');
 let mod;
 
 let counters = [];
diff --git a/examples/char/package.json b/examples/char/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/closures/index.js b/examples/closures/index.js
@@ -1,4 +1,4 @@
 // For more comments about what's going on here, check out the `hello_world`
 // example
-import('./pkg/closures')
+import('./pkg')
   .catch(console.error);
diff --git a/examples/closures/package.json b/examples/closures/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/console_log/index.js b/examples/console_log/index.js
@@ -1,4 +1,4 @@
 // For more comments about what's going on here, check out the `hello_world`
 // example
-import('./pkg/console_log')
+import('./pkg')
   .catch(console.error);
diff --git a/examples/console_log/package.json b/examples/console_log/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/dom/index.js b/examples/dom/index.js
@@ -1,4 +1,4 @@
 // For more comments about what's going on here, check out the `hello_world`
 // example
-import('./pkg/dom')
+import('./pkg')
   .catch(console.error);
diff --git a/examples/dom/package.json b/examples/dom/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/duck-typed-interfaces/index.js b/examples/duck-typed-interfaces/index.js
@@ -1,3 +1,3 @@
 // For more comments about what's going on here, check out the `hello_world`
 // example.
-import('./pkg/rust_duck_typed_interfaces');
+import('./pkg');
diff --git a/examples/duck-typed-interfaces/package.json b/examples/duck-typed-interfaces/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/fetch/index.js b/examples/fetch/index.js
@@ -1,4 +1,4 @@
-const rust = import('./pkg/fetch');
+const rust = import('./pkg');
 
 rust
   .then(m => {
diff --git a/examples/fetch/package.json b/examples/fetch/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/guide-supported-types-examples/package.json b/examples/guide-supported-types-examples/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/hello_world/index.js b/examples/hello_world/index.js
@@ -1,7 +1,7 @@
 // Note that a dynamic `import` statement here is required due to
-// webpack/webpack#6615, but in theory `import { greet } from './pkg/hello_world';`
+// webpack/webpack#6615, but in theory `import { greet } from './pkg';`
 // will work here one day as well!
-const rust = import('./pkg/hello_world');
+const rust = import('./pkg');
 
 rust
   .then(m => m.greet('World!'))
diff --git a/examples/hello_world/package.json b/examples/hello_world/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/import_js/index.js b/examples/import_js/index.js
@@ -1,4 +1,4 @@
 // For more comments about what's going on here, check out the `hello_world`
 // example
-import('./crate/pkg/import_js')
+import('./crate/pkg')
   .catch(console.error);
diff --git a/examples/import_js/package.json b/examples/import_js/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/julia_set/index.js b/examples/julia_set/index.js
@@ -1,4 +1,4 @@
-import('./pkg/julia_set')
+import('./pkg')
     .then(wasm => {
         const canvas = document.getElementById('drawing');
         const ctx = canvas.getContext('2d');
diff --git a/examples/julia_set/package.json b/examples/julia_set/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/paint/index.js b/examples/paint/index.js
@@ -1,4 +1,4 @@
 // For more comments about what's going on here, check out the `hello_world`
 // example.
-import('./pkg/wasm_bindgen_paint')
+import('./pkg')
   .catch(console.error);
diff --git a/examples/paint/package.json b/examples/paint/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/performance/index.js b/examples/performance/index.js
@@ -1,4 +1,4 @@
 // For more comments about what's going on here, check out the `hello_world`
 // example
-import('./pkg/performance')
+import('./pkg')
   .catch(console.error);
diff --git a/examples/performance/package.json b/examples/performance/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/raytrace-parallel/src/pool.rs b/examples/raytrace-parallel/src/pool.rs
@@ -1,3 +1,7 @@
+// Silences warnings from the compiler about Work.func and child_entry_point
+// being unused when the target is not wasm.
+#![cfg_attr(not(target_arch = "wasm32"), allow(dead_code))]
+
 //! A small module that's intended to provide an example of creating a pool of
 //! web workers which can be used to execute `rayon`-style work.
 
diff --git a/examples/request-animation-frame/index.js b/examples/request-animation-frame/index.js
@@ -1,4 +1,4 @@
 // For more comments about what's going on here, check out the `hello_world`
 // example
-import('./pkg/request_animation_frame')
+import('./pkg')
   .catch(console.error);
diff --git a/examples/request-animation-frame/package.json b/examples/request-animation-frame/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/todomvc/index.js b/examples/todomvc/index.js
@@ -1,6 +1,6 @@
 // For more comments about what's going on here, check out the `hello_world`
 // example
-const rust = import('./pkg/todomvc');
+const rust = import('./pkg');
 
 rust
   .then(m => m.run())
diff --git a/examples/todomvc/package.json b/examples/todomvc/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/wasm-in-wasm/index.js b/examples/wasm-in-wasm/index.js
@@ -1,4 +1,4 @@
 // For more comments about what's going on here, check out the `hello_world`
 // example
-import('./pkg/wasm_in_wasm')
+import('./pkg')
   .catch(console.error);
diff --git a/examples/wasm-in-wasm/package.json b/examples/wasm-in-wasm/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/webaudio/index.js b/examples/webaudio/index.js
@@ -1,4 +1,4 @@
-import('./pkg/webaudio')
+import('./pkg')
   .then(rust_module => {
     let fm = null;
 
diff --git a/examples/webaudio/package.json b/examples/webaudio/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
diff --git a/examples/webgl/index.js b/examples/webgl/index.js
@@ -1,4 +1,4 @@
 // For more comments about what's going on here, check out the `hello_world`
 // example.
-import('./pkg/webgl')
+import('./pkg')
   .catch(console.error);
diff --git a/examples/webgl/package.json b/examples/webgl/package.json
@@ -4,7 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.4.2",
+    "@wasm-tool/wasm-pack-plugin": "1.0.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.29.4",
