Skip to content

Effectively revert the trait-based manifest change #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 28, 2025
Merged

Effectively revert the trait-based manifest change #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f32f3bc
Effectively revert the trait-based manifest change
kateinoigakukun Mar 28, 2025
8d8dada
Revert "Update Examples/Embedded to use the new `Embedded` trait"
kateinoigakukun Mar 28, 2025
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
4 changes: 2 additions & 2 deletions Examples/Embedded/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: [
Expand Down
3 changes: 2 additions & 1 deletion Examples/Embedded/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
42 changes: 22 additions & 20 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand Down
104 changes: 0 additions & 104 deletions [email protected]
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down