Skip to content

Commit 8d8dada

Browse files
Revert "Update Examples/Embedded to use the new Embedded trait"
This reverts commit 64fb506.
1 parent f32f3bc commit 8d8dada

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

Examples/Embedded/Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
// swift-tools-version:6.1
1+
// swift-tools-version:6.0
22

33
import PackageDescription
44

55
let package = Package(
66
name: "Embedded",
77
dependencies: [
8-
.package(name: "JavaScriptKit", path: "../../", traits: ["Embedded"]),
8+
.package(name: "JavaScriptKit", path: "../../"),
99
.package(url: "https://github.com/swiftwasm/swift-dlmalloc", branch: "0.1.0"),
1010
],
1111
targets: [

Examples/Embedded/build.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
22
package_dir="$(cd "$(dirname "$0")" && pwd)"
3-
swift package --package-path "$package_dir" \
3+
JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM=true \
4+
swift package --package-path "$package_dir" \
45
-c release --triple wasm32-unknown-none-wasm js

Plugins/PackageToJS/Sources/PackageToJSPlugin.swift

+5
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,11 @@ struct PackageToJSPlugin: CommandPlugin {
342342

343343
/// Check if the build is for embedded WebAssembly
344344
private func isBuildingForEmbedded(selfPackage: Package) -> Bool {
345+
if let rawValue = ProcessInfo.processInfo.environment["JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM"],
346+
let value = Bool(rawValue), value
347+
{
348+
return true
349+
}
345350
let coreTarget = selfPackage.targets.first { $0.name == "JavaScriptKit" }
346351
guard let swiftTarget = coreTarget as? SwiftSourceModuleTarget else {
347352
return false

0 commit comments

Comments
 (0)