@forge/bundler 4.21.0-next.8 → 4.21.0

package/CHANGELOG.md

@@ -1,5 +1,85 @@
 # @forge/bundler
 
+## 4.21.0
+
+### Minor Changes
+
+- 9471e5d: Package Node runtime in a central location and remove 'bundled'
+- 30f197e: Refactoring to enable alternate bundler support
+
+### Patch Changes
+
+- 4879128: Revert Changes: Added config file utility method to only read appId and refactored commands to perform validation after command configuration
+- Updated dependencies [70cd30c]
+- Updated dependencies [576da26]
+- Updated dependencies [2712852]
+- Updated dependencies [4879128]
+- Updated dependencies [009ab70]
+- Updated dependencies [cf5bc5c]
+- Updated dependencies [272d770]
+- Updated dependencies [9471e5d]
+- Updated dependencies [78a006f]
+- Updated dependencies [4c15b3a]
+- Updated dependencies [359756b]
+- Updated dependencies [34db0f6]
+- Updated dependencies [01ca857]
+- Updated dependencies [70badb7]
+- Updated dependencies [30f197e]
+  - @forge/cli-shared@6.7.0
+  - @forge/api@5.1.1
+  - @forge/manifest@8.8.0
+  - @forge/lint@5.7.2
+
+## 4.21.0-next.13
+
+### Patch Changes
+
+- 4879128: Revert Changes: Added config file utility method to only read appId and refactored commands to perform validation after command configuration
+- Updated dependencies [4879128]
+  - @forge/cli-shared@6.7.0-next.11
+  - @forge/lint@5.7.2-next.11
+
+## 4.21.0-next.12
+
+### Patch Changes
+
+- Updated dependencies [cf5bc5c]
+- Updated dependencies [4c15b3a]
+  - @forge/cli-shared@6.7.0-next.10
+  - @forge/manifest@8.8.0-next.5
+  - @forge/lint@5.7.2-next.10
+
+## 4.21.0-next.11
+
+### Minor Changes
+
+- 9471e5d: Package Node runtime in a central location and remove 'bundled'
+
+### Patch Changes
+
+- Updated dependencies [9471e5d]
+  - @forge/cli-shared@6.7.0-next.9
+  - @forge/lint@5.7.2-next.9
+
+## 4.21.0-next.10
+
+### Patch Changes
+
+- Updated dependencies [2712852]
+  - @forge/manifest@8.8.0-next.4
+  - @forge/cli-shared@6.6.2-next.8
+  - @forge/lint@5.7.2-next.8
+
+## 4.21.0-next.9
+
+### Patch Changes
+
+- Updated dependencies [009ab70]
+- Updated dependencies [34db0f6]
+  - @forge/manifest@8.7.1-next.3
+  - @forge/cli-shared@6.6.2-next.7
+  - @forge/lint@5.7.2-next.7
+
 ## 4.21.0-next.8
 
 ### Patch Changes

package/out/nativeui.d.ts

@@ -6,7 +6,7 @@ export interface NativeUIBundleResult {
     nativeUiBundlesDetails: ResourceDetails[];
 }
 export declare class NativeUIBundler extends WebpackBundler {
-    getConfig({ entryPoints, i18nConfig }: BundlerArgs): ConfigWithOutput;
+    getConfig({ entryPoints, i18nConfig }: BundlerArgs): Promise<ConfigWithOutput>;
     bundleResources(resources: ResourceDetails[], i18nConfig?: Translations): Promise<NativeUIBundleResult>;
 }
 //# sourceMappingURL=nativeui.d.ts.map

package/out/nativeui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nativeui.d.ts","sourceRoot":"","sources":["../src/nativeui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,OAAO,EAAE,WAAW,EAA4B,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE7D,MAAM,WAAW,oBAAoB;IACnC,sBAAsB,EAAE,eAAe,EAAE,CAAC;CAC3C;AAED,qBAAa,eAAgB,SAAQ,cAAc;IACjD,SAAS,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,WAAW,GAAG,gBAAgB;IAIxD,eAAe,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE,UAAU,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAgCrH"}
+{"version":3,"file":"nativeui.d.ts","sourceRoot":"","sources":["../src/nativeui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,OAAO,EAAE,WAAW,EAA4B,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE7D,MAAM,WAAW,oBAAoB;IACnC,sBAAsB,EAAE,eAAe,EAAE,CAAC;CAC3C;AAED,qBAAa,eAAgB,SAAQ,cAAc;IAC3C,SAAS,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAIvE,eAAe,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE,UAAU,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAgCrH"}

package/out/nativeui.js

@@ -5,7 +5,7 @@ const nativeui_1 = require("./config/nativeui");
 const types_1 = require("./types");
 const webpack_1 = require("./webpack");
 class NativeUIBundler extends webpack_1.WebpackBundler {
-    getConfig({ entryPoints, i18nConfig }) {
+    async getConfig({ entryPoints, i18nConfig }) {
         return (0, nativeui_1.getNativeUiBuildConfig)(entryPoints, i18nConfig);
     }
     async bundleResources(resources, i18nConfig) {

package/out/runtime.d.ts

@@ -1,16 +1,17 @@
-import { ConfigReader } from '@forge/cli-shared';
+import { ConfigReader, StatsigReader } from '@forge/cli-shared';
 import { BundleLogger, BundlerArgs } from './types';
 import { ConfigWithOutput, WebpackBundler } from './webpack';
 import { WrapperProvider } from './wrapper-provider';
 export declare class SandboxBundler extends WebpackBundler {
     constructor(logger: BundleLogger);
-    getConfig(args: BundlerArgs): ConfigWithOutput;
+    getConfig(args: BundlerArgs): Promise<ConfigWithOutput>;
 }
 declare class NodeBundler extends WebpackBundler {
     private readonly wrapperProvider;
-    constructor(logger: BundleLogger, wrapperProvider: WrapperProvider);
-    getConfig(args: BundlerArgs): ConfigWithOutput;
+    private readonly statsigReader;
+    constructor(logger: BundleLogger, wrapperProvider: WrapperProvider, statsigReader: StatsigReader);
+    getConfig(args: BundlerArgs): Promise<ConfigWithOutput>;
 }
-export declare function getNodeBundler(logger: BundleLogger, wrapperProvider: WrapperProvider, configReader: ConfigReader): NodeBundler;
+export declare function getNodeBundler(logger: BundleLogger, wrapperProvider: WrapperProvider, configReader: ConfigReader, statsigReader: StatsigReader): NodeBundler;
 export {};
 //# sourceMappingURL=runtime.d.ts.map

package/out/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAc,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,qBAAa,cAAe,SAAQ,cAAc;gBACpC,MAAM,EAAE,YAAY;IAIhC,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,gBAAgB;CAG/C;AAoCD,cAAM,WAAY,SAAQ,cAAc;IAGpC,OAAO,CAAC,QAAQ,CAAC,eAAe;gBADhC,MAAM,EAAE,YAAY,EACH,eAAe,EAAE,eAAe;IAKnD,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,gBAAgB;CA8C/C;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,GACzB,WAAW,CAKb"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIhE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAc,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAiB,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEpE,qBAAa,cAAe,SAAQ,cAAc;gBACpC,MAAM,EAAE,YAAY;IAI1B,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAG9D;AAkDD,cAAM,WAAY,SAAQ,cAAc;IAGpC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAF9B,MAAM,EAAE,YAAY,EACH,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa;IAKzC,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAmD9D;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAE,aAAa,GAC3B,WAAW,CAKb"}

package/out/runtime.js

@@ -11,42 +11,53 @@ class SandboxBundler extends webpack_2.WebpackBundler {
     constructor(logger) {
         super(logger);
     }
-    getConfig(args) {
+    async getConfig(args) {
         return (0, sandbox_1.getSandboxedRuntimeBuildConfig)(args);
     }
 }
 exports.SandboxBundler = SandboxBundler;
+const NODE_RUNTIME_CODE_FILE = '__forge__.js';
+const NODE_RUNTIME_BACKUP_WRAPPER_FILE = '__forge_wrapper__.cjs';
 const NODE_RUNTIME_VERSION_FILE = 'runtime.json';
 const NODE_WEBPACK_USER_CODE_DIR = 'bundled';
-async function emitWrapperFiles(provider, entrypoints, emit) {
+async function emitWrapperFiles(provider, entrypoints, emit, useSingleWrapper) {
     const wrapper = await provider.getNodeRuntimeWrapper();
     const loader = await provider.getNodeRuntimeLoader();
+    let entrypointScript;
     if (loader) {
-        for (const entrypoint of entrypoints) {
-            await emit(`${entrypoint.name}.cjs`, loader.script);
-        }
-        await emit('__forge_wrapper__.cjs', wrapper.script);
+        entrypointScript = loader;
+        await emit(NODE_RUNTIME_BACKUP_WRAPPER_FILE, wrapper.script);
+    }
+    else {
+        entrypointScript = wrapper;
+    }
+    if (useSingleWrapper) {
+        await emit(NODE_RUNTIME_CODE_FILE, entrypointScript.script);
     }
     else {
         for (const entrypoint of entrypoints) {
-            await emit(`${entrypoint.name}.cjs`, wrapper.script);
+            await emit(`${entrypoint.name}.cjs`, entrypointScript.script);
         }
     }
-    await emit(NODE_RUNTIME_VERSION_FILE, JSON.stringify({ version: loader ? loader.version : wrapper.version }, null, 2));
+    await emit(NODE_RUNTIME_VERSION_FILE, JSON.stringify({ version: entrypointScript.version }, null, 2));
 }
 class NodeBundler extends webpack_2.WebpackBundler {
     wrapperProvider;
-    constructor(logger, wrapperProvider) {
+    statsigReader;
+    constructor(logger, wrapperProvider, statsigReader) {
         super(logger);
         this.wrapperProvider = wrapperProvider;
+        this.statsigReader = statsigReader;
     }
-    getConfig(args) {
+    async getConfig(args) {
         const webpackConfig = (0, common_1.getCommonWebpackConfig)(args);
-        const newEntries = {};
-        for (const [entryKey, entryPath] of Object.entries(webpackConfig.entry)) {
-            newEntries[`${NODE_WEBPACK_USER_CODE_DIR}/${entryKey}`] = entryPath;
+        if (!(await this.statsigReader.packageSingleWrapper())) {
+            const newEntries = {};
+            for (const [entryKey, entryPath] of Object.entries(webpackConfig.entry)) {
+                newEntries[`${NODE_WEBPACK_USER_CODE_DIR}/${entryKey}`] = entryPath;
+            }
+            webpackConfig.entry = newEntries;
         }
-        webpackConfig.entry = newEntries;
         webpackConfig.target = 'node18';
         webpackConfig.output.filename = '[name].cjs';
         webpackConfig.name = 'node-runtime';
@@ -58,13 +69,13 @@ class NodeBundler extends webpack_2.WebpackBundler {
         });
         webpackConfig.plugins.push({
             apply: (compiler) => {
-                compiler.hooks.make.tapPromise('AfterEmitPlugin', async (compilation) => await emitWrapperFiles(this.wrapperProvider, args.entryPoints, async (name, contents) => compilation.emitAsset(name, new RawSource(contents))));
+                compiler.hooks.make.tapPromise('AfterEmitPlugin', async (compilation) => await emitWrapperFiles(this.wrapperProvider, args.entryPoints, async (name, contents) => compilation.emitAsset(name, new RawSource(contents)), await this.statsigReader.packageSingleWrapper()));
             }
         });
         return webpackConfig;
     }
 }
-function getNodeBundler(logger, wrapperProvider, configReader) {
-    return new NodeBundler(logger, wrapperProvider);
+function getNodeBundler(logger, wrapperProvider, configReader, statsigReader) {
+    return new NodeBundler(logger, wrapperProvider, statsigReader);
 }
 exports.getNodeBundler = getNodeBundler;

package/out/webpack.d.ts

@@ -11,7 +11,7 @@ export declare abstract class WebpackBundler implements Bundler {
     constructor(logger: BundleLogger);
     protected getOutput(config: ConfigWithOutput, stats: webpack.Stats): Promise<BundlerOutput>;
     protected runCompiler(config: ConfigWithOutput): Promise<BundlerOutput>;
-    abstract getConfig(args: BundlerArgs): ConfigWithOutput;
+    abstract getConfig(args: BundlerArgs): Promise<ConfigWithOutput>;
     bundle(args: BundlerArgs): Promise<BundlerOutput>;
     watch(args: BundlerWatchArgs, watch: BundlerWatch): Promise<BundlerWatchOutput>;
 }

package/out/webpack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,OAAO,EACL,OAAO,EACP,YAAY,EAEZ,aAAa,EACb,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,GAAG,aAAa,GAAG,QAAQ,CAAC,GAAG,SAAS,GAC7E,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAkChC;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,QAAQ,CAE3E;AAqBD,oBAAY,gBAAgB,GAAG,OAAO,CAAC,aAAa,GAAG;IAAE,MAAM,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAEvF,8BAAsB,cAAe,YAAW,OAAO;IACzC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY;gBAApB,MAAM,EAAE,YAAY;cAEnC,SAAS,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;cAWjF,WAAW,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAsB7E,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,gBAAgB;IAEjD,MAAM,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAKjD,KAAK,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAsCtF"}
+{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,OAAO,EACL,OAAO,EACP,YAAY,EAEZ,aAAa,EACb,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,GAAG,aAAa,GAAG,QAAQ,CAAC,GAAG,SAAS,GAC7E,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAkChC;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,QAAQ,CAE3E;AAqBD,oBAAY,gBAAgB,GAAG,OAAO,CAAC,aAAa,GAAG;IAAE,MAAM,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAEvF,8BAAsB,cAAe,YAAW,OAAO;IACzC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY;gBAApB,MAAM,EAAE,YAAY;cAEnC,SAAS,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;cAWjF,WAAW,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAsB7E,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAE1D,MAAM,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAKjD,KAAK,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAsCtF"}

package/out/webpack.js

@@ -88,11 +88,11 @@ class WebpackBundler {
         });
     }
     async bundle(args) {
-        const config = this.getConfig(args);
+        const config = await this.getConfig(args);
         return await this.runCompiler(config);
     }
     async watch(args, watch) {
-        const config = this.getConfig(args);
+        const config = await this.getConfig(args);
         const compiler = getCompiler(config);
         let isFirstRun = true;
         compiler.hooks.watchRun.tapAsync('watchRun', async (_, watchRunCallback) => {

package/out/wrapper-provider.d.ts

@@ -10,6 +10,7 @@ export declare class ParseWrapperCDNIndexError extends BaseError {
 }
 export declare type RuntimeScript = {
     script: string;
+    source: string;
     version: string;
 };
 export interface WrapperProvider {
@@ -20,6 +21,7 @@ export declare class LocalWrapperProvider implements WrapperProvider {
     private readonly filesystemReader;
     private readonly runtimePath;
     constructor(filesystemReader: FileSystemReader, runtimePath: string);
+    private getLocalScript;
     getNodeRuntimeWrapper(): Promise<RuntimeScript>;
     getNodeRuntimeLoader(): Promise<RuntimeScript | undefined>;
 }

package/out/wrapper-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrapper-provider.d.ts","sourceRoot":"","sources":["../src/wrapper-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,SAAS,EACT,gBAAgB,EAChB,SAAS,EAGT,cAAc,EACf,MAAM,mBAAmB,CAAC;AAW3B,qBAAa,yBAA0B,SAAQ,SAAS;;CAIvD;AAED,qBAAa,mBAAoB,SAAQ,SAAS;gBACpC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;CAGhD;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS;CAG3D;AAED,oBAAY,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAChD,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;CAC5D;AAOD,qBAAa,oBAAqB,YAAW,eAAe;IAExD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBADX,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,MAAM;IAEhC,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;IAW/C,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAUjE;AAED,qBAAa,sBAAuB,YAAW,eAAe;IAKhD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc;IAJ7D,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,MAAM,CAA4B;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEM,cAAc,EAAE,cAAc;YAI/C,sBAAsB;IAgBpC,OAAO,CAAC,cAAc,CAmCpB;IAEI,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;IAO/C,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAQjE;AAED,eAAO,MAAM,kBAAkB;sBAIX,gBAAgB;oBAClB,cAAc;mDAS/B,CAAC"}
+{"version":3,"file":"wrapper-provider.d.ts","sourceRoot":"","sources":["../src/wrapper-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,SAAS,EACT,gBAAgB,EAChB,SAAS,EAGT,cAAc,EACf,MAAM,mBAAmB,CAAC;AAW3B,qBAAa,yBAA0B,SAAQ,SAAS;;CAIvD;AAED,qBAAa,mBAAoB,SAAQ,SAAS;gBACpC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;CAGhD;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS;CAG3D;AAED,oBAAY,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAChD,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;CAC5D;AAOD,qBAAa,oBAAqB,YAAW,eAAe;IAExD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBADX,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,MAAM;YAExB,cAAc;IAatB,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;IAI/C,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAGjE;AAED,qBAAa,sBAAuB,YAAW,eAAe;IAKhD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc;IAJ7D,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,MAAM,CAA4B;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEM,cAAc,EAAE,cAAc;YAI/C,sBAAsB;IAgBpC,OAAO,CAAC,cAAc,CAoCpB;IAEI,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;IAO/C,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAQjE;AAED,eAAO,MAAM,kBAAkB;sBAIX,gBAAgB;oBAClB,cAAc;mDAS/B,CAAC"}

package/out/wrapper-provider.js

@@ -44,25 +44,23 @@ class LocalWrapperProvider {
         this.filesystemReader = filesystemReader;
         this.runtimePath = runtimePath;
     }
-    async getNodeRuntimeWrapper() {
-        const wrapper = await this.filesystemReader.readFileAsync(path_1.default.join(this.runtimePath, 'dist/wrapper.js'));
-        if (!wrapper) {
+    async getLocalScript(scriptType) {
+        const source = path_1.default.join(this.runtimePath, `dist/${scriptType}.js`);
+        const script = await this.filesystemReader.readFileAsync(source);
+        if (!script) {
             throw new LocalWrapperNotFoundError();
         }
         return {
-            script: wrapper,
-            version: 'local-wrapper'
+            script,
+            source,
+            version: 'local'
         };
     }
+    async getNodeRuntimeWrapper() {
+        return await this.getLocalScript(ScriptType.WRAPPER);
+    }
     async getNodeRuntimeLoader() {
-        const loader = await this.filesystemReader.readFileAsync(path_1.default.join(this.runtimePath, 'dist/loader.js'));
-        if (!loader) {
-            throw new LocalWrapperNotFoundError();
-        }
-        return {
-            script: loader,
-            version: 'local-loader'
-        };
+        return await this.getLocalScript(ScriptType.LOADER);
     }
 }
 exports.LocalWrapperProvider = LocalWrapperProvider;
@@ -91,15 +89,16 @@ class NetworkWrapperProvider {
             if (!indexResponse.ok) {
                 throw new WrapperNetworkError(`Failed to fetch runtime component: ${this.cdnUrl} ${indexResponse.status}.`, (0, cli_shared_1.getAtlassianTraceId)(indexResponse.headers));
             }
-            const scriptUrl = await this.getScriptPathFromIndex(await indexResponse.text(), (0, cli_shared_1.getAtlassianTraceId)(indexResponse.headers), scriptType);
-            const response = await (0, node_fetch_1.default)(scriptUrl);
+            const source = await this.getScriptPathFromIndex(await indexResponse.text(), (0, cli_shared_1.getAtlassianTraceId)(indexResponse.headers), scriptType);
+            const response = await (0, node_fetch_1.default)(source);
             if (!response.ok) {
-                throw new WrapperNetworkError(`Failed to fetch runtime component: ${scriptUrl.toString()} ${response.status}.`, (0, cli_shared_1.getAtlassianTraceId)(response.headers));
+                throw new WrapperNetworkError(`Failed to fetch runtime component: ${source.toString()} ${response.status}.`, (0, cli_shared_1.getAtlassianTraceId)(response.headers));
             }
             const script = await response.text();
             return {
                 script,
-                version: new URL(scriptUrl).pathname
+                source,
+                version: new URL(source).pathname
             };
         }
         catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "4.21.0-next.8",
+  "version": "4.21.0",
   "description": "Default bundler for Forge apps",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Atlassian",
@@ -19,12 +19,12 @@
     "@babel/plugin-transform-optional-chaining": "^7.23.4",
     "@babel/plugin-transform-react-jsx": "^7.23.4",
     "@babel/preset-typescript": "^7.23.3",
-    "@forge/api": "5.1.1-next.1",
+    "@forge/api": "5.1.1",
     "@forge/babel-plugin-transform-ui": "1.1.21",
-    "@forge/cli-shared": "6.6.2-next.6",
+    "@forge/cli-shared": "6.7.0",
     "@forge/i18n": "0.0.4",
-    "@forge/lint": "5.7.2-next.6",
-    "@forge/manifest": "8.7.1-next.2",
+    "@forge/lint": "5.7.2",
+    "@forge/manifest": "8.8.0",
     "@forge/util": "1.4.8",
     "assert": "^2.1.0",
     "babel-loader": "^8.3.0",
@@ -61,7 +61,7 @@
   },
   "devDependencies": {
     "@atlassian/xen-test-util": "^4.2.0",
-    "@forge/runtime": "5.10.7-next.0",
+    "@forge/runtime": "5.10.7",
     "@types/jest": "^29.5.12",
     "@types/node": "14.18.63",
     "@types/react": "^18.2.64",