Skip to content

Commit 9cb6216

Browse files
authored
fix: bump libs (#508)
1 parent 1bfe829 commit 9cb6216

9 files changed

Lines changed: 260 additions & 106 deletions

File tree

.sfdevrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
"wireit": {
66
"test:command-reference": {
7-
"command": "\"./bin/dev\" commandreference:generate --plugins auth --outputdir test/tmp",
7+
"command": "ts-node \"./bin/dev.js\" commandreference:generate --plugins auth --outputdir test/tmp",
88
"files": ["src/**/*.ts", "messages/**", "package.json"],
99
"output": ["test/tmp"]
1010
},

bin/dev

Lines changed: 0 additions & 12 deletions
This file was deleted.

bin/dev.cmd

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
set NODE_ENV=development
3-
node "%~dp0\dev" %*
2+
3+
node --loader ts-node/esm --no-warnings=ExperimentalWarning "%~dp0\dev" %*

bin/dev.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env ts-node
2+
// eslint-disable-next-line node/shebang, unicorn/prefer-top-level-await
3+
(async () => {
4+
const oclif = await import('@oclif/core');
5+
await oclif.execute({ development: true, dir: __dirname });
6+
})();

bin/run

Lines changed: 0 additions & 3 deletions
This file was deleted.

bin/run.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env node
2+
3+
// eslint-disable-next-line unicorn/prefer-top-level-await
4+
(async () => {
5+
const oclif = await import('@oclif/core');
6+
await oclif.execute({ development: false, dir: __dirname });
7+
})();

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55
"author": "Salesforce",
66
"bugs": "https://github.com/salesforcecli/plugin-command-reference/issues",
77
"dependencies": {
8-
"@oclif/core": "^2.15.0",
8+
"@oclif/core": "^3.0.0",
99
"@salesforce/core": "^5.3.20",
1010
"@salesforce/kit": "^3.0.15",
11-
"@salesforce/sf-plugins-core": "^3.1.28",
11+
"@salesforce/sf-plugins-core": "^4",
1212
"@salesforce/ts-types": "^2.0.9",
1313
"chalk": "^4",
1414
"handlebars": "^4.7.8",
1515
"tslib": "^2"
1616
},
1717
"devDependencies": {
18-
"@oclif/plugin-help": "^5.2.20",
18+
"@oclif/plugin-help": "^6",
1919
"@salesforce/dev-scripts": "^6.0.3",
2020
"@salesforce/plugin-auth": "^2.8.26",
2121
"@types/debug": "^4.1.12",
2222
"@types/ejs": "^3.1.5",
2323
"eslint-plugin-sf-plugin": "^1.16.15",
24-
"oclif": "^3.17.2",
24+
"oclif": "^4",
2525
"shx": "^0.3.3",
2626
"ts-node": "^10.9.1",
2727
"typescript": "^5.2.2"
@@ -156,7 +156,7 @@
156156
]
157157
},
158158
"test:command-reference": {
159-
"command": "\"./bin/dev\" commandreference:generate --plugins auth --outputdir test/tmp",
159+
"command": "ts-node \"./bin/dev.js\" commandreference:generate --plugins auth --outputdir test/tmp",
160160
"files": [
161161
"src/**/*.ts",
162162
"messages/**",
@@ -167,7 +167,7 @@
167167
]
168168
},
169169
"test:deprecation-policy": {
170-
"command": "\"./bin/dev\" snapshot:compare",
170+
"command": "ts-node \"./bin/dev.js\" snapshot:compare",
171171
"files": [
172172
"src/**/*.ts"
173173
],
@@ -177,7 +177,7 @@
177177
]
178178
},
179179
"test:json-schema": {
180-
"command": "\"./bin/dev\" schema:compare",
180+
"command": "ts-node \"./bin/dev.js\" schema:compare",
181181
"files": [
182182
"src/**/*.ts",
183183
"schemas"

src/commands/commandreference/generate.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,10 @@ export default class CommandReferenceGenerate extends SfCommand<CommandReference
7878

7979
let pluginNames: string[];
8080
if (!flags.plugins && !flags.all) {
81-
pluginNames = this.loadedConfig.plugins.filter((p) => p.type !== 'dev').map((p) => p.name);
81+
pluginNames = this.loadedConfig
82+
.getPluginsList()
83+
.filter((p) => p.type !== 'dev')
84+
.map((p) => p.name);
8285
} else if (flags.all) {
8386
const ignore = [
8487
/@oclif/,
@@ -87,7 +90,10 @@ export default class CommandReferenceGenerate extends SfCommand<CommandReference
8790
/@salesforce\/plugin-telemetry/,
8891
/@salesforce\/plugin-command-reference/,
8992
];
90-
pluginNames = this.loadedConfig.plugins.map((p) => p.name).filter((p) => !ignore.some((i) => i.test(p)));
93+
pluginNames = this.loadedConfig
94+
.getPluginsList()
95+
.map((p) => p.name)
96+
.filter((p) => !ignore.some((i) => i.test(p)));
9197
} else {
9298
pluginNames = flags.plugins ?? [];
9399
}
@@ -179,7 +185,7 @@ export default class CommandReferenceGenerate extends SfCommand<CommandReference
179185
}
180186

181187
private getPlugin(pluginName: string): Interfaces.Plugin | undefined {
182-
return this.loadedConfig.plugins.find((info) => info.name === pluginName);
188+
return this.loadedConfig.plugins.get(pluginName);
183189
}
184190

185191
// eslint-disable-next-line class-methods-use-this

0 commit comments

Comments
 (0)