Drop Embedded Swift with 6.1 and earlier and remove JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM

Author: kateinoigakukun

Examples/Embedded/build.sh

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

Package.swift

@@ -4,7 +4,6 @@ import CompilerPluginSupport
 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
 
@@ -36,18 +35,9 @@ let package = Package(
             dependencies: ["_CJavaScriptKit"],
             exclude: useLegacyResourceBundling ? [] : ["Runtime"],
             resources: useLegacyResourceBundling ? [.copy("Runtime")] : [],
-            cSettings: shouldBuildForEmbedded
-                ? [
-                    .unsafeFlags(["-fdeclspec"])
-                ] : nil,
             swiftSettings: [
                 .enableExperimentalFeature("Extern")
             ]
-                + (shouldBuildForEmbedded
-                    ? [
-                        .enableExperimentalFeature("Embedded"),
-                        .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"]),
-                    ] : [])
         ),
         .target(name: "_CJavaScriptKit"),
         .testTarget(
@@ -60,12 +50,7 @@ let package = Package(
 
         .target(
             name: "JavaScriptBigIntSupport",
-            dependencies: ["_CJavaScriptBigIntSupport", "JavaScriptKit"],
-            swiftSettings: shouldBuildForEmbedded
-                ? [
-                    .enableExperimentalFeature("Embedded"),
-                    .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"]),
-                ] : []
+            dependencies: ["_CJavaScriptBigIntSupport", "JavaScriptKit"]
         ),
         .target(name: "_CJavaScriptBigIntSupport", dependencies: ["_CJavaScriptKit"]),
         .testTarget(
@@ -75,12 +60,7 @@ let package = Package(
 
         .target(
             name: "JavaScriptEventLoop",
-            dependencies: ["JavaScriptKit", "_CJavaScriptEventLoop"],
-            swiftSettings: shouldBuildForEmbedded
-                ? [
-                    .enableExperimentalFeature("Embedded"),
-                    .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"]),
-                ] : []
+            dependencies: ["JavaScriptKit", "_CJavaScriptEventLoop"]
         ),
         .target(name: "_CJavaScriptEventLoop"),
         .testTarget(

Plugins/PackageToJS/Sources/PackageToJSPlugin.swift

@@ -376,11 +376,6 @@ 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

Plugins/PackageToJS/Tests/ExampleTests.swift

@@ -323,30 +323,30 @@ extension Trait where Self == ConditionTrait {
         }
     }
 
+    #if compiler(>=6.2)
     @Test(.requireEmbeddedSwiftInToolchain(triple: "wasm32-unknown-none-wasm"))
     func embeddedWasmUnknownNone() throws {
         try withPackage(at: "Examples/Embedded") { packageDir, _, runSwift in
             try runSwift(
                 ["package", "--triple", "wasm32-unknown-none-wasm", "js", "-c", "release"],
-                [
-                    "JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM": "true"
-                ]
+                [:]
             )
         }
     }
+    #endif
 
+    #if compiler(>=6.2)
     @Test(.requireEmbeddedSwiftInSwiftSDK())
     func embeddedWasmUnknownWasi() throws {
         let swiftSDKID = try #require(Self.getEmbeddedSwiftSDKID())
         try withPackage(at: "Examples/Embedded") { packageDir, _, runSwift in
             try runSwift(
                 ["package", "--swift-sdk", swiftSDKID, "js", "-c", "release"],
-                [
-                    "JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM": "true"
-                ]
+                [:]
             )
         }
     }
+    #endif
 
     @Test(.requireSwiftSDK)
     func continuationLeakInTest_XCTest() throws {