Put wasm and bindgen files in ignored /pkg dir

rustwasm · Sep 13, 2023 · c0b7228 · c0b7228
1 parent ac90713
commit c0b7228
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 44 deletions.
diff --git a/examples/raytrace-parallel/.gitignore b/examples/raytrace-parallel/.gitignore
@@ -1,5 +1 @@
-raytrace_parallel.js
-raytrace_parallel.d.ts
-raytrace_parallel_bg.wasm
-raytrace_parallel_bg.wasm.d.ts
-snippets
+snippets
diff --git a/examples/raytrace-parallel/build.py b/examples/raytrace-parallel/build.py
@@ -49,7 +49,7 @@
             "raytrace_parallel.wasm",
         ),
         "--out-dir",
-        root_dir,
+        os.path.join(root_dir, "pkg"),
         "--target",
         "no-modules",
     ],

diff --git a/examples/raytrace-parallel/index.html b/examples/raytrace-parallel/index.html
@@ -1,22 +1,22 @@
 <html>
-  <head>
-    <meta content="text/html;charset=utf-8" http-equiv="Content-Type"/>
-    <style>
-      #scene {
-        height: 100%;
-        width: 500px;
-        float: left;
-      }
+<head>
+  <meta content="text/html;charset=utf-8" http-equiv="Content-Type"/>
+  <style>
+    #scene {
+      height: 100%;
+      width: 500px;
+      float: left;
+    }
 
-      #render, .concurrency, .timing {
-        padding: 20px;
-        margin: 20px;
-        float: left;
-      }
-    </style>
-  </head>
-  <body>
-    <textarea id='scene'>
+    #render, .concurrency, .timing {
+      padding: 20px;
+      margin: 20px;
+      float: left;
+    }
+  </style>
+</head>
+<body>
+  <textarea id='scene'>
 {
   "width": 800,
   "height": 800,
@@ -201,25 +201,25 @@
 }
     </textarea>
 
-    <button disabled id='render'>Loading wasm...</button>
-    <div class='concurrency'>
-      <p id='concurrency-amt'>Concurrency: 1</p>
-      <br/>
-      <input disabled type="range" id="concurrency" min="0" max="1" />
-    </div>
-    <div id='timing'>
-      Render duration:
-      <p id='timing-val'></p>
-    </div>
+  <button disabled id='render'>Loading wasm...</button>
+  <div class='concurrency'>
+    <p id='concurrency-amt'>Concurrency: 1</p>
+    <br/>
+    <input disabled type="range" id="concurrency" min="0" max="1" />
+  </div>
+  <div id='timing'>
+    Render duration:
+    <p id='timing-val'></p>
+  </div>
 
 
-    <canvas id='canvas'></canvas>
+  <canvas id='canvas'></canvas>
 
-    <script>
-      document.getElementById('render').disabled = true;
-      document.getElementById('concurrency').disabled = true;
-    </script>
-    <script src='raytrace_parallel.js'></script>
-    <script src='index.js'></script>
-  </body>
+  <script>
+    document.getElementById('render').disabled = true;
+    document.getElementById('concurrency').disabled = true;
+  </script>
+  <script src='pkg/raytrace_parallel.js'></script>
+  <script src='index.js'></script>
+</body>
 </html>
diff --git a/examples/raytrace-parallel/worker.js b/examples/raytrace-parallel/worker.js
@@ -1,5 +1,5 @@
 // synchronously, using the browser, import out shim JS scripts
-importScripts('raytrace_parallel.js');
+importScripts('pkg/raytrace_parallel.js');
 
 // Wait for the main thread to send us the shared module/memory. Once we've got
 // it, initialize it all with the `wasm_bindgen` global we imported via

diff --git a/examples/wasm-audio-worklet/.gitignore b/examples/wasm-audio-worklet/.gitignore
@@ -0,0 +1 @@
+snippets
diff --git a/examples/wasm-audio-worklet/build.py b/examples/wasm-audio-worklet/build.py
@@ -49,7 +49,7 @@
             "wasm_audio_worklet.wasm",
         ),
         "--out-dir",
-        root_dir,
+        os.path.join(root_dir, "pkg"),
         "--target",
         "web",
         "--split-linked-modules",

diff --git a/examples/wasm-audio-worklet/index.html b/examples/wasm-audio-worklet/index.html
@@ -5,7 +5,7 @@
     </head>
     <body>
         <script type="module">
-            import init, {web_main} from "./wasm_audio_worklet.js";
+            import init, {web_main} from "./pkg/wasm_audio_worklet.js";
             async function run() {
                 await init();
                 web_main();