@forge/bundler 7.0.2-next.1 → 7.0.2-next.11

package/CHANGELOG.md

@@ -1,5 +1,90 @@
 # @forge/bundler
 
+## 7.0.2-next.11
+
+### Patch Changes
+
+- f408181: Reject dependencies outside application directory
+- Updated dependencies [f408181]
+  - @forge/cli-shared@9.2.0-next.10
+  - @forge/lint@6.0.2-next.11
+
+## 7.0.2-next.10
+
+### Patch Changes
+
+- Updated dependencies [2b30ef8]
+  - @forge/manifest@13.2.0-next.5
+  - @forge/cli-shared@9.2.0-next.9
+  - @forge/lint@6.0.2-next.10
+
+## 7.0.2-next.9
+
+### Patch Changes
+
+- Updated dependencies [5abe69e]
+  - @forge/cli-shared@9.2.0-next.8
+  - @forge/manifest@13.2.0-next.4
+  - @forge/lint@6.0.2-next.9
+
+## 7.0.2-next.8
+
+### Patch Changes
+
+- Updated dependencies [8826ca3]
+- Updated dependencies [c67b720]
+  - @forge/cli-shared@9.2.0-next.7
+  - @forge/manifest@13.2.0-next.3
+  - @forge/lint@6.0.2-next.8
+
+## 7.0.2-next.7
+
+### Patch Changes
+
+- @forge/lint@6.0.2-next.7
+
+## 7.0.2-next.6
+
+### Patch Changes
+
+- 6e5b5a4: Better interface for packaging the runtime code
+- Updated dependencies [6e5b5a4]
+  - @forge/cli-shared@9.2.0-next.6
+  - @forge/lint@6.0.2-next.6
+
+## 7.0.2-next.5
+
+### Patch Changes
+
+- Updated dependencies [d415c89]
+  - @forge/cli-shared@9.2.0-next.5
+  - @forge/lint@6.0.2-next.5
+
+## 7.0.2-next.4
+
+### Patch Changes
+
+- Updated dependencies [903d6c1]
+  - @forge/cli-shared@9.2.0-next.4
+  - @forge/lint@6.0.2-next.4
+
+## 7.0.2-next.3
+
+### Patch Changes
+
+- Updated dependencies [757223b]
+  - @forge/cli-shared@9.2.0-next.3
+  - @forge/lint@6.0.2-next.3
+
+## 7.0.2-next.2
+
+### Patch Changes
+
+- Updated dependencies [7195f29]
+  - @forge/manifest@13.1.1-next.2
+  - @forge/cli-shared@9.1.1-next.2
+  - @forge/lint@6.0.2-next.2
+
 ## 7.0.2-next.1
 
 ### Patch Changes

package/out/dependencies.d.ts

@@ -1,6 +1,10 @@
 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 +1 @@
-{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../src/dependencies.ts"],"names":[],"mappings":"AAwDA,KAAK,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"}
+{"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,5 +1,7 @@
 "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");
@@ -7,6 +9,10 @@ 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');
@@ -16,8 +22,8 @@ async function readPackageJSON(directory) {
         return null;
     }
 }
-async function dependencyDir(moduleDir, dependency) {
-    for (let source = moduleDir; source !== path_1.default.dirname(source); source = path_1.default.dirname(source)) {
+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;
@@ -25,30 +31,46 @@ async function dependencyDir(moduleDir, dependency) {
     }
     return null;
 }
-function transplantDir(source, destination, directory) {
-    const relative = path_1.default.relative(source, directory);
-    return path_1.default.join(destination, relative);
+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 copyProductionDependencies(moduleDir, target, options) {
+async function enumerateProductionDependencies(moduleDir, options, root, result, visited) {
     const packageDef = await readPackageJSON(moduleDir);
-    if (!packageDef) {
+    if (!packageDef?.dependencies) {
         return;
     }
-    const exclude = options?.exclude ?? [];
-    for (const dependency of Object.keys(packageDef.dependencies ?? {})) {
-        if (exclude.includes(dependency)) {
+    for (const dependency of Object.keys(packageDef.dependencies)) {
+        if (options.exclude?.includes(dependency)) {
             continue;
         }
-        const source = await dependencyDir(moduleDir, dependency);
+        const source = await dependencyDir(moduleDir, dependency, root);
         if (source) {
-            const destination = transplantDir(moduleDir, target, source);
-            if ((0, fs_1.existsSync)(destination)) {
+            if (!isWithinRoot(root, source)) {
+                continue;
+            }
+            const destination = path_1.default.relative(root, source);
+            if (visited.has(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);
+            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/runtime.d.ts

@@ -2,6 +2,5 @@ import { ConfigReader, Logger, StatsigService } from '@forge/cli-shared';
 import { Bundler } from './types';
 import { WrapperProvider } from './wrapper-provider';
 export declare const NODE_RUNTIME_CODE_FILE = "__forge__.cjs";
-export declare function userCodePath(entryKey: string): string;
 export declare function getNodeBundler(logger: Logger, wrapperProvider: WrapperProvider, configReader: ConfigReader, statsigService: StatsigService): 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,EAEZ,MAAM,EAEN,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAI3B,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;AA6JD,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":"AAMA,OAAO,EACL,YAAY,EAEZ,MAAM,EAEN,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,OAAO,EAAkF,MAAM,SAAS,CAAC;AAGlH,OAAO,EAAiB,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAMpE,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AAkLtD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAC7B,OAAO,CAET"}

package/out/runtime.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NODE_RUNTIME_CODE_FILE = void 0;
-exports.userCodePath = userCodePath;
 exports.getNodeBundler = getNodeBundler;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -18,10 +17,6 @@ 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';
 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));
-}
 async function emitWrapperFiles(provider, emit) {
     const wrapper = await provider.getNodeRuntimeWrapper();
     const loader = await provider.getNodeRuntimeLoader();
@@ -82,8 +77,8 @@ class TypeScriptNodeBundler extends typescript_1.TypeScriptBundler {
         super(logger);
         this.wrapperProvider = wrapperProvider;
     }
-    async getResult(args, outputDir, output) {
-        const result = await super.getResult(args, outputDir, output);
+    async getResult(args, outputDir, output, additionalOutputs) {
+        const result = await super.getResult(args, outputDir, output, additionalOutputs);
         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 });

package/out/types.d.ts

@@ -14,6 +14,7 @@ export declare function emptyMetadata(): BundlerMetadata;
 export declare function mergeMetadata(metadata1: BundlerMetadata, metadata2: BundlerMetadata): BundlerMetadata;
 export interface BundlerOutput {
     outputDir: string;
+    additionalOutputs?: Map<string, string>;
     metadata?: BundlerMetadata;
 }
 export type BundlerWatchMode = 'watch' | 'debug';

package/out/types.d.ts.map

@@ -1 +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,MAAM,MAAM,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;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,wBAAgB,aAAa,IAAI,eAAe,CAS/C;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,EAAE,eAAe,GAAG,eAAe,CAarG;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B;AAED,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,OAAO,CAAC;AAEjD,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,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,MAAM,MAAM,gBAAgB,GAAG,WAAW,GACxC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,GAAG;IACzC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEJ,MAAM,MAAM,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,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAAG;IAChD,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,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,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,MAAM,MAAM,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;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,wBAAgB,aAAa,IAAI,eAAe,CAS/C;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,EAAE,eAAe,GAAG,eAAe,CAarG;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAKlB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B;AAED,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,OAAO,CAAC;AAEjD,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,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,MAAM,MAAM,gBAAgB,GAAG,WAAW,GACxC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,GAAG;IACzC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEJ,MAAM,MAAM,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,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAAG;IAChD,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,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

@@ -8,7 +8,7 @@ export declare abstract class TypeScriptBundler implements Bundler {
     constructor(logger: Logger);
     protected runTypeScript(args: BundlerArgs, outputDir: string): OutputProcess;
     protected isListedFile(line: string): string | null;
-    protected getResult(args: BundlerArgs, outputDir: string, output?: string): Promise<BundlerOutput>;
+    protected getResult(args: BundlerArgs, outputDir: string, output?: string, additionalOutputs?: Map<string, string>): Promise<BundlerOutput>;
     bundle(args: BundlerArgs): Promise<BundlerOutput>;
     watch(args: BundlerWatchArgs, watch: BundlerWatch): Promise<BundlerWatchOutput>;
 }

package/out/typescript.d.ts.map

@@ -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;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,KAAK,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;cAWnC,SAAS,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAkBlG,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"}
+{"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;AASrE,OAAO,EACL,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,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,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;CA2DtF"}

package/out/typescript.js

@@ -12,9 +12,6 @@ const dependencies_1 = require("./dependencies");
 const text_1 = require("./text");
 const types_1 = require("./types");
 const metadata_1 = require("./metadata");
-const COPY_DEPENDENCIES_OPTIONS = {
-    exclude: ['@forge/react', '@forge/bridge']
-};
 class TypeScriptBundler {
     logger;
     constructor(logger) {
@@ -48,7 +45,7 @@ class TypeScriptBundler {
         }
         return line;
     }
-    async getResult(args, outputDir, output) {
+    async getResult(args, outputDir, output, additionalOutputs) {
         let metadata;
         if (output) {
             const files = new Set();
@@ -64,11 +61,11 @@ class TypeScriptBundler {
             metadata = (0, types_1.emptyMetadata)();
         }
         metadata.bundler = 'typescript';
-        return { outputDir, metadata };
+        return { outputDir, metadata, additionalOutputs };
     }
     async bundle(args) {
         const outputDir = (0, common_1.getOutputDir)(args);
-        await (0, dependencies_1.copyProductionDependencies)(args.appDirectory, outputDir, COPY_DEPENDENCIES_OPTIONS);
+        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()));
@@ -78,7 +75,7 @@ class TypeScriptBundler {
                     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);
+                const result = await this.getResult(args, outputDir, output, additionalOutputs);
                 resolve(result);
             }
             catch (e) {
@@ -88,7 +85,7 @@ class TypeScriptBundler {
     }
     async watch(args, watch) {
         const outputDir = (0, common_1.getOutputDir)(args);
-        await (0, dependencies_1.copyProductionDependencies)(args.appDirectory, outputDir, COPY_DEPENDENCIES_OPTIONS);
+        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 = [];

package/out/wrapper-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrapper-provider.d.ts","sourceRoot":"","sources":["../src/wrapper-provider.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,SAAS,EACT,gBAAgB,EAChB,SAAS,EAGT,cAAc,EACf,MAAM,mBAAmB,CAAC;AAW3B,qBAAa,yBAA0B,SAAQ,SAAS;;CAIvD;AAED,qBAAa,mBAAoB,SAAQ,SAAS;gBACpC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;CAGhD;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS;CAG3D;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAChD,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;CAC5D;AAOD,qBAAa,oBAAqB,YAAW,eAAe;IAExD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBADX,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,MAAM;YAExB,cAAc;IAatB,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;IAI/C,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAGjE;AAED,qBAAa,sBAAuB,YAAW,eAAe;IAKhD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc;IAJ7D,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,MAAM,CAA4B;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEM,cAAc,EAAE,cAAc;YAI/C,sBAAsB;IAgBpC,OAAO,CAAC,cAAc,CAoCpB;IAEI,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;IAO/C,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAQjE;AAED,eAAO,MAAM,kBAAkB,GAAI,sCAGhC;IACD,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,cAAc,EAAE,cAAc,CAAC;CAChC,kDAQA,CAAC"}
+{"version":3,"file":"wrapper-provider.d.ts","sourceRoot":"","sources":["../src/wrapper-provider.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,SAAS,EACT,gBAAgB,EAChB,SAAS,EAGT,cAAc,EACf,MAAM,mBAAmB,CAAC;AAW3B,qBAAa,yBAA0B,SAAQ,SAAS;;CAIvD;AAED,qBAAa,mBAAoB,SAAQ,SAAS;gBACpC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;CAGhD;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS;CAG3D;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAChD,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;CAC5D;AAOD,qBAAa,oBAAqB,YAAW,eAAe;IAExD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBADX,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,MAAM;YAExB,cAAc;IAatB,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;IAI/C,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAGjE;AAED,qBAAa,sBAAuB,YAAW,eAAe;IAKhD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc;IAJ7D,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,MAAM,CAA4B;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEM,cAAc,EAAE,cAAc;YAI/C,sBAAsB;IAgBpC,OAAO,CAAC,cAAc,CAuCpB;IAEI,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC;IAO/C,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAQjE;AAED,eAAO,MAAM,kBAAkB,GAAI,sCAGhC;IACD,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,cAAc,EAAE,cAAc,CAAC;CAChC,kDAQA,CAAC"}

package/out/wrapper-provider.js

@@ -22,7 +22,7 @@ class LocalWrapperNotFoundError extends cli_shared_1.UserError {
 exports.LocalWrapperNotFoundError = LocalWrapperNotFoundError;
 class WrapperNetworkError extends cli_shared_1.BaseError {
     constructor(message, requestId) {
-        super(undefined, message);
+        super(requestId, message);
     }
 }
 exports.WrapperNetworkError = WrapperNetworkError;
@@ -105,6 +105,9 @@ class NetworkWrapperProvider {
             if (e instanceof ParseWrapperCDNIndexError) {
                 throw e;
             }
+            if (e instanceof WrapperNetworkError) {
+                throw e;
+            }
             throw new WrapperNetworkError(e instanceof Error ? e.message : 'Networking error when retrieving runtime component, retry the command.');
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "7.0.2-next.1",
+  "version": "7.0.2-next.11",
   "description": "Default bundler for Forge apps",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Atlassian",
@@ -21,10 +21,10 @@
     "@babel/plugin-transform-react-jsx": "^7.23.4",
     "@babel/traverse": "^7.24.0",
     "@babel/types": "^7.24.0",
-    "@forge/cli-shared": "9.1.1-next.1",
+    "@forge/cli-shared": "9.2.0-next.10",
     "@forge/i18n": "1.0.0",
-    "@forge/lint": "6.0.2-next.1",
-    "@forge/manifest": "13.1.1-next.1",
+    "@forge/lint": "6.0.2-next.11",
+    "@forge/manifest": "13.2.0-next.5",
     "babel-loader": "^8.3.0",
     "cheerio": "^1.2.0",
     "cross-spawn": "^7.0.6",