Skip to content

Commit

Permalink
chore(vscode): fix bundle size
Browse files Browse the repository at this point in the history
  • Loading branch information
johnsoncodehk committed Jun 30, 2024
1 parent bca79db commit 733db3b
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 23 deletions.
5 changes: 3 additions & 2 deletions extensions/vscode/src/features/doctor.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { BaseLanguageClient, getTsdk, ExecuteCommandRequest, ExecuteCommandParams } from '@volar/vscode';
import { commands, SFCParseResult } from '@vue/language-server';
import { BaseLanguageClient, ExecuteCommandParams, ExecuteCommandRequest, getTsdk } from '@volar/vscode';
import type { SFCParseResult } from '@vue/language-server';
import { commands } from '@vue/language-server/lib/types';
import * as semver from 'semver';
import * as vscode from 'vscode';
import { config } from '../config';
Expand Down
6 changes: 3 additions & 3 deletions extensions/vscode/src/features/nameCasing.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as vscode from 'vscode';
import { quickPick } from '@volar/vscode/lib/common';
import { BaseLanguageClient, ExecuteCommandParams, ExecuteCommandRequest, State, TextEdit } from '@volar/vscode';
import { AttrNameCasing, TagNameCasing, commands } from '@vue/language-server';
import { quickPick } from '@volar/vscode/lib/common';
import { AttrNameCasing, TagNameCasing, commands } from '@vue/language-server/lib/types';
import * as vscode from 'vscode';
import { config } from '../config';

export const attrNameCasings = new Map<string, AttrNameCasing>();
Expand Down
3 changes: 2 additions & 1 deletion extensions/vscode/src/features/splitEditors.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ExecuteCommandParams, ExecuteCommandRequest, type BaseLanguageClient } from '@volar/vscode';
import { commands, type SFCParseResult } from '@vue/language-server';
import type { SFCParseResult } from '@vue/language-server';
import { commands } from '@vue/language-server/lib/types';
import * as vscode from 'vscode';
import { config } from '../config';

Expand Down
2 changes: 1 addition & 1 deletion extensions/vscode/src/middleware.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AttrNameCasing, TagNameCasing } from '@vue/language-server';
import { AttrNameCasing, TagNameCasing } from '@vue/language-server/lib/types';
import * as vscode from 'vscode';
import * as lsp from '@volar/vscode';
import { attrNameCasings, tagNameCasings } from './features/nameCasing';
Expand Down
4 changes: 2 additions & 2 deletions extensions/vscode/src/nodeClientMain.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createLabsInfo } from '@volar/vscode';
import * as serverLib from '@vue/language-server';
import * as protocol from '@vue/language-server/protocol';
import * as fs from 'fs';
import * as vscode from 'vscode';
import * as lsp from '@volar/vscode/node';
Expand All @@ -9,7 +9,7 @@ import { middleware } from './middleware';

export async function activate(context: vscode.ExtensionContext) {

const volarLabs = createLabsInfo(serverLib);
const volarLabs = createLabsInfo(protocol);

await commonActivate(context, (
id,
Expand Down
4 changes: 1 addition & 3 deletions packages/language-server/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
export { commands } from '@vue/language-service';
export * from './lib/types';
export * from './lib/initialize';

// export protocol and types of parent package
// export types of parent package
export * from '@volar/language-server/lib/types';
export * from '@volar/language-server/protocol';

// only export types of depend packages
export * from '@vue/language-service/lib/types';
2 changes: 1 addition & 1 deletion packages/language-server/lib/initialize.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LanguageServer } from '@volar/language-server';
import type { LanguageServer } from '@volar/language-server';
import { createTypeScriptProject } from '@volar/language-server/node';
import { createParsedCommandLine, createVueLanguagePlugin, FileMap, resolveVueCompilerOptions, VueCompilerOptions } from '@vue/language-core';
import { Disposable, getFullLanguageServicePlugins, InitializeParams } from '@vue/language-service';
Expand Down
3 changes: 3 additions & 0 deletions packages/language-server/lib/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ export type VueInitializationOptions = {
hybridMode?: boolean;
};
};

export * from '@volar/language-server/lib/types';
export * from '@vue/language-service/lib/types';
1 change: 1 addition & 0 deletions packages/language-server/protocol.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from '@volar/language-server/protocol';
11 changes: 1 addition & 10 deletions packages/language-service/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export * from './lib/ideFeatures/nameCasing';
export * from './lib/types';

import type { LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
import { AttrNameCasing, TagNameCasing } from './lib/types';
import { AttrNameCasing, commands, TagNameCasing } from './lib/types';

import { create as createEmmetPlugin } from 'volar-service-emmet';
import { create as createJsonPlugin } from 'volar-service-json';
Expand Down Expand Up @@ -149,15 +149,6 @@ export function getHybridModeLanguageServicePlugins(
return plugins;
}

export const commands = {
parseSfc: 'vue.parseSfc',
detectNameCasing: 'vue.detectNameCasing',
convertTagsToKebabCase: 'vue.convertTagsToKebabCase',
convertTagsToPascalCase: 'vue.convertTagsToPascalCase',
convertPropsToKebabCase: 'vue.convertPropsToKebabCase',
convertPropsToCamelCase: 'vue.convertPropsToCamelCase',
};

function getCommonLanguageServicePlugins(
ts: typeof import('typescript'),
getTsPluginClient: (context: LanguageServiceContext) => typeof import('@vue/typescript-plugin/lib/client') | undefined
Expand Down
9 changes: 9 additions & 0 deletions packages/language-service/lib/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ export enum AttrNameCasing {
Camel,
}

export const commands = {
parseSfc: 'vue.parseSfc',
detectNameCasing: 'vue.detectNameCasing',
convertTagsToKebabCase: 'vue.convertTagsToKebabCase',
convertTagsToPascalCase: 'vue.convertTagsToPascalCase',
convertPropsToKebabCase: 'vue.convertPropsToKebabCase',
convertPropsToCamelCase: 'vue.convertPropsToCamelCase',
};

// only export types of depend packages
export * from '@volar/language-service/lib/types';
export * from '@vue/language-core/lib/types';

0 comments on commit 733db3b

Please sign in to comment.