Skip to content

fix(sdks): update deprecated VSCode TypeScript settings to new keys #7225

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

Open
LoongzF wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −5
Open

fix(sdks): update deprecated VSCode TypeScript settings to new keys #7225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"editor.tabSize": 2,
"files.eol": "\n",
"typescript.tsdk": ".yarn/sdks/typescript/lib",
"js/ts.tsdk.path": ".yarn/sdks/typescript/lib",
"typescript.tsserver.watchOptions": {
"watchFile": "useFsEventsOnParentDirectory",
"watchDirectory": "useFsEvents"
Expand All @@ -21,7 +21,7 @@
"pasteImage.basePath": "${projectRoot}/packages/gatsby/static",
"pasteImage.forceUnixStyleSeparator": true,
"pasteImage.prefix": "/",
"typescript.enablePromptUseWorkspaceTsdk": true,
"js/ts.tsdk.promptToUseWorkspaceVersion": true,
"search.exclude": {
"**/.pnp.*": true,
"**/.yarn": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/yarnpkg-sdks/sources/commands/SdkCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default class SdkCommand extends Command {

- When \`base\` is used, only the base SDKs will be generated. This is useful for when an editor is not yet supported and you plan to manage the settings yourself.

- When a set of integrations is used (e.g. \`vscode\`, \`vim\`, ...), the base SDKs will be installed plus all the settings relevant to the corresponding environments (for example on VSCode it would set \`typescript.tsdk\`).
- When a set of integrations is used (e.g. \`vscode\`, \`vim\`, ...), the base SDKs will be installed plus all the settings relevant to the corresponding environments (for example on VSCode it would set \`js/ts.tsdk.path\`).

The supported integrations at this time are: ${[...SUPPORTED_INTEGRATIONS.keys()].map(integration => `\`${integration}\``).join(`, `)}.

Expand Down
4 changes: 2 additions & 2 deletions packages/yarnpkg-sdks/sources/sdks/vscode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ export const generateRelayCompilerWrapper: GenerateIntegrationWrapper = async (p

export const generateTypescriptWrapper: GenerateIntegrationWrapper = async (pnpApi: PnpApi, target: PortablePath, wrapper: Wrapper) => {
await addVSCodeWorkspaceConfiguration(pnpApi, VSCodeConfiguration.settings, {
[`typescript.tsdk`]: npath.fromPortablePath(
[`js/ts.tsdk.path`]: npath.fromPortablePath(
ppath.dirname(
wrapper.getProjectPathTo(
`lib/tsserver.js` as PortablePath,
),
),
),
[`typescript.enablePromptUseWorkspaceTsdk`]: true,
[`js/ts.tsdk.promptToUseWorkspaceVersion`]: true,
});
};

Expand Down
Loading