@forge/bundler 4.21.1-next.9 → 4.22.0-next.16

package/CHANGELOG.md

@@ -1,5 +1,72 @@
 # @forge/bundler
 
+## 4.22.0-next.16
+
+### Minor Changes
+
+- 4b083be: Option to bundle applications using TypeScript
+
+### Patch Changes
+
+- Updated dependencies [4b083be]
+  - @forge/manifest@8.9.0-next.8
+  - @forge/cli-shared@6.8.0-next.15
+  - @forge/lint@5.7.3-next.16
+
+## 4.21.1-next.15
+
+### Patch Changes
+
+- Updated dependencies [7a83fd9]
+  - @forge/cli-shared@6.8.0-next.14
+  - @forge/lint@5.7.3-next.15
+
+## 4.21.1-next.14
+
+### Patch Changes
+
+- c57e34a: Fix bundling when handlers are defined in subdirectories
+- Updated dependencies [c57e34a]
+  - @forge/cli-shared@6.8.0-next.13
+  - @forge/lint@5.7.3-next.14
+
+## 4.21.1-next.13
+
+### Patch Changes
+
+- Updated dependencies [7243788]
+  - @forge/cli-shared@6.8.0-next.12
+  - @forge/manifest@8.9.0-next.7
+  - @forge/lint@5.7.3-next.13
+
+## 4.21.1-next.12
+
+### Patch Changes
+
+- 336f74f: Support serving i18n resources while using `forge tunnel`
+- Updated dependencies [04ab98e]
+- Updated dependencies [336f74f]
+  - @forge/api@5.2.0-next.0
+  - @forge/cli-shared@6.8.0-next.11
+  - @forge/i18n@0.0.5-next.0
+  - @forge/lint@5.7.3-next.12
+  - @forge/manifest@8.9.0-next.6
+
+## 4.21.1-next.11
+
+### Patch Changes
+
+- @forge/lint@5.7.3-next.11
+
+## 4.21.1-next.10
+
+### Patch Changes
+
+- Updated dependencies [de0bf46]
+  - @forge/manifest@8.9.0-next.5
+  - @forge/cli-shared@6.8.0-next.10
+  - @forge/lint@5.7.3-next.10
+
 ## 4.21.1-next.9
 
 ### Patch Changes

package/out/dependencies.d.ts

@@ -0,0 +1,6 @@
+declare type CopyDepsOptions = {
+    exclude?: 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

@@ -0,0 +1 @@
+{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../src/dependencies.ts"],"names":[],"mappings":"AAwDA,aAAK,eAAe,GAAG;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAaF,wBAAsB,0BAA0B,CAC9C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,IAAI,CAAC,CAuBf"}

package/out/dependencies.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.copyProductionDependencies = void 0;
+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");
+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) {
+    for (let source = moduleDir; source !== path_1.default.dirname(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;
+}
+function transplantDir(source, destination, directory) {
+    const relative = path_1.default.relative(source, directory);
+    return path_1.default.join(destination, relative);
+}
+async function copyProductionDependencies(moduleDir, target, options) {
+    const packageDef = await readPackageJSON(moduleDir);
+    if (!packageDef) {
+        return;
+    }
+    const exclude = options?.exclude ?? [];
+    for (const dependency of Object.keys(packageDef.dependencies ?? {})) {
+        if (exclude.includes(dependency)) {
+            continue;
+        }
+        const source = await dependencyDir(moduleDir, dependency);
+        if (source) {
+            const destination = transplantDir(moduleDir, target, source);
+            if ((0, fs_1.existsSync)(destination)) {
+                continue;
+            }
+            await (0, fs_extra_1.copy)(source, destination, {
+                filter: (src) => path_1.default.basename(src) !== common_1.NODE_MODULES_DIR
+            });
+            await copyProductionDependencies(source, destination, options);
+        }
+    }
+}
+exports.copyProductionDependencies = copyProductionDependencies;

package/out/runtime.d.ts

@@ -1,17 +1,11 @@
 import { ConfigReader, StatsigReader } from '@forge/cli-shared';
-import { BundleLogger, BundlerArgs } from './types';
+import { BundleLogger, Bundler, BundlerArgs } from './types';
 import { ConfigWithOutput, WebpackBundler } from './webpack';
 import { WrapperProvider } from './wrapper-provider';
 export declare class SandboxBundler extends WebpackBundler {
     constructor(logger: BundleLogger);
     getConfig(args: BundlerArgs): Promise<ConfigWithOutput>;
 }
-declare class NodeBundler extends WebpackBundler {
-    private readonly wrapperProvider;
-    private readonly statsigReader;
-    constructor(logger: BundleLogger, wrapperProvider: WrapperProvider, statsigReader: StatsigReader);
-    getConfig(args: BundlerArgs): Promise<ConfigWithOutput>;
-}
-export declare function getNodeBundler(logger: BundleLogger, wrapperProvider: WrapperProvider, configReader: ConfigReader, statsigReader: StatsigReader): NodeBundler;
-export {};
+export declare function userCodePath(entryKey: string): string;
+export declare function getNodeBundler(logger: BundleLogger, wrapperProvider: WrapperProvider, configReader: ConfigReader, statsigReader: StatsigReader): 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":"AAGA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIhE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAc,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAiB,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEpE,qBAAa,cAAe,SAAQ,cAAc;gBACpC,MAAM,EAAE,YAAY;IAI1B,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAG9D;AAkDD,cAAM,WAAY,SAAQ,cAAc;IAGpC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAF9B,MAAM,EAAE,YAAY,EACH,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa;IAKzC,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAmD9D;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAE,aAAa,GAC3B,WAAW,CAKb"}
+{"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;AAoBD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAErD;AA6KD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAE,aAAa,GAC3B,OAAO,CAET"}

package/out/runtime.js

@@ -1,12 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeBundler = exports.SandboxBundler = void 0;
+exports.getNodeBundler = exports.userCodePath = exports.SandboxBundler = void 0;
 const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
+const promises_1 = tslib_1.__importDefault(require("fs/promises"));
 const webpack_1 = tslib_1.__importDefault(require("webpack"));
 var RawSource = webpack_1.default.sources.RawSource;
+const cli_shared_1 = require("@forge/cli-shared");
 const common_1 = require("./config/common");
 const sandbox_1 = require("./config/sandbox");
+const typescript_1 = require("./typescript");
 const webpack_2 = require("./webpack");
+const i18n_1 = require("@forge/i18n");
 class SandboxBundler extends webpack_2.WebpackBundler {
     constructor(logger) {
         super(logger);
@@ -20,6 +25,10 @@ const NODE_RUNTIME_CODE_FILE = '__forge__.js';
 const NODE_RUNTIME_BACKUP_WRAPPER_FILE = '__forge_wrapper__.cjs';
 const NODE_RUNTIME_VERSION_FILE = 'runtime.json';
 const NODE_WEBPACK_USER_CODE_DIR = 'bundled';
+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) {
     const wrapper = await provider.getNodeRuntimeWrapper();
     const loader = await provider.getNodeRuntimeLoader();
@@ -41,6 +50,12 @@ async function emitWrapperFiles(provider, entrypoints, emit, useSingleWrapper) {
     }
     await emit(NODE_RUNTIME_VERSION_FILE, JSON.stringify({ version: entrypointScript.version }, null, 2));
 }
+async function emitI18nFiles(i18nResourceBundle, emit) {
+    await Promise.all((0, cli_shared_1.listFilesInI18nResourceBundle)(i18nResourceBundle).map(async ([fileName, filePath]) => {
+        const fileContent = await promises_1.default.readFile(filePath);
+        await emit(path_1.default.join(i18n_1.I18N_BUNDLE_FOLDER_NAME, fileName), fileContent.toString());
+    }));
+}
 class NodeBundler extends webpack_2.WebpackBundler {
     wrapperProvider;
     statsigReader;
@@ -52,11 +67,7 @@ class NodeBundler extends webpack_2.WebpackBundler {
     async getConfig(args) {
         const webpackConfig = (0, common_1.getCommonWebpackConfig)(args);
         if (!(await this.statsigReader.packageSingleWrapper())) {
-            const newEntries = {};
-            for (const [entryKey, entryPath] of Object.entries(webpackConfig.entry)) {
-                newEntries[`${NODE_WEBPACK_USER_CODE_DIR}/${entryKey}`] = entryPath;
-            }
-            webpackConfig.entry = newEntries;
+            webpackConfig.entry = Object.fromEntries(Object.entries(webpackConfig.entry).map(([entryKey, entryPath]) => [userCodePath(entryKey), entryPath]));
         }
         webpackConfig.target = 'node18';
         webpackConfig.output.filename = '[name].cjs';
@@ -69,13 +80,67 @@ class NodeBundler extends webpack_2.WebpackBundler {
         });
         webpackConfig.plugins.push({
             apply: (compiler) => {
-                compiler.hooks.make.tapPromise('AfterEmitPlugin', async (compilation) => await emitWrapperFiles(this.wrapperProvider, args.entryPoints, async (name, contents) => compilation.emitAsset(name, new RawSource(contents)), await this.statsigReader.packageSingleWrapper()));
+                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());
+                    if (args.i18nResourceBundle) {
+                        await emitI18nFiles(args.i18nResourceBundle, emit);
+                    }
+                });
             }
         });
         return webpackConfig;
     }
 }
+class TypeScriptNodeBundler extends typescript_1.TypeScriptBundler {
+    wrapperProvider;
+    statsigReader;
+    constructor(logger, wrapperProvider, statsigReader) {
+        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);
+        if (args.i18nResourceBundle) {
+            await emitI18nFiles(args.i18nResourceBundle, emit);
+        }
+        return result;
+    }
+}
+class ConfigBundler {
+    configReader;
+    bundlers;
+    constructor(logger, wrapperProvider, configReader, statsigReader) {
+        this.configReader = configReader;
+        this.bundlers = new Map([
+            ['webpack', new NodeBundler(logger, wrapperProvider, statsigReader)],
+            ['typescript', new TypeScriptNodeBundler(logger, wrapperProvider, statsigReader)]
+        ]);
+    }
+    async getBundlerType() {
+        return (await this.configReader.readConfig()).app.package?.bundler ?? 'webpack';
+    }
+    async getBundler() {
+        return this.bundlers.get(await this.getBundlerType());
+    }
+    async bundle(args) {
+        return (await this.getBundler()).bundle(args);
+    }
+    async watch(args, watch) {
+        return (await this.getBundler()).watch(args, watch);
+    }
+}
 function getNodeBundler(logger, wrapperProvider, configReader, statsigReader) {
-    return new NodeBundler(logger, wrapperProvider, statsigReader);
+    return new ConfigBundler(logger, wrapperProvider, configReader, statsigReader);
 }
 exports.getNodeBundler = getNodeBundler;

package/out/types.d.ts

@@ -1,4 +1,4 @@
-import { Logger, UserError } from '@forge/cli-shared';
+import { I18nResourceBundle, Logger, UserError } from '@forge/cli-shared';
 import { Translations } from '@forge/manifest';
 export declare type BundlerMetadata = {
     modules?: string[];
@@ -16,8 +16,9 @@ export declare type EntryPoint = {
 export declare type BundlerArgs = {
     appDirectory: string;
     entryPoints: EntryPoint[];
-    i18nConfig?: Translations;
     watchMode?: BundlerWatchMode;
+    i18nConfig?: Translations;
+    i18nResourceBundle?: I18nResourceBundle;
 };
 export declare type BundlerWatchArgs = BundlerArgs & Required<Pick<BundlerArgs, 'watchMode'>> & {
     successMessage: string;

package/out/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,oBAAY,eAAe,GAAG;IAC5B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF,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,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,SAAS,CAAC,EAAE,gBAAgB,CAAC;CAC9B,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"}
+{"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;CACpB,CAAC;AAEF,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"}

package/out/typescript.d.ts

@@ -0,0 +1,16 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { ChildProcessByStdio } from 'child_process';
+import { Readable } from 'stream';
+import { Bundler, BundleLogger, BundlerOutput, BundlerArgs, BundlerWatch, BundlerWatchArgs, BundlerWatchOutput } from './types';
+declare type OutputProcess = ChildProcessByStdio<null, Readable, null>;
+export declare abstract class TypeScriptBundler implements Bundler {
+    protected readonly logger: BundleLogger;
+    constructor(logger: BundleLogger);
+    protected runTypeScript(args: BundlerArgs, outputDir: string): OutputProcess;
+    protected getResult(args: BundlerArgs, outputDir: string): 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

@@ -0,0 +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,EACnB,MAAM,SAAS,CAAC;AAEjB,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;cAqB5D,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAKjF,MAAM,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAyBjD,KAAK,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA2DtF"}

package/out/typescript.js

@@ -0,0 +1,110 @@
+"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 common_1 = require("./common");
+const dependencies_1 = require("./dependencies");
+const text_1 = require("./text");
+const COPY_DEPENDENCIES_OPTIONS = {
+    exclude: ['@forge/react', '@forge/bridge']
+};
+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, common_1.SOURCE_DIR));
+        if (args.watchMode) {
+            processArgs.push('--watch');
+        }
+        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'] });
+    }
+    async getResult(args, outputDir) {
+        return { outputDir, metadata: {} };
+    }
+    async bundle(args) {
+        const outputDir = (0, common_1.getOutputDir)(args);
+        await (0, dependencies_1.copyProductionDependencies)(args.appDirectory, outputDir, COPY_DEPENDENCIES_OPTIONS);
+        const compiler = this.runTypeScript(args, outputDir);
+        const output = [];
+        compiler.stdout.on('data', (data) => output.push(data));
+        return new Promise((resolve, reject) => compiler.on('exit', async (code) => {
+            try {
+                if (code !== 0) {
+                    throw new cli_shared_1.BundlerTSError(text_1.Text.typescriptError(output));
+                }
+                const result = await this.getResult(args, outputDir);
+                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, 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: () => compiler.kill() });
+                        return;
+                    }
+                    await watch.onBuildFinished(null, result);
+                }
+                catch (e) {
+                    if (isFirstRun) {
+                        isFirstRun = false;
+                        reject(e);
+                        return;
+                    }
+                    await watch.onBuildFinished(e);
+                }
+            });
+        });
+    }
+}
+exports.TypeScriptBundler = TypeScriptBundler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "4.21.1-next.9",
+  "version": "4.22.0-next.16",
   "description": "Default bundler for Forge apps",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Atlassian",
@@ -19,12 +19,12 @@
     "@babel/plugin-transform-optional-chaining": "^7.23.4",
     "@babel/plugin-transform-react-jsx": "^7.23.4",
     "@babel/preset-typescript": "^7.23.3",
-    "@forge/api": "5.1.1",
+    "@forge/api": "5.2.0-next.0",
     "@forge/babel-plugin-transform-ui": "1.1.21",
-    "@forge/cli-shared": "6.8.0-next.9",
-    "@forge/i18n": "0.0.4",
-    "@forge/lint": "5.7.3-next.9",
-    "@forge/manifest": "8.9.0-next.4",
+    "@forge/cli-shared": "6.8.0-next.15",
+    "@forge/i18n": "0.0.5-next.0",
+    "@forge/lint": "5.7.3-next.16",
+    "@forge/manifest": "8.9.0-next.8",
     "@forge/util": "1.4.8",
     "assert": "^2.1.0",
     "babel-loader": "^8.3.0",
@@ -33,8 +33,10 @@
     "chalk": "^4.1.2",
     "cheerio": "^0.22.0",
     "console-browserify": "^1.2.0",
+    "cross-spawn": "^7.0.5",
     "crypto-browserify": "^3.12.0",
     "events": "^3.3.0",
+    "fs-extra": "^11.2.0",
     "headers-utils": "^3.0.2",
     "html-webpack-plugin": "^5.6.0",
     "inherits": "^2.0.4",
@@ -62,6 +64,8 @@
   "devDependencies": {
     "@atlassian/xen-test-util": "^4.2.0",
     "@forge/runtime": "5.10.7",
+    "@types/cross-spawn": "^6.0.6",
+    "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.12",
     "@types/node": "14.18.63",
     "@types/react": "^18.2.64",
@@ -72,6 +76,7 @@
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
+    "glob": "^10.3.10",
     "jest-matcher-specific-error": "^1.0.0",
     "prettier": "3.2.5"
   },