astro-vscode 0.23.2 → 0.24.1

package/dist/types/env.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Astro global available in all contexts in .astro files
+ *
+ * [Astro documentation](https://docs.astro.build/reference/api-reference/#astro-global)
+ */
+declare const Astro: any;
+declare const Fragment: any;
+
+declare module '*.md' {
+	const md: any;
+	export default md;
+}
+
+declare module '*.mdx' {
+	const mdx: any;
+	export default mdx;
+}
+
+declare module '*.html' {
+	const html: any;
+	export default html;
+}

package/package.json

@@ -23,14 +23,17 @@
     "color": "#FFBE2D",
     "theme": "dark"
   },
-  "version": "0.23.2",
+  "version": "0.24.1",
   "author": "withastro",
   "license": "MIT",
   "publisher": "astro-build",
   "scripts": {
-    "vscode:prepublish": "yarn build",
-    "build": "astro-scripts build \"src/**/*.ts\" && tsc -p tsconfig.json",
-    "dev": "astro-scripts dev \"src/**/*.ts\"",
+    "build": "yarn run build:node & yarn run build:browser",
+    "dev": "yarn run build:node --watch & yarn run build:browser --watch",
+    "build:node": "node ./scripts/build-node.js",
+    "build:browser": "node ./scripts/build-browser.js",
+    "build:ci:node": "yarn run build:node & yarn run build:browser --empty",
+    "build:ci:browser": "yarn run build:browser & yarn run build:node --empty",
     "test": "yarn run test:vscode && yarn run test:grammar",
     "test:vscode": "node ./test/runTest.js",
     "test:grammar": "node ./test/grammar/test.mjs",
@@ -44,18 +47,22 @@
     "workspaceContains:astro.config.*"
   ],
   "dependencies": {
-    "@astrojs/language-server": "0.23.2",
-    "@astrojs/ts-plugin": "0.2.1",
-    "vscode-languageclient": "^8.0.1"
+    "@astrojs/ts-plugin": "0.3.0",
+    "prettier": "^2.7.1",
+    "prettier-plugin-astro": "^0.5.4"
   },
   "devDependencies": {
+    "esbuild-plugin-copy": "^1.3.0",
+    "@astrojs/language-server": "0.24.1",
     "@types/vscode": "^1.67.0",
     "@vscode/test-electron": "^2.1.3",
-    "vscode-tmgrammar-test": "^0.1.1",
-    "astro-scripts": "file:../../scripts"
+    "path-browserify": "^1.0.1",
+    "typescript": "~4.8.2",
+    "vscode-languageclient": "^8.0.1",
+    "vscode-tmgrammar-test": "^0.1.1"
   },
-  "main": "./dist/index.js",
-  "browser": "./dist/index.js",
+  "main": "./dist/node/client.js",
+  "browser": "./dist/browser/client.js",
   "files": [
     "dist/",
     "languages/",
@@ -81,6 +88,10 @@
       {
         "command": "astro.showTSXOutput",
         "title": "Astro: Debug: Show TSX Output"
+      },
+      {
+        "command": "astro.selectTypescriptVersion",
+        "title": "Astro: Select Typescript Version..."
       }
     ],
     "configuration": {

package/dist/html/autoClose.d.ts

@@ -1,5 +0,0 @@
-import { Disposable, TextDocument, Position } from 'vscode';
-/**  */
-export declare function activateTagClosing(tagProvider: (document: TextDocument, position: Position) => Thenable<string>, supportedLanguages: {
-    [id: string]: boolean;
-}, configName: string): Disposable;

package/dist/html/autoClose.js

@@ -1,98 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
-};
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
-  }
-  return target;
-};
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-__markAsModule(exports);
-__export(exports, {
-  activateTagClosing: () => activateTagClosing
-});
-var import_vscode = __toModule(require("vscode"));
-function activateTagClosing(tagProvider, supportedLanguages, configName) {
-  const disposables = [];
-  import_vscode.workspace.onDidChangeTextDocument((event) => onDidChangeTextDocument(event.document, event.contentChanges), null, disposables);
-  let isEnabled = false;
-  updateEnabledState();
-  import_vscode.window.onDidChangeActiveTextEditor(updateEnabledState, null, disposables);
-  let timeout = void 0;
-  function updateEnabledState() {
-    isEnabled = false;
-    const editor = import_vscode.window.activeTextEditor;
-    if (!editor) {
-      return;
-    }
-    const document = editor.document;
-    if (!supportedLanguages[document.languageId]) {
-      return;
-    }
-    if (!import_vscode.workspace.getConfiguration(void 0, document.uri).get(configName)) {
-      return;
-    }
-    isEnabled = true;
-  }
-  function onDidChangeTextDocument(document, changes) {
-    var _a;
-    if (!isEnabled) {
-      return;
-    }
-    const activeDocument = import_vscode.window.activeTextEditor && import_vscode.window.activeTextEditor.document;
-    if (document !== activeDocument || changes.length === 0) {
-      return;
-    }
-    if (typeof timeout !== "undefined") {
-      clearTimeout(timeout);
-    }
-    const lastChange = changes[changes.length - 1];
-    const lastCharacter = lastChange.text[lastChange.text.length - 1];
-    if ("range" in lastChange && ((_a = lastChange.rangeLength) != null ? _a : 0) > 0 || lastCharacter !== ">" && lastCharacter !== "/") {
-      return;
-    }
-    const rangeStart = "range" in lastChange ? lastChange.range.start : new import_vscode.Position(0, document.getText().length);
-    const version = document.version;
-    timeout = setTimeout(() => {
-      const position = new import_vscode.Position(rangeStart.line, rangeStart.character + lastChange.text.length);
-      tagProvider(document, position).then((text) => {
-        if (text && isEnabled) {
-          const activeEditor = import_vscode.window.activeTextEditor;
-          if (activeEditor) {
-            const activeEditorDocument = activeEditor.document;
-            if (document === activeEditorDocument && activeEditorDocument.version === version) {
-              const selections = activeEditor.selections;
-              if (selections.length && selections.some((s) => s.active.isEqual(position))) {
-                activeEditor.insertSnippet(new import_vscode.SnippetString(text), selections.map((s) => s.active));
-              } else {
-                activeEditor.insertSnippet(new import_vscode.SnippetString(text), position);
-              }
-            }
-          }
-        }
-      });
-      timeout = void 0;
-    }, 100);
-  }
-  return import_vscode.Disposable.from(...disposables);
-}
-"use strict";
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  activateTagClosing
-});
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2h0bWwvYXV0b0Nsb3NlLnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQVFBLG9CQUFxRjtBQUs5RSw0QkFDTixhQUNBLG9CQUNBLFlBQ2E7QUFDYixRQUFNLGNBQTRCO0FBQ2xDLDBCQUFVLHdCQUNULENBQUMsVUFBVSx3QkFBd0IsTUFBTSxVQUFVLE1BQU0saUJBQ3pELE1BQ0E7QUFHRCxNQUFJLFlBQVk7QUFDaEI7QUFDQSx1QkFBTyw0QkFBNEIsb0JBQW9CLE1BQU07QUFFN0QsTUFBSSxVQUFvQztBQUd4QyxnQ0FBOEI7QUFDN0IsZ0JBQVk7QUFDWixVQUFNLFNBQVMscUJBQU87QUFDdEIsUUFBSSxDQUFDLFFBQVE7QUFDWjtBQUFBO0FBRUQsVUFBTSxXQUFXLE9BQU87QUFDeEIsUUFBSSxDQUFDLG1CQUFtQixTQUFTLGFBQWE7QUFDN0M7QUFBQTtBQUVELFFBQUksQ0FBQyx3QkFBVSxpQkFBaUIsUUFBUSxTQUFTLEtBQUssSUFBYSxhQUFhO0FBQy9FO0FBQUE7QUFFRCxnQkFBWTtBQUFBO0FBSWIsbUNBQWlDLFVBQXdCLFNBQW9EO0FBakQ5RztBQWtERSxRQUFJLENBQUMsV0FBVztBQUNmO0FBQUE7QUFFRCxVQUFNLGlCQUFpQixxQkFBTyxvQkFBb0IscUJBQU8saUJBQWlCO0FBQzFFLFFBQUksYUFBYSxrQkFBa0IsUUFBUSxXQUFXLEdBQUc7QUFDeEQ7QUFBQTtBQUVELFFBQUksT0FBTyxZQUFZLGFBQWE7QUFDbkMsbUJBQWE7QUFBQTtBQUVkLFVBQU0sYUFBYSxRQUFRLFFBQVEsU0FBUztBQUM1QyxVQUFNLGdCQUFnQixXQUFXLEtBQUssV0FBVyxLQUFLLFNBQVM7QUFDL0QsUUFDRSxXQUFXLGNBQWUsa0JBQVcsZ0JBQVgsWUFBMEIsS0FBSyxLQUN6RCxrQkFBa0IsT0FBTyxrQkFBa0IsS0FDM0M7QUFDRDtBQUFBO0FBRUQsVUFBTSxhQUFhLFdBQVcsYUFBYSxXQUFXLE1BQU0sUUFBUSxJQUFJLHVCQUFTLEdBQUcsU0FBUyxVQUFVO0FBQ3ZHLFVBQU0sVUFBVSxTQUFTO0FBQ3pCLGNBQVUsV0FBVyxNQUFNO0FBQzFCLFlBQU0sV0FBVyxJQUFJLHVCQUFTLFdBQVcsTUFBTSxXQUFXLFlBQVksV0FBVyxLQUFLO0FBQ3RGLGtCQUFZLFVBQVUsVUFBVSxLQUFLLENBQUMsU0FBUztBQUM5QyxZQUFJLFFBQVEsV0FBVztBQUN0QixnQkFBTSxlQUFlLHFCQUFPO0FBQzVCLGNBQUksY0FBYztBQUNqQixrQkFBTSx1QkFBdUIsYUFBYTtBQUMxQyxnQkFBSSxhQUFhLHdCQUF3QixxQkFBcUIsWUFBWSxTQUFTO0FBQ2xGLG9CQUFNLGFBQWEsYUFBYTtBQUNoQyxrQkFBSSxXQUFXLFVBQVUsV0FBVyxLQUFLLENBQUMsTUFBTSxFQUFFLE9BQU8sUUFBUSxZQUFZO0FBQzVFLDZCQUFhLGNBQ1osSUFBSSw0QkFBYyxPQUNsQixXQUFXLElBQUksQ0FBQyxNQUFNLEVBQUU7QUFBQSxxQkFFbkI7QUFDTiw2QkFBYSxjQUFjLElBQUksNEJBQWMsT0FBTztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFNekQsZ0JBQVU7QUFBQSxPQUNSO0FBQUE7QUFFSixTQUFPLHlCQUFXLEtBQUssR0FBRztBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=

package/dist/index.d.ts

@@ -1,6 +0,0 @@
-import { ExtensionContext } from 'vscode';
-import { LanguageClient } from 'vscode-languageclient/node';
-export declare function activate(context: ExtensionContext): Promise<{
-    getLanguageServer: () => LanguageClient;
-}>;
-export declare function deactivate(): Promise<void> | undefined;

package/dist/index.js

@@ -1,160 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
-};
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
-  }
-  return target;
-};
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-__markAsModule(exports);
-__export(exports, {
-  activate: () => activate,
-  deactivate: () => deactivate
-});
-var path = __toModule(require("path"));
-var import_vscode = __toModule(require("vscode"));
-var import_node = __toModule(require("vscode-languageclient/node"));
-var import_autoClose = __toModule(require("./html/autoClose.js"));
-const TagCloseRequest = new import_node.RequestType("html/tag");
-let client;
-async function activate(context) {
-  const runtimeConfig = import_vscode.workspace.getConfiguration("astro.language-server");
-  const {workspaceFolders} = import_vscode.workspace;
-  const rootPath = workspaceFolders == null ? void 0 : workspaceFolders[0].uri.fsPath;
-  let lsPath = runtimeConfig.get("ls-path");
-  if (typeof lsPath === "string" && lsPath.trim() !== "" && typeof rootPath === "string") {
-    lsPath = path.isAbsolute(lsPath) ? lsPath : path.join(rootPath, lsPath);
-    console.info(`Using language server at ${lsPath}`);
-  } else {
-    lsPath = void 0;
-  }
-  const serverModule = lsPath != null ? require.resolve(lsPath) : require.resolve("@astrojs/language-server/bin/nodeServer.js");
-  const port = 6040;
-  const debugOptions = {execArgv: ["--nolazy", "--inspect=" + port]};
-  const serverOptions = {
-    run: {module: serverModule, transport: import_node.TransportKind.ipc},
-    debug: {
-      module: serverModule,
-      transport: import_node.TransportKind.ipc,
-      options: debugOptions
-    }
-  };
-  const serverRuntime = runtimeConfig.get("runtime");
-  if (serverRuntime) {
-    serverOptions.run.runtime = serverRuntime;
-    serverOptions.debug.runtime = serverRuntime;
-    console.info(`Using ${serverRuntime} as runtime`);
-  }
-  const clientOptions = {
-    documentSelector: [{scheme: "file", language: "astro"}],
-    synchronize: {
-      fileEvents: import_vscode.workspace.createFileSystemWatcher("{**/*.js,**/*.ts}", false, false, false)
-    },
-    initializationOptions: {
-      environment: "node",
-      dontFilterIncompleteCompletions: true,
-      isTrusted: import_vscode.workspace.isTrusted
-    }
-  };
-  client = createLanguageServer(serverOptions, clientOptions);
-  client.start().then(() => {
-    const tagRequestor = (document, position) => {
-      const param = client.code2ProtocolConverter.asTextDocumentPositionParams(document, position);
-      return client.sendRequest(TagCloseRequest, param);
-    };
-    const disposable = (0, import_autoClose.activateTagClosing)(tagRequestor, {astro: true}, "html.autoClosingTags");
-    context.subscriptions.push(disposable);
-  }).catch((err) => {
-    console.error("Astro, unable to load language server.", err);
-  });
-  import_vscode.workspace.onDidSaveTextDocument(async (doc) => {
-    var _a;
-    const fileName = (_a = doc.fileName.split(/\/|\\/).pop()) != null ? _a : doc.fileName;
-    if ([/^tsconfig\.json$/, /^jsconfig\.json$/].some((regex) => regex.test(fileName))) {
-      await restartClient(false);
-    }
-  });
-  import_vscode.workspace.onDidChangeTextDocument((params) => {
-    var _a;
-    if (["vue", "svelte", "javascript", "typescript", "javascriptreact", "typescriptreact", "json", "jsonc"].includes(params.document.languageId)) {
-      const fileName = (_a = params.document.fileName.split(/\/|\\/).pop()) != null ? _a : params.document.fileName;
-      if (["json", "jsonc"].includes(params.document.languageId) && (fileName.startsWith("tsconfig") || fileName.startsWith("jsconfig"))) {
-        return;
-      }
-      getLSClient().sendNotification("$/onDidChangeNonAstroFile", {
-        uri: params.document.uri.toString(true),
-        changes: ["vue", "svelte"].includes(params.document.languageId) ? void 0 : params.contentChanges.map((c) => ({
-          range: {
-            start: {line: c.range.start.line, character: c.range.start.character},
-            end: {line: c.range.end.line, character: c.range.end.character}
-          },
-          text: c.text
-        }))
-      });
-    }
-  });
-  context.subscriptions.push(import_vscode.commands.registerCommand("astro.restartLanguageServer", async () => {
-    await restartClient(true);
-  }), import_vscode.commands.registerCommand("astro.showTSXOutput", async () => {
-    var _a;
-    const content = await getLSClient().sendRequest("$/getTSXOutput", (_a = import_vscode.window.activeTextEditor) == null ? void 0 : _a.document.uri.toString());
-    if (content) {
-      const document = await import_vscode.workspace.openTextDocument({content, language: "typescriptreact"});
-      await import_vscode.window.showTextDocument(document, {
-        preview: true,
-        viewColumn: import_vscode.ViewColumn.Beside
-      });
-    } else {
-      import_vscode.window.showErrorMessage("Could not open the current document's TSX output");
-    }
-  }));
-  let restartingClient = false;
-  async function restartClient(showNotification) {
-    if (restartingClient) {
-      return;
-    }
-    restartingClient = true;
-    await client.stop();
-    client = createLanguageServer(serverOptions, clientOptions);
-    await client.start();
-    if (showNotification) {
-      import_vscode.window.showInformationMessage("Astro language server restarted.");
-    }
-    restartingClient = false;
-  }
-  function getLSClient() {
-    return client;
-  }
-  return {
-    getLanguageServer: getLSClient
-  };
-}
-function deactivate() {
-  if (!client) {
-    return void 0;
-  }
-  return client.stop();
-}
-function createLanguageServer(serverOptions, clientOptions) {
-  return new import_node.LanguageClient("astro", "Astro", serverOptions, clientOptions);
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  activate,
-  deactivate
-});
-//# sourceMappingURL=data:application/json;base64,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UUFDM0QsS0FBSyxPQUFPLFNBQVMsSUFBSSxTQUFTO0FBQUEsUUFFbEMsU0FBUyxDQUFDLE9BQU8sVUFBVSxTQUFTLE9BQU8sU0FBUyxjQUNqRCxTQUNBLE9BQU8sZUFBZSxJQUFJLENBQUMsTUFBTztBQUFBLFVBQ2xDLE9BQU87QUFBQSxZQUNOLE9BQU8sQ0FBRSxNQUFNLEVBQUUsTUFBTSxNQUFNLE1BQU0sV0FBVyxFQUFFLE1BQU0sTUFBTTtBQUFBLFlBQzVELEtBQUssQ0FBRSxNQUFNLEVBQUUsTUFBTSxJQUFJLE1BQU0sV0FBVyxFQUFFLE1BQU0sSUFBSTtBQUFBO0FBQUEsVUFFdkQsTUFBTSxFQUFFO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFNZCxVQUFRLGNBQWMsS0FDckIsdUJBQVMsZ0JBQWdCLCtCQUErQixZQUFZO0FBQ25FLFVBQU0sY0FBYztBQUFBLE1BRXJCLHVCQUFTLGdCQUFnQix1QkFBdUIsWUFBWTtBQXRJOUQ7QUF1SUcsVUFBTSxVQUFVLE1BQU0sY0FBYyxZQUNuQyxrQkFDQSwyQkFBTyxxQkFBUCxtQkFBeUIsU0FBUyxJQUFJO0FBR3ZDLFFBQUksU0FBUztBQUNaLFlBQU0sV0FBVyxNQUFNLHdCQUFVLGlCQUFpQixDQUFFLFNBQVMsVUFBVTtBQUV2RSxZQUFNLHFCQUFPLGlCQUFpQixVQUFVO0FBQUEsUUFDdkMsU0FBUztBQUFBLFFBQ1QsWUFBWSx5QkFBVztBQUFBO0FBQUEsV0FFbEI7QUFDTiwyQkFBTyxpQkFBaUI7QUFBQTtBQUFBO0FBSzNCLE1BQUksbUJBQW1CO0FBQ3ZCLCtCQUE2QixrQkFBMkI7QUFDdkQsUUFBSSxrQkFBa0I7QUFDckI7QUFBQTtBQUdELHVCQUFtQjtBQUNuQixVQUFNLE9BQU87QUFFYixhQUFTLHFCQUFxQixlQUFlO0FBQzdDLFVBQU0sT0FBTztBQUViLFFBQUksa0JBQWtCO0FBQ3JCLDJCQUFPLHVCQUF1QjtBQUFBO0FBRy9CLHVCQUFtQjtBQUFBO0FBR3BCLHlCQUF1QjtBQUN0QixXQUFPO0FBQUE7QUFHUixTQUFPO0FBQUEsSUFDTixtQkFBbUI7QUFBQTtBQUFBO0FBSWQsc0JBQWlEO0FBQ3ZELE1BQUksQ0FBQyxRQUFRO0FBQ1osV0FBTztBQUFBO0FBR1IsU0FBTyxPQUFPO0FBQUE7QUFHZiw4QkFBOEIsZUFBOEIsZUFBc0M7QUFDakcsU0FBTyxJQUFJLDJCQUFlLFNBQVMsU0FBUyxlQUFlO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==