@forge/bundler 6.1.3 → 6.1.4-next.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @forge/bundler
 
+## 6.1.4-next.1
+
+### Patch Changes
+
+- bda7c8d: Send 'app packaged' analytics event
+- Updated dependencies [bda7c8d]
+  - @forge/cli-shared@8.5.0-next.1
+  - @forge/lint@5.10.3-next.1
+
+## 6.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies [be30715]
+  - @forge/cli-shared@8.5.0-next.0
+  - @forge/lint@5.10.3-next.0
+
 ## 6.1.3
 
 ### Patch Changes

package/out/index.d.ts

@@ -2,7 +2,7 @@ export { getOutputDir, getEntryPoints } from './common';
 export { runLinter } from './lint';
 export { NativeUIBundler, NativeUIBundleResult } from './nativeui';
 export { getNodeBundler, NODE_RUNTIME_CODE_FILE } from './runtime';
-export { Bundler, BundlerError, BundlerOutput, BundlerWatch, EntryPoint, WatcherMonitor } from './types';
+export { Bundler, BundlerError, BundlerMetadata, emptyMetadata, mergeMetadata, BundlerOutput, BundlerWatch, EntryPoint, WatcherMonitor } from './types';
 export { getCompiler, handleWebpackCompilationResult } from './webpack';
 export { getNativeUiBuildConfig } 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,MAAM,UAAU,CAAC;AACxD,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,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzG,OAAO,EAAE,WAAW,EAAE,8BAA8B,EAAE,MAAM,WAAW,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,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,MAAM,UAAU,CAAC;AACxD,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,MAAM,mBAAmB,CAAC;AAC3D,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.getNativeUiBuildConfig = exports.handleWebpackCompilationResult = exports.getCompiler = exports.BundlerError = exports.NODE_RUNTIME_CODE_FILE = exports.getNodeBundler = exports.NativeUIBundler = exports.runLinter = exports.getEntryPoints = exports.getOutputDir = void 0;
+exports.LocalWrapperProvider = exports.getWrapperProvider = exports.getNativeUiBuildConfig = exports.handleWebpackCompilationResult = exports.getCompiler = exports.mergeMetadata = exports.emptyMetadata = exports.BundlerError = exports.NODE_RUNTIME_CODE_FILE = exports.getNodeBundler = exports.NativeUIBundler = exports.runLinter = 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; } });
@@ -13,6 +13,8 @@ Object.defineProperty(exports, "getNodeBundler", { enumerable: true, get: functi
 Object.defineProperty(exports, "NODE_RUNTIME_CODE_FILE", { enumerable: true, get: function () { return runtime_1.NODE_RUNTIME_CODE_FILE; } });
 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; } });
 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/metadata.d.ts

@@ -0,0 +1,3 @@
+import { BundleLogger, BundlerMetadata } from './types';
+export declare function getMetadata(logger: BundleLogger, files: string[]): Promise<BundlerMetadata>;
+//# sourceMappingURL=metadata.d.ts.map

package/out/metadata.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../src/metadata.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAiB,MAAM,SAAS,CAAC;AASvE,wBAAsB,WAAW,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAqBjG"}

package/out/metadata.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMetadata = void 0;
+const tslib_1 = require("tslib");
+const promises_1 = require("fs/promises");
+const path_1 = tslib_1.__importDefault(require("path"));
+const parser = tslib_1.__importStar(require("@babel/parser"));
+const traverse_1 = tslib_1.__importDefault(require("@babel/traverse"));
+const text_1 = require("./text");
+const types_1 = require("./types");
+async function getMetadata(logger, files) {
+    const metadata = (0, types_1.emptyMetadata)();
+    const packageJson = await warnIfFailed(logger, async () => {
+        try {
+            await (0, promises_1.access)('package.json');
+        }
+        catch {
+            return undefined;
+        }
+        const packageFile = await (0, promises_1.readFile)('package.json', 'utf8');
+        return JSON.parse(packageFile);
+    });
+    if (packageJson?.type === 'module') {
+        metadata.esm = true;
+    }
+    await Promise.all(files.map((filePath) => warnIfFailed(logger, async () => processFile(metadata, filePath))));
+    return metadata;
+}
+exports.getMetadata = getMetadata;
+function packageFromImport(name) {
+    const parts = name.split('/');
+    if (parts.length === 0 || parts[0] === '') {
+        return '';
+    }
+    if (parts[0].startsWith('@')) {
+        return `${parts[0]}/${parts[1]}`;
+    }
+    if (parts[0].startsWith('node:')) {
+        return parts[0].substring(5);
+    }
+    return parts[0];
+}
+async function processFile(metadata, filePath) {
+    const ext = path_1.default.extname(filePath);
+    if (ext.match(/^\.[cm]?jsx?$/)) {
+        metadata.jsFiles++;
+    }
+    else if (ext.match(/^\.[cm]?tsx?$/)) {
+        metadata.tsFiles++;
+    }
+    else if (ext === '.json') {
+        return;
+    }
+    const source = await (0, promises_1.readFile)(filePath, 'utf8');
+    const ast = parser.parse(source, {
+        sourceType: 'module',
+        plugins: ['typescript', 'jsx']
+    });
+    (0, traverse_1.default)(ast, {
+        ImportDeclaration: ({ node }) => {
+            const packageName = packageFromImport(node.source.value);
+            metadata.dependencies.add(packageName);
+            if (packageName.startsWith('@forge/')) {
+                for (const specifier of node.specifiers) {
+                    let member;
+                    switch (specifier.type) {
+                        case 'ImportDefaultSpecifier':
+                        case 'ImportNamespaceSpecifier':
+                            member = '*';
+                            break;
+                        case 'ImportSpecifier':
+                            switch (specifier.imported.type) {
+                                case 'Identifier':
+                                    member = specifier.imported.name;
+                                    break;
+                                case 'StringLiteral':
+                                    member = specifier.imported.value;
+                                    break;
+                            }
+                    }
+                    metadata.sdkImports.add(`${packageName}.${member}`);
+                }
+            }
+        }
+    });
+}
+async function warnIfFailed(logger, action) {
+    try {
+        return await action();
+    }
+    catch (error) {
+        logger.warn(text_1.Text.metadataFailed(error));
+    }
+}

package/out/nativeui.d.ts

@@ -1,9 +1,10 @@
 import { ResourceDetails } from '@forge/cli-shared';
 import { Translations } from '@forge/manifest';
-import { BundlerArgs } from './types';
+import { BundlerArgs, BundlerMetadata } from './types';
 import { ConfigWithOutput, WebpackBundler } from './webpack';
 export interface NativeUIBundleResult {
     nativeUiBundlesDetails: ResourceDetails[];
+    metadata: BundlerMetadata;
 }
 export declare class NativeUIBundler extends WebpackBundler {
     getConfig({ entryPoints, i18nConfig }: BundlerArgs): Promise<ConfigWithOutput>;

package/out/nativeui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nativeui.d.ts","sourceRoot":"","sources":["../src/nativeui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,OAAO,EAAE,WAAW,EAA+B,MAAM,SAAS,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE7D,MAAM,WAAW,oBAAoB;IACnC,sBAAsB,EAAE,eAAe,EAAE,CAAC;CAC3C;AAED,qBAAa,eAAgB,SAAQ,cAAc;IAC3C,SAAS,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAIvE,eAAe,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE,UAAU,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAmCrH"}
+{"version":3,"file":"nativeui.d.ts","sourceRoot":"","sources":["../src/nativeui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,OAAO,EAAE,WAAW,EAAgB,eAAe,EAA+C,MAAM,SAAS,CAAC;AAClH,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE7D,MAAM,WAAW,oBAAoB;IACnC,sBAAsB,EAAE,eAAe,EAAE,CAAC;IAC1C,QAAQ,EAAE,eAAe,CAAC;CAC3B;AAED,qBAAa,eAAgB,SAAQ,cAAc;IAC3C,SAAS,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAIvE,eAAe,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE,UAAU,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAyCrH"}

package/out/nativeui.js

@@ -10,6 +10,7 @@ class NativeUIBundler extends webpack_1.WebpackBundler {
     }
     async bundleResources(resources, i18nConfig) {
         const nativeUiBundlesDetails = [];
+        let combinedMetadata = (0, types_1.emptyMetadata)();
         await Promise.all(resources.map(async (resource) => {
             const entryPoint = {
                 name: resource.key,
@@ -26,15 +27,19 @@ class NativeUIBundler extends webpack_1.WebpackBundler {
             catch (e) {
                 throw new types_1.BundlerError(e.message);
             }
-            const { outputDir } = bundlerOutput;
+            const { outputDir, metadata } = bundlerOutput;
             this.logger.debug(`NativeUI bundle created: ${outputDir}`);
             nativeUiBundlesDetails.push({
                 ...resource,
                 path: outputDir
             });
+            if (metadata) {
+                combinedMetadata = (0, types_1.mergeMetadata)(combinedMetadata, metadata);
+            }
         }));
         return {
-            nativeUiBundlesDetails
+            nativeUiBundlesDetails,
+            metadata: combinedMetadata
         };
     }
 }

package/out/runtime.js

@@ -80,8 +80,8 @@ class TypeScriptNodeBundler extends typescript_1.TypeScriptBundler {
         super(logger);
         this.wrapperProvider = wrapperProvider;
     }
-    async getResult(args, outputDir) {
-        const result = await super.getResult(args, outputDir);
+    async getResult(args, outputDir, output) {
+        const result = await super.getResult(args, outputDir, output);
         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 });

package/out/text.d.ts

@@ -2,6 +2,6 @@ export declare const Text: {
     genericBundlingError: (errors: string[]) => string;
     typescriptError: (errors: string[]) => string;
     noExecutableFile: string;
-    unsupported: (requestedModule: string) => string;
+    metadataFailed: (error: Error) => string;
 };
 //# sourceMappingURL=text.d.ts.map

package/out/text.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../src/text.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI;mCACgB,MAAM,EAAE;8BACb,MAAM,EAAE;;mCAKH,MAAM;CAEtC,CAAC"}
+{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../src/text.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI;mCACgB,MAAM,EAAE;8BACb,MAAM,EAAE;;4BAKV,KAAK;CAC9B,CAAC"}

package/out/text.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Text = void 0;
 exports.Text = {
     genericBundlingError: (errors) => `Bundling failed: ${errors.join(', ')}`,
-    typescriptError: (errors) => `TypeScript errors in the app caused the bundling to fail. Fix the errors listed below before rerunning the command. ${errors.join('')}`,
+    typescriptError: (errors) => `TypeScript errors in the app caused the bundling to fail. Fix the errors listed below before rerunning the command. ${errors.join('\n')}`,
     noExecutableFile: 'Could not find the main executable file',
-    unsupported: (requestedModule) => `⚠️  the '${requestedModule}' module is not supported by Forge, please refer to the documentation at https://go.atlassian.com/forge-runtime-js-environment`
+    metadataFailed: (error) => `Application code metadata processing failed: ${error.message}`
 };

package/out/types.d.ts

@@ -2,7 +2,14 @@ import { I18nResourceBundle, Logger, UserError } from '@forge/cli-shared';
 import { Translations } from '@forge/manifest';
 export declare type BundlerMetadata = {
     modules?: string[];
+    jsFiles: number;
+    tsFiles: number;
+    esm: boolean;
+    dependencies: Set<string>;
+    sdkImports: Set<string>;
 };
+export declare function emptyMetadata(): BundlerMetadata;
+export declare function mergeMetadata(metadata1: BundlerMetadata, metadata2: BundlerMetadata): BundlerMetadata;
 export interface BundlerOutput {
     outputDir: string;
     metadata?: BundlerMetadata;

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,MAAM,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,oBAAY,eAAe,GAAG;IAC5B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B;AAED,oBAAY,YAAY,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;AAEvF,oBAAY,gBAAgB,GAAG,OAAO,GAAG,OAAO,CAAC;AAEjD,oBAAY,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,oBAAY,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,oBAAY,gBAAgB,GAAG,WAAW,GACxC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,GAAG;IACzC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEJ,oBAAY,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,oBAAY,kBAAkB,GAAG,cAAc,GAAG;IAChD,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,oBAAY,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,MAAM,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,oBAAY,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;CACzB,CAAC;AAEF,wBAAgB,aAAa,IAAI,eAAe,CAQ/C;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,EAAE,eAAe,GAAG,eAAe,CAWrG;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B;AAED,oBAAY,YAAY,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;AAEvF,oBAAY,gBAAgB,GAAG,OAAO,GAAG,OAAO,CAAC;AAEjD,oBAAY,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,oBAAY,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,oBAAY,gBAAgB,GAAG,WAAW,GACxC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,GAAG;IACzC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEJ,oBAAY,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,oBAAY,kBAAkB,GAAG,cAAc,GAAG;IAChD,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,oBAAY,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

@@ -1,7 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BundlerError = void 0;
+exports.BundlerError = exports.mergeMetadata = exports.emptyMetadata = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
+function emptyMetadata() {
+    return {
+        jsFiles: 0,
+        tsFiles: 0,
+        esm: false,
+        dependencies: new Set(),
+        sdkImports: new Set()
+    };
+}
+exports.emptyMetadata = emptyMetadata;
+function mergeMetadata(metadata1, metadata2) {
+    return {
+        ...((metadata1.modules || metadata2.modules) && {
+            modules: [...(metadata1.modules ?? []), ...(metadata2.modules ?? [])]
+        }),
+        jsFiles: metadata1.jsFiles + metadata2.jsFiles,
+        tsFiles: metadata1.tsFiles + metadata2.tsFiles,
+        esm: metadata1.esm || metadata2.esm,
+        dependencies: new Set([...metadata1.dependencies, ...metadata2.dependencies]),
+        sdkImports: new Set([...metadata1.sdkImports, ...metadata2.sdkImports])
+    };
+}
+exports.mergeMetadata = mergeMetadata;
 class BundlerError extends cli_shared_1.UserError {
 }
 exports.BundlerError = BundlerError;

package/out/typescript.d.ts

@@ -8,7 +8,9 @@ export declare abstract class TypeScriptBundler implements Bundler {
     protected readonly logger: BundleLogger;
     constructor(logger: BundleLogger);
     protected runTypeScript(args: BundlerArgs, outputDir: string): OutputProcess;
-    protected getResult(args: BundlerArgs, outputDir: string): Promise<BundlerOutput>;
+    protected isListedFile(line: string): string | null;
+    protected isAppFile(line: string): string | null;
+    protected getResult(args: BundlerArgs, outputDir: string, output?: string): 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;AASlC,OAAO,EACL,OAAO,EACP,YAAY,EACZ,aAAa,EACb,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,SAAS,CAAC;AAEjB,aAAK,aAAa,GAAG,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AA6B/D,8BAAsB,iBAAkB,YAAW,OAAO;IAC5C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY;gBAApB,MAAM,EAAE,YAAY;IAEnD,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,aAAa;cAqB5D,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAKjF,MAAM,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAyBjD,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;AASlC,OAAO,EACL,OAAO,EACP,YAAY,EACZ,aAAa,EACb,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAEnB,MAAM,SAAS,CAAC;AAGjB,aAAK,aAAa,GAAG,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AA6B/D,8BAAsB,iBAAkB,YAAW,OAAO;IAC5C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY;gBAApB,MAAM,EAAE,YAAY;IAEnD,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;IAWnD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;cAUhC,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAiBlG,MAAM,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IA6BjD,KAAK,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA2DtF"}

package/out/typescript.js

@@ -10,6 +10,8 @@ const cli_shared_1 = require("@forge/cli-shared");
 const common_1 = require("./common");
 const dependencies_1 = require("./dependencies");
 const text_1 = require("./text");
+const types_1 = require("./types");
+const metadata_1 = require("./metadata");
 const COPY_DEPENDENCIES_OPTIONS = {
     exclude: ['@forge/react', '@forge/bridge']
 };
@@ -25,6 +27,9 @@ class TypeScriptBundler {
         if (args.watchMode) {
             processArgs.push('--watch');
         }
+        else {
+            processArgs.push('--listFiles');
+        }
         processArgs.push('--outDir', outputDir);
         let tsc = 'tsc';
         const appTsc = path_1.default.join(args.appDirectory, common_1.NODE_MODULES_DIR, '.bin', 'tsc');
@@ -33,21 +38,55 @@ class TypeScriptBundler {
         }
         return (0, cross_spawn_1.default)(tsc, processArgs, { stdio: ['ignore', 'pipe', 'inherit'] });
     }
-    async getResult(args, outputDir) {
-        return { outputDir, metadata: {} };
+    isListedFile(line) {
+        line = line.trim();
+        if (line.length === 0) {
+            return null;
+        }
+        if (!line.match(/^\/.+\.[cm]?[jt]sx?$/)) {
+            return null;
+        }
+        return line;
+    }
+    isAppFile(line) {
+        if (!this.isListedFile(line)) {
+            return null;
+        }
+        if (line.includes('node_modules/')) {
+            return null;
+        }
+        return line;
+    }
+    async getResult(args, outputDir, output) {
+        let metadata;
+        if (output) {
+            const files = [];
+            for (const line of output.split('\n')) {
+                const filePath = this.isAppFile(line);
+                if (filePath) {
+                    files.push(filePath);
+                }
+            }
+            metadata = await (0, metadata_1.getMetadata)(this.logger, files);
+        }
+        else {
+            metadata = (0, types_1.emptyMetadata)();
+        }
+        return { outputDir, metadata };
     }
     async bundle(args) {
         const outputDir = (0, common_1.getOutputDir)(args);
         await (0, dependencies_1.copyProductionDependencies)(args.appDirectory, outputDir, COPY_DEPENDENCIES_OPTIONS);
         const compiler = this.runTypeScript(args, outputDir);
-        const output = [];
-        compiler.stdout.on('data', (data) => output.push(data));
+        let output = '';
+        compiler.stdout.on('data', (data) => (output += data.toString()));
         return new Promise((resolve, reject) => compiler.on('exit', async (code) => {
             try {
                 if (code !== 0) {
-                    throw new cli_shared_1.BundlerTSError(text_1.Text.typescriptError(output));
+                    const errors = output.split('\n').filter((line) => !this.isListedFile(line));
+                    throw new cli_shared_1.BundlerTSError(text_1.Text.typescriptError(errors));
                 }
-                const result = await this.getResult(args, outputDir);
+                const result = await this.getResult(args, outputDir, output);
                 resolve(result);
             }
             catch (e) {

package/out/webpack.d.ts

@@ -10,6 +10,8 @@ export declare abstract class WebpackBundler implements Bundler {
     protected readonly logger: BundleLogger;
     constructor(logger: BundleLogger);
     protected getOutput(config: ConfigWithOutput, stats: webpack.Stats): Promise<BundlerOutput>;
+    protected isLocalModule(name: string): boolean;
+    protected localModules(stats: webpack.Stats): string[];
     protected runCompiler(config: ConfigWithOutput): Promise<BundlerOutput>;
     abstract getConfig(args: BundlerArgs): Promise<ConfigWithOutput>;
     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":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,OAAO,EACL,OAAO,EACP,YAAY,EAEZ,aAAa,EACb,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,YAAY,EACpB,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,oBAAY,gBAAgB,GAAG,OAAO,CAAC,aAAa,GAAG;IAAE,MAAM,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAEvF,8BAAsB,cAAe,YAAW,OAAO;IACzC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY;gBAApB,MAAM,EAAE,YAAY;cAEnC,SAAS,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;cAWjF,WAAW,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAsB7E,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAE1D,MAAM,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAKjD,KAAK,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAsCtF"}
+{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,EACL,OAAO,EACP,YAAY,EAEZ,aAAa,EACb,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,YAAY,EACpB,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,oBAAY,gBAAgB,GAAG,OAAO,CAAC,aAAa,GAAG;IAAE,MAAM,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAEvF,8BAAsB,cAAe,YAAW,OAAO;IACzC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY;gBAApB,MAAM,EAAE,YAAY;cAEnC,SAAS,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAkBjG,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAyB9C,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,MAAM,EAAE;cA0BtC,WAAW,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAsB7E,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAE1D,MAAM,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAKjD,KAAK,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAsCtF"}

package/out/webpack.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebpackBundler = exports.getCompiler = exports.handleWebpackCompilationResult = void 0;
 const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
 const webpack_1 = tslib_1.__importDefault(require("webpack"));
 const cli_shared_1 = require("@forge/cli-shared");
+const metadata_1 = require("./metadata");
 const text_1 = require("./text");
 function handleWebpackCompilationResult(logger, err, stats) {
     if (err) {
@@ -62,12 +64,51 @@ class WebpackBundler {
     }
     async getOutput(config, stats) {
         const outputDir = config.output.path;
-        const metadata = {};
+        const metadata = await (0, metadata_1.getMetadata)(this.logger, this.localModules(stats));
         if (stats) {
             metadata.modules = getNodeModuleNames(stats);
         }
         return { outputDir, metadata };
     }
+    isLocalModule(name) {
+        if (name.match(/\/node_modules\/(.+)$/)) {
+            return false;
+        }
+        if (name.match(/^external "(?:node:)?([^:"]+)"$/)) {
+            return false;
+        }
+        if (name.startsWith('webpack/runtime/')) {
+            return false;
+        }
+        if (path_1.default.extname(name) === '.json') {
+            return false;
+        }
+        if (!path_1.default.extname(name).match(/^\.[cm]?[jt]sx?$/)) {
+            throw new Error(`Unknown module type for ${JSON.stringify(name)}.`);
+        }
+        return true;
+    }
+    localModules(stats) {
+        const { modules } = stats.toJson({ modules: true });
+        const result = [];
+        const addModules = (modules) => {
+            for (const module of modules) {
+                if (module.modules) {
+                    addModules(module.modules);
+                }
+                else if (!module.name) {
+                    throw new Error('Module name is missing');
+                }
+                else if (this.isLocalModule(module.name)) {
+                    result.push(module.name);
+                }
+            }
+        };
+        if (modules) {
+            addModules(modules);
+        }
+        return result;
+    }
     async runCompiler(config) {
         const compiler = getCompiler(config);
         return new Promise((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "6.1.3",
+  "version": "6.1.4-next.1",
   "description": "Default bundler for Forge apps",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Atlassian",
@@ -13,14 +13,16 @@
   },
   "dependencies": {
     "@babel/core": "^7.24.0",
+    "@babel/parser": "7.28.0",
     "@babel/plugin-transform-class-properties": "^7.23.3",
     "@babel/plugin-transform-class-static-block": "^7.23.4",
     "@babel/plugin-transform-numeric-separator": "^7.23.4",
     "@babel/plugin-transform-optional-chaining": "^7.23.4",
     "@babel/plugin-transform-react-jsx": "^7.23.4",
-    "@forge/cli-shared": "8.4.0",
+    "@babel/traverse": "^7.24.0",
+    "@forge/cli-shared": "8.5.0-next.1",
     "@forge/i18n": "0.0.7",
-    "@forge/lint": "5.10.2",
+    "@forge/lint": "5.10.3-next.1",
     "@forge/manifest": "10.3.0",
     "babel-loader": "^8.3.0",
     "cheerio": "^1.1.0",
@@ -31,6 +33,7 @@
     "node-fetch": "2.7.0",
     "tmp": "^0.2.3",
     "ts-loader": "^9.5.2",
+    "type-fest": "4.10.2",
     "typescript": "4.8.4",
     "webpack": "^5.99.9",
     "webpack-bundle-analyzer": "^4.10.2"