@salesforce/core 9.1.1 → 9.1.2

package/lib/sfProject.js

@@ -668,27 +668,27 @@ class SfProject {
                 configAggregator_1.ConfigAggregator.create(),
             ]);
             await Promise.all([global.read(), local.read()]);
-            this.projectConfig = (0, kit_1.defaults)(local.toObject(), global.toObject());
+            const config = (0, kit_1.defaults)(local.toObject(), global.toObject());
             // Add fields in sfdx-config.json
-            Object.assign(this.projectConfig, configAggregator.getConfig());
+            Object.assign(config, configAggregator.getConfig());
             // we don't have a login url yet, so use instanceUrl from config or default
             // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-            if (!this.projectConfig.sfdcLoginUrl) {
+            if (!config.sfdcLoginUrl) {
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                this.projectConfig.sfdcLoginUrl = configAggregator.getConfig()['org-instance-url'] ?? sfdcUrl_1.SfdcUrl.PRODUCTION;
+                config.sfdcLoginUrl = configAggregator.getConfig()['org-instance-url'] ?? sfdcUrl_1.SfdcUrl.PRODUCTION;
             }
             // LEGACY - Allow override of sfdcLoginUrl via env var FORCE_SFDC_LOGIN_URL
             if (process.env.FORCE_SFDC_LOGIN_URL) {
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                this.projectConfig.sfdcLoginUrl = process.env.FORCE_SFDC_LOGIN_URL;
+                config.sfdcLoginUrl = process.env.FORCE_SFDC_LOGIN_URL;
             }
             // Allow override of signupTargetLoginUrl via env var SFDX_SCRATCH_ORG_CREATION_LOGIN_URL
             if (process.env.SFDX_SCRATCH_ORG_CREATION_LOGIN_URL) {
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                this.projectConfig.signupTargetLoginUrl = process.env.SFDX_SCRATCH_ORG_CREATION_LOGIN_URL;
+                config.signupTargetLoginUrl = process.env.SFDX_SCRATCH_ORG_CREATION_LOGIN_URL;
             }
             // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-            const loginUrl = this.projectConfig.sfdcLoginUrl;
+            const loginUrl = config.sfdcLoginUrl;
             if (loginUrl) {
                 if (!sfdcUrl_1.SfdcUrl.isValidUrl(loginUrl) ||
                     (!new sfdcUrl_1.SfdcUrl(loginUrl).isSalesforceDomain() && !new sfdcUrl_1.SfdcUrl(loginUrl).isInternalUrl())) {
@@ -696,13 +696,15 @@ class SfProject {
                 }
             }
             // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-            const signupUrl = this.projectConfig.signupTargetLoginUrl;
+            const signupUrl = config.signupTargetLoginUrl;
             if (signupUrl) {
                 if (!sfdcUrl_1.SfdcUrl.isValidUrl(signupUrl) ||
                     (!new sfdcUrl_1.SfdcUrl(signupUrl).isSalesforceDomain() && !new sfdcUrl_1.SfdcUrl(signupUrl).isInternalUrl())) {
                     throw messages.createError('invalidProjectLoginUrl', [signupUrl]);
                 }
             }
+            // Only cache after validation passes
+            this.projectConfig = config;
         }
         // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return this.projectConfig;

package/lib/util/sfdcUrl.js

@@ -108,7 +108,7 @@ class SfdcUrl extends node_url_1.URL {
             '.salesforce.com',
             '.salesforceliveagent.com',
             '.secure.force.com',
-            'crmforce.mil',
+            '.crmforce.mil',
             '.sfcrmproducts.cn',
         ];
         const allowlistOfSalesforceHosts = ['developer.salesforce.com', 'trailhead.salesforce.com'];
@@ -120,19 +120,20 @@ class SfdcUrl extends node_url_1.URL {
      * @returns {boolean} true if this is an internal domain
      */
     isInternalUrl() {
-        const INTERNAL_URL_PARTS = [
-            '.vpod.',
-            'stm.salesforce.com',
-            'stm.force.com',
+        const INTERNAL_SFDC_SUFFIXES = [
+            '.vpod.salesforce.com',
+            '.vpod.force.com',
+            '.stm.salesforce.com',
+            '.stm.force.com',
             '.blitz.salesforce.com',
             '.stm.salesforce.ms',
             '.pc-rnd.force.com',
             '.pc-rnd.salesforce.com',
-            '.crm.dev', // workspaces container
+            '.crm.dev',
         ];
-        return (this.origin.startsWith('https://gs1.') ||
+        return (this.hostname === 'gs1.salesforce.com' ||
             this.isLocalUrl() ||
-            INTERNAL_URL_PARTS.some((part) => this.origin.includes(part)));
+            INTERNAL_SFDC_SUFFIXES.some((suffix) => this.hostname.endsWith(suffix)));
     }
     /**
      * Tests whether this url runs on a local machine
@@ -140,8 +141,8 @@ class SfdcUrl extends node_url_1.URL {
      * @returns {boolean} true if this is a local machine
      */
     isLocalUrl() {
-        const LOCAL_PARTS = ['localhost.sfdcdev.', '.internal.'];
-        return LOCAL_PARTS.some((part) => this.origin.includes(part));
+        const LOCAL_SFDC_SUFFIXES = ['.localhost.sfdcdev.salesforce.com', '.internal.salesforce.com'];
+        return LOCAL_SFDC_SUFFIXES.some((suffix) => this.hostname.endsWith(suffix));
     }
     toLightningDomain() {
         if (this.origin.endsWith('.my.salesforce.mil')) {

package/package.json

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