Skip to content

Commit 354c878

Browse files
committed
refactor: move vue modules to vue-language-tools/*
1 parent 7eb574b commit 354c878

File tree

199 files changed

+254
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+254
-226
lines changed

examples/svelte/tsconfig.build.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4+
"noEmit": false,
45
"outDir": "out",
56
"rootDir": "src",
67
},

extensions/vscode-vue-language-features/tsconfig.build.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4+
"noEmit": false,
45
"outDir": "out",
56
"rootDir": "src",
67
},
@@ -14,7 +15,7 @@
1415
],
1516
"references": [
1617
{
17-
"path": "../../packages/vue-language-server/tsconfig.build.json"
18+
"path": "../../vue-language-tools/vue-language-server/tsconfig.build.json"
1819
},
1920
{
2021
"path": "../../packages/preview/tsconfig.build.json"

packages/language-core/tsconfig.build.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4+
"noEmit": false,
45
"outDir": "out",
56
"rootDir": "src",
67
},

packages/language-server/src/utils/config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import * as vue from '@volar/vue-language-service';
1+
import { LanguageServicePlugin } from '@volar/language-service';
22

33
export function loadCustomPlugins(dir: string) {
44
try {
55
const configPath = require.resolve('./volar.config.js', { paths: [dir] });
6-
const config: { plugins?: vue.EmbeddedLanguageServicePlugin[]; } = require(configPath);
6+
const config: { plugins?: LanguageServicePlugin[]; } = require(configPath);
77
// console.warn('Found', configPath, 'and loaded', config.plugins?.length, 'plugins.');
88
return config.plugins ?? [];
99
}

packages/language-server/src/utils/configurationHost.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as vscode from 'vscode-languageserver';
2-
import { ConfigurationHost } from '@volar/vue-language-service';
2+
import { ConfigurationHost } from '@volar/language-service';
33

44
export function createConfigurationHost(params: vscode.InitializeParams, connection: vscode.Connection): ConfigurationHost & { ready(): void; } {
55

packages/language-server/src/utils/documentServiceHost.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { LanguageServerPlugin, RuntimeEnvironment } from '../types';
22
import * as embedded from '@volar/language-service';
3-
import { ConfigurationHost } from '@volar/vue-language-service';
43
import { URI } from 'vscode-uri';
54
import { loadCustomPlugins } from './config';
65

@@ -11,7 +10,7 @@ export function createDocumentServiceHost(
1110
runtimeEnv: RuntimeEnvironment,
1211
plugins: ReturnType<LanguageServerPlugin>[],
1312
ts: typeof import('typescript/lib/tsserverlibrary'),
14-
configHost: ConfigurationHost | undefined,
13+
configHost: embedded.ConfigurationHost | undefined,
1514
) {
1615

1716
const workspaceServices = new Map<string, embedded.DocumentService>();

packages/language-server/src/utils/inferredCompilerOptions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ConfigurationHost } from '@volar/vue-language-service';
1+
import { ConfigurationHost } from '@volar/language-service';
22
import type * as ts from 'typescript/lib/tsserverlibrary';
33

44
export async function getInferredCompilerOptions(

packages/language-server/src/utils/project.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { URI } from 'vscode-uri';
77
import { loadCustomPlugins } from './config';
88
import { FileSystem, FileSystemHost, LanguageServerPlugin, RuntimeEnvironment } from '../types';
99
import { createSnapshots } from './snapshots';
10-
import { ConfigurationHost } from '@volar/vue-language-service';
10+
import { ConfigurationHost } from '@volar/language-service';
1111
import * as html from 'vscode-html-languageservice';
1212
import * as path from 'typesafe-path';
1313
import { CancellactionTokenHost } from './cancellationPipe';

packages/language-server/src/utils/workspaces.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as shared from '@volar/shared';
2-
import { ConfigurationHost } from '@volar/vue-language-service';
2+
import { ConfigurationHost } from '@volar/language-service';
33
import type * as ts from 'typescript/lib/tsserverlibrary';
44
import * as vscode from 'vscode-languageserver';
55
import { URI } from 'vscode-uri';

packages/language-server/tsconfig.build.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4+
"noEmit": false,
45
"outDir": "out",
56
"rootDir": "src",
67
},
@@ -16,10 +17,10 @@
1617
"path": "../shared/tsconfig.build.json"
1718
},
1819
{
19-
"path": "../vue-language-core/tsconfig.build.json"
20+
"path": "../language-core/tsconfig.build.json"
2021
},
2122
{
22-
"path": "../vue-language-service/tsconfig.build.json"
23+
"path": "../language-service/tsconfig.build.json"
2324
},
2425
]
2526
}

0 commit comments

Comments
 (0)