Skip to content

Commit

Permalink
fix: bump deps, fix NUT types
Browse files Browse the repository at this point in the history
  • Loading branch information
WillieRuemmele committed Jun 20, 2024
1 parent 2421e15 commit 1581ab0
Show file tree
Hide file tree
Showing 3 changed files with 184 additions and 188 deletions.
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.2",
"@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"
Expand Down
12 changes: 7 additions & 5 deletions test/commands/package/packageVersion.nut.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -16,6 +16,7 @@ import {
PackagingSObjects,
VersionNumber,
} from '@salesforce/packaging';
import { isNamedPackagingDirectory, isPackagingDirectory } from '@salesforce/core/project';
import {
PackageVersionListCommandResult,
PackageVersionListDetails,
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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';
Expand Down
Loading

0 comments on commit 1581ab0

Please sign in to comment.