@salesforce/core 8.32.4 → 8.32.6-eca.0

package/lib/logger/logger.d.ts

@@ -1,4 +1,4 @@
-import { type Logger as PinoLogger } from 'pino';
+import { type Logger as PinoLogger, pino } from 'pino';
 /**
  * The common set of `Logger` options.
  */
@@ -258,4 +258,6 @@ export declare class Logger {
      */
     fatal(...args: unknown[]): Logger;
 }
+/** return various streams that the logger could send data to, depending on the options and env  */
+export declare const getWriteStream: (level?: string) => pino.TransportSingleOptions;
 export declare const computeLevel: (optionsLevel?: number | string) => string;

package/lib/logger/logger.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.computeLevel = exports.Logger = exports.LoggerLevel = void 0;
+exports.computeLevel = exports.getWriteStream = exports.Logger = exports.LoggerLevel = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -148,7 +148,7 @@ class Logger {
                             {
                                 target: path.join('..', '..', 'lib', 'logger', 'transformStream'),
                             },
-                            getWriteStream(level),
+                            (0, exports.getWriteStream)(level),
                         ],
                     },
                 });
@@ -411,16 +411,20 @@ const getWriteStream = (level = 'warn') => {
         ['1d', new Date().toISOString().split('T')[0]],
     ]);
     const logRotationPeriod = env.getString('SF_LOG_ROTATION_PERIOD') ?? '1d';
+    if (logRotationPeriod && !rotator.has(logRotationPeriod)) {
+        process.stderr.write(`Warning: Unrecognized SF_LOG_ROTATION_PERIOD value "${logRotationPeriod}". Expected 1m, 1h, or 1d. Falling back to 1d.\n`);
+    }
     return {
         // write to a rotating file
         target: 'pino/file',
         options: {
-            destination: path.join(global_1.Global.SF_DIR, `sf-${(0, ts_types_1.ensureString)(rotator.get(logRotationPeriod)) ?? rotator.get('1d')}.log`),
+            destination: path.join(global_1.Global.SF_DIR, `sf-${rotator.get(logRotationPeriod) ?? rotator.get('1d')}.log`),
             mkdir: true,
             level,
         },
     };
 };
+exports.getWriteStream = getWriteStream;
 const computeLevel = (optionsLevel) => {
     const env = new kit_1.Env();
     const envValue = isNaN(env.getNumber('SF_LOG_LEVEL') ?? NaN)

package/lib/org/scratchOrgInfoGenerator.js

@@ -151,11 +151,11 @@ const generateScratchOrgInfo = async ({ hubOrg, scratchOrgInfoPayload, nonamespa
     return {
         ...payload,
         orgName: scratchOrgInfoPayload.orgName ?? 'Company',
-        // we already have the info, and want to get rid of configApi, so this doesn't use that
-        connectedAppCallbackUrl: `http://localhost:${await webOAuthServer_1.WebOAuthServer.determineOauthPort()}/OauthRedirect`,
+        connectedAppCallbackUrl: process.env.SF_SCRATCH_SIGNUP_CALLBACK_URL ??
+            `http://localhost:${await webOAuthServer_1.WebOAuthServer.determineOauthPort()}/OauthRedirect`,
         ...(!nonamespace && namespace ? { namespace } : {}),
-        // Use the Hub org's client ID value, if one wasn't provided to us, or the default
         connectedAppConsumerKey: scratchOrgInfoPayload.connectedAppConsumerKey ??
+            process.env.SF_SCRATCH_SIGNUP_CONNECTED_APP ??
             hubOrg.getConnection().getAuthInfoFields().clientId ??
             authInfo_1.DEFAULT_CONNECTED_APP_INFO.clientId,
         package2AncestorIds: !ignoreAncestorIds && sfProject?.hasPackages()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "8.32.4",
+  "version": "8.32.6-eca.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/index",
   "types": "lib/index.d.ts",