@forge/bundler
7.2.37.3.0-next.0
−
Removed (6 files)
~
Modified (8 files)
Index: package/out/runtime.js
===================================================================
--- package/out/runtime.js
+++ package/out/runtime.js
@@ -11,9 +11,8 @@
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';
const NODE_RUNTIME_USE_LOCAL_WRAPPER_FILE = '__forge_use_local_wrapper.txt';
@@ -59,20 +58,8 @@
result.additionalOutputs = (0, types_1.mergeOutputs)(result.additionalOutputs, await getRuntimeArtifacts(this.wrapperProvider, args));
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;
static WATCH_DEBOUNCE_MS = 200;
@@ -127,26 +114,18 @@
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);
}
return new NodeBundler(this.logger, this.wrapperProvider);
@@ -157,7 +136,7 @@
async watch(args, watch) {
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);
}Index: package/out/text.js
===================================================================
--- package/out/text.js
+++ 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.'
};Index: package/package.json
===================================================================
--- package/package.json
+++ package/package.json
@@ -1,7 +1,7 @@
{
"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",
"main": "out/index.js",
@@ -20,18 +20,16 @@
"@babel/plugin-transform-optional-chaining": "^7.23.4",
"@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",
"ts-loader": "^9.5.2",
@@ -42,10 +40,8 @@
},
"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",
"@types/webpack-bundle-analyzer": "^4.7.0",
@@ -53,9 +49,8 @@
"@typescript-eslint/parser": "^5.62.0",
"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"
},Index: package/out/runtime.d.ts.map
===================================================================
--- package/out/runtime.d.ts.map
+++ package/out/runtime.d.ts.map
@@ -1,1 +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"}
\ No newline at end of file
+{"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"}
\ No newline at end of fileIndex: package/out/text.d.ts.map
===================================================================
--- package/out/text.d.ts.map
+++ package/out/text.d.ts.map
@@ -1,1 +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"}
\ No newline at end of file
+{"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"}
\ No newline at end of file File too large for inline diff
Index: package/out/runtime.d.ts
===================================================================
--- package/out/runtime.d.ts
+++ 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
\ No newline at end of fileIndex: package/out/text.d.ts
===================================================================
--- package/out/text.d.ts
+++ package/out/text.d.ts
@@ -2,9 +2,8 @@
genericBundlingError: (errors: string[]) => string;
typescriptError: (errors: string[]) => string;
noExecutableFile: string;
metadataFailed: (error: Error) => string;
- typescriptBundlerEAP: string;
manualBundlerPathRequired: string;
packagePathOnlySupportedForManualBundler: string;
};
//# sourceMappingURL=text.d.ts.map
\ No newline at end of file