Merge pull request rustwasm#1159 from alexcrichton/webpack

Convert all examples to using wasm-pack
alexcrichton · Jan 18, 2019 · 71ed305 · 71ed305
2 parents ba732a8 + 32c611d
commit 71ed305
Show file tree

Hide file tree

Showing 126 changed files with 180 additions and 481 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -93,14 +93,15 @@ matrix:
         - *INSTALL_NODE_VIA_NVM
         - *INSTALL_AWS
         - npm install
+        - curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -s -- -f
       script:
+        - cargo build -p wasm-bindgen-cli
+        - ln -snf target/debug/wasm-bindgen $HOME/.cargo/wasm-bindgen
         - |
           for dir in `ls examples | grep -v README | grep -v asm.js | grep -v raytrace | grep -v no_modules`; do
             (cd examples/$dir &&
-             sed -i "s|: \"webpack-dev-server\"|: \"webpack --output-path $HOME/$TRAVIS_BUILD_NUMBER/exbuild/$dir\"|" package.json &&
-             sed -i 's/npm install//' build.sh &&
              ln -fs ../../node_modules . &&
-             ./build.sh) || exit 1;
+             npm run build -- --output-path $HOME/$TRAVIS_BUILD_NUMBER/exbuild/$dir) || exit 1;
           done
         - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then aws s3 sync --quiet ~/$TRAVIS_BUILD_NUMBER s3://wasm-bindgen-ci/$TRAVIS_BUILD_NUMBER; fi
       if: branch = master

diff --git a/examples/.gitignore b/examples/.gitignore
@@ -0,0 +1,4 @@
+package-lock.json
+pkg
+dist
+wasm-pack.log
diff --git a/examples/add/.gitignore b/examples/add/.gitignore
diff --git a/examples/add/README.md b/examples/add/README.md
@@ -9,9 +9,7 @@ online][compiled]
 You can build the example locally with:
 
 ```
-$ ./build.sh
+$ npm run serve
 ```
 
-(or running the commands on Windows manually)
-
 and then visiting http://localhost:8080 in a browser should run the example!
diff --git a/examples/add/build.sh b/examples/add/build.sh
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('./add');
+const rust = import('./pkg/add');
 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
@@ -1,9 +1,10 @@
 {
   "scripts": {
-    "build": "webpack",
-    "serve": "webpack-dev-server"
+    "build": "webpack -p",
+    "serve": "webpack-dev-server -p"
   },
   "devDependencies": {
+    "@wasm-tool/wasm-pack-plugin": "0.2.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.11.1",

diff --git a/examples/add/webpack.config.js b/examples/add/webpack.config.js
@@ -1,6 +1,7 @@
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const webpack = require('webpack');
+const WasmPackPlugin = require("@wasm-tool/wasm-pack-plugin");
 
 module.exports = {
     entry: './index.js',
@@ -10,6 +11,9 @@ module.exports = {
     },
     plugins: [
         new HtmlWebpackPlugin(),
+        new WasmPackPlugin({
+            crateDirectory: path.resolve(__dirname, ".")
+        }),
         // Have this example work in Edge which doesn't ship `TextEncoder` or
         // `TextDecoder` at this time.
         new webpack.ProvidePlugin({

diff --git a/examples/canvas/.gitignore b/examples/canvas/.gitignore
diff --git a/examples/canvas/README.md b/examples/canvas/README.md
@@ -9,9 +9,7 @@ online][compiled]
 You can build the example locally with:
 
 ```
-$ ./build.sh
+$ npm run serve
 ```
 
-(or running the commands on Windows manually)
-
 and then visiting http://localhost:8080 in a browser should run the example!
diff --git a/examples/canvas/build.sh b/examples/canvas/build.sh
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('./canvas')
+import('./pkg/canvas')
   .catch(console.error);
diff --git a/examples/canvas/package.json b/examples/canvas/package.json
@@ -4,6 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
+    "@wasm-tool/wasm-pack-plugin": "0.2.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.11.1",

diff --git a/examples/canvas/webpack.config.js b/examples/canvas/webpack.config.js
@@ -1,6 +1,7 @@
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const webpack = require('webpack');
+const WasmPackPlugin = require("@wasm-tool/wasm-pack-plugin");
 
 module.exports = {
     entry: './index.js',
@@ -10,7 +11,10 @@ module.exports = {
     },
     plugins: [
         new HtmlWebpackPlugin({
-            template: "index.html"
+            template: 'index.html'
+        }),
+        new WasmPackPlugin({
+            crateDirectory: path.resolve(__dirname, ".")
         }),
         // Have this example work in Edge which doesn't ship `TextEncoder` or
         // `TextDecoder` at this time.

diff --git a/examples/char/.gitignore b/examples/char/.gitignore
diff --git a/examples/char/README.md b/examples/char/README.md
@@ -9,9 +9,7 @@ online][compiled]
 You can build the example locally with:
 
 ```
-$ ./build.sh
+$ npm run serve
 ```
 
-(or running the commands on Windows manually)
-
 and then visiting http://localhost:8080 in a browser should run the example!
diff --git a/examples/char/build.sh b/examples/char/build.sh
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('./char.js');
+let imp = import('./pkg/char');
 let mod;
 
 let counters = [];

diff --git a/examples/char/package.json b/examples/char/package.json
@@ -4,6 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
+    "@wasm-tool/wasm-pack-plugin": "0.2.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.11.1",

diff --git a/examples/char/webpack.config.js b/examples/char/webpack.config.js
@@ -1,6 +1,7 @@
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const webpack = require('webpack');
+const WasmPackPlugin = require("@wasm-tool/wasm-pack-plugin");
 
 module.exports = {
     entry: './index.js',
@@ -12,6 +13,9 @@ module.exports = {
         new HtmlWebpackPlugin({
             template: "index.html"
         }),
+        new WasmPackPlugin({
+            crateDirectory: path.resolve(__dirname, ".")
+        }),
         // Have this example work in Edge which doesn't ship `TextEncoder` or
         // `TextDecoder` at this time.
         new webpack.ProvidePlugin({

diff --git a/examples/closures/.gitignore b/examples/closures/.gitignore
diff --git a/examples/closures/README.md b/examples/closures/README.md
@@ -9,9 +9,7 @@ online][compiled]
 You can build the example locally with:
 
 ```
-$ ./build.sh
+$ npm run serve
 ```
 
-(or running the commands on Windows manually)
-
 and then visiting http://localhost:8080 in a browser should run the example!
diff --git a/examples/closures/build.sh b/examples/closures/build.sh
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('./closures')
+import('./pkg/closures')
   .catch(console.error);
diff --git a/examples/closures/package.json b/examples/closures/package.json
@@ -4,6 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
+    "@wasm-tool/wasm-pack-plugin": "0.2.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.11.1",

diff --git a/examples/closures/webpack.config.js b/examples/closures/webpack.config.js
@@ -1,6 +1,7 @@
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const webpack = require('webpack');
+const WasmPackPlugin = require("@wasm-tool/wasm-pack-plugin");
 
 module.exports = {
     entry: './index.js',
@@ -9,8 +10,9 @@ module.exports = {
         filename: 'index.js',
     },
     plugins: [
-        new HtmlWebpackPlugin({
-            template: "index.html"
+        new HtmlWebpackPlugin(),
+        new WasmPackPlugin({
+            crateDirectory: path.resolve(__dirname, ".")
         }),
         // Have this example work in Edge which doesn't ship `TextEncoder` or
         // `TextDecoder` at this time.

diff --git a/examples/console_log/.gitignore b/examples/console_log/.gitignore
diff --git a/examples/console_log/README.md b/examples/console_log/README.md
@@ -9,9 +9,7 @@ online][compiled]
 You can build the example locally with:
 
 ```
-$ ./build.sh
+$ npm run serve
 ```
 
-(or running the commands on Windows manually)
-
 and then visiting http://localhost:8080 in a browser should run the example!
diff --git a/examples/console_log/build.sh b/examples/console_log/build.sh
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('./console_log')
+import('./pkg/console_log')
   .catch(console.error);
diff --git a/examples/console_log/package.json b/examples/console_log/package.json
@@ -4,6 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
+    "@wasm-tool/wasm-pack-plugin": "0.2.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.11.1",

diff --git a/examples/console_log/webpack.config.js b/examples/console_log/webpack.config.js
@@ -1,6 +1,7 @@
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const webpack = require('webpack');
+const WasmPackPlugin = require("@wasm-tool/wasm-pack-plugin");
 
 module.exports = {
     entry: './index.js',
@@ -9,8 +10,9 @@ module.exports = {
         filename: 'index.js',
     },
     plugins: [
-        new HtmlWebpackPlugin({
-            template: "index.html"
+        new HtmlWebpackPlugin(),
+        new WasmPackPlugin({
+            crateDirectory: path.resolve(__dirname, ".")
         }),
         // Have this example work in Edge which doesn't ship `TextEncoder` or
         // `TextDecoder` at this time.

diff --git a/examples/dom/.gitignore b/examples/dom/.gitignore
diff --git a/examples/dom/README.md b/examples/dom/README.md
@@ -9,9 +9,7 @@ online][compiled]
 You can build the example locally with:
 
 ```
-$ ./build.sh
+$ npm run serve
 ```
 
-(or running the commands on Windows manually)
-
 and then visiting http://localhost:8080 in a browser should run the example!
diff --git a/examples/dom/build.sh b/examples/dom/build.sh
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('./dom')
+import('./pkg/dom')
   .catch(console.error);
diff --git a/examples/dom/package.json b/examples/dom/package.json
@@ -4,6 +4,7 @@
     "serve": "webpack-dev-server"
   },
   "devDependencies": {
+    "@wasm-tool/wasm-pack-plugin": "0.2.1",
     "text-encoding": "^0.7.0",
     "html-webpack-plugin": "^3.2.0",
     "webpack": "^4.11.1",