@forge/bundler 4.12.4-next.4 → 4.13.0-next.11

package/CHANGELOG.md

@@ -1,5 +1,66 @@
 # @forge/bundler
 
+## 4.13.0-next.11
+
+### Patch Changes
+
+- Updated dependencies [8e7c4ca]
+  - @forge/cli-shared@3.20.2-next.4
+  - @forge/lint@3.7.2-next.5
+  - @forge/node-runtime@0.4.0-next.5
+
+## 4.13.0-next.10
+
+### Patch Changes
+
+- 5c47ac2: Bumping dependencies via Renovate:
+
+  - @types/react
+
+## 4.13.0-next.9
+
+### Patch Changes
+
+- Updated dependencies [863f7eb]
+  - @forge/util@1.3.2-next.0
+  - @forge/api@2.19.3-next.0
+  - @forge/cli-shared@3.20.2-next.3
+  - @forge/node-runtime@0.4.0-next.4
+  - @forge/lint@3.7.2-next.4
+
+## 4.13.0-next.8
+
+### Patch Changes
+
+- Updated dependencies [ce14925]
+  - @forge/cli-shared@3.20.2-next.2
+  - @forge/lint@3.7.2-next.3
+
+## 4.13.0-next.7
+
+### Patch Changes
+
+- Updated dependencies [92a511b]
+  - @forge/lint@3.7.2-next.2
+
+## 4.13.0-next.6
+
+### Patch Changes
+
+- @forge/cli-shared@3.20.2-next.1
+- @forge/lint@3.7.2-next.1
+
+## 4.13.0-next.5
+
+### Minor Changes
+
+- 1d4baff: Track node-runtime version
+
+### Patch Changes
+
+- Updated dependencies [1d4baff]
+  - @forge/node-runtime@0.4.0-next.3
+
 ## 4.12.4-next.4
 
 ### Patch Changes

package/out/config/node.d.ts

@@ -2,6 +2,7 @@ import { CommonWebpackConfig, ConfigBuilder, FunctionsEntryPoint } from './commo
 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 const NODE_RUNTIME_VERSION_FILE = "runtime.json";
 export declare class LocalWrapperNotFoundError extends UserError {
     constructor();
 }
@@ -11,20 +12,24 @@ export declare class WrapperNetworkError extends BaseError {
 export declare class ParseWrapperCDNIndexError extends BaseError {
     constructor(message: string, requestId: string | undefined);
 }
+export type WrapperScript = {
+    script: string;
+    version: string;
+};
 export interface WrapperProvider {
-    getNodeRuntimeWrapper(): Promise<string>;
+    getNodeRuntimeWrapper(): Promise<WrapperScript>;
 }
 export declare class LocalWrapperProvider implements WrapperProvider {
     private readonly filesystemReader;
     constructor(filesystemReader: FileSystemReader);
-    getNodeRuntimeWrapper(): Promise<string>;
+    getNodeRuntimeWrapper(): Promise<WrapperScript>;
 }
 export declare class NetworkWrapperProvider implements WrapperProvider {
     private readonly cdnUrl;
     private wrapper;
     constructor(cdnUrl: string);
     private getWrapperPathFromIndex;
-    getNodeRuntimeWrapper(): Promise<string>;
+    getNodeRuntimeWrapper(): Promise<WrapperScript>;
 }
 export declare const getWrapperProvider: ({ fileSystemReader }: {
     fileSystemReader: FileSystemReader;

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,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;sBAA8C,gBAAgB;mDAM5F,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;AACpD,eAAO,MAAM,yBAAyB,iBAAiB,CAAC;AAIxD,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,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;CACjD;AAED,qBAAa,oBAAqB,YAAW,eAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAhB,gBAAgB,EAAE,gBAAgB;IACzD,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;CAUtD;AAED,qBAAa,sBAAuB,YAAW,eAAe;IAEhD,OAAO,CAAC,QAAQ,CAAC,MAAM;IADnC,OAAO,CAAC,OAAO,CAA4B;gBACd,MAAM,EAAE,MAAM;YAE7B,uBAAuB;IAS/B,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;CAuCtD;AAED,eAAO,MAAM,kBAAkB;sBAA8C,gBAAgB;mDAM5F,CAAC;AAEF,eAAO,MAAM,yBAAyB,oBAClB,eAAe,mBACnB,mBAAmB,EAAE,UAAU,aAAa,KAAG,mBA2D5D,CAAC"}

package/out/config/node.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.getNodeRuntimeBuildConfig = exports.getWrapperProvider = exports.NetworkWrapperProvider = exports.LocalWrapperProvider = exports.ParseWrapperCDNIndexError = exports.WrapperNetworkError = exports.LocalWrapperNotFoundError = exports.NODE_RUNTIME_VERSION_FILE = 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");
@@ -9,6 +9,7 @@ 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';
+exports.NODE_RUNTIME_VERSION_FILE = 'runtime.json';
 const FORGE_RUNTIME_CDN = 'https://forge-node-runtime.prod-east.frontend.public.atl-paas.net/';
 class LocalWrapperNotFoundError extends cli_shared_1.UserError {
     constructor() {
@@ -37,7 +38,10 @@ class LocalWrapperProvider {
         if (!wrapper) {
             throw new LocalWrapperNotFoundError();
         }
-        return wrapper;
+        return {
+            script: wrapper,
+            version: 'local'
+        };
     }
 }
 exports.LocalWrapperProvider = LocalWrapperProvider;
@@ -68,7 +72,11 @@ class NetworkWrapperProvider {
             if (!response.ok) {
                 throw new WrapperNetworkError(`Failed to fetch runtime component: ${wrapperUrl.toString()} ${response.status}.`, (0, cli_shared_1.getAtlassianTraceId)(response.headers));
             }
-            this.wrapper = await response.text();
+            const script = await response.text();
+            this.wrapper = {
+                script,
+                version: new URL(wrapperUrl).pathname
+            };
             return this.wrapper;
         }
         catch (e) {
@@ -107,10 +115,13 @@ const getNodeRuntimeBuildConfig = (wrapperProvider) => (entrypoints, config) =>
             compiler.hooks.make.tapPromise('AfterEmitPlugin', async (compilation) => {
                 const { RawSource } = compiler.webpack.sources;
                 const wrapper = await wrapperProvider.getNodeRuntimeWrapper();
-                const source = new RawSource(wrapper);
+                const source = new RawSource(wrapper.script);
                 for (const entrypoint of entrypoints) {
                     compilation.emitAsset(`${entrypoint.name}.js`, source);
                 }
+                compilation.emitAsset(exports.NODE_RUNTIME_VERSION_FILE, new RawSource(JSON.stringify({
+                    version: wrapper.version
+                }, null, 2)));
             });
         }
     });

package/out/webpack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,GAAG,EAAU,MAAM,OAAO,CAAC;AACxD,OAAO,OAAO,EAAE,EAAE,QAAQ,EAAE,aAAa,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AAG5E,OAAO,EACL,OAAO,EAGP,OAAO,EAEP,aAAa,EACb,aAAa,EACb,YAAY,EACb,MAAM,SAAS,CAAC;AACjB,OAAO,EAEL,gBAAgB,EAGhB,gBAAgB,EAGjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAA2B,UAAU,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtG,OAAO,EAIL,eAAe,EAChB,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,UAAU,EAAE,CAAC;AAQtB,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,GAC/B,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAkChC;AAWD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,EAAE,UAAU,CAAC,EAAE,GAAG,GAAG,aAAa,CAmB9F;AAED,UAAU,eAAe;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,eAAO,MAAM,WAAW,kBAAmB,aAAa,YAAY,eAAe,KAAG,QAOrF,CAAC;AA6BF,eAAO,MAAM,SAAS,YAEZ,UAAU,+EAGjB,QAAQ,IAAI,CA+Bd,CAAC;AAEF,eAAO,MAAM,KAAK,EAAE,OAwBnB,CAAC;AAEF,wBAAgB,aAAa,CAAC,EAAE,SAAS,UAAU,GAAG,UAAU,EAC9D,cAAc,EAAE,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,aAAa,KAAK,mBAAmB,GACvF,OAAO,CAAC,EAAE,CAAC,CA8Bb;AAED,eAAO,MAAM,iBAAiB,EAAE,MAAM,OAA6D,CAAC;AACpG,eAAO,MAAM,cAAc,EAAE,CAAC,eAAe,EAAE,eAAe,KAAK,OAAO,CAAC,mBAAmB,CACnC,CAAC;AAE5D,eAAO,MAAM,cAAc,EAAE,aAkB5B,CAAC"}
+{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,GAAG,EAAU,MAAM,OAAO,CAAC;AACxD,OAAO,OAAO,EAAE,EAAE,QAAQ,EAAE,aAAa,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AAG5E,OAAO,EACL,OAAO,EAGP,OAAO,EAEP,aAAa,EACb,aAAa,EACb,YAAY,EACb,MAAM,SAAS,CAAC;AACjB,OAAO,EAEL,gBAAgB,EAGhB,gBAAgB,EAGjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAA2B,UAAU,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtG,OAAO,EAKL,eAAe,EAChB,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,UAAU,EAAE,CAAC;AAQtB,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,GAC/B,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAkChC;AAWD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,EAAE,UAAU,CAAC,EAAE,GAAG,GAAG,aAAa,CAyB9F;AAED,UAAU,eAAe;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,eAAO,MAAM,WAAW,kBAAmB,aAAa,YAAY,eAAe,KAAG,QAOrF,CAAC;AA6BF,eAAO,MAAM,SAAS,YAEZ,UAAU,+EAGjB,QAAQ,IAAI,CA+Bd,CAAC;AAEF,eAAO,MAAM,KAAK,EAAE,OAwBnB,CAAC;AAEF,wBAAgB,aAAa,CAAC,EAAE,SAAS,UAAU,GAAG,UAAU,EAC9D,cAAc,EAAE,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,aAAa,KAAK,mBAAmB,GACvF,OAAO,CAAC,EAAE,CAAC,CA+Bb;AAED,eAAO,MAAM,iBAAiB,EAAE,MAAM,OAA6D,CAAC;AACpG,eAAO,MAAM,cAAc,EAAE,CAAC,eAAe,EAAE,eAAe,KAAK,OAAO,CAAC,mBAAmB,CACnC,CAAC;AAE5D,eAAO,MAAM,cAAc,EAAE,aAkB5B,CAAC"}

package/out/webpack.js

@@ -53,15 +53,19 @@ function getInMemoryBundle(config, fileSystem) {
     const output = {}, sourceMap = {};
     const outputFileSystem = fileSystem || compilerOutputFileSystem;
     for (const name in config.entry) {
-        output[name] = readMemoryFileSync(outputFileSystem, `/${name}.js`).toString();
+        output[name] = readMemoryFileSync(outputFileSystem, `/${name}.js`);
         if (config.name === node_1.NODE_WEBPACK_CONFIG_NAME && name.startsWith(node_1.NODE_WEBPACK_USER_CODE_DIR + '/')) {
             const wrapperName = name.slice(node_1.NODE_WEBPACK_USER_CODE_DIR.length + 1);
-            output[wrapperName] = readMemoryFileSync(outputFileSystem, `/${wrapperName}.js`).toString();
+            output[wrapperName] = readMemoryFileSync(outputFileSystem, `/${wrapperName}.js`);
             tryReadSourceMapSync(outputFileSystem, sourceMap, wrapperName);
         }
         tryReadSourceMapSync(outputFileSystem, sourceMap, name);
     }
-    return { output, sourceMap };
+    const metadata = {};
+    if (config.name === node_1.NODE_WEBPACK_CONFIG_NAME) {
+        metadata.nodeRuntimeVersion = readMemoryFileSync(outputFileSystem, `/${node_1.NODE_RUNTIME_VERSION_FILE}`);
+    }
+    return { output, sourceMap, metadata };
 }
 exports.getInMemoryBundle = getInMemoryBundle;
 const getCompiler = (webpackConfig, options) => {
@@ -164,9 +168,7 @@ function createBundler(getBuildConfig) {
                             reject(closeError);
                         }
                     });
-                    result.metadata = {
-                        modules: getNodeModuleNames(stats)
-                    };
+                    result.metadata = Object.assign({ modules: getNodeModuleNames(stats) }, result.metadata);
                     resolve(result);
                 }
                 catch (fileReadError) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "4.12.4-next.4",
+  "version": "4.13.0-next.11",
   "description": "Default bundler for Forge apps",
   "license": "UNLICENSED",
   "author": "Atlassian",
@@ -19,12 +19,12 @@
     "@babel/plugin-transform-optional-chaining": "^7.23.0",
     "@babel/plugin-transform-react-jsx": "^7.22.15",
     "@babel/preset-typescript": "^7.23.0",
-    "@forge/api": "2.19.2",
+    "@forge/api": "2.19.3-next.0",
     "@forge/babel-plugin-transform-ui": "1.1.9",
-    "@forge/cli-shared": "3.20.2-next.0",
-    "@forge/lint": "3.7.2-next.0",
-    "@forge/node-runtime": "0.3.1-next.2",
-    "@forge/util": "1.3.1",
+    "@forge/cli-shared": "3.20.2-next.4",
+    "@forge/lint": "3.7.2-next.5",
+    "@forge/node-runtime": "0.4.0-next.5",
+    "@forge/util": "1.3.2-next.0",
     "assert": "^2.1.0",
     "babel-loader": "^8.3.0",
     "browserify-zlib": "^0.2.0",
@@ -59,10 +59,10 @@
   },
   "devDependencies": {
     "@atlassian/xen-test-util": "^3.1.2",
-    "@forge/runtime": "5.1.2-next.0",
+    "@forge/runtime": "5.1.2-next.2",
     "@types/jest": "^29.5.5",
     "@types/node": "14.18.63",
-    "@types/react": "^17.0.67",
+    "@types/react": "^17.0.68",
     "@types/readable-stream": "^4.0.3",
     "@types/webpack-bundle-analyzer": "^4.6.1",
     "@typescript-eslint/eslint-plugin": "^5.62.0",