@forge/bundler 5.0.1-next.4 → 5.0.1-next.5

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @forge/bundler
 
+## 5.0.1-next.5
+
+### Patch Changes
+
+- 75b7732: Remove feature flag for single wrapper packaging
+- 64befbb: Refactor runtime version manifest check into a linter
+- Updated dependencies [dd7cad7]
+- Updated dependencies [75b7732]
+- Updated dependencies [64befbb]
+  - @forge/lint@5.9.0-next.5
+  - @forge/cli-shared@7.1.0-next.5
+  - @forge/manifest@9.5.0-next.4
+
 ## 5.0.1-next.4
 
 ### Patch Changes

package/out/lint.d.ts

@@ -1,4 +1,4 @@
-import { FileSystemReader, FileSystemWriter } from '@forge/cli-shared';
+import { FileSystemReader, FileSystemWriter, StatsigService } from '@forge/cli-shared';
 import { LintLogger } from '@forge/lint';
-export declare function runLinter(logger?: LintLogger, fileSystemReader?: FileSystemReader, fileSystemWriter?: FileSystemWriter): Promise<void>;
+export declare function runLinter(statsigService: StatsigService, logger?: LintLogger, fileSystemReader?: FileSystemReader, fileSystemWriter?: FileSystemWriter): Promise<void>;
 //# sourceMappingURL=lint.d.ts.map

package/out/lint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,gBAAgB,EAAwB,gBAAgB,EAAsB,MAAM,mBAAmB,CAAC;AACvH,OAAO,EAA2B,UAAU,EAAE,MAAM,aAAa,CAAC;AAIlE,wBAAsB,SAAS,CAE7B,MAAM,GAAE,UAAkC,EAC1C,gBAAgB,mBAAyB,EACzC,gBAAgB,mBAAyB,GACxC,OAAO,CAAC,IAAI,CAAC,CA+Bf"}
+{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,gBAAgB,EAGhB,gBAAgB,EAEhB,cAAc,EACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAA2B,UAAU,EAAE,MAAM,aAAa,CAAC;AAIlE,wBAAsB,SAAS,CAC7B,cAAc,EAAE,cAAc,EAE9B,MAAM,GAAE,UAAkC,EAC1C,gBAAgB,mBAAyB,EACzC,gBAAgB,mBAAyB,GACxC,OAAO,CAAC,IAAI,CAAC,CAqCf"}

package/out/lint.js

@@ -6,7 +6,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const cli_shared_1 = require("@forge/cli-shared");
 const lint_1 = require("@forge/lint");
 const common_1 = require("./common");
-async function runLinter(logger = { info: console.log }, fileSystemReader = new cli_shared_1.FileSystemReader(), fileSystemWriter = new cli_shared_1.FileSystemWriter()) {
+async function runLinter(statsigService, logger = { info: console.log }, fileSystemReader = new cli_shared_1.FileSystemReader(), fileSystemWriter = new cli_shared_1.FileSystemWriter()) {
     logger.info(`\n${cli_shared_1.Text.tunnel.preBundleTask(cli_shared_1.Text.lint.running)}`);
     const exclude = [...(await (0, cli_shared_1.listGitIgnoreFiles)(fileSystemReader)), '.git', common_1.NODE_MODULES_DIR];
     const configFile = new cli_shared_1.ConfigFile(fileSystemReader, fileSystemWriter);
@@ -19,7 +19,7 @@ async function runLinter(logger = { info: console.log }, fileSystemReader = new
     ]);
     const csuikFilesToLint = csuikFilesByDirectory.reduce((allFiles, directoryFiles) => allFiles.concat(directoryFiles), []);
     try {
-        const lintResults = await (0, lint_1.lint)([...filesToLint, ...csuikFilesToLint], manifest, 'development', logger);
+        const lintResults = await (0, lint_1.lint)([...filesToLint, ...csuikFilesToLint], manifest, 'development', logger, statsigService);
         if (lintResults.some((result) => result.size())) {
             logger.info('');
             (0, lint_1.reportLintResults)(logger, lintResults);

package/out/runtime.d.ts

@@ -1,4 +1,4 @@
-import { ConfigReader, StatsigReader } from '@forge/cli-shared';
+import { ConfigReader } from '@forge/cli-shared';
 import { BundleLogger, Bundler, BundlerArgs } from './types';
 import { ConfigWithOutput, WebpackBundler } from './webpack';
 import { WrapperProvider } from './wrapper-provider';
@@ -8,5 +8,5 @@ export declare class SandboxBundler extends WebpackBundler {
 }
 export declare const NODE_RUNTIME_CODE_FILE = "__forge__.cjs";
 export declare function userCodePath(entryKey: string): string;
-export declare function getNodeBundler(logger: BundleLogger, wrapperProvider: WrapperProvider, configReader: ConfigReader, statsigReader: StatsigReader): Bundler;
+export declare function getNodeBundler(logger: BundleLogger, 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":"AAMA,OAAO,EACL,YAAY,EAGZ,aAAa,EAEd,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EACL,YAAY,EACZ,OAAO,EACP,WAAW,EAMZ,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAiB,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGpE,qBAAa,cAAe,SAAQ,cAAc;gBACpC,MAAM,EAAE,YAAY;IAI1B,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAG9D;AAKD,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AAoBtD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAErD;AAmLD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAE,aAAa,GAC3B,OAAO,CAET"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAqD,MAAM,mBAAmB,CAAC;AAIpG,OAAO,EACL,YAAY,EACZ,OAAO,EACP,WAAW,EAKZ,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAiB,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGpE,qBAAa,cAAe,SAAQ,cAAc;gBACpC,MAAM,EAAE,YAAY;IAI1B,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAG9D;AAKD,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"}

package/out/runtime.js

@@ -30,7 +30,7 @@ function userCodePath(entryKey) {
     return path_1.default.join(path_1.default.dirname(entryKey), NODE_WEBPACK_USER_CODE_DIR, path_1.default.basename(entryKey));
 }
 exports.userCodePath = userCodePath;
-async function emitWrapperFiles(provider, entrypoints, emit, useSingleWrapper) {
+async function emitWrapperFiles(provider, emit) {
     const wrapper = await provider.getNodeRuntimeWrapper();
     const loader = await provider.getNodeRuntimeLoader();
     let entrypointScript;
@@ -41,14 +41,7 @@ async function emitWrapperFiles(provider, entrypoints, emit, useSingleWrapper) {
     else {
         entrypointScript = wrapper;
     }
-    if (useSingleWrapper) {
-        await emit(exports.NODE_RUNTIME_CODE_FILE, entrypointScript.script);
-    }
-    else {
-        for (const entrypoint of entrypoints) {
-            await emit(`${entrypoint.name}.cjs`, entrypointScript.script);
-        }
-    }
+    await emit(exports.NODE_RUNTIME_CODE_FILE, entrypointScript.script);
     if (process.env.FORGE_RUNTIME_PATH) {
         await emit(NODE_RUNTIME_USE_LOCAL_WRAPPER_FILE, 'Local wrapper used');
     }
@@ -62,17 +55,12 @@ async function emitI18nFiles(i18nResourceBundle, emit) {
 }
 class NodeBundler extends webpack_2.WebpackBundler {
     wrapperProvider;
-    statsigReader;
-    constructor(logger, wrapperProvider, statsigReader) {
+    constructor(logger, wrapperProvider) {
         super(logger);
         this.wrapperProvider = wrapperProvider;
-        this.statsigReader = statsigReader;
     }
     async getConfig(args) {
         const webpackConfig = (0, common_1.getCommonWebpackConfig)(args);
-        if (!(await this.statsigReader.packageSingleWrapper())) {
-            webpackConfig.entry = Object.fromEntries(Object.entries(webpackConfig.entry).map(([entryKey, entryPath]) => [userCodePath(entryKey), entryPath]));
-        }
         webpackConfig.target = 'node18';
         webpackConfig.output.filename = '[name].cjs';
         webpackConfig.name = 'node-runtime';
@@ -86,7 +74,7 @@ class NodeBundler extends webpack_2.WebpackBundler {
             apply: (compiler) => {
                 compiler.hooks.make.tapPromise('AfterEmitPlugin', async (compilation) => {
                     const emit = async (name, contents) => compilation.emitAsset(name, new RawSource(contents));
-                    await emitWrapperFiles(this.wrapperProvider, args.entryPoints, emit, await this.statsigReader.packageSingleWrapper());
+                    await emitWrapperFiles(this.wrapperProvider, emit);
                     if (args.i18nResourceBundle) {
                         await emitI18nFiles(args.i18nResourceBundle, emit);
                     }
@@ -98,23 +86,18 @@ class NodeBundler extends webpack_2.WebpackBundler {
 }
 class TypeScriptNodeBundler extends typescript_1.TypeScriptBundler {
     wrapperProvider;
-    statsigReader;
-    constructor(logger, wrapperProvider, statsigReader) {
+    constructor(logger, wrapperProvider) {
         super(logger);
         this.wrapperProvider = wrapperProvider;
-        this.statsigReader = statsigReader;
     }
     async getResult(args, outputDir) {
-        if (!(await this.statsigReader.packageSingleWrapper())) {
-            throw new cli_shared_1.UserError('Single wrapper feature flag must be enabled to use the TypeScript bundler.');
-        }
         const result = await super.getResult(args, outputDir);
         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 });
             await promises_1.default.writeFile(outputPath, contents);
         };
-        await emitWrapperFiles(this.wrapperProvider, args.entryPoints, emit, true);
+        await emitWrapperFiles(this.wrapperProvider, emit);
         if (args.i18nResourceBundle) {
             await emitI18nFiles(args.i18nResourceBundle, emit);
         }
@@ -124,11 +107,11 @@ class TypeScriptNodeBundler extends typescript_1.TypeScriptBundler {
 class ConfigBundler {
     configReader;
     bundlers;
-    constructor(logger, wrapperProvider, configReader, statsigReader) {
+    constructor(logger, wrapperProvider, configReader) {
         this.configReader = configReader;
         this.bundlers = new Map([
-            ['webpack', new NodeBundler(logger, wrapperProvider, statsigReader)],
-            ['typescript', new TypeScriptNodeBundler(logger, wrapperProvider, statsigReader)]
+            ['webpack', new NodeBundler(logger, wrapperProvider)],
+            ['typescript', new TypeScriptNodeBundler(logger, wrapperProvider)]
         ]);
     }
     async getBundlerType() {
@@ -144,7 +127,7 @@ class ConfigBundler {
         return (await this.getBundler()).watch(args, watch);
     }
 }
-function getNodeBundler(logger, wrapperProvider, configReader, statsigReader) {
-    return new ConfigBundler(logger, wrapperProvider, configReader, statsigReader);
+function getNodeBundler(logger, wrapperProvider, configReader) {
+    return new ConfigBundler(logger, wrapperProvider, configReader);
 }
 exports.getNodeBundler = getNodeBundler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "5.0.1-next.4",
+  "version": "5.0.1-next.5",
   "description": "Default bundler for Forge apps",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Atlassian",
@@ -19,10 +19,10 @@
     "@babel/plugin-transform-optional-chaining": "^7.23.4",
     "@babel/plugin-transform-react-jsx": "^7.23.4",
     "@forge/api": "5.3.0",
-    "@forge/cli-shared": "7.1.0-next.4",
+    "@forge/cli-shared": "7.1.0-next.5",
     "@forge/i18n": "0.0.6",
-    "@forge/lint": "5.9.0-next.4",
-    "@forge/manifest": "9.5.0-next.3",
+    "@forge/lint": "5.9.0-next.5",
+    "@forge/manifest": "9.5.0-next.4",
     "@forge/util": "1.4.9",
     "assert": "^2.1.0",
     "babel-loader": "^8.3.0",