Skip to content

Commit af57cb2

Browse files
kaisalmenCGNonofr
authored andcommitted
fix: tsserver failed to start
typescript.tsserver.web.projectWideIntellisense.enabled can now be disabled
1 parent 54c00a7 commit af57cb2

File tree

5 files changed

+21
-19
lines changed

5 files changed

+21
-19
lines changed

demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"xterm-addon-webgl": "0.16.0"
4444
},
4545
"volta": {
46-
"node": "18.14.2",
47-
"npm": "9.5.1"
46+
"node": "18.18.0",
47+
"npm": "9.8.1"
4848
}
4949
}

demo/vite.config.ts

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,6 @@ export default defineConfig({
2121
next()
2222
})
2323
}
24-
},
25-
{
26-
// prevent vite from trying to inject code into an extension file du to an `import()` in that file
27-
name: 'hack-prevent-transform-javascript',
28-
apply: 'serve',
29-
load (source) {
30-
if (source.includes('tsserver.web.js')) {
31-
return `eval(${JSON.stringify(fs.readFileSync(source).toString('utf-8'))})`
32-
}
33-
}
3424
}
3525
],
3626
optimizeDeps: {
@@ -50,10 +40,9 @@ export default defineConfig({
5040
'vscode/default-extensions/objective-c', 'vscode/default-extensions/perl', 'vscode/default-extensions/php', 'vscode/default-extensions/powershell',
5141
'vscode/default-extensions/python', 'vscode/default-extensions/r', 'vscode/default-extensions/ruby', 'vscode/default-extensions/rust',
5242
'vscode/default-extensions/scss', 'vscode/default-extensions/shellscript', 'vscode/default-extensions/sql', 'vscode/default-extensions/swift',
53-
'vscode/default-extensions/typescript-basics', 'vscode/default-extensions/vb', 'vscode/default-extensions/xml', 'vscode/default-extensions/yaml',
54-
'vscode/default-extensions/theme-defaults', 'vscode/default-extensions/theme-seti',
55-
'vscode/default-extensions/references-view', 'vscode/default-extensions/typescript-basics', 'vscode/default-extensions/search-result',
56-
'vscode/default-extensions/typescript-language-features', 'vscode/default-extensions/markdown-language-features',
43+
'vscode/default-extensions/typescript-basics', 'vscode/default-extensions/typescript-language-features', 'vscode/default-extensions/vb',
44+
'vscode/default-extensions/xml', 'vscode/default-extensions/yaml', 'vscode/default-extensions/theme-defaults', 'vscode/default-extensions/theme-seti',
45+
'vscode/default-extensions/references-view', 'vscode/default-extensions/search-result', 'vscode/default-extensions/markdown-language-features',
5746
'vscode/default-extensions/json-language-features', 'vscode/default-extensions/css-language-features',
5847
'vscode/default-extensions/npm', 'vscode/default-extensions/css', 'vscode/default-extensions/markdown-basics', 'vscode/default-extensions/html',
5948
'vscode/default-extensions/html-language-features', 'vscode/default-extensions/configuration-editing', 'vscode/default-extensions/media-preview', 'vscode/default-extensions/markdown-math',

docs/vscode_monaco_upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
- Update dependencies
2828
- Implement improvements dependening on the new features available from vscode (optional)
2929

30-
## Hints:
30+
## Hints
3131

3232
Use repo log viewers and check the last update branch when in doubt

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
"recast": "^0.23.4"
180180
},
181181
"volta": {
182-
"node": "18.17.1",
183-
"npm": "9.6.7"
182+
"node": "18.18.0",
183+
"npm": "9.8.1"
184184
}
185185
}

scripts/vscode.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,19 @@ index 775a1be5996..ce8435bd920 100644
6868
relativePath = relativePath.replace(/\\/g, '/');
6969
if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
7070
relativePath = './' + relativePath;
71+
diff --git a/extensions/typescript-language-features/web/typingsInstaller.ts b/extensions/typescript-language-features/web/typingsInstaller.ts
72+
index 7b9b164c40c..a961bb7267a 100644
73+
--- a/extensions/typescript-language-features/web/typingsInstaller.ts
74+
+++ b/extensions/typescript-language-features/web/typingsInstaller.ts
75+
@@ -66,6 +66,8 @@ export default class WebTypingsInstallerClient implements ts.server.ITypingsInst
76+
case 'action::packageInstalled':
77+
case 'action::invalidate':
78+
case 'action::set':
79+
+ // missing case leads to error
80+
+ case 'action::watchTypingLocations':
81+
this.projectService!.updateTypingsForProject(response);
82+
break;
83+
case 'event::beginInstallTypes':
7184
diff --git a/extensions/typescript-language-features/web/webServer.ts b/extensions/typescript-language-features/web/webServer.ts
7285
index 191c2d03f63..f1526cf68ac 100644
7386
--- a/extensions/typescript-language-features/web/webServer.ts

0 commit comments

Comments
 (0)