Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 2 additions & 22 deletions 24 Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -45,18 +44,9 @@ let package = Package(
dependencies: ["_CJavaScriptKit", "BridgeJSMacros"],
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"),
.macro(
Expand All @@ -78,12 +68,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(
Expand All @@ -94,12 +79,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(
Expand Down
5 changes: 0 additions & 5 deletions 5 Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -374,11 +374,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
Expand Down
7 changes: 1 addition & 6 deletions 7 Plugins/PackageToJS/Tests/ExampleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -352,21 +352,16 @@ extension Trait where Self == ConditionTrait {
}
}

// FIXME: This test fails on the current main snapshot
#if !compiler(>=6.3)
@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 // compiler(>=6.3)

@Test(.requireSwiftSDK)
func continuationLeakInTest_XCTest() throws {
Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.