@forge/bundler 7.2.3 → 7.3.0-next.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @forge/bundler
 
+## 7.3.0-next.0
+
+### Minor Changes
+
+- a68050a: Removed the TypeScript bundler EAP. Use manual packaging instead, running `tsc` or another compiler yourself.
+
+### Patch Changes
+
+- Updated dependencies [a68050a]
+  - @forge/cli-shared@9.8.0-next.0
+  - @forge/manifest@13.7.0-next.0
+  - @forge/lint@6.3.1-next.0
+
 ## 7.2.3
 
 ### Patch Changes

package/out/runtime.d.ts

@@ -1,8 +1,8 @@
-import { ConfigReader, Logger, StatsigService } from '@forge/cli-shared';
+import { ConfigReader, Logger } 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;
+export declare function getNodeBundler(logger: Logger, wrapperProvider: WrapperProvider, configReader: ConfigReader): 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":"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,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAK3E,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AA4NtD,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,EAA4C,MAAM,mBAAmB,CAAC;AAEnG,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAKjD,OAAO,EAEL,OAAO,EAOR,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAK3E,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AA2LtD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAEpH"}

package/out/runtime.js

@@ -12,7 +12,6 @@ const common_1 = require("./config/common");
 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';
@@ -60,18 +59,6 @@ class NodeBundler extends webpack_1.WebpackBundler {
         return result;
     }
 }
-class TypeScriptNodeBundler extends typescript_1.TypeScriptBundler {
-    wrapperProvider;
-    constructor(logger, wrapperProvider) {
-        super(logger);
-        this.wrapperProvider = wrapperProvider;
-    }
-    async getResult(args, outputDir, output, additionalOutputs) {
-        const result = await super.getResult(args, outputDir, output, additionalOutputs);
-        result.additionalOutputs = (0, types_1.mergeOutputs)(result.additionalOutputs, await getRuntimeArtifacts(this.wrapperProvider, args));
-        return result;
-    }
-}
 class ManualBundler {
     logger;
     wrapperProvider;
@@ -128,24 +115,16 @@ class ConfigBundler {
     logger;
     wrapperProvider;
     configReader;
-    statsigService;
-    constructor(logger, wrapperProvider, configReader, statsigService) {
+    constructor(logger, wrapperProvider, configReader) {
         this.logger = logger;
         this.wrapperProvider = wrapperProvider;
         this.configReader = configReader;
-        this.statsigService = statsigService;
     }
     async getBundler() {
         const config = (await this.configReader.readConfig()).app.package;
         if (config?.path && config?.bundler !== 'manual@2026') {
             throw new cli_shared_1.UserError(text_1.Text.packagePathOnlySupportedForManualBundler);
         }
-        if (config?.bundler === 'typescript') {
-            if (!(await this.statsigService.isTypescriptBundlerEnabled())) {
-                throw new cli_shared_1.UserError(text_1.Text.typescriptBundlerEAP);
-            }
-            return new TypeScriptNodeBundler(this.logger, this.wrapperProvider);
-        }
         if (config?.bundler === 'manual@2026') {
             return new ManualBundler(config, this.logger, this.wrapperProvider);
         }
@@ -158,6 +137,6 @@ class ConfigBundler {
         return (await this.getBundler()).watch(args, watch);
     }
 }
-function getNodeBundler(logger, wrapperProvider, configReader, statsigService) {
-    return new ConfigBundler(logger, wrapperProvider, configReader, statsigService);
+function getNodeBundler(logger, wrapperProvider, configReader) {
+    return new ConfigBundler(logger, wrapperProvider, configReader);
 }

package/out/text.d.ts

@@ -3,7 +3,6 @@ export declare const Text: {
     typescriptError: (errors: string[]) => string;
     noExecutableFile: string;
     metadataFailed: (error: Error) => string;
-    typescriptBundlerEAP: string;
     manualBundlerPathRequired: string;
     packagePathOnlySupportedForManualBundler: string;
 };

package/out/text.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../src/text.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,IAAI;mCACgB,MAAM,EAAE;8BACb,MAAM,EAAE;;4BAKV,KAAK;;;;CAI9B,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;;;CAG9B,CAAC"}

package/out/text.js

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Text = void 0;
-const cli_shared_1 = require("@forge/cli-shared");
 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('\n')}`,
     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.`,
     manualBundlerPathRequired: 'For manual packaging, the path to the packaged runtime code is required.',
     packagePathOnlySupportedForManualBundler: 'The package path is only needed when the application is packaged manually.'
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "7.2.3",
+  "version": "7.3.0-next.0",
   "description": "Default bundler for Forge apps",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Atlassian",
@@ -21,16 +21,14 @@
     "@babel/plugin-transform-react-jsx": "^7.23.4",
     "@babel/traverse": "^7.24.0",
     "@babel/types": "^7.24.0",
-    "@forge/cli-shared": "9.7.0",
+    "@forge/cli-shared": "9.8.0-next.0",
     "@forge/i18n": "1.0.0",
-    "@forge/lint": "6.3.0",
-    "@forge/manifest": "13.6.0",
+    "@forge/lint": "6.3.1-next.0",
+    "@forge/manifest": "13.7.0-next.0",
     "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",
     "tmp": "^0.2.3",
@@ -43,8 +41,6 @@
   "devDependencies": {
     "@atlassian/xen-test-util": "^4.2.0",
     "@forge/runtime": "7.0.0",
-    "@types/cross-spawn": "^6.0.6",
-    "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.14",
     "@types/node": "20.19.1",
     "@types/react": "^18.2.64",
@@ -54,7 +50,6 @@
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "glob": "^13.0.0",
     "jest-matcher-specific-error": "^1.0.0",
     "prettier": "3.2.5",
     "typescript": "5.9.2"

package/out/dependencies.d.ts

@@ -1,10 +0,0 @@
-type CopyDepsOptions = {
-    exclude?: string[];
-};
-export declare const DEFAULT_COPY_DEPENDENCIES_OPTIONS: {
-    exclude: string[];
-};
-export declare function getProductionDependencies(moduleDir: string, options?: CopyDepsOptions): Promise<Map<string, string>>;
-export declare function copyProductionDependencies(moduleDir: string, target: string, options?: CopyDepsOptions): Promise<void>;
-export {};
-//# sourceMappingURL=dependencies.d.ts.map

package/out/dependencies.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../src/dependencies.ts"],"names":[],"mappings":"AAoDA,KAAK,eAAe,GAAG;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAyBF,eAAO,MAAM,iCAAiC;;CAE7C,CAAC;AAYF,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAI9B;AAsDD,wBAAsB,0BAA0B,CAC9C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,IAAI,CAAC,CAKf"}

package/out/dependencies.js

@@ -1,76 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_COPY_DEPENDENCIES_OPTIONS = void 0;
-exports.getProductionDependencies = getProductionDependencies;
-exports.copyProductionDependencies = copyProductionDependencies;
-const tslib_1 = require("tslib");
-const fs_1 = require("fs");
-const promises_1 = require("fs/promises");
-const path_1 = tslib_1.__importDefault(require("path"));
-const fs_extra_1 = require("fs-extra");
-const common_1 = require("./common");
-function isWithinRoot(root, source) {
-    const relativeToRoot = path_1.default.relative(path_1.default.resolve(root), path_1.default.resolve(source));
-    return relativeToRoot === '' || (!relativeToRoot.startsWith('..') && !path_1.default.isAbsolute(relativeToRoot));
-}
-async function readPackageJSON(directory) {
-    try {
-        const packageJson = await (0, promises_1.readFile)(path_1.default.join(directory, 'package.json'), 'utf8');
-        return JSON.parse(packageJson);
-    }
-    catch (e) {
-        return null;
-    }
-}
-async function dependencyDir(moduleDir, dependency, root) {
-    for (let source = path_1.default.resolve(moduleDir); source !== path_1.default.dirname(source) && isWithinRoot(root, source); source = path_1.default.dirname(source)) {
-        const candidate = path_1.default.join(source, common_1.NODE_MODULES_DIR, dependency);
-        if ((0, fs_1.existsSync)(candidate)) {
-            return candidate;
-        }
-    }
-    return null;
-}
-exports.DEFAULT_COPY_DEPENDENCIES_OPTIONS = {
-    exclude: ['@forge/react', '@forge/bridge']
-};
-async function getProductionDependencies(moduleDir, options) {
-    const result = new Map();
-    await enumerateProductionDependencies(moduleDir, options ?? {}, moduleDir, result, new Set());
-    return result;
-}
-async function enumerateProductionDependencies(moduleDir, options, root, result, visited) {
-    const packageDef = await readPackageJSON(moduleDir);
-    if (!packageDef?.dependencies) {
-        return;
-    }
-    for (const dependency of Object.keys(packageDef.dependencies)) {
-        if (options.exclude?.includes(dependency)) {
-            continue;
-        }
-        const source = await dependencyDir(moduleDir, dependency, root);
-        if (source) {
-            if (!isWithinRoot(root, source)) {
-                continue;
-            }
-            const destination = path_1.default.relative(root, source);
-            if (visited.has(destination)) {
-                continue;
-            }
-            visited.add(destination);
-            for (const entry of await (0, promises_1.readdir)(source)) {
-                if (entry === common_1.NODE_MODULES_DIR) {
-                    continue;
-                }
-                result.set(path_1.default.join(destination, entry), path_1.default.join(source, entry));
-            }
-            await enumerateProductionDependencies(source, options, root, result, visited);
-        }
-    }
-}
-async function copyProductionDependencies(moduleDir, target, options) {
-    const dependencies = await getProductionDependencies(moduleDir, options);
-    for (const [destination, source] of dependencies.entries()) {
-        await (0, fs_extra_1.copy)(source, path_1.default.join(target, destination));
-    }
-}

package/out/typescript.d.ts

@@ -1,16 +0,0 @@
-import { ChildProcessByStdio } from 'child_process';
-import { Readable } from 'stream';
-import { Logger } from '@forge/cli-shared';
-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?: AdditionalOutputs): Promise<BundlerOutput>;
-    bundle(args: BundlerArgs): Promise<BundlerOutput>;
-    watch(args: BundlerWatchArgs, watch: BundlerWatch): Promise<BundlerWatchOutput>;
-}
-export {};
-//# sourceMappingURL=typescript.d.ts.map

package/out/typescript.d.ts.map

@@ -1 +0,0 @@
-{"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;AAUrE,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

@@ -1,142 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeScriptBundler = void 0;
-const tslib_1 = require("tslib");
-const fs_1 = require("fs");
-const path_1 = tslib_1.__importDefault(require("path"));
-const readline_1 = require("readline");
-const cross_spawn_1 = tslib_1.__importDefault(require("cross-spawn"));
-const cli_shared_1 = require("@forge/cli-shared");
-const manifest_1 = require("@forge/manifest");
-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");
-class TypeScriptBundler {
-    logger;
-    constructor(logger) {
-        this.logger = logger;
-    }
-    runTypeScript(args, outputDir) {
-        const processArgs = [];
-        processArgs.push('--project', args.appDirectory);
-        processArgs.push('--rootDir', path_1.default.join(args.appDirectory, manifest_1.SOURCE_DIRECTORY));
-        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');
-        if ((0, fs_1.existsSync)(appTsc)) {
-            tsc = appTsc;
-        }
-        return (0, cross_spawn_1.default)(tsc, processArgs, { stdio: ['ignore', 'pipe', 'inherit'] });
-    }
-    isListedFile(line) {
-        line = line.trim();
-        if (line.length === 0) {
-            return null;
-        }
-        if (!line.match(/^\/.+\.[cm]?[jt]sx?$/)) {
-            return null;
-        }
-        return line;
-    }
-    async getResult(args, outputDir, output, additionalOutputs) {
-        let metadata;
-        if (output) {
-            const files = new Set();
-            for (const line of output.split('\n')) {
-                const filePath = this.isListedFile(line);
-                if (filePath) {
-                    files.add(filePath);
-                }
-            }
-            metadata = await (0, metadata_1.getMetadata)(this.logger, args.appDirectory, files);
-        }
-        else {
-            metadata = (0, types_1.emptyMetadata)();
-        }
-        metadata.bundler = 'typescript';
-        return { outputDir, metadata, additionalOutputs };
-    }
-    async bundle(args) {
-        const outputDir = (0, common_1.getOutputDir)(args);
-        const additionalOutputs = await (0, dependencies_1.getProductionDependencies)(args.appDirectory, dependencies_1.DEFAULT_COPY_DEPENDENCIES_OPTIONS);
-        const compiler = this.runTypeScript(args, outputDir);
-        let output = '';
-        compiler.stdout.on('data', (data) => (output += data.toString()));
-        return new Promise((resolve, reject) => compiler.on('exit', async (code) => {
-            try {
-                if (code !== 0) {
-                    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, output, additionalOutputs);
-                resolve(result);
-            }
-            catch (e) {
-                reject(e);
-            }
-        }));
-    }
-    async watch(args, watch) {
-        const outputDir = (0, common_1.getOutputDir)(args);
-        await (0, dependencies_1.copyProductionDependencies)(args.appDirectory, outputDir, dependencies_1.DEFAULT_COPY_DEPENDENCIES_OPTIONS);
-        const compiler = this.runTypeScript(args, outputDir);
-        let isFirstRun = true;
-        const output = [];
-        return new Promise((resolve, reject) => {
-            compiler.on('exit', async () => {
-                reject(new cli_shared_1.BundlerTSError(text_1.Text.typescriptError(output)));
-            });
-            const outputLines = (0, readline_1.createInterface)(compiler.stdout);
-            outputLines.on('line', async (line) => {
-                if (/Starting (incremental )?compilation/.exec(line)) {
-                    if (!isFirstRun) {
-                        await watch.onBuildWillStart();
-                    }
-                    output.length = 0;
-                    return;
-                }
-                if (!line.includes('Watching for file changes.')) {
-                    line = line.trim();
-                    if (line) {
-                        output.push(line);
-                    }
-                    return;
-                }
-                try {
-                    const errors = Number(/Found (\d+) error/.exec(line)?.[1] ?? '0');
-                    if (errors) {
-                        throw new cli_shared_1.BundlerTSError(text_1.Text.typescriptError(output));
-                    }
-                    const result = await this.getResult(args, outputDir);
-                    if (isFirstRun) {
-                        isFirstRun = false;
-                        this.logger.info(cli_shared_1.LogColor.trace(args.successMessage));
-                        resolve({
-                            result,
-                            stop: async () => void compiler.kill()
-                        });
-                        return;
-                    }
-                    await watch.onBuildFinished(null, result);
-                }
-                catch (e) {
-                    if (isFirstRun) {
-                        isFirstRun = false;
-                        reject(e);
-                        return;
-                    }
-                    await watch.onBuildFinished(e);
-                }
-            });
-        });
-    }
-}
-exports.TypeScriptBundler = TypeScriptBundler;