@forge/bundler 7.1.0-next.12-experimental-4b981ef → 7.1.0-next.13

package/CHANGELOG.md

@@ -1,34 +1,14 @@
 # @forge/bundler
 
-## 7.1.0-next.12-experimental-4b981ef
-
-### Minor Changes
-
-- efa5897: Move from node-fetch to native fetch
-- a36d70b: Implement manual bundler
-- d1610cc: Manual runtime packaging option
+## 7.1.0-next.13
 
 ### Patch Changes
 
-- Updated dependencies [4d50a76]
-- Updated dependencies [efa5897]
-- Updated dependencies [0f6f64f]
-- Updated dependencies [f01417b]
-- Updated dependencies [18b920d]
-- Updated dependencies [d706cd8]
-- Updated dependencies [0949833]
-- Updated dependencies [a36d70b]
-- Updated dependencies [d1610cc]
-- Updated dependencies [e7bfe5e]
-- Updated dependencies [bc2d278]
-- Updated dependencies [498fda5]
-- Updated dependencies [ca4fa27]
-- Updated dependencies [89ccb1e]
-- Updated dependencies [39f1f15]
-- Updated dependencies [c3a0f20]
-  - @forge/cli-shared@9.3.0-next.11-experimental-4b981ef
-  - @forge/lint@6.0.3-next.12-experimental-4b981ef
-  - @forge/manifest@13.3.0-next.7-experimental-4b981ef
+- 4b90a07: Lint target directory when using the manual packaging
+- Updated dependencies [4b90a07]
+  - @forge/manifest@13.3.0-next.8
+  - @forge/lint@6.0.3-next.13
+  - @forge/cli-shared@9.3.0-next.12
 
 ## 7.1.0-next.12
 

package/out/common.d.ts

@@ -1,7 +1,6 @@
 import { Handler } from '@forge/cli-shared';
 import { BundlerArgs, EntryPoint } from './types';
 export declare function getOutputDir(args: Pick<BundlerArgs, 'watchMode'>): string;
-export declare const SOURCE_DIR = "src";
 export declare const NODE_MODULES_DIR = "node_modules";
 export declare function getEntryPoints(handlers: Handler[]): EntryPoint[];
 export declare function createEntryPointsForResource(resourceKey: string, resourcePath: string, entry?: Record<string, string>): EntryPoint[];

package/out/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAmC,MAAM,mBAAmB,CAAC;AAE7E,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAElD,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,MAAM,CAKzE;AAED,eAAO,MAAM,UAAU,QAAQ,CAAC;AAEhC,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAOhE;AAgBD,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,UAAU,EAAE,CAYd"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAmC,MAAM,mBAAmB,CAAC;AAG7E,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAElD,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,MAAM,CAKzE;AAED,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAOhE;AAgBD,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,UAAU,EAAE,CAYd"}

package/out/common.js

@@ -1,23 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NODE_MODULES_DIR = exports.SOURCE_DIR = void 0;
+exports.NODE_MODULES_DIR = void 0;
 exports.getOutputDir = getOutputDir;
 exports.getEntryPoints = getEntryPoints;
 exports.createEntryPointsForResource = createEntryPointsForResource;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const cli_shared_1 = require("@forge/cli-shared");
+const manifest_1 = require("@forge/manifest");
 function getOutputDir(args) {
     const outputDir = args.watchMode === 'debug' ? path_1.default.resolve(cli_shared_1.TUNNEL_BUNDLE_DIRECTORY) : (0, cli_shared_1.tmpDir)('dist');
     return outputDir;
 }
-exports.SOURCE_DIR = 'src';
 exports.NODE_MODULES_DIR = 'node_modules';
 function getEntryPoints(handlers) {
     const modules = new Set(handlers.map(({ module }) => module));
     return Array.from(modules).map((module) => ({
         name: module,
-        path: path_1.default.resolve(exports.SOURCE_DIR, module)
+        path: path_1.default.resolve(manifest_1.SOURCE_DIRECTORY, module)
     }));
 }
 function createEntryPointsForResource(resourceKey, resourcePath, entry) {

package/out/config/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/config/common.ts"],"names":[],"mappings":"AAEA,OAAgB,EAAE,aAAa,IAAI,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAIjF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAK/C,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,eAAO,MAAM,iBAAiB,GAAI,YAAY,MAAM,KAAG,MAEtD,CAAC;AAEF,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,eAAO,MAAM,gBAAgB,GAAI,eAAe,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,KAAG,MAShF,CAAC;AAEF,MAAM,MAAM,cAAc,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAC5E,MAAM,MAAM,mBAAmB,GAAG,cAAc,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;AAC5F,KAAK,mBAAmB,GAAG,cAAc,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;AAClE,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACpD,MAAM,MAAM,mBAAmB,GAAG,cAAc,CAAC,aAAa,EAAE,QAAQ,GAAG,SAAS,CAAC,GACnF,MAAM,CAAC,QAAQ,EAAE,mBAAmB,CAAC,GACrC,MAAM,CAAC,QAAQ,EAAE,mBAAmB,CAAC,GACrC,MAAM,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;AAElC,eAAO,MAAM,WAAW,GAAI,YAAY,YAAY;;;;;+DAIe;YAAE,MAAM,EAAE;gBAAE,QAAQ,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE;;CAalG,CAAC;AAEF,eAAO,MAAM,sBAAsB,GAAI,MAAM,WAAW,KAAG,mBA0F1D,CAAC"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/config/common.ts"],"names":[],"mappings":"AAEA,OAAgB,EAAE,aAAa,IAAI,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAIjF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAK/C,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,eAAO,MAAM,iBAAiB,GAAI,YAAY,MAAM,KAAG,MAEtD,CAAC;AAEF,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,eAAO,MAAM,gBAAgB,GAAI,eAAe,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,KAAG,MAShF,CAAC;AAEF,MAAM,MAAM,cAAc,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAC5E,MAAM,MAAM,mBAAmB,GAAG,cAAc,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;AAC5F,KAAK,mBAAmB,GAAG,cAAc,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;AAClE,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACpD,MAAM,MAAM,mBAAmB,GAAG,cAAc,CAAC,aAAa,EAAE,QAAQ,GAAG,SAAS,CAAC,GACnF,MAAM,CAAC,QAAQ,EAAE,mBAAmB,CAAC,GACrC,MAAM,CAAC,QAAQ,EAAE,mBAAmB,CAAC,GACrC,MAAM,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;AAElC,eAAO,MAAM,WAAW,GAAI,YAAY,YAAY;;;;;+DAIe;YAAE,MAAM,EAAE;gBAAE,QAAQ,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE;;CAalG,CAAC;AAEF,eAAO,MAAM,sBAAsB,GAAI,MAAM,WAAW,KAAG,mBA2F1D,CAAC"}

package/out/config/common.js

@@ -75,6 +75,7 @@ const getCommonWebpackConfig = (args) => {
             modules: require.resolve.paths('babel-loader') || undefined
         },
         plugins: [
+            new webpack_1.default.IgnorePlugin({ resourceRegExp: /^encoding$/, contextRegExp: /node-fetch/ }),
             new webpack_1.default.IgnorePlugin({ resourceRegExp: /^(bufferutil|utf-8-validate)$/, contextRegExp: /ws\/lib$/ }),
             new webpack_1.default.IgnorePlugin({ resourceRegExp: /^dtrace-provider$/, contextRegExp: /bunyan$/ })
         ],

package/out/runtime.d.ts.map

@@ -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;AA8NtD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAC7B,OAAO,CAET"}
+{"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"}

package/out/runtime.js

@@ -144,6 +144,9 @@ class ConfigBundler {
     }
     async getBundler() {
         const config = (await this.configReader.readConfig()).app.package;
+        if (config?.path && config?.bundler !== 'manual@2026') {
+            throw new cli_shared_1.UserError(text_1.Text.packagePathOnlySupportedForManualBundler);
+        }
         if (config?.bundler === 'typescript') {
             if (!(await this.statsigService.isTypescriptBundlerEnabled())) {
                 throw new cli_shared_1.UserError(text_1.Text.typescriptBundlerEAP);

package/out/text.d.ts

@@ -5,5 +5,6 @@ export declare const Text: {
     metadataFailed: (error: Error) => string;
     typescriptBundlerEAP: string;
     manualBundlerPathRequired: string;
+    packagePathOnlySupportedForManualBundler: string;
 };
 //# sourceMappingURL=text.d.ts.map

package/out/text.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../src/text.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,IAAI;mCACgB,MAAM,EAAE;8BACb,MAAM,EAAE;;4BAKV,KAAK;;;CAG9B,CAAC"}
+{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../src/text.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,IAAI;mCACgB,MAAM,EAAE;8BACb,MAAM,EAAE;;4BAKV,KAAK;;;;CAI9B,CAAC"}

package/out/text.js

@@ -8,5 +8,6 @@ exports.Text = {
     noExecutableFile: 'Could not find the main executable file',
     metadataFailed: (error) => `Application code metadata processing failed: ${error.message}`,
     typescriptBundlerEAP: `TypeScript bundler is a Forge EAP feature. Please see ${cli_shared_1.Text.go('dac/platform/forge/manifest-reference/#package')} for more details.`,
-    manualBundlerPathRequired: 'For manual packaging, the path to the packaged runtime code is required.'
+    manualBundlerPathRequired: 'For manual packaging, the path to the packaged runtime code is required.',
+    packagePathOnlySupportedForManualBundler: 'The package path is only needed when the application is packaged manually.'
 };

package/out/typescript.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../src/typescript.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAIpD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAIlC,OAAO,EAA4B,MAAM,EAAE,MAAM,mBAAmB,CAAC;AASrE,OAAO,EACL,iBAAiB,EACjB,OAAO,EACP,aAAa,EACb,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAEnB,MAAM,SAAS,CAAC;AAGjB,KAAK,aAAa,GAAG,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAE/D,8BAAsB,iBAAkB,YAAW,OAAO;IAC5C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM;IAE7C,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,aAAa;IAwB5E,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;cAWnC,SAAS,CACvB,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,OAAO,CAAC,aAAa,CAAC;IAkBnB,MAAM,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IA4BjD,KAAK,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA8DtF"}
+{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../src/typescript.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAIpD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAIlC,OAAO,EAA4B,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAUrE,OAAO,EACL,iBAAiB,EACjB,OAAO,EACP,aAAa,EACb,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAEnB,MAAM,SAAS,CAAC;AAGjB,KAAK,aAAa,GAAG,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAE/D,8BAAsB,iBAAkB,YAAW,OAAO;IAC5C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM;IAE7C,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,aAAa;IAwB5E,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;cAWnC,SAAS,CACvB,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,OAAO,CAAC,aAAa,CAAC;IAkBnB,MAAM,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IA4BjD,KAAK,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA8DtF"}

package/out/typescript.js

@@ -7,6 +7,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const readline_1 = require("readline");
 const cross_spawn_1 = tslib_1.__importDefault(require("cross-spawn"));
 const cli_shared_1 = require("@forge/cli-shared");
+const manifest_1 = require("@forge/manifest");
 const common_1 = require("./common");
 const dependencies_1 = require("./dependencies");
 const text_1 = require("./text");
@@ -20,7 +21,7 @@ class TypeScriptBundler {
     runTypeScript(args, outputDir) {
         const processArgs = [];
         processArgs.push('--project', args.appDirectory);
-        processArgs.push('--rootDir', path_1.default.join(args.appDirectory, common_1.SOURCE_DIR));
+        processArgs.push('--rootDir', path_1.default.join(args.appDirectory, manifest_1.SOURCE_DIRECTORY));
         if (args.watchMode) {
             processArgs.push('--watch');
         }

package/out/wrapper-provider.d.ts

@@ -17,12 +17,6 @@ export interface WrapperProvider {
     getNodeRuntimeWrapper(): Promise<RuntimeScript>;
     getNodeRuntimeLoader(): Promise<RuntimeScript | undefined>;
 }
-type RuntimeFetchResponse = {
-    ok: boolean;
-    status: number;
-    headers: Headers;
-    text: () => Promise<string>;
-};
 export declare class LocalWrapperProvider implements WrapperProvider {
     private readonly filesystemReader;
     private readonly runtimePath;
@@ -37,7 +31,6 @@ export declare class NetworkWrapperProvider implements WrapperProvider {
     private loader;
     protected cdnUrl: string;
     constructor(statsigService: StatsigService);
-    protected getFromNodeRequest: (url: string) => Promise<RuntimeFetchResponse>;
     private getScriptPathFromIndex;
     private getFileFromCDN;
     getNodeRuntimeWrapper(): Promise<RuntimeScript>;
@@ -47,5 +40,4 @@ export declare const getWrapperProvider: ({ fileSystemReader, statsigService }:
     fileSystemReader: FileSystemReader;
     statsigService: StatsigService;
 }) => LocalWrapperProvider | NetworkWrapperProvider;
-export {};
 //# sourceMappingURL=wrapper-provider.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"wrapper-provider.d.ts","sourceRoot":"","sources":["../src/wrapper-provider.ts"],"names":[],"mappings":"AAOA,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,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,KAAK,oBAAoB,GAAG;IAC1B,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC;AAiCF,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;IAI7D,SAAS,CAAC,kBAAkB,GAAU,KAAK,MAAM,KAAG,OAAO,CAAC,oBAAoB,CAAC,CAqB/E;YAEY,sBAAsB;IAgBpC,OAAO,CAAC,cAAc,CAyCpB;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"}
+{"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,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,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,CAuCpB;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"}

package/out/wrapper-provider.js

@@ -3,10 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWrapperProvider = exports.NetworkWrapperProvider = exports.LocalWrapperProvider = exports.ParseWrapperCDNIndexError = exports.WrapperNetworkError = exports.LocalWrapperNotFoundError = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
-const http_1 = tslib_1.__importDefault(require("http"));
-const https_1 = tslib_1.__importDefault(require("https"));
-const url_1 = require("url");
 const cheerio_1 = require("cheerio");
+const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 const cli_shared_1 = require("@forge/cli-shared");
 var RuntimeCDN;
 (function (RuntimeCDN) {
@@ -39,30 +37,6 @@ var ScriptType;
     ScriptType["WRAPPER"] = "wrapper";
     ScriptType["LOADER"] = "loader";
 })(ScriptType || (ScriptType = {}));
-const NODE_REQUEST_TIMEOUT_MS = 30_000;
-const DEFAULT_HTTP_ERROR_STATUS = 500;
-const toHeaders = (rawHeaders) => {
-    const responseHeaders = new Headers();
-    Object.entries(rawHeaders).forEach(([key, value]) => {
-        if (Array.isArray(value)) {
-            value.forEach((headerValue) => responseHeaders.append(key, headerValue));
-            return;
-        }
-        if (typeof value === 'string') {
-            responseHeaders.set(key, value);
-        }
-    });
-    return responseHeaders;
-};
-const toRuntimeFetchResponse = (response, chunks, headers) => {
-    const status = response.statusCode ?? DEFAULT_HTTP_ERROR_STATUS;
-    return {
-        ok: status >= 200 && status < 300,
-        status,
-        headers,
-        text: async () => Buffer.concat(chunks).toString('utf8')
-    };
-};
 class LocalWrapperProvider {
     filesystemReader;
     runtimePath;
@@ -99,23 +73,6 @@ class NetworkWrapperProvider {
         this.statsigService = statsigService;
         this.cdnUrl = (0, cli_shared_1.getEnvironmentConfig)(RuntimeCDN);
     }
-    getFromNodeRequest = async (url) => {
-        return await new Promise((resolve, reject) => {
-            const parsedUrl = new url_1.URL(url);
-            const requestClient = parsedUrl.protocol === 'https:' ? https_1.default : http_1.default;
-            const request = requestClient.get(parsedUrl, (response) => {
-                const body = [];
-                response.on('data', (chunk) => body.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)));
-                response.on('end', () => {
-                    resolve(toRuntimeFetchResponse(response, body, toHeaders(response.headers)));
-                });
-            });
-            request.setTimeout(NODE_REQUEST_TIMEOUT_MS, () => {
-                request.destroy(new Error(`Request timed out after ${NODE_REQUEST_TIMEOUT_MS}ms`));
-            });
-            request.on('error', reject);
-        });
-    };
     async getScriptPathFromIndex(htmlContent, requestId, scriptType) {
         const html = (0, cheerio_1.load)(htmlContent, { xml: { xmlMode: false } });
         const scriptPath = html('script')
@@ -124,16 +81,16 @@ class NetworkWrapperProvider {
         if (typeof scriptPath !== 'string') {
             throw new ParseWrapperCDNIndexError(`Unable to parse source of runtime ${scriptType}.`, requestId);
         }
-        return new url_1.URL(scriptPath, this.cdnUrl).toString();
+        return new URL(scriptPath, this.cdnUrl).toString();
     }
     getFileFromCDN = async (scriptType) => {
         try {
-            const indexResponse = await this.getFromNodeRequest(this.cdnUrl);
+            const indexResponse = await (0, node_fetch_1.default)(this.cdnUrl);
             if (!indexResponse.ok) {
                 throw new WrapperNetworkError(`Failed to fetch runtime component: ${this.cdnUrl} ${indexResponse.status}.`, (0, cli_shared_1.getAtlassianTraceId)(indexResponse.headers));
             }
             const source = await this.getScriptPathFromIndex(await indexResponse.text(), (0, cli_shared_1.getAtlassianTraceId)(indexResponse.headers), scriptType);
-            const response = await this.getFromNodeRequest(source);
+            const response = await (0, node_fetch_1.default)(source);
             if (!response.ok) {
                 throw new WrapperNetworkError(`Failed to fetch runtime component: ${source.toString()} ${response.status}.`, (0, cli_shared_1.getAtlassianTraceId)(response.headers));
             }
@@ -141,7 +98,7 @@ class NetworkWrapperProvider {
             return {
                 script,
                 source,
-                version: new url_1.URL(source).pathname
+                version: new URL(source).pathname
             };
         }
         catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "7.1.0-next.12-experimental-4b981ef",
+  "version": "7.1.0-next.13",
   "description": "Default bundler for Forge apps",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Atlassian",
@@ -21,10 +21,10 @@
     "@babel/plugin-transform-react-jsx": "^7.23.4",
     "@babel/traverse": "^7.24.0",
     "@babel/types": "^7.24.0",
-    "@forge/cli-shared": "9.3.0-next.11-experimental-4b981ef",
+    "@forge/cli-shared": "9.3.0-next.12",
     "@forge/i18n": "1.0.0",
-    "@forge/lint": "6.0.3-next.12-experimental-4b981ef",
-    "@forge/manifest": "13.3.0-next.7-experimental-4b981ef",
+    "@forge/lint": "6.0.3-next.13",
+    "@forge/manifest": "13.3.0-next.8",
     "babel-loader": "^8.3.0",
     "cheerio": "^1.2.0",
     "chokidar": "^4.0.3",
@@ -33,6 +33,7 @@
     "fs-extra": "^11.2.0",
     "html-webpack-plugin": "^5.6.3",
     "nock": "13.5.6",
+    "node-fetch": "2.7.0",
     "tmp": "^0.2.3",
     "ts-loader": "^9.5.2",
     "type-fest": "4.10.2",