@forge/bundler 6.1.4-next.5 → 6.1.4-next.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # @forge/bundler
2
2
 
3
+ ## 6.1.4-next.7
4
+
5
+ ### Patch Changes
6
+
7
+ - d27aec7: Send analytics about failed metadata collection
8
+
9
+ ## 6.1.4-next.6
10
+
11
+ ### Patch Changes
12
+
13
+ - Updated dependencies [924b093]
14
+ - @forge/cli-shared@8.5.0-next.6
15
+ - @forge/lint@5.11.0-next.6
16
+
3
17
  ## 6.1.4-next.5
4
18
 
5
19
  ### Patch Changes
package/out/metadata.d.ts CHANGED
@@ -1,3 +1,4 @@
1
- import { BundleLogger, BundlerMetadata } from './types';
2
- export declare function getMetadata(logger: BundleLogger, files: string[]): Promise<BundlerMetadata>;
1
+ import { Logger } from '@forge/cli-shared';
2
+ import { BundlerMetadata } from './types';
3
+ export declare function getMetadata(logger: Logger, files: string[]): Promise<BundlerMetadata>;
3
4
  //# sourceMappingURL=metadata.d.ts.map
@@ -1 +1 @@
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"}
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;AAqJzD,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAG3F"}
package/out/metadata.js CHANGED
@@ -8,9 +8,13 @@ const parser = tslib_1.__importStar(require("@babel/parser"));
8
8
  const traverse_1 = tslib_1.__importDefault(require("@babel/traverse"));
9
9
  const text_1 = require("./text");
10
10
  const types_1 = require("./types");
11
- async function getMetadata(logger, files) {
12
- const metadata = (0, types_1.emptyMetadata)();
13
- const packageJson = await warnIfFailed(logger, async () => {
11
+ class MetadataCollector {
12
+ logger;
13
+ metadata = (0, types_1.emptyMetadata)();
14
+ constructor(logger) {
15
+ this.logger = logger;
16
+ }
17
+ async processPackageJson() {
14
18
  try {
15
19
  await (0, promises_1.access)('package.json');
16
20
  }
@@ -18,77 +22,86 @@ async function getMetadata(logger, files) {
18
22
  return undefined;
19
23
  }
20
24
  const packageFile = await (0, promises_1.readFile)('package.json', 'utf8');
21
- return JSON.parse(packageFile);
22
- });
23
- if (packageJson?.type === 'module') {
24
- metadata.esm = true;
25
- }
26
- await Promise.all(files.map((filePath) => warnIfFailed(logger, async () => processFile(metadata, filePath))));
27
- return metadata;
28
- }
29
- exports.getMetadata = getMetadata;
30
- function packageFromImport(name) {
31
- const parts = name.split('/');
32
- if (parts.length === 0 || parts[0] === '') {
33
- return '';
34
- }
35
- if (parts[0].startsWith('@')) {
36
- return `${parts[0]}/${parts[1]}`;
37
- }
38
- if (parts[0].startsWith('node:')) {
39
- return parts[0].substring(5);
40
- }
41
- return parts[0];
42
- }
43
- async function processFile(metadata, filePath) {
44
- const ext = path_1.default.extname(filePath);
45
- if (ext.match(/^\.[cm]?jsx?$/)) {
46
- metadata.jsFiles++;
25
+ const packageJson = JSON.parse(packageFile);
26
+ if (packageJson.type === 'module') {
27
+ this.metadata.esm = true;
28
+ }
47
29
  }
48
- else if (ext.match(/^\.[cm]?tsx?$/)) {
49
- metadata.tsFiles++;
30
+ static packageFromImport(name) {
31
+ const parts = name.split('/');
32
+ if (parts.length === 0 || parts[0] === '') {
33
+ return '';
34
+ }
35
+ if (parts[0].startsWith('@')) {
36
+ return `${parts[0]}/${parts[1]}`;
37
+ }
38
+ if (parts[0].startsWith('node:')) {
39
+ return parts[0].substring(5);
40
+ }
41
+ return parts[0];
50
42
  }
51
- else if (ext === '.json') {
52
- return;
43
+ async processSourceFile(filePath) {
44
+ const ext = path_1.default.extname(filePath);
45
+ if (ext.match(/^\.[cm]?jsx?$/)) {
46
+ this.metadata.jsFiles++;
47
+ }
48
+ else if (ext.match(/^\.[cm]?tsx?$/)) {
49
+ this.metadata.tsFiles++;
50
+ }
51
+ else if (ext === '.json') {
52
+ return;
53
+ }
54
+ const source = await (0, promises_1.readFile)(filePath, 'utf8');
55
+ const ast = parser.parse(source, {
56
+ sourceType: 'module',
57
+ plugins: ['typescript', 'jsx']
58
+ });
59
+ (0, traverse_1.default)(ast, {
60
+ ImportDeclaration: ({ node }) => this.processImport(node)
61
+ });
53
62
  }
54
- const source = await (0, promises_1.readFile)(filePath, 'utf8');
55
- const ast = parser.parse(source, {
56
- sourceType: 'module',
57
- plugins: ['typescript', 'jsx']
58
- });
59
- (0, traverse_1.default)(ast, {
60
- ImportDeclaration: ({ node }) => {
61
- const packageName = packageFromImport(node.source.value);
62
- metadata.dependencies.add(packageName);
63
- if (packageName.startsWith('@forge/')) {
64
- for (const specifier of node.specifiers) {
65
- let member;
66
- switch (specifier.type) {
67
- case 'ImportDefaultSpecifier':
68
- case 'ImportNamespaceSpecifier':
69
- member = '*';
70
- break;
71
- case 'ImportSpecifier':
72
- switch (specifier.imported.type) {
73
- case 'Identifier':
74
- member = specifier.imported.name;
75
- break;
76
- case 'StringLiteral':
77
- member = specifier.imported.value;
78
- break;
79
- }
80
- }
81
- metadata.sdkImports.add(`${packageName}.${member}`);
63
+ processImport(node) {
64
+ const packageName = MetadataCollector.packageFromImport(node.source.value);
65
+ this.metadata.dependencies.add(packageName);
66
+ if (packageName.startsWith('@forge/')) {
67
+ for (const specifier of node.specifiers) {
68
+ let member;
69
+ switch (specifier.type) {
70
+ case 'ImportDefaultSpecifier':
71
+ case 'ImportNamespaceSpecifier':
72
+ member = '*';
73
+ break;
74
+ case 'ImportSpecifier':
75
+ switch (specifier.imported.type) {
76
+ case 'Identifier':
77
+ member = specifier.imported.name;
78
+ break;
79
+ case 'StringLiteral':
80
+ member = specifier.imported.value;
81
+ break;
82
+ }
82
83
  }
84
+ this.metadata.sdkImports.add(`${packageName}.${member}`);
83
85
  }
84
86
  }
85
- });
86
- }
87
- async function warnIfFailed(logger, action) {
88
- try {
89
- return await action();
90
87
  }
91
- catch (error) {
92
- logger.warn(text_1.Text.metadataFailed(error));
88
+ async collect({ files }) {
89
+ await this.warnIfFailed(() => this.processPackageJson());
90
+ await Promise.all(files.map((filePath) => this.warnIfFailed(() => this.processSourceFile(filePath))));
91
+ return this.metadata;
92
+ }
93
+ async warnIfFailed(action) {
94
+ try {
95
+ return await action();
96
+ }
97
+ catch (error) {
98
+ this.logger.debug(text_1.Text.metadataFailed(error));
99
+ this.metadata.errors++;
100
+ }
93
101
  }
94
102
  }
103
+ async function getMetadata(logger, files) {
104
+ const collector = new MetadataCollector(logger);
105
+ return collector.collect({ files });
106
+ }
107
+ exports.getMetadata = getMetadata;
package/out/runtime.d.ts CHANGED
@@ -1,7 +1,7 @@
1
- import { ConfigReader } from '@forge/cli-shared';
2
- import { BundleLogger, Bundler } from './types';
1
+ import { ConfigReader, Logger } from '@forge/cli-shared';
2
+ import { Bundler } from './types';
3
3
  import { WrapperProvider } from './wrapper-provider';
4
4
  export declare const NODE_RUNTIME_CODE_FILE = "__forge__.cjs";
5
5
  export declare function userCodePath(entryKey: string): string;
6
- export declare function getNodeBundler(logger: BundleLogger, wrapperProvider: WrapperProvider, configReader: ConfigReader): Bundler;
6
+ export declare function getNodeBundler(logger: Logger, wrapperProvider: WrapperProvider, configReader: ConfigReader): Bundler;
7
7
  //# sourceMappingURL=runtime.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAqD,MAAM,mBAAmB,CAAC;AAGpG,OAAO,EACL,YAAY,EACZ,OAAO,EAMR,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAiB,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAMpE,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AAoBtD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAErD;AAsJD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,GACzB,OAAO,CAET"}
1
+ {"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAsB,MAAM,EAAiC,MAAM,mBAAmB,CAAC;AAG5G,OAAO,EAAE,OAAO,EAAkF,MAAM,SAAS,CAAC;AAGlH,OAAO,EAAiB,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAMpE,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AAoBtD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAErD;AAsJD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAEpH"}
package/out/types.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { I18nResourceBundle, Logger, UserError } from '@forge/cli-shared';
1
+ import { I18nResourceBundle, UserError } from '@forge/cli-shared';
2
2
  import { Translations } from '@forge/manifest';
3
3
  export declare type BundlerMetadata = {
4
4
  modules?: string[];
@@ -7,6 +7,7 @@ export declare type BundlerMetadata = {
7
7
  esm: boolean;
8
8
  dependencies: Set<string>;
9
9
  sdkImports: Set<string>;
10
+ errors: number;
10
11
  };
11
12
  export declare function emptyMetadata(): BundlerMetadata;
12
13
  export declare function mergeMetadata(metadata1: BundlerMetadata, metadata2: BundlerMetadata): BundlerMetadata;
@@ -14,7 +15,6 @@ export interface BundlerOutput {
14
15
  outputDir: string;
15
16
  metadata?: BundlerMetadata;
16
17
  }
17
- export declare type BundleLogger = Pick<Logger, 'trace' | 'debug' | 'info' | 'warn' | 'error'>;
18
18
  export declare type BundlerWatchMode = 'watch' | 'debug';
19
19
  export declare type EntryPoint = {
20
20
  name: string;
@@ -1 +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;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"}
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,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;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAgB,aAAa,IAAI,eAAe,CAS/C;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,EAAE,eAAe,GAAG,eAAe,CAYrG;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B;AAED,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 CHANGED
@@ -8,7 +8,8 @@ function emptyMetadata() {
8
8
  tsFiles: 0,
9
9
  esm: false,
10
10
  dependencies: new Set(),
11
- sdkImports: new Set()
11
+ sdkImports: new Set(),
12
+ errors: 0
12
13
  };
13
14
  }
14
15
  exports.emptyMetadata = emptyMetadata;
@@ -21,7 +22,8 @@ function mergeMetadata(metadata1, metadata2) {
21
22
  tsFiles: metadata1.tsFiles + metadata2.tsFiles,
22
23
  esm: metadata1.esm || metadata2.esm,
23
24
  dependencies: new Set([...metadata1.dependencies, ...metadata2.dependencies]),
24
- sdkImports: new Set([...metadata1.sdkImports, ...metadata2.sdkImports])
25
+ sdkImports: new Set([...metadata1.sdkImports, ...metadata2.sdkImports]),
26
+ errors: metadata1.errors + metadata2.errors
25
27
  };
26
28
  }
27
29
  exports.mergeMetadata = mergeMetadata;
@@ -2,11 +2,12 @@
2
2
  /// <reference types="node" />
3
3
  import { ChildProcessByStdio } from 'child_process';
4
4
  import { Readable } from 'stream';
5
- import { Bundler, BundleLogger, BundlerOutput, BundlerArgs, BundlerWatch, BundlerWatchArgs, BundlerWatchOutput } from './types';
5
+ import { Logger } from '@forge/cli-shared';
6
+ import { Bundler, BundlerOutput, BundlerArgs, BundlerWatch, BundlerWatchArgs, BundlerWatchOutput } from './types';
6
7
  declare type OutputProcess = ChildProcessByStdio<null, Readable, null>;
7
8
  export declare abstract class TypeScriptBundler implements Bundler {
8
- protected readonly logger: BundleLogger;
9
- constructor(logger: BundleLogger);
9
+ protected readonly logger: Logger;
10
+ constructor(logger: Logger);
10
11
  protected runTypeScript(args: BundlerArgs, outputDir: string): OutputProcess;
11
12
  protected isListedFile(line: string): string | null;
12
13
  protected isAppFile(line: string): string | null;
@@ -1 +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,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"}
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;AAKrE,OAAO,EACL,OAAO,EACP,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,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;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/webpack.d.ts CHANGED
@@ -1,14 +1,15 @@
1
1
  import webpack from 'webpack';
2
+ import { Logger } from '@forge/cli-shared';
2
3
  import { CommonOutputOptions } from './config/common';
3
- import { Bundler, BundleLogger, BundlerOutput, BundlerArgs, BundlerWatch, BundlerWatchArgs, BundlerWatchOutput } from './types';
4
- export declare function handleWebpackCompilationResult(logger: BundleLogger, err: Error | null | undefined, stats: Pick<webpack.Stats, 'hasErrors' | 'hasWarnings' | 'toJson'> | undefined): asserts stats is webpack.Stats;
4
+ import { Bundler, BundlerOutput, BundlerArgs, BundlerWatch, BundlerWatchArgs, BundlerWatchOutput } from './types';
5
+ export declare function handleWebpackCompilationResult(logger: Logger, err: Error | null | undefined, stats: Pick<webpack.Stats, 'hasErrors' | 'hasWarnings' | 'toJson'> | undefined): asserts stats is webpack.Stats;
5
6
  export declare function getCompiler(config: webpack.Configuration): webpack.Compiler;
6
7
  export declare type ConfigWithOutput = webpack.Configuration & {
7
8
  output: CommonOutputOptions;
8
9
  };
9
10
  export declare abstract class WebpackBundler implements Bundler {
10
- protected readonly logger: BundleLogger;
11
- constructor(logger: BundleLogger);
11
+ protected readonly logger: Logger;
12
+ constructor(logger: Logger);
12
13
  protected getOutput(config: ConfigWithOutput, stats: webpack.Stats): Promise<BundlerOutput>;
13
14
  protected isLocalModule(name: string): boolean;
14
15
  protected localModules(stats: webpack.Stats): string[];
@@ -1 +1 @@
1
- {"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"}
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,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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/bundler",
3
- "version": "6.1.4-next.5",
3
+ "version": "6.1.4-next.7",
4
4
  "description": "Default bundler for Forge apps",
5
5
  "license": "SEE LICENSE IN LICENSE.txt",
6
6
  "author": "Atlassian",
@@ -20,9 +20,10 @@
20
20
  "@babel/plugin-transform-optional-chaining": "^7.23.4",
21
21
  "@babel/plugin-transform-react-jsx": "^7.23.4",
22
22
  "@babel/traverse": "^7.24.0",
23
- "@forge/cli-shared": "8.5.0-next.5",
23
+ "@babel/types": "^7.24.0",
24
+ "@forge/cli-shared": "8.5.0-next.6",
24
25
  "@forge/i18n": "0.0.7",
25
- "@forge/lint": "5.11.0-next.5",
26
+ "@forge/lint": "5.11.0-next.6",
26
27
  "@forge/manifest": "10.4.0-next.3",
27
28
  "babel-loader": "^8.3.0",
28
29
  "cheerio": "^1.1.0",