@forge/bundler 4.11.1-next.16 → 4.11.1-next.18

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @forge/bundler
 
+## 4.11.1-next.18
+
+### Patch Changes
+
+- 8c4ec99f: Bumping dependencies via Renovate:
+
+  - @atlassian/xen-test-util
+
+- Updated dependencies [8c4ec99f]
+  - @forge/cli-shared@3.17.2-next.8
+  - @forge/lint@3.6.5-next.9
+
+## 4.11.1-next.17
+
+### Patch Changes
+
+- a9e43a70: Don't include runtime in sandbox wrapper
+- Updated dependencies [a9e43a70]
+  - @forge/node-runtime@0.1.1-next.4
+
 ## 4.11.1-next.16
 
 ### Patch Changes

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

@@ -1,10 +1,14 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
+import { IncomingMessage } from 'http';
 import { RequestOptions } from 'https';
 import { Writable } from 'readable-stream';
 import { URL } from 'url';
 import { FetchOptions } from '@forge/api';
-import { HttpCallback } from '@forge/runtime';
+type HttpCallback = (res: IncomingMessage) => void;
+type HttpArg = RequestOptions | string | URL | HttpCallback;
+export declare const isHttpRequestOptions: (options: HttpArg) => options is RequestOptions;
 interface ChainableOptions {
     timeout?: number;
     headers: {

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

@@ -1 +1 @@
-{"version":3,"file":"http-sandbox-impl.d.ts","sourceRoot":"","sources":["../../src/stubs/http-sandbox-impl.ts"],"names":[],"mappings":";;AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAY,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAe,YAAY,EAAS,MAAM,YAAY,CAAC;AAE9D,OAAO,EAAE,YAAY,EAA8D,MAAM,gBAAgB,CAAC;AAE1G,UAAU,gBAAgB;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACvB,CAAC;CACH;AAED,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,YAAY;IAapE,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,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"}
+{"version":3,"file":"http-sandbox-impl.d.ts","sourceRoot":"","sources":["../../src/stubs/http-sandbox-impl.ts"],"names":[],"mappings":";;;AAGA,OAAO,EAAuB,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAY,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAe,YAAY,EAAS,MAAM,YAAY,CAAC;AAE9D,KAAK,YAAY,GAAG,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,CAAC;AAEnD,KAAK,OAAO,GAAG,cAAc,GAAG,MAAM,GAAG,GAAG,GAAG,YAAY,CAAC;AAQ5D,eAAO,MAAM,oBAAoB,YAAa,OAAO,8BACJ,CAAC;AAYlD,UAAU,gBAAgB;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACvB,CAAC;CACH;AAED,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,YAAY;IAapE,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,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"}

package/out/stubs/http-sandbox-impl.js

@@ -1,9 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Request = void 0;
+exports.Request = exports.isHttpRequestOptions = void 0;
 const readable_stream_1 = require("readable-stream");
 const api_1 = require("@forge/api");
-const runtime_1 = require("@forge/runtime");
+const isCallback = (options) => typeof options === 'function';
+const isString = (options) => typeof options === 'string';
+const isURL = (options) => typeof options === 'object' && options.constructor.name === 'URL';
+const isStringOrURL = (options) => isString(options) || isURL(options);
+const isHttpRequestOptions = (options) => !isStringOrURL(options) && !isCallback(options);
+exports.isHttpRequestOptions = isHttpRequestOptions;
+function formatHttpRequestArgsToUrl(options) {
+    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}`;
+}
 class Request extends readable_stream_1.Writable {
     constructor(options, callback) {
         super();
@@ -65,15 +79,15 @@ class Request extends readable_stream_1.Writable {
         }
     }
     static urlFromFetchArgs(options) {
-        if ((0, runtime_1.isString)(options)) {
+        if (isString(options)) {
             return options;
         }
-        else if ((0, runtime_1.isURL)(options)) {
+        else if (isURL(options)) {
             return options.toString();
         }
         else {
             try {
-                return (0, runtime_1.formatHttpRequestArgsToUrl)(options);
+                return formatHttpRequestArgsToUrl(options);
             }
             catch (err) {
                 console.error('Unable to make request with unrecognised URL options:', options);
@@ -83,7 +97,7 @@ class Request extends readable_stream_1.Writable {
     }
     static convertToForgeFetchArgs(options, chainableOptions) {
         const url = Request.urlFromFetchArgs(options);
-        if ((0, runtime_1.isStringOrURL)(options)) {
+        if (isStringOrURL(options)) {
             return { url, init: chainableOptions };
         }
         else {

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

@@ -1 +1 @@
-{"version":3,"file":"http-sandbox.d.ts","sourceRoot":"","sources":["../../src/stubs/http-sandbox.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,wBAAgB,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAElH;AAED,wBAAgB,GAAG,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAO9G;AAID,qBAAa,KAAK;gBACJ,OAAO,EAAE,YAAY;CAOlC"}
+{"version":3,"file":"http-sandbox.d.ts","sourceRoot":"","sources":["../../src/stubs/http-sandbox.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAE,OAAO,EAAwB,MAAM,qBAAqB,CAAC;AAEpE,wBAAgB,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAElH;AAED,wBAAgB,GAAG,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAO9G;AAID,qBAAa,KAAK;gBACJ,OAAO,EAAE,YAAY;CAOlC"}

package/out/stubs/http-sandbox.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Agent = exports.get = exports.request = void 0;
-const runtime_1 = require("@forge/runtime");
 const http_sandbox_impl_1 = require("./http-sandbox-impl");
 function request(options, callback) {
     return new http_sandbox_impl_1.Request(options, callback);
 }
 exports.request = request;
 function get(options, callback) {
-    if ((0, runtime_1.isHttpRequestOptions)(options)) {
+    if ((0, http_sandbox_impl_1.isHttpRequestOptions)(options)) {
         options = Object.assign(Object.assign({}, options), { method: 'GET' });
     }
     const result = new http_sandbox_impl_1.Request(options, callback);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "4.11.1-next.16",
+  "version": "4.11.1-next.18",
   "description": "Default bundler for Forge apps",
   "license": "UNLICENSED",
   "author": "Atlassian",
@@ -21,10 +21,9 @@
     "@babel/preset-typescript": "^7.22.5",
     "@forge/api": "2.18.5-next.2",
     "@forge/babel-plugin-transform-ui": "1.1.6",
-    "@forge/cli-shared": "3.17.2-next.7",
-    "@forge/lint": "3.6.5-next.8",
-    "@forge/node-runtime": "0.1.1-next.3",
-    "@forge/runtime": "5.0.0-next.5",
+    "@forge/cli-shared": "3.17.2-next.8",
+    "@forge/lint": "3.6.5-next.9",
+    "@forge/node-runtime": "0.1.1-next.4",
     "@forge/util": "1.3.1",
     "assert": "^2.0.0",
     "babel-loader": "^8.3.0",
@@ -57,7 +56,7 @@
     "whatwg-url": "^7.1.0"
   },
   "devDependencies": {
-    "@atlassian/xen-test-util": "^2.1.5",
+    "@atlassian/xen-test-util": "^3.0.3",
     "@types/jest": "^29.5.3",
     "@types/node": "14.18.54",
     "@types/react": "^17.0.64",
@@ -68,9 +67,10 @@
     "eslint": "^8.47.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.0",
-    "prettier": "3.0.2"
+    "prettier": "3.0.2",
+    "@forge/runtime": "5.0.0-next.6"
   },
   "engines": {
     "node": ">=12.13.1"
   }
-}
+}