Merge pull request #705 from salesforcecli/wr/bumpDeps

fix: bump deps, fix NUT types
salesforcecli · Jun 20, 2024 · dcf4584 · dcf4584
2 parents 2421e15 + afe51cf
commit dcf4584
Show file tree

Hide file tree

Showing 3 changed files with 184 additions and 188 deletions.
diff --git a/package.json b/package.json
@@ -6,18 +6,18 @@
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@oclif/core": "^4",
-    "@salesforce/core": "^7.4.1",
+    "@salesforce/core": "^8.0.1",
     "@salesforce/kit": "^3.1.6",
-    "@salesforce/packaging": "^3.7.1",
-    "@salesforce/sf-plugins-core": "^11.1.0",
+    "@salesforce/packaging": "^4.0.3",
+    "@salesforce/sf-plugins-core": "^11.1.2",
     "chalk": "^5.3.0"
   },
   "devDependencies": {
-    "@oclif/plugin-command-snapshot": "^5.1.8",
-    "@salesforce/cli-plugins-testkit": "^5.2.0",
-    "@salesforce/dev-scripts": "^10.2.0",
-    "@salesforce/plugin-command-reference": "^3.0.82",
-    "eslint-plugin-sf-plugin": "^1.18.0",
+    "@oclif/plugin-command-snapshot": "^5.2.3",
+    "@salesforce/cli-plugins-testkit": "^5.3.15",
+    "@salesforce/dev-scripts": "^10.2.1",
+    "@salesforce/plugin-command-reference": "^3.1.4",
+    "eslint-plugin-sf-plugin": "^1.18.8",
     "oclif": "^4.10.11",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5"

diff --git a/test/commands/package/packageVersion.nut.ts b/test/commands/package/packageVersion.nut.ts
@@ -7,7 +7,7 @@
 
 import { execCmd, genUniqueString, TestSession } from '@salesforce/cli-plugins-testkit';
 import { ConfigAggregator, Org, SfProject } from '@salesforce/core';
-import { expect, config as chaiConfig } from 'chai';
+import { expect, config as chaiConfig, assert } from 'chai';
 import { Duration } from '@salesforce/kit';
 import {
   PackageAncestryNodeData,
@@ -16,6 +16,7 @@ import {
   PackagingSObjects,
   VersionNumber,
 } from '@salesforce/packaging';
+import { isNamedPackagingDirectory, isPackagingDirectory } from '@salesforce/core/project';
 import {
   PackageVersionListCommandResult,
   PackageVersionListDetails,
@@ -132,12 +133,12 @@ describe('package:version:*', () => {
       const project = await SfProject.resolve();
       const projectJson = project.getSfProjectJson();
       const contents = projectJson.getContents();
-      if (!contents.packageDirectories.some((pkgDir) => pkgDir.package === pkgName)) {
+      if (!contents.packageDirectories.some((pkgDir) => isPackagingDirectory(pkgDir) && pkgDir.package === pkgName)) {
         expect.fail('packageDirectory not found');
       }
-      const newPackageDirs = contents.packageDirectories.map((pkgDir) =>
-        pkgDir.package === pkgName ? { ...pkgDir, package: packageId } : pkgDir
-      );
+      const newPackageDirs = contents.packageDirectories
+        .filter(isPackagingDirectory)
+        .map((pkgDir) => (pkgDir.package === pkgName ? { ...pkgDir, package: packageId } : pkgDir));
 
       projectJson.set('packageDirectories', newPackageDirs);
       projectJson.writeSync();
@@ -477,6 +478,7 @@ describe('package:version:*', () => {
       project = await SfProject.resolve();
       const pjson = project.getSfProjectJson();
       const pkg = project.getDefaultPackage();
+      assert(isNamedPackagingDirectory(pkg));
       pkg.package = ancestryPkgName;
       pkg.versionNumber = sortedVersions[0].toString();
       pkg.versionName = 'v1';