@forge/bundler 4.6.4-next.0 → 4.6.4-next.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @forge/bundler
 
+## 4.6.4-next.2
+
+### Patch Changes
+
+- Updated dependencies [e8d41b0]
+  - @forge/cli-shared@3.10.1-next.0
+  - @forge/lint@3.2.20-next.0
+
+## 4.6.4-next.1
+
+### Patch Changes
+
+- e91cabc: Route HTTPS calls from the new runtime through @forge/api
+- Updated dependencies [e91cabc]
+  - @forge/api@2.15.1-next.1
+
 ## 4.6.4-next.0
 
 ### Patch Changes

package/out/config/sandbox.js

@@ -34,8 +34,8 @@ const getCustomModulesAliases = () => {
         util: (0, common_1.resolveModulePath)('util/'),
         zlib: (0, common_1.resolveModulePath)('browserify-zlib'),
         fs: (0, common_1.resolveModulePath)('memfs'),
-        http: (0, common_1.resolveStubPath)('http'),
-        https: (0, common_1.resolveStubPath)('http'),
+        http: (0, common_1.resolveStubPath)('http-sandbox'),
+        https: (0, common_1.resolveStubPath)('http-sandbox'),
         path: (0, common_1.resolveModulePath)('path-browserify'),
         querystring: (0, common_1.resolveModulePath)('querystring-browser'),
         stream: (0, common_1.resolveModulePath)('readable-stream'),

package/out/stubs/console.d.ts

@@ -1,4 +1,6 @@
 import { ConsoleMethod, LogHeader } from '@forge/runtime';
 export declare const starSerializer: (arg: any[]) => any;
 export declare function forgeConsole(consoleMethod: ConsoleMethod, header: LogHeader): (...rawData: any[]) => void;
+export declare function replaceConsole(header: LogHeader): void;
+export declare function restoreConsole(): void;
 //# sourceMappingURL=console.d.ts.map

package/out/stubs/console.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"console.d.ts","sourceRoot":"","sources":["../../src/stubs/console.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,aAAa,EAIb,SAAS,EAEV,MAAM,gBAAgB,CAAC;AA2CxB,eAAO,MAAM,cAAc,QAAS,GAAG,EAAE,KAAG,GAAoC,CAAC;AAoDjF,wBAAgB,YAAY,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,SAAS,+BAW3E"}
+{"version":3,"file":"console.d.ts","sourceRoot":"","sources":["../../src/stubs/console.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,aAAa,EAIb,SAAS,EAGV,MAAM,gBAAgB,CAAC;AA2CxB,eAAO,MAAM,cAAc,QAAS,GAAG,EAAE,KAAG,GAAoC,CAAC;AAoDjF,wBAAgB,YAAY,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,SAAS,+BAW3E;AAMD,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,QAI/C;AAED,wBAAgB,cAAc,SAI7B"}

package/out/stubs/console.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.forgeConsole = exports.starSerializer = void 0;
+exports.restoreConsole = exports.replaceConsole = exports.forgeConsole = exports.starSerializer = void 0;
 const bunyan_1 = require("bunyan");
 const api_1 = require("@forge/api");
 const runtime_1 = require("@forge/runtime");
@@ -84,3 +84,16 @@ function forgeConsole(consoleMethod, header) {
     }
 }
 exports.forgeConsole = forgeConsole;
+const originalConsole = new Map(runtime_1.CONSOLE_METHODS.map((method) => [method, global.console[method]]));
+function replaceConsole(header) {
+    for (const method of runtime_1.CONSOLE_METHODS) {
+        global.console[method] = forgeConsole(method, header);
+    }
+}
+exports.replaceConsole = replaceConsole;
+function restoreConsole() {
+    for (const method of runtime_1.CONSOLE_METHODS) {
+        global.console[method] = originalConsole.get(method);
+    }
+}
+exports.restoreConsole = restoreConsole;

package/out/stubs/http-impl.d.ts

@@ -12,6 +12,7 @@ export interface ChainableOptions {
         [key: string]: string;
     };
 }
+export declare const isRequestOptions: (options: RequestOptions | string | URL) => options is RequestOptions;
 export declare class Request extends Writable {
     private reqBody;
     private chainableOptions;
@@ -21,10 +22,12 @@ export declare class Request extends Writable {
     private fetch;
     _write(chunk: any, encoding: string, callback: (error?: Error | null) => void): void;
     static formatUrl(options: RequestOptions): string;
+    static urlFromFetchArgs(options: RequestOptions | string | URL): string;
     static convertToForgeFetchArgs(options: RequestOptions | string | URL, chainableOptions: ChainableOptions): {
         url: string;
         init: FetchOptions;
     };
+    abort(): void;
 }
 export declare class Agent {
     constructor(options: AgentOptions);

package/out/stubs/http-impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-impl.d.ts","sourceRoot":"","sources":["../../src/stubs/http-impl.ts"],"names":[],"mappings":";;;AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAErD,OAAO,EAAY,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,GAAG,EAAkC,MAAM,KAAK,CAAC;AAC1D,OAAO,EAAe,YAAY,EAAS,MAAM,YAAY,CAAC;AAsB9D,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACvB,CAAC;CACH;AAMD,qBAAa,OAAQ,SAAQ,QAAQ;IACnC,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,gBAAgB,CAAmB;gBAE/B,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI;IAatF,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAM/C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO;IAQhE,OAAO,CAAC,KAAK;IAsBN,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI;IAe3F,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM;IAmCjD,MAAM,CAAC,uBAAuB,CAC5B,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EACtC,gBAAgB,EAAE,gBAAgB,GACjC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE;CA8BvC;AAID,qBAAa,KAAK;gBACJ,OAAO,EAAE,YAAY;CAOlC"}
+{"version":3,"file":"http-impl.d.ts","sourceRoot":"","sources":["../../src/stubs/http-impl.ts"],"names":[],"mappings":";;;AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAErD,OAAO,EAAY,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAe,YAAY,EAAS,MAAM,YAAY,CAAC;AAsB9D,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACvB,CAAC;CACH;AAMD,eAAO,MAAM,gBAAgB,YAAa,cAAc,GAAG,MAAM,GAAG,GAAG,8BAChC,CAAC;AAExC,qBAAa,OAAQ,SAAQ,QAAQ;IACnC,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,gBAAgB,CAAmB;gBAE/B,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI;IAatF,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAM/C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO;IAQhE,OAAO,CAAC,KAAK;IAsBN,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI;IAe3F,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM;IAUjD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,GAAG,MAAM;IAiBvE,MAAM,CAAC,uBAAuB,CAC5B,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EACtC,gBAAgB,EAAE,gBAAgB,GACjC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE;IAuBtC,KAAK;CAGN;AAID,qBAAa,KAAK;gBACJ,OAAO,EAAE,YAAY;CAOlC"}

package/out/stubs/http-impl.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Agent = exports.Request = void 0;
+exports.Agent = exports.Request = exports.isRequestOptions = void 0;
 const readable_stream_1 = require("readable-stream");
-const url_1 = require("url");
 const api_1 = require("@forge/api");
 class Response extends readable_stream_1.Readable {
     constructor(content, response) {
@@ -17,6 +16,8 @@ class Response extends readable_stream_1.Readable {
 }
 const isString = (options) => typeof options === 'string';
 const isURL = (options) => typeof options === 'object' && options.constructor.name === 'URL';
+const isRequestOptions = (options) => !isString(options) && !isURL(options);
+exports.isRequestOptions = isRequestOptions;
 class Request extends readable_stream_1.Writable {
     constructor(options, callback) {
         super();
@@ -42,7 +43,7 @@ class Request extends readable_stream_1.Writable {
     }
     fetch(options) {
         const { url, init } = Request.convertToForgeFetchArgs(options, this.chainableOptions);
-        if (init.method !== 'GET') {
+        if (init.method && init.method !== 'HEAD' && init.method !== 'GET') {
             init.body = Buffer.concat(this.reqBody);
         }
         (0, api_1.fetch)(url, init)
@@ -78,57 +79,24 @@ class Request extends readable_stream_1.Writable {
         }
     }
     static formatUrl(options) {
-        const reqUrlBuilder = options;
-        reqUrlBuilder.protocol = options.protocol || 'https:';
-        if (reqUrlBuilder.path) {
-            const { path: originalPath, pathname: originalPathname } = reqUrlBuilder;
-            if (reqUrlBuilder.query === undefined) {
-                const pathMatch = originalPath === null || originalPath === void 0 ? void 0 : originalPath.match(/(^.*)\?(.*$)/);
-                const pathnameMatch = originalPathname === null || originalPathname === void 0 ? void 0 : originalPathname.match(/(^.*)\?(.*$)/);
-                if (pathMatch) {
-                    const [, pathname, query] = pathMatch;
-                    reqUrlBuilder.pathname = pathname;
-                    reqUrlBuilder.query = query;
-                    reqUrlBuilder.search = `?${query}`;
-                }
-                else if (pathnameMatch) {
-                    const [, pathname, query] = pathnameMatch;
-                    reqUrlBuilder.path = reqUrlBuilder.pathname;
-                    reqUrlBuilder.pathname = pathname;
-                    reqUrlBuilder.query = query;
-                    reqUrlBuilder.search = `?${query}`;
-                }
-                else {
-                    reqUrlBuilder.pathname = reqUrlBuilder.path;
-                }
-            }
-        }
-        return (0, url_1.format)(reqUrlBuilder);
+        var _a, _b;
+        const protocol = 'https:';
+        const auth = options.auth ? `${options.auth}@` : '';
+        const host = (_a = options.hostname) !== null && _a !== void 0 ? _a : options.host;
+        const port = options.port ? `:${options.port}` : '';
+        const path = (_b = options.path) !== null && _b !== void 0 ? _b : '/';
+        return `${protocol}//${auth}${host}${port}${path}`;
     }
-    static convertToForgeFetchArgs(options, chainableOptions) {
+    static urlFromFetchArgs(options) {
         if (isString(options)) {
-            return { url: options, init: chainableOptions };
+            return options;
         }
         else if (isURL(options)) {
-            return { url: options.toString(), init: chainableOptions };
+            return options.toString();
         }
         else {
             try {
-                const reqOpts = {};
-                if (options.headers) {
-                    reqOpts.headers = {};
-                    for (const header in options.headers) {
-                        const headerValue = options.headers[header];
-                        if (headerValue) {
-                            reqOpts.headers[header] = headerValue.toString();
-                        }
-                    }
-                }
-                if (options.timeout)
-                    reqOpts.timeout = options.timeout;
-                reqOpts.method = options.method || 'GET';
-                const url = Request.formatUrl(options);
-                return { url, init: Object.assign(Object.assign({}, chainableOptions), reqOpts) };
+                return Request.formatUrl(options);
             }
             catch (err) {
                 console.error('Unable to make request with unrecognised URL options:', options);
@@ -136,6 +104,30 @@ class Request extends readable_stream_1.Writable {
             }
         }
     }
+    static convertToForgeFetchArgs(options, chainableOptions) {
+        const url = Request.urlFromFetchArgs(options);
+        if (!(0, exports.isRequestOptions)(options)) {
+            return { url, init: chainableOptions };
+        }
+        else {
+            const reqOpts = {};
+            if (options.headers) {
+                reqOpts.headers = {};
+                for (const header in options.headers) {
+                    const headerValue = options.headers[header];
+                    if (headerValue) {
+                        reqOpts.headers[header] = headerValue.toString();
+                    }
+                }
+            }
+            if (options.timeout)
+                reqOpts.timeout = options.timeout;
+            reqOpts.method = options.method || 'GET';
+            return { url, init: Object.assign(Object.assign({}, chainableOptions), reqOpts) };
+        }
+    }
+    abort() {
+    }
 }
 exports.Request = Request;
 const NUM_SUPPORTED_AGENT_OPTIONS = 1;

package/out/stubs/http-node.d.ts

@@ -0,0 +1,3 @@
+export declare function replaceHttps(): void;
+export declare function restoreHttps(): void;
+//# sourceMappingURL=http-node.d.ts.map

package/out/stubs/http-node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-node.d.ts","sourceRoot":"","sources":["../../src/stubs/http-node.ts"],"names":[],"mappings":"AA0CA,wBAAgB,YAAY,SAK3B;AAED,wBAAgB,YAAY,SAG3B"}

package/out/stubs/http-node.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.restoreHttps = exports.replaceHttps = void 0;
+const http_impl_1 = require("./http-impl");
+const https = require('https');
+const originalHttpsRequest = https.request;
+const originalHttpsGet = https.get;
+function request(options, callback) {
+    var _a;
+    if ((0, http_impl_1.isRequestOptions)(options) && ((_a = options.headers) === null || _a === void 0 ? void 0 : _a['Forge-Proxy-Authorization'])) {
+        return originalHttpsRequest(options, callback);
+    }
+    return new http_impl_1.Request(options, callback);
+}
+function get(options, callback) {
+    if ((0, http_impl_1.isRequestOptions)(options)) {
+        options = Object.assign(Object.assign({}, options), { method: 'GET' });
+    }
+    const result = request(options, callback);
+    result.end();
+    return result;
+}
+function replaceHttps() {
+    https.request = request;
+    https.get = get;
+}
+exports.replaceHttps = replaceHttps;
+function restoreHttps() {
+    https.request = originalHttpsGet;
+    https.get = originalHttpsGet;
+}
+exports.restoreHttps = restoreHttps;

package/out/stubs/http-sandbox.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=http-sandbox.d.ts.map

package/out/stubs/http-sandbox.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-sandbox.d.ts","sourceRoot":"","sources":["../../src/stubs/http-sandbox.ts"],"names":[],"mappings":""}

package/out/stubs/http-sandbox.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const http_impl_1 = require("./http-impl");
+module.exports = {
+    request: (options, callback) => {
+        return new http_impl_1.Request(options, callback);
+    },
+    get: (options, callback) => {
+        if ((0, http_impl_1.isRequestOptions)(options)) {
+            options = Object.assign(Object.assign({}, options), { method: 'GET' });
+        }
+        const result = new http_impl_1.Request(options, callback);
+        result.end();
+        return result;
+    },
+    Agent: http_impl_1.Agent
+};

package/out/stubs/wrapper.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const api_1 = require("@forge/api");
 const runtime_1 = require("@forge/runtime");
 const console_1 = require("./console");
+const http_node_1 = require("./http-node");
 const log_events_1 = require("./log-events");
 const wrappedFilename = __filename.replace(/\/[^/]+.js$/, (name) => '/bundled' + name);
 const realRequire = eval('require');
@@ -35,9 +36,8 @@ const adapter = (name) => {
         }
         try {
             const header = (0, log_events_1.emitHeaderEvent)(lambdaEvent);
-            for (const method of runtime_1.CONSOLE_METHODS) {
-                global.console[method] = (0, console_1.forgeConsole)(method, header);
-            }
+            (0, console_1.replaceConsole)(header);
+            (0, http_node_1.replaceHttps)();
             const bundled = realRequire(wrappedFilename);
             const timer = metrics.timing('invoke').measure();
             let result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "4.6.4-next.0",
+  "version": "4.6.4-next.2",
   "description": "Default bundler for Forge apps",
   "license": "UNLICENSED",
   "author": "Atlassian",
@@ -18,10 +18,10 @@
     "@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.15.1-next.0",
+    "@forge/api": "2.15.1-next.1",
     "@forge/babel-plugin-transform-ui": "1.1.1",
-    "@forge/cli-shared": "3.10.0",
-    "@forge/lint": "3.2.19",
+    "@forge/cli-shared": "3.10.1-next.0",
+    "@forge/lint": "3.2.20-next.0",
     "@forge/runtime": "4.3.1",
     "@forge/util": "1.2.2",
     "assert": "^1.1.1",
@@ -35,6 +35,7 @@
     "events": "^3.0.0",
     "html-webpack-plugin": "^5.5.0",
     "memfs": "^3.4.1",
+    "nock": "^10.0.6",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.0",
     "process": "^0.11.10",
@@ -56,7 +57,7 @@
   "devDependencies": {
     "@types/bunyan": "^1.8.5",
     "@types/jest": "^29.1.2",
-    "@types/node": "^12.12.63",
+    "@types/node": "14.18.42",
     "@types/react": "^17.0.53",
     "@types/readable-stream": "^2.3.15",
     "@types/webpack-bundle-analyzer": "^4.6.0",

package/out/stubs/http.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=http.d.ts.map

package/out/stubs/http.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/stubs/http.ts"],"names":[],"mappings":""}

package/out/stubs/http.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const http_impl_1 = require("./http-impl");
-module.exports = {
-    request: (options, callback) => {
-        return new http_impl_1.Request(options, callback);
-    },
-    Agent: http_impl_1.Agent
-};