@forge/bundler 3.0.12-next.2 → 3.1.0-next.0

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @forge/bundler
 
+## 3.1.0-next.0
+
+### Minor Changes
+
+- 89ae99e0: Add support for auto-bundling resources
+
+### Patch Changes
+
+- Updated dependencies [89ae99e0]
+  - @forge/cli-shared@3.1.0-next.0
+  - @forge/lint@3.2.4-next.0
+
+## 3.0.12
+
+### Patch Changes
+
+- Updated dependencies [5424f97]
+- Updated dependencies [35172f2]
+- Updated dependencies [edab85a]
+- Updated dependencies [5972825c]
+  - @forge/cli-shared@3.0.0
+  - @forge/lint@3.2.3
+
+## 3.0.12-next.3
+
+### Patch Changes
+
+- Updated dependencies [5424f97]
+  - @forge/cli-shared@3.0.0-next.3
+  - @forge/lint@3.2.3-next.3
+
 ## 3.0.12-next.2
 
 ### Patch Changes

package/out/bundler-config/nativeui-webpack-config.d.ts

@@ -0,0 +1,4 @@
+import { Configuration as WebpackConfig } from 'webpack';
+import { ConfigBuilder, EntryPoints } from '../webpack';
+export declare const getNativeUiBuildConfig: (entrypoints: EntryPoints, config: ConfigBuilder) => WebpackConfig;
+//# sourceMappingURL=nativeui-webpack-config.d.ts.map

package/out/bundler-config/nativeui-webpack-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nativeui-webpack-config.d.ts","sourceRoot":"","sources":["../../src/bundler-config/nativeui-webpack-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAMxD,eAAO,MAAM,sBAAsB,qCAAsC,aAAa,KAAG,aAsExF,CAAC"}

package/out/bundler-config/nativeui-webpack-config.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNativeUiBuildConfig = void 0;
+const tslib_1 = require("tslib");
+const path_1 = require("path");
+const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
+const html_webpack_plugin_1 = tslib_1.__importDefault(require("html-webpack-plugin"));
+const tmp_1 = tslib_1.__importDefault(require("tmp"));
+exports.getNativeUiBuildConfig = (entrypoints, config) => {
+    const resolvedEntryPoints = {};
+    for (const entrypoint of entrypoints) {
+        resolvedEntryPoints[entrypoint.name] = path_1.resolve(entrypoint.path);
+    }
+    return {
+        entry: Object.assign({}, resolvedEntryPoints),
+        mode: 'production',
+        devtool: 'source-map',
+        output: {
+            filename: '[name].js',
+            path: tmp_1.default.dirSync().name
+        },
+        node: {
+            __dirname: true
+        },
+        plugins: [
+            new html_webpack_plugin_1.default({
+                filename: 'index.html'
+            }),
+            new webpack_bundle_analyzer_1.BundleAnalyzerPlugin({ analyzerMode: 'disabled', generateStatsFile: true })
+        ],
+        resolve: {
+            extensions: ['.ts', '.tsx', '.js', '.jsx', '.jpg', '.jpeg', '.png', '.gif', '.svg']
+        },
+        resolveLoader: {
+            modules: require.resolve.paths('babel-loader') || undefined
+        },
+        target: 'web',
+        module: {
+            rules: [
+                {
+                    test: /\.(jpe?g|png|gif|svg)$/i,
+                    loader: 'file-loader',
+                    options: {
+                        name: '[name].[contenthash].[ext]',
+                        outputPath: 'assets'
+                    }
+                },
+                { test: /\.tsx?$/, loader: 'ts-loader' },
+                {
+                    test: /\.jsx?$/,
+                    exclude: /node_modules/,
+                    use: [
+                        {
+                            loader: 'babel-loader',
+                            options: {
+                                plugins: [
+                                    [
+                                        require.resolve('@babel/plugin-transform-react-jsx'),
+                                        {
+                                            pragma: 'React.createElement'
+                                        }
+                                    ],
+                                    require.resolve('@babel/plugin-proposal-numeric-separator'),
+                                    require.resolve('@babel/plugin-proposal-class-properties'),
+                                    require.resolve('@babel/plugin-proposal-optional-chaining')
+                                ],
+                                cacheDirectory: true
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    };
+};

package/out/index.d.ts

@@ -1,3 +1,3 @@
-export { Bundler, Watcher, WatcherMonitor, BundlerOutput } from './types';
-export { sandboxBundle, nodeBundle, watch } from './webpack';
+export { Bundler, InDiskBundler, Watcher, WatcherMonitor, BundlerOutput } from './types';
+export { sandboxBundle, nodeBundle, nativeUiBundle, watch } from './webpack';
 //# sourceMappingURL=index.d.ts.map

package/out/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC"}

package/out/index.js

@@ -3,4 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var webpack_1 = require("./webpack");
 Object.defineProperty(exports, "sandboxBundle", { enumerable: true, get: function () { return webpack_1.sandboxBundle; } });
 Object.defineProperty(exports, "nodeBundle", { enumerable: true, get: function () { return webpack_1.nodeBundle; } });
+Object.defineProperty(exports, "nativeUiBundle", { enumerable: true, get: function () { return webpack_1.nativeUiBundle; } });
 Object.defineProperty(exports, "watch", { enumerable: true, get: function () { return webpack_1.watch; } });

package/out/types.d.ts

@@ -14,6 +14,9 @@ export interface BundlerOutput {
     };
 }
 export declare type Bundler = (appDirectory: string, endpointPath: EntryPoints) => Promise<BundlerOutput>;
+export declare type InDiskBundler = (appDirectory: string, entrypoints: EntryPoints) => Promise<{
+    outputDir: string;
+}>;
 export declare type WatcherCallback = (err: Error | null, output?: BundlerOutput) => void;
 export interface WatcherMonitor {
     stop(): void;

package/out/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,oBAAY,YAAY,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAC1D,oBAAY,gBAAgB,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAE9D,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,QAAQ,CAAC,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH;AAED,oBAAY,OAAO,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;AAElG,oBAAY,eAAe,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,aAAa,KAAK,IAAI,CAAC;AAClF,MAAM,WAAW,cAAc;IAC7B,IAAI,IAAI,IAAI,CAAC;CACd;AAED,oBAAY,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AAEpE,oBAAY,OAAO,GAAG,CACpB,YAAY,EAAE,WAAW,EACzB,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,eAAe,EACzB,QAAQ,CAAC,EAAE,QAAQ,KAChB,cAAc,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,oBAAY,YAAY,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAC1D,oBAAY,gBAAgB,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAE9D,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,QAAQ,CAAC,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH;AAED,oBAAY,OAAO,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;AAClG,oBAAY,aAAa,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAE/G,oBAAY,eAAe,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,aAAa,KAAK,IAAI,CAAC;AAClF,MAAM,WAAW,cAAc;IAC7B,IAAI,IAAI,IAAI,CAAC;CACd;AAED,oBAAY,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AAEpE,oBAAY,OAAO,GAAG,CACpB,YAAY,EAAE,WAAW,EACzB,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,eAAe,EACzB,QAAQ,CAAC,EAAE,QAAQ,KAChB,cAAc,CAAC"}

package/out/webpack.d.ts

@@ -1,5 +1,5 @@
 import { Configuration as WebpackConfig, ModuleOptions } from 'webpack';
-import { Bundler, Watcher } from './types';
+import { Bundler, Watcher, InDiskBundler } from './types';
 export declare type EntryPoints = Array<{
     name: string;
     path: string;
@@ -19,5 +19,6 @@ export declare const watch: Watcher;
 export declare const createBundler: (getBuildConfig: (entrypoints: EntryPoints, configBuilder: ConfigBuilder) => WebpackConfig) => Bundler;
 export declare const sandboxBundle: Bundler;
 export declare const nodeBundle: Bundler;
+export declare const nativeUiBundle: InDiskBundler;
 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":"AAGA,OAAgB,EAAY,aAAa,IAAI,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE3F,OAAO,EAAE,OAAO,EAAkC,OAAO,EAAkB,MAAM,SAAS,CAAC;AAe3F,oBAAY,WAAW,GAAG,KAAK,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,CAAC;AAQH,eAAO,MAAM,iBAAiB,eAAgB,MAAM,KAAG,MAEtD,CAAC;AAsCF,eAAO,MAAM,gBAAgB,WAAY,aAAa,KAAG,MASxD,CAAC;AACF,aAAK,cAAc,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACrE,aAAK,mBAAmB,GAAG,cAAc,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;AAClE,aAAK,mBAAmB,GAAG,cAAc,CAAC,aAAa,EAAE,SAAS,GAAG,QAAQ,CAAC,GAAG,MAAM,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;AACvH,eAAO,MAAM,sBAAsB,qCAAsC,aAAa,KAAG,mBA8FxF,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB;AAiED,eAAO,MAAM,KAAK,EAAE,OAwCnB,CAAC;AAEF,eAAO,MAAM,aAAa,6DACkC,aAAa,KAAK,aAAa,KACxF,OAyCF,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,OAAuD,CAAC;AAEpF,eAAO,MAAM,UAAU,EAAE,OAwBxB,CAAC"}
+{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":"AAGA,OAAgB,EAAY,aAAa,IAAI,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE3F,OAAO,EAAE,OAAO,EAAkC,OAAO,EAAkB,aAAa,EAAE,MAAM,SAAS,CAAC;AAgB1G,oBAAY,WAAW,GAAG,KAAK,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,CAAC;AAQH,eAAO,MAAM,iBAAiB,eAAgB,MAAM,KAAG,MAEtD,CAAC;AAsCF,eAAO,MAAM,gBAAgB,WAAY,aAAa,KAAG,MASxD,CAAC;AACF,aAAK,cAAc,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACrE,aAAK,mBAAmB,GAAG,cAAc,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;AAClE,aAAK,mBAAmB,GAAG,cAAc,CAAC,aAAa,EAAE,SAAS,GAAG,QAAQ,CAAC,GAAG,MAAM,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;AACvH,eAAO,MAAM,sBAAsB,qCAAsC,aAAa,KAAG,mBA8FxF,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB;AAwED,eAAO,MAAM,KAAK,EAAE,OAwCnB,CAAC;AAEF,eAAO,MAAM,aAAa,6DACkC,aAAa,KAAK,aAAa,KACxF,OAyCF,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,OAAuD,CAAC;AAEpF,eAAO,MAAM,UAAU,EAAE,OAwBxB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,aAoB5B,CAAC"}

package/out/webpack.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nodeBundle = exports.sandboxBundle = exports.createBundler = exports.watch = exports.getCommonWebpackConfig = exports.getDevToolConfig = exports.resolveModulePath = void 0;
+exports.nativeUiBundle = exports.nodeBundle = exports.sandboxBundle = exports.createBundler = exports.watch = exports.getCommonWebpackConfig = exports.getDevToolConfig = exports.resolveModulePath = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const memfs_1 = require("memfs");
@@ -13,6 +13,7 @@ const fs_1 = require("fs");
 const sandboxed_webpack_config_1 = require("./bundler-config/sandboxed-webpack-config");
 const node_webpack_config_1 = require("./bundler-config/node-webpack-config");
 const tsconfig_interactor_1 = require("./tsconfig-interactor");
+const nativeui_webpack_config_1 = require("./bundler-config/nativeui-webpack-config");
 const compilerOutputFileSystem = memfs_1.createFsFromVolume(new memfs_1.Volume());
 const readMemoryFileSync = (filePath) => {
     return compilerOutputFileSystem.readFileSync(filePath, { encoding: 'utf8' }).toString();
@@ -141,9 +142,11 @@ exports.getCommonWebpackConfig = (entrypoints, config) => {
         }
     };
 };
-const getCompiler = (webpackConfig) => {
+const getCompiler = (webpackConfig, options) => {
     const compiler = webpack_1.default(webpackConfig);
-    compiler.outputFileSystem = compilerOutputFileSystem;
+    if (!(options === null || options === void 0 ? void 0 : options.writeToDisk)) {
+        compiler.outputFileSystem = compilerOutputFileSystem;
+    }
     return compiler;
 };
 const getNodeModuleNames = (stats) => {
@@ -284,3 +287,22 @@ exports.nodeBundle = async (appDirectory, entryPoints) => {
     });
     return { output, sourceMap, metadata };
 };
+exports.nativeUiBundle = (appDirectory, entrypoints) => {
+    const config = nativeui_webpack_config_1.getNativeUiBuildConfig(entrypoints, { isWatchMode: false, appDirectory });
+    const compiler = getCompiler(config, { writeToDisk: true });
+    return new Promise((resolve, reject) => {
+        compiler.run((compilerError, stats) => {
+            try {
+                if (!handleCallback(compilerError, stats)) {
+                    return;
+                }
+                resolve({
+                    outputDir: config.output.path
+                });
+            }
+            catch (err) {
+                reject(err);
+            }
+        });
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "3.0.12-next.2",
+  "version": "3.1.0-next.0",
   "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": "3.0.0-next.2",
-    "@forge/lint": "3.2.3-next.2",
+    "@forge/cli-shared": "3.1.0-next.0",
+    "@forge/lint": "3.2.4-next.0",
     "assert": "^1.1.1",
     "babel-loader": "^8.2.3",
     "browserify-zlib": "^0.2.0",
@@ -30,6 +30,7 @@
     "console-browserify": "^1.1.0",
     "crypto-browserify": "^3.11.0",
     "events": "^3.0.0",
+    "html-webpack-plugin": "^5.5.0",
     "memfs": "^3.4.1",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.0",
@@ -45,6 +46,7 @@
     "url": "^0.11.0",
     "util": "^0.11.0",
     "webpack": "^5.66.0",
+    "webpack-bundle-analyzer": "^4.5.0",
     "whatwg-url": "^7.0.0"
   },
   "devDependencies": {
@@ -53,6 +55,7 @@
     "@types/react": "^17.0.38",
     "@types/readable-stream": "^2.3.5",
     "@types/webpack": "^5.28.0",
+    "@types/webpack-bundle-analyzer": "^4.4.1",
     "@typescript-eslint/eslint-plugin": "^2.10.0",
     "@typescript-eslint/parser": "^2.10.0",
     "eslint": "^7.32.0",