Skip to content

Commit f28fd65

Browse files
authored
Merge pull request #589 from salesforcecli/sm/bump-deps-for-nuts
Sm/bump-deps-for-nuts
2 parents d6201ba + c6a1913 commit f28fd65

File tree

6 files changed

+123
-298
lines changed

6 files changed

+123
-298
lines changed

package.json

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
"main": "lib/index.js",
77
"bugs": "https://github.com/forcedotcom/cli/issues",
88
"dependencies": {
9-
"@oclif/core": "^2.1.0",
10-
"@salesforce/core": "^3.33.1",
11-
"@salesforce/kit": "^1.8.5",
12-
"@salesforce/sf-plugins-core": "^2.1.1",
9+
"@oclif/core": "^2.3.0",
10+
"@salesforce/core": "^3.33.2",
11+
"@salesforce/kit": "^1.9.0",
12+
"@salesforce/sf-plugins-core": "^2.2.1",
1313
"open": "8.4.1",
1414
"tslib": "^2"
1515
},
1616
"devDependencies": {
1717
"@oclif/plugin-command-snapshot": "^3.3.4",
1818
"@salesforce/cli-plugins-testkit": "^3.2.21",
1919
"@salesforce/dev-config": "^3.1.0",
20-
"@salesforce/dev-scripts": "^3.1.1",
20+
"@salesforce/dev-scripts": "^4.0.0-beta.9",
2121
"@salesforce/plugin-command-reference": "^2.2.9",
2222
"@salesforce/prettier-config": "^0.0.2",
2323
"@salesforce/ts-sinon": "1.4.6",
24-
"@swc/core": "^1.3.24",
24+
"@swc/core": "^1.3.36",
2525
"@types/chai-as-promised": "^7.1.5",
2626
"@types/shelljs": "^0.8.10",
2727
"@typescript-eslint/eslint-plugin": "^5.42.1",
@@ -103,19 +103,18 @@
103103
},
104104
"repository": "salesforcecli/plugin-org",
105105
"scripts": {
106-
"build": "sf-build",
106+
"build": "wireit",
107107
"clean": "sf-clean",
108108
"clean-all": "sf-clean all",
109109
"clean:lib": "shx rm -rf lib && shx rm -rf coverage && shx rm -rf .nyc_output && shx rm -f oclif.manifest.json",
110-
"compile": "sf-compile",
110+
"compile": "wireit",
111111
"docs": "sf-docs",
112-
"format": "sf-format",
113-
"lint": "sf-lint",
112+
"format": "wireit",
113+
"lint": "wireit",
114114
"postpack": "shx rm -f oclif.manifest.json",
115115
"prepack": "sf-prepack",
116116
"prepare": "sf-install",
117-
"pretest": "sf-compile-test",
118-
"test": "sf-test",
117+
"test": "wireit",
119118
"test:command-reference": "wireit",
120119
"test:compile": "wireit",
121120
"test:deprecation-policy": "wireit",

test/nut/async-create-resume.nut.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe('env:create:scratch async/resume', () => {
3939

4040
before(async () => {
4141
session = await TestSession.create({
42-
project: { name: 'testProject' },
42+
project: {},
4343
devhubAuthStrategy: 'AUTO',
4444
});
4545
cacheFilePath = path.join(session.dir, '.sf', ScratchOrgCache.getFileName());

test/nut/legacy/create.nut.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import * as path from 'path';
88
import { assert, expect } from 'chai';
99
import { TestSession, execCmd, genUniqueString } from '@salesforce/cli-plugins-testkit';
10-
import { ScratchOrgCreateResult, Messages } from '@salesforce/core';
10+
import { ScratchOrgCreateResult } from '@salesforce/core';
1111

1212
let session: TestSession;
1313

@@ -43,16 +43,8 @@ describe('org:create command', () => {
4343
{
4444
ensureExitCode: 1,
4545
}
46-
).jsonOutput as unknown as { message: string };
47-
48-
Messages.importMessagesDirectory(
49-
// 'messages' is appended to the path
50-
path.join(__dirname, '..', '..', '..', 'node_modules', '@salesforce', 'core'),
51-
false,
52-
'@salesforce/core'
53-
);
54-
const messages = Messages.loadMessages('@salesforce/core', 'scratchOrgErrorCodes');
55-
expect(errorOutput.message).to.be.a('string').and.to.include(messages.getMessage('C-1007'));
46+
).jsonOutput as unknown as { name: string };
47+
expect(errorOutput.name).to.be.a('string').and.include('C-1007');
5648
});
5749
});
5850

test/nut/scratchCreate.nut.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe('env create scratch NUTs', () => {
2929

3030
before(async () => {
3131
session = await TestSession.create({
32-
project: { name: 'testProject' },
32+
project: {},
3333
devhubAuthStrategy: 'AUTO',
3434
});
3535
});

test/nut/scratchDelete.nut.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ describe('env:delete:scratch NUTs', () => {
1818

1919
before(async () => {
2020
session = await TestSession.create({
21-
project: {
22-
name: 'testProject',
23-
},
21+
project: {},
2422
devhubAuthStrategy: 'AUTO',
2523
scratchOrgs: [
2624
{

0 commit comments

Comments
 (0)