Removed the pkg folder

asolove · Feb 19, 2019 · be56d13 · be56d13
1 parent 11db2c1
commit be56d13
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,21 +2,15 @@
 .idea
 ss
 
-/examples/web/target/
-/examples/web/www/node_modules/
-/examples/web/www/pkg/
 
 # Web generated files
-*.data
-*.html.map
 *.wasm
-*.wasm.map
-*.wast
-*.log
+*.js
 
 # Generated by Cargo
 # will have compiled files and executables
 /target/
+/examples/web/target/
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html

diff --git a/examples/web/build b/examples/web/build
@@ -9,7 +9,7 @@ if [ -z "$RELEASE"  ]; then
   echo "Development build"
 
   RUST_BACKTRACE=1 cargo +nightly build --target wasm32-unknown-unknown --release
-  wasm-bindgen ./target/wasm32-unknown-unknown/release/hello_world_web.wasm --out-dir ./www/pkg/ --no-typescript --no-modules
+  wasm-bindgen ./target/wasm32-unknown-unknown/release/hello_world_web.wasm --out-dir ./www/ --no-typescript --no-modules
 
 # RELEASE=1 ./build.sh
 else
@@ -21,7 +21,7 @@ else
   echo "Release build"
 
   cargo +nightly build --target wasm32-unknown-unknown --release &&
-  wasm-bindgen ./target/wasm32-unknown-unknown/release/hello_world_web.wasm --out-dir ./www/pkg/ --no-typescript --no-modules &&
-  wasm-opt -O3 -o ./www/pkg/optimized.wasm ./www/pkg/hello_world_web_bg.wasm  &&
-  mv ./www/pkg/optimized.wasm ./www/pkg/hello_world_web_bg.wasm
+  wasm-bindgen ./target/wasm32-unknown-unknown/release/hello_world_web.wasm --out-dir ./www/ --no-typescript --no-modules &&
+  wasm-opt -O3 -o ./www/optimized.wasm ./www/hello_world_web_bg.wasm  &&
+  mv ./www/optimized.wasm ./www/hello_world_web_bg.wasm
 fi
diff --git a/examples/web/www/index.html b/examples/web/www/index.html
@@ -4,10 +4,10 @@
   </head>
   <body>
     <canvas id="canvas" height="720" width="1280" />
-    <script src='/pkg/hello_world_web.js'></script>
+    <script src='/hello_world_web.js'></script>
     <script>
       window.addEventListener('load', function () {
-        window.wasm_bindgen('/pkg/hello_world_web_bg.wasm')
+        window.wasm_bindgen('/hello_world_web_bg.wasm')
       })
     </script>
   </body>