@forge/bundler 4.12.0-next.16 → 4.12.0-next.18

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @forge/bundler
 
+## 4.12.0-next.18
+
+### Patch Changes
+
+- 902c23c0: Fetch wrapper directly from CDN instead of Launchdarkly
+
+## 4.12.0-next.17
+
+### Patch Changes
+
+- e3260cf: Bumping dependencies via Renovate:
+
+  - @types/node
+
+- Updated dependencies [e3260cf]
+  - @forge/api@2.19.0-next.5
+  - @forge/cli-shared@3.18.0-next.12
+  - @forge/node-runtime@0.1.2-next.7
+  - @forge/lint@3.6.6-next.12
+
 ## 4.12.0-next.16
 
 ### Patch Changes

package/out/config/node.d.ts

@@ -1,15 +1,15 @@
 import { CommonWebpackConfig, ConfigBuilder, FunctionsEntryPoint } from './common';
-import { BaseError, FeatureFlagReader, FileSystemReader, UserError } from '@forge/cli-shared';
+import { BaseError, FileSystemReader, UserError } from '@forge/cli-shared';
 export declare const NODE_WEBPACK_CONFIG_NAME = "node-runtime";
 export declare const NODE_WEBPACK_USER_CODE_DIR = "bundled";
 export declare class LocalWrapperNotFoundError extends UserError {
     constructor();
 }
 export declare class WrapperNetworkError extends BaseError {
-    constructor(message: string);
+    constructor(message: string, requestId?: string);
 }
-export declare class WrapperNotAvailableError extends BaseError {
-    constructor();
+export declare class ParseWrapperCDNIndexError extends BaseError {
+    constructor(message: string, requestId: string | undefined);
 }
 export interface WrapperProvider {
     getNodeRuntimeWrapper(): Promise<string>;
@@ -20,13 +20,13 @@ export declare class LocalWrapperProvider implements WrapperProvider {
     getNodeRuntimeWrapper(): Promise<string>;
 }
 export declare class NetworkWrapperProvider implements WrapperProvider {
-    private readonly wrapperUrl;
+    private readonly cdnUrl;
     private wrapper;
-    constructor(wrapperUrl: string);
+    constructor(cdnUrl: string);
+    private getWrapperPathFromIndex;
     getNodeRuntimeWrapper(): Promise<string>;
 }
-export declare const getWrapperProvider: ({ featureFlags, fileSystemReader }: {
-    featureFlags: FeatureFlagReader;
+export declare const getWrapperProvider: ({ fileSystemReader }: {
     fileSystemReader: FileSystemReader;
 }) => Promise<LocalWrapperProvider | NetworkWrapperProvider>;
 export declare const getNodeRuntimeBuildConfig: (wrapperProvider: WrapperProvider) => (entrypoints: FunctionsEntryPoint[], config: ConfigBuilder) => CommonWebpackConfig;

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

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/config/node.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,mBAAmB,EAGpB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9F,eAAO,MAAM,wBAAwB,iBAAiB,CAAC;AACvD,eAAO,MAAM,0BAA0B,YAAY,CAAC;AAEpD,qBAAa,yBAA0B,SAAQ,SAAS;;CAIvD;AAED,qBAAa,mBAAoB,SAAQ,SAAS;gBACpC,OAAO,EAAE,MAAM;CAG5B;AAED,qBAAa,wBAAyB,SAAQ,SAAS;;CAItD;AAED,MAAM,WAAW,eAAe;IAC9B,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1C;AAED,qBAAa,oBAAqB,YAAW,eAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAhB,gBAAgB,EAAE,gBAAgB;IACzD,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC;CAO/C;AAED,qBAAa,sBAAuB,YAAW,eAAe;IAEhD,OAAO,CAAC,QAAQ,CAAC,UAAU;IADvC,OAAO,CAAC,OAAO,CAAqB;gBACP,UAAU,EAAE,MAAM;IACzC,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC;CAiB/C;AAED,eAAO,MAAM,kBAAkB;kBAIf,iBAAiB;sBACb,gBAAgB;4DAYnC,CAAC;AAEF,eAAO,MAAM,yBAAyB,oBAClB,eAAe,mBACnB,mBAAmB,EAAE,UAAU,aAAa,KAAG,mBA6C5D,CAAC"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/config/node.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,mBAAmB,EAGpB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAuB,MAAM,mBAAmB,CAAC;AAGhG,eAAO,MAAM,wBAAwB,iBAAiB,CAAC;AACvD,eAAO,MAAM,0BAA0B,YAAY,CAAC;AAIpD,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,WAAW,eAAe;IAC9B,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1C;AAED,qBAAa,oBAAqB,YAAW,eAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAhB,gBAAgB,EAAE,gBAAgB;IACzD,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC;CAO/C;AAED,qBAAa,sBAAuB,YAAW,eAAe;IAEhD,OAAO,CAAC,QAAQ,CAAC,MAAM;IADnC,OAAO,CAAC,OAAO,CAAqB;gBACP,MAAM,EAAE,MAAM;YAE7B,uBAAuB;IAS/B,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC;CAmC/C;AAED,eAAO,MAAM,kBAAkB;sBAAoD,gBAAgB;4DAMlG,CAAC;AAEF,eAAO,MAAM,yBAAyB,oBAClB,eAAe,mBACnB,mBAAmB,EAAE,UAAU,aAAa,KAAG,mBA6C5D,CAAC"}

package/out/config/node.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeRuntimeBuildConfig = exports.getWrapperProvider = exports.NetworkWrapperProvider = exports.LocalWrapperProvider = exports.WrapperNotAvailableError = exports.WrapperNetworkError = exports.LocalWrapperNotFoundError = exports.NODE_WEBPACK_USER_CODE_DIR = exports.NODE_WEBPACK_CONFIG_NAME = void 0;
+exports.getNodeRuntimeBuildConfig = exports.getWrapperProvider = exports.NetworkWrapperProvider = exports.LocalWrapperProvider = exports.ParseWrapperCDNIndexError = exports.WrapperNetworkError = exports.LocalWrapperNotFoundError = exports.NODE_WEBPACK_USER_CODE_DIR = exports.NODE_WEBPACK_CONFIG_NAME = void 0;
 const tslib_1 = require("tslib");
 const node_runtime_1 = require("@forge/node-runtime");
 const common_1 = require("./common");
 const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 const cli_shared_1 = require("@forge/cli-shared");
+const cheerio_1 = tslib_1.__importDefault(require("cheerio"));
 exports.NODE_WEBPACK_CONFIG_NAME = 'node-runtime';
 exports.NODE_WEBPACK_USER_CODE_DIR = 'bundled';
+const FORGE_RUNTIME_CDN = 'https://forge-node-runtime.prod-east.frontend.public.atl-paas.net/';
 class LocalWrapperNotFoundError extends cli_shared_1.UserError {
     constructor() {
         super('Local node runtime wrapper not found.');
@@ -15,17 +17,17 @@ class LocalWrapperNotFoundError extends cli_shared_1.UserError {
 }
 exports.LocalWrapperNotFoundError = LocalWrapperNotFoundError;
 class WrapperNetworkError extends cli_shared_1.BaseError {
-    constructor(message) {
+    constructor(message, requestId) {
         super(undefined, message);
     }
 }
 exports.WrapperNetworkError = WrapperNetworkError;
-class WrapperNotAvailableError extends cli_shared_1.BaseError {
-    constructor() {
-        super(undefined, 'Failed to load runtime component, check your network connection and retry.');
+class ParseWrapperCDNIndexError extends cli_shared_1.BaseError {
+    constructor(message, requestId) {
+        super(requestId, message);
     }
 }
-exports.WrapperNotAvailableError = WrapperNotAvailableError;
+exports.ParseWrapperCDNIndexError = ParseWrapperCDNIndexError;
 class LocalWrapperProvider {
     constructor(filesystemReader) {
         this.filesystemReader = filesystemReader;
@@ -40,36 +42,49 @@ class LocalWrapperProvider {
 }
 exports.LocalWrapperProvider = LocalWrapperProvider;
 class NetworkWrapperProvider {
-    constructor(wrapperUrl) {
-        this.wrapperUrl = wrapperUrl;
+    constructor(cdnUrl) {
+        this.cdnUrl = cdnUrl;
+    }
+    async getWrapperPathFromIndex(htmlContent, requestId) {
+        var _a, _b, _c;
+        const html = cheerio_1.default.load(htmlContent);
+        const wrapperPath = (_c = (_b = (_a = html('script')) === null || _a === void 0 ? void 0 : _a.get()) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.attribs['src'];
+        if (typeof wrapperPath !== 'string') {
+            throw new ParseWrapperCDNIndexError('Unable to parse source of runtime component.', requestId);
+        }
+        return new URL(wrapperPath, this.cdnUrl).toString();
     }
     async getNodeRuntimeWrapper() {
         if (this.wrapper) {
             return this.wrapper;
         }
         try {
-            const response = await (0, node_fetch_1.default)(this.wrapperUrl);
+            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 wrapperUrl = await this.getWrapperPathFromIndex(await indexResponse.text(), (0, cli_shared_1.getAtlassianTraceId)(indexResponse.headers));
+            const response = await (0, node_fetch_1.default)(wrapperUrl);
             if (!response.ok) {
-                throw new WrapperNetworkError(`Failed to fetch runtime component: ${this.wrapperUrl} ${response.status}.`);
+                throw new WrapperNetworkError(`Failed to fetch runtime component: ${wrapperUrl.toString()} ${response.status}.`, (0, cli_shared_1.getAtlassianTraceId)(response.headers));
             }
             this.wrapper = await response.text();
             return this.wrapper;
         }
         catch (e) {
+            if (e instanceof ParseWrapperCDNIndexError) {
+                throw e;
+            }
             throw new WrapperNetworkError(e instanceof Error ? e.message : 'Networking error when retrieving runtime component, retry the command.');
         }
     }
 }
 exports.NetworkWrapperProvider = NetworkWrapperProvider;
-const getWrapperProvider = async ({ featureFlags, fileSystemReader }) => {
+const getWrapperProvider = async ({ fileSystemReader }) => {
     if (process.env.FORGE_USE_LOCAL_WRAPPER === 'true') {
         return new LocalWrapperProvider(fileSystemReader);
     }
-    const wrapperUrl = await featureFlags.readFlag('forge-cli-node-runtime-wrapper-url');
-    if (typeof wrapperUrl === 'string') {
-        return new NetworkWrapperProvider(wrapperUrl);
-    }
-    throw new WrapperNotAvailableError();
+    return new NetworkWrapperProvider(FORGE_RUNTIME_CDN);
 };
 exports.getWrapperProvider = getWrapperProvider;
 const getNodeRuntimeBuildConfig = (wrapperProvider) => (entrypoints, config) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "4.12.0-next.16",
+  "version": "4.12.0-next.18",
   "description": "Default bundler for Forge apps",
   "license": "UNLICENSED",
   "author": "Atlassian",
@@ -19,17 +19,18 @@
     "@babel/plugin-transform-optional-chaining": "^7.22.12",
     "@babel/plugin-transform-react-jsx": "^7.22.5",
     "@babel/preset-typescript": "^7.22.11",
-    "@forge/api": "2.19.0-next.4",
+    "@forge/api": "2.19.0-next.5",
     "@forge/babel-plugin-transform-ui": "1.1.7-next.0",
-    "@forge/cli-shared": "3.18.0-next.11",
-    "@forge/lint": "3.6.6-next.11",
-    "@forge/node-runtime": "0.1.2-next.6",
+    "@forge/cli-shared": "3.18.0-next.12",
+    "@forge/lint": "3.6.6-next.12",
+    "@forge/node-runtime": "0.1.2-next.7",
     "@forge/util": "1.3.1",
     "assert": "^2.0.0",
     "babel-loader": "^8.3.0",
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "chalk": "^2.4.2",
+    "cheerio": "^0.22.0",
     "console-browserify": "^1.2.0",
     "crypto-browserify": "^3.12.0",
     "events": "^3.3.0",
@@ -58,9 +59,9 @@
   },
   "devDependencies": {
     "@atlassian/xen-test-util": "^3.0.5",
-    "@forge/runtime": "5.0.1-next.5",
+    "@forge/runtime": "5.0.1-next.6",
     "@types/jest": "^29.5.4",
-    "@types/node": "14.18.57",
+    "@types/node": "14.18.58",
     "@types/react": "^17.0.65",
     "@types/readable-stream": "^2.3.15",
     "@types/webpack-bundle-analyzer": "^4.6.0",
@@ -75,4 +76,4 @@
   "engines": {
     "node": ">=12.13.1"
   }
-}
+}