@forge/bundler 4.6.2 → 4.6.3-next.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @forge/bundler
 
+## 4.6.3-next.1
+
+### Patch Changes
+
+- Updated dependencies [e7f0fb6]
+  - @forge/cli-shared@3.9.1-next.1
+  - @forge/lint@3.2.19-next.1
+
+## 4.6.3-next.0
+
+### Patch Changes
+
+- ff28cf5: Fix node runtime logging for non-jsonable primitives
+  - @forge/cli-shared@3.9.1-next.0
+  - @forge/lint@3.2.19-next.0
+
 ## 4.6.2
 
 ### Patch Changes

package/out/stubs/console.d.ts

@@ -1,4 +1,4 @@
 import { ConsoleMethod, LogHeader } from '@forge/runtime';
-export declare const starSerializer: (arg: any) => any;
+export declare const starSerializer: (arg: any[]) => any;
 export declare function forgeConsole(consoleMethod: ConsoleMethod, header: LogHeader): (...rawData: any[]) => 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,KAAG,GA0BzC,CAAC;AAkDF,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":"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"}

package/out/stubs/console.js

@@ -4,6 +4,7 @@ exports.forgeConsole = exports.starSerializer = void 0;
 const bunyan_1 = require("bunyan");
 const api_1 = require("@forge/api");
 const runtime_1 = require("@forge/runtime");
+const util_1 = require("util");
 function stringMessage(arg) {
     if (typeof arg === 'string') {
         return arg;
@@ -16,8 +17,8 @@ function stringMessage(arg) {
     }
 }
 function transformSandBoxLogMessage(arg) {
-    let msg = stringMessage(arg);
-    if (msg === null && Array.isArray(arg) && arg.length > 0) {
+    let msg = null;
+    if (Array.isArray(arg) && arg.length > 0) {
         msg = stringMessage(arg[0]);
         if (msg !== null) {
             arg = arg.slice(1);
@@ -31,30 +32,7 @@ function transformSandBoxLogMessage(arg) {
         '*': arg
     };
 }
-const starSerializer = (arg) => {
-    var _a, _b;
-    if (typeof arg !== 'object') {
-        return arg;
-    }
-    if (Array.isArray(arg)) {
-        return arg.map(exports.starSerializer);
-    }
-    if (arg instanceof Error) {
-        return {
-            message: arg.message,
-            name: (0, api_1.isForgePlatformError)(arg) ? arg.name : api_1.FUNCTION_ERR,
-            stack: (_a = arg.stack) !== null && _a !== void 0 ? _a : ''
-        };
-    }
-    if (((_b = arg === null || arg === void 0 ? void 0 : arg.constructor) === null || _b === void 0 ? void 0 : _b.name) !== 'Object') {
-        return arg;
-    }
-    const res = {};
-    for (const prop in arg) {
-        res[prop] = (0, exports.starSerializer)(arg[prop]);
-    }
-    return res;
-};
+const starSerializer = (arg) => arg.map((val) => (0, util_1.format)(val));
 exports.starSerializer = starSerializer;
 function formatLogMessage(requestId, logEventData) {
     const transformedMessage = transformSandBoxLogMessage(logEventData.logArguments);
@@ -85,7 +63,7 @@ function customConsole(logMethod, header) {
                 logArguments: rawData
             };
             if (global.__forge_tunnel__) {
-                process.stdout.write(JSON.stringify((0, exports.starSerializer)(logEventData)) + '\n');
+                process.stdout.write(JSON.stringify(Object.assign(Object.assign({}, logEventData), { logArguments: (0, exports.starSerializer)(logEventData.logArguments) })) + '\n');
             }
             else {
                 const logLine = formatLogMessage(awsRequestId, logEventData);

package/out/stubs/log-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log-events.d.ts","sourceRoot":"","sources":["../../src/stubs/log-events.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,wBAAwB,gBAAgB,CAAC;AACtD,eAAO,MAAM,qBAAqB,SAAS,CAAC;AAE5C,wBAAgB,cAAc,IAAI,MAAM,CAavC;AA4CD,aAAK,SAAS;IACZ,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,GAAG,QAAQ;CACZ;AA0CD,wBAAgB,eAAe,CAAC,WAAW,EAAE,GAAG;;;;EAE/C;AAED,wBAAgB,yBAAyB;;;;EAExC;AAED,wBAAgB,qBAAqB;;;;EAEpC;AAED,wBAAgB,cAAc,CAAC,YAAY,EAAE,GAAG;;;;EAG/C"}
+{"version":3,"file":"log-events.d.ts","sourceRoot":"","sources":["../../src/stubs/log-events.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,wBAAwB,gBAAgB,CAAC;AACtD,eAAO,MAAM,qBAAqB,SAAS,CAAC;AAE5C,wBAAgB,cAAc,IAAI,MAAM,CAavC;AA4CD,aAAK,SAAS;IACZ,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,GAAG,QAAQ;CACZ;AA4CD,wBAAgB,eAAe,CAAC,WAAW,EAAE,GAAG;;;;EAE/C;AAED,wBAAgB,yBAAyB;;;;EAExC;AAED,wBAAgB,qBAAqB;;;;EAEpC;AAED,wBAAgB,cAAc,CAAC,YAAY,EAAE,GAAG;;;;EAG/C"}

package/out/stubs/log-events.js

@@ -71,7 +71,7 @@ function simpleBunyanLogEvent(eventType, eventLevel, data) {
             return logData;
         }
         return {
-            '*': [(0, console_1.starSerializer)(logData)],
+            '*': (0, console_1.starSerializer)([logData]),
             P: 3,
             lvl: eventLevel,
             ts: Date.now()
@@ -89,7 +89,7 @@ function logErrorToTunnelProcess(caughtObject) {
             logLevel: runtime_1.LogLevel.ERROR,
             logArguments: [caughtObject]
         };
-        process.stdout.write(JSON.stringify((0, console_1.starSerializer)(logEventData)) + '\n');
+        process.stdout.write(JSON.stringify(Object.assign(Object.assign({}, logEventData), { logArguments: (0, console_1.starSerializer)(logEventData.logArguments) })) + '\n');
     }
 }
 function emitHeaderEvent(lambdaEvent) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "4.6.2",
+  "version": "4.6.3-next.1",
   "description": "Default bundler for Forge apps",
   "license": "UNLICENSED",
   "author": "Atlassian",
@@ -20,8 +20,8 @@
     "@babel/preset-typescript": "^7.16.7",
     "@forge/api": "2.14.0",
     "@forge/babel-plugin-transform-ui": "1.1.1",
-    "@forge/cli-shared": "3.9.0",
-    "@forge/lint": "3.2.18",
+    "@forge/cli-shared": "3.9.1-next.1",
+    "@forge/lint": "3.2.19-next.1",
     "@forge/runtime": "4.3.1",
     "@forge/util": "1.2.2",
     "assert": "^1.1.1",