@salesforce/core 3.31.8 → 3.31.10

package/lib/org/scratchOrgInfoApi.js

@@ -218,6 +218,9 @@ const checkOrgDoesntExist = async (scratchOrgInfo) => {
  * @returns {Promise<SaveResult>}
  */
 const requestScratchOrgCreation = async (hubOrg, scratchOrgRequest, settings) => {
+    if (!hubOrg.isDevHubOrg()) {
+        throw messages.createError('hubOrgIsNotDevHub', [hubOrg.getUsername(), hubOrg.getOrgId()]);
+    }
     // If these were present, they were already used to initialize the scratchOrgSettingsGenerator.
     // They shouldn't be submitted as part of the scratchOrgInfo.
     delete scratchOrgRequest.settings;

package/lib/sfProject.js

@@ -501,7 +501,15 @@ class SfProject {
      */
     getPackageFromPath(path) {
         const packageDirs = this.getPackageDirectories();
-        const match = packageDirs.find((packageDir) => (0, path_1.basename)(path) === packageDir.path || path.includes(packageDir.fullPath));
+        // resolve the given path
+        const fullPath = (0, path_1.resolve)(path);
+        const match = packageDirs.find((packageDir) => {
+            // fullPath will not have a trailing slash, so remove it from packageDir.fullPath, if it exists
+            const fullPathSansTrailingSep = packageDir.fullPath.replace(/(\\|\/)$/, '');
+            return ((0, path_1.basename)(path) === packageDir.path ||
+                fullPath === fullPathSansTrailingSep ||
+                fullPath.includes(packageDir.fullPath));
+        });
         return match;
     }
     /**

package/messages/scratchOrgInfoApi.md

@@ -13,3 +13,7 @@ We've deprecated OrgPreferences. Update the scratch org definition file to repla
 # SourceStatusResetFailureError
 
 Successfully created org with ID: %s and name: %s. Unfortunately, source tracking isn’t working as expected. If you run force:source:status, the results may be incorrect. Try again by creating another scratch org.
+
+# hubOrgIsNotDevHub
+
+Make sure that the org with username %s and ID %s is enabled as a Dev Hub. To enable it, open the org in your browser, navigate to the Dev Hub page in Setup, and click Enable.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.31.8",
+  "version": "3.31.10",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -37,7 +37,7 @@
     "@salesforce/bunyan": "^2.0.0",
     "@salesforce/kit": "^1.7.0",
     "@salesforce/schemas": "^1.1.0",
-    "@salesforce/ts-types": "^1.5.20",
+    "@salesforce/ts-types": "^1.5.21",
     "@types/graceful-fs": "^4.1.5",
     "@types/semver": "^7.3.9",
     "ajv": "^8.11.0",