@forge/bundler 4.1.1-next.7 → 4.2.0-next.9

package/out/{wrapper.js → stubs/wrapper.js}

@@ -1,7 +1,11 @@
 "use strict";
 var _a, _b;
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const api_1 = require("@forge/api");
+const ARI = tslib_1.__importStar(require("@forge/util/packages/cs-ari"));
 function createInstallationContext({ contextAri }) {
-    const ari = {};
+    const ari = ARI.parse(contextAri);
     if (ari.resourceType === 'project') {
         return { projectId: ari.resourceId, installContext: contextAri };
     }
@@ -120,31 +124,43 @@ function simpleBunyanLogEvent(eventType, eventLevel, invocationId, data) {
     process.stdout.write(JSON.stringify(logEvent) + '\n');
 }
 function emitHeaderEvent(lambdaEvent) {
-    simpleBunyanLogEvent(BunyanCoreLogEventTypes.HEADER, BunyanCoreLogEventLevels.INFO, global.lambdaContext.awsRequestId, invocationHeaderLogs(lambdaEvent));
+    simpleBunyanLogEvent(BunyanCoreLogEventTypes.HEADER, BunyanCoreLogEventLevels.INFO, (0, api_1.getRuntime)().lambdaContext.awsRequestId, invocationHeaderLogs(lambdaEvent));
 }
 function emitSuccessfulFooterEvent() {
-    simpleBunyanLogEvent(BunyanCoreLogEventTypes.FOOTER, BunyanCoreLogEventLevels.INFO, global.lambdaContext.awsRequestId, invocationFooterLogs(true));
+    simpleBunyanLogEvent(BunyanCoreLogEventTypes.FOOTER, BunyanCoreLogEventLevels.INFO, (0, api_1.getRuntime)().lambdaContext.awsRequestId, invocationFooterLogs(true));
 }
 function emitFailedFooterEvent() {
-    simpleBunyanLogEvent(BunyanCoreLogEventTypes.FOOTER, BunyanCoreLogEventLevels.INFO, global.lambdaContext.awsRequestId, invocationFooterLogs(false));
+    simpleBunyanLogEvent(BunyanCoreLogEventTypes.FOOTER, BunyanCoreLogEventLevels.INFO, (0, api_1.getRuntime)().lambdaContext.awsRequestId, invocationFooterLogs(false));
 }
 function emitErrorEvent(caughtObject) {
-    simpleBunyanLogEvent(BunyanCoreLogEventTypes.LOG, BunyanCoreLogEventLevels.ERROR, global.lambdaContext.awsRequestId, caughtObject);
+    simpleBunyanLogEvent(BunyanCoreLogEventTypes.LOG, BunyanCoreLogEventLevels.ERROR, (0, api_1.getRuntime)().lambdaContext.awsRequestId, caughtObject);
+}
+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;
         const event = lambdaEvent.body;
         const context = setupRequestContext(lambdaEvent._meta);
-        global.lambdaContext = lambdaContext;
-        global.proxyInfo = lambdaEvent._meta.proxy;
-        global.allowedEgress = lambdaEvent._meta.fetchAllowList;
+        const runtime = {
+            proxy: lambdaEvent._meta.proxy,
+            allowedEgress: lambdaEvent._meta.fetchAllowList,
+            lambdaContext: lambdaContext
+        };
+        global.__forge_runtime__ = runtime;
         for (const { key, value } of (_a = lambdaEvent.variables) !== null && _a !== void 0 ? _a : []) {
             process.env[key] = value;
         }
         try {
             emitHeaderEvent(lambdaEvent);
-            const bundled = require('./__PLACEHOLDER_MODULE__');
+            const bundled = realRequire(wrappedFilename);
             const result = await bundled[name](event, context);
             emitSuccessfulFooterEvent();
             return {
@@ -167,11 +183,6 @@ const adapter = (name) => {
     };
 };
 (_b = (_a = process).setSourceMapsEnabled) === null || _b === void 0 ? void 0 : _b.call(_a, true);
-module.exports = new Proxy({}, {
-    get(target, name, receiver) {
-        if (name === 'then') {
-            return undefined;
-        }
-        return adapter(name);
-    }
-});
+for (const ownExport of bundledExports) {
+    exports[ownExport] = adapter(ownExport);
+}

package/out/types.d.ts

@@ -1,5 +1,5 @@
 import { Compiler } from 'webpack';
-import { EntryPoints } from './webpack';
+import { EntryPoint } from './webpack';
 export declare type BundledFiles = {
     [filename: string]: string;
 };
@@ -13,8 +13,8 @@ export interface BundlerOutput {
         [key: string]: any;
     };
 }
-export declare type Bundler = (appDirectory: string, endpointPath: EntryPoints) => Promise<BundlerOutput>;
-export declare type InDiskBundler = (entrypoints: EntryPoints) => Promise<{
+export declare type Bundler<EP = EntryPoint> = (appDirectory: string, endpointPath: EP[]) => Promise<BundlerOutput>;
+export declare type InDiskBundler = (entrypoints: EntryPoint[]) => Promise<{
     outputDir: string;
 }>;
 export declare type WatcherCallback = (err: Error | null, output?: BundlerOutput) => void;
@@ -22,5 +22,5 @@ export interface WatcherMonitor {
     stop(): void;
 }
 export declare type WatchRun = (compiler: Compiler, ...args: any[]) => void;
-export declare type Watcher = (endpointPath: EntryPoints, isDebugMode: boolean, callback: WatcherCallback, watchRun?: WatchRun) => WatcherMonitor;
+export declare type Watcher = (endpointPath: EntryPoint[], isDebugMode: boolean, callback: WatcherCallback, watchRun?: WatchRun) => WatcherMonitor;
 //# sourceMappingURL=types.d.ts.map

package/out/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,oBAAY,YAAY,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAC1D,oBAAY,gBAAgB,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAE9D,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,QAAQ,CAAC,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH;AAED,oBAAY,OAAO,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;AAClG,oBAAY,aAAa,GAAG,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEzF,oBAAY,eAAe,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,aAAa,KAAK,IAAI,CAAC;AAClF,MAAM,WAAW,cAAc;IAC7B,IAAI,IAAI,IAAI,CAAC;CACd;AAED,oBAAY,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AAEpE,oBAAY,OAAO,GAAG,CACpB,YAAY,EAAE,WAAW,EACzB,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,eAAe,EACzB,QAAQ,CAAC,EAAE,QAAQ,KAChB,cAAc,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,oBAAY,YAAY,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAC1D,oBAAY,gBAAgB,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAE9D,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,QAAQ,CAAC,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH;AAED,oBAAY,OAAO,CAAC,EAAE,GAAG,UAAU,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;AAC5G,oBAAY,aAAa,GAAG,CAAC,WAAW,EAAE,UAAU,EAAE,KAAK,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAE1F,oBAAY,eAAe,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,aAAa,KAAK,IAAI,CAAC;AAClF,MAAM,WAAW,cAAc;IAC7B,IAAI,IAAI,IAAI,CAAC;CACd;AAED,oBAAY,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AAEpE,oBAAY,OAAO,GAAG,CACpB,YAAY,EAAE,UAAU,EAAE,EAC1B,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,eAAe,EACzB,QAAQ,CAAC,EAAE,QAAQ,KAChB,cAAc,CAAC"}

package/out/webpack.d.ts

@@ -1,36 +1,19 @@
-import webpack, { Compiler, Configuration as WebpackConfig, ModuleOptions } from 'webpack';
+import webpack, { Compiler, Configuration as WebpackConfig } from 'webpack';
 import { Bundler, Watcher, InDiskBundler, BundlerOutput } from './types';
 import { FileSystemReader, FileSystemWriter } from '@forge/cli-shared';
 import { LintLogger } from '@forge/lint';
-export declare type EntryPoints = Array<{
-    name: string;
-    path: string;
-}>;
-export declare const resolveModulePath: (moduleName: string) => string;
-export declare const handleWebpackCompilationResult: (err: Error | undefined, stats: webpack.Stats | undefined) => stats is webpack.Stats;
-export declare const getInMemoryBundle: (entryPoints: {
-    name: string;
-    path: string;
-}[]) => BundlerOutput;
-export declare const getDevToolConfig: (config: ConfigBuilder) => string;
-declare type RequiredFields<T, F extends keyof T> = T & Required<Pick<T, F>>;
-declare type CommonModuleOptions = RequiredFields<ModuleOptions, 'rules'>;
-declare type CommonWebpackConfig = RequiredFields<WebpackConfig, 'plugins' | 'module'> & Record<'module', CommonModuleOptions>;
-export declare const getCommonWebpackConfig: (entrypoints: EntryPoints, config: ConfigBuilder) => CommonWebpackConfig;
-export interface ConfigBuilder {
-    isWatchMode: boolean;
-    isDebugMode?: boolean;
-    appDirectory: string;
-}
+import { CommonWebpackConfig, ConfigBuilder, EntryPoint, FunctionsEntryPoint } from './config/common';
+export { EntryPoint };
+export declare function handleWebpackCompilationResult(err: Error | undefined, stats: webpack.Stats | undefined): asserts stats is webpack.Stats;
+export declare function getInMemoryBundle(config: CommonWebpackConfig): BundlerOutput;
 interface CompilerOptions {
     writeToDisk?: boolean;
 }
 export declare const getCompiler: (webpackConfig: WebpackConfig, options?: CompilerOptions) => Compiler;
 export declare const runLinter: (logger?: LintLogger, fileSystemReader?: FileSystemReader, fileSystemWriter?: FileSystemWriter) => Promise<void>;
 export declare const watch: Watcher;
-export declare const createBundler: (getBuildConfig: (entrypoints: EntryPoints, configBuilder: ConfigBuilder) => WebpackConfig) => Bundler;
+export declare function createBundler<EP extends EntryPoint = EntryPoint>(getBuildConfig: (entrypoints: EP[], configBuilder: ConfigBuilder) => CommonWebpackConfig): Bundler<EP>;
 export declare const sandboxBundle: Bundler;
-export declare const nodeBundle: Bundler;
+export declare const nodeBundle: Bundler<FunctionsEntryPoint>;
 export declare const nativeUiBundle: InDiskBundler;
-export {};
 //# sourceMappingURL=webpack.d.ts.map

package/out/webpack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":"AAGA,OAAO,OAAO,EAAE,EAAE,QAAQ,EAAE,aAAa,IAAI,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE3F,OAAO,EACL,OAAO,EAGP,OAAO,EAEP,aAAa,EACb,aAAa,EACd,MAAM,SAAS,CAAC;AACjB,OAAO,EAEL,gBAAgB,EAGhB,gBAAgB,EAEjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAA2B,UAAU,EAAE,MAAM,aAAa,CAAC;AAOlE,oBAAY,WAAW,GAAG,KAAK,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,CAAC;AAQH,eAAO,MAAM,iBAAiB,eAAgB,MAAM,KAAG,MAEtD,CAAC;AAEF,eAAO,MAAM,8BAA8B,QACpC,KAAK,GAAG,SAAS,SACf,QAAQ,KAAK,GAAG,SAAS,2BAmCjC,CAAC;AAEF,eAAO,MAAM,iBAAiB,gBAAiB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,KAAG,aAiBjF,CAAC;AAEF,eAAO,MAAM,gBAAgB,WAAY,aAAa,KAAG,MASxD,CAAC;AACF,aAAK,cAAc,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACrE,aAAK,mBAAmB,GAAG,cAAc,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;AAClE,aAAK,mBAAmB,GAAG,cAAc,CAAC,aAAa,EAAE,SAAS,GAAG,QAAQ,CAAC,GAAG,MAAM,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;AACvH,eAAO,MAAM,sBAAsB,qCAAsC,aAAa,KAAG,mBA8FxF,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB;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,CAuBd,CAAC;AAEF,eAAO,MAAM,KAAK,EAAE,OAwCnB,CAAC;AAEF,eAAO,MAAM,aAAa,6DACkC,aAAa,KAAK,aAAa,KACxF,OAyCF,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,OAAuD,CAAC;AAEpF,eAAO,MAAM,UAAU,EAAE,OAuBxB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,aAoB5B,CAAC"}
+{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,EAAE,EAAE,QAAQ,EAAE,aAAa,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AAE5E,OAAO,EACL,OAAO,EAGP,OAAO,EAEP,aAAa,EACb,aAAa,EACd,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,GAAG,EAAE,KAAK,GAAG,SAAS,EACtB,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,GAC/B,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAiChC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,GAAG,aAAa,CAU5E;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,CAuBd,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"}

package/out/webpack.js

@@ -1,28 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nativeUiBundle = exports.nodeBundle = exports.sandboxBundle = exports.createBundler = exports.watch = exports.runLinter = exports.getCompiler = exports.getCommonWebpackConfig = exports.getDevToolConfig = exports.getInMemoryBundle = exports.handleWebpackCompilationResult = exports.resolveModulePath = void 0;
+exports.nativeUiBundle = exports.nodeBundle = exports.sandboxBundle = exports.createBundler = exports.watch = exports.runLinter = exports.getCompiler = exports.getInMemoryBundle = exports.handleWebpackCompilationResult = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const memfs_1 = require("memfs");
-const path_1 = require("path");
 const webpack_1 = tslib_1.__importDefault(require("webpack"));
 const text_1 = require("./text");
 const cli_shared_1 = require("@forge/cli-shared");
 const lint_1 = require("@forge/lint");
-const fs_1 = require("fs");
-const sandboxed_webpack_config_1 = require("./bundler-config/sandboxed-webpack-config");
-const node_webpack_config_1 = require("./bundler-config/node-webpack-config");
-const tsconfig_interactor_1 = require("./tsconfig-interactor");
-const nativeui_webpack_config_1 = require("./bundler-config/nativeui-webpack-config");
+const sandbox_1 = require("./config/sandbox");
+const node_1 = require("./config/node");
+const nativeui_1 = require("./config/nativeui");
 const compilerOutputFileSystem = (0, memfs_1.createFsFromVolume)(new memfs_1.Volume());
 const readMemoryFileSync = (filePath) => {
     return compilerOutputFileSystem.readFileSync(filePath, { encoding: 'utf8' }).toString();
 };
-const resolveModulePath = (moduleName) => {
-    return require.resolve(moduleName);
-};
-exports.resolveModulePath = resolveModulePath;
-const handleWebpackCompilationResult = (err, stats) => {
+function handleWebpackCompilationResult(err, stats) {
     if (err) {
         throw err;
     }
@@ -36,7 +29,7 @@ const handleWebpackCompilationResult = (err, stats) => {
             const formattedErrors = info.errors.map((error) => {
                 return error.message.replace(/\.?.+.tsx?(?!\([0-9]\,[0-9]\))$/gm, '');
             });
-            throw new Error(text_1.Text.typescriptError(formattedErrors));
+            throw new cli_shared_1.BundlerTSError(text_1.Text.typescriptError(formattedErrors));
         }
         else {
             throw new Error(text_1.Text.genericBundlingError(info.errors.map((e) => e.message)));
@@ -46,122 +39,17 @@ const handleWebpackCompilationResult = (err, stats) => {
         const warnings = text_1.Text.warnings(info.warnings.map((e) => e.message));
         console.warn(chalk_1.default.magenta(warnings));
     }
-    return true;
-};
+}
 exports.handleWebpackCompilationResult = handleWebpackCompilationResult;
-const getInMemoryBundle = (entryPoints) => {
+function getInMemoryBundle(config) {
     const output = {}, sourceMap = {};
-    entryPoints.forEach(({ name }) => {
-        output[name] = readMemoryFileSync(`/${name}.js`);
-        try {
-            sourceMap[name] = readMemoryFileSync(`/${name}.js.map`);
-        }
-        catch (e) {
-        }
-    });
-    return {
-        output,
-        sourceMap
-    };
-};
-exports.getInMemoryBundle = getInMemoryBundle;
-const getDevToolConfig = (config) => {
-    if (!config.isWatchMode) {
-        return 'source-map';
-    }
-    return config.isDebugMode ? 'eval-cheap-module-source-map' : 'cheap-source-map';
-};
-exports.getDevToolConfig = getDevToolConfig;
-const getCommonWebpackConfig = (entrypoints, config) => {
-    if (!require.main) {
-        throw new Error(text_1.Text.noExecutableFile);
+    for (const name in config.entry) {
+        output[name] = readMemoryFileSync(`/${name}.js`).toString();
+        sourceMap[name] = readMemoryFileSync(`/${name}.js.map`).toString();
     }
-    const resolvedEntryPoints = {};
-    for (const entrypoint of entrypoints) {
-        resolvedEntryPoints[entrypoint.name] = (0, path_1.resolve)(entrypoint.path);
-    }
-    return {
-        entry: Object.assign({}, resolvedEntryPoints),
-        mode: 'production',
-        optimization: {
-            minimize: false
-        },
-        devtool: (0, exports.getDevToolConfig)(config),
-        output: {
-            libraryTarget: 'commonjs',
-            globalObject: 'this',
-            filename: '[name].js',
-            path: '/'
-        },
-        node: {
-            __dirname: true
-        },
-        performance: false,
-        resolve: {
-            extensions: ['.ts', '.tsx', '.js', '.jsx', '.json']
-        },
-        resolveLoader: {
-            modules: require.resolve.paths('babel-loader') || undefined
-        },
-        plugins: [new webpack_1.default.IgnorePlugin({ resourceRegExp: /^encoding$/, contextRegExp: /node-fetch/ })],
-        module: {
-            rules: [
-                {
-                    test: /\.jsx?$/,
-                    exclude: /node_modules/,
-                    use: [
-                        {
-                            loader: 'babel-loader',
-                            options: {
-                                presets: [
-                                    [
-                                        (0, exports.resolveModulePath)('@babel/preset-typescript'),
-                                        {
-                                            isTSX: true,
-                                            jsxPragma: 'ForgeUI',
-                                            allExtensions: true
-                                        }
-                                    ]
-                                ],
-                                plugins: [
-                                    [
-                                        (0, exports.resolveModulePath)('@babel/plugin-transform-react-jsx'),
-                                        {
-                                            pragma: 'ForgeUI.createElement'
-                                        }
-                                    ],
-                                    (0, exports.resolveModulePath)('@forge/babel-plugin-transform-ui'),
-                                    (0, exports.resolveModulePath)('@babel/plugin-proposal-numeric-separator'),
-                                    (0, exports.resolveModulePath)('@babel/plugin-proposal-class-properties'),
-                                    (0, exports.resolveModulePath)('@babel/plugin-proposal-optional-chaining')
-                                ],
-                                cacheDirectory: true
-                            }
-                        }
-                    ]
-                },
-                {
-                    test: /\.tsx?$/,
-                    exclude: /node_modules/,
-                    use: [
-                        {
-                            loader: 'ts-loader',
-                            options: {
-                                compilerOptions: {
-                                    jsx: 'react',
-                                    jsxFactory: 'ForgeUI.createElement'
-                                },
-                                configFile: new tsconfig_interactor_1.TSConfigInteractor(new cli_shared_1.FileSystemReader(), config.appDirectory).getTSConfigPath(),
-                                context: config.appDirectory
-                            }
-                        }
-                    ]
-                }
-            ]
-        }
-    };
-};
-exports.getCommonWebpackConfig = getCommonWebpackConfig;
+    return { output, sourceMap };
+}
+exports.getInMemoryBundle = getInMemoryBundle;
 const getCompiler = (webpackConfig, options) => {
     const compiler = (0, webpack_1.default)(webpackConfig);
     if (!(options === null || options === void 0 ? void 0 : options.writeToDisk)) {
@@ -222,7 +110,7 @@ const runLinter = async (logger = { info: console.log }, fileSystemReader = new
 };
 exports.runLinter = runLinter;
 const watch = (entryPoints, debugMode, callback, watchRun) => {
-    const config = (0, sandboxed_webpack_config_1.getSandboxedRuntimeBuildConfig)(entryPoints, {
+    const config = (0, sandbox_1.getSandboxedRuntimeBuildConfig)(entryPoints, {
         isWatchMode: true,
         isDebugMode: debugMode,
         appDirectory: process.cwd()
@@ -235,20 +123,8 @@ const watch = (entryPoints, debugMode, callback, watchRun) => {
     }
     const watcher = compiler.watch({ poll: 1000 }, (compilerError, stats) => {
         try {
-            (0, exports.handleWebpackCompilationResult)(compilerError, stats);
-            const output = {}, sourceMap = {};
-            entryPoints.forEach(({ name }) => {
-                output[name] = readMemoryFileSync(`/${name}.js`);
-                try {
-                    sourceMap[name] = readMemoryFileSync(`/${name}.js.map`);
-                }
-                catch (e) {
-                }
-            });
-            callback(null, {
-                output,
-                sourceMap
-            });
+            handleWebpackCompilationResult(compilerError, stats);
+            callback(null, getInMemoryBundle(config));
         }
         catch (fileReadError) {
             callback(fileReadError);
@@ -257,33 +133,24 @@ const watch = (entryPoints, debugMode, callback, watchRun) => {
     return new Monitor(watcher);
 };
 exports.watch = watch;
-const createBundler = (getBuildConfig) => {
+function createBundler(getBuildConfig) {
     return (appDirectory, endpoints) => {
         const config = getBuildConfig(endpoints, { isWatchMode: false, appDirectory });
         const compiler = (0, exports.getCompiler)(config);
         return new Promise((resolve, reject) => {
             compiler.run((compilerError, stats) => {
                 try {
-                    if (!(0, exports.handleWebpackCompilationResult)(compilerError, stats)) {
-                        return;
-                    }
-                    const output = {}, sourceMap = {};
-                    endpoints.forEach(({ name }) => {
-                        output[name] = readMemoryFileSync(`/${name}.js`).toString();
-                        sourceMap[name] = readMemoryFileSync(`/${name}.js.map`).toString();
-                    });
+                    handleWebpackCompilationResult(compilerError, stats);
+                    const result = getInMemoryBundle(config);
                     compiler.close((closeError) => {
                         if (closeError) {
                             reject(closeError);
                         }
                     });
-                    resolve({
-                        output,
-                        sourceMap,
-                        metadata: {
-                            modules: getNodeModuleNames(stats)
-                        }
-                    });
+                    result.metadata = {
+                        modules: getNodeModuleNames(stats)
+                    };
+                    resolve(result);
                 }
                 catch (fileReadError) {
                     reject(fileReadError);
@@ -291,36 +158,17 @@ const createBundler = (getBuildConfig) => {
             });
         });
     };
-};
+}
 exports.createBundler = createBundler;
-exports.sandboxBundle = (0, exports.createBundler)(sandboxed_webpack_config_1.getSandboxedRuntimeBuildConfig);
-const nodeBundle = async (appDirectory, entryPoints) => {
-    const bundler = (0, exports.createBundler)(node_webpack_config_1.getNodeRuntimeBuildConfig);
-    const { output: bundlerOutput, sourceMap: bundlerSourceMap, metadata } = await bundler(appDirectory, entryPoints);
-    const wrapper = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../out/wrapper.js')).toString();
-    const output = {};
-    const sourceMap = {};
-    entryPoints.forEach(({ name }) => {
-        const wrappedName = 'bundled/' + name;
-        output[wrappedName] = bundlerOutput[name];
-        const sourceMapValue = bundlerSourceMap === null || bundlerSourceMap === void 0 ? void 0 : bundlerSourceMap[name];
-        if (sourceMapValue) {
-            sourceMap[wrappedName] = sourceMapValue;
-        }
-        output[name] = wrapper.replace("'./__PLACEHOLDER_MODULE__'", JSON.stringify('./' + wrappedName));
-    });
-    return { output, sourceMap, metadata };
-};
-exports.nodeBundle = nodeBundle;
+exports.sandboxBundle = createBundler(sandbox_1.getSandboxedRuntimeBuildConfig);
+exports.nodeBundle = createBundler(node_1.getNodeRuntimeBuildConfig);
 const nativeUiBundle = (entrypoints) => {
-    const config = (0, nativeui_webpack_config_1.getNativeUiBuildConfig)(entrypoints);
+    const config = (0, nativeui_1.getNativeUiBuildConfig)(entrypoints);
     const compiler = (0, exports.getCompiler)(config, { writeToDisk: true });
     return new Promise((resolve, reject) => {
         compiler.run((compilerError, stats) => {
             try {
-                if (!(0, exports.handleWebpackCompilationResult)(compilerError, stats)) {
-                    return;
-                }
+                handleWebpackCompilationResult(compilerError, stats);
                 resolve({
                     outputDir: config.output.path
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "4.1.1-next.7",
+  "version": "4.2.0-next.9",
   "description": "Default bundler for Forge apps",
   "license": "UNLICENSED",
   "author": "Atlassian",
@@ -18,10 +18,11 @@
     "@babel/plugin-proposal-optional-chaining": "^7.16.7",
     "@babel/plugin-transform-react-jsx": "^7.16.7",
     "@babel/preset-typescript": "^7.16.7",
-    "@forge/api": "2.9.1-next.1",
+    "@forge/api": "2.9.1-next.2",
     "@forge/babel-plugin-transform-ui": "1.1.0",
-    "@forge/cli-shared": "3.4.1-next.3",
-    "@forge/lint": "3.2.12-next.3",
+    "@forge/cli-shared": "3.5.0-next.5",
+    "@forge/lint": "3.2.12-next.5",
+    "@forge/util": "1.2.0",
     "assert": "^1.1.1",
     "babel-loader": "^8.2.3",
     "browserify-zlib": "^0.2.0",

package/out/__PLACEHOLDER_MODULE__.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=__PLACEHOLDER_MODULE__.d.ts.map

package/out/__PLACEHOLDER_MODULE__.d.ts.map

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

package/out/__PLACEHOLDER_MODULE__.js

@@ -1 +0,0 @@
-"use strict";

package/out/bundler-config/nativeui-webpack-config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"nativeui-webpack-config.d.ts","sourceRoot":"","sources":["../../src/bundler-config/nativeui-webpack-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAMzC,eAAO,MAAM,sBAAsB,gCAA+B,aAwEjE,CAAC"}

package/out/bundler-config/node-webpack-config.d.ts

@@ -1,4 +0,0 @@
-import { Configuration as WebpackConfig } from 'webpack';
-import { ConfigBuilder, EntryPoints } from '../webpack';
-export declare const getNodeRuntimeBuildConfig: (entrypoints: EntryPoints, config: ConfigBuilder) => WebpackConfig;
-//# sourceMappingURL=node-webpack-config.d.ts.map

package/out/bundler-config/node-webpack-config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"node-webpack-config.d.ts","sourceRoot":"","sources":["../../src/bundler-config/node-webpack-config.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAE,aAAa,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AAElE,OAAO,EAAE,aAAa,EAAE,WAAW,EAA0B,MAAM,YAAY,CAAC;AAMhF,eAAO,MAAM,yBAAyB,qCAAsC,aAAa,KAAG,aAY3F,CAAC"}

package/out/bundler-config/node-webpack-config.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeRuntimeBuildConfig = void 0;
-const tslib_1 = require("tslib");
-const webpack_1 = tslib_1.__importDefault(require("webpack"));
-const path_1 = require("path");
-const webpack_2 = require("../webpack");
-function bundleStubPath(filePath) {
-    return (0, path_1.resolve)(__dirname, '..', `${filePath}${(0, path_1.extname)(__filename)}`);
-}
-const getNodeRuntimeBuildConfig = (entrypoints, config) => {
-    const webpackConfig = (0, webpack_2.getCommonWebpackConfig)(entrypoints, config);
-    const nodeConfigPlugin = new webpack_1.default.ProvidePlugin({
-        console: bundleStubPath('console'),
-        'global.console': bundleStubPath('console')
-    });
-    webpackConfig.plugins.push(nodeConfigPlugin);
-    webpackConfig.target = 'node14';
-    return webpackConfig;
-};
-exports.getNodeRuntimeBuildConfig = getNodeRuntimeBuildConfig;

package/out/bundler-config/sandboxed-webpack-config.d.ts

@@ -1,5 +0,0 @@
-import { Configuration as WebpackConfig } from 'webpack';
-import { ConfigBuilder, EntryPoints } from '../webpack';
-export declare const SANDBOXED_WEBPACK_CONFIG_NAME = "sandboxed-runtime";
-export declare const getSandboxedRuntimeBuildConfig: (entrypoints: EntryPoints, config: ConfigBuilder) => WebpackConfig;
-//# sourceMappingURL=sandboxed-webpack-config.d.ts.map

package/out/bundler-config/sandboxed-webpack-config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sandboxed-webpack-config.d.ts","sourceRoot":"","sources":["../../src/bundler-config/sandboxed-webpack-config.ts"],"names":[],"mappings":"AACA,OAAgB,EAAE,aAAa,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AAElE,OAAO,EAAE,aAAa,EAAE,WAAW,EAA6C,MAAM,YAAY,CAAC;AAEnG,eAAO,MAAM,6BAA6B,sBAAsB,CAAC;AAyDjE,eAAO,MAAM,8BAA8B,qCAAsC,aAAa,KAAG,aAwEhG,CAAC"}

package/out/bundler-config/sandboxed-webpack-config.js

@@ -1,107 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSandboxedRuntimeBuildConfig = exports.SANDBOXED_WEBPACK_CONFIG_NAME = void 0;
-const tslib_1 = require("tslib");
-const path_1 = require("path");
-const webpack_1 = tslib_1.__importDefault(require("webpack"));
-const stub_plugin_1 = require("../stub-plugin");
-const webpack_2 = require("../webpack");
-exports.SANDBOXED_WEBPACK_CONFIG_NAME = 'sandboxed-runtime';
-const getCustomModulesAliases = () => {
-    return {
-        'browserify-cipher': (0, webpack_2.resolveModulePath)('browserify-cipher/browser.js'),
-        'browserify-sign/algos': (0, webpack_2.resolveModulePath)('browserify-sign/algos.js'),
-        'browserify-sign': (0, webpack_2.resolveModulePath)('browserify-sign/browser/index.js'),
-        'create-ecdh': (0, webpack_2.resolveModulePath)('create-ecdh/browser.js'),
-        'create-hash/md5': (0, webpack_2.resolveModulePath)('create-hash/md5.js'),
-        'create-hash': (0, webpack_2.resolveModulePath)('create-hash/browser.js'),
-        'create-hmac': (0, webpack_2.resolveModulePath)('create-hmac/browser.js'),
-        'diffie-hellman': (0, webpack_2.resolveModulePath)('diffie-hellman/browser.js'),
-        pbkdf2: (0, webpack_2.resolveModulePath)('pbkdf2/browser.js'),
-        'public-encrypt': (0, webpack_2.resolveModulePath)('public-encrypt/browser.js'),
-        randombytes: (0, webpack_2.resolveModulePath)('randombytes/browser.js'),
-        randomfill: (0, webpack_2.resolveModulePath)('randomfill/browser.js'),
-        assert: (0, webpack_2.resolveModulePath)('assert/'),
-        buffer: (0, webpack_2.resolveModulePath)('buffer/'),
-        console: (0, webpack_2.resolveModulePath)('console-browserify'),
-        crypto: (0, webpack_2.resolveModulePath)('crypto-browserify'),
-        events: (0, webpack_2.resolveModulePath)('events/'),
-        os: (0, webpack_2.resolveModulePath)('os-browserify/browser'),
-        punycode: (0, webpack_2.resolveModulePath)('punycode/'),
-        process: (0, webpack_2.resolveModulePath)('process/browser.js'),
-        string_decoder: (0, webpack_2.resolveModulePath)('string_decoder/'),
-        timers: (0, webpack_2.resolveModulePath)('timers-browserify'),
-        url: (0, webpack_2.resolveModulePath)('url/'),
-        util: (0, webpack_2.resolveModulePath)('util/'),
-        zlib: (0, webpack_2.resolveModulePath)('browserify-zlib'),
-        fs: (0, webpack_2.resolveModulePath)('memfs'),
-        http: (0, webpack_2.resolveModulePath)('./http'),
-        https: (0, webpack_2.resolveModulePath)('./http'),
-        path: (0, webpack_2.resolveModulePath)('path-browserify'),
-        querystring: (0, webpack_2.resolveModulePath)('querystring-browser'),
-        stream: (0, webpack_2.resolveModulePath)('readable-stream'),
-        'supports-color': (0, webpack_2.resolveModulePath)('supports-color/index.js')
-    };
-};
-const getSandboxedRuntimeBuildConfig = (entrypoints, config) => {
-    const webpackConfig = (0, webpack_2.getCommonWebpackConfig)(entrypoints, config);
-    const sandboxedConfigPlugins = [
-        new webpack_1.default.ProvidePlugin({
-            Buffer: [(0, webpack_2.resolveModulePath)('buffer/'), 'Buffer'],
-            path: (0, webpack_2.resolveModulePath)('path-browserify'),
-            querystring: (0, webpack_2.resolveModulePath)('querystring-browser'),
-            stream: (0, webpack_2.resolveModulePath)('readable-stream'),
-            TextDecoder: [(0, webpack_2.resolveModulePath)('text-encoder-lite'), 'TextDecoderLite'],
-            TextEncoder: [(0, webpack_2.resolveModulePath)('text-encoder-lite'), 'TextEncoderLite'],
-            URL: [(0, webpack_2.resolveModulePath)('whatwg-url'), 'URL'],
-            URLSearchParams: [(0, webpack_2.resolveModulePath)('whatwg-url'), 'URLSearchParams']
-        }),
-        new stub_plugin_1.StubPlugin({
-            modules: [
-                'async_hooks',
-                'child_process',
-                'cluster',
-                'constants',
-                'dgram',
-                'dns',
-                'domain',
-                'http2',
-                'module',
-                'net',
-                'perf_hooks',
-                'readline',
-                'repl',
-                'sys',
-                'tls',
-                'trace_events',
-                'tty',
-                'v8',
-                'vm',
-                'worker_threads'
-            ],
-            placeholder: 'requestedModule',
-            stub: (0, path_1.resolve)(__dirname, '..', 'unsupported')
-        })
-    ];
-    sandboxedConfigPlugins.forEach((plugin) => webpackConfig.plugins.push(plugin));
-    const moduleRuls = [
-        {
-            test: /(readable-stream|pbkdf2|util)\//,
-            resolve: {
-                aliasFields: ['browser']
-            }
-        },
-        {
-            test: /axios\//,
-            resolve: {
-                aliasFields: []
-            }
-        }
-    ];
-    moduleRuls.forEach((rule) => webpackConfig.module.rules.push(rule));
-    webpackConfig.target = 'webworker';
-    webpackConfig.resolve = Object.assign(Object.assign({}, webpackConfig.resolve), { mainFields: ['main', 'module'], exportsFields: [], alias: getCustomModulesAliases() });
-    webpackConfig.name = exports.SANDBOXED_WEBPACK_CONFIG_NAME;
-    return webpackConfig;
-};
-exports.getSandboxedRuntimeBuildConfig = getSandboxedRuntimeBuildConfig;