diff --git a/package.json b/package.json index eac1b5f1..0ffcab5f 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "@vitejs/plugin-vue": "^5.0.4", "@volar/monaco": "~2.1.0", "@volar/typescript": "~2.1.0", - "@vue/language-service": "2.0.1", + "@vue/language-service": "2.0.3", "bumpp": "^9.3.0", "codemirror": "^5.65.16", "conventional-changelog-cli": "^4.1.0", @@ -103,8 +103,7 @@ }, "pnpm": { "patchedDependencies": { - "@volar/monaco@2.1.0": "patches/@volar__monaco@2.1.0.patch", - "@vue/typescript-plugin@2.0.1": "patches/@vue__typescript-plugin@2.0.1.patch" + "@volar/monaco@2.1.0": "patches/@volar__monaco@2.1.0.patch" } } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0bf2e38d..57a16d84 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,9 +8,6 @@ patchedDependencies: '@volar/monaco@2.1.0': hash: i2wbe4djnc7tc6em3zycjamena path: patches/@volar__monaco@2.1.0.patch - '@vue/typescript-plugin@2.0.1': - hash: 24wta7rmfejryhbtwfpunkvv44 - path: patches/@vue__typescript-plugin@2.0.1.patch devDependencies: '@babel/types': @@ -44,8 +41,8 @@ devDependencies: specifier: ~2.1.0 version: 2.1.0 '@vue/language-service': - specifier: 2.0.1 - version: 2.0.1(typescript@5.3.3) + specifier: 2.0.3 + version: 2.0.3(typescript@5.3.3) bumpp: specifier: ^9.3.0 version: 9.3.0 @@ -1163,8 +1160,8 @@ packages: vue-template-compiler: 2.7.16 dev: true - /@vue/language-core@2.0.1(typescript@5.3.3): - resolution: {integrity: sha512-TZ9xKj3WhZol2hWvXcCjGDiOVkmQ1aG7MS3YJkhVMeoLYyopP5XFn9Obc9qorxG6vZDWapRxBkyEzJ9d6xL3Zg==} + /@vue/language-core@2.0.3(typescript@5.3.3): + resolution: {integrity: sha512-hnVF/Q3cD2v+EFD4pD1YdITGBcdM38P18SYqilVQDezKw5RobWny4BwIckWGS1fJmUstsO9mTX30ZOyzyR2Q+Q==} peerDependencies: typescript: '*' peerDependenciesMeta: @@ -1181,16 +1178,15 @@ packages: vue-template-compiler: 2.7.16 dev: true - /@vue/language-service@2.0.1(typescript@5.3.3): - resolution: {integrity: sha512-Jlc6mDuIzfMisUwwZ4Ycpei9Y9LToz5Qbqce+rqIkDtEYbc6oN3fZMaVq8h4UwqmV0Vif/eFOg8C1SEchb0V1g==} + /@vue/language-service@2.0.3(typescript@5.3.3): + resolution: {integrity: sha512-sU8DjlZSor74hMY98aj7uW8uy8voltCfNjffQGPWB5JyJ8/Q3cX3C1vD+PmibCOAICQYCc07MShlrpWnFu6vmQ==} dependencies: '@volar/language-core': 2.1.0 '@volar/language-service': 2.1.0 '@volar/typescript': 2.1.0 '@vue/compiler-dom': 3.4.21 - '@vue/language-core': 2.0.1(typescript@5.3.3) + '@vue/language-core': 2.0.3(typescript@5.3.3) '@vue/shared': 3.4.21 - '@vue/typescript-plugin': 2.0.1(patch_hash=24wta7rmfejryhbtwfpunkvv44)(typescript@5.3.3) computeds: 0.0.1 path-browserify: 1.0.1 volar-service-css: 0.0.31(@volar/language-service@2.1.0) @@ -1250,17 +1246,6 @@ packages: resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==} dev: true - /@vue/typescript-plugin@2.0.1(patch_hash=24wta7rmfejryhbtwfpunkvv44)(typescript@5.3.3): - resolution: {integrity: sha512-TNUIqt9H56T53HPNVQ8I5okPhodEkpvtODBbtsf1h7BS0k9h4VJCQoNTXKPhSSGIySu/lDE7YAwiMinLnhm1lA==} - dependencies: - '@volar/typescript': 2.1.0 - '@vue/language-core': 2.0.1(typescript@5.3.3) - '@vue/shared': 3.4.21 - transitivePeerDependencies: - - typescript - dev: true - patched: true - /JSONStream@1.3.5: resolution: {integrity: sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==} hasBin: true diff --git a/src/monaco/vue.worker.ts b/src/monaco/vue.worker.ts index 78a96ee4..57d68a19 100644 --- a/src/monaco/vue.worker.ts +++ b/src/monaco/vue.worker.ts @@ -33,15 +33,6 @@ self.onmessage = async (msg: MessageEvent) => { return } - const env: ServiceEnvironment = { - workspaceFolder: 'file:///', - locale, - typescript: { - uriToFileName: (uri) => uri.substring('file://'.length), - fileNameToUri: (fileName) => 'file://' + fileName, - }, - } - worker.initialize( ( ctx: monaco.worker.IWorkerContext, @@ -51,6 +42,16 @@ self.onmessage = async (msg: MessageEvent) => { dependencies, }: CreateData, ) => { + const uriToFileName = (uri: string) => uri.substring('file://'.length) + const env: ServiceEnvironment = { + workspaceFolder: 'file:///', + locale, + typescript: { + uriToFileName, + fileNameToUri: (fileName) => 'file://' + fileName, + }, + } + const { options: compilerOptions } = ts.convertCompilerOptionsFromJson( tsconfig?.compilerOptions || {}, '',