Skip to content

Commit 8fbd593

Browse files
committed
build: migrate to eslint flat config and typescript 6
1 parent 07ea7a7 commit 8fbd593

43 files changed

Lines changed: 1154 additions & 1226 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.eslintrc.cjs

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

eslint-suppressions.json

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
{
2+
"src/agentActivation.ts": {
3+
"no-useless-assignment": {
4+
"count": 1
5+
}
6+
},
7+
"src/commands/agent/adl/create.ts": {
8+
"sf-plugin/flag-min-max-default": {
9+
"count": 1
10+
}
11+
},
12+
"src/commands/agent/adl/upload.ts": {
13+
"sf-plugin/flag-min-max-default": {
14+
"count": 1
15+
}
16+
},
17+
"src/commands/agent/generate/agent-spec.ts": {
18+
"@typescript-eslint/no-unused-vars": {
19+
"count": 1
20+
}
21+
},
22+
"src/commands/agent/generate/test-spec.ts": {
23+
"@typescript-eslint/no-unused-vars": {
24+
"count": 2
25+
}
26+
},
27+
"src/commands/agent/publish/authoring-bundle.ts": {
28+
"@typescript-eslint/explicit-function-return-type": {
29+
"count": 1
30+
}
31+
},
32+
"src/commands/agent/test/create.ts": {
33+
"complexity": {
34+
"count": 1
35+
}
36+
},
37+
"src/commands/agent/test/run.ts": {
38+
"sf-plugin/flag-min-max-default": {
39+
"count": 1
40+
}
41+
},
42+
"src/components/agent-preview-react.tsx": {
43+
"@typescript-eslint/explicit-function-return-type": {
44+
"count": 1
45+
},
46+
"@typescript-eslint/no-unused-vars": {
47+
"count": 1
48+
}
49+
},
50+
"src/flags.ts": {
51+
"@typescript-eslint/no-unused-vars": {
52+
"count": 1
53+
}
54+
},
55+
"test/nuts/agent.activate.nut.ts": {
56+
"@typescript-eslint/no-unused-vars": {
57+
"count": 1
58+
}
59+
},
60+
"test/nuts/shared-setup.ts": {
61+
"@typescript-eslint/no-unused-vars": {
62+
"count": 1
63+
},
64+
"@typescript-eslint/prefer-promise-reject-errors": {
65+
"count": 1
66+
}
67+
},
68+
"test/nuts/z2.agent.publish.nut.ts": {
69+
"@typescript-eslint/no-unused-vars": {
70+
"count": 1
71+
},
72+
"@typescript-eslint/prefer-promise-reject-errors": {
73+
"count": 1
74+
}
75+
}
76+
}

eslint.config.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default } from 'eslint-config-salesforce-typescript';

package.json

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
"@inquirer/prompts": "^7.10.1",
1313
"@oclif/core": "^5.0.0",
1414
"@oclif/multi-stage-output": "^1.0.0",
15-
"@salesforce/agents": "^2.1.0",
16-
"@salesforce/core": "^9.1.8",
15+
"@salesforce/agents": "^2.3.0",
16+
"@salesforce/core": "^9.1.10",
1717
"@salesforce/kit": "^4.0.0",
1818
"@salesforce/sf-plugins-core": "^13.0.4",
19-
"@salesforce/source-deploy-retrieve": "^13.3.0",
19+
"@salesforce/source-deploy-retrieve": "^13.3.1",
2020
"@salesforce/types": "1.8.0",
2121
"ansis": "^3.17.0",
2222
"fast-xml-parser": "^5.11.1",
@@ -31,19 +31,25 @@
3131
"@oclif/plugin-command-snapshot": "^6.0.0",
3232
"@oclif/test": "^5.0.0",
3333
"@salesforce/cli-plugins-testkit": "^5.3.66",
34-
"@salesforce/dev-scripts": "^11.0.4",
35-
"@salesforce/plugin-command-reference": "^3.1.132",
34+
"@salesforce/dev-scripts": "^14.0.0",
35+
"@salesforce/plugin-command-reference": "^3.1.133",
36+
"@types/chai": "^4.3.17",
3637
"@types/inquirer": "^9.0.10",
38+
"@types/mocha": "^10.0.10",
39+
"@types/node": "^18",
3740
"@types/react": "^18.3.31",
41+
"@types/sinon": "^10.0.20",
42+
"eslint": "^10.4.0",
43+
"eslint-config-salesforce-typescript": "^6.0.0",
3844
"eslint-config-xo": "^0.50.0",
3945
"eslint-config-xo-react": "^0.27.0",
4046
"eslint-plugin-react": "^7.37.5",
4147
"eslint-plugin-react-hooks": "^4.6.2",
42-
"eslint-plugin-sf-plugin": "^1.20.33",
48+
"eslint-plugin-sf-plugin": "^3.0.0",
4349
"esmock": "^2.7.6",
44-
"oclif": "^5.0.0",
50+
"oclif": "^5.0.1",
4551
"ts-node": "^10.9.2",
46-
"typescript": "^5.9.3"
52+
"typescript": "^6.0.3"
4753
},
4854
"engines": {
4955
"node": ">=22.0.0"
@@ -179,6 +185,7 @@
179185
"src/**/*.ts",
180186
"test/**/*.ts",
181187
"messages/**",
188+
"**/eslint.config.*",
182189
"**/.eslint*",
183190
"**/tsconfig.json"
184191
],

src/commands/agent/generate/agent-spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ export default class AgentCreateSpec extends SfCommand<AgentCreateSpecResult> {
224224
(flags.tone as AgentTone) ??
225225
inputSpec?.tone ??
226226
(flags['full-interview'] ? await promptForFlag(FLAGGABLE_PROMPTS.tone) : 'casual');
227-
tone = validateTone(tone as AgentTone);
227+
tone = validateTone(tone);
228228
// const primaryLanguage =
229229
// flags['primary-language'] ??
230230
// inputSpec?.primaryLanguage ??

src/commands/agent/mcp/create.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
type McpServerCreateOutput,
2121
type McpServerCreateInput,
2222
type McpServerAuthorizationInput,
23-
type McpAuthType,
2423
} from '@salesforce/agents';
2524

2625
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
@@ -77,7 +76,7 @@ export default class ApiCatalogMcpServerCreate extends SfCommand<McpServerCreate
7776
const { flags } = await this.parse(ApiCatalogMcpServerCreate);
7877
const connection = flags['target-org'].getConnection(flags['api-version']);
7978

80-
const authType = flags['auth-type'] as McpAuthType;
79+
const authType = flags['auth-type'];
8180

8281
if (authType === 'OAUTH') {
8382
if (!flags['identity-provider'] || !flags['client-id'] || !flags['client-secret'] || !flags.scope) {

src/commands/agent/mcp/update.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
type McpServerOutput,
2121
type McpServerUpdateInput,
2222
type McpServerAuthorizationInput,
23-
type McpAuthType,
2423
} from '@salesforce/agents';
2524

2625
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
@@ -89,16 +88,11 @@ export default class ApiCatalogMcpServerUpdate extends SfCommand<ApiCatalogMcpSe
8988
input.serverUrl = flags['server-url'];
9089
}
9190

92-
const authType = flags['auth-type'] as McpAuthType | undefined;
91+
const authType = flags['auth-type'];
9392

9493
if (authType) {
9594
if (authType === 'OAUTH') {
96-
if (
97-
!flags['identity-provider'] ||
98-
!flags['client-id'] ||
99-
!flags['client-secret'] ||
100-
!flags.scope
101-
) {
95+
if (!flags['identity-provider'] || !flags['client-id'] || !flags['client-secret'] || !flags.scope) {
10296
throw new SfError(messages.getMessage('error.missingOauthFields'), 'MissingOauthFields', [], 1);
10397
}
10498

src/commands/agent/test/create.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const FLAGGABLE_PROMPTS = {
6464
},
6565
};
6666

67-
async function promptUntilUniqueName(connection: Connection, name?: string | undefined): Promise<string | undefined> {
67+
async function promptUntilUniqueName(connection: Connection, name?: string): Promise<string | undefined> {
6868
const apiName = name ?? (await promptForFlag(FLAGGABLE_PROMPTS['api-name']));
6969
const existingDefinitions = await AgentTest.list(connection);
7070
if (existingDefinitions.some((d) => d.fullName === apiName)) {

src/commands/agent/test/resume.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ export default class AgentTestResume extends SfCommand<AgentTestRunResult> {
169169
process.exitCode = 1;
170170
}
171171

172-
return { ...response, runId, status: 'COMPLETED' } as AgentTestRunResult;
172+
return { ...response, runId, status: 'COMPLETED' };
173173
}
174174

175175
protected catch(error: Error | SfError | CLIError): Promise<never> {

0 commit comments

Comments
 (0)