@forge/bundler 7.1.0-next.8 → 7.1.0-next.9

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @forge/bundler
 
+## 7.1.0-next.9
+
+### Minor Changes
+
+- a36d70b: Implement manual bundler
+
+### Patch Changes
+
+- Updated dependencies [a36d70b]
+  - @forge/cli-shared@9.3.0-next.9
+  - @forge/lint@6.0.3-next.9
+
 ## 7.1.0-next.8
 
 ### Patch Changes

package/out/index.d.ts

@@ -2,7 +2,7 @@ export { getOutputDir, getEntryPoints, createEntryPointsForResource } from './co
 export { runLinter } from './lint';
 export { NativeUIBundler, NativeUIBundleResult } from './nativeui';
 export { getNodeBundler, NODE_RUNTIME_CODE_FILE } from './runtime';
-export { Bundler, BundlerError, BundlerMetadata, emptyMetadata, mergeMetadata, BundlerOutput, BundlerWatch, EntryPoint, WatcherMonitor } from './types';
+export { AdditionalOutputs, Bundler, BundlerError, BundlerMetadata, emptyMetadata, mergeMetadata, mergeOutputs, BundlerOutput, BundlerWatch, EntryPoint, WatcherMonitor } from './types';
 export { getCompiler, handleWebpackCompilationResult } from './webpack';
 export { getNativeUiBuildConfig, getNativeUiWorkerBuildConfig } from './config/nativeui';
 export { getWrapperProvider, LocalWrapperProvider } from './wrapper-provider';

package/out/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AACtF,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EACL,OAAO,EACP,YAAY,EACZ,eAAe,EACf,aAAa,EACb,aAAa,EACb,aAAa,EACb,YAAY,EACZ,UAAU,EACV,cAAc,EACf,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,WAAW,EAAE,8BAA8B,EAAE,MAAM,WAAW,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AACtF,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EACL,iBAAiB,EACjB,OAAO,EACP,YAAY,EACZ,eAAe,EACf,aAAa,EACb,aAAa,EACb,YAAY,EACZ,aAAa,EACb,YAAY,EACZ,UAAU,EACV,cAAc,EACf,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,WAAW,EAAE,8BAA8B,EAAE,MAAM,WAAW,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC"}

package/out/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalWrapperProvider = exports.getWrapperProvider = exports.getNativeUiWorkerBuildConfig = exports.getNativeUiBuildConfig = exports.handleWebpackCompilationResult = exports.getCompiler = exports.mergeMetadata = exports.emptyMetadata = exports.BundlerError = exports.NODE_RUNTIME_CODE_FILE = exports.getNodeBundler = exports.NativeUIBundler = exports.runLinter = exports.createEntryPointsForResource = exports.getEntryPoints = exports.getOutputDir = void 0;
+exports.LocalWrapperProvider = exports.getWrapperProvider = exports.getNativeUiWorkerBuildConfig = exports.getNativeUiBuildConfig = exports.handleWebpackCompilationResult = exports.getCompiler = exports.mergeOutputs = exports.mergeMetadata = exports.emptyMetadata = exports.BundlerError = exports.NODE_RUNTIME_CODE_FILE = exports.getNodeBundler = exports.NativeUIBundler = exports.runLinter = exports.createEntryPointsForResource = exports.getEntryPoints = exports.getOutputDir = void 0;
 var common_1 = require("./common");
 Object.defineProperty(exports, "getOutputDir", { enumerable: true, get: function () { return common_1.getOutputDir; } });
 Object.defineProperty(exports, "getEntryPoints", { enumerable: true, get: function () { return common_1.getEntryPoints; } });
@@ -16,6 +16,7 @@ var types_1 = require("./types");
 Object.defineProperty(exports, "BundlerError", { enumerable: true, get: function () { return types_1.BundlerError; } });
 Object.defineProperty(exports, "emptyMetadata", { enumerable: true, get: function () { return types_1.emptyMetadata; } });
 Object.defineProperty(exports, "mergeMetadata", { enumerable: true, get: function () { return types_1.mergeMetadata; } });
+Object.defineProperty(exports, "mergeOutputs", { enumerable: true, get: function () { return types_1.mergeOutputs; } });
 var webpack_1 = require("./webpack");
 Object.defineProperty(exports, "getCompiler", { enumerable: true, get: function () { return webpack_1.getCompiler; } });
 Object.defineProperty(exports, "handleWebpackCompilationResult", { enumerable: true, get: function () { return webpack_1.handleWebpackCompilationResult; } });

package/out/runtime.d.ts

@@ -1,6 +1,8 @@
 import { ConfigReader, Logger, StatsigService } from '@forge/cli-shared';
+import { ManifestSchema } from '@forge/manifest';
 import { Bundler } from './types';
 import { WrapperProvider } from './wrapper-provider';
+export type PackageOptions = NonNullable<ManifestSchema['app']['package']>;
 export declare const NODE_RUNTIME_CODE_FILE = "__forge__.cjs";
 export declare function getNodeBundler(logger: Logger, wrapperProvider: WrapperProvider, configReader: ConfigReader, statsigService: StatsigService): Bundler;
 //# sourceMappingURL=runtime.d.ts.map

package/out/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,YAAY,EAEZ,MAAM,EAEN,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,OAAO,EAAkF,MAAM,SAAS,CAAC;AAGlH,OAAO,EAAiB,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAMpE,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AA4KtD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAC7B,OAAO,CAET"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAiC,cAAc,EAAa,MAAM,mBAAmB,CAAC;AAEnH,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAKjD,OAAO,EAEL,OAAO,EAOR,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAiB,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEpE,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAK3E,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AA8NtD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAC7B,OAAO,CAET"}

package/out/runtime.js

@@ -4,43 +4,45 @@ exports.NODE_RUNTIME_CODE_FILE = void 0;
 exports.getNodeBundler = getNodeBundler;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
-const promises_1 = tslib_1.__importDefault(require("fs/promises"));
-const webpack_1 = tslib_1.__importDefault(require("webpack"));
-var RawSource = webpack_1.default.sources.RawSource;
+const chokidar_1 = tslib_1.__importDefault(require("chokidar"));
+const debounce_1 = tslib_1.__importDefault(require("debounce"));
 const cli_shared_1 = require("@forge/cli-shared");
 const i18n_1 = require("@forge/i18n");
 const common_1 = require("./config/common");
-const typescript_1 = require("./typescript");
-const webpack_2 = require("./webpack");
+const metadata_1 = require("./metadata");
 const text_1 = require("./text");
+const types_1 = require("./types");
+const typescript_1 = require("./typescript");
+const webpack_1 = require("./webpack");
 exports.NODE_RUNTIME_CODE_FILE = '__forge__.cjs';
 const NODE_RUNTIME_BACKUP_WRAPPER_FILE = '__forge_wrapper__.cjs';
 const NODE_RUNTIME_USE_LOCAL_WRAPPER_FILE = '__forge_use_local_wrapper.txt';
 const NODE_RUNTIME_VERSION_FILE = 'runtime.json';
-async function emitWrapperFiles(provider, emit) {
+async function getRuntimeArtifacts(provider, args) {
+    const result = new Map();
     const wrapper = await provider.getNodeRuntimeWrapper();
     const loader = await provider.getNodeRuntimeLoader();
     let entrypointScript;
     if (loader) {
         entrypointScript = loader;
-        await emit(NODE_RUNTIME_BACKUP_WRAPPER_FILE, wrapper.script);
+        result.set(NODE_RUNTIME_BACKUP_WRAPPER_FILE, Buffer.from(wrapper.script));
     }
     else {
         entrypointScript = wrapper;
     }
-    await emit(exports.NODE_RUNTIME_CODE_FILE, entrypointScript.script);
+    result.set(exports.NODE_RUNTIME_CODE_FILE, Buffer.from(entrypointScript.script));
     if (process.env.FORGE_RUNTIME_PATH) {
-        await emit(NODE_RUNTIME_USE_LOCAL_WRAPPER_FILE, 'Local wrapper used');
+        result.set(NODE_RUNTIME_USE_LOCAL_WRAPPER_FILE, Buffer.from('Local wrapper used'));
     }
-    await emit(NODE_RUNTIME_VERSION_FILE, JSON.stringify({ version: entrypointScript.version }, null, 2));
-}
-async function emitI18nFiles(i18nResourceBundle, emit) {
-    await Promise.all((0, cli_shared_1.listFilesInI18nResourceBundle)(i18nResourceBundle).map(async ([fileName, filePath]) => {
-        const fileContent = await promises_1.default.readFile(filePath);
-        await emit(path_1.default.join(i18n_1.I18N_BUNDLE_FOLDER_NAME, fileName), fileContent.toString());
-    }));
+    result.set(NODE_RUNTIME_VERSION_FILE, Buffer.from(JSON.stringify({ version: entrypointScript.version }, null, 2)));
+    if (args.i18nResourceBundle) {
+        for (const [fileName, filePath] of (0, cli_shared_1.listFilesInI18nResourceBundle)(args.i18nResourceBundle)) {
+            result.set(path_1.default.join(i18n_1.I18N_BUNDLE_FOLDER_NAME, fileName), filePath);
+        }
+    }
+    return result;
 }
-class NodeBundler extends webpack_2.WebpackBundler {
+class NodeBundler extends webpack_1.WebpackBundler {
     wrapperProvider;
     constructor(logger, wrapperProvider) {
         super(logger);
@@ -57,19 +59,13 @@ class NodeBundler extends webpack_2.WebpackBundler {
                 fullySpecified: false
             }
         });
-        webpackConfig.plugins.push({
-            apply: (compiler) => {
-                compiler.hooks.make.tapPromise('AfterEmitPlugin', async (compilation) => {
-                    const emit = async (name, contents) => compilation.emitAsset(name, new RawSource(contents));
-                    await emitWrapperFiles(this.wrapperProvider, emit);
-                    if (args.i18nResourceBundle) {
-                        await emitI18nFiles(args.i18nResourceBundle, emit);
-                    }
-                });
-            }
-        });
         return [webpackConfig];
     }
+    async getOutput(args, config, stats) {
+        const result = await super.getOutput(args, config, stats);
+        result.additionalOutputs = (0, types_1.mergeOutputs)(result.additionalOutputs, await getRuntimeArtifacts(this.wrapperProvider, args));
+        return result;
+    }
 }
 class TypeScriptNodeBundler extends typescript_1.TypeScriptBundler {
     wrapperProvider;
@@ -79,18 +75,62 @@ class TypeScriptNodeBundler extends typescript_1.TypeScriptBundler {
     }
     async getResult(args, outputDir, output, additionalOutputs) {
         const result = await super.getResult(args, outputDir, output, additionalOutputs);
-        const emit = async (name, contents) => {
-            const outputPath = path_1.default.join(outputDir, name);
-            await promises_1.default.mkdir(path_1.default.dirname(outputPath), { recursive: true });
-            await promises_1.default.writeFile(outputPath, contents);
-        };
-        await emitWrapperFiles(this.wrapperProvider, emit);
-        if (args.i18nResourceBundle) {
-            await emitI18nFiles(args.i18nResourceBundle, emit);
-        }
+        result.additionalOutputs = (0, types_1.mergeOutputs)(result.additionalOutputs, await getRuntimeArtifacts(this.wrapperProvider, args));
         return result;
     }
 }
+class ManualBundler {
+    logger;
+    wrapperProvider;
+    static WATCH_DEBOUNCE_MS = 200;
+    path;
+    constructor(config, logger, wrapperProvider) {
+        this.logger = logger;
+        this.wrapperProvider = wrapperProvider;
+        if (!config?.path) {
+            throw new cli_shared_1.UserError(text_1.Text.manualBundlerPathRequired);
+        }
+        this.path = config.path;
+    }
+    async bundle(args) {
+        const outputDir = path_1.default.join(args.appDirectory, this.path);
+        const additionalOutputs = await getRuntimeArtifacts(this.wrapperProvider, args);
+        const metadata = await (0, metadata_1.getMetadata)(this.logger, args.appDirectory, new Set());
+        metadata.bundler = 'manual@2026';
+        return { outputDir, additionalOutputs, metadata };
+    }
+    async watch(args, watch) {
+        const result = await this.bundle(args);
+        const watcher = chokidar_1.default.watch(result.outputDir, {
+            persistent: false,
+            ignoreInitial: true,
+            ignored: (path) => path.includes('node_modules')
+        });
+        const onChange = (0, debounce_1.default)(async () => {
+            await watch.onBuildWillStart();
+            try {
+                const nextResult = await this.bundle(args);
+                await watch.onBuildFinished(null, nextResult);
+            }
+            catch (error) {
+                await watch.onBuildFinished(error);
+            }
+        }, ManualBundler.WATCH_DEBOUNCE_MS);
+        watcher.on('all', () => void onChange());
+        watcher.on('error', (error) => void watch.onBuildFinished(error));
+        await new Promise((resolve, reject) => {
+            watcher.once('ready', resolve);
+            watcher.once('error', reject);
+        });
+        return {
+            result,
+            stop: async () => {
+                onChange.clear();
+                await watcher.close();
+            }
+        };
+    }
+}
 class ConfigBundler {
     logger;
     wrapperProvider;
@@ -111,7 +151,7 @@ class ConfigBundler {
             return new TypeScriptNodeBundler(this.logger, this.wrapperProvider);
         }
         if (config?.bundler === 'manual@2026') {
-            throw new cli_shared_1.UserError(text_1.Text.manualBundlerEAP);
+            return new ManualBundler(config, this.logger, this.wrapperProvider);
         }
         return new NodeBundler(this.logger, this.wrapperProvider);
     }

package/out/text.d.ts

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

package/out/text.js

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

package/out/types.d.ts

@@ -12,11 +12,13 @@ export type BundlerMetadata = {
 };
 export declare function emptyMetadata(): BundlerMetadata;
 export declare function mergeMetadata(metadata1: BundlerMetadata, metadata2: BundlerMetadata): BundlerMetadata;
+export type AdditionalOutputs = Map<string, string | Buffer>;
 export interface BundlerOutput {
     outputDir: string;
-    additionalOutputs?: Map<string, string>;
+    additionalOutputs?: AdditionalOutputs;
     metadata?: BundlerMetadata;
 }
+export declare function mergeOutputs(outputs1: AdditionalOutputs | undefined, outputs2: AdditionalOutputs | undefined): AdditionalOutputs;
 export type BundlerWatchMode = 'watch' | 'debug';
 export type EntryPoint = {
     name: string;
@@ -38,7 +40,7 @@ export type BundlerWatch = {
     onBuildFinished: ((err: null, result: BundlerOutput) => Promise<void>) & ((err: Error) => Promise<void>);
 };
 export interface WatcherMonitor {
-    stop(): void;
+    stop(): Promise<void>;
 }
 export type BundlerWatchOutput = WatcherMonitor & {
     result: BundlerOutput;

package/out/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,OAAO,CAAC;IACb,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,wBAAgB,aAAa,IAAI,eAAe,CAS/C;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,EAAE,eAAe,GAAG,eAAe,CAarG;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAKlB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B;AAED,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,OAAO,CAAC;AAEjD,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,WAAW,GACxC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,GAAG;IACzC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEJ,MAAM,MAAM,YAAY,GAAG;IACzB,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,eAAe,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;CAC1G,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,IAAI,IAAI,IAAI,CAAC;CACd;AAED,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAAG;IAChD,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,MAAM,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAClD,KAAK,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACjF,CAAC;AAEF,qBAAa,YAAa,SAAQ,SAAS;CAAG"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,OAAO,CAAC;IACb,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,wBAAgB,aAAa,IAAI,eAAe,CAS/C;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,EAAE,eAAe,GAAG,eAAe,CAarG;AAED,MAAM,MAAM,iBAAiB,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;AAE7D,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAQlB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B;AAED,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,iBAAiB,GAAG,SAAS,EACvC,QAAQ,EAAE,iBAAiB,GAAG,SAAS,GACtC,iBAAiB,CAEnB;AAED,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,OAAO,CAAC;AAEjD,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,WAAW,GACxC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,GAAG;IACzC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEJ,MAAM,MAAM,YAAY,GAAG;IACzB,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,eAAe,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;CAC1G,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAED,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAAG;IAChD,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,MAAM,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAClD,KAAK,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACjF,CAAC;AAEF,qBAAa,YAAa,SAAQ,SAAS;CAAG"}

package/out/types.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BundlerError = void 0;
 exports.emptyMetadata = emptyMetadata;
 exports.mergeMetadata = mergeMetadata;
+exports.mergeOutputs = mergeOutputs;
 const cli_shared_1 = require("@forge/cli-shared");
 function emptyMetadata() {
     return {
@@ -28,6 +29,9 @@ function mergeMetadata(metadata1, metadata2) {
         bundler: metadata1.bundler || metadata2.bundler
     };
 }
+function mergeOutputs(outputs1, outputs2) {
+    return new Map([...(outputs1 ?? []), ...(outputs2 ?? [])]);
+}
 class BundlerError extends cli_shared_1.UserError {
 }
 exports.BundlerError = BundlerError;

package/out/typescript.d.ts

@@ -1,14 +1,14 @@
 import { ChildProcessByStdio } from 'child_process';
 import { Readable } from 'stream';
 import { Logger } from '@forge/cli-shared';
-import { Bundler, BundlerOutput, BundlerArgs, BundlerWatch, BundlerWatchArgs, BundlerWatchOutput } from './types';
+import { AdditionalOutputs, Bundler, BundlerOutput, BundlerArgs, BundlerWatch, BundlerWatchArgs, BundlerWatchOutput } from './types';
 type OutputProcess = ChildProcessByStdio<null, Readable, null>;
 export declare abstract class TypeScriptBundler implements Bundler {
     protected readonly logger: Logger;
     constructor(logger: Logger);
     protected runTypeScript(args: BundlerArgs, outputDir: string): OutputProcess;
     protected isListedFile(line: string): string | null;
-    protected getResult(args: BundlerArgs, outputDir: string, output?: string, additionalOutputs?: Map<string, string>): Promise<BundlerOutput>;
+    protected getResult(args: BundlerArgs, outputDir: string, output?: string, additionalOutputs?: AdditionalOutputs): Promise<BundlerOutput>;
     bundle(args: BundlerArgs): Promise<BundlerOutput>;
     watch(args: BundlerWatchArgs, watch: BundlerWatch): Promise<BundlerWatchOutput>;
 }

package/out/typescript.d.ts.map

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

package/out/typescript.js

@@ -118,7 +118,10 @@ class TypeScriptBundler {
                     if (isFirstRun) {
                         isFirstRun = false;
                         this.logger.info(cli_shared_1.LogColor.trace(args.successMessage));
-                        resolve({ result, stop: () => compiler.kill() });
+                        resolve({
+                            result,
+                            stop: async () => void compiler.kill()
+                        });
                         return;
                     }
                     await watch.onBuildFinished(null, result);

package/out/webpack.d.ts

@@ -2,7 +2,8 @@ import webpack from 'webpack';
 import { Logger } from '@forge/cli-shared';
 import { CommonOutputOptions } from './config/common';
 import { Bundler, BundlerOutput, BundlerArgs, BundlerWatch, BundlerWatchArgs, BundlerWatchOutput } from './types';
-export declare function handleWebpackCompilationResult(logger: Logger, err: Error | null | undefined, stats: Pick<webpack.Stats, 'hasErrors' | 'hasWarnings' | 'toJson'> | undefined): asserts stats is webpack.Stats;
+export type Stats = webpack.Stats;
+export declare function handleWebpackCompilationResult(logger: Logger, err: Error | null | undefined, stats: Pick<Stats, 'hasErrors' | 'hasWarnings' | 'toJson'> | undefined): asserts stats is Stats;
 export declare function getCompiler(config: webpack.Configuration): webpack.Compiler;
 export type ConfigWithOutput = webpack.Configuration & {
     output: CommonOutputOptions;
@@ -11,9 +12,9 @@ export type Configs = [ConfigWithOutput, ...ConfigWithOutput[]];
 export declare abstract class WebpackBundler implements Bundler {
     protected readonly logger: Logger;
     constructor(logger: Logger);
-    protected getOutput(args: BundlerArgs, config: ConfigWithOutput, stats: webpack.Stats): Promise<BundlerOutput>;
+    protected getOutput(args: BundlerArgs, config: ConfigWithOutput, stats: Stats): Promise<BundlerOutput>;
     protected isRegularModule(name: string): boolean;
-    protected localModules(stats: webpack.Stats): Set<string>;
+    protected localModules(stats: Stats): Set<string>;
     protected runCompiler(args: BundlerArgs, config: ConfigWithOutput): Promise<BundlerOutput>;
     abstract getConfigs(args: BundlerArgs): Promise<Configs>;
     bundle(args: BundlerArgs): Promise<BundlerOutput>;

package/out/webpack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,MAAM,EAA4B,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,EACL,OAAO,EAEP,aAAa,EACb,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAGnB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,GAAG,aAAa,GAAG,QAAQ,CAAC,GAAG,SAAS,GAC7E,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAkChC;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,QAAQ,CAE3E;AAqBD,MAAM,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,GAAG;IAAE,MAAM,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAEvF,MAAM,MAAM,OAAO,GAAG,CAAC,gBAAgB,EAAE,GAAG,gBAAgB,EAAE,CAAC,CAAC;AAEhE,8BAAsB,cAAe,YAAW,OAAO;IACzC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM;cAE7B,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAkBpH,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAmBhD,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC;cAwBzC,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAsBhG,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAElD,MAAM,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAWjD,KAAK,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA2CtF"}
+{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":"AAGA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,MAAM,EAA4B,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,EACL,OAAO,EAEP,aAAa,EACb,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAGnB,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;AAElC,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,WAAW,GAAG,aAAa,GAAG,QAAQ,CAAC,GAAG,SAAS,GACrE,OAAO,CAAC,KAAK,IAAI,KAAK,CAkCxB;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,QAAQ,CAE3E;AAqBD,MAAM,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,GAAG;IAAE,MAAM,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAEvF,MAAM,MAAM,OAAO,GAAG,CAAC,gBAAgB,EAAE,GAAG,gBAAgB,EAAE,CAAC,CAAC;AAEhE,8BAAsB,cAAe,YAAW,OAAO;IACzC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM;cAE7B,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAkB5G,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAmBhD,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC;cAwBjC,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAsBhG,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAElD,MAAM,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAWjD,KAAK,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA2CtF"}

package/out/webpack.js

@@ -5,6 +5,7 @@ exports.handleWebpackCompilationResult = handleWebpackCompilationResult;
 exports.getCompiler = getCompiler;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
+const util_1 = require("util");
 const webpack_1 = tslib_1.__importDefault(require("webpack"));
 const cli_shared_1 = require("@forge/cli-shared");
 const metadata_1 = require("./metadata");
@@ -125,7 +126,7 @@ class WebpackBundler {
         const outputs = await Promise.all(configs.map((cfg) => this.runCompiler(args, cfg)));
         const [primary, ...rest] = outputs;
         const metadata = rest.reduce((acc, output) => (output.metadata ? (0, types_1.mergeMetadata)(acc, output.metadata) : acc), primary.metadata ?? (0, types_1.emptyMetadata)());
-        return { outputDir: primary.outputDir, metadata };
+        return { ...primary, metadata };
     }
     async watch(args, watch) {
         const configs = await this.getConfigs(args);
@@ -146,7 +147,7 @@ class WebpackBundler {
                     const result = await this.getOutput(args, targetConfig, stats);
                     if (isFirstRun) {
                         isFirstRun = false;
-                        resolve({ result, stop: () => watching.close(() => void 0) });
+                        resolve({ result, stop: (0, util_1.promisify)(watching.close.bind(watching)) });
                     }
                     else {
                         await watch.onBuildFinished(null, result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "7.1.0-next.8",
+  "version": "7.1.0-next.9",
   "description": "Default bundler for Forge apps",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Atlassian",
@@ -21,13 +21,15 @@
     "@babel/plugin-transform-react-jsx": "^7.23.4",
     "@babel/traverse": "^7.24.0",
     "@babel/types": "^7.24.0",
-    "@forge/cli-shared": "9.3.0-next.8",
+    "@forge/cli-shared": "9.3.0-next.9",
     "@forge/i18n": "1.0.0",
-    "@forge/lint": "6.0.3-next.8",
+    "@forge/lint": "6.0.3-next.9",
     "@forge/manifest": "13.3.0-next.7",
     "babel-loader": "^8.3.0",
     "cheerio": "^1.2.0",
+    "chokidar": "^4.0.3",
     "cross-spawn": "^7.0.6",
+    "debounce": "^2.2.0",
     "fs-extra": "^11.2.0",
     "html-webpack-plugin": "^5.6.3",
     "nock": "13.5.6",