Skip to content

Commit c3551af

Browse files
authored
Merge pull request #597 from salesforcecli/devScripts2023-02-26
fix(deps): update nuts and deps
2 parents e5b941a + cb555b0 commit c3551af

File tree

6 files changed

+155
-517
lines changed

6 files changed

+155
-517
lines changed

package.json

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,49 @@
66
"main": "lib/index.js",
77
"bugs": "https://github.com/forcedotcom/cli/issues",
88
"dependencies": {
9-
"@oclif/core": "^2.3.0",
10-
"@salesforce/core": "^3.33.2",
9+
"@oclif/core": "^2.3.1",
10+
"@salesforce/core": "^3.33.5",
1111
"@salesforce/kit": "^1.9.0",
12-
"@salesforce/sf-plugins-core": "^2.2.1",
12+
"@salesforce/sf-plugins-core": "^2.2.3",
1313
"open": "8.4.1",
1414
"tslib": "^2"
1515
},
1616
"devDependencies": {
1717
"@oclif/plugin-command-snapshot": "^3.3.4",
18-
"@salesforce/cli-plugins-testkit": "^3.2.21",
18+
"@salesforce/cli-plugins-testkit": "^3.2.23",
1919
"@salesforce/dev-config": "^3.1.0",
20-
"@salesforce/dev-scripts": "^4.0.0-beta.9",
20+
"@salesforce/dev-scripts": "^4.1.1",
2121
"@salesforce/plugin-command-reference": "^2.2.9",
2222
"@salesforce/prettier-config": "^0.0.2",
2323
"@salesforce/ts-sinon": "1.4.6",
2424
"@swc/core": "^1.3.36",
2525
"@types/chai-as-promised": "^7.1.5",
2626
"@types/shelljs": "^0.8.10",
27-
"@typescript-eslint/eslint-plugin": "^5.42.1",
28-
"@typescript-eslint/parser": "^5.46.0",
27+
"@typescript-eslint/eslint-plugin": "^5.53.0",
28+
"@typescript-eslint/parser": "^5.53.0",
2929
"chai": "^4.3.7",
3030
"chai-as-promised": "^7.1.1",
3131
"eslint": "^8.33.0",
3232
"eslint-config-prettier": "^8.6.0",
3333
"eslint-config-salesforce": "^1.1.1",
34-
"eslint-config-salesforce-license": "^0.1.6",
34+
"eslint-config-salesforce-license": "^0.2.0",
3535
"eslint-config-salesforce-typescript": "^1.1.1",
3636
"eslint-plugin-header": "^3.0.0",
3737
"eslint-plugin-import": "2.27.5",
38-
"eslint-plugin-jsdoc": "^39.6.7",
38+
"eslint-plugin-jsdoc": "^40.0.0",
3939
"eslint-plugin-sf-plugin": "^1.8.1",
4040
"husky": "^7.0.4",
4141
"mocha": "^9.1.3",
4242
"moment": "^2.29.1",
4343
"nyc": "^15.1.0",
44-
"oclif": "^3.6.5",
44+
"oclif": "^3.7.0",
4545
"prettier": "^2.8.4",
4646
"pretty-quick": "^3.1.0",
4747
"shelljs": "^0.8.5",
4848
"shx": "0.3.4",
4949
"sinon": "10.0.0",
5050
"ts-node": "^10.9.1",
51-
"typescript": "^4.9.4",
51+
"typescript": "^4.9.5",
5252
"wireit": "^0.9.5"
5353
},
5454
"engines": {
@@ -115,10 +115,6 @@
115115
"prepack": "sf-prepack",
116116
"prepare": "sf-install",
117117
"test": "wireit",
118-
"test:command-reference": "wireit",
119-
"test:compile": "wireit",
120-
"test:deprecation-policy": "wireit",
121-
"test:json-schema": "wireit",
122118
"test:nuts": "nyc mocha \"./test/nut/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --jobs 10",
123119
"test:nuts:legacy": "nyc mocha \"./test/nut/legacy/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --jobs 10",
124120
"test:nuts:sandbox": "nyc mocha \"./test/**/*.sandboxNut.ts\" --slow 450000 --timeout 7200000 --parallel --jobs 10",
@@ -150,16 +146,23 @@
150146
"clean": "if-file-deleted"
151147
},
152148
"format": {
153-
"command": "prettier --write \"+(src|test|schemas)/**/*.+(ts|js|json)|command-snapshot.json\""
149+
"command": "prettier --write \"+(src|test|schemas)/**/*.+(ts|js|json)|command-snapshot.json\"",
150+
"files": [
151+
"src/**/*.ts",
152+
"test/**/*.ts",
153+
"schemas/**/*.json",
154+
"command-snapshot.json",
155+
".prettier*"
156+
],
157+
"output": []
154158
},
155159
"lint": {
156160
"command": "eslint src test --color --cache --cache-location .eslintcache",
157161
"files": [
158162
"src/**/*.ts",
159163
"test/**/*.ts",
160164
"messages/**",
161-
".eslintignore",
162-
".eslintrc.js"
165+
".eslint*"
163166
],
164167
"output": []
165168
},
@@ -177,7 +180,8 @@
177180
"command": "\"./bin/dev\" commandreference:generate --erroronwarnings",
178181
"files": [
179182
"src/**/*.ts",
180-
"messages/**"
183+
"messages/**",
184+
"package.json"
181185
],
182186
"output": [
183187
"tmp/root"
@@ -216,9 +220,12 @@
216220
"test/**/*.ts",
217221
"src/**/*.ts",
218222
"tsconfig.json",
219-
"test/tsconfig.json"
223+
".mocha*",
224+
"test/tsconfig.json",
225+
"!*.nut.ts",
226+
".nycrc"
220227
],
221228
"output": []
222229
}
223230
}
224-
}
231+
}

src/commands/force/org/create.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ export class Create extends SfCommand<CreateResult> {
282282
if (!scratchOrgInfo) {
283283
throw new SfError('No scratch org info returned from scratchOrgCreate');
284284
}
285-
if (!authFields || !authFields.orgId) {
285+
if (!authFields?.orgId) {
286286
throw new SfError('Information missing from authFields');
287287
}
288288

test/nut/legacy/delete.org.nut.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@ describe('Delete Orgs', () => {
2020
// create our own orgs to delete to avoid interfering with other NUTs/cleanup
2121
before(async () => {
2222
session = await TestSession.create({
23-
project: { name: 'forceOrgList' },
23+
project: { name: 'legacyOrgDelete' },
2424
devhubAuthStrategy: 'AUTO',
2525
scratchOrgs: [
2626
{
27-
executable: 'sfdx',
2827
setDefault: true,
2928
config: join('config', 'project-scratch-def.json'),
3029
},
3130
{
32-
executable: 'sfdx',
3331
alias: 'anAlias',
3432
config: join('config', 'project-scratch-def.json'),
3533
},

test/nut/listAndDisplay.nut.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const verifyHumanResults = (
3434
const aliasUserLine = lines.find((line) => line.includes(aliasedUsername));
3535
assert(aliasUserLine);
3636
expect(aliasUserLine).to.include('anAlias');
37-
// verbose mode should display sractch org Id and dev hub org Id
37+
// verbose mode should display scratch org Id and dev hub org Id
3838
if (verbose) {
3939
expect(defaultUserLine.match(/00D/g)).to.have.lengthOf(2, defaultUserLine);
4040
expect(aliasUserLine.match(/00D/g)).to.have.lengthOf(2, aliasUserLine);
@@ -57,12 +57,10 @@ describe('Org Command NUT', () => {
5757
devhubAuthStrategy: 'AUTO',
5858
scratchOrgs: [
5959
{
60-
executable: 'sfdx',
6160
config: join('config', 'project-scratch-def.json'),
6261
setDefault: true,
6362
},
6463
{
65-
executable: 'sfdx',
6664
config: join('config', 'project-scratch-def.json'),
6765
alias: 'anAlias',
6866
},

test/nut/open.nut.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ let session: TestSession;
1515
describe('test org:open command', () => {
1616
before(async () => {
1717
session = await TestSession.create({
18-
project: { name: 'forceOrgList' },
18+
project: { name: 'orgOpen' },
1919
devhubAuthStrategy: 'AUTO',
2020
scratchOrgs: [
2121
{
22-
executable: 'sfdx',
2322
config: join('config', 'project-scratch-def.json'),
2423
setDefault: true,
2524
},

0 commit comments

Comments
 (0)