astro-vscode 0.8.9 → 0.9.1

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # astro-vscode
 
+## 0.9.1
+
+### Patch Changes
+
+- 7dc85cc: Add support for Emmet inside components, upgrade Emmet version
+- Updated dependencies [7dc85cc]
+  - @astrojs/language-server@0.9.1
+
+## 0.9.0
+
+### Minor Changes
+
+- 6b6b47a: Remove internal astro.d.ts files, instead prefer the one provided by Astro itself
+
+### Patch Changes
+
+- Updated dependencies [6b6b47a]
+  - @astrojs/language-server@0.9.0
+  - @astrojs/ts-plugin@0.2.0
+
+## 0.8.10
+
+### Patch Changes
+
+- 8878324: Add feature to reload language server on ts/jsconfig change
+- Updated dependencies [5b16fb4]
+  - @astrojs/language-server@0.8.10
+
 ## 0.8.9
 
 ### Patch Changes

package/README.md

@@ -17,3 +17,11 @@ Provides language support for `.astro` files. This extension is powered by the [
 ## Configuration
 
 You can disable most features in the extension by going to your workspace settings page. Under __Extension__ find Astro configuration and uncheck the feature you do not want. For example to disable error messages unselect __TypeScript > Diagnostics: Enable__.
+
+## Troubleshooting
+
+### Cannot find name "Astro" or Property 'env' does not exist on type 'ImportMeta' or Cannot find name "Fragment"
+
+Starting from 0.23.5 version of Astro and the 0.9 version of this extension, typechecking is now done using types that are provided by Astro itself. Therefore, to benefit from those included types, you need to use any version of Astro that is higher or equal to 0.23.5
+
+If you can't upgrade to a newer version of Astro for the moment, you can downgrade the extension to the latest pre 0.9.0 version by right clicking the Astro extension in the sidebar and pressing "Install another version"

package/dist/index.d.ts

@@ -1,3 +1,5 @@
-import * as vscode from 'vscode';
-/**  */
-export declare function activate(context: vscode.ExtensionContext): Promise<void>;
+import { ExtensionContext } from 'vscode';
+import { LanguageClient } from 'vscode-languageclient/node';
+export declare function activate(context: ExtensionContext): Promise<{
+    getLanguageServer: () => LanguageClient;
+}>;

package/dist/index.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {enumerable: true, configurable: true, writable: true, value}) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
 var __export = (target, all) => {
   for (var name in all)
@@ -41,50 +24,40 @@ __markAsModule(exports);
 __export(exports, {
   activate: () => activate
 });
-var vscode = __toModule(require("vscode"));
-var lsp = __toModule(require("vscode-languageclient/node.js"));
+var import_vscode = __toModule(require("vscode"));
+var import_node = __toModule(require("vscode-languageclient/node"));
 var import_autoClose = __toModule(require("./html/autoClose.js"));
-let docClient;
-const TagCloseRequest = new lsp.RequestType("html/tag");
+const TagCloseRequest = new import_node.RequestType("html/tag");
 async function activate(context) {
-  docClient = createLanguageService(context, "doc", "astro", "Astro", 6040);
-  await docClient.onReady();
-}
-function createLanguageService(context, mode, id, name, port) {
-  const {workspace} = vscode;
   const serverModule = require.resolve("@astrojs/language-server/bin/server.js");
+  const port = 6040;
   const debugOptions = {execArgv: ["--nolazy", "--inspect=" + port]};
   const serverOptions = {
-    run: {module: serverModule, transport: lsp.TransportKind.ipc},
+    run: {module: serverModule, transport: import_node.TransportKind.ipc},
     debug: {
       module: serverModule,
-      transport: lsp.TransportKind.ipc,
+      transport: import_node.TransportKind.ipc,
       options: debugOptions
     }
   };
-  const serverInitOptions = {
-    mode,
-    appRoot: vscode.env.appRoot,
-    language: vscode.env.language
-  };
   const clientOptions = {
     documentSelector: [{scheme: "file", language: "astro"}],
     synchronize: {
       configurationSection: ["astro", "javascript", "typescript", "prettier"],
-      fileEvents: workspace.createFileSystemWatcher("{**/*.js,**/*.ts}", false, false, false)
+      fileEvents: import_vscode.workspace.createFileSystemWatcher("{**/*.js,**/*.ts}", false, false, false)
     },
-    initializationOptions: __spreadProps(__spreadValues({}, serverInitOptions), {
+    initializationOptions: {
       configuration: {
-        astro: workspace.getConfiguration("astro"),
-        prettier: workspace.getConfiguration("prettier"),
-        emmet: workspace.getConfiguration("emmet"),
-        typescript: workspace.getConfiguration("typescript"),
-        javascript: workspace.getConfiguration("javascript")
+        astro: import_vscode.workspace.getConfiguration("astro"),
+        prettier: import_vscode.workspace.getConfiguration("prettier"),
+        emmet: import_vscode.workspace.getConfiguration("emmet"),
+        typescript: import_vscode.workspace.getConfiguration("typescript"),
+        javascript: import_vscode.workspace.getConfiguration("javascript")
       },
       dontFilterIncompleteCompletions: true
-    })
+    }
   };
-  const client = new lsp.LanguageClient(id, name, serverOptions, clientOptions);
+  let client = createLanguageServer(serverOptions, clientOptions);
   context.subscriptions.push(client.start());
   client.onReady().then(() => {
     const tagRequestor = (document, position) => {
@@ -96,10 +69,43 @@ function createLanguageService(context, mode, id, name, port) {
   }).catch((err) => {
     console.error("Astro, unable to load language server.", err);
   });
-  return client;
+  import_vscode.workspace.onDidSaveTextDocument(async (doc) => {
+    var _a;
+    const fileName = (_a = doc.fileName.split(/\/|\\/).pop()) != null ? _a : doc.fileName;
+    if ([/^tsconfig\.json$/, /^jsconfig\.json$/, /^astro\.config\.(js|cjs|mjs|ts)$/].some((regex) => regex.test(fileName))) {
+      await restartClient(false);
+    }
+  });
+  context.subscriptions.push(import_vscode.commands.registerCommand("astro.restartLanguageServer", async () => {
+    await restartClient(true);
+  }));
+  let restartingClient = false;
+  async function restartClient(showNotification) {
+    if (restartingClient) {
+      return;
+    }
+    restartingClient = true;
+    await client.stop();
+    client = createLanguageServer(serverOptions, clientOptions);
+    context.subscriptions.push(client.start());
+    await client.onReady();
+    if (showNotification) {
+      import_vscode.window.showInformationMessage("Astro language server restarted.");
+    }
+    restartingClient = false;
+  }
+  function getLSClient() {
+    return client;
+  }
+  return {
+    getLanguageServer: getLSClient
+  };
+}
+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
 });
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSxhQUF3QjtBQUN4QixVQUFxQjtBQUNyQix1QkFBbUM7QUFFbkMsSUFBSTtBQUVKLE1BQU0sa0JBQWdGLElBQUksSUFBSSxZQUFZO0FBRzFHLHdCQUErQixTQUFrQztBQUMvRCxjQUFZLHNCQUFzQixTQUFTLE9BQU8sU0FBUyxTQUFTO0FBRXBFLFFBQU0sVUFBVTtBQUFBO0FBSWxCLCtCQUErQixTQUFrQyxNQUFhLElBQVksTUFBYyxNQUFjO0FBQ3BILFFBQU0sQ0FBRSxhQUFjO0FBQ3RCLFFBQU0sZUFBK0I7QUFDckMsUUFBTSxlQUFlLENBQUUsVUFBVSxDQUFDLFlBQVksZUFBZTtBQUM3RCxRQUFNLGdCQUFtQztBQUFBLElBQ3ZDLEtBQUssQ0FBRSxRQUFRLGNBQWMsV0FBVyxJQUFJLGNBQWM7QUFBQSxJQUMxRCxPQUFPO0FBQUEsTUFDTCxRQUFRO0FBQUEsTUFDUixXQUFXLElBQUksY0FBYztBQUFBLE1BQzdCLFNBQVM7QUFBQTtBQUFBO0FBR2IsUUFBTSxvQkFBeUI7QUFBQSxJQUM3QjtBQUFBLElBQ0EsU0FBUyxPQUFPLElBQUk7QUFBQSxJQUNwQixVQUFVLE9BQU8sSUFBSTtBQUFBO0FBRXZCLFFBQU0sZ0JBQTJDO0FBQUEsSUFDL0Msa0JBQWtCLENBQUMsQ0FBRSxRQUFRLFFBQVEsVUFBVTtBQUFBLElBQy9DLGFBQWE7QUFBQSxNQUNYLHNCQUFzQixDQUFDLFNBQVMsY0FBYyxjQUFjO0FBQUEsTUFDNUQsWUFBWSxVQUFVLHdCQUF3QixxQkFBcUIsT0FBTyxPQUFPO0FBQUE7QUFBQSxJQUVuRix1QkFBdUIsaUNBQ2xCLG9CQURrQjtBQUFBLE1BRXJCLGVBQWU7QUFBQSxRQUNiLE9BQU8sVUFBVSxpQkFBaUI7QUFBQSxRQUNsQyxVQUFVLFVBQVUsaUJBQWlCO0FBQUEsUUFDckMsT0FBTyxVQUFVLGlCQUFpQjtBQUFBLFFBQ2xDLFlBQVksVUFBVSxpQkFBaUI7QUFBQSxRQUN2QyxZQUFZLFVBQVUsaUJBQWlCO0FBQUE7QUFBQSxNQUV6QyxpQ0FBaUM7QUFBQTtBQUFBO0FBR3JDLFFBQU0sU0FBUyxJQUFJLElBQUksZUFBZSxJQUFJLE1BQU0sZUFBZTtBQUUvRCxVQUFRLGNBQWMsS0FBSyxPQUFPO0FBRWxDLFNBQ0csVUFDQSxLQUFLLE1BQU07QUFDVixVQUFNLGVBQWUsQ0FBQyxVQUErQixhQUE4QjtBQUNqRixZQUFNLFFBQVEsT0FBTyx1QkFBdUIsNkJBQTZCLFVBQVU7QUFDbkYsYUFBTyxPQUFPLFlBQVksaUJBQWlCO0FBQUE7QUFFN0MsVUFBTSxhQUFhLHlDQUFtQixjQUFjLENBQUUsT0FBTyxPQUFRO0FBQ3JFLFlBQVEsY0FBYyxLQUFLO0FBQUEsS0FFNUIsTUFBTSxDQUFDLFFBQVE7QUFDZCxZQUFRLE1BQU0sMENBQTBDO0FBQUE7QUFHNUQsU0FBTztBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEsb0JBQXNGO0FBQ3RGLGtCQUFzRztBQUV0Ryx1QkFBbUM7QUFFbkMsTUFBTSxrQkFBd0UsSUFBSSx3QkFBWTtBQUU5Rix3QkFBK0IsU0FBMkI7QUFDekQsUUFBTSxlQUErQjtBQUVyQyxRQUFNLE9BQU87QUFDYixRQUFNLGVBQWUsQ0FBRSxVQUFVLENBQUMsWUFBWSxlQUFlO0FBRTdELFFBQU0sZ0JBQStCO0FBQUEsSUFDcEMsS0FBSyxDQUFFLFFBQVEsY0FBYyxXQUFXLDBCQUFjO0FBQUEsSUFDdEQsT0FBTztBQUFBLE1BQ04sUUFBUTtBQUFBLE1BQ1IsV0FBVywwQkFBYztBQUFBLE1BQ3pCLFNBQVM7QUFBQTtBQUFBO0FBSVgsUUFBTSxnQkFBdUM7QUFBQSxJQUM1QyxrQkFBa0IsQ0FBQyxDQUFFLFFBQVEsUUFBUSxVQUFVO0FBQUEsSUFDL0MsYUFBYTtBQUFBLE1BQ1osc0JBQXNCLENBQUMsU0FBUyxjQUFjLGNBQWM7QUFBQSxNQUM1RCxZQUFZLHdCQUFVLHdCQUF3QixxQkFBcUIsT0FBTyxPQUFPO0FBQUE7QUFBQSxJQUVsRix1QkFBdUI7QUFBQSxNQUN0QixlQUFlO0FBQUEsUUFDZCxPQUFPLHdCQUFVLGlCQUFpQjtBQUFBLFFBQ2xDLFVBQVUsd0JBQVUsaUJBQWlCO0FBQUEsUUFDckMsT0FBTyx3QkFBVSxpQkFBaUI7QUFBQSxRQUNsQyxZQUFZLHdCQUFVLGlCQUFpQjtBQUFBLFFBQ3ZDLFlBQVksd0JBQVUsaUJBQWlCO0FBQUE7QUFBQSxNQUV4QyxpQ0FBaUM7QUFBQTtBQUFBO0FBSW5DLE1BQUksU0FBUyxxQkFBcUIsZUFBZTtBQUNqRCxVQUFRLGNBQWMsS0FBSyxPQUFPO0FBRWxDLFNBQ0UsVUFDQSxLQUFLLE1BQU07QUFDWCxVQUFNLGVBQWUsQ0FBQyxVQUF3QixhQUF1QjtBQUNwRSxZQUFNLFFBQVEsT0FBTyx1QkFBdUIsNkJBQTZCLFVBQVU7QUFDbkYsYUFBTyxPQUFPLFlBQVksaUJBQWlCO0FBQUE7QUFFNUMsVUFBTSxhQUFhLHlDQUFtQixjQUFjLENBQUUsT0FBTyxPQUFRO0FBQ3JFLFlBQVEsY0FBYyxLQUFLO0FBQUEsS0FFM0IsTUFBTSxDQUFDLFFBQVE7QUFDZixZQUFRLE1BQU0sMENBQTBDO0FBQUE7QUFJMUQsMEJBQVUsc0JBQXNCLE9BQU8sUUFBc0I7QUExRDlEO0FBMkRFLFVBQU0sV0FBVyxVQUFJLFNBQVMsTUFBTSxTQUFTLFVBQTVCLFlBQXFDLElBQUk7QUFDMUQsUUFBSSxDQUFDLG9CQUFvQixvQkFBb0Isb0NBQW9DLEtBQUssQ0FBQyxVQUFVLE1BQU0sS0FBSyxZQUFZO0FBQ3ZILFlBQU0sY0FBYztBQUFBO0FBQUE7QUFJdEIsVUFBUSxjQUFjLEtBQ3JCLHVCQUFTLGdCQUFnQiwrQkFBK0IsWUFBWTtBQUNuRSxVQUFNLGNBQWM7QUFBQTtBQUl0QixNQUFJLG1CQUFtQjtBQUN2QiwrQkFBNkIsa0JBQTJCO0FBQ3ZELFFBQUksa0JBQWtCO0FBQ3JCO0FBQUE7QUFHRCx1QkFBbUI7QUFDbkIsVUFBTSxPQUFPO0FBRWIsYUFBUyxxQkFBcUIsZUFBZTtBQUM3QyxZQUFRLGNBQWMsS0FBSyxPQUFPO0FBQ2xDLFVBQU0sT0FBTztBQUViLFFBQUksa0JBQWtCO0FBQ3JCLDJCQUFPLHVCQUF1QjtBQUFBO0FBRy9CLHVCQUFtQjtBQUFBO0FBR3BCLHlCQUF1QjtBQUN0QixXQUFPO0FBQUE7QUFHUixTQUFPO0FBQUEsSUFDTixtQkFBbUI7QUFBQTtBQUFBO0FBSXJCLDhCQUE4QixlQUE4QixlQUFzQztBQUNqRyxTQUFPLElBQUksMkJBQWUsU0FBUyxTQUFTLGVBQWU7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K

package/package.json

@@ -8,7 +8,7 @@
     "color": "#FFBE2D",
     "theme": "dark"
   },
-  "version": "0.8.9",
+  "version": "0.9.1",
   "author": "withastro",
   "license": "MIT",
   "publisher": "astro-build",
@@ -24,10 +24,8 @@
     "onLanguage:astro"
   ],
   "dependencies": {
-    "@astrojs/language-server": "0.8.9",
-    "@astrojs/ts-plugin": "0.1.1",
-    "vscode-emmet-helper": "2.1.2",
-    "vscode-html-languageservice": "^3.0.3",
+    "@astrojs/language-server": "0.9.1",
+    "@astrojs/ts-plugin": "0.2.0",
     "vscode-languageclient": "~7.0.0"
   },
   "devDependencies": {
@@ -53,6 +51,12 @@
         "enableForWorkspaceTypeScriptVersions": true
       }
     ],
+    "commands": [
+      {
+        "command": "astro.restartLanguageServer",
+        "title": "Astro: Restart Language Server"
+      }
+    ],
     "configuration": {
       "type": "object",
       "title": "Astro configuration",