Skip to content
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

Jump to bottom

Fix relative TypeScript path in monorepos #42586

Merged
merged 4 commits into from Nov 7, 2022
Merged

Fix relative TypeScript path in monorepos #42586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6863195
fix ts relative path in a monorepo
shuding Nov 7, 2022
13e176d
Merge branch 'canary' into shu/63cf
ijjk Nov 7, 2022
e6419b6
Merge branch 'canary' into shu/63cf
kodiakhq[bot] Nov 7, 2022
f9a8c44
Merge branch 'canary' into shu/63cf
kodiakhq[bot] Nov 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/next/lib/typescript/writeVscodeConfigurations.ts
View file
Open in desktop
Expand Up @@ -6,7 +6,8 @@ import * as CommentJson from 'next/dist/compiled/comment-json'

// Write .vscode settings to enable Next.js typescript plugin.
export async function writeVscodeConfigurations(
baseDir: string
baseDir: string,
tsPath: string
): Promise<void> {
try {
const vscodeSettings = path.join(baseDir, '.vscode', 'settings.json')
Expand All @@ -24,7 +25,7 @@ export async function writeVscodeConfigurations(
}
}

const libPath = './node_modules/typescript/lib'
const libPath = path.relative(baseDir, path.dirname(tsPath))
if (
settings['typescript.tsdk'] === libPath &&
settings['typescript.enablePromptUseWorkspaceTsdk']
Expand Down
5 changes: 3 additions & 2 deletions packages/next/lib/verifyTypeScriptSetup.ts
View file
Open in desktop
Expand Up @@ -103,8 +103,9 @@ export async function verifyTypeScriptSetup({
}

// Load TypeScript after we're sure it exists:
const tsPath = deps.resolved.get('typescript')!
const ts = (await Promise.resolve(
require(deps.resolved.get('typescript')!)
require(tsPath)
)) as typeof import('typescript')

if (semver.lt(ts.version, '4.3.2')) {
Expand All @@ -125,7 +126,7 @@ export async function verifyTypeScriptSetup({
await writeAppTypeDeclarations(dir, !disableStaticImages)

if (isAppDirEnabled) {
await writeVscodeConfigurations(dir)
await writeVscodeConfigurations(dir, tsPath)
}

let result
Expand Down