@forge/bundler 6.1.4 → 6.1.5-next.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @forge/bundler
 
+## 6.1.5-next.1
+
+### Patch Changes
+
+- fb25473: Fix edge cases in metadata collection
+
+## 6.1.5-next.0
+
+### Patch Changes
+
+- Updated dependencies [e0b9806]
+  - @forge/cli-shared@8.5.1-next.0
+  - @forge/lint@5.11.1-next.0
+
 ## 6.1.4
 
 ### Patch Changes

package/out/metadata.d.ts

@@ -1,4 +1,4 @@
 import { Logger } from '@forge/cli-shared';
 import { BundlerMetadata } from './types';
-export declare function getMetadata(logger: Logger, appDirectory: string, files: string[]): Promise<BundlerMetadata>;
+export declare function getMetadata(logger: Logger, appDirectory: string, files: Set<string>): Promise<BundlerMetadata>;
 //# sourceMappingURL=metadata.d.ts.map

package/out/metadata.d.ts.map

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

package/out/metadata.js

@@ -58,7 +58,7 @@ class MetadataCollector {
         else if (ext.match(/^\.[cm]?tsx?$/)) {
             this.metadata.tsFiles++;
         }
-        else if (ext === '.json') {
+        else {
             return;
         }
         const source = await (0, promises_1.readFile)(filePath, 'utf8');
@@ -97,7 +97,7 @@ class MetadataCollector {
     }
     async collect({ files }) {
         await this.warnIfFailed(() => this.processPackageJson());
-        await Promise.all(files.map((filePath) => this.warnIfFailed(() => this.processSourceFile(filePath))));
+        await Promise.all(Array.from(files, (filePath) => this.warnIfFailed(() => this.processSourceFile(filePath))));
         return this.metadata;
     }
     async warnIfFailed(action) {

package/out/typescript.js

@@ -51,11 +51,11 @@ class TypeScriptBundler {
     async getResult(args, outputDir, output) {
         let metadata;
         if (output) {
-            const files = [];
+            const files = new Set();
             for (const line of output.split('\n')) {
                 const filePath = this.isListedFile(line);
                 if (filePath) {
-                    files.push(filePath);
+                    files.add(filePath);
                 }
             }
             metadata = await (0, metadata_1.getMetadata)(this.logger, args.appDirectory, files);

package/out/webpack.d.ts

@@ -12,7 +12,7 @@ export declare abstract class WebpackBundler implements Bundler {
     constructor(logger: Logger);
     protected getOutput(args: BundlerArgs, config: ConfigWithOutput, stats: webpack.Stats): Promise<BundlerOutput>;
     protected isRegularModule(name: string): boolean;
-    protected localModules(stats: webpack.Stats): string[];
+    protected localModules(stats: webpack.Stats): Set<string>;
     protected runCompiler(args: BundlerArgs, 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":"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,EACnB,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,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,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;IAsBhD,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,MAAM,EAAE;cA0BtC,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAsBhG,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;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,EACnB,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,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,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,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

@@ -77,27 +77,21 @@ class WebpackBundler {
         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 false;
         }
         return true;
     }
     localModules(stats) {
         const { modules } = stats.toJson({ modules: true });
-        const result = [];
+        const result = new Set();
         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.isRegularModule(module.name)) {
-                    result.push(module.name);
+                else if (module.name && this.isRegularModule(module.name)) {
+                    result.add(module.name);
                 }
             }
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "6.1.4",
+  "version": "6.1.5-next.1",
   "description": "Default bundler for Forge apps",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Atlassian",
@@ -21,9 +21,9 @@
     "@babel/plugin-transform-react-jsx": "^7.23.4",
     "@babel/traverse": "^7.24.0",
     "@babel/types": "^7.24.0",
-    "@forge/cli-shared": "8.5.0",
+    "@forge/cli-shared": "8.5.1-next.0",
     "@forge/i18n": "0.0.7",
-    "@forge/lint": "5.11.0",
+    "@forge/lint": "5.11.1-next.0",
     "@forge/manifest": "10.4.0",
     "babel-loader": "^8.3.0",
     "cheerio": "^1.1.0",