@forge/bundler

7.2.3-next.15-experimental-fd0ebbc7.2.3-next.17
~

Modified (7 files)

out/runtime.js View → 
Index: package/out/runtime.js
===================================================================
--- package/out/runtime.js
+++ package/out/runtime.js
@@ -21,21 +21,14 @@
 async function getRuntimeArtifacts(provider, args) {
     const result = new Map();
     const wrapper = await provider.getNodeRuntimeWrapper();
     const loader = await provider.getNodeRuntimeLoader();
-    let entrypointScript;
-    if (loader) {
-        entrypointScript = loader;
-        result.set(NODE_RUNTIME_BACKUP_WRAPPER_FILE, Buffer.from(wrapper.script));
-    }
-    else {
-        entrypointScript = wrapper;
-    }
-    result.set(exports.NODE_RUNTIME_CODE_FILE, Buffer.from(entrypointScript.script));
+    result.set(exports.NODE_RUNTIME_CODE_FILE, Buffer.from(loader.script));
+    result.set(NODE_RUNTIME_BACKUP_WRAPPER_FILE, Buffer.from(wrapper.script));
     if (process.env.FORGE_RUNTIME_PATH) {
         result.set(NODE_RUNTIME_USE_LOCAL_WRAPPER_FILE, Buffer.from('Local wrapper used'));
     }
-    result.set(NODE_RUNTIME_VERSION_FILE, Buffer.from(JSON.stringify({ version: entrypointScript.version }, null, 2)));
+    result.set(NODE_RUNTIME_VERSION_FILE, Buffer.from(JSON.stringify({ version: loader.version }, null, 2)));
     if (args.i18nResourceBundle) {
         for (const [fileName, filePath] of (0, cli_shared_1.listFilesInI18nResourceBundle)(args.i18nResourceBundle)) {
             result.set(path_1.default.join(i18n_1.I18N_BUNDLE_FOLDER_NAME, fileName), filePath);
         }
out/wrapper-provider.js View → 
Index: package/out/wrapper-provider.js
===================================================================
--- package/out/wrapper-provider.js
+++ package/out/wrapper-provider.js
@@ -64,14 +64,12 @@
     }
 }
 exports.LocalWrapperProvider = LocalWrapperProvider;
 class NetworkWrapperProvider {
-    statsigService;
     wrapper;
     loader;
     cdnUrl;
-    constructor(statsigService) {
-        this.statsigService = statsigService;
+    constructor() {
         this.cdnUrl = (0, cli_shared_1.getEnvironmentConfig)(RuntimeCDN);
     }
     async getScriptPathFromIndex(htmlContent, requestId, scriptType) {
         const html = (0, cheerio_1.load)(htmlContent, { xml: { xmlMode: false } });
@@ -124,19 +122,17 @@
         return this.wrapper;
     }
     async getNodeRuntimeLoader() {
         if (!this.loader) {
-            if (await this.statsigService.testForgeCliBundleRuntimeLoaderGate()) {
-                this.loader = await this.getFileFromCDN(ScriptType.LOADER);
-            }
+            this.loader = await this.getFileFromCDN(ScriptType.LOADER);
         }
         return this.loader;
     }
 }
 exports.NetworkWrapperProvider = NetworkWrapperProvider;
-const getWrapperProvider = ({ fileSystemReader, statsigService }) => {
+const getWrapperProvider = ({ fileSystemReader }) => {
     if (process.env.FORGE_RUNTIME_PATH) {
         return new LocalWrapperProvider(fileSystemReader, process.env.FORGE_RUNTIME_PATH);
     }
-    return new NetworkWrapperProvider(statsigService);
+    return new NetworkWrapperProvider();
 };
 exports.getWrapperProvider = getWrapperProvider;
package.json View → 
Index: package/package.json
===================================================================
--- package/package.json
+++ package/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@forge/bundler",
-  "version": "7.2.3-next.15-experimental-fd0ebbc",
+  "version": "7.2.3-next.17",
   "description": "Default bundler for Forge apps",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Atlassian",
   "main": "out/index.js",
@@ -20,12 +20,12 @@
     "@babel/plugin-transform-optional-chaining": "^7.23.4",
     "@babel/plugin-transform-react-jsx": "^7.23.4",
     "@babel/traverse": "^7.24.0",
     "@babel/types": "^7.24.0",
-    "@forge/cli-shared": "9.7.0-next.14-experimental-fd0ebbc",
+    "@forge/cli-shared": "9.7.0-next.16",
     "@forge/i18n": "1.0.0",
-    "@forge/lint": "6.2.3-next.15-experimental-fd0ebbc",
-    "@forge/manifest": "13.5.1-next.1-experimental-fd0ebbc",
+    "@forge/lint": "6.2.3-next.17",
+    "@forge/manifest": "13.6.0-next.2",
     "babel-loader": "^8.3.0",
     "cheerio": "^1.2.0",
     "chokidar": "^4.0.3",
     "cross-spawn": "^7.0.6",
out/runtime.d.ts.map View → 
Index: package/out/runtime.d.ts.map
===================================================================
--- package/out/runtime.d.ts.map
+++ package/out/runtime.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAiC,cAAc,EAAa,MAAM,mBAAmB,CAAC;AAEnH,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAKjD,OAAO,EAEL,OAAO,EAOR,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAiB,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEpE,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAK3E,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AAkOtD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAC7B,OAAO,CAET"}
\ No newline at end of file
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAiC,cAAc,EAAa,MAAM,mBAAmB,CAAC;AAEnH,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAKjD,OAAO,EAEL,OAAO,EAOR,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAK3E,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AA4NtD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAC7B,OAAO,CAET"}
\ No newline at end of file
out/wrapper-provider.d.ts.map View → 
Index: package/out/wrapper-provider.d.ts.map
===================================================================
--- package/out/wrapper-provider.d.ts.map
+++ package/out/wrapper-provider.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"wrapper-provider.d.ts","sourceRoot":"","sources":["../src/wrapper-provider.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,SAAS,EACT,gBAAgB,EAChB,SAAS,EAGT,cAAc,EAEf,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,MAAM,MAAM,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,CA6CpB;IAEI,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;IAO/C,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAQjE;AAED,eAAO,MAAM,kBAAkB,GAAI,sCAGhC;IACD,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,cAAc,EAAE,cAAc,CAAC;CAChC,kDAQA,CAAC"}
\ No newline at end of file
+{"version":3,"file":"wrapper-provider.d.ts","sourceRoot":"","sources":["../src/wrapper-provider.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,SAAS,EACT,gBAAgB,EAChB,SAAS,EAIV,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,MAAM,MAAM,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,CAAC,CAAC;CAChD;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,CAAC;CAGrD;AAED,qBAAa,sBAAuB,YAAW,eAAe;IAC5D,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,MAAM,CAA4B;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;;YAMX,sBAAsB;IAgBpC,OAAO,CAAC,cAAc,CA6CpB;IAEI,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;IAO/C,oBAAoB,IAAI,OAAO,CAAC,aAAa,CAAC;CAMrD;AAED,eAAO,MAAM,kBAAkB,GAAI,sBAAsB;IAAE,gBAAgB,EAAE,gBAAgB,CAAA;CAAE,kDAQ9F,CAAC"}
\ No newline at end of file
CHANGELOG.md View →
File too large for inline diff
out/wrapper-provider.d.ts View → 
Index: package/out/wrapper-provider.d.ts
===================================================================
--- package/out/wrapper-provider.d.ts
+++ package/out/wrapper-provider.d.ts
@@ -1,5 +1,5 @@
-import { BaseError, FileSystemReader, UserError, StatsigService } from '@forge/cli-shared';
+import { BaseError, FileSystemReader, UserError } from '@forge/cli-shared';
 export declare class LocalWrapperNotFoundError extends UserError {
     constructor();
 }
 export declare class WrapperNetworkError extends BaseError {
@@ -14,30 +14,28 @@
     version: string;
 };
 export interface WrapperProvider {
     getNodeRuntimeWrapper(): Promise<RuntimeScript>;
-    getNodeRuntimeLoader(): Promise<RuntimeScript | undefined>;
+    getNodeRuntimeLoader(): Promise<RuntimeScript>;
 }
 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>;
+    getNodeRuntimeLoader(): Promise<RuntimeScript>;
 }
 export declare class NetworkWrapperProvider implements WrapperProvider {
-    protected readonly statsigService: StatsigService;
     private wrapper;
     private loader;
     protected cdnUrl: string;
-    constructor(statsigService: StatsigService);
+    constructor();
     private getScriptPathFromIndex;
     private getFileFromCDN;
     getNodeRuntimeWrapper(): Promise<RuntimeScript>;
-    getNodeRuntimeLoader(): Promise<RuntimeScript | undefined>;
+    getNodeRuntimeLoader(): Promise<RuntimeScript>;
 }
-export declare const getWrapperProvider: ({ fileSystemReader, statsigService }: {
+export declare const getWrapperProvider: ({ fileSystemReader }: {
     fileSystemReader: FileSystemReader;
-    statsigService: StatsigService;
 }) => LocalWrapperProvider | NetworkWrapperProvider;
 //# sourceMappingURL=wrapper-provider.d.ts.map
\ No newline at end of file