@forge/bundler 4.11.1-next.2 → 4.11.1-next.20

package/CHANGELOG.md

@@ -1,5 +1,158 @@
 # @forge/bundler
 
+## 4.11.1-next.20
+
+### Patch Changes
+
+- Updated dependencies [63f3f2db]
+  - @forge/node-runtime@0.1.1-next.5
+
+## 4.11.1-next.19
+
+### Patch Changes
+
+- 4941db4a: Fix HTTP error handling in sandbox
+
+## 4.11.1-next.18
+
+### Patch Changes
+
+- 8c4ec99f: Bumping dependencies via Renovate:
+
+  - @atlassian/xen-test-util
+
+- Updated dependencies [8c4ec99f]
+  - @forge/cli-shared@3.17.2-next.8
+  - @forge/lint@3.6.5-next.9
+
+## 4.11.1-next.17
+
+### Patch Changes
+
+- a9e43a70: Don't include runtime in sandbox wrapper
+- Updated dependencies [a9e43a70]
+  - @forge/node-runtime@0.1.1-next.4
+
+## 4.11.1-next.16
+
+### Patch Changes
+
+- b9806172: Updated logging headers
+- Updated dependencies [b9806172]
+  - @forge/runtime@5.0.0-next.5
+  - @forge/node-runtime@0.1.1-next.3
+
+## 4.11.1-next.15
+
+### Patch Changes
+
+- Updated dependencies [39a3fe44]
+  - @forge/runtime@5.0.0-next.4
+  - @forge/node-runtime@0.1.1-next.2
+
+## 4.11.1-next.14
+
+### Patch Changes
+
+- Updated dependencies [439098ca]
+  - @forge/cli-shared@3.17.2-next.7
+  - @forge/lint@3.6.5-next.8
+  - @forge/api@2.18.5-next.2
+  - @forge/node-runtime@0.1.1-next.1
+
+## 4.11.1-next.13
+
+### Patch Changes
+
+- cd2b8e51: Bundle wrapper ahead of compilation for node runtime
+- Updated dependencies [cd2b8e51]
+  - @forge/node-runtime@0.1.1-next.0
+  - @forge/runtime@5.0.0-next.3
+
+## 4.11.1-next.12
+
+### Patch Changes
+
+- @forge/cli-shared@3.17.2-next.6
+- @forge/lint@3.6.5-next.7
+
+## 4.11.1-next.11
+
+### Patch Changes
+
+- Updated dependencies [ba548d9]
+  - @forge/runtime@4.4.7-next.2
+  - @forge/api@2.18.5-next.1
+
+## 4.11.1-next.10
+
+### Patch Changes
+
+- Updated dependencies [035116d]
+  - @forge/api@2.18.5-next.0
+  - @forge/cli-shared@3.17.2-next.5
+  - @forge/lint@3.6.5-next.6
+  - @forge/runtime@4.4.7-next.1
+
+## 4.11.1-next.9
+
+### Patch Changes
+
+- Updated dependencies [cdf28f27]
+  - @forge/cli-shared@3.17.2-next.4
+  - @forge/lint@3.6.5-next.5
+
+## 4.11.1-next.8
+
+### Patch Changes
+
+- Updated dependencies [30713ea9]
+  - @forge/cli-shared@3.17.2-next.3
+  - @forge/lint@3.6.5-next.4
+
+## 4.11.1-next.7
+
+### Patch Changes
+
+- 4be20514: Bumping dependencies via Renovate:
+
+  - eslint-plugin-prettier
+
+## 4.11.1-next.6
+
+### Patch Changes
+
+- 4769ae06: Bumping dependencies via Renovate:
+
+  - eslint-config-prettier
+
+## 4.11.1-next.5
+
+### Patch Changes
+
+- 1d4230e6: Bumping dependencies via Renovate:
+
+  - eslint
+  - @types/eslint
+
+- Updated dependencies [1d4230e6]
+  - @forge/lint@3.6.5-next.3
+
+## 4.11.1-next.4
+
+### Patch Changes
+
+- @forge/cli-shared@3.17.2-next.2
+- @forge/lint@3.6.5-next.2
+
+## 4.11.1-next.3
+
+### Patch Changes
+
+- 89e0c881: Use \_HANDLER to determine functions to expose on Node runtime
+- Updated dependencies [89e0c881]
+  - @forge/runtime@4.4.7-next.0
+
 ## 4.11.1-next.2
 
 ### Patch Changes

package/out/config/node.d.ts

@@ -1,4 +1,5 @@
 import { CommonWebpackConfig, ConfigBuilder, FunctionsEntryPoint } from './common';
 export declare const NODE_WEBPACK_CONFIG_NAME = "node-runtime";
+export declare const NODE_WEBPACK_USER_CODE_DIR = "bundled";
 export declare const getNodeRuntimeBuildConfig: (entrypoints: FunctionsEntryPoint[], config: ConfigBuilder) => CommonWebpackConfig;
 //# sourceMappingURL=node.d.ts.map

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,EAIpB,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,wBAAwB,iBAAiB,CAAC;AAEvD,eAAO,MAAM,yBAAyB,gBACvB,mBAAmB,EAAE,UAC1B,aAAa,KACpB,mBAuDF,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;AAGlB,eAAO,MAAM,wBAAwB,iBAAiB,CAAC;AACvD,eAAO,MAAM,0BAA0B,YAAY,CAAC;AAEpD,eAAO,MAAM,yBAAyB,gBACvB,mBAAmB,EAAE,UAC1B,aAAa,KACpB,mBA6CF,CAAC"}

package/out/config/node.js

@@ -1,31 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeRuntimeBuildConfig = exports.NODE_WEBPACK_CONFIG_NAME = void 0;
-const webpack_1 = require("webpack");
+exports.getNodeRuntimeBuildConfig = exports.NODE_WEBPACK_USER_CODE_DIR = exports.NODE_WEBPACK_CONFIG_NAME = void 0;
+const node_runtime_1 = require("@forge/node-runtime");
 const common_1 = require("./common");
+const promises_1 = require("fs/promises");
 exports.NODE_WEBPACK_CONFIG_NAME = 'node-runtime';
+exports.NODE_WEBPACK_USER_CODE_DIR = 'bundled';
 const getNodeRuntimeBuildConfig = (entrypoints, config) => {
     const webpackConfig = (0, common_1.getCommonWebpackConfig)(entrypoints, config);
-    const wrapperPath = (0, common_1.resolveStubPath)('wrapper');
     const newEntries = {};
     for (const [entryKey, entryPath] of Object.entries(webpackConfig.entry)) {
-        newEntries[`bundled/${entryKey}`] = entryPath;
-        newEntries[entryKey] = wrapperPath;
+        newEntries[`${exports.NODE_WEBPACK_USER_CODE_DIR}/${entryKey}`] = entryPath;
     }
     webpackConfig.entry = newEntries;
     webpackConfig.target = 'node18';
-    const defineExports = ({ filename }) => {
-        const entryName = filename.replace(/\.js$/, '');
-        const entrypoint = entrypoints.find((e) => e.name === entryName);
-        if (entrypoint) {
-            return `__BUNDLED_EXPORTS__ = ${JSON.stringify(entrypoint.functions)};`;
-        }
-        return '';
-    };
-    webpackConfig.plugins.push(new webpack_1.BannerPlugin({
-        banner: defineExports,
-        raw: true
-    }));
     webpackConfig.name = exports.NODE_WEBPACK_CONFIG_NAME;
     webpackConfig.module.rules.push({
         test: /\.m?js$/,
@@ -33,6 +21,18 @@ const getNodeRuntimeBuildConfig = (entrypoints, config) => {
             fullySpecified: false
         }
     });
+    webpackConfig.plugins.push({
+        apply: (compiler) => {
+            compiler.hooks.make.tapPromise('AfterEmitPlugin', async (compilation) => {
+                const { RawSource } = compiler.webpack.sources;
+                const wrapper = await (0, promises_1.readFile)(node_runtime_1.WRAPPER_PATH, 'utf-8');
+                const source = new RawSource(wrapper);
+                for (const entrypoint of entrypoints) {
+                    compilation.emitAsset(`${entrypoint.name}.js`, source);
+                }
+            });
+        }
+    });
     return webpackConfig;
 };
 exports.getNodeRuntimeBuildConfig = getNodeRuntimeBuildConfig;

package/out/stubs/http-sandbox-impl.d.ts

@@ -1,10 +1,14 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
+import { IncomingMessage } from 'http';
 import { RequestOptions } from 'https';
 import { Writable } from 'readable-stream';
 import { URL } from 'url';
 import { FetchOptions } from '@forge/api';
-import { Callback } from './http-shared';
+type HttpCallback = (res: IncomingMessage) => void;
+type HttpArg = RequestOptions | string | URL | HttpCallback;
+export declare const isHttpRequestOptions: (options: HttpArg) => options is RequestOptions;
 interface ChainableOptions {
     timeout?: number;
     headers: {
@@ -14,7 +18,7 @@ interface ChainableOptions {
 export declare class Request extends Writable {
     private reqBody;
     private chainableOptions;
-    constructor(options: RequestOptions | string | URL, callback?: Callback);
+    constructor(options: RequestOptions | string | URL, callback?: HttpCallback);
     setHeader(name: string, value: string): Request;
     setTimeout(value: number, callback?: () => void): Request;
     private fetch;

package/out/stubs/http-sandbox-impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-sandbox-impl.d.ts","sourceRoot":"","sources":["../../src/stubs/http-sandbox-impl.ts"],"names":[],"mappings":";;AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAY,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAe,YAAY,EAAS,MAAM,YAAY,CAAC;AAE9D,OAAO,EAAE,QAAQ,EAA6C,MAAM,eAAe,CAAC;AAEpF,UAAU,gBAAgB;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACvB,CAAC;CACH;AAED,qBAAa,OAAQ,SAAQ,QAAQ;IACnC,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,gBAAgB,CAAmB;gBAE/B,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,QAAQ;IAahE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAM/C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO;IAQhE,OAAO,CAAC,KAAK;IAsBN,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI;IAe3F,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,GAAG,MAAM;IAiBvE,MAAM,CAAC,uBAAuB,CAC5B,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EACtC,gBAAgB,EAAE,gBAAgB,GACjC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE;IAuBtC,KAAK;CAGN"}
+{"version":3,"file":"http-sandbox-impl.d.ts","sourceRoot":"","sources":["../../src/stubs/http-sandbox-impl.ts"],"names":[],"mappings":";;;AAGA,OAAO,EAAuB,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAY,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAe,YAAY,EAAS,MAAM,YAAY,CAAC;AAE9D,KAAK,YAAY,GAAG,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,CAAC;AAEnD,KAAK,OAAO,GAAG,cAAc,GAAG,MAAM,GAAG,GAAG,GAAG,YAAY,CAAC;AAQ5D,eAAO,MAAM,oBAAoB,YAAa,OAAO,8BACJ,CAAC;AAYlD,UAAU,gBAAgB;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACvB,CAAC;CACH;AAED,qBAAa,OAAQ,SAAQ,QAAQ;IACnC,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,gBAAgB,CAAmB;gBAE/B,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,YAAY;IAapE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAM/C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO;YAQlD,KAAK;IAqBZ,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI;IAe3F,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,GAAG,MAAM;IAiBvE,MAAM,CAAC,uBAAuB,CAC5B,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EACtC,gBAAgB,EAAE,gBAAgB,GACjC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE;IAuBtC,KAAK;CAGN"}

package/out/stubs/http-sandbox-impl.js

@@ -1,9 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Request = void 0;
+exports.Request = exports.isHttpRequestOptions = void 0;
 const readable_stream_1 = require("readable-stream");
 const api_1 = require("@forge/api");
-const http_shared_1 = require("./http-shared");
+const isCallback = (options) => typeof options === 'function';
+const isString = (options) => typeof options === 'string';
+const isURL = (options) => typeof options === 'object' && options.constructor.name === 'URL';
+const isStringOrURL = (options) => isString(options) || isURL(options);
+const isHttpRequestOptions = (options) => !isStringOrURL(options) && !isCallback(options);
+exports.isHttpRequestOptions = isHttpRequestOptions;
+function formatHttpRequestArgsToUrl(options) {
+    var _a, _b;
+    const protocol = 'https:';
+    const auth = options.auth ? `${options.auth}@` : '';
+    const host = (_a = options.hostname) !== null && _a !== void 0 ? _a : options.host;
+    const port = options.port ? `:${options.port}` : '';
+    const path = (_b = options.path) !== null && _b !== void 0 ? _b : '/';
+    return `${protocol}//${auth}${host}${port}${path}`;
+}
 class Request extends readable_stream_1.Writable {
     constructor(options, callback) {
         super();
@@ -27,25 +41,25 @@ class Request extends readable_stream_1.Writable {
         }
         return this;
     }
-    fetch(options) {
+    async fetch(options) {
         const { url, init } = Request.convertToForgeFetchArgs(options, this.chainableOptions);
         if (init.method && init.method !== 'HEAD' && init.method !== 'GET') {
             init.body = Buffer.concat(this.reqBody);
         }
-        (0, api_1.fetch)(url, init)
-            .then(async (response) => {
+        try {
+            const response = await (0, api_1.fetch)(url, init);
             const content = await response.arrayBuffer();
             const transformedAPIResponse = new Response(content, response);
             this.emit('response', transformedAPIResponse);
-        })
-            .catch((err) => {
+        }
+        catch (err) {
             if (err.message.startsWith('network timeout')) {
                 this.emit('timeout');
             }
             else {
                 this.emit('error', err);
             }
-        });
+        }
     }
     _write(chunk, encoding, callback) {
         try {
@@ -65,15 +79,15 @@ class Request extends readable_stream_1.Writable {
         }
     }
     static urlFromFetchArgs(options) {
-        if ((0, http_shared_1.isString)(options)) {
+        if (isString(options)) {
             return options;
         }
-        else if ((0, http_shared_1.isURL)(options)) {
+        else if (isURL(options)) {
             return options.toString();
         }
         else {
             try {
-                return (0, http_shared_1.formatUrl)(options);
+                return formatHttpRequestArgsToUrl(options);
             }
             catch (err) {
                 console.error('Unable to make request with unrecognised URL options:', options);
@@ -83,7 +97,7 @@ class Request extends readable_stream_1.Writable {
     }
     static convertToForgeFetchArgs(options, chainableOptions) {
         const url = Request.urlFromFetchArgs(options);
-        if ((0, http_shared_1.isStringOrURL)(options)) {
+        if (isStringOrURL(options)) {
             return { url, init: chainableOptions };
         }
         else {

package/out/stubs/http-sandbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-sandbox.d.ts","sourceRoot":"","sources":["../../src/stubs/http-sandbox.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,wBAAgB,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAElH;AAED,wBAAgB,GAAG,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAO9G;AAID,qBAAa,KAAK;gBACJ,OAAO,EAAE,YAAY;CAOlC"}
+{"version":3,"file":"http-sandbox.d.ts","sourceRoot":"","sources":["../../src/stubs/http-sandbox.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAE,OAAO,EAAwB,MAAM,qBAAqB,CAAC;AAEpE,wBAAgB,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAElH;AAED,wBAAgB,GAAG,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAO9G;AAID,qBAAa,KAAK;gBACJ,OAAO,EAAE,YAAY;CAOlC"}

package/out/stubs/http-sandbox.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Agent = exports.get = exports.request = void 0;
-const http_shared_1 = require("./http-shared");
 const http_sandbox_impl_1 = require("./http-sandbox-impl");
 function request(options, callback) {
     return new http_sandbox_impl_1.Request(options, callback);
 }
 exports.request = request;
 function get(options, callback) {
-    if ((0, http_shared_1.isRequestOptions)(options)) {
+    if ((0, http_sandbox_impl_1.isHttpRequestOptions)(options)) {
         options = Object.assign(Object.assign({}, options), { method: 'GET' });
     }
     const result = new http_sandbox_impl_1.Request(options, callback);

package/out/tsconfig-interactor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tsconfig-interactor.d.ts","sourceRoot":"","sources":["../src/tsconfig-interactor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAIrD,eAAO,MAAM,QAAQ,kBAAkB,CAAC;AAExC,eAAO,MAAM,oBAAoB,QAA2C,CAAC;AAE7E,qBAAa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAAoB,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAAjE,gBAAgB,EAAE,gBAAgB,EAAmB,YAAY,EAAE,MAAM;IAE/F,eAAe,IAAI,MAAM;CAKjC"}
+{"version":3,"file":"tsconfig-interactor.d.ts","sourceRoot":"","sources":["../src/tsconfig-interactor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAIrD,eAAO,MAAM,QAAQ,kBAAkB,CAAC;AAExC,eAAO,MAAM,oBAAoB,QAA2C,CAAC;AAE7E,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBADZ,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,MAAM;IAGhC,eAAe,IAAI,MAAM;CAKjC"}

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;AAKtG,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;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,EAAE,UAAU,CAAC,EAAE,GAAG,GAAG,aAAa,CAiB9F;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,aAAa,EAAE,OAAuD,CAAC;AAEpF,eAAO,MAAM,UAAU,EAAE,OAAO,CAAC,mBAAmB,CAA4C,CAAC;AAEjG,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;AAKtG,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,aAAa,EAAE,OAAuD,CAAC;AACpF,eAAO,MAAM,UAAU,EAAE,OAAO,CAAC,mBAAmB,CAA4C,CAAC;AAEjG,eAAO,MAAM,cAAc,EAAE,aAkB5B,CAAC"}

package/out/webpack.js

@@ -42,16 +42,24 @@ function handleWebpackCompilationResult(logger, err, stats) {
     }
 }
 exports.handleWebpackCompilationResult = handleWebpackCompilationResult;
+function tryReadSourceMapSync(fileSystem, sourceMap, entryName) {
+    try {
+        sourceMap[entryName] = readMemoryFileSync(fileSystem, `${entryName}.js.map`);
+    }
+    catch (e) {
+    }
+}
 function getInMemoryBundle(config, fileSystem) {
     const output = {}, sourceMap = {};
     const outputFileSystem = fileSystem || compilerOutputFileSystem;
     for (const name in config.entry) {
         output[name] = readMemoryFileSync(outputFileSystem, `/${name}.js`).toString();
-        try {
-            sourceMap[name] = readMemoryFileSync(outputFileSystem, `/${name}.js.map`);
-        }
-        catch (e) {
+        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();
+            tryReadSourceMapSync(outputFileSystem, sourceMap, wrapperName);
         }
+        tryReadSourceMapSync(outputFileSystem, sourceMap, name);
     }
     return { output, sourceMap };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "4.11.1-next.2",
+  "version": "4.11.1-next.20",
   "description": "Default bundler for Forge apps",
   "license": "UNLICENSED",
   "author": "Atlassian",
@@ -19,11 +19,11 @@
     "@babel/plugin-transform-optional-chaining": "^7.22.10",
     "@babel/plugin-transform-react-jsx": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
-    "@forge/api": "2.18.4",
+    "@forge/api": "2.18.5-next.2",
     "@forge/babel-plugin-transform-ui": "1.1.6",
-    "@forge/cli-shared": "3.17.2-next.1",
-    "@forge/lint": "3.6.5-next.1",
-    "@forge/runtime": "4.4.6",
+    "@forge/cli-shared": "3.17.2-next.8",
+    "@forge/lint": "3.6.5-next.9",
+    "@forge/node-runtime": "0.1.1-next.5",
     "@forge/util": "1.3.1",
     "assert": "^2.0.0",
     "babel-loader": "^8.3.0",
@@ -56,7 +56,7 @@
     "whatwg-url": "^7.1.0"
   },
   "devDependencies": {
-    "@atlassian/xen-test-util": "^2.1.5",
+    "@atlassian/xen-test-util": "^3.0.3",
     "@types/jest": "^29.5.3",
     "@types/node": "14.18.54",
     "@types/react": "^17.0.64",
@@ -64,10 +64,11 @@
     "@types/webpack-bundle-analyzer": "^4.6.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^6.15.0",
-    "eslint-plugin-prettier": "^3.4.1",
-    "prettier": "2.8.8"
+    "eslint": "^8.47.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "prettier": "3.0.2",
+    "@forge/runtime": "5.0.0-next.6"
   },
   "engines": {
     "node": ">=12.13.1"

package/out/stubs/console.d.ts

@@ -1,8 +0,0 @@
-import { ConsoleMethod, P3LogEvent, LogHeader, HeadedLogLine } from '@forge/runtime';
-export declare function emitTunnelEvent(event: P3LogEvent): void;
-export declare function emitLogEvent(event: HeadedLogLine): void;
-export declare function forgeConsole(consoleMethod: ConsoleMethod, header: LogHeader): (...rawData: unknown[]) => void;
-export declare function replaceConsole(header: LogHeader): void;
-export declare function restoreConsole(): void;
-export declare function sendLogCache(): Promise<void>;
-//# sourceMappingURL=console.d.ts.map

package/out/stubs/console.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"console.d.ts","sourceRoot":"","sources":["../../src/stubs/console.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,SAAS,EAET,aAAa,EAEd,MAAM,gBAAgB,CAAC;AAWxB,wBAAgB,eAAe,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAEvD;AAOD,wBAAgB,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,CAEvD;AA6BD,wBAAgB,YAAY,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,SAAS,mCAY3E;AAMD,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,QAI/C;AAED,wBAAgB,cAAc,SAI7B;AAED,wBAAsB,YAAY,kBAwCjC"}

package/out/stubs/console.js

@@ -1,98 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendLogCache = exports.restoreConsole = exports.replaceConsole = exports.forgeConsole = exports.emitLogEvent = exports.emitTunnelEvent = void 0;
-const tslib_1 = require("tslib");
-const api_1 = require("@forge/api");
-const runtime_1 = require("@forge/runtime");
-const util_1 = require("util");
-const https = tslib_1.__importStar(require("https"));
-let logEventCache = [];
-function emitTunnelEvent(event) {
-    process.stdout.write(JSON.stringify(event) + '\n');
-}
-exports.emitTunnelEvent = emitTunnelEvent;
-function emitLogEvent(event) {
-    logEventCache.push(event);
-}
-exports.emitLogEvent = emitLogEvent;
-function customConsole(logLevel, header) {
-    return (...rawData) => {
-        var _a;
-        const msg = (0, util_1.format)((_a = rawData[0]) !== null && _a !== void 0 ? _a : '');
-        const rest = rawData.slice(1).map((val) => (0, util_1.format)(val));
-        const invocationId = (0, api_1.getRuntime)().lambdaContext.awsRequestId;
-        if (global.__forge_tunnel__) {
-            const logEventData = { invocationId, logLevel, logArguments: [msg, ...rest] };
-            emitTunnelEvent(logEventData);
-        }
-        else {
-            const logLine = Object.assign(Object.assign({}, header), { type: runtime_1.LogType.LOG, id: invocationId, P: 3, ts: Date.now(), lvl: logLevel, msg, '*': rest });
-            emitLogEvent(logLine);
-        }
-    };
-}
-function forgeConsole(consoleMethod, header) {
-    switch (consoleMethod) {
-        case 'debug':
-            return customConsole(runtime_1.LogLevel.DEBUG, header);
-        case 'warn':
-            return customConsole(runtime_1.LogLevel.WARN, header);
-        case 'error':
-            return customConsole(runtime_1.LogLevel.ERROR, header);
-        default:
-            return customConsole(runtime_1.LogLevel.INFO, header);
-    }
-}
-exports.forgeConsole = forgeConsole;
-const originalConsole = new Map(runtime_1.CONSOLE_METHODS.map((method) => [method, global.console[method]]));
-function replaceConsole(header) {
-    for (const method of runtime_1.CONSOLE_METHODS) {
-        global.console[method] = forgeConsole(method, header);
-    }
-}
-exports.replaceConsole = replaceConsole;
-function restoreConsole() {
-    for (const method of runtime_1.CONSOLE_METHODS) {
-        global.console[method] = originalConsole.get(method);
-    }
-}
-exports.restoreConsole = restoreConsole;
-async function sendLogCache() {
-    var _a;
-    const options = {
-        method: 'POST',
-        protocol: 'https',
-        host: 'logs',
-        path: '',
-        headers: {
-            'Content-Type': 'application/json'
-        },
-        agent: 'FORGE_PRODUCT_REQUEST'
-    };
-    if (logEventCache.length > 0) {
-        try {
-            const req = https.request(options);
-            req.write(JSON.stringify(logEventCache));
-            const result = await new Promise((resolve, reject) => {
-                req.on('response', ({ statusCode, statusMessage }) => resolve({
-                    statusCode,
-                    statusMessage
-                }));
-                req.on('error', reject);
-                req.end();
-            });
-            if (result.statusCode === 200) {
-            }
-            else {
-                process.stderr.write(`Error returned from proxy when sending logs: status code ${result.statusCode}\n`);
-            }
-        }
-        catch (error) {
-            process.stderr.write(`Sending logs to proxy ${(_a = error.stack) !== null && _a !== void 0 ? _a : error}\n`);
-        }
-        finally {
-            logEventCache = [];
-        }
-    }
-}
-exports.sendLogCache = sendLogCache;

package/out/stubs/http-node.d.ts

@@ -1,3 +0,0 @@
-export declare function replaceHttps(): void;
-export declare function restoreHttps(): void;
-//# sourceMappingURL=http-node.d.ts.map

package/out/stubs/http-node.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"http-node.d.ts","sourceRoot":"","sources":["../../src/stubs/http-node.ts"],"names":[],"mappings":"AAsRA,wBAAgB,YAAY,SAG3B;AAED,wBAAgB,YAAY,SAG3B"}

package/out/stubs/http-node.js

@@ -1,160 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.restoreHttps = exports.replaceHttps = void 0;
-const http_1 = require("http");
-const perf_hooks_1 = require("perf_hooks");
-const url_1 = require("url");
-const http_shared_1 = require("./http-shared");
-const api_1 = require("@forge/api");
-const https = require('https');
-const FORGE_PROXY_UPSTREAM_LATENCY_HEADER = 'forge-proxy-upstream-latency';
-const FORGE_PROXY_RELATIVE_LOCATION_HEADER = 'forge-proxy-relative-location';
-const REDIRECT_STATUS = new Set([300, 301, 302, 303, 307, 308]);
-const originalHttpsRequest = https.request;
-const originalHttpsGet = https.get;
-function parseArgs(args) {
-    const result = {
-        options: {}
-    };
-    if (args.length > 0 && (0, http_shared_1.isStringOrURL)(args[0])) {
-        const url = (0, http_shared_1.isString)(args[0]) ? new url_1.URL(args[0]) : args[0];
-        result.options = (0, url_1.urlToHttpOptions)(url);
-        args.shift();
-    }
-    if (args.length > 0 && (0, http_shared_1.isRequestOptions)(args[0])) {
-        result.options = Object.assign(result.options, args[0]);
-        args.shift();
-    }
-    if (args.length > 0 && (0, http_shared_1.isCallback)(args[0])) {
-        result.callback = args[0];
-        args.shift();
-    }
-    return result;
-}
-const AUTH_PROVIDERS = ['app', 'user', 'none'];
-function isAuthProvider(provider) {
-    return AUTH_PROVIDERS.includes(provider);
-}
-const REMOTE_APIS = ['jira', 'confluence', 'stargate', 'bitbucket'];
-function isRemoteAPI(remote) {
-    return REMOTE_APIS.includes(remote);
-}
-function getProxyPath(args) {
-    switch (args.type) {
-        case 'egress':
-            return '/egress';
-        case 'logs':
-            return '/logs';
-        case 'fpp':
-            return `/fpp/provider/${args.provider}/remote/${args.remote}`;
-    }
-}
-const providerToMetric = {
-    app: 'asApp',
-    user: 'asUser'
-};
-const remoteToMetric = {
-    jira: 'requestJira',
-    confluence: 'requestConfluence',
-    bitbucket: 'requestBitbucket',
-    stargate: 'requestAtlassian'
-};
-const METRICS_TAGS = { proxy: 'true' };
-function getMetricsName(args) {
-    switch (args.type) {
-        case 'logs':
-            return 'api.log';
-        case 'egress':
-            return 'api.fetch';
-        case 'fpp':
-            const { provider, remote } = args;
-            if (provider === 'none') {
-                return `api.${remoteToMetric[remote]}`;
-            }
-            return `api.${providerToMetric[provider]}.${remoteToMetric[remote]}`;
-    }
-}
-function getSingleString(values) {
-    if (typeof values === 'string') {
-        return values;
-    }
-    if (Array.isArray(values)) {
-        return values[0];
-    }
-}
-function getSingleHeader(response, header) {
-    return getSingleString(response.headers[header]);
-}
-function request(...args) {
-    var _a, _b;
-    const { options, callback } = parseArgs(args);
-    let proxyArgs = { type: 'egress' };
-    const host = (_a = options.host) !== null && _a !== void 0 ? _a : options.hostname;
-    if ((options === null || options === void 0 ? void 0 : options.agent) === 'FORGE_PRODUCT_REQUEST') {
-        delete options.agent;
-        if (host && isRemoteAPI(host)) {
-            const authorization = getSingleString((_b = options.headers) === null || _b === void 0 ? void 0 : _b.authorization);
-            if (authorization === null || authorization === void 0 ? void 0 : authorization.startsWith('Forge ')) {
-                const [, provider] = authorization.split(' ');
-                if (isAuthProvider(provider)) {
-                    proxyArgs = { type: 'fpp', provider, remote: host };
-                }
-            }
-        }
-        else if (host === 'logs') {
-            proxyArgs = { type: 'logs' };
-        }
-    }
-    const { metrics, proxy } = (0, api_1.getRuntime)();
-    const metricsName = getMetricsName(proxyArgs);
-    const headers = Object.assign(Object.assign({}, options.headers), { 'forge-proxy-authorization': `Bearer ${proxy.token}` });
-    if (proxy.host) {
-        headers['Host'] = proxy.host;
-    }
-    switch (proxyArgs.type) {
-        case 'egress':
-            headers['forge-proxy-target'] = (0, http_shared_1.formatUrl)(options);
-            break;
-        case 'fpp':
-            headers['forge-proxy-target'] = options.path;
-            break;
-        case 'logs':
-            break;
-    }
-    const proxyOptions = Object.assign(Object.assign(Object.assign({}, options), (0, url_1.urlToHttpOptions)(new url_1.URL(`${proxy.url}${getProxyPath(proxyArgs)}`))), { headers });
-    metrics.counter(metricsName, METRICS_TAGS).incr();
-    const originalRequest = proxyOptions.protocol === 'http:' ? http_1.request : originalHttpsRequest;
-    const requestStart = perf_hooks_1.performance.now();
-    return originalRequest(proxyOptions, (response) => {
-        const requestEnd = perf_hooks_1.performance.now();
-        metrics.timing(metricsName, METRICS_TAGS).set(requestEnd - requestStart);
-        const upstreamLatencyHeader = getSingleHeader(response, FORGE_PROXY_UPSTREAM_LATENCY_HEADER);
-        if (upstreamLatencyHeader !== undefined) {
-            const proxyUpstreamLatency = parseInt(upstreamLatencyHeader);
-            metrics.timing('proxy-success-overhead', METRICS_TAGS).set(requestEnd - requestStart - proxyUpstreamLatency);
-        }
-        if (response.statusCode && REDIRECT_STATUS.has(response.statusCode)) {
-            const relativeLocation = getSingleHeader(response, FORGE_PROXY_RELATIVE_LOCATION_HEADER);
-            if (relativeLocation) {
-                response.headers['location'] = `https://${host}${relativeLocation}`;
-            }
-        }
-        callback === null || callback === void 0 ? void 0 : callback(response);
-    });
-}
-function get(...args) {
-    const { options, callback } = parseArgs(args);
-    const result = request(Object.assign(Object.assign({}, options), { method: 'GET' }), ...(callback ? [callback] : []));
-    result.end();
-    return result;
-}
-function replaceHttps() {
-    https.request = request;
-    https.get = get;
-}
-exports.replaceHttps = replaceHttps;
-function restoreHttps() {
-    https.request = originalHttpsRequest;
-    https.get = originalHttpsGet;
-}
-exports.restoreHttps = restoreHttps;

package/out/stubs/http-shared.d.ts

@@ -1,15 +0,0 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-import { IncomingMessage } from 'http';
-import { RequestOptions } from 'https';
-import { URL } from 'url';
-export type Callback = (res: IncomingMessage) => void;
-export type Arg = RequestOptions | string | URL | Callback;
-export declare const isCallback: (options: Arg) => options is Callback;
-export declare const isString: (options: Arg) => options is string;
-export declare const isURL: (options: Arg) => options is URL;
-export declare const isStringOrURL: (options: Arg) => options is string | URL;
-export declare const isRequestOptions: (options: Arg) => options is RequestOptions;
-export declare function formatUrl(options: RequestOptions): string;
-//# sourceMappingURL=http-shared.d.ts.map

package/out/stubs/http-shared.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"http-shared.d.ts","sourceRoot":"","sources":["../../src/stubs/http-shared.ts"],"names":[],"mappings":";;;AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,CAAC;AAEtD,MAAM,MAAM,GAAG,GAAG,cAAc,GAAG,MAAM,GAAG,GAAG,GAAG,QAAQ,CAAC;AAE3D,eAAO,MAAM,UAAU,YAAa,GAAG,wBAAuD,CAAC;AAC/F,eAAO,MAAM,QAAQ,YAAa,GAAG,sBAAmD,CAAC;AACzF,eAAO,MAAM,KAAK,YAAa,GAAG,mBACiC,CAAC;AAEpE,eAAO,MAAM,aAAa,YAAa,GAAG,4BAAiE,CAAC;AAE5G,eAAO,MAAM,gBAAgB,YAAa,GAAG,8BACI,CAAC;AAElD,wBAAgB,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CAQzD"}

package/out/stubs/http-shared.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatUrl = exports.isRequestOptions = exports.isStringOrURL = exports.isURL = exports.isString = exports.isCallback = void 0;
-const isCallback = (options) => typeof options === 'function';
-exports.isCallback = isCallback;
-const isString = (options) => typeof options === 'string';
-exports.isString = isString;
-const isURL = (options) => typeof options === 'object' && options.constructor.name === 'URL';
-exports.isURL = isURL;
-const isStringOrURL = (options) => (0, exports.isString)(options) || (0, exports.isURL)(options);
-exports.isStringOrURL = isStringOrURL;
-const isRequestOptions = (options) => !(0, exports.isStringOrURL)(options) && !(0, exports.isCallback)(options);
-exports.isRequestOptions = isRequestOptions;
-function formatUrl(options) {
-    var _a, _b;
-    const protocol = 'https:';
-    const auth = options.auth ? `${options.auth}@` : '';
-    const host = (_a = options.hostname) !== null && _a !== void 0 ? _a : options.host;
-    const port = options.port ? `:${options.port}` : '';
-    const path = (_b = options.path) !== null && _b !== void 0 ? _b : '/';
-    return `${protocol}//${auth}${host}${port}${path}`;
-}
-exports.formatUrl = formatUrl;

package/out/stubs/log-events.d.ts

@@ -1,6 +0,0 @@
-import { ExternalRequestBody, LogHeader } from '@forge/runtime';
-export declare const AWS_EXECUTION_ENV_PREFIX = "AWS_Lambda_";
-export declare const RUNTIME_NAME_FALLBACK = "node";
-export declare function getRuntimeName(): string;
-export declare function invocationHeaderLogs(lambdaEvent: ExternalRequestBody): LogHeader;
-//# sourceMappingURL=log-events.d.ts.map

package/out/stubs/log-events.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"log-events.d.ts","sourceRoot":"","sources":["../../src/stubs/log-events.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAW,MAAM,gBAAgB,CAAC;AAEzE,eAAO,MAAM,wBAAwB,gBAAgB,CAAC;AACtD,eAAO,MAAM,qBAAqB,SAAS,CAAC;AAE5C,wBAAgB,cAAc,IAAI,MAAM,CAavC;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,mBAAmB,GAAG,SAAS,CAiBhF"}

package/out/stubs/log-events.js

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.invocationHeaderLogs = exports.getRuntimeName = exports.RUNTIME_NAME_FALLBACK = exports.AWS_EXECUTION_ENV_PREFIX = void 0;
-const api_1 = require("@forge/api");
-const runtime_1 = require("@forge/runtime");
-exports.AWS_EXECUTION_ENV_PREFIX = 'AWS_Lambda_';
-exports.RUNTIME_NAME_FALLBACK = 'node';
-function getRuntimeName() {
-    const awsRuntime = process.env.AWS_EXECUTION_ENV;
-    if (!awsRuntime) {
-        return exports.RUNTIME_NAME_FALLBACK;
-    }
-    if (awsRuntime.startsWith(exports.AWS_EXECUTION_ENV_PREFIX)) {
-        return awsRuntime.substring(exports.AWS_EXECUTION_ENV_PREFIX.length);
-    }
-    return awsRuntime;
-}
-exports.getRuntimeName = getRuntimeName;
-function invocationHeaderLogs(lambdaEvent) {
-    const { featureFlags, contextAri, appContext, tracing } = lambdaEvent === null || lambdaEvent === void 0 ? void 0 : lambdaEvent._meta;
-    const { appId, environmentId, appVersion, functionKey, moduleKey, moduleType } = appContext !== null && appContext !== void 0 ? appContext : {};
-    return {
-        id: (0, api_1.getRuntime)().lambdaContext.awsRequestId,
-        type: runtime_1.LogType.HEADER,
-        appId,
-        environmentId,
-        appVersion,
-        installationContext: contextAri,
-        functionKey,
-        moduleType,
-        moduleKey,
-        b3: `${tracing.traceId}-${tracing.spanId}`,
-        featureFlags: featureFlags || [],
-        runtime: getRuntimeName()
-    };
-}
-exports.invocationHeaderLogs = invocationHeaderLogs;

package/out/stubs/wrapper.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=wrapper.d.ts.map

package/out/stubs/wrapper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../src/stubs/wrapper.ts"],"names":[],"mappings":""}

package/out/stubs/wrapper.js

@@ -1,76 +0,0 @@
-"use strict";
-var _a, _b;
-Object.defineProperty(exports, "__esModule", { value: true });
-const api_1 = require("@forge/api");
-const runtime_1 = require("@forge/runtime");
-const console_1 = require("./console");
-const http_node_1 = require("./http-node");
-const log_events_1 = require("./log-events");
-const wrappedFilename = __filename.replace(/\/[^/]+.js$/, (name) => '/bundled' + name);
-const realRequire = eval('require');
-if (!realRequire) {
-    throw new Error(`Unexpected require: ${realRequire}`);
-}
-const bundledExports = eval('__BUNDLED_EXPORTS__');
-if (!bundledExports || bundledExports.length === 0) {
-    throw new Error('Expected to find __BUNDLED_EXPORTS__ replaced by Webpack configuration.');
-}
-const adapter = (name) => {
-    return async (lambdaEvent, lambdaContext) => {
-        var _a, _b;
-        const event = lambdaEvent.body;
-        const context = (0, runtime_1.setupRequestContext)({ meta: lambdaEvent._meta, handler: lambdaEvent.handler });
-        const metricsCollector = new runtime_1.MetricsCollector(new runtime_1.InMemoryMetrics({ runtime: 'nodejs' }));
-        const metrics = metricsCollector.metrics();
-        const rms = lambdaEvent._meta.rms;
-        const runtime = Object.assign(Object.assign({ proxy: lambdaEvent._meta.proxy, contextAri: lambdaEvent._meta.contextAri, appContext: lambdaEvent._meta.appContext, allowedEgress: (_a = lambdaEvent._meta.fetchAllowList) !== null && _a !== void 0 ? _a : [], lambdaContext: lambdaContext, tracing: lambdaEvent._meta.tracing, aaid: lambdaEvent._meta.aaid }, (rms && { rms })), { metrics });
-        global.__forge_runtime__ = runtime;
-        for (const { key, value } of (_b = lambdaEvent.variables) !== null && _b !== void 0 ? _b : []) {
-            process.env[key] = value;
-        }
-        try {
-            const header = (0, log_events_1.invocationHeaderLogs)(lambdaEvent);
-            (0, console_1.replaceConsole)(header);
-            (0, http_node_1.replaceHttps)();
-            const timer = metrics.timing('invoke').measure();
-            const bundled = realRequire(wrappedFilename);
-            let result;
-            try {
-                try {
-                    result = await bundled[name](event, context);
-                }
-                catch (err) {
-                    console.error(err);
-                    throw err;
-                }
-            }
-            finally {
-                await (0, console_1.sendLogCache)();
-                timer.stop();
-            }
-            return {
-                success: true,
-                body: result,
-                metrics: metricsCollector.collectMetrics()
-            };
-        }
-        catch (err) {
-            const errorName = (0, api_1.isForgePlatformError)(err) ? err.name : api_1.FUNCTION_ERR;
-            return {
-                success: false,
-                error: {
-                    errorMessage: err.message,
-                    errorType: errorName,
-                    isHostedCodeError: (0, api_1.isHostedCodeError)(errorName),
-                    stack: (err.stack || '').split('\n'),
-                    serviceKey: err.serviceKey
-                },
-                metrics: metricsCollector.collectMetrics()
-            };
-        }
-    };
-};
-(_b = (_a = process).setSourceMapsEnabled) === null || _b === void 0 ? void 0 : _b.call(_a, true);
-for (const ownExport of bundledExports) {
-    exports[ownExport] = adapter(ownExport);
-}