Skip to content

feat!: require Node >=22, drop EOL Node versions @W-23480655@ #1530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iowillhoit merged 2 commits into from
Jul 30, 2026
Merged

feat!: require Node >=22, drop EOL Node versions @W-23480655@ #1530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c766955
feat!: require Node >=22, drop EOL Node versions @W-23480655@
WillieRuemmele Jul 29, 2026
cdf7cef
fix: update test stub for core 9 config resolution + regenerate schemas
WillieRuemmele Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"@inquirer/checkbox": "^2.5.0",
"@inquirer/select": "^2.5.0",
"@oclif/core": "^4",
"@salesforce/core": "^8.25.1",
"@salesforce/kit": "^3.2.4",
"@salesforce/core": "^9.0.0",
"@salesforce/kit": "^4.0.0",
"@salesforce/plugin-info": "^3.4.131",
"@salesforce/sf-plugins-core": "^12.2.6",
"@salesforce/ts-types": "^2.0.11",
"@salesforce/sf-plugins-core": "^13.0.0",
"@salesforce/ts-types": "^3.0.0",
"open": "^10.2.0"
},
"devDependencies": {
Expand All @@ -29,7 +29,7 @@
"typescript": "^5.5.4"
},
"engines": {
"node": ">=18.0.0"
"node": ">=22.0.0"
},
"files": [
"/lib",
Expand Down
17 changes: 14 additions & 3 deletions schemas/org-list-auth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@
},
"oauthMethod": {
"type": "string",
"enum": ["jwt", "web", "token", "unknown"]
"enum": [
"jwt",
"web",
"token",
"unknown"
]
},
"configs": {
"anyOf": [
Expand Down Expand Up @@ -64,8 +69,14 @@
]
}
},
"required": ["alias", "isExpired", "oauthMethod", "orgId", "username"]
"required": [
"alias",
"isExpired",
"oauthMethod",
"orgId",
"username"
]
}
}
}
}
}
25 changes: 18 additions & 7 deletions schemas/org-login-access__token.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@
"const": "web"
}
},
"required": ["clientId", "accessToken", "refreshToken", "oauthFlow"],
"required": [
"clientId",
"accessToken",
"refreshToken",
"oauthFlow"
],
"additionalProperties": false
}
},
Expand Down Expand Up @@ -82,9 +87,6 @@
"refreshToken": {
"type": "string"
},
"scratchAdminUsername": {
"type": "string"
},
"snapshot": {
"type": "string"
},
Expand Down Expand Up @@ -116,7 +118,10 @@
"type": "string"
},
"namespacePrefix": {
"type": ["string", "null"]
"type": [
"string",
"null"
]
},
"isSandbox": {
"type": "boolean"
Expand All @@ -125,11 +130,17 @@
"type": "boolean"
},
"trailExpirationDate": {
"type": ["string", "null"]
"type": [
"string",
"null"
]
},
"orgEdition": {
"type": "string"
}
},
"additionalProperties": false,
"description": "Fields for authorization, org, and local information."
}
}
}
}
25 changes: 18 additions & 7 deletions schemas/org-login-jwt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@
"const": "web"
}
},
"required": ["clientId", "accessToken", "refreshToken", "oauthFlow"],
"required": [
"clientId",
"accessToken",
"refreshToken",
"oauthFlow"
],
"additionalProperties": false
}
},
Expand Down Expand Up @@ -82,9 +87,6 @@
"refreshToken": {
"type": "string"
},
"scratchAdminUsername": {
"type": "string"
},
"snapshot": {
"type": "string"
},
Expand Down Expand Up @@ -116,7 +118,10 @@
"type": "string"
},
"namespacePrefix": {
"type": ["string", "null"]
"type": [
"string",
"null"
]
},
"isSandbox": {
"type": "boolean"
Expand All @@ -125,11 +130,17 @@
"type": "boolean"
},
"trailExpirationDate": {
"type": ["string", "null"]
"type": [
"string",
"null"
]
},
"orgEdition": {
"type": "string"
}
},
"additionalProperties": false,
"description": "Fields for authorization, org, and local information."
}
}
}
}
25 changes: 18 additions & 7 deletions schemas/org-login-sfdx__url.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@
"const": "web"
}
},
"required": ["clientId", "accessToken", "refreshToken", "oauthFlow"],
"required": [
"clientId",
"accessToken",
"refreshToken",
"oauthFlow"
],
"additionalProperties": false
}
},
Expand Down Expand Up @@ -82,9 +87,6 @@
"refreshToken": {
"type": "string"
},
"scratchAdminUsername": {
"type": "string"
},
"snapshot": {
"type": "string"
},
Expand Down Expand Up @@ -116,7 +118,10 @@
"type": "string"
},
"namespacePrefix": {
"type": ["string", "null"]
"type": [
"string",
"null"
]
},
"isSandbox": {
"type": "boolean"
Expand All @@ -125,11 +130,17 @@
"type": "boolean"
},
"trailExpirationDate": {
"type": ["string", "null"]
"type": [
"string",
"null"
]
},
"orgEdition": {
"type": "string"
}
},
"additionalProperties": false,
"description": "Fields for authorization, org, and local information."
}
}
}
}
25 changes: 18 additions & 7 deletions schemas/org-login-web.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@
"const": "web"
}
},
"required": ["clientId", "accessToken", "refreshToken", "oauthFlow"],
"required": [
"clientId",
"accessToken",
"refreshToken",
"oauthFlow"
],
"additionalProperties": false
}
},
Expand Down Expand Up @@ -82,9 +87,6 @@
"refreshToken": {
"type": "string"
},
"scratchAdminUsername": {
"type": "string"
},
"snapshot": {
"type": "string"
},
Expand Down Expand Up @@ -116,7 +118,10 @@
"type": "string"
},
"namespacePrefix": {
"type": ["string", "null"]
"type": [
"string",
"null"
]
},
"isSandbox": {
"type": "boolean"
Expand All @@ -125,11 +130,17 @@
"type": "boolean"
},
"trailExpirationDate": {
"type": ["string", "null"]
"type": [
"string",
"null"
]
},
"orgEdition": {
"type": "string"
}
},
"additionalProperties": false,
"description": "Fields for authorization, org, and local information."
}
}
}
}
2 changes: 1 addition & 1 deletion schemas/org-logout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
}
}
}
}
}
12 changes: 4 additions & 8 deletions test/common.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { ConfigContents, SfdcUrl, Global, Mode } from '@salesforce/core';
import { ConfigContents, SfdcUrl, SfProject, Global, Mode } from '@salesforce/core';
import { assert, expect } from 'chai';
import { TestContext, uniqid } from '@salesforce/core/testSetup';
import common from '../src/common.js';
Expand Down Expand Up @@ -144,13 +144,9 @@ describe('common unit tests', () => {
expect(loginUrl).to.equal(INSTANCE_URL_1);
});
it('should return custom login URL if project with property sfdcLoginUrl present and not equal to production URL', async () => {
await projectSetup($$, true, {
packageDirectories: [
{
path: 'force-app',
default: true,
},
],
$$.inProject(true);
$$.SANDBOXES.PROJECT.stub(SfProject.prototype, 'resolveProjectConfig').resolves({
packageDirectories: [{ path: 'force-app', default: true }],
sfdcLoginUrl: INSTANCE_URL_2,
sourceApiVersion: '50.0',
});
Expand Down
Loading
Loading