@forge/bundler 3.0.8 → 3.0.9-next.2

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @forge/bundler
 
+## 3.0.9-next.2
+
+### Patch Changes
+
+- @forge/cli-shared@2.6.0-next.1
+- @forge/lint@3.1.3-next.1
+
+## 3.0.9-next.1
+
+### Patch Changes
+
+- e0f6a1c9: Refactored bundler creation into a factory function
+
+## 3.0.9-next.0
+
+### Patch Changes
+
+- Updated dependencies [69f42bdc]
+  - @forge/cli-shared@2.6.0-next.0
+  - @forge/lint@3.1.3-next.0
+
 ## 3.0.8
 
 ### Patch Changes

package/out/webpack.d.ts

@@ -1,3 +1,4 @@
+import { Configuration as WebpackConfig } from 'webpack';
 import { Bundler, Watcher } from './types';
 export declare type EntryPoints = Array<{
     name: string;
@@ -9,7 +10,8 @@ interface ConfigBuilder {
     appDirectory: string;
 }
 export declare const getDevToolConfig: (config: ConfigBuilder) => string;
-export declare const bundle: Bundler;
 export declare const watch: Watcher;
+export declare const createBundler: (getBuildConfig: (entrypoints: EntryPoints, configBuilder: ConfigBuilder) => WebpackConfig) => Bundler;
+export declare const bundle: Bundler;
 export {};
 //# sourceMappingURL=webpack.d.ts.map

package/out/webpack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAkC,OAAO,EAAkB,MAAM,SAAS,CAAC;AAY3F,oBAAY,WAAW,GAAG,KAAK,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,CAAC;AAgDH,UAAU,aAAa;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,gBAAgB,WAAY,aAAa,KAAG,MASxD,CAAC;AAoPF,eAAO,MAAM,MAAM,EAAE,OAqCpB,CAAC;AAgCF,eAAO,MAAM,KAAK,EAAE,OAmCnB,CAAC"}
+{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":"AAGA,OAAgB,EAAY,aAAa,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AAG5E,OAAO,EAAE,OAAO,EAAkC,OAAO,EAAkB,MAAM,SAAS,CAAC;AAY3F,oBAAY,WAAW,GAAG,KAAK,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,CAAC;AAgDH,UAAU,aAAa;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,gBAAgB,WAAY,aAAa,KAAG,MASxD,CAAC;AAiRF,eAAO,MAAM,KAAK,EAAE,OAwCnB,CAAC;AAEF,eAAO,MAAM,aAAa,6DACkC,aAAa,KAAK,aAAa,KACxF,OAwCF,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,OAAuD,CAAC"}

package/out/webpack.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.watch = exports.bundle = exports.getDevToolConfig = void 0;
+exports.bundle = exports.createBundler = exports.watch = exports.getDevToolConfig = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const memfs_1 = require("memfs");
@@ -86,7 +86,7 @@ const getCustomModulesAliases = () => {
         'supports-color': resolveModulePath('supports-color/index.js')
     };
 };
-const getBuildConfig = (entrypoints, config) => {
+const getSandboxedRuntimeBuildConfig = (entrypoints, config) => {
     if (!require.main) {
         throw new Error(text_1.Text.noExecutableFile);
     }
@@ -229,9 +229,8 @@ const getBuildConfig = (entrypoints, config) => {
         ]
     };
 };
-const getCompiler = (endpoints, configBuilder) => {
-    const config = getBuildConfig(endpoints, configBuilder);
-    const compiler = webpack_1.default(config);
+const getCompiler = (webpackConfig) => {
+    const compiler = webpack_1.default(webpackConfig);
     compiler.outputFileSystem = compilerOutputFileSystem;
     return compiler;
 };
@@ -262,38 +261,6 @@ class Monitor {
         this.watcher.close(() => null);
     }
 }
-exports.bundle = (appDirectory, endpoints) => {
-    const compiler = getCompiler(endpoints, { isWatchMode: false, appDirectory });
-    return new Promise((resolve, reject) => {
-        compiler.run((compilerError, stats) => {
-            try {
-                if (!handleCallback(compilerError, stats)) {
-                    return;
-                }
-                const output = {}, sourceMap = {};
-                endpoints.forEach(({ name }) => {
-                    output[name] = readMemoryFileSync(`/${name}.js`).toString();
-                    sourceMap[name] = readMemoryFileSync(`/${name}.js.map`).toString();
-                });
-                compiler.close((closeError) => {
-                    if (closeError) {
-                        reject(closeError);
-                    }
-                });
-                resolve({
-                    output,
-                    sourceMap,
-                    metadata: {
-                        modules: getNodeModuleNames(stats)
-                    }
-                });
-            }
-            catch (fileReadError) {
-                reject(fileReadError);
-            }
-        });
-    });
-};
 const runLinter = async (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 filesToLint = await fileSystemReader.recursiveReadDir('./src', [
@@ -318,7 +285,12 @@ const runLinter = async (logger = { info: console.log }, fileSystemReader = new
     }
 };
 exports.watch = (entryPoints, debugMode, callback, watchRun) => {
-    const compiler = getCompiler(entryPoints, { isWatchMode: true, isDebugMode: debugMode, appDirectory: process.cwd() });
+    const config = getSandboxedRuntimeBuildConfig(entryPoints, {
+        isWatchMode: true,
+        isDebugMode: debugMode,
+        appDirectory: process.cwd()
+    });
+    const compiler = getCompiler(config);
     if (typeof watchRun === 'function') {
         compiler.hooks.watchRun.tapAsync('watchRun', (watchRunCompiler, watchRunCallback) => {
             watchRun(watchRunCompiler, runLinter, watchRunCallback);
@@ -347,3 +319,39 @@ exports.watch = (entryPoints, debugMode, callback, watchRun) => {
     });
     return new Monitor(watcher);
 };
+exports.createBundler = (getBuildConfig) => {
+    return (appDirectory, endpoints) => {
+        const config = getBuildConfig(endpoints, { isWatchMode: false, appDirectory });
+        const compiler = getCompiler(config);
+        return new Promise((resolve, reject) => {
+            compiler.run((compilerError, stats) => {
+                try {
+                    if (!handleCallback(compilerError, stats)) {
+                        return;
+                    }
+                    const output = {}, sourceMap = {};
+                    endpoints.forEach(({ name }) => {
+                        output[name] = readMemoryFileSync(`/${name}.js`).toString();
+                        sourceMap[name] = readMemoryFileSync(`/${name}.js.map`).toString();
+                    });
+                    compiler.close((closeError) => {
+                        if (closeError) {
+                            reject(closeError);
+                        }
+                    });
+                    resolve({
+                        output,
+                        sourceMap,
+                        metadata: {
+                            modules: getNodeModuleNames(stats)
+                        }
+                    });
+                }
+                catch (fileReadError) {
+                    reject(fileReadError);
+                }
+            });
+        });
+    };
+};
+exports.bundle = exports.createBundler(getSandboxedRuntimeBuildConfig);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "3.0.8",
+  "version": "3.0.9-next.2",
   "description": "Default bundler for Forge apps",
   "license": "UNLICENSED",
   "author": "Atlassian",
@@ -20,8 +20,8 @@
     "@babel/preset-typescript": "^7.16.7",
     "@forge/api": "2.7.0",
     "@forge/babel-plugin-transform-ui": "1.1.0",
-    "@forge/cli-shared": "2.5.1",
-    "@forge/lint": "3.1.2",
+    "@forge/cli-shared": "2.6.0-next.1",
+    "@forge/lint": "3.1.3-next.1",
     "assert": "^1.1.1",
     "babel-loader": "^8.2.3",
     "browserify-zlib": "^0.2.0",