@forge/bundler 1.1.1-next.8 → 2.0.0-next.13

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @forge/bundler
 
+## 2.0.0-next.13
+
+### Patch Changes
+
+- 7d0ef8b: Updated ignore plugin params to correctly ignore encoding import for node-fetch
+
+## 2.0.0-next.12
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.1-next.9
+- @forge/lint@3.0.0-next.11
+
+## 2.0.0-next.11
+
+### Patch Changes
+
+- 37f9898: Added process dependency to package with notes in the path resolver
+
+## 2.0.0-next.10
+
+### Patch Changes
+
+- Updated dependencies [f5d4a636]
+  - @forge/lint@3.0.0-next.10
+  - @forge/cli-shared@2.2.1-next.8
+
+## 2.0.0-next.9
+
+### Major Changes
+
+- 037c31a: Upgrade webpack from 4 to 5 and other relavent packages to fix the issue for node17+ (openssl change)
+
+### Patch Changes
+
+- Updated dependencies [037c31a]
+  - @forge/babel-plugin-transform-ui@1.1.0-next.0
+  - @forge/lint@3.0.0-next.9
+  - @forge/cli-shared@2.2.1-next.7
+
 ## 1.1.1-next.8
 
 ### Patch Changes

package/out/stub-plugin.d.ts

@@ -1,10 +1,10 @@
-import { Compiler, Plugin } from 'webpack';
+import webpack, { Compiler } from 'webpack';
 interface StubPluginOptions {
     modules: string[];
     placeholder?: string;
     stub: string;
 }
-export declare class StubPlugin implements Plugin {
+export declare class StubPlugin implements webpack.WebpackPluginInstance {
     private modules;
     private placeholder;
     private stub;

package/out/stub-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stub-plugin.d.ts","sourceRoot":"","sources":["../src/stub-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAI3C,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,UAAW,YAAW,MAAM;IACvC,OAAO,CAAC,OAAO,CAA+B;IAC9C,OAAO,CAAC,WAAW,CAAmC;IACtD,OAAO,CAAC,IAAI,CAA4B;gBAE5B,EAAE,OAAY,EAAE,WAAW,EAAE,IAAS,EAAE,EAAE,iBAAiB;IAMhE,KAAK,CAAC,QAAQ,EAAE,QAAQ;IA2C/B,OAAO,CAAC,cAAc;CAWvB"}
+{"version":3,"file":"stub-plugin.d.ts","sourceRoot":"","sources":["../src/stub-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAI5C,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,UAAW,YAAW,OAAO,CAAC,qBAAqB;IAC9D,OAAO,CAAC,OAAO,CAA+B;IAC9C,OAAO,CAAC,WAAW,CAAmC;IACtD,OAAO,CAAC,IAAI,CAA4B;gBAE5B,EAAE,OAAY,EAAE,WAAW,EAAE,IAAS,EAAE,EAAE,iBAAiB;IAMhE,KAAK,CAAC,QAAQ,EAAE,QAAQ;IA2C/B,OAAO,CAAC,cAAc;CAWvB"}

package/out/stub-plugin.js

@@ -11,7 +11,7 @@ class StubPlugin {
     apply(compiler) {
         compiler.resolverFactory.hooks.resolver.for('normal').tap(StubPlugin.name, (resolver) => {
             resolver.hooks.resolve.tapAsync(StubPlugin.name, (request, resolveContext, callback) => {
-                const requestedModule = request.__innerRequest;
+                const requestedModule = request.request;
                 if (!this.modules.includes(requestedModule)) {
                     return callback();
                 }

package/out/webpack.d.ts

@@ -1,4 +1,3 @@
-import { Options } from 'webpack';
 import { Bundler, Watcher } from './types';
 export declare type EntryPoints = Array<{
     name: string;
@@ -9,7 +8,7 @@ interface ConfigBuilder {
     isDebugMode?: boolean;
     appDirectory: string;
 }
-export declare const getDevToolConfig: (config: ConfigBuilder) => Options.Devtool;
+export declare const getDevToolConfig: (config: ConfigBuilder) => string;
 export declare const bundle: Bundler;
 export declare const watch: Watcher;
 export {};

package/out/webpack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../src/webpack.ts"],"names":[],"mappings":"AAGA,OAAgB,EAId,OAAO,EAGR,MAAM,SAAS,CAAC;AAGjB,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;AAmDH,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,OAAO,CAAC,OAShE,CAAC;AAiOF,eAAO,MAAM,MAAM,EAAE,OA6BpB,CAAC;AAgCF,eAAO,MAAM,KAAK,EAAE,OAmCnB,CAAC"}
+{"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;AAiPF,eAAO,MAAM,MAAM,EAAE,OAqCpB,CAAC;AAgCF,eAAO,MAAM,KAAK,EAAE,OAmCnB,CAAC"}

package/out/webpack.js

@@ -11,16 +11,9 @@ const text_1 = require("./text");
 const cli_shared_1 = require("@forge/cli-shared");
 const lint_1 = require("@forge/lint");
 const tsconfig_interactor_1 = require("./tsconfig-interactor");
+const compilerOutputFileSystem = memfs_1.createFsFromVolume(new memfs_1.Volume());
 const readMemoryFileSync = (filePath) => {
-    return memfs_1.fs.readFileSync(filePath, { encoding: 'utf8' });
-};
-const outputMemoryFileSystem = {
-    join: path_1.join,
-    mkdir: memfs_1.fs.mkdir,
-    mkdirp: memfs_1.fs.mkdirp,
-    rmdir: memfs_1.fs.rmdir,
-    unlink: memfs_1.fs.unlink,
-    writeFile: memfs_1.fs.writeFile
+    return compilerOutputFileSystem.readFileSync(filePath, { encoding: 'utf8' }).toString();
 };
 const resolveModulePath = (moduleName) => {
     return require.resolve(moduleName);
@@ -29,9 +22,12 @@ const handleCallback = (err, stats) => {
     if (err) {
         throw err;
     }
+    if (!stats) {
+        throw new Error('bundle function callback returns empty stats');
+    }
     const info = stats.toJson();
-    if (stats.hasErrors()) {
-        const isTSError = info.errors.every((e) => e.includes('[tsl]'));
+    if (stats.hasErrors() && info.errors) {
+        const isTSError = info.errors.every((e) => e.message.includes('[tsl]'));
         if (isTSError) {
             const formattedErrors = info.errors.map((error) => {
                 return error.replace(/\.?.+.tsx?(?!\([0-9]\,[0-9]\))$/gm, '');
@@ -39,14 +35,14 @@ const handleCallback = (err, stats) => {
             throw new Error(text_1.Text.typescriptError(formattedErrors));
         }
         else {
-            throw new Error(text_1.Text.genericBundlingError(info.errors));
+            throw new Error(text_1.Text.genericBundlingError(info.errors.map((e) => e.message)));
         }
     }
-    if (stats.hasWarnings()) {
-        const warnings = text_1.Text.warnings(info.warnings);
+    if (stats.hasWarnings() && info.warnings) {
+        const warnings = text_1.Text.warnings(info.warnings.map((e) => e.message));
         console.warn(chalk_1.default.magenta(warnings));
     }
-    return stats;
+    return true;
 };
 exports.getDevToolConfig = (config) => {
     if (!config.isWatchMode) {
@@ -65,10 +61,22 @@ const getCustomModulesAliases = () => {
         'create-hmac': resolveModulePath('create-hmac/browser.js'),
         'diffie-hellman': resolveModulePath('diffie-hellman/browser.js'),
         pbkdf2: resolveModulePath('pbkdf2/browser.js'),
-        process: resolveModulePath('process/browser.js'),
         'public-encrypt': resolveModulePath('public-encrypt/browser.js'),
         randombytes: resolveModulePath('randombytes/browser.js'),
         randomfill: resolveModulePath('randomfill/browser.js'),
+        assert: resolveModulePath('assert/'),
+        buffer: resolveModulePath('buffer/'),
+        console: resolveModulePath('console-browserify'),
+        crypto: resolveModulePath('crypto-browserify'),
+        events: resolveModulePath('events/'),
+        os: resolveModulePath('os-browserify/browser'),
+        punycode: resolveModulePath('punycode/'),
+        process: resolveModulePath('process/browser.js'),
+        string_decoder: resolveModulePath('string_decoder/'),
+        timers: resolveModulePath('timers-browserify'),
+        url: resolveModulePath('url/'),
+        util: resolveModulePath('util/'),
+        zlib: resolveModulePath('browserify-zlib'),
         fs: resolveModulePath('memfs'),
         http: resolveModulePath('./http'),
         https: resolveModulePath('./http'),
@@ -168,8 +176,7 @@ const getBuildConfig = (entrypoints, config) => {
             ]
         },
         node: {
-            __dirname: true,
-            process: false
+            __dirname: true
         },
         performance: false,
         resolve: {
@@ -181,8 +188,9 @@ const getBuildConfig = (entrypoints, config) => {
             modules: require.resolve.paths('babel-loader') || undefined
         },
         plugins: [
-            new webpack_1.default.IgnorePlugin(/^encoding$/, /node-fetch/),
+            new webpack_1.default.IgnorePlugin({ resourceRegExp: /^encoding$/, contextRegExp: /node-fetch/ }),
             new webpack_1.default.ProvidePlugin({
+                Buffer: [resolveModulePath('buffer/'), 'Buffer'],
                 path: resolveModulePath('path-browserify'),
                 querystring: resolveModulePath('querystring-browser'),
                 stream: resolveModulePath('readable-stream'),
@@ -223,14 +231,16 @@ const getBuildConfig = (entrypoints, config) => {
 const getCompiler = (endpoints, configBuilder) => {
     const config = getBuildConfig(endpoints, configBuilder);
     const compiler = webpack_1.default(config);
-    compiler.outputFileSystem = outputMemoryFileSystem;
+    compiler.outputFileSystem = compilerOutputFileSystem;
     return compiler;
 };
 const getNodeModuleNames = (stats) => {
     const { modules } = stats.toJson({ modules: true });
     if (modules) {
         const filteredModuleNames = new Set();
-        modules.forEach(({ name }) => {
+        modules
+            .map((m) => m.name || '')
+            .forEach((name) => {
             const parts = name.match(/^\.\/node_modules\/([^/]+)\/([^/]+)/);
             if (parts) {
                 const module = parts[1][0] === '@' ? `${parts[1]}/${parts[2]}` : parts[1];
@@ -256,11 +266,18 @@ exports.bundle = (appDirectory, endpoints) => {
     return new Promise((resolve, reject) => {
         compiler.run((compilerError, stats) => {
             try {
-                handleCallback(compilerError, stats);
+                if (!handleCallback(compilerError, stats)) {
+                    return;
+                }
                 const output = {}, sourceMap = {};
                 endpoints.forEach(({ name }) => {
-                    output[name] = readMemoryFileSync(`/${name}.js`);
-                    sourceMap[name] = readMemoryFileSync(`/${name}.js.map`);
+                    output[name] = readMemoryFileSync(`/${name}.js`).toString();
+                    sourceMap[name] = readMemoryFileSync(`/${name}.js.map`).toString();
+                });
+                compiler.close((closeError) => {
+                    if (closeError) {
+                        reject(closeError);
+                    }
                 });
                 resolve({
                     output,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "1.1.1-next.8",
+  "version": "2.0.0-next.13",
   "description": "Default bundler for Forge apps",
   "license": "UNLICENSED",
   "author": "Atlassian",
@@ -12,42 +12,55 @@
     "clean": "rm -rf ./out && rm -f tsconfig.tsbuildinfo"
   },
   "dependencies": {
-    "@babel/core": "~7.10.2",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/plugin-proposal-numeric-separator": "^7.2.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.12.7",
-    "@babel/plugin-transform-react-jsx": "^7.3.0",
-    "@babel/preset-typescript": "^7.6.0",
+    "@babel/core": "^7.16.7",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/plugin-proposal-numeric-separator": "^7.16.7",
+    "@babel/plugin-proposal-optional-chaining": "^7.16.7",
+    "@babel/plugin-transform-react-jsx": "^7.16.7",
+    "@babel/preset-typescript": "^7.16.7",
     "@forge/api": "2.6.0",
-    "@forge/babel-plugin-transform-ui": "1.0.0",
-    "@forge/cli-shared": "2.2.1-next.6",
-    "@forge/lint": "3.0.0-next.8",
-    "babel-loader": "^8.0.6",
+    "@forge/babel-plugin-transform-ui": "1.1.0-next.0",
+    "assert": "^2.0.0",
+    "babel-loader": "^8.2.3",
+    "browserify-zlib": "^0.2.0",
+    "buffer": "^6.0.3",
+    "@forge/cli-shared": "2.2.1-next.9",
+    "@forge/lint": "3.0.0-next.11",
     "chalk": "^2.4.2",
-    "memfs": "^2.17.1",
+    "console-browserify": "^1.2.0",
+    "crypto-browserify": "^3.12.0",
+    "events": "^3.3.0",
+    "memfs": "^3.4.1",
+    "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.0",
+    "process": "^0.11.10",
+    "punycode": "^2.1.1",
     "querystring-browser": "^1.0.4",
     "readable-stream": "^3.4.0",
+    "string_decoder": "^1.3.0",
     "text-encoder-lite": "^2.0.0",
-    "ts-loader": "^6.2.2",
+    "timers-browserify": "^2.0.12",
+    "ts-loader": "^9.2.6",
     "typescript": "^3.9.7",
-    "webpack": "^4.42.1",
+    "url": "^0.11.0",
+    "util": "^0.12.4",
+    "webpack": "^5.66.0",
     "whatwg-url": "^7.0.0"
   },
   "devDependencies": {
     "@types/jest": "^26.0.0",
     "@types/node": "^12.12.63",
-    "@types/react": "^16.9.34",
+    "@types/react": "^17.0.38",
     "@types/readable-stream": "^2.3.5",
-    "@types/webpack": "4.39.8",
+    "@types/webpack": "^5.28.0",
     "@typescript-eslint/eslint-plugin": "^2.10.0",
     "@typescript-eslint/parser": "^2.10.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^6.7.0",
     "eslint-plugin-prettier": "^3.1.1",
-    "prettier": "^2.2.1"
+    "prettier": "2.2.1"
   },
   "engines": {
-    "node": ">=8.3"
+    "node": ">=12.13.1"
   }
 }