Merge pull request #325 from swiftwasm/katei/revert-trait

Effectively revert the trait-based manifest change

Author: kateinoigakukun

Diff for: Examples/Embedded/Package.swift

@@ -1,11 +1,11 @@
-// swift-tools-version:6.1
+// swift-tools-version:6.0
 
 import PackageDescription
 
 let package = Package(
     name: "Embedded",
     dependencies: [
-        .package(name: "JavaScriptKit", path: "../../", traits: ["Embedded"]),
+        .package(name: "JavaScriptKit", path: "../../"),
         .package(url: "https://github.com/swiftwasm/swift-dlmalloc", branch: "0.1.0"),
     ],
     targets: [

Diff for: Examples/Embedded/build.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 package_dir="$(cd "$(dirname "$0")" && pwd)"
-swift package --package-path "$package_dir" \
+JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM=true \
+  swift package --package-path "$package_dir" \
   -c release --triple wasm32-unknown-none-wasm js

Diff for: Package.swift

@@ -1,8 +1,9 @@
-// swift-tools-version:6.1
+// swift-tools-version:6.0
 
 import PackageDescription
 
 // NOTE: needed for embedded customizations, ideally this will not be necessary at all in the future, or can be replaced with traits
+let shouldBuildForEmbedded = Context.environment["JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM"].flatMap(Bool.init) ?? false
 let useLegacyResourceBundling =
     Context.environment["JAVASCRIPTKIT_USE_LEGACY_RESOURCE_BUNDLING"].flatMap(Bool.init) ?? false
 
@@ -15,23 +16,22 @@ let package = Package(
         .library(name: "JavaScriptEventLoopTestSupport", targets: ["JavaScriptEventLoopTestSupport"]),
         .plugin(name: "PackageToJS", targets: ["PackageToJS"]),
     ],
-    traits: [
-        "Embedded"
-    ],
     targets: [
         .target(
             name: "JavaScriptKit",
             dependencies: ["_CJavaScriptKit"],
             exclude: useLegacyResourceBundling ? [] : ["Runtime"],
             resources: useLegacyResourceBundling ? [.copy("Runtime")] : [],
-            cSettings: [
-                .unsafeFlags(["-fdeclspec"], .when(traits: ["Embedded"]))
-            ],
-            swiftSettings: [
-                .enableExperimentalFeature("Embedded", .when(traits: ["Embedded"])),
-                .enableExperimentalFeature("Extern", .when(traits: ["Embedded"])),
-                .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"], .when(traits: ["Embedded"])),
-            ]
+            cSettings: shouldBuildForEmbedded
+                ? [
+                    .unsafeFlags(["-fdeclspec"])
+                ] : nil,
+            swiftSettings: shouldBuildForEmbedded
+                ? [
+                    .enableExperimentalFeature("Embedded"),
+                    .enableExperimentalFeature("Extern"),
+                    .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"]),
+                ] : nil
         ),
         .target(name: "_CJavaScriptKit"),
         .testTarget(
@@ -45,10 +45,11 @@ let package = Package(
         .target(
             name: "JavaScriptBigIntSupport",
             dependencies: ["_CJavaScriptBigIntSupport", "JavaScriptKit"],
-            swiftSettings: [
-                .enableExperimentalFeature("Embedded", .when(traits: ["Embedded"])),
-                .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"], .when(traits: ["Embedded"])),
-            ]
+            swiftSettings: shouldBuildForEmbedded
+                ? [
+                    .enableExperimentalFeature("Embedded"),
+                    .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"]),
+                ] : []
         ),
         .target(name: "_CJavaScriptBigIntSupport", dependencies: ["_CJavaScriptKit"]),
         .testTarget(
@@ -59,10 +60,11 @@ let package = Package(
         .target(
             name: "JavaScriptEventLoop",
             dependencies: ["JavaScriptKit", "_CJavaScriptEventLoop"],
-            swiftSettings: [
-                .enableExperimentalFeature("Embedded", .when(traits: ["Embedded"])),
-                .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"], .when(traits: ["Embedded"])),
-            ]
+            swiftSettings: shouldBuildForEmbedded
+                ? [
+                    .enableExperimentalFeature("Embedded"),
+                    .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"]),
+                ] : []
         ),
         .target(name: "_CJavaScriptEventLoop"),
         .testTarget(

Diff for: [email protected]

@@ -342,6 +342,11 @@ struct PackageToJSPlugin: CommandPlugin {
 
     /// Check if the build is for embedded WebAssembly
     private func isBuildingForEmbedded(selfPackage: Package) -> Bool {
+        if let rawValue = ProcessInfo.processInfo.environment["JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM"],
+            let value = Bool(rawValue), value
+        {
+            return true
+        }
         let coreTarget = selfPackage.targets.first { $0.name == "JavaScriptKit" }
         guard let swiftTarget = coreTarget as? SwiftSourceModuleTarget else {
             return false