Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .yarn/versions/c309a37a.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
releases:
"@yarnpkg/sdks": major
22 changes: 22 additions & 0 deletions packages/yarnpkg-sdks/sources/sdkUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,25 @@ export const addSettingWorkspaceConfiguration = async (pnpApi: PnpApi, relativeF
automaticNewlines: true,
});
};

export const removeSettingWorkspaceConfiguration = async (pnpApi: PnpApi, relativeFileName: PortablePath, keysToRemove: Array<string>) => {
const topLevelInformation = pnpApi.getPackageInformation(pnpApi.topLevel)!;
const projectRoot = npath.toPortablePath(topLevelInformation.packageLocation);

const filePath = ppath.join(projectRoot, relativeFileName);

if (!await xfs.existsPromise(filePath))
return;

const content = await xfs.readFilePromise(filePath, `utf8`);
const data = CJSON.parse(content);

for (const key of keysToRemove)
delete data[key];

const patched = `${CJSON.stringify(data, null, 2)}\n`;

await xfs.changeFilePromise(filePath, patched, {
automaticNewlines: true,
});
};
15 changes: 13 additions & 2 deletions packages/yarnpkg-sdks/sources/sdks/vscode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ export const addVSCodeWorkspaceConfiguration = async (pnpApi: PnpApi, type: VSCo
await sdkUtils.addSettingWorkspaceConfiguration(pnpApi, relativeFilePath, patch);
};

export const removeVSCodeWorkspaceConfiguration = async (pnpApi: PnpApi, type: VSCodeConfiguration, patch: any) => {
const relativeFilePath = `.vscode/${type}` as PortablePath;
await sdkUtils.removeSettingWorkspaceConfiguration(pnpApi, relativeFilePath, patch);
};

export const generateDefaultWrapper: GenerateDefaultWrapper = async (pnpApi: PnpApi) => {
await addVSCodeWorkspaceConfiguration(pnpApi, VSCodeConfiguration.settings, {
[`search.exclude`]: {
Expand Down Expand Up @@ -94,15 +99,21 @@ export const generateRelayCompilerWrapper: GenerateIntegrationWrapper = async (p
};

export const generateTypescriptWrapper: GenerateIntegrationWrapper = async (pnpApi: PnpApi, target: PortablePath, wrapper: Wrapper) => {
// Remove old TypeScript settings if present to prevent deprecation warnings from vscode
await removeVSCodeWorkspaceConfiguration(pnpApi, VSCodeConfiguration.settings, [
`typescript.tsdk`,
`typescript.enablePromptUseWorkspaceTsdk`,
]);

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