From 64f4f74fb641194c12edf3888a55a3359c9f594f Mon Sep 17 00:00:00 2001 From: Nate Moore Date: Wed, 5 May 2021 12:44:31 -0500 Subject: [PATCH] Split out `astro-languageserver` and `astro-vscode` (#173) --- .vscode/launch.json | 10 +- .vscode/tasks.json | 5 +- package.json | 6 + .../server => astro-languageserver}/LICENSE | 0 tools/astro-languageserver/package.json | 27 ++ .../src/core/config/ConfigManager.ts | 0 .../src/core/config/index.ts | 0 .../src/core/documents/Document.ts | 0 .../src/core/documents/DocumentManager.ts | 0 .../src/core/documents/index.ts | 0 .../src/core/documents/parseAstro.ts | 0 .../src/core/documents/parseHtml.ts | 0 .../src/core/documents/utils.ts | 0 .../src/index.ts | 6 +- .../src/plugins/PluginHost.ts | 0 .../src/plugins/astro/AstroPlugin.ts | 0 .../src/plugins/html/HTMLPlugin.ts | 0 .../src/plugins/index.ts | 0 .../src/plugins/interfaces.ts | 0 .../typescript/LanguageServiceManager.ts | 0 .../src/plugins/typescript/SnapshotManager.ts | 0 .../plugins/typescript/TypeScriptPlugin.ts | 0 .../src/plugins/typescript/astro-sys.ts | 0 .../features/CompletionsProvider.ts | 0 .../src/plugins/typescript/languageService.ts | 0 .../src/plugins/typescript/utils.ts | 0 .../astro-languageserver/src/types/index.d.ts | 4 + .../src/utils.ts | 0 .../tsconfig.json | 0 tools/{vscode => astro-vscode}/.vscodeignore | 0 .../{vscode => astro-vscode}/assets/icon.png | Bin .../astro-language-configuration.json | 0 tools/{vscode => astro-vscode}/package.json | 22 +- .../src/html/autoClose.ts | 0 .../client => astro-vscode}/src/index.ts | 4 +- .../syntaxes/astro.tmLanguage.json | 0 .../tsconfig.base.json | 0 .../client => astro-vscode}/tsconfig.json | 3 +- tools/vscode/packages/client/package.json | 12 - tools/vscode/packages/server/package.json | 22 -- tools/vscode/scripts/build.mjs | 37 -- tools/vscode/scripts/esbuild.config.mjs | 7 - tools/vscode/scripts/watch.mjs | 27 -- tools/vscode/tsconfig.json | 13 - yarn.lock | 318 ++++++++++++++---- 45 files changed, 323 insertions(+), 200 deletions(-) rename tools/{vscode/packages/server => astro-languageserver}/LICENSE (100%) create mode 100644 tools/astro-languageserver/package.json rename tools/{vscode/packages/server => astro-languageserver}/src/core/config/ConfigManager.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/core/config/index.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/core/documents/Document.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/core/documents/DocumentManager.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/core/documents/index.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/core/documents/parseAstro.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/core/documents/parseHtml.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/core/documents/utils.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/index.ts (98%) rename tools/{vscode/packages/server => astro-languageserver}/src/plugins/PluginHost.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/plugins/astro/AstroPlugin.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/plugins/html/HTMLPlugin.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/plugins/index.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/plugins/interfaces.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/plugins/typescript/LanguageServiceManager.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/plugins/typescript/SnapshotManager.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/plugins/typescript/TypeScriptPlugin.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/plugins/typescript/astro-sys.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/plugins/typescript/features/CompletionsProvider.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/plugins/typescript/languageService.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/src/plugins/typescript/utils.ts (100%) create mode 100644 tools/astro-languageserver/src/types/index.d.ts rename tools/{vscode/packages/server => astro-languageserver}/src/utils.ts (100%) rename tools/{vscode/packages/server => astro-languageserver}/tsconfig.json (100%) rename tools/{vscode => astro-vscode}/.vscodeignore (100%) rename tools/{vscode => astro-vscode}/assets/icon.png (100%) rename tools/{vscode => astro-vscode}/languages/astro-language-configuration.json (100%) rename tools/{vscode => astro-vscode}/package.json (82%) rename tools/{vscode/packages/client => astro-vscode}/src/html/autoClose.ts (100%) rename tools/{vscode/packages/client => astro-vscode}/src/index.ts (93%) rename tools/{vscode => astro-vscode}/syntaxes/astro.tmLanguage.json (100%) rename tools/{vscode => astro-vscode}/tsconfig.base.json (100%) rename tools/{vscode/packages/client => astro-vscode}/tsconfig.json (65%) delete mode 100644 tools/vscode/packages/client/package.json delete mode 100644 tools/vscode/packages/server/package.json delete mode 100644 tools/vscode/scripts/build.mjs delete mode 100644 tools/vscode/scripts/esbuild.config.mjs delete mode 100644 tools/vscode/scripts/watch.mjs delete mode 100644 tools/vscode/tsconfig.json diff --git a/.vscode/launch.json b/.vscode/launch.json index b458758c8..25ec2df98 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -3,15 +3,15 @@ "version": "0.2.0", "configurations": [ { - "type": "extensionHost", + "type": "pwa-extensionHost", "request": "launch", "name": "Launch Client", "runtimeExecutable": "${execPath}", - "args": ["--extensionDevelopmentPath=${workspaceRoot}/vscode"], - "outFiles": ["${workspaceRoot}/vscode/dist/**/*.js"], + "args": ["--extensionDevelopmentPath=${workspaceRoot}"], + "outFiles": ["${workspaceRoot}/tools/astro-vscode/dist/**/*.js"], "preLaunchTask": { "type": "npm", - "script": "build:extension" + "script": "build:vscode" } }, { @@ -20,7 +20,7 @@ "name": "Attach to Server", "port": 6040, "restart": true, - "outFiles": ["${workspaceRoot}/vscode/dist/**/*.js"] + "outFiles": ["${workspaceRoot}/tools/astro-languageserver/dist/**/*.js"] } ], "compounds": [ diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 3b066f021..d81861501 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -3,13 +3,12 @@ "tasks": [ { "type": "npm", - "script": "build:extension", + "script": "build:vscode", "group": "build", "presentation": { "panel": "dedicated", "reveal": "never" - }, - "problemMatcher": ["$tsc"] + } } ] } diff --git a/package.json b/package.json index 0fa802270..314e216fd 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,13 @@ { "name": "root", + "version": "0.0.0", "private": true, "scripts": { "release": "yarn build && yarn changeset publish", "build": "yarn build:core", "build:core": "lerna run build --scope astro --scope astro-parser --scope create-astro", + "build:vscode": "lerna run build --scope astro-languageserver --scope astro-vscode", + "dev:vscode": "lerna run dev --scope astro-languageserver --scope astro-vscode --parallel --stream", "format": "prettier -w '**/*.{js,jsx,ts,tsx,md,json}'", "lint": "eslint 'packages/**/*.ts'", "test": "yarn test:core && yarn test:prettier", @@ -18,6 +21,9 @@ "scripts", "www" ], + "engines": { + "vscode": "^1.22.0" + }, "volta": { "node": "14.16.1", "npm": "7.11.2", diff --git a/tools/vscode/packages/server/LICENSE b/tools/astro-languageserver/LICENSE similarity index 100% rename from tools/vscode/packages/server/LICENSE rename to tools/astro-languageserver/LICENSE diff --git a/tools/astro-languageserver/package.json b/tools/astro-languageserver/package.json new file mode 100644 index 000000000..7572c450a --- /dev/null +++ b/tools/astro-languageserver/package.json @@ -0,0 +1,27 @@ +{ + "name": "astro-languageserver", + "version": "0.3.0", + "author": "Skypack", + "license": "MIT", + "type": "commonjs", + "main": "dist/index.js", + "types": "types/index.d.ts", + "files": [ + "dist", + "types" + ], + "scripts": { + "build": "astro-scripts build 'src/index.ts'", + "dev": "astro-scripts dev 'src/index.ts'" + }, + "devDependencies": { + "astro": "0.0.9", + "astro-scripts": "0.0.1" + }, + "dependencies": { + "vscode-emmet-helper": "2.1.2", + "vscode-html-languageservice": "^3.0.3", + "vscode-languageserver": "6.1.1", + "vscode-languageserver-textdocument": "^1.0.1" + } +} diff --git a/tools/vscode/packages/server/src/core/config/ConfigManager.ts b/tools/astro-languageserver/src/core/config/ConfigManager.ts similarity index 100% rename from tools/vscode/packages/server/src/core/config/ConfigManager.ts rename to tools/astro-languageserver/src/core/config/ConfigManager.ts diff --git a/tools/vscode/packages/server/src/core/config/index.ts b/tools/astro-languageserver/src/core/config/index.ts similarity index 100% rename from tools/vscode/packages/server/src/core/config/index.ts rename to tools/astro-languageserver/src/core/config/index.ts diff --git a/tools/vscode/packages/server/src/core/documents/Document.ts b/tools/astro-languageserver/src/core/documents/Document.ts similarity index 100% rename from tools/vscode/packages/server/src/core/documents/Document.ts rename to tools/astro-languageserver/src/core/documents/Document.ts diff --git a/tools/vscode/packages/server/src/core/documents/DocumentManager.ts b/tools/astro-languageserver/src/core/documents/DocumentManager.ts similarity index 100% rename from tools/vscode/packages/server/src/core/documents/DocumentManager.ts rename to tools/astro-languageserver/src/core/documents/DocumentManager.ts diff --git a/tools/vscode/packages/server/src/core/documents/index.ts b/tools/astro-languageserver/src/core/documents/index.ts similarity index 100% rename from tools/vscode/packages/server/src/core/documents/index.ts rename to tools/astro-languageserver/src/core/documents/index.ts diff --git a/tools/vscode/packages/server/src/core/documents/parseAstro.ts b/tools/astro-languageserver/src/core/documents/parseAstro.ts similarity index 100% rename from tools/vscode/packages/server/src/core/documents/parseAstro.ts rename to tools/astro-languageserver/src/core/documents/parseAstro.ts diff --git a/tools/vscode/packages/server/src/core/documents/parseHtml.ts b/tools/astro-languageserver/src/core/documents/parseHtml.ts similarity index 100% rename from tools/vscode/packages/server/src/core/documents/parseHtml.ts rename to tools/astro-languageserver/src/core/documents/parseHtml.ts diff --git a/tools/vscode/packages/server/src/core/documents/utils.ts b/tools/astro-languageserver/src/core/documents/utils.ts similarity index 100% rename from tools/vscode/packages/server/src/core/documents/utils.ts rename to tools/astro-languageserver/src/core/documents/utils.ts diff --git a/tools/vscode/packages/server/src/index.ts b/tools/astro-languageserver/src/index.ts similarity index 98% rename from tools/vscode/packages/server/src/index.ts rename to tools/astro-languageserver/src/index.ts index 528d3cb9d..c834beaf9 100644 --- a/tools/vscode/packages/server/src/index.ts +++ b/tools/astro-languageserver/src/index.ts @@ -6,7 +6,9 @@ import { urlToPath } from './utils'; const TagCloseRequest: RequestType = new RequestType('html/tag'); -/** */ +/** + * Starts `astro-languageservice` + */ export function startServer() { let connection = createConnection(ProposedFeatures.all); @@ -102,5 +104,3 @@ export function startServer() { connection.listen(); } - -startServer(); diff --git a/tools/vscode/packages/server/src/plugins/PluginHost.ts b/tools/astro-languageserver/src/plugins/PluginHost.ts similarity index 100% rename from tools/vscode/packages/server/src/plugins/PluginHost.ts rename to tools/astro-languageserver/src/plugins/PluginHost.ts diff --git a/tools/vscode/packages/server/src/plugins/astro/AstroPlugin.ts b/tools/astro-languageserver/src/plugins/astro/AstroPlugin.ts similarity index 100% rename from tools/vscode/packages/server/src/plugins/astro/AstroPlugin.ts rename to tools/astro-languageserver/src/plugins/astro/AstroPlugin.ts diff --git a/tools/vscode/packages/server/src/plugins/html/HTMLPlugin.ts b/tools/astro-languageserver/src/plugins/html/HTMLPlugin.ts similarity index 100% rename from tools/vscode/packages/server/src/plugins/html/HTMLPlugin.ts rename to tools/astro-languageserver/src/plugins/html/HTMLPlugin.ts diff --git a/tools/vscode/packages/server/src/plugins/index.ts b/tools/astro-languageserver/src/plugins/index.ts similarity index 100% rename from tools/vscode/packages/server/src/plugins/index.ts rename to tools/astro-languageserver/src/plugins/index.ts diff --git a/tools/vscode/packages/server/src/plugins/interfaces.ts b/tools/astro-languageserver/src/plugins/interfaces.ts similarity index 100% rename from tools/vscode/packages/server/src/plugins/interfaces.ts rename to tools/astro-languageserver/src/plugins/interfaces.ts diff --git a/tools/vscode/packages/server/src/plugins/typescript/LanguageServiceManager.ts b/tools/astro-languageserver/src/plugins/typescript/LanguageServiceManager.ts similarity index 100% rename from tools/vscode/packages/server/src/plugins/typescript/LanguageServiceManager.ts rename to tools/astro-languageserver/src/plugins/typescript/LanguageServiceManager.ts diff --git a/tools/vscode/packages/server/src/plugins/typescript/SnapshotManager.ts b/tools/astro-languageserver/src/plugins/typescript/SnapshotManager.ts similarity index 100% rename from tools/vscode/packages/server/src/plugins/typescript/SnapshotManager.ts rename to tools/astro-languageserver/src/plugins/typescript/SnapshotManager.ts diff --git a/tools/vscode/packages/server/src/plugins/typescript/TypeScriptPlugin.ts b/tools/astro-languageserver/src/plugins/typescript/TypeScriptPlugin.ts similarity index 100% rename from tools/vscode/packages/server/src/plugins/typescript/TypeScriptPlugin.ts rename to tools/astro-languageserver/src/plugins/typescript/TypeScriptPlugin.ts diff --git a/tools/vscode/packages/server/src/plugins/typescript/astro-sys.ts b/tools/astro-languageserver/src/plugins/typescript/astro-sys.ts similarity index 100% rename from tools/vscode/packages/server/src/plugins/typescript/astro-sys.ts rename to tools/astro-languageserver/src/plugins/typescript/astro-sys.ts diff --git a/tools/vscode/packages/server/src/plugins/typescript/features/CompletionsProvider.ts b/tools/astro-languageserver/src/plugins/typescript/features/CompletionsProvider.ts similarity index 100% rename from tools/vscode/packages/server/src/plugins/typescript/features/CompletionsProvider.ts rename to tools/astro-languageserver/src/plugins/typescript/features/CompletionsProvider.ts diff --git a/tools/vscode/packages/server/src/plugins/typescript/languageService.ts b/tools/astro-languageserver/src/plugins/typescript/languageService.ts similarity index 100% rename from tools/vscode/packages/server/src/plugins/typescript/languageService.ts rename to tools/astro-languageserver/src/plugins/typescript/languageService.ts diff --git a/tools/vscode/packages/server/src/plugins/typescript/utils.ts b/tools/astro-languageserver/src/plugins/typescript/utils.ts similarity index 100% rename from tools/vscode/packages/server/src/plugins/typescript/utils.ts rename to tools/astro-languageserver/src/plugins/typescript/utils.ts diff --git a/tools/astro-languageserver/src/types/index.d.ts b/tools/astro-languageserver/src/types/index.d.ts new file mode 100644 index 000000000..e048b1a0c --- /dev/null +++ b/tools/astro-languageserver/src/types/index.d.ts @@ -0,0 +1,4 @@ +/** + * Starts `astro-languageservice` + */ +export function startServer(): void {} diff --git a/tools/vscode/packages/server/src/utils.ts b/tools/astro-languageserver/src/utils.ts similarity index 100% rename from tools/vscode/packages/server/src/utils.ts rename to tools/astro-languageserver/src/utils.ts diff --git a/tools/vscode/packages/server/tsconfig.json b/tools/astro-languageserver/tsconfig.json similarity index 100% rename from tools/vscode/packages/server/tsconfig.json rename to tools/astro-languageserver/tsconfig.json diff --git a/tools/vscode/.vscodeignore b/tools/astro-vscode/.vscodeignore similarity index 100% rename from tools/vscode/.vscodeignore rename to tools/astro-vscode/.vscodeignore diff --git a/tools/vscode/assets/icon.png b/tools/astro-vscode/assets/icon.png similarity index 100% rename from tools/vscode/assets/icon.png rename to tools/astro-vscode/assets/icon.png diff --git a/tools/vscode/languages/astro-language-configuration.json b/tools/astro-vscode/languages/astro-language-configuration.json similarity index 100% rename from tools/vscode/languages/astro-language-configuration.json rename to tools/astro-vscode/languages/astro-language-configuration.json diff --git a/tools/vscode/package.json b/tools/astro-vscode/package.json similarity index 82% rename from tools/vscode/package.json rename to tools/astro-vscode/package.json index f663d8bcb..ecf9aaca7 100644 --- a/tools/vscode/package.json +++ b/tools/astro-vscode/package.json @@ -1,8 +1,9 @@ { - "name": "@astro.build/vscode", + "name": "astro-vscode", "displayName": "Astro", "description": "Language support for Astro", "icon": "assets/icon.png", + "type": "commonjs", "galleryBanner": { "color": "#FF5D01", "theme": "dark" @@ -12,25 +13,26 @@ "publisher": "astro-build", "license": "MIT", "scripts": { - "vscode:prepublish": "npm run build", - "bootstrap": "cd packages/client && yarn && cd ../server && yarn", - "build": "node scripts/build.mjs", - "watch": "node scripts/watch.mjs" + "vscode:prepublish": "yarn build", + "build": "astro-scripts build 'src/index.ts'", + "dev": "astro-scripts dev 'src/index.ts'" }, "engines": { - "vscode": "^1.52.0" + "vscode": "^1.22.0" }, "activationEvents": [ "onLanguage:astro" ], "dependencies": { + "vscode": "^1.1.37", + "vscode-languageclient": "~7.0.0", "vscode-html-languageservice": "^3.0.3", - "vscode-emmet-helper": "2.1.2" + "vscode-emmet-helper": "2.1.2", + "astro-languageserver": "0.3.0" }, "devDependencies": { - "esbuild": "0.10.0", - "@astro-vscode/client": "file:./packages/client", - "@astro-vscode/server": "file:./packages/server" + "astro-scripts": "0.0.1", + "@types/vscode": "latest" }, "main": "./dist/index.js", "files": [ diff --git a/tools/vscode/packages/client/src/html/autoClose.ts b/tools/astro-vscode/src/html/autoClose.ts similarity index 100% rename from tools/vscode/packages/client/src/html/autoClose.ts rename to tools/astro-vscode/src/html/autoClose.ts diff --git a/tools/vscode/packages/client/src/index.ts b/tools/astro-vscode/src/index.ts similarity index 93% rename from tools/vscode/packages/client/src/index.ts rename to tools/astro-vscode/src/index.ts index 9ed016eb0..672a074d0 100644 --- a/tools/vscode/packages/client/src/index.ts +++ b/tools/astro-vscode/src/index.ts @@ -17,10 +17,10 @@ export async function activate(context: vscode.ExtensionContext) { /** */ function createLanguageService(context: vscode.ExtensionContext, mode: 'doc', id: string, name: string, port: number) { const { workspace } = vscode; - const serverModule = context.asAbsolutePath(path.join('dist', 'server.js')); + const serverModule = context.asAbsolutePath(require.resolve('astro-languageserver')); const debugOptions = { execArgv: ['--nolazy', '--inspect=' + port] }; const serverOptions: lsp.ServerOptions = { - run: { module: serverModule, transport: lsp.TransportKind.ipc }, + run: { module: 'astro-languageserver', transport: lsp.TransportKind.ipc }, debug: { module: serverModule, transport: lsp.TransportKind.ipc, diff --git a/tools/vscode/syntaxes/astro.tmLanguage.json b/tools/astro-vscode/syntaxes/astro.tmLanguage.json similarity index 100% rename from tools/vscode/syntaxes/astro.tmLanguage.json rename to tools/astro-vscode/syntaxes/astro.tmLanguage.json diff --git a/tools/vscode/tsconfig.base.json b/tools/astro-vscode/tsconfig.base.json similarity index 100% rename from tools/vscode/tsconfig.base.json rename to tools/astro-vscode/tsconfig.base.json diff --git a/tools/vscode/packages/client/tsconfig.json b/tools/astro-vscode/tsconfig.json similarity index 65% rename from tools/vscode/packages/client/tsconfig.json rename to tools/astro-vscode/tsconfig.json index 417801227..7b2ff1ea2 100644 --- a/tools/vscode/packages/client/tsconfig.json +++ b/tools/astro-vscode/tsconfig.json @@ -5,6 +5,5 @@ "rootDir": "src" }, "include": ["src"], - "exclude": ["node_modules"], - "references": [{ "path": "../server" }] + "exclude": ["node_modules"] } diff --git a/tools/vscode/packages/client/package.json b/tools/vscode/packages/client/package.json deleted file mode 100644 index 991f538dc..000000000 --- a/tools/vscode/packages/client/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "@astro-vscode/client", - "version": "0.1.0", - "author": "Skypack", - "license": "MIT", - "dependencies": { - "vscode-languageclient": "next" - }, - "devDependencies": { - "@types/vscode": "latest" - } -} diff --git a/tools/vscode/packages/server/package.json b/tools/vscode/packages/server/package.json deleted file mode 100644 index a8a1d98b6..000000000 --- a/tools/vscode/packages/server/package.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "@astro-vscode/server", - "version": "0.1.0", - "author": "Skypack", - "license": "MIT", - "main": "dist/index.js", - "files": [ - "dist" - ], - "scripts": { - "build": "tsc" - }, - "devDependencies": { - "astro": "0.0.9" - }, - "dependencies": { - "vscode-emmet-helper": "2.1.2", - "vscode-html-languageservice": "^3.0.3", - "vscode-languageserver": "^6.1.1", - "vscode-languageserver-textdocument": "^1.0.1" - } -} diff --git a/tools/vscode/scripts/build.mjs b/tools/vscode/scripts/build.mjs deleted file mode 100644 index baaaa207f..000000000 --- a/tools/vscode/scripts/build.mjs +++ /dev/null @@ -1,37 +0,0 @@ -import esbuild from 'esbuild'; -import config from './esbuild.config.mjs'; -import { performance } from 'perf_hooks'; - -function buildClient() { - return esbuild.build({ - ...config, - entryPoints: ['packages/client/src/index.ts'], - outfile: 'dist/index.js', - }); -} - -function buildServer() { - return esbuild.build({ - ...config, - entryPoints: ['packages/server/src/index.ts'], - outfile: 'dist/server.js', - }); -} - -async function build() { - const start = performance.now(); - try { - await Promise.all([buildClient(), buildServer()]); - } catch ({ errors }) { - if (errors[0].text.indexOf('Could not resolve') > -1) { - console.error('Make sure you run "npm run bootstrap" first!'); - } - return; - } - const end = performance.now(); - const span = end - start; - - console.log(`✨ Built in ${Math.round(span)}ms!`); -} - -build(); diff --git a/tools/vscode/scripts/esbuild.config.mjs b/tools/vscode/scripts/esbuild.config.mjs deleted file mode 100644 index 334429ffd..000000000 --- a/tools/vscode/scripts/esbuild.config.mjs +++ /dev/null @@ -1,7 +0,0 @@ -export default { - bundle: true, - logLevel: 'error', - platform: 'node', - format: 'cjs', - external: ['vscode', 'vscode-html-languageservice', "vscode-emmet-helper"], -}; diff --git a/tools/vscode/scripts/watch.mjs b/tools/vscode/scripts/watch.mjs deleted file mode 100644 index 37bdc53e6..000000000 --- a/tools/vscode/scripts/watch.mjs +++ /dev/null @@ -1,27 +0,0 @@ -import esbuild from 'esbuild'; -import config from './esbuild.config.mjs'; - -function buildClient() { - return esbuild.build({ - ...config, - watch: true, - entryPoints: ['packages/client/src/index.ts'], - outfile: 'dist/index.js', - }); -} - -function buildServer() { - return esbuild.build({ - ...config, - watch: true, - entryPoints: ['packages/server/src/index.ts'], - outfile: 'dist/server.js', - }); -} - -async function watch() { - await Promise.all([buildClient(), buildServer()]); - console.log('👀 Watching for changes...'); -} - -watch(); diff --git a/tools/vscode/tsconfig.json b/tools/vscode/tsconfig.json deleted file mode 100644 index 1791849bb..000000000 --- a/tools/vscode/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "./tsconfig.base.json", - "files": [], - "include": [], - "references": [ - { - "path": "./packages/client" - }, - { - "path": "./packages/server" - } - ] -} diff --git a/yarn.lock b/yarn.lock index f10c37dd9..3937134a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -62,19 +62,6 @@ time-require "^0.1.2" valid-url "^1.0.9" -"@astro-vscode/client@file:./tools/vscode/packages/client": - version "0.1.0" - dependencies: - vscode-languageclient next - -"@astro-vscode/server@file:./tools/vscode/packages/server": - version "0.1.0" - dependencies: - vscode-emmet-helper "2.1.2" - vscode-html-languageservice "^3.0.3" - vscode-languageserver "^6.1.1" - vscode-languageserver-textdocument "^1.0.1" - "@babel/code-frame@7.12.11": version "7.12.11" resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz" @@ -1646,6 +1633,11 @@ "@types/unist" "*" "@types/vfile-message" "*" +"@types/vscode@latest": + version "1.55.0" + resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.55.0.tgz#58cfbebbd32b3e374e07e7858b1fd0e92b1a1d2b" + integrity sha512-49hysH7jneTQoSC8TWbAi7nKK9Lc5osQNjmDHVosrcU8o3jecD9GrK0Qyul8q4aGPSXRfNGqIp9CBdb13akETg== + "@types/yargs-parser@^20.2.0": version "20.2.0" resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz" @@ -1894,6 +1886,13 @@ after@0.8.2: resolved "https://registry.npmjs.org/after/-/after-0.8.2.tgz" integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= +agent-base@4, agent-base@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" + integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== + dependencies: + es6-promisify "^5.0.0" + agent-base@6: version "6.0.2" resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz" @@ -2205,6 +2204,117 @@ astral-regex@^2.0.0: resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== +astro@0.0.11: + version "0.0.11" + resolved "https://registry.yarnpkg.com/astro/-/astro-0.0.11.tgz#a028fdab35f05cf53309865facaf4b686435b4c5" + integrity sha512-cTS1isXyeQct3G/PFgImhzVuJ6GzjKjjZCFVHfpWFRSF/nIH1kToU91VnAKuRbgMaOlPPQM7BI3LOvmwkxYMCA== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/generator" "^7.13.9" + "@babel/parser" "^7.13.15" + "@babel/traverse" "^7.13.15" + "@snowpack/plugin-sass" "^1.4.0" + "@snowpack/plugin-svelte" "^3.6.1" + "@snowpack/plugin-vue" "^2.4.0" + "@vue/server-renderer" "^3.0.10" + acorn "^7.4.0" + astro-parser "0.0.9" + astro-prism "0.0.2" + autoprefixer "^10.2.5" + cheerio "^1.0.0-rc.5" + domhandler "^4.1.0" + es-module-lexer "^0.4.1" + esbuild "^0.10.1" + estree-walker "^3.0.0" + fast-xml-parser "^3.19.0" + fdir "^5.0.0" + find-up "^5.0.0" + github-slugger "^1.3.0" + gray-matter "^4.0.2" + gzip-size "^6.0.0" + hast-to-hyperscript "~9.0.0" + kleur "^4.1.4" + locate-character "^2.0.5" + magic-string "^0.25.3" + micromark "^2.11.4" + micromark-extension-gfm "^0.3.3" + micromark-extension-mdx-expression "^0.3.2" + micromark-extension-mdx-jsx "^0.3.3" + moize "^6.0.1" + node-fetch "^2.6.1" + picomatch "^2.2.3" + postcss "^8.2.8" + postcss-icss-keyframes "^0.2.1" + preact "^10.5.13" + preact-render-to-string "^5.1.18" + prismjs "^1.23.0" + react "^17.0.1" + react-dom "^17.0.1" + rehype-parse "^7.0.1" + rollup "^2.43.1" + rollup-plugin-terser "^7.0.2" + sass "^1.32.8" + snowpack "^3.3.7" + source-map-support "^0.5.19" + string-width "^5.0.0" + svelte "^3.35.0" + unified "^9.2.1" + vue "^3.0.10" + yargs-parser "^20.2.7" + +astro@0.0.9: + version "0.0.9" + resolved "https://registry.yarnpkg.com/astro/-/astro-0.0.9.tgz#c69e05e4d9ecd61f029833738548cd57d3d41933" + integrity sha512-D+HEH854M22syvp57JT9CLpO2kU35pdYgttpYQiuAFTmZ0N+8r4QqEdOT3PaXAdue6JY0dybVTskVMQ9mK1QbA== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/generator" "^7.13.9" + "@babel/parser" "^7.13.15" + "@babel/traverse" "^7.13.15" + "@snowpack/plugin-sass" "^1.4.0" + "@snowpack/plugin-svelte" "^3.6.1" + "@snowpack/plugin-vue" "^2.4.0" + "@vue/server-renderer" "^3.0.10" + acorn "^7.4.0" + autoprefixer "^10.2.5" + cheerio "^1.0.0-rc.5" + es-module-lexer "^0.4.1" + esbuild "^0.10.1" + estree-walker "^3.0.0" + fast-xml-parser "^3.19.0" + fdir "^5.0.0" + find-up "^5.0.0" + github-slugger "^1.3.0" + gray-matter "^4.0.2" + hast-to-hyperscript "^9.0.1" + kleur "^4.1.4" + locate-character "^2.0.5" + magic-string "^0.25.3" + micromark "^2.11.4" + micromark-extension-gfm "^0.3.3" + micromark-extension-mdx-expression "^0.3.2" + micromark-extension-mdx-jsx "^0.3.3" + moize "^6.0.1" + node-fetch "^2.6.1" + picomatch "^2.2.3" + postcss "^8.2.8" + postcss-icss-keyframes "^0.2.1" + preact "^10.5.13" + preact-render-to-string "^5.1.18" + prismjs "^1.23.0" + react "^17.0.1" + react-dom "^17.0.1" + rehype-parse "^7.0.1" + rollup "^2.43.1" + rollup-plugin-terser "^7.0.2" + sass "^1.32.8" + snowpack "^3.3.7" + svelte "^3.35.0" + tiny-glob "^0.2.8" + unified "^9.2.1" + vue "^3.0.10" + yargs-parser "^20.2.7" + async-each-series@0.1.1: version "0.1.1" resolved "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz" @@ -2489,6 +2599,11 @@ breakword@^1.0.5: dependencies: wcwidth "^1.0.1" +browser-stdout@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" + integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== + browser-sync-client@^2.26.14: version "2.26.14" resolved "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.26.14.tgz" @@ -3153,6 +3268,11 @@ comma-separated-tokens@^1.0.0: resolved "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz" integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw== +commander@2.15.1: + version "2.15.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" + integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== + commander@^2.19.0, commander@^2.2.0, commander@^2.20.0, commander@^2.8.1: version "2.20.3" resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" @@ -3556,6 +3676,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" +debug@3.1.0, debug@~3.1.0: + version "3.1.0" + resolved "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + debug@4, debug@4.3.1, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: version "4.3.1" resolved "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz" @@ -3563,20 +3690,13 @@ debug@4, debug@4.3.1, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, de dependencies: ms "2.1.2" -debug@^3.2.6: +debug@^3.1.0, debug@^3.2.6: version "3.2.7" resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" -debug@~3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - debug@~4.1.0: version "4.1.1" resolved "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz" @@ -3846,6 +3966,11 @@ didyoumean@^1.2.1: resolved "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.1.tgz" integrity sha1-6S7f2tplN9SE1zwBcv0eugxJdv8= +diff@3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" + integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== + diff@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz" @@ -4233,15 +4358,17 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -es6-promise@^4.1.0: +es6-promise@^4.0.3, es6-promise@^4.1.0: version "4.2.8" resolved "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz" integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== -esbuild@0.10.0: - version "0.10.0" - resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.10.0.tgz" - integrity sha512-g+/Fk18bP7GAx0eG2RTfvjbsdB6RSchvvrrokFX8UexrTtPo0ZF0R1KViUu5v0A4Uu8m3I7pZhEyZveiOk0/JA== +es6-promisify@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203" + integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM= + dependencies: + es6-promise "^4.0.3" esbuild@^0.10.1: version "0.10.2" @@ -4278,7 +4405,7 @@ escape-html@^1.0.3, escape-html@~1.0.3: resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: +escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= @@ -5107,6 +5234,18 @@ glob-to-regexp@^0.3.0: resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz" integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= +glob@7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" + integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz" @@ -5273,6 +5412,11 @@ gray-matter@^4.0.2: section-matter "^1.0.0" strip-bom-string "^1.0.0" +growl@1.10.5: + version "1.10.5" + resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" + integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== + gzip-size@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462" @@ -5412,7 +5556,7 @@ hash-sum@^2.0.0: resolved "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz" integrity sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg== -hast-to-hyperscript@~9.0.0: +hast-to-hyperscript@^9.0.1, hast-to-hyperscript@~9.0.0: version "9.0.1" resolved "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz" integrity sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA== @@ -5453,6 +5597,11 @@ hastscript@^6.0.0: property-information "^5.0.0" space-separated-tokens "^1.0.0" +he@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" + integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0= + hogan.js@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz" @@ -5546,6 +5695,14 @@ http-errors@~1.6.2: setprototypeof "1.1.0" statuses ">= 1.4.0 < 2" +http-proxy-agent@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405" + integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg== + dependencies: + agent-base "4" + debug "3.1.0" + http-proxy-agent@^4.0.1: version "4.0.1" resolved "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz" @@ -5573,6 +5730,14 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" +https-proxy-agent@^2.2.1: + version "2.2.4" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b" + integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg== + dependencies: + agent-base "^4.3.0" + debug "^3.1.0" + https-proxy-agent@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz" @@ -7376,7 +7541,7 @@ min-indent@^1.0.0: resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4: +minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -7400,6 +7565,11 @@ minimist-options@^3.0.1: arrify "^1.0.1" is-plain-obj "^1.1.0" +minimist@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= + minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz" @@ -7514,6 +7684,13 @@ mkdirp@0.3.0: resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz" integrity sha1-G79asbqCevI1dRQ0kEJkVfSB/h4= +mkdirp@0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= + dependencies: + minimist "0.0.8" + mkdirp@^0.5.0, mkdirp@^0.5.1: version "0.5.5" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz" @@ -7526,6 +7703,23 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== +mocha@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" + integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ== + dependencies: + browser-stdout "1.3.1" + commander "2.15.1" + debug "3.1.0" + diff "3.5.0" + escape-string-regexp "1.0.5" + glob "7.1.2" + growl "1.10.5" + he "1.1.1" + minimatch "3.0.4" + mkdirp "0.5.1" + supports-color "5.4.0" + modern-normalize@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/modern-normalize/-/modern-normalize-1.0.0.tgz" @@ -10240,7 +10434,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.19, source-map-support@~0.5.19: +source-map-support@^0.5.0, source-map-support@^0.5.19, source-map-support@~0.5.19: version "0.5.19" resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz" integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== @@ -10806,6 +11000,13 @@ sugarss@^2.0.0: dependencies: postcss "^7.0.2" +supports-color@5.4.0: + version "5.4.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" + integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w== + dependencies: + has-flag "^3.0.0" + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" @@ -11746,31 +11947,18 @@ vscode-jsonrpc@6.0.0: resolved "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz" integrity sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg== -vscode-jsonrpc@6.1.0-next.2: - version "6.1.0-next.2" - resolved "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.1.0-next.2.tgz" - integrity sha512-nkiNDGI+Ytp7uj1lxHXddXCoEunhcry1D+KmVHBfUUgWT9jMF8ZJyH5KQObdF+OGAh7bXZxD/SV4uGwSCeHHWA== - -vscode-languageclient@next: - version "7.1.0-next.4" - resolved "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.1.0-next.4.tgz" - integrity sha512-Gal+DvbI1KIwO1z90MvSnghMCVBCGlwdpOVIS0Hhmep7rjHUOwuC5Df7YlVkpzfPm+RCRyZQnUSJ19VNrnxxhA== +vscode-languageclient@~7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz#b505c22c21ffcf96e167799757fca07a6bad0fb2" + integrity sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg== dependencies: minimatch "^3.0.4" semver "^7.3.4" - vscode-languageserver-protocol "3.17.0-next.5" + vscode-languageserver-protocol "3.16.0" -vscode-languageserver-protocol@3.17.0-next.5: - version "3.17.0-next.5" - resolved "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.5.tgz" - integrity sha512-LFZ6WMB3iPezQAU9OnGoERzcIVKhcs0OLfD/NHcqSj3g1wgxuLUL5kSlZbbjFySQCmhzm6b0yb3hjTSeBtq1+w== - dependencies: - vscode-jsonrpc "6.1.0-next.2" - vscode-languageserver-types "3.17.0-next.1" - -vscode-languageserver-protocol@^3.15.3: +vscode-languageserver-protocol@3.16.0, vscode-languageserver-protocol@^3.15.3: version "3.16.0" - resolved "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz#34135b61a9091db972188a07d337406a3cdbe821" integrity sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A== dependencies: vscode-jsonrpc "6.0.0" @@ -11791,14 +11979,9 @@ vscode-languageserver-types@3.16.0-next.2: resolved "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz" integrity sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q== -vscode-languageserver-types@3.17.0-next.1: - version "3.17.0-next.1" - resolved "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.1.tgz" - integrity sha512-VGzh06oynbYa6JbTKUbxOEZN7CYEtWhN7DK5wfzUpeCJl8X8xZX39g2PVfpqXrIEduu7dcJgK007KgnX9tHNKA== - -vscode-languageserver@^6.1.1: +vscode-languageserver@6.1.1: version "6.1.1" - resolved "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz#d76afc68172c27d4327ee74332b468fbc740d762" integrity sha512-DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ== dependencies: vscode-languageserver-protocol "^3.15.3" @@ -11808,11 +11991,32 @@ vscode-nls@^5.0.0: resolved "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz" integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA== +vscode-test@^0.4.1: + version "0.4.3" + resolved "https://registry.yarnpkg.com/vscode-test/-/vscode-test-0.4.3.tgz#461ebf25fc4bc93d77d982aed556658a2e2b90b8" + integrity sha512-EkMGqBSefZH2MgW65nY05rdRSko15uvzq4VAPM5jVmwYuFQKE7eikKXNJDRxL+OITXHB6pI+a3XqqD32Y3KC5w== + dependencies: + http-proxy-agent "^2.1.0" + https-proxy-agent "^2.2.1" + vscode-uri@^2.1.2: version "2.1.2" resolved "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz" integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A== +vscode@^1.1.37: + version "1.1.37" + resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.37.tgz#c2a770bee4bb3fff765e2b72c7bcc813b8a6bb0a" + integrity sha512-vJNj6IlN7IJPdMavlQa1KoFB3Ihn06q1AiN3ZFI/HfzPNzbKZWPPuiU+XkpNOfGU5k15m4r80nxNPlM7wcc0wg== + dependencies: + glob "^7.1.2" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + mocha "^5.2.0" + semver "^5.4.1" + source-map-support "^0.5.0" + vscode-test "^0.4.1" + vue@^3.0.10: version "3.0.11" resolved "https://registry.npmjs.org/vue/-/vue-3.0.11.tgz"