swiftwasm · kateinoigakukun · Mar 13, 2025 · Feb 28, 2025
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@ node_modules
 xcuserdata/
 .swiftpm
 .vscode
+Examples/*/Bundle
+Examples/*/package-lock.json
diff --git a/Examples/Basic/Package.swift b/Examples/Basic/Package.swift
@@ -17,5 +17,5 @@ let package = Package(
             ]
         )
     ],
-    swiftLanguageVersions: [.v5]
+    swiftLanguageModes: [.v5]
 )
diff --git a/Examples/Basic/build.sh b/Examples/Basic/build.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
-swift build --swift-sdk "${SWIFT_SDK_ID:-wasm32-unknown-wasi}" -Xswiftc -Xclang-linker -Xswiftc -mexec-model=reactor -Xlinker --export=__main_argc_argv
+set -ex
+swift package --swift-sdk "${SWIFT_SDK_ID:-wasm32-unknown-wasi}" -c "${1:-debug}" js --use-cdn
diff --git a/Examples/Basic/index.html b/Examples/Basic/index.html
@@ -6,7 +6,10 @@
 </head>
 
 <body>
-  <script src="./index.js" type="module"></script>
+  <script type="module">
+    import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js";
+    await init(fetch("./.build/plugins/PackageToJS/outputs/Package/main.wasm"));
+  </script>
 </body>
 
 </html>
diff --git a/Examples/Basic/index.js b/Examples/Basic/index.js
diff --git a/Examples/Embedded/_Runtime b/Examples/Embedded/_Runtime
diff --git a/Examples/Embedded/build.sh b/Examples/Embedded/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 package_dir="$(cd "$(dirname "$0")" && pwd)"
 JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM=true \
-  swift build --package-path "$package_dir" --product EmbeddedApp \
-  -c release --triple wasm32-unknown-none-wasm
+  swift package --package-path "$package_dir" \
+  -c release --triple wasm32-unknown-none-wasm js
diff --git a/Examples/Embedded/index.html b/Examples/Embedded/index.html
@@ -6,7 +6,10 @@
 </head>
 
 <body>
-  <script src="./index.js" type="module"></script>
+  <script type="module">
+    import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js";
+    await init(fetch("./.build/plugins/PackageToJS/outputs/Package/main.wasm"));
+  </script>
 </body>
 
 </html>
diff --git a/Examples/Embedded/index.js b/Examples/Embedded/index.js
diff --git a/Examples/Multithreading/Sources/JavaScript/index.js b/Examples/Multithreading/Sources/JavaScript/index.js
diff --git a/Examples/Multithreading/Sources/JavaScript/instantiate.js b/Examples/Multithreading/Sources/JavaScript/instantiate.js
diff --git a/Examples/Multithreading/Sources/JavaScript/worker.js b/Examples/Multithreading/Sources/JavaScript/worker.js
diff --git a/Examples/Multithreading/build.sh b/Examples/Multithreading/build.sh
@@ -1 +1,3 @@
-swift build --swift-sdk "${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}" -Xswiftc -Xclang-linker -Xswiftc -mexec-model=reactor -Xlinker --export=__main_argc_argv -c release -Xswiftc -g
+swift package --swift-sdk "${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}" -c release \
+    plugin --allow-writing-to-package-directory \
+    js --use-cdn --output ./Bundle
diff --git a/Examples/Multithreading/index.html b/Examples/Multithreading/index.html
@@ -27,25 +27,28 @@
 </head>
 
 <body>
-  <script type="module" src="Sources/JavaScript/index.js"></script>
+  <script type="module">
+    import { init } from "./Bundle/index.js"
+    init(fetch(new URL("./Bundle/main.wasm", import.meta.url)));
+  </script>
   <h1>Threading Example</h1>
   <p>
-    <div>
-      <label for="background">Background:</label>
-      <input id="background" type="checkbox" checked>
-    </div>
-    <div>
-      <label for="size">Size:</label>
-      <input id="size" type="number" value="800">
-    </div>
-    <div>
-      <label for="concurrency">Concurrency:</label>
-      <input id="concurrency" type="number">
-      <button id="render-button">Render</button>
-    </div>
+  <div>
+    <label for="background">Background:</label>
+    <input id="background" type="checkbox" checked>
+  </div>
+  <div>
+    <label for="size">Size:</label>
+    <input id="size" type="number" value="800">
+  </div>
+  <div>
+    <label for="concurrency">Concurrency:</label>
+    <input id="concurrency" type="number">
+    <button id="render-button">Render</button>
+  </div>
   </p>
   <p>
-    <div id="loading-emoji" class="loading-emoji">🧵</div>
+  <div id="loading-emoji" class="loading-emoji">🧵</div>
   </p>
   <p id="render-time"></p>
   <canvas id="canvas"></canvas>

diff --git a/Examples/OffscrenCanvas/build.sh b/Examples/OffscrenCanvas/build.sh
@@ -1 +1,3 @@
-swift build --swift-sdk "${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}" -Xswiftc -Xclang-linker -Xswiftc -mexec-model=reactor -Xlinker --export=__main_argc_argv -c release -Xswiftc -g
+swift package --swift-sdk "${SWIFT_SDK_ID:-wasm32-unknown-wasip1-threads}" -c release \
+    plugin --allow-writing-to-package-directory \
+    js --use-cdn --output ./Bundle
diff --git a/Examples/OffscrenCanvas/index.html b/Examples/OffscrenCanvas/index.html
@@ -68,7 +68,10 @@
 </head>
 
 <body>
-  <script type="module" src="Sources/JavaScript/index.js"></script>
+  <script type="module">
+    import { init } from "./Bundle/index.js"
+    init(fetch(new URL("./Bundle/main.wasm", import.meta.url)));
+  </script>
   <h1>OffscreenCanvas Example</h1>
   <p>
   <div>

diff --git a/Examples/OffscrenCanvas/serve.json b/Examples/OffscrenCanvas/serve.json
diff --git a/Examples/OffscrenCanvas/serve.json b/Examples/OffscrenCanvas/serve.json
@@ -0,0 +1,14 @@
+{
+    "headers": [{
+        "source": "**/*",
+        "headers": [
+            {
+                "key": "Cross-Origin-Embedder-Policy",
+                "value": "require-corp"
+            }, {
+                "key": "Cross-Origin-Opener-Policy",
+                "value": "same-origin"
+            }
+        ]
+    }]
+}
diff --git a/Examples/Testing/.gitignore b/Examples/Testing/.gitignore
@@ -0,0 +1,8 @@
+.DS_Store
+/.build
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm/configuration/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc
diff --git a/Examples/Testing/Package.swift b/Examples/Testing/Package.swift
@@ -0,0 +1,28 @@
+// swift-tools-version: 6.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Counter",
+    products: [
+        // Products define the executables and libraries a package produces, making them visible to other packages.
+        .library(
+            name: "Counter",
+            targets: ["Counter"]),
+    ],
+    dependencies: [.package(name: "JavaScriptKit", path: "../../")],
+    targets: [
+        // Targets are the basic building blocks of a package, defining a module or a test suite.
+        // Targets can depend on other targets in this package and products from dependencies.
+        .target(
+            name: "Counter",
+            dependencies: [
+                .product(name: "JavaScriptKit", package: "JavaScriptKit")
+            ]),
+        .testTarget(
+            name: "CounterTests",
+            dependencies: ["Counter"]
+        ),
+    ]
+)
diff --git a/Examples/Testing/Sources/Counter/Counter.swift b/Examples/Testing/Sources/Counter/Counter.swift
@@ -0,0 +1,7 @@
+public struct Counter {
+    public private(set) var count = 0
+
+    public mutating func increment() {
+        count += 1
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,5 +17,5 @@ let package = Package( @@
                 ]
             )
         ],
-        swiftLanguageVersions: [.v5]
+        swiftLanguageModes: [.v5]
     )