From 9b9828ec15feb3e8e1ef9cc69bce338826551e46 Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Tue, 18 Aug 2026 20:37:38 +0900
Subject: [PATCH 01/10] PackageToJS: Derive WASI and shared memory support from
 wasm imports

The SwiftBuild backend's build directory doesn't encode the target triple, so
detect the traits derived from it by parsing the imports of the product binary
instead. The imports are now parsed as a part of the packaging build graph.
---
 .github/workflows/test.yml                    |  15 +-
 .../Sources/PlayBridgeJS/main.swift           |   2 +-
 Makefile                                      |   3 +-
 .../Sources/BridgeJSLink/BridgeJSLink.swift   |  11 +-
 .../BridgeJSToolInternal.swift                |   2 +-
 .../BridgeJSToolTests/BridgeJSLinkTests.swift |  14 +-
 .../ImportedJSModuleRegistryTests.swift       |   2 +-
 Plugins/PackageToJS/Sources/PackageToJS.swift | 153 ++++++++++++------
 .../Sources/PackageToJSPlugin.swift           |   3 +-
 .../Tests/PackagingPlannerTests.swift         |  59 ++++++-
 .../planBuild_debug.json                      |  80 ++++-----
 .../planBuild_release.json                    |  80 ++++-----
 .../planBuild_release_dwarf.json              |  80 ++++-----
 .../planBuild_release_name.json               |  80 ++++-----
 .../planBuild_release_no_optimize.json        |  80 ++++-----
 .../PackagingPlannerTests/planTestBuild.json  | 104 ++++++------
 16 files changed, 439 insertions(+), 329 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0458dec5d..a9e90c175 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,9 +14,10 @@ jobs:
         entry:
           - os: ubuntu-24.04
             toolchain:
-              download-url: https://download.swift.org/development/ubuntu2404/swift-DEVELOPMENT-SNAPSHOT-2026-05-27-a/swift-DEVELOPMENT-SNAPSHOT-2026-05-27-a-ubuntu24.04.tar.gz
+              download-url: https://download.swift.org/development/ubuntu2404/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a-ubuntu24.04.tar.gz
             wasi-backend: Node
             target: "wasm32-unknown-wasip1"
+            build-system: swiftbuild
             env: |
               JAVASCRIPTKIT_DISABLE_TRACING_TRAIT=1
           - os: ubuntu-24.04
@@ -24,11 +25,13 @@ jobs:
               download-url: https://download.swift.org/swift-6.3-branch/ubuntu2404/swift-6.3-DEVELOPMENT-SNAPSHOT-2026-03-05-a/swift-6.3-DEVELOPMENT-SNAPSHOT-2026-03-05-a-ubuntu24.04.tar.gz
             wasi-backend: Node
             target: "wasm32-unknown-wasip1"
+            build-system: native
           - os: ubuntu-22.04
             toolchain:
-              download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2026-05-27-a/swift-DEVELOPMENT-SNAPSHOT-2026-05-27-a-ubuntu22.04.tar.gz
+              download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a-ubuntu22.04.tar.gz
             wasi-backend: Node
             target: "wasm32-unknown-wasip1-threads"
+            build-system: swiftbuild
 
     runs-on: ${{ matrix.entry.os }}
     env:
@@ -55,7 +58,7 @@ jobs:
           echo "SWIFT_BIN_PATH=$(dirname $(which swiftc))" >> $GITHUB_ENV
       - run: make bootstrap
       - run: npm run test:runtime
-      - run: make unittest
+      - run: make unittest BUILD_SYSTEM=${{ matrix.entry.build-system }}
         # Skip unit tests with uwasi because its proc_exit throws
         # unhandled promise rejection.
         if: ${{ matrix.entry.wasi-backend != 'MicroWASI' }}
@@ -144,7 +147,7 @@ jobs:
       - uses: actions/checkout@v7
       - uses: ./.github/actions/install-swift
         with:
-          download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2026-05-27-a/swift-DEVELOPMENT-SNAPSHOT-2026-05-27-a-ubuntu22.04.tar.gz
+          download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a-ubuntu22.04.tar.gz
       - run: make bootstrap
       - run: ./Utilities/bridge-js-generate.sh
       - name: Check if BridgeJS generated files are up-to-date
@@ -175,7 +178,7 @@ jobs:
       - uses: actions/checkout@v7
       - uses: ./.github/actions/install-swift
         with:
-          download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2026-05-27-a/swift-DEVELOPMENT-SNAPSHOT-2026-05-27-a-ubuntu22.04.tar.gz
+          download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a-ubuntu22.04.tar.gz
       - uses: swiftwasm/setup-swiftwasm@v2
         id: setup-wasm32-unknown-wasip1
         with: { target: wasm32-unknown-wasip1 }
@@ -198,7 +201,7 @@ jobs:
       - uses: actions/checkout@v7
       - uses: ./.github/actions/install-swift
         with:
-          download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2026-05-27-a/swift-DEVELOPMENT-SNAPSHOT-2026-05-27-a-ubuntu22.04.tar.gz
+          download-url: https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a/swift-DEVELOPMENT-SNAPSHOT-2026-08-11-a-ubuntu22.04.tar.gz
       - uses: swiftwasm/setup-swiftwasm@v2
         id: setup-wasm32-unknown-wasip1
         with: { target: wasm32-unknown-wasip1 }
diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift
index a30eb3b06..3a4063945 100644
--- a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift
+++ b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift
@@ -70,7 +70,7 @@ import class Foundation.JSONDecoder
             let importTS = ImportTS(progress: .silent, moduleName: moduleName, skeleton: $0)
             return try importTS.finalize()
         }
-        let linker = BridgeJSLink(skeletons: [skeleton], sharedMemory: false)
+        let linker = BridgeJSLink(skeletons: [skeleton])
         let linked = try linker.link()
 
         return PlayBridgeJSOutput(
diff --git a/Makefile b/Makefile
index 4b174e347..bbf031a00 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 SWIFT_SDK_ID ?=
+BUILD_SYSTEM ?= swiftbuild
 ifeq ($(JAVASCRIPTKIT_DISABLE_TRACING_TRAIT),1)
 	TRACING_ARGS :=
 else
@@ -16,7 +17,7 @@ unittest:
 		echo "SWIFT_SDK_ID is not set. Run 'swift sdk list' and pass a matching SDK, e.g. 'make unittest SWIFT_SDK_ID=<id>'."; \
 		exit 2; \
 	}
-	swift package --build-system native --swift-sdk "$(SWIFT_SDK_ID)" \
+	swift package --build-system "$(BUILD_SYSTEM)" --swift-sdk "$(SWIFT_SDK_ID)" \
 	    $(TRACING_ARGS) \
 	    --disable-sandbox \
 	    js test --prelude ./Tests/prelude.mjs -Xnode --expose-gc
diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
index 0e5bdc221..66bd6074b 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
@@ -9,7 +9,6 @@ import BridgeJSUtilities
 
 public struct BridgeJSLink {
     var skeletons: [BridgeJSSkeleton] = []
-    let sharedMemory: Bool
     /// Whether to track the lifetime of Swift objects.
     ///
     /// This is useful for debugging memory issues.
@@ -19,11 +18,9 @@ public struct BridgeJSLink {
     private let importedModuleRegistry = ImportedJSModuleRegistry()
 
     public init(
-        skeletons: [BridgeJSSkeleton] = [],
-        sharedMemory: Bool = false
+        skeletons: [BridgeJSSkeleton] = []
     ) {
         self.skeletons = skeletons
-        self.sharedMemory = sharedMemory
     }
 
     /// The identity mode from the config file, resolved from skeletons.
@@ -1173,7 +1170,7 @@ public struct BridgeJSLink {
     }
 
     /// Generates JavaScript output using CodeFragmentPrinter for better maintainability
-    private func generateJavaScript(data: LinkData) throws -> String {
+    private func generateJavaScript(data: LinkData, sharedMemory: Bool) throws -> String {
         let header = """
             // NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
             // DO NOT EDIT.
@@ -1346,7 +1343,7 @@ public struct BridgeJSLink {
         return printer.lines.joined(separator: "\n")
     }
 
-    public func link() throws -> (outputJs: String, outputDts: String) {
+    public func link(sharedMemory: Bool = false) throws -> (outputJs: String, outputDts: String) {
         intrinsicRegistry.reset()
         importedModuleRegistry.configure(skeletons: skeletons)
         intrinsicRegistry.classNamespaces = skeletons.reduce(into: [:]) { result, unified in
@@ -1359,7 +1356,7 @@ public struct BridgeJSLink {
         }
         intrinsicRegistry.typeOwnerModules = collectTypeOwnerModules()
         let data = try collectLinkData()
-        let outputJs = try generateJavaScript(data: data)
+        let outputJs = try generateJavaScript(data: data, sharedMemory: sharedMemory)
         let outputDts = generateTypeScript(data: data)
         return (outputJs, outputDts)
     }
diff --git a/Plugins/BridgeJS/Sources/BridgeJSToolInternal/BridgeJSToolInternal.swift b/Plugins/BridgeJS/Sources/BridgeJSToolInternal/BridgeJSToolInternal.swift
index 971c9608e..f57f50756 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSToolInternal/BridgeJSToolInternal.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSToolInternal/BridgeJSToolInternal.swift
@@ -110,7 +110,7 @@ import ArgumentParser
             let skeletonData = try readData(from: skeletonFile)
             skeletons.append(try JSONDecoder().decode(BridgeJSSkeleton.self, from: skeletonData))
         }
-        let link = BridgeJSLink(skeletons: skeletons, sharedMemory: false)
+        let link = BridgeJSLink(skeletons: skeletons)
         return try link.link()
     }
 
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift
index cab2aca6f..f96ec2d8d 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSLinkTests.swift
@@ -70,7 +70,7 @@ import Testing
         )
         importSwift.addSourceFile(sourceFile, inputFilePath: "\(name).swift")
         let importResult = try importSwift.finalize()
-        var bridgeJSLink = BridgeJSLink(sharedMemory: false)
+        var bridgeJSLink = BridgeJSLink()
         let encoder = JSONEncoder()
         encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
         let unifiedData = try encoder.encode(importResult)
@@ -99,8 +99,7 @@ import Testing
         let bridgeJSLink: BridgeJSLink = BridgeJSLink(
             skeletons: [
                 outputSkeleton
-            ],
-            sharedMemory: false
+            ]
         )
         try snapshot(bridgeJSLink: bridgeJSLink, name: name + ".Global")
     }
@@ -133,8 +132,7 @@ import Testing
             skeletons: [
                 globalSkeleton,
                 privateSkeleton,
-            ],
-            sharedMemory: false
+            ]
         )
         try snapshot(bridgeJSLink: bridgeJSLink, name: "MixedModules")
     }
@@ -151,7 +149,7 @@ import Testing
         )
         importSwift.addSourceFile(sourceFile, inputFilePath: "\(name).swift")
         let importResult = try importSwift.finalize()
-        var bridgeJSLink = BridgeJSLink(sharedMemory: false)
+        var bridgeJSLink = BridgeJSLink()
         let encoder = JSONEncoder()
         encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
         let unifiedData = try encoder.encode(importResult)
@@ -182,7 +180,7 @@ import Testing
         #expect(explicitlyUncachedClass?.identityMode == false)
 
         // Verify generated JS via snapshot
-        let bridgeJSLink = BridgeJSLink(skeletons: [outputSkeleton], sharedMemory: false)
+        let bridgeJSLink = BridgeJSLink(skeletons: [outputSkeleton])
         try snapshot(bridgeJSLink: bridgeJSLink, name: "IdentityModeClass.PerClass")
     }
 
@@ -206,7 +204,7 @@ import Testing
         #expect(explicitlyUncachedClass?.identityMode == false)
 
         // Verify generated JS via snapshot
-        let bridgeJSLink = BridgeJSLink(skeletons: [outputSkeleton], sharedMemory: false)
+        let bridgeJSLink = BridgeJSLink(skeletons: [outputSkeleton])
         try snapshot(bridgeJSLink: bridgeJSLink, name: "IdentityModeClass.ConfigPointer")
     }
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportedJSModuleRegistryTests.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportedJSModuleRegistryTests.swift
index 16c28be95..7c5d168d2 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportedJSModuleRegistryTests.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/ImportedJSModuleRegistryTests.swift
@@ -35,7 +35,7 @@ import Testing
     }
 
     private func importLines(_ skeletons: [BridgeJSSkeleton]) throws -> [String] {
-        var link = BridgeJSLink(sharedMemory: false)
+        var link = BridgeJSLink()
         let encoder = JSONEncoder()
         for skeleton in skeletons {
             _ = try link.addSkeletonFile(data: try encoder.encode(skeleton))
diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift
index c1d09af0a..076807e91 100644
--- a/Plugins/PackageToJS/Sources/PackageToJS.swift
+++ b/Plugins/PackageToJS/Sources/PackageToJS.swift
@@ -69,15 +69,31 @@ struct PackageToJS {
         var packageOptions: PackageOptions
     }
 
-    static func deriveBuildConfiguration(wasmProductArtifact: URL) -> (configuration: String, triple: String) {
+    /// Derives the build configuration from the path of the wasm product artifact.
+    /// Returns "debug" or "release"
+    static func deriveBuildConfiguration(wasmProductArtifact: URL) -> String {
+        // For "--build-system swiftbuild"
+        // e.g. path/to/.build/out/Products/Debug-webassembly-wasm32/Basic.wasm
+        // ref: https://github.com/swiftlang/swift-build/blob/48498f5450c85da3f8c09808168f0286d207329b/Sources/SWBCore/Core.swift#L631-L643
+        //
+        // For "--build-system native"
         // e.g. path/to/.build/wasm32-unknown-wasi/debug/Basic.wasm -> ("debug", "wasm32-unknown-wasi")
 
         // First, resolve symlink to get the actual path as SwiftPM 6.0 and earlier returns unresolved
         // symlink path for product artifact.
         let wasmProductArtifact = wasmProductArtifact.resolvingSymlinksInPath()
-        let buildConfiguration = wasmProductArtifact.deletingLastPathComponent().lastPathComponent
-        let triple = wasmProductArtifact.deletingLastPathComponent().deletingLastPathComponent().lastPathComponent
-        return (buildConfiguration, triple)
+        let swiftBuildSuffix = "-webassembly-wasm32"
+        let parentDirName = wasmProductArtifact.deletingLastPathComponent().lastPathComponent
+        if parentDirName.hasSuffix(swiftBuildSuffix) {
+            // This is SwiftBuild backend mode
+            let swiftBuildConfig = String(parentDirName.dropLast(swiftBuildSuffix.count))
+            guard let mappedConfig = ["Debug": "debug", "Release": "release"][swiftBuildConfig] else {
+                fatalError("Unknown SwiftPM build configuration: \(swiftBuildConfig)")
+            }
+            return mappedConfig
+        }
+        // This is native backend mode, the parent directory name is the build configuration
+        return parentDirName
     }
 
     static func runTest(testRunner: URL, currentDirectoryURL: URL, outputDir: URL, testOptions: TestOptions) throws {
@@ -426,8 +442,6 @@ struct PackagingPlanner {
     let wasmProductArtifact: BuildPath
     /// The build configuration
     let configuration: String
-    /// The target triple
-    let triple: String
     /// The system interface to use
     let system: any PackagingSystem
 
@@ -441,7 +455,6 @@ struct PackagingPlanner {
         wasmProductArtifact: BuildPath,
         wasmFilename: String,
         configuration: String,
-        triple: String,
         // NOTE: We should use `ProcessInfo.processInfo.arguments[0]` instead of `CommandLine.arguments[0]`
         // because the latter may not always be the full executable path (e.g. when invoked through PATH lookup).
         // https://github.com/swiftlang/swift-foundation/blob/f5143f96d01cdb6d280665de8221b75fc8631d95/Sources/FoundationEssentials/ProcessInfo/ProcessInfo.swift#L47
@@ -458,7 +471,6 @@ struct PackagingPlanner {
         self.selfPath = selfPath
         self.wasmProductArtifact = wasmProductArtifact
         self.configuration = configuration
-        self.triple = triple
         self.system = system
     }
 
@@ -469,7 +481,7 @@ struct PackagingPlanner {
         make: inout MiniMake,
         buildOptions: PackageToJS.BuildOptions
     ) throws -> MiniMake.TaskKey {
-        let (allTasks, _, _, _) = try planBuildInternal(
+        let (allTasks, _, _, _, _) = try planBuildInternal(
             make: &make,
             noOptimize: buildOptions.noOptimize,
             debugInfoFormat: buildOptions.debugInfoFormat
@@ -489,7 +501,8 @@ struct PackagingPlanner {
         allTasks: [MiniMake.TaskKey],
         outputDirTask: MiniMake.TaskKey,
         intermediatesDirTask: MiniMake.TaskKey,
-        packageJsonTask: MiniMake.TaskKey
+        packageJsonTask: MiniMake.TaskKey,
+        wasmImportsTask: MiniMake.TaskKey
     ) {
         // Prepare output directory
         let outputDirTask = make.addTask(
@@ -575,19 +588,29 @@ struct PackagingPlanner {
         }
         packageInputs.append(wasm)
 
-        let wasmImportsPath = intermediatesDir.appending(path: "wasm-imports.json")
+        // NOTE: The imports are parsed from the product artifact instead of the final .wasm
+        // file because wasm-opt removes unreferenced imports, and the presence of an import
+        // decides how the JavaScript glue code is generated.
+        let wasmImportsPath = self.wasmImportsPath
         let wasmImportsTask = make.addTask(
-            inputFiles: [selfPath, finalWasmPath],
-            inputTasks: [outputDirTask, intermediatesDirTask, wasm],
+            inputFiles: [selfPath, wasmProductArtifact],
+            inputTasks: [intermediatesDirTask],
             output: wasmImportsPath
         ) {
             let metadata = try parseImports(
-                moduleBytes: try Data(contentsOf: URL(fileURLWithPath: $1.resolve(path: finalWasmPath).path))
+                moduleBytes: try Data(contentsOf: URL(fileURLWithPath: $1.resolve(path: wasmProductArtifact).path))
             )
             let jsonEncoder = JSONEncoder()
             jsonEncoder.outputFormatting = .prettyPrinted
             let jsonData = try jsonEncoder.encode(metadata)
-            try system.writeFile(atPath: $1.resolve(path: $0.output).path, content: jsonData)
+            let outputPath = $1.resolve(path: $0.output)
+            // Every task consuming the imports depends on this file, so leave it untouched
+            // when the imports are unchanged. Rewriting it would give it a newer timestamp
+            // and re-run them (including `npm install`) for unrelated Swift source changes.
+            if let lastImports = try? Data(contentsOf: outputPath), lastImports == jsonData {
+                return
+            }
+            try system.writeFile(atPath: outputPath.path, content: jsonData)
         }
 
         packageInputs.append(wasmImportsTask)
@@ -606,6 +629,7 @@ struct PackagingPlanner {
             file: "Plugins/PackageToJS/Templates/package.json",
             output: "package.json",
             outputDirTask: outputDirTask,
+            wasmImportsTask: wasmImportsTask,
             inputFiles: [],
             inputTasks: []
         )
@@ -618,8 +642,13 @@ struct PackagingPlanner {
             let bridgeDts = outputDir.appending(path: "bridge-js.d.ts")
             let bridgeModules = outputDir.appending(path: "bridge-js-modules")
             packageInputs.append(
-                make.addTask(inputFiles: skeletonFiles + [selfPath], output: bridgeJs) { _, scope in
-                    let output = try bridge.link.link()
+                make.addTask(
+                    inputFiles: skeletonFiles + [selfPath, wasmImportsPath],
+                    inputTasks: [outputDirTask, wasmImportsTask],
+                    output: bridgeJs
+                ) { _, scope in
+                    let features = try Self.loadWasmFeatures(at: scope.resolve(path: wasmImportsPath))
+                    let output = try bridge.link.link(sharedMemory: features.sharedMemory)
                     try system.writeFile(
                         atPath: scope.resolve(path: bridgeJs).path,
                         content: Data(output.outputJs.utf8)
@@ -678,22 +707,20 @@ struct PackagingPlanner {
                     file: file,
                     output: output,
                     outputDirTask: outputDirTask,
-                    inputFiles: [wasmImportsPath],
-                    inputTasks: [platformsDirTask, wasmImportsTask],
-                    wasmImportsPath: wasmImportsPath
+                    wasmImportsTask: wasmImportsTask,
+                    inputFiles: [],
+                    inputTasks: [platformsDirTask]
                 )
             )
         }
-        return (packageInputs, outputDirTask, intermediatesDirTask, packageJsonTask)
+        return (packageInputs, outputDirTask, intermediatesDirTask, packageJsonTask, wasmImportsTask)
     }
 
     private func loadBridgeJS() throws -> (
         link: BridgeJSLink,
         modules: [JavaScriptModuleInput]
     ) {
-        var link = BridgeJSLink(
-            sharedMemory: Self.isSharedMemoryEnabled(triple: triple)
-        )
+        var link = BridgeJSLink()
         var moduleSources: [String: BuildPath] = [:]
 
         for input in skeletons {
@@ -735,7 +762,7 @@ struct PackagingPlanner {
     func planTestBuild(
         make: inout MiniMake
     ) throws -> (rootTask: MiniMake.TaskKey, binDir: BuildPath) {
-        var (allTasks, outputDirTask, intermediatesDirTask, packageJsonTask) = try planBuildInternal(
+        var (allTasks, outputDirTask, intermediatesDirTask, packageJsonTask, wasmImportsTask) = try planBuildInternal(
             make: &make,
             noOptimize: false,
             debugInfoFormat: .dwarf
@@ -779,6 +806,7 @@ struct PackagingPlanner {
                     file: file,
                     output: output,
                     outputDirTask: outputDirTask,
+                    wasmImportsTask: wasmImportsTask,
                     inputFiles: [],
                     inputTasks: [binDirTask]
                 )
@@ -797,9 +825,9 @@ struct PackagingPlanner {
         file: String,
         output: String,
         outputDirTask: MiniMake.TaskKey,
+        wasmImportsTask: MiniMake.TaskKey,
         inputFiles: [BuildPath],
-        inputTasks: [MiniMake.TaskKey],
-        wasmImportsPath: BuildPath? = nil
+        inputTasks: [MiniMake.TaskKey]
     ) -> MiniMake.TaskKey {
 
         struct Salt: Encodable {
@@ -808,9 +836,10 @@ struct PackagingPlanner {
         }
 
         let inputPath = selfPackageDir.appending(path: file)
-        let conditions: [String: Bool] = [
-            "USE_SHARED_MEMORY": Self.isSharedMemoryEnabled(triple: triple),
-            "IS_WASI": triple.hasPrefix("wasm32-unknown-wasi"),
+        // NOTE: The conditions derived from the .wasm binary are not part of the salt because
+        // they are not known until the imports are parsed. The imports file is an input of
+        // this task instead, so a change in them still re-runs the preprocessing.
+        let staticConditions: [String: Bool] = [
             "USE_WASI_CDN": options.useCDN,
             "HAS_BRIDGE": skeletons.count > 0,
             "HAS_IMPORTS": skeletons.count > 0,
@@ -821,30 +850,26 @@ struct PackagingPlanner {
             "PACKAGE_TO_JS_MODULE_PATH": wasmFilename,
             "PACKAGE_TO_JS_PACKAGE_NAME": options.packageName ?? packageId.lowercased(),
         ]
-        let salt = Salt(conditions: conditions, substitutions: constantSubstitutions)
+        let salt = Salt(conditions: staticConditions, substitutions: constantSubstitutions)
+        let wasmImportsPath = self.wasmImportsPath
 
         return make.addTask(
-            inputFiles: [selfPath, inputPath] + inputFiles,
-            inputTasks: [outputDirTask] + inputTasks,
+            inputFiles: [selfPath, inputPath, wasmImportsPath] + inputFiles,
+            inputTasks: [outputDirTask, wasmImportsTask] + inputTasks,
             output: outputDir.appending(path: output),
             salt: salt
         ) {
             var substitutions = constantSubstitutions
+            let features = try Self.loadWasmFeatures(at: $1.resolve(path: wasmImportsPath))
 
-            if let wasmImportsPath = wasmImportsPath {
-                let wasmImportsPath = $1.resolve(path: wasmImportsPath)
-                let importEntries = try JSONDecoder().decode(
-                    [ImportEntry].self,
-                    from: Data(contentsOf: wasmImportsPath)
-                )
-                let memoryImport = importEntries.first {
-                    $0.module == "env" && $0.name == "memory"
-                }
-                if case .memory(let type) = memoryImport?.kind {
-                    substitutions["PACKAGE_TO_JS_MEMORY_INITIAL"] = type.minimum.description
-                    substitutions["PACKAGE_TO_JS_MEMORY_MAXIMUM"] = (type.maximum ?? type.minimum).description
-                    substitutions["PACKAGE_TO_JS_MEMORY_SHARED"] = type.shared.description
-                }
+            var conditions = staticConditions
+            conditions["USE_SHARED_MEMORY"] = features.sharedMemory
+            conditions["IS_WASI"] = features.isWASI
+
+            if let memory = features.importedMemory {
+                substitutions["PACKAGE_TO_JS_MEMORY_INITIAL"] = memory.minimum.description
+                substitutions["PACKAGE_TO_JS_MEMORY_MAXIMUM"] = (memory.maximum ?? memory.minimum).description
+                substitutions["PACKAGE_TO_JS_MEMORY_SHARED"] = memory.shared.description
             }
 
             let inputPath = $1.resolve(path: inputPath)
@@ -855,8 +880,38 @@ struct PackagingPlanner {
         }
     }
 
-    private static func isSharedMemoryEnabled(triple: String) -> Bool {
-        return triple == "wasm32-unknown-wasip1-threads"
+    /// The path to the JSON file describing the imports of the product .wasm file
+    var wasmImportsPath: BuildPath {
+        intermediatesDir.appending(path: "wasm-imports.json")
+    }
+
+    static func loadWasmFeatures(at wasmImportsPath: URL) throws -> WasmFeatures {
+        let importEntries = try JSONDecoder().decode(
+            [ImportEntry].self,
+            from: Data(contentsOf: wasmImportsPath)
+        )
+        return WasmFeatures(imports: importEntries)
+    }
+}
+
+/// The traits of a .wasm binary that affect the JavaScript code generated for it
+struct WasmFeatures {
+    /// Whether the module requires a WASI implementation to be instantiated
+    let isWASI: Bool
+    /// Whether the module uses shared memory
+    let sharedMemory: Bool
+    /// The type of the memory imported by the module if any
+    let importedMemory: MemoryType?
+
+    init(imports: [ImportEntry]) {
+        self.isWASI = imports.contains { $0.module == "wasi_snapshot_preview1" }
+        let memoryImport = imports.first { $0.module == "env" && $0.name == "memory" }
+        if case .memory(let type) = memoryImport?.kind {
+            self.importedMemory = type
+        } else {
+            self.importedMemory = nil
+        }
+        self.sharedMemory = self.importedMemory?.shared ?? false
     }
 }
 
diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
index cc16de20a..ad37b9a04 100644
--- a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
+++ b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
@@ -799,7 +799,7 @@ extension PackagingPlanner {
         wasmFilename: String
     ) {
         let outputBaseName = outputDir.lastPathComponent
-        let (configuration, triple) = PackageToJS.deriveBuildConfiguration(wasmProductArtifact: wasmProductArtifact)
+        let configuration = PackageToJS.deriveBuildConfiguration(wasmProductArtifact: wasmProductArtifact)
         let system = DefaultPackagingSystem(printWarning: printStderr, which: which(_:))
         self.init(
             options: options,
@@ -813,7 +813,6 @@ extension PackagingPlanner {
             wasmProductArtifact: BuildPath(absolute: wasmProductArtifact.path),
             wasmFilename: wasmFilename,
             configuration: configuration,
-            triple: triple,
             system: system
         )
     }
diff --git a/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift b/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift
index 12187a201..4cff48e6c 100644
--- a/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift
+++ b/Plugins/PackageToJS/Tests/PackagingPlannerTests.swift
@@ -76,7 +76,6 @@ import Testing
             wasmProductArtifact: BuildPath(prefix: "WASM_PRODUCT_ARTIFACT"),
             wasmFilename: "main.wasm",
             configuration: configuration,
-            triple: "wasm32-unknown-wasi",
             selfPath: BuildPath(prefix: "PLANNER_SOURCE_PATH"),
             system: system
         )
@@ -106,7 +105,6 @@ import Testing
             wasmProductArtifact: BuildPath(prefix: "WASM_PRODUCT_ARTIFACT"),
             wasmFilename: "main.wasm",
             configuration: "debug",
-            triple: "wasm32-unknown-wasi",
             selfPath: BuildPath(prefix: "PLANNER_SOURCE_PATH"),
             system: system
         )
@@ -172,7 +170,6 @@ import Testing
                 wasmProductArtifact: BuildPath(absolute: wasm.path),
                 wasmFilename: "main.wasm",
                 configuration: "debug",
-                triple: "wasm32-unknown-wasi",
                 selfPath: BuildPath(absolute: plannerSource.path),
                 system: system
             )
@@ -266,7 +263,6 @@ import Testing
                 wasmProductArtifact: BuildPath(absolute: wasm.path),
                 wasmFilename: "main.wasm",
                 configuration: "debug",
-                triple: "wasm32-unknown-wasi",
                 selfPath: BuildPath(absolute: plannerSource.path),
                 system: system
             )
@@ -345,7 +341,6 @@ import Testing
                 wasmProductArtifact: BuildPath(absolute: wasm.path),
                 wasmFilename: "main.wasm",
                 configuration: "debug",
-                triple: "wasm32-unknown-wasi",
                 selfPath: BuildPath(absolute: plannerSource.path),
                 system: system
             )
@@ -370,3 +365,57 @@ import Testing
         }
     }
 }
+
+@Suite struct WasmFeaturesTests {
+    private func memoryImport(shared: Bool) -> ImportEntry {
+        ImportEntry(
+            module: "env",
+            name: "memory",
+            kind: .memory(type: MemoryType(minimum: 17, maximum: 65536, shared: shared, index: .i32))
+        )
+    }
+
+    @Test func noImports() {
+        let features = WasmFeatures(imports: [])
+        #expect(features.isWASI == false)
+        #expect(features.sharedMemory == false)
+        #expect(features.importedMemory == nil)
+    }
+
+    @Test func wasiImport() {
+        let features = WasmFeatures(imports: [
+            ImportEntry(module: "wasi_snapshot_preview1", name: "proc_exit", kind: .function)
+        ])
+        #expect(features.isWASI == true)
+        #expect(features.sharedMemory == false)
+    }
+
+    @Test func unsharedMemoryImport() {
+        let features = WasmFeatures(imports: [memoryImport(shared: false)])
+        #expect(features.sharedMemory == false)
+        #expect(features.importedMemory?.minimum == 17)
+    }
+
+    @Test func sharedMemoryImport() {
+        let features = WasmFeatures(imports: [
+            memoryImport(shared: true),
+            ImportEntry(module: "wasi", name: "thread-spawn", kind: .function),
+        ])
+        #expect(features.sharedMemory == true)
+        #expect(features.isWASI == false)
+    }
+
+    /// Only the memory imported as "env.memory" is the one instantiated by the generated
+    /// JavaScript, so a memory imported under another name must not be picked up.
+    @Test func otherMemoryImport() {
+        let features = WasmFeatures(imports: [
+            ImportEntry(
+                module: "other",
+                name: "memory",
+                kind: .memory(type: MemoryType(minimum: 1, maximum: nil, shared: true, index: .i32))
+            )
+        ])
+        #expect(features.sharedMemory == false)
+        #expect(features.importedMemory == nil)
+    }
+}
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json
index 49cee1f90..fefcda9b2 100644
--- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json
+++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json
@@ -17,13 +17,11 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$OUTPUT\/main.wasm"
+      "$WASM_PRODUCT_ARTIFACT"
     ],
     "output" : "$INTERMEDIATES\/wasm-imports.json",
     "wants" : [
-      "$OUTPUT",
-      "$INTERMEDIATES",
-      "$OUTPUT\/main.wasm"
+      "$INTERMEDIATES"
     ]
   },
   {
@@ -48,11 +46,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -65,11 +63,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -82,11 +80,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -99,11 +97,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -125,12 +123,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/package.json",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
-      "$OUTPUT"
+      "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json"
     ]
   },
   {
@@ -155,11 +155,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -172,11 +172,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -189,11 +189,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.worker.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -206,11 +206,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -223,11 +223,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -240,11 +240,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -257,11 +257,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json
index 6b1e1090c..32fc2b670 100644
--- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json
+++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json
@@ -31,13 +31,11 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$OUTPUT\/main.wasm"
+      "$WASM_PRODUCT_ARTIFACT"
     ],
     "output" : "$INTERMEDIATES\/wasm-imports.json",
     "wants" : [
-      "$OUTPUT",
-      "$INTERMEDIATES",
-      "$OUTPUT\/main.wasm"
+      "$INTERMEDIATES"
     ]
   },
   {
@@ -62,11 +60,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -79,11 +77,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -96,11 +94,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -113,11 +111,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -140,12 +138,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/package.json",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
-      "$OUTPUT"
+      "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json"
     ]
   },
   {
@@ -170,11 +170,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -187,11 +187,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -204,11 +204,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.worker.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -221,11 +221,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -238,11 +238,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -255,11 +255,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -272,11 +272,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json
index 49cee1f90..fefcda9b2 100644
--- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json
+++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json
@@ -17,13 +17,11 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$OUTPUT\/main.wasm"
+      "$WASM_PRODUCT_ARTIFACT"
     ],
     "output" : "$INTERMEDIATES\/wasm-imports.json",
     "wants" : [
-      "$OUTPUT",
-      "$INTERMEDIATES",
-      "$OUTPUT\/main.wasm"
+      "$INTERMEDIATES"
     ]
   },
   {
@@ -48,11 +46,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -65,11 +63,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -82,11 +80,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -99,11 +97,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -125,12 +123,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/package.json",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
-      "$OUTPUT"
+      "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json"
     ]
   },
   {
@@ -155,11 +155,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -172,11 +172,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -189,11 +189,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.worker.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -206,11 +206,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -223,11 +223,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -240,11 +240,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -257,11 +257,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json
index 6b1e1090c..32fc2b670 100644
--- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json
+++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json
@@ -31,13 +31,11 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$OUTPUT\/main.wasm"
+      "$WASM_PRODUCT_ARTIFACT"
     ],
     "output" : "$INTERMEDIATES\/wasm-imports.json",
     "wants" : [
-      "$OUTPUT",
-      "$INTERMEDIATES",
-      "$OUTPUT\/main.wasm"
+      "$INTERMEDIATES"
     ]
   },
   {
@@ -62,11 +60,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -79,11 +77,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -96,11 +94,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -113,11 +111,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -140,12 +138,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/package.json",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
-      "$OUTPUT"
+      "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json"
     ]
   },
   {
@@ -170,11 +170,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -187,11 +187,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -204,11 +204,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.worker.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -221,11 +221,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -238,11 +238,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -255,11 +255,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -272,11 +272,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json
index 49cee1f90..fefcda9b2 100644
--- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json
+++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json
@@ -17,13 +17,11 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$OUTPUT\/main.wasm"
+      "$WASM_PRODUCT_ARTIFACT"
     ],
     "output" : "$INTERMEDIATES\/wasm-imports.json",
     "wants" : [
-      "$OUTPUT",
-      "$INTERMEDIATES",
-      "$OUTPUT\/main.wasm"
+      "$INTERMEDIATES"
     ]
   },
   {
@@ -48,11 +46,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -65,11 +63,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -82,11 +80,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -99,11 +97,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -125,12 +123,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/package.json",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
-      "$OUTPUT"
+      "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json"
     ]
   },
   {
@@ -155,11 +155,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -172,11 +172,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -189,11 +189,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.worker.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -206,11 +206,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -223,11 +223,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -240,11 +240,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -257,11 +257,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json
index 5f16f6e8e..b6b382ae3 100644
--- a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json
+++ b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json
@@ -31,13 +31,11 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$OUTPUT\/main.wasm"
+      "$WASM_PRODUCT_ARTIFACT"
     ],
     "output" : "$INTERMEDIATES\/wasm-imports.json",
     "wants" : [
-      "$OUTPUT",
-      "$INTERMEDIATES",
-      "$OUTPUT\/main.wasm"
+      "$INTERMEDIATES"
     ]
   },
   {
@@ -70,12 +68,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/bin\/test.js"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/bin\/test.js",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/bin\/test.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json",
       "$OUTPUT\/bin"
     ]
   },
@@ -89,11 +89,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -106,11 +106,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/index.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -123,11 +123,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -140,11 +140,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/instantiate.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -166,12 +166,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/package.json",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/package.json",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
-      "$OUTPUT"
+      "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json"
     ]
   },
   {
@@ -196,11 +198,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -213,11 +215,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -230,11 +232,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/browser.worker.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -247,11 +249,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -264,11 +266,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/platforms\/node.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -281,11 +283,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -298,11 +300,11 @@
       "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/runtime.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
-      "$OUTPUT\/platforms",
-      "$INTERMEDIATES\/wasm-imports.json"
+      "$INTERMEDIATES\/wasm-imports.json",
+      "$OUTPUT\/platforms"
     ]
   },
   {
@@ -311,12 +313,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.browser.html"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.browser.html",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/test.browser.html",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json",
       "$OUTPUT\/bin"
     ]
   },
@@ -326,12 +330,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.d.ts"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.d.ts",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/test.d.ts",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json",
       "$OUTPUT\/bin"
     ]
   },
@@ -341,12 +347,14 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.js"
+      "$SELF_PACKAGE\/Plugins\/PackageToJS\/Templates\/test.js",
+      "$INTERMEDIATES\/wasm-imports.json"
     ],
     "output" : "$OUTPUT\/test.js",
-    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIklTX1dBU0kiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfU0hBUkVEX01FTU9SWSI6ZmFsc2UsIlVTRV9XQVNJX0NETiI6ZmFsc2V9LCJzdWJzdGl0dXRpb25zIjp7IlBBQ0tBR0VfVE9fSlNfTU9EVUxFX1BBVEgiOiJtYWluLndhc20iLCJQQUNLQUdFX1RPX0pTX1BBQ0tBR0VfTkFNRSI6InRlc3QifX0=",
+    "salt" : "eyJjb25kaXRpb25zIjp7IkhBU19CUklER0UiOmZhbHNlLCJIQVNfSU1QT1JUUyI6ZmFsc2UsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX0JST1dTRVIiOnRydWUsIlRBUkdFVF9ERUZBVUxUX1BMQVRGT1JNX05PREUiOmZhbHNlLCJVU0VfV0FTSV9DRE4iOmZhbHNlfSwic3Vic3RpdHV0aW9ucyI6eyJQQUNLQUdFX1RPX0pTX01PRFVMRV9QQVRIIjoibWFpbi53YXNtIiwiUEFDS0FHRV9UT19KU19QQUNLQUdFX05BTUUiOiJ0ZXN0In19",
     "wants" : [
       "$OUTPUT",
+      "$INTERMEDIATES\/wasm-imports.json",
       "$OUTPUT\/bin"
     ]
   },

From 95448341b30dab4c71599b5dc01367094add02ad Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Tue, 18 Aug 2026 21:45:51 +0900
Subject: [PATCH 02/10] Avoid `import var Foundation.stderr`

```
$ echo "@preconcurrency import var Foundation.stderr" | swiftly run +main-snapshot-2026-08-11 swiftc  - -o /dev/null
<stdin>:1:28: error: ambiguous name 'stderr' in module 'Foundation'
1 | @preconcurrency import var Foundation.stderr
  |                            `- error: ambiguous name 'stderr' in module 'Foundation'
2 |

Glibc.stderr:1:32: note: found this candidate
1 | nonisolated(unsafe) public var stderr: UnsafeMutablePointer<FILE>! { get }
  |                                `- note: found this candidate

/usr/include/stdio.h:151:14: note: found this candidate
149 | extern FILE *stdin;               /* Standard input stream.  */
150 | extern FILE *stdout;              /* Standard output stream.  */
151 | extern FILE *stderr;              /* Standard error output stream.  */
    |              `- note: found this candidate
152 | /* C89/C99 say they're macros.  Make them happy.  */
153 | #define stdin stdin
```

https://github.com/swiftlang/swift/pull/89891
---
 .../BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift | 12 +++++++++++-
 Plugins/PackageToJS/Sources/PackageToJSPlugin.swift  | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift
index 96d9c4705..d3d9a484e 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift
@@ -2,7 +2,6 @@
 @preconcurrency import func Foundation.fputs
 @preconcurrency import func Foundation.open
 @preconcurrency import func Foundation.strerror
-@preconcurrency import var Foundation.stderr
 @preconcurrency import var Foundation.errno
 @preconcurrency import var Foundation.O_WRONLY
 @preconcurrency import var Foundation.O_CREAT
@@ -15,6 +14,17 @@
 @preconcurrency import class Foundation.FileManager
 @preconcurrency import class Foundation.JSONDecoder
 @preconcurrency import class Foundation.ProcessInfo
+
+#if canImport(Darwin)
+@preconcurrency import var Darwin.stderr
+#elseif canImport(Glibc)
+@preconcurrency import var Glibc.stderr
+#elseif canImport(Musl)
+@preconcurrency import var Musl.stderr
+#elseif canImport(Android)
+@preconcurrency import var Android.stderr
+#endif
+
 import SwiftParser
 import SwiftSyntax
 
diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
index ad37b9a04..ea1cb8dc6 100644
--- a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
+++ b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
@@ -8,7 +8,17 @@
 @preconcurrency import struct Foundation.CocoaError
 @preconcurrency import func Foundation.fputs
 @preconcurrency import func Foundation.exit
-@preconcurrency import var Foundation.stderr
+
+#if canImport(Darwin)
+@preconcurrency import var Darwin.stderr
+#elseif canImport(Glibc)
+@preconcurrency import var Glibc.stderr
+#elseif canImport(Musl)
+@preconcurrency import var Musl.stderr
+#elseif canImport(Android)
+@preconcurrency import var Android.stderr
+#endif
+
 import PackagePlugin
 
 /// The main entry point for the PackageToJS plugin.

From e6cdd9d9b3b2c03e32f79edb0e34c8775bec4c61 Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Wed, 19 Aug 2026 09:19:47 +0900
Subject: [PATCH 03/10] CI: Install Swift toolchain preserving its usr/bin
 layout

Flattening the tarball into /usr/local makes SwiftPM derive a bogus
toolchain root, so the swiftbuild build system cannot find swiftc.
---
 .github/actions/install-swift/action.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/actions/install-swift/action.yml b/.github/actions/install-swift/action.yml
index d6fbcc969..c2803206c 100644
--- a/.github/actions/install-swift/action.yml
+++ b/.github/actions/install-swift/action.yml
@@ -32,6 +32,12 @@ runs:
         zlib1g-dev
         curl
 
+    # Keep the toolchain's `<root>/usr/bin` layout intact. Flattening it into
+    # /usr/local breaks toolchain discovery in the swiftbuild build system,
+    # which derives the toolchain root by stripping `usr/bin` from `swiftc`.
     - name: Install Swift
       shell: bash
-      run: curl -fL ${{ inputs.download-url }} | sudo tar xfz - --strip-components=2 -C /usr/local
+      run: |
+        sudo mkdir -p /opt/swift
+        curl -fL ${{ inputs.download-url }} | sudo tar xfz - --strip-components=1 -C /opt/swift
+        echo "/opt/swift/usr/bin" >> "$GITHUB_PATH"

From 0c6e58230947b7b257a2b022921e46f63915d4bc Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Wed, 19 Aug 2026 09:30:16 +0900
Subject: [PATCH 04/10] PackageToJS: Record every import kind while parsing
 wasm imports

Only memory imports were collected, so `WasmFeatures.isWASI` never saw
`wasi_snapshot_preview1` and the generated node.js dropped the WASI import
while still constructing a WASI instance.
---
 Plugins/PackageToJS/Sources/ParseWasm.swift   | 10 ++--
 .../PackageToJS/Tests/ParseWasmTests.swift    | 52 +++++++++++++++++++
 2 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 Plugins/PackageToJS/Tests/ParseWasmTests.swift

diff --git a/Plugins/PackageToJS/Sources/ParseWasm.swift b/Plugins/PackageToJS/Sources/ParseWasm.swift
index 4372b32c5..31cd4a692 100644
--- a/Plugins/PackageToJS/Sources/ParseWasm.swift
+++ b/Plugins/PackageToJS/Sources/ParseWasm.swift
@@ -186,27 +186,29 @@ func parseImports(moduleBytes: Data) throws -> [ImportEntry] {
                 let name = try parseState.readName()
                 let type = try parseState.readByte()
 
+                let kind: ImportEntry.ImportKind
                 switch type {
                 case 0x00:  // Function
                     let index = try parseState.readUnsignedLEB128()
                     guard index < UInt32(types.count) else {
                         throw ParseError.unexpectedEndOfData
                     }
+                    kind = .function
 
                 case 0x01:  // Table
                     _ = try parseTableType(parseState)
+                    kind = .table
 
                 case 0x02:  // Memory
-                    let limits = try parseLimits(parseState)
-                    imports.append(
-                        ImportEntry(module: module, name: name, kind: .memory(type: limits))
-                    )
+                    kind = .memory(type: try parseLimits(parseState))
 
                 case 0x03:  // Global
                     _ = try parseGlobalType(parseState)
+                    kind = .global
                 default:
                     throw ParseError.unknownImportDescriptorType(type)
                 }
+                imports.append(ImportEntry(module: module, name: name, kind: kind))
             }
             // Skip the rest of the module
             return imports
diff --git a/Plugins/PackageToJS/Tests/ParseWasmTests.swift b/Plugins/PackageToJS/Tests/ParseWasmTests.swift
new file mode 100644
index 000000000..7da67b6d6
--- /dev/null
+++ b/Plugins/PackageToJS/Tests/ParseWasmTests.swift
@@ -0,0 +1,52 @@
+import Foundation
+import Testing
+
+@testable import PackageToJS
+
+@Suite struct ParseWasmTests {
+    /// A module importing `wasi_snapshot_preview1.proc_exit`, `env.memory` and `env.__stack_pointer`
+    private var moduleBytes: Data {
+        var bytes: [UInt8] = [
+            0x00, 0x61, 0x73, 0x6D,  // magic
+            0x01, 0x00, 0x00, 0x00,  // version
+        ]
+        // Type section: [(i32) -> ()]
+        let typeSection: [UInt8] = [0x01, 0x60, 0x01, 0x7F, 0x00]
+        bytes += [0x01, UInt8(typeSection.count)] + typeSection
+
+        var importSection: [UInt8] = [0x03]  // 3 imports
+        func name(_ value: String) -> [UInt8] {
+            [UInt8(value.utf8.count)] + Array(value.utf8)
+        }
+        importSection += name("wasi_snapshot_preview1") + name("proc_exit") + [0x00, 0x00]
+        importSection += name("env") + name("memory") + [0x02, 0x00, 0x11]
+        importSection += name("env") + name("__stack_pointer") + [0x03, 0x7F, 0x01]
+        bytes += [0x02, UInt8(importSection.count)] + importSection
+
+        return Data(bytes)
+    }
+
+    @Test func parseAllImportKinds() throws {
+        let imports = try parseImports(moduleBytes: moduleBytes)
+        #expect(imports.count == 3)
+        #expect(imports[0].module == "wasi_snapshot_preview1")
+        #expect(imports[0].name == "proc_exit")
+        if case .function = imports[0].kind {
+        } else {
+            Issue.record("expected a function import, got \(imports[0].kind)")
+        }
+        #expect(imports[2].name == "__stack_pointer")
+        if case .global = imports[2].kind {
+        } else {
+            Issue.record("expected a global import, got \(imports[2].kind)")
+        }
+    }
+
+    /// WASI is detected by the imported functions, so they must not be dropped while parsing.
+    @Test func deriveFeaturesFromParsedImports() throws {
+        let features = WasmFeatures(imports: try parseImports(moduleBytes: moduleBytes))
+        #expect(features.isWASI == true)
+        #expect(features.sharedMemory == false)
+        #expect(features.importedMemory?.minimum == 17)
+    }
+}

From ec72a957fedd317307b4a2597e68e71b3ae819b1 Mon Sep 17 00:00:00 2001
From: Yuta Saito <yuta@goodnotes.com>
Date: Tue, 21 Jul 2026 22:15:10 +0000
Subject: [PATCH 05/10] PackageToJS: run per-target test runners under the
 swiftbuild build system

`swift package js test` assumed the native build system's single combined
`<Package>PackageTests` binary: it looked for one `.wasm`/`.xctest` under
`.build/<config>/`, packaged it, and ran it.

SwiftBuild produces no combined test binary. It emits one
`<TestTarget>-test-runner.wasm` per test target under `.build/out/Products/`,
plus an aggregate target that only orchestrates building them, so the old
lookup failed with "Failed to find 'JavaScriptKitPackageTests.wasm'".

(cherry picked from commit c12c7e9bab5f30885eb14bf25aca94190ac99696)
---
 Plugins/PackageToJS/Sources/PackageToJS.swift | 141 ++++++++---
 .../Sources/PackageToJSPlugin.swift           | 221 ++++++++++++++----
 2 files changed, 274 insertions(+), 88 deletions(-)

diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift
index 076807e91..eb32f76b8 100644
--- a/Plugins/PackageToJS/Sources/PackageToJS.swift
+++ b/Plugins/PackageToJS/Sources/PackageToJS.swift
@@ -588,30 +588,8 @@ struct PackagingPlanner {
         }
         packageInputs.append(wasm)
 
-        // NOTE: The imports are parsed from the product artifact instead of the final .wasm
-        // file because wasm-opt removes unreferenced imports, and the presence of an import
-        // decides how the JavaScript glue code is generated.
         let wasmImportsPath = self.wasmImportsPath
-        let wasmImportsTask = make.addTask(
-            inputFiles: [selfPath, wasmProductArtifact],
-            inputTasks: [intermediatesDirTask],
-            output: wasmImportsPath
-        ) {
-            let metadata = try parseImports(
-                moduleBytes: try Data(contentsOf: URL(fileURLWithPath: $1.resolve(path: wasmProductArtifact).path))
-            )
-            let jsonEncoder = JSONEncoder()
-            jsonEncoder.outputFormatting = .prettyPrinted
-            let jsonData = try jsonEncoder.encode(metadata)
-            let outputPath = $1.resolve(path: $0.output)
-            // Every task consuming the imports depends on this file, so leave it untouched
-            // when the imports are unchanged. Rewriting it would give it a newer timestamp
-            // and re-run them (including `npm install`) for unrelated Swift source changes.
-            if let lastImports = try? Data(contentsOf: outputPath), lastImports == jsonData {
-                return
-            }
-            try system.writeFile(atPath: outputPath.path, content: jsonData)
-        }
+        let wasmImportsTask = planWasmImports(make: &make, intermediatesDirTask: intermediatesDirTask)
 
         packageInputs.append(wasmImportsTask)
 
@@ -758,9 +736,99 @@ struct PackagingPlanner {
         )
     }
 
+    /// Plan the shared npm install for a directory that hosts several per-runner test
+    /// bundles as subdirectories. Node resolves `node_modules` by walking up the directory
+    /// tree, so a single install here serves every runner underneath, avoiding one install
+    /// per test target.
+    func planSharedNodeModules(make: inout MiniMake) throws -> MiniMake.TaskKey {
+        let outputDirTask = make.addTask(
+            inputFiles: [selfPath],
+            output: outputDir,
+            attributes: [.silent]
+        ) {
+            try system.createDirectory(atPath: $1.resolve(path: $0.output).path)
+        }
+        let intermediatesDirTask = make.addTask(
+            inputFiles: [selfPath],
+            output: intermediatesDir,
+            attributes: [.silent]
+        ) {
+            try system.createDirectory(atPath: $1.resolve(path: $0.output).path)
+        }
+        let wasmImportsTask = planWasmImports(make: &make, intermediatesDirTask: intermediatesDirTask)
+        let packageJsonTask = planCopyTemplateFile(
+            make: &make,
+            file: "Plugins/PackageToJS/Templates/package.json",
+            output: "package.json",
+            outputDirTask: outputDirTask,
+            wasmImportsTask: wasmImportsTask,
+            inputFiles: [],
+            inputTasks: []
+        )
+        return planNpmInstall(
+            make: &make,
+            intermediatesDirTask: intermediatesDirTask,
+            packageJsonTask: packageJsonTask
+        )
+    }
+
+    /// Plan the task parsing the imports of the product .wasm file
+    ///
+    /// NOTE: The imports are parsed from the product artifact instead of the final .wasm
+    /// file because wasm-opt removes unreferenced imports, and the presence of an import
+    /// decides how the JavaScript glue code is generated.
+    private func planWasmImports(
+        make: inout MiniMake,
+        intermediatesDirTask: MiniMake.TaskKey
+    ) -> MiniMake.TaskKey {
+        make.addTask(
+            inputFiles: [selfPath, wasmProductArtifact],
+            inputTasks: [intermediatesDirTask],
+            output: wasmImportsPath
+        ) {
+            let metadata = try parseImports(
+                moduleBytes: try Data(contentsOf: URL(fileURLWithPath: $1.resolve(path: wasmProductArtifact).path))
+            )
+            let jsonEncoder = JSONEncoder()
+            jsonEncoder.outputFormatting = .prettyPrinted
+            let jsonData = try jsonEncoder.encode(metadata)
+            let outputPath = $1.resolve(path: $0.output)
+            // Every task consuming the imports depends on this file, so leave it untouched
+            // when the imports are unchanged. Rewriting it would give it a newer timestamp
+            // and re-run them (including `npm install`) for unrelated Swift source changes.
+            if let lastImports = try? Data(contentsOf: outputPath), lastImports == jsonData {
+                return
+            }
+            try system.writeFile(atPath: outputPath.path, content: jsonData)
+        }
+    }
+
+    private func planNpmInstall(
+        make: inout MiniMake,
+        intermediatesDirTask: MiniMake.TaskKey,
+        packageJsonTask: MiniMake.TaskKey
+    ) -> MiniMake.TaskKey {
+        make.addTask(
+            inputFiles: [
+                selfPath,
+                outputDir.appending(path: "package.json"),
+            ],
+            inputTasks: [intermediatesDirTask, packageJsonTask],
+            output: intermediatesDir.appending(path: "npm-install.stamp")
+        ) {
+            try system.npmInstall(packageDir: $1.resolve(path: outputDir).path)
+            try system.writeFile(atPath: $1.resolve(path: $0.output).path, content: Data())
+        }
+    }
+
     /// Construct the test build plan and return the root task key
+    ///
+    /// - Parameter installNodeModules: whether to install the test harness's npm
+    ///   dependencies into this bundle's directory. Pass `false` when several runners share
+    ///   a single `node_modules` planned once via `planSharedNodeModules`.
     func planTestBuild(
-        make: inout MiniMake
+        make: inout MiniMake,
+        installNodeModules: Bool = true
     ) throws -> (rootTask: MiniMake.TaskKey, binDir: BuildPath) {
         var (allTasks, outputDirTask, intermediatesDirTask, packageJsonTask, wasmImportsTask) = try planBuildInternal(
             make: &make,
@@ -768,20 +836,17 @@ struct PackagingPlanner {
             debugInfoFormat: .dwarf
         )
 
-        // Install npm dependencies used in the test harness
-        allTasks.append(
-            make.addTask(
-                inputFiles: [
-                    selfPath,
-                    outputDir.appending(path: "package.json"),
-                ],
-                inputTasks: [intermediatesDirTask, packageJsonTask],
-                output: intermediatesDir.appending(path: "npm-install.stamp")
-            ) {
-                try system.npmInstall(packageDir: $1.resolve(path: outputDir).path)
-                try system.writeFile(atPath: $1.resolve(path: $0.output).path, content: Data())
-            }
-        )
+        // Install npm dependencies used in the test harness, unless a shared node_modules is
+        // provided in a parent directory (see planSharedNodeModules).
+        if installNodeModules {
+            allTasks.append(
+                planNpmInstall(
+                    make: &make,
+                    intermediatesDirTask: intermediatesDirTask,
+                    packageJsonTask: packageJsonTask
+                )
+            )
+        }
 
         let binDir = outputDir.appending(path: "bin")
         let binDirTask = make.addTask(
diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
index ea1cb8dc6..5a89b3b4c 100644
--- a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
+++ b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
@@ -274,69 +274,189 @@ struct PackageToJSPlugin: CommandPlugin {
         let skeletonCollector = SkeletonCollector(context: context)
         let skeletons = skeletonCollector.collectFromTests()
 
-        // NOTE: Find the product artifact from the default build directory
+        // NOTE: Find the product artifact(s) from the default build directory
         //       because PackageManager.BuildResult doesn't include the
         //       product artifact for tests.
         //       This doesn't work when `--scratch-path` is used but
         //       we don't have a way to guess the correct path. (we can find
         //       the path by building a dummy executable product but it's
         //       not worth the overhead)
-        var productArtifact: URL?
-        for fileExtension in ["wasm", "xctest"] {
-            let packageDir = context.package.directoryURL
-            let path = packageDir.appending(path: ".build/debug/\(productName).\(fileExtension)").path
-            if FileManager.default.fileExists(atPath: path) {
-                productArtifact = URL(fileURLWithPath: path)
-                break
-            }
-        }
-        guard let productArtifact = productArtifact else {
-            throw PackageToJSError(
-                "Failed to find '\(productName).wasm' or '\(productName).xctest'"
-            )
-        }
-        let outputDir =
+        let productArtifacts = try findTestProductArtifacts(
+            productName: productName,
+            context: context,
+            options: testOptions.packageOptions
+        )
+
+        let baseOutputDir =
             if let outputPath = testOptions.packageOptions.outputPath {
                 URL(fileURLWithPath: outputPath)
             } else {
                 context.pluginWorkDirectoryURL.appending(path: "PackageTests")
             }
-        var make = MiniMake(
-            explain: testOptions.packageOptions.explain,
-            printProgress: self.printProgress
-        )
-        let planner = PackagingPlanner(
-            options: testOptions.packageOptions,
-            context: context,
-            selfPackage: selfPackage,
-            skeletons: skeletons,
-            outputDir: outputDir,
-            wasmProductArtifact: productArtifact,
-            // If the product artifact doesn't have a .wasm extension, add it
-            // to deliver it with the correct MIME type when serving the test
-            // files for browser tests.
-            wasmFilename: productArtifact.lastPathComponent.hasSuffix(".wasm")
-                ? productArtifact.lastPathComponent
-                : productArtifact.lastPathComponent + ".wasm"
-        )
-        let (rootTask, binDir) = try planner.planTestBuild(
-            make: &make
-        )
-        cleanIfBuildGraphChanged(root: rootTask, make: make, context: context)
-        print("Packaging tests...")
-        let scope = MiniMake.VariableScope(variables: [:])
-        try make.build(output: rootTask, scope: scope)
-        print("Packaging tests finished")
 
-        if !testOptions.buildOnly {
-            let testRunner = scope.resolve(path: binDir.appending(path: "test.js"))
-            try PackageToJS.runTest(
-                testRunner: testRunner,
-                currentDirectoryURL: context.pluginWorkDirectoryURL,
+        // With multiple runners, install the test harness's npm dependencies once into the
+        // shared base directory. Each runner is packaged into a subdirectory of it, and Node
+        // resolves `node_modules` by walking up the directory tree, so one install serves
+        // them all instead of one per test target.
+        let sharesNodeModules = productArtifacts.count > 1
+        if sharesNodeModules, let firstArtifact = productArtifacts.first {
+            var make = MiniMake(
+                explain: testOptions.packageOptions.explain,
+                printProgress: self.printProgress
+            )
+            let planner = PackagingPlanner(
+                options: testOptions.packageOptions,
+                context: context,
+                selfPackage: selfPackage,
+                skeletons: skeletons,
+                outputDir: baseOutputDir,
+                wasmProductArtifact: firstArtifact,
+                wasmFilename: firstArtifact.lastPathComponent.hasSuffix(".wasm")
+                    ? firstArtifact.lastPathComponent
+                    : firstArtifact.lastPathComponent + ".wasm"
+            )
+            let rootTask = try planner.planSharedNodeModules(make: &make)
+            print("Installing shared test dependencies...")
+            try make.build(output: rootTask, scope: MiniMake.VariableScope(variables: [:]))
+        }
+
+        // The native build system links every test target into a single combined
+        // `<Package>PackageTests` binary, but SwiftBuild produces one runner per test
+        // target. Package and run each artifact. When there is more than one, give each its
+        // own output subdirectory and build fingerprint so their harnesses don't clobber one
+        // another, and keep going after a failure so every target's results are reported.
+        var anyTestFailed = false
+        for productArtifact in productArtifacts {
+            let runnerName = productArtifact.deletingPathExtension().lastPathComponent
+            let outputDir =
+                productArtifacts.count == 1
+                ? baseOutputDir
+                : baseOutputDir.appending(path: runnerName)
+
+            var make = MiniMake(
+                explain: testOptions.packageOptions.explain,
+                printProgress: self.printProgress
+            )
+            let planner = PackagingPlanner(
+                options: testOptions.packageOptions,
+                context: context,
+                selfPackage: selfPackage,
+                skeletons: skeletons,
                 outputDir: outputDir,
-                testOptions: testOptions
+                wasmProductArtifact: productArtifact,
+                // If the product artifact doesn't have a .wasm extension, add it
+                // to deliver it with the correct MIME type when serving the test
+                // files for browser tests.
+                wasmFilename: productArtifact.lastPathComponent.hasSuffix(".wasm")
+                    ? productArtifact.lastPathComponent
+                    : productArtifact.lastPathComponent + ".wasm"
+            )
+            let (rootTask, binDir) = try planner.planTestBuild(
+                make: &make,
+                installNodeModules: !sharesNodeModules
             )
+            cleanIfBuildGraphChanged(
+                root: rootTask,
+                make: make,
+                context: context,
+                fingerprintName: productArtifacts.count == 1 ? "minimake.json" : "minimake-\(runnerName).json"
+            )
+            if productArtifacts.count == 1 {
+                print("Packaging tests...")
+            } else {
+                print("Packaging tests for '\(runnerName)'...")
+            }
+            let scope = MiniMake.VariableScope(variables: [:])
+            try make.build(output: rootTask, scope: scope)
+            print("Packaging tests finished")
+
+            // BridgeJS emits an aggregated `bridge-js.js` (generated from every test
+            // target's skeletons, so identical across runners). Test preludes import it from
+            // the base output directory, so surface a copy there when packaging into a
+            // per-runner subdirectory.
+            if outputDir != baseOutputDir {
+                let runnerBridge = outputDir.appending(path: "bridge-js.js")
+                if FileManager.default.fileExists(atPath: runnerBridge.path) {
+                    let baseBridge = baseOutputDir.appending(path: "bridge-js.js")
+                    try? FileManager.default.removeItem(at: baseBridge)
+                    try FileManager.default.copyItem(at: runnerBridge, to: baseBridge)
+                }
+            }
+
+            if !testOptions.buildOnly {
+                let testRunner = scope.resolve(path: binDir.appending(path: "test.js"))
+                do {
+                    try PackageToJS.runTest(
+                        testRunner: testRunner,
+                        currentDirectoryURL: context.pluginWorkDirectoryURL,
+                        outputDir: outputDir,
+                        testOptions: testOptions
+                    )
+                } catch {
+                    // Keep running the remaining test runners, but remember the failure so
+                    // the overall command still exits non-zero.
+                    printStderr("\(runnerName): \(error)")
+                    anyTestFailed = true
+                }
+            }
+        }
+
+        if anyTestFailed {
+            exit(1)
+        }
+    }
+
+    /// Locate the test product artifact(s) to run.
+    ///
+    /// The native build system links all test targets into a single combined
+    /// `<Package>PackageTests` binary. SwiftBuild instead emits one
+    /// `<TestTarget>-test-runner.wasm` per test target and only an aggregate
+    /// orchestration product, so fall back to discovering those runners.
+    private func findTestProductArtifacts(
+        productName: String,
+        context: PluginContext,
+        options: PackageToJS.PackageOptions
+    ) throws -> [URL] {
+        let fileManager = FileManager.default
+        let packageDir = context.package.directoryURL
+        let configuration = (options.configuration ?? "debug").lowercased()
+
+        // Native combined test binary.
+        for fileExtension in ["wasm", "xctest"] {
+            let path = packageDir.appending(path: ".build/\(configuration)/\(productName).\(fileExtension)").path
+            if fileManager.fileExists(atPath: path) {
+                return [URL(fileURLWithPath: path)]
+            }
         }
+
+        // SwiftBuild per-test-target runners:
+        //   .build/out/Products/<Config>-webassembly-wasm32/<TestTarget>-test-runner.wasm
+        let productsDir = packageDir.appending(path: ".build/out/Products")
+        if let configDirs = try? fileManager.contentsOfDirectory(
+            at: productsDir,
+            includingPropertiesForKeys: nil
+        ) {
+            let wasmConfigDirs = configDirs.filter { $0.lastPathComponent.hasSuffix("-webassembly-wasm32") }
+            let chosenDir =
+                wasmConfigDirs.first { $0.lastPathComponent.lowercased().hasPrefix(configuration) }
+                ?? wasmConfigDirs.first
+            if let chosenDir,
+                let entries = try? fileManager.contentsOfDirectory(at: chosenDir, includingPropertiesForKeys: nil)
+            {
+                let runners =
+                    entries
+                    .filter { $0.lastPathComponent.hasSuffix("-test-runner.wasm") }
+                    .sorted { $0.lastPathComponent < $1.lastPathComponent }
+                if !runners.isEmpty {
+                    return runners
+                }
+            }
+        }
+
+        throw PackageToJSError(
+            "Failed to find '\(productName).wasm' or '\(productName).xctest' (native build system), "
+                + "or any '*-test-runner.wasm' under .build/out/Products (swiftbuild build system)"
+        )
     }
 
     private func buildWasm(
@@ -424,9 +544,10 @@ struct PackageToJSPlugin: CommandPlugin {
     private func cleanIfBuildGraphChanged(
         root: MiniMake.TaskKey,
         make: MiniMake,
-        context: PluginContext
+        context: PluginContext,
+        fingerprintName: String = "minimake.json"
     ) {
-        let buildFingerprint = context.pluginWorkDirectoryURL.appending(path: "minimake.json")
+        let buildFingerprint = context.pluginWorkDirectoryURL.appending(path: fingerprintName)
         let lastBuildFingerprint = try? Data(contentsOf: buildFingerprint)
         let currentBuildFingerprint = try? make.computeFingerprint(root: root)
         if lastBuildFingerprint != currentBuildFingerprint {

From 2b02b7230f8bb1d05ec66445e60ecccc864f02f0 Mon Sep 17 00:00:00 2001
From: Yuta Saito <yuta@goodnotes.com>
Date: Tue, 21 Jul 2026 22:15:10 +0000
Subject: [PATCH 06/10] Install the JS event loop executor in async test
 targets

Because SwiftBuild mode produces a linked executable for each test
target.

(cherry picked from commit 0a1f926e35a043e27938ef8933d1b23f864097a7)
---
 Package.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Package.swift b/Package.swift
index 63eacf6be..0504d4505 100644
--- a/Package.swift
+++ b/Package.swift
@@ -82,7 +82,7 @@ let package = Package(
 
         .testTarget(
             name: "JavaScriptKitTests",
-            dependencies: ["JavaScriptKit"],
+            dependencies: ["JavaScriptKit", "JavaScriptEventLoopTestSupport"],
             swiftSettings: [
                 .enableExperimentalFeature("Extern"),
                 .define("Tracing", .when(traits: ["Tracing"])),
@@ -191,7 +191,7 @@ let package = Package(
         ),
         .testTarget(
             name: "BridgeJSRuntimeTests",
-            dependencies: ["JavaScriptKit", "JavaScriptEventLoop"],
+            dependencies: ["JavaScriptKit", "JavaScriptEventLoop", "JavaScriptEventLoopTestSupport"],
             exclude: [
                 "bridge-js.config.json",
                 "bridge-js.d.ts",
@@ -220,7 +220,7 @@ let package = Package(
         ),
         .testTarget(
             name: "BridgeJSIdentityTests",
-            dependencies: ["JavaScriptKit", "JavaScriptEventLoop"],
+            dependencies: ["JavaScriptKit", "JavaScriptEventLoop", "JavaScriptEventLoopTestSupport"],
             exclude: [
                 "bridge-js.config.json",
                 "Generated/JavaScript",

From 35088fc5c55abedb38d0f533d2ef439b93a4b50c Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Fri, 21 Aug 2026 20:24:54 +0900
Subject: [PATCH 07/10] BridgeJS: Skip type handle registration for unlinked
 modules

`js test` generates the glue from every test target's skeletons, but the
SwiftBuild build system links one binary per test target, so the eager
registration hit a missing export.
---
 Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift    | 6 +++++-
 .../__Snapshots__/BridgeJSLinkTests/GenericImports.js       | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
index 66bd6074b..8f7adee4d 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
@@ -351,7 +351,11 @@ public struct BridgeJSLink {
             for skeleton in skeletons {
                 guard skeleton.typeRegistrationEntries != nil else { continue }
                 let name = ABINameGenerator.typeRegistrationFunctionName(moduleName: skeleton.moduleName)
-                declarations.append("    \(JSGlueVariableScope.reservedInstance).exports[\"\(name)\"]();")
+                // The glue may describe more modules than the instance links in: `js test`
+                // generates it from every test target's skeletons, while the SwiftBuild
+                // build system produces one binary per test target. A module that isn't
+                // linked in can't have its types used either, so skip its registration.
+                declarations.append("    \(JSGlueVariableScope.reservedInstance).exports[\"\(name)\"]?.();")
             }
             declarations.append("}")
             declarations.append(contentsOf: GenericJSCodegen.runtimeHelperDeclarations())
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js
index d8b1fdf15..cdb3a9241 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js
@@ -52,7 +52,7 @@ export async function createInstantiator(options, swift) {
         }
         __bjs_typeHandlesRegistered = true;
         instance.exports["bjs_core_register_type_handles"]();
-        instance.exports["bjs_TestModule_register_type_handles"]();
+        instance.exports["bjs_TestModule_register_type_handles"]?.();
     }
     function __bjs_codecForTypeId(typeId) {
         __bjs_registerTypeHandles();

From bd8494bf43cb78cfbae854c6ef4f4ca17ed633ba Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Fri, 21 Aug 2026 21:38:49 +0900
Subject: [PATCH 08/10] PackageToJS: Share the linked JS modules with the
 aggregated glue

The per-runner `bridge-js.js` copied to the base output directory for test
preludes imports its JavaScript modules relative to itself, so copy the
`bridge-js-modules` directory next to it.
---
 .../PackageToJS/Sources/PackageToJSPlugin.swift    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
index 5a89b3b4c..f4e8d0a3a 100644
--- a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
+++ b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
@@ -373,13 +373,15 @@ struct PackageToJSPlugin: CommandPlugin {
             // BridgeJS emits an aggregated `bridge-js.js` (generated from every test
             // target's skeletons, so identical across runners). Test preludes import it from
             // the base output directory, so surface a copy there when packaging into a
-            // per-runner subdirectory.
+            // per-runner subdirectory. The glue imports the JavaScript modules it was linked
+            // against by a path relative to itself, so carry those over as well.
             if outputDir != baseOutputDir {
-                let runnerBridge = outputDir.appending(path: "bridge-js.js")
-                if FileManager.default.fileExists(atPath: runnerBridge.path) {
-                    let baseBridge = baseOutputDir.appending(path: "bridge-js.js")
-                    try? FileManager.default.removeItem(at: baseBridge)
-                    try FileManager.default.copyItem(at: runnerBridge, to: baseBridge)
+                for entry in ["bridge-js.js", "bridge-js-modules"] {
+                    let packaged = outputDir.appending(path: entry)
+                    guard FileManager.default.fileExists(atPath: packaged.path) else { continue }
+                    let shared = baseOutputDir.appending(path: entry)
+                    try? FileManager.default.removeItem(at: shared)
+                    try FileManager.default.copyItem(at: packaged, to: shared)
                 }
             }
 

From 281249a7e50557af8fc9db12cf4dc96ca2a2633d Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Sat, 22 Aug 2026 15:22:44 +0900
Subject: [PATCH 09/10] BridgeJS: Require the imports object for static-only
 imported types

An imported type looked up from `getImports` contributes its static methods
too, but only a constructor marked the imports object as needed, so the glue
referenced an undeclared `imports`.
---
 .../BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift   | 10 ++++------
 .../BridgeJSLinkTests/AsyncStaticImport.js             |  1 +
 .../BridgeJSLinkTests/EnumAssociatedValueImport.js     |  1 +
 .../__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js  |  1 +
 .../__Snapshots__/BridgeJSLinkTests/GenericImports.js  |  2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
index 8f7adee4d..163b7db6b 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
@@ -267,7 +267,9 @@ public struct BridgeJSLink {
                     try renderImportedFunction(importObjectBuilder: importObjectBuilder, function: function)
                 }
                 for type in fileSkeleton.types {
-                    if type.constructor != nil, type.from == nil {
+                    // Matches the condition rendering the type into the `getImports` result
+                    // type: both its constructor and its static methods are looked up there.
+                    if type.from == nil, type.constructor != nil || !type.staticMethods.isEmpty {
                         data.needsImportsObject = true
                     }
                     try renderImportedType(importObjectBuilder: importObjectBuilder, type: type)
@@ -351,11 +353,7 @@ public struct BridgeJSLink {
             for skeleton in skeletons {
                 guard skeleton.typeRegistrationEntries != nil else { continue }
                 let name = ABINameGenerator.typeRegistrationFunctionName(moduleName: skeleton.moduleName)
-                // The glue may describe more modules than the instance links in: `js test`
-                // generates it from every test target's skeletons, while the SwiftBuild
-                // build system produces one binary per test target. A module that isn't
-                // linked in can't have its types used either, so skip its registration.
-                declarations.append("    \(JSGlueVariableScope.reservedInstance).exports[\"\(name)\"]?.();")
+                declarations.append("    \(JSGlueVariableScope.reservedInstance).exports[\"\(name)\"]();")
             }
             declarations.append("}")
             declarations.append(contentsOf: GenericJSCodegen.runtimeHelperDeclarations())
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js
index 47dd161a2..eea340c35 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/AsyncStaticImport.js
@@ -153,6 +153,7 @@ export async function createInstantiator(options, swift) {
         addImports: (importObject, importsContext) => {
             bjs = {};
             importObject["bjs"] = bjs;
+            const imports = options.getImports(importsContext);
             bjs["swift_js_return_string"] = function(ptr, len) {
                 tmpRetString = decodeString(ptr, len);
             }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.js
index 07fe91654..2b36953bb 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValueImport.js
@@ -83,6 +83,7 @@ export async function createInstantiator(options, swift) {
         addImports: (importObject, importsContext) => {
             bjs = {};
             importObject["bjs"] = bjs;
+            const imports = options.getImports(importsContext);
             bjs["swift_js_return_string"] = function(ptr, len) {
                 tmpRetString = decodeString(ptr, len);
             }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js
index b4e67b6b8..bde5fc31f 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumCaseImport.js
@@ -44,6 +44,7 @@ export async function createInstantiator(options, swift) {
         addImports: (importObject, importsContext) => {
             bjs = {};
             importObject["bjs"] = bjs;
+            const imports = options.getImports(importsContext);
             bjs["swift_js_return_string"] = function(ptr, len) {
                 tmpRetString = decodeString(ptr, len);
             }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js
index cdb3a9241..d8b1fdf15 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/GenericImports.js
@@ -52,7 +52,7 @@ export async function createInstantiator(options, swift) {
         }
         __bjs_typeHandlesRegistered = true;
         instance.exports["bjs_core_register_type_handles"]();
-        instance.exports["bjs_TestModule_register_type_handles"]?.();
+        instance.exports["bjs_TestModule_register_type_handles"]();
     }
     function __bjs_codecForTypeId(typeId) {
         __bjs_registerTypeHandles();

From 137e41dfc7b25d4fda56056e0b3e18c5d7d40f40 Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Sat, 22 Aug 2026 15:22:44 +0900
Subject: [PATCH 10/10] PackageToJS: Generate each test bundle's glue from what
 its binary links in

`js test` generated the glue from every test target's skeletons and handed
the same copy to each SwiftBuild per-target runner, which described exports
those binaries don't have. Package the aggregated glue once into the shared
base directory, where preludes import it by a fixed path, and give each
runner glue scoped to the target it links in.

This supersedes the registration guard in the JS code generator.
---
 Plugins/PackageToJS/Sources/PackageToJS.swift | 149 +++++++++++-------
 .../Sources/PackageToJSPlugin.swift           |  83 ++++++----
 2 files changed, 146 insertions(+), 86 deletions(-)

diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift
index eb32f76b8..c8adb9346 100644
--- a/Plugins/PackageToJS/Sources/PackageToJS.swift
+++ b/Plugins/PackageToJS/Sources/PackageToJS.swift
@@ -614,54 +614,13 @@ struct PackagingPlanner {
         packageInputs.append(packageJsonTask)
 
         if !skeletons.isEmpty {
-            let bridge = try loadBridgeJS()
-            let skeletonFiles = skeletons.map { BuildPath(absolute: $0.source.path) }
-            let bridgeJs = outputDir.appending(path: "bridge-js.js")
-            let bridgeDts = outputDir.appending(path: "bridge-js.d.ts")
-            let bridgeModules = outputDir.appending(path: "bridge-js-modules")
             packageInputs.append(
-                make.addTask(
-                    inputFiles: skeletonFiles + [selfPath, wasmImportsPath],
-                    inputTasks: [outputDirTask, wasmImportsTask],
-                    output: bridgeJs
-                ) { _, scope in
-                    let features = try Self.loadWasmFeatures(at: scope.resolve(path: wasmImportsPath))
-                    let output = try bridge.link.link(sharedMemory: features.sharedMemory)
-                    try system.writeFile(
-                        atPath: scope.resolve(path: bridgeJs).path,
-                        content: Data(output.outputJs.utf8)
-                    )
-                    try system.writeFile(
-                        atPath: scope.resolve(path: bridgeDts).path,
-                        content: Data(output.outputDts.utf8)
-                    )
-                }
-            )
-            let bridgeModulesStamp = intermediatesDir.appending(path: "bridge-js-modules.stamp")
-            packageInputs.append(
-                make.addTask(
-                    inputFiles: skeletonFiles + bridge.modules.map(\.source) + [selfPath],
-                    inputTasks: [outputDirTask, intermediatesDirTask],
-                    output: bridgeModulesStamp
-                ) { _, scope in
-                    let modulesDirectory = scope.resolve(path: bridgeModules)
-                    try system.removeItemIfExists(atPath: modulesDirectory.path)
-                    if !bridge.modules.isEmpty {
-                        try system.createDirectory(atPath: modulesDirectory.path)
-                    }
-                    for module in bridge.modules {
-                        let destination = scope.resolve(path: outputDir.appending(path: module.relativeOutputPath))
-                        try system.createDirectory(atPath: destination.deletingLastPathComponent().path)
-                        try system.syncFile(
-                            from: scope.resolve(path: module.source).path,
-                            to: destination.path
-                        )
-                    }
-                    try system.writeFile(
-                        atPath: scope.resolve(path: bridgeModulesStamp).path,
-                        content: Data()
-                    )
-                }
+                contentsOf: try planBridgeJS(
+                    make: &make,
+                    outputDirTask: outputDirTask,
+                    intermediatesDirTask: intermediatesDirTask,
+                    wasmImportsTask: wasmImportsTask
+                )
             )
         }
 
@@ -736,11 +695,15 @@ struct PackagingPlanner {
         )
     }
 
-    /// Plan the shared npm install for a directory that hosts several per-runner test
-    /// bundles as subdirectories. Node resolves `node_modules` by walking up the directory
-    /// tree, so a single install here serves every runner underneath, avoiding one install
-    /// per test target.
-    func planSharedNodeModules(make: inout MiniMake) throws -> MiniMake.TaskKey {
+    /// Plan the artifacts that several per-runner test bundles packaged as subdirectories
+    /// share.
+    ///
+    /// Node resolves `node_modules` by walking up the directory tree, so a single install
+    /// here serves every runner underneath, avoiding one install per test target. The glue
+    /// generated here describes every test target rather than the one target a runner links
+    /// in, so that test preludes - which are loaded for every runner and import it by a
+    /// fixed path - see the whole package's API.
+    func planSharedTestArtifacts(make: inout MiniMake) throws -> MiniMake.TaskKey {
         let outputDirTask = make.addTask(
             inputFiles: [selfPath],
             output: outputDir,
@@ -765,13 +728,87 @@ struct PackagingPlanner {
             inputFiles: [],
             inputTasks: []
         )
-        return planNpmInstall(
-            make: &make,
-            intermediatesDirTask: intermediatesDirTask,
-            packageJsonTask: packageJsonTask
+        var tasks = [
+            planNpmInstall(
+                make: &make,
+                intermediatesDirTask: intermediatesDirTask,
+                packageJsonTask: packageJsonTask
+            )
+        ]
+        if !skeletons.isEmpty {
+            tasks.append(
+                contentsOf: try planBridgeJS(
+                    make: &make,
+                    outputDirTask: outputDirTask,
+                    intermediatesDirTask: intermediatesDirTask,
+                    wasmImportsTask: wasmImportsTask
+                )
+            )
+        }
+        return make.addTask(
+            inputTasks: tasks,
+            output: BuildPath(phony: "shared-test-artifacts"),
+            attributes: [.phony, .silent]
         )
     }
 
+    /// Plan the tasks generating the BridgeJS glue and syncing the JavaScript modules it
+    /// imports into the output directory
+    private func planBridgeJS(
+        make: inout MiniMake,
+        outputDirTask: MiniMake.TaskKey,
+        intermediatesDirTask: MiniMake.TaskKey,
+        wasmImportsTask: MiniMake.TaskKey
+    ) throws -> [MiniMake.TaskKey] {
+        let bridge = try loadBridgeJS()
+        let skeletonFiles = skeletons.map { BuildPath(absolute: $0.source.path) }
+        let wasmImportsPath = self.wasmImportsPath
+        let bridgeJs = outputDir.appending(path: "bridge-js.js")
+        let bridgeDts = outputDir.appending(path: "bridge-js.d.ts")
+        let bridgeModules = outputDir.appending(path: "bridge-js-modules")
+        let bridgeJsTask = make.addTask(
+            inputFiles: skeletonFiles + [selfPath, wasmImportsPath],
+            inputTasks: [outputDirTask, wasmImportsTask],
+            output: bridgeJs
+        ) { _, scope in
+            let features = try Self.loadWasmFeatures(at: scope.resolve(path: wasmImportsPath))
+            let output = try bridge.link.link(sharedMemory: features.sharedMemory)
+            try system.writeFile(
+                atPath: scope.resolve(path: bridgeJs).path,
+                content: Data(output.outputJs.utf8)
+            )
+            try system.writeFile(
+                atPath: scope.resolve(path: bridgeDts).path,
+                content: Data(output.outputDts.utf8)
+            )
+        }
+        let bridgeModulesStamp = intermediatesDir.appending(path: "bridge-js-modules.stamp")
+        let bridgeModulesTask = make.addTask(
+            inputFiles: skeletonFiles + bridge.modules.map(\.source) + [selfPath],
+            inputTasks: [outputDirTask, intermediatesDirTask],
+            output: bridgeModulesStamp
+        ) { _, scope in
+            let modulesDirectory = scope.resolve(path: bridgeModules)
+            try system.removeItemIfExists(atPath: modulesDirectory.path)
+            if !bridge.modules.isEmpty {
+                try system.createDirectory(atPath: modulesDirectory.path)
+            }
+            for module in bridge.modules {
+                let destination = scope.resolve(path: outputDir.appending(path: module.relativeOutputPath))
+                try system.createDirectory(atPath: destination.deletingLastPathComponent().path)
+                try system.syncFile(
+                    from: scope.resolve(path: module.source).path,
+                    to: destination.path
+                )
+            }
+            try system.writeFile(
+                atPath: scope.resolve(path: bridgeModulesStamp).path,
+                content: Data()
+            )
+        }
+        return [bridgeJsTask, bridgeModulesTask]
+    }
+
     /// Plan the task parsing the imports of the product .wasm file
     ///
     /// NOTE: The imports are parsed from the product artifact instead of the final .wasm
diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
index f4e8d0a3a..560b3e980 100644
--- a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
+++ b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
@@ -294,12 +294,12 @@ struct PackageToJSPlugin: CommandPlugin {
                 context.pluginWorkDirectoryURL.appending(path: "PackageTests")
             }
 
-        // With multiple runners, install the test harness's npm dependencies once into the
-        // shared base directory. Each runner is packaged into a subdirectory of it, and Node
-        // resolves `node_modules` by walking up the directory tree, so one install serves
-        // them all instead of one per test target.
-        let sharesNodeModules = productArtifacts.count > 1
-        if sharesNodeModules, let firstArtifact = productArtifacts.first {
+        // With multiple runners, package what they share into the base directory once: the
+        // test harness's npm dependencies, and the glue describing every test target that
+        // preludes import by a fixed path. Each runner is packaged into a subdirectory of
+        // it.
+        let hasSharedArtifacts = productArtifacts.count > 1
+        if hasSharedArtifacts, let firstArtifact = productArtifacts.first {
             var make = MiniMake(
                 explain: testOptions.packageOptions.explain,
                 printProgress: self.printProgress
@@ -315,8 +315,8 @@ struct PackageToJSPlugin: CommandPlugin {
                     ? firstArtifact.lastPathComponent
                     : firstArtifact.lastPathComponent + ".wasm"
             )
-            let rootTask = try planner.planSharedNodeModules(make: &make)
-            print("Installing shared test dependencies...")
+            let rootTask = try planner.planSharedTestArtifacts(make: &make)
+            print("Packaging shared test artifacts...")
             try make.build(output: rootTask, scope: MiniMake.VariableScope(variables: [:]))
         }
 
@@ -341,7 +341,14 @@ struct PackageToJSPlugin: CommandPlugin {
                 options: testOptions.packageOptions,
                 context: context,
                 selfPackage: selfPackage,
-                skeletons: skeletons,
+                // Generate the glue from what this binary actually links in: the combined
+                // binary holds every test target, while a per-target runner holds one.
+                skeletons: runnerSkeletons(
+                    runnerName: runnerName,
+                    isCombinedBinary: !hasSharedArtifacts,
+                    context: context,
+                    aggregated: skeletons
+                ),
                 outputDir: outputDir,
                 wasmProductArtifact: productArtifact,
                 // If the product artifact doesn't have a .wasm extension, add it
@@ -353,7 +360,7 @@ struct PackageToJSPlugin: CommandPlugin {
             )
             let (rootTask, binDir) = try planner.planTestBuild(
                 make: &make,
-                installNodeModules: !sharesNodeModules
+                installNodeModules: !hasSharedArtifacts
             )
             cleanIfBuildGraphChanged(
                 root: rootTask,
@@ -370,21 +377,6 @@ struct PackageToJSPlugin: CommandPlugin {
             try make.build(output: rootTask, scope: scope)
             print("Packaging tests finished")
 
-            // BridgeJS emits an aggregated `bridge-js.js` (generated from every test
-            // target's skeletons, so identical across runners). Test preludes import it from
-            // the base output directory, so surface a copy there when packaging into a
-            // per-runner subdirectory. The glue imports the JavaScript modules it was linked
-            // against by a path relative to itself, so carry those over as well.
-            if outputDir != baseOutputDir {
-                for entry in ["bridge-js.js", "bridge-js-modules"] {
-                    let packaged = outputDir.appending(path: entry)
-                    guard FileManager.default.fileExists(atPath: packaged.path) else { continue }
-                    let shared = baseOutputDir.appending(path: entry)
-                    try? FileManager.default.removeItem(at: shared)
-                    try FileManager.default.copyItem(at: packaged, to: shared)
-                }
-            }
-
             if !testOptions.buildOnly {
                 let testRunner = scope.resolve(path: binDir.appending(path: "test.js"))
                 do {
@@ -408,6 +400,25 @@ struct PackageToJSPlugin: CommandPlugin {
         }
     }
 
+    /// The skeletons describing the API a single test binary exposes.
+    ///
+    /// The native build system links every test target into one binary, so it gets the
+    /// skeletons of all of them. SwiftBuild produces a `<TestTarget>-test-runner` per test
+    /// target, which only exposes that target and its dependencies.
+    private func runnerSkeletons(
+        runnerName: String,
+        isCombinedBinary: Bool,
+        context: PluginContext,
+        aggregated: [BridgeJSSkeletonInput]
+    ) -> [BridgeJSSkeletonInput] {
+        let testRunnerSuffix = "-test-runner"
+        guard !isCombinedBinary, runnerName.hasSuffix(testRunnerSuffix) else {
+            return aggregated
+        }
+        let targetName = String(runnerName.dropLast(testRunnerSuffix.count))
+        return SkeletonCollector(context: context).collectFromTest(targetName: targetName)
+    }
+
     /// Locate the test product artifact(s) to run.
     ///
     /// The native build system links all test targets into a single combined
@@ -854,16 +865,28 @@ class SkeletonCollector {
     }
 
     func collectFromTests() -> [BridgeJSSkeletonInput] {
-        let tests = context.package.targets.filter {
-            guard let target = $0 as? SwiftSourceModuleTarget else { return false }
-            return target.kind == .test
-        }
-        for test in tests {
+        for test in testTargets {
             visit(target: test, package: context.package)
         }
         return skeletons
     }
 
+    /// Collect the skeletons of a single test target and everything it links in.
+    func collectFromTest(targetName: String) -> [BridgeJSSkeletonInput] {
+        guard let test = testTargets.first(where: { $0.name == targetName }) else {
+            return []
+        }
+        visit(target: test, package: context.package)
+        return skeletons
+    }
+
+    private var testTargets: [Target] {
+        context.package.targets.filter {
+            guard let target = $0 as? SwiftSourceModuleTarget else { return false }
+            return target.kind == .test
+        }
+    }
+
     private func visit(product: Product, package: Package) {
         if visitedProducts.contains(product.id) { return }
         visitedProducts.insert(product.id)