astro 1.2.8 → 1.3.1

package/dist/vite-plugin-jsx/tag.js

@@ -36,27 +36,59 @@ function tagExportsWithRenderer({
           }
         }
       },
-      ExportDeclaration(path, state) {
-        var _a, _b;
-        const node = path.node;
-        if (node.exportKind === "type")
-          return;
-        if (node.type === "ExportAllDeclaration")
-          return;
-        if (node.type === "ExportNamedDeclaration") {
-          if (t.isFunctionDeclaration(node.declaration)) {
-            if ((_a = node.declaration.id) == null ? void 0 : _a.name) {
-              const id = node.declaration.id.name;
-              const tags = state.get("astro:tags") ?? [];
-              state.set("astro:tags", [...tags, id]);
-            }
+      ExportDeclaration: {
+        enter(path) {
+          var _a, _b, _c;
+          const node = path.node;
+          if (node.type !== "ExportDefaultDeclaration")
+            return;
+          if (((_a = node.declaration) == null ? void 0 : _a.type) === "ArrowFunctionExpression") {
+            const uidIdentifier = path.scope.generateUidIdentifier("_arrow_function");
+            path.insertBefore(
+              t.variableDeclaration("const", [
+                t.variableDeclarator(uidIdentifier, node.declaration)
+              ])
+            );
+            node.declaration = uidIdentifier;
+          } else if (((_b = node.declaration) == null ? void 0 : _b.type) === "FunctionDeclaration" && !((_c = node.declaration.id) == null ? void 0 : _c.name)) {
+            const uidIdentifier = path.scope.generateUidIdentifier("_function");
+            node.declaration.id = uidIdentifier;
           }
-        } else if (node.type === "ExportDefaultDeclaration") {
-          if (t.isFunctionDeclaration(node.declaration)) {
-            if ((_b = node.declaration.id) == null ? void 0 : _b.name) {
-              const id = node.declaration.id.name;
-              const tags = state.get("astro:tags") ?? [];
-              state.set("astro:tags", [...tags, id]);
+        },
+        exit(path, state) {
+          var _a, _b, _c;
+          const node = path.node;
+          if (node.exportKind === "type")
+            return;
+          if (node.type === "ExportAllDeclaration")
+            return;
+          const addTag = (id) => {
+            const tags = state.get("astro:tags") ?? [];
+            state.set("astro:tags", [...tags, id]);
+          };
+          if (node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration") {
+            if (t.isIdentifier(node.declaration)) {
+              addTag(node.declaration.name);
+            } else if (t.isFunctionDeclaration(node.declaration) && ((_a = node.declaration.id) == null ? void 0 : _a.name)) {
+              addTag(node.declaration.id.name);
+            } else if (t.isVariableDeclaration(node.declaration)) {
+              (_b = node.declaration.declarations) == null ? void 0 : _b.forEach((declaration) => {
+                if (t.isArrowFunctionExpression(declaration.init) && t.isIdentifier(declaration.id)) {
+                  addTag(declaration.id.name);
+                }
+              });
+            } else if (t.isObjectExpression(node.declaration)) {
+              (_c = node.declaration.properties) == null ? void 0 : _c.forEach((property) => {
+                if (t.isProperty(property) && t.isIdentifier(property.key)) {
+                  addTag(property.key.name);
+                }
+              });
+            } else if (t.isExportNamedDeclaration(node)) {
+              node.specifiers.forEach((specifier) => {
+                if (t.isExportSpecifier(specifier) && t.isIdentifier(specifier.exported)) {
+                  addTag(specifier.local.name);
+                }
+              });
             }
           }
         }

package/dist/vite-plugin-markdown/index.js

@@ -1,6 +1,8 @@
 import { renderMarkdown } from "@astrojs/markdown-remark";
 import fs from "fs";
 import matter from "gray-matter";
+import { fileURLToPath } from "node:url";
+import { normalizePath } from "vite";
 import { collectErrorMetadata } from "../core/errors.js";
 import { warn } from "../core/logger/core.js";
 import { getFileInfo, safelyGetAstroData } from "../vite-plugin-utils/index.js";
@@ -12,6 +14,9 @@ function safeMatter(source, id) {
     throw collectErrorMetadata(e);
   }
 }
+const astroJsxRuntimeModulePath = normalizePath(
+  fileURLToPath(new URL("../jsx-runtime/index.js", import.meta.url))
+);
 function markdown({ settings, logging }) {
   return {
     enforce: "pre",
@@ -42,7 +47,7 @@ function markdown({ settings, logging }) {
           );
         }
         const code = escapeViteEnvReferences(`
-				import { Fragment, jsx as h } from 'astro/jsx-runtime';
+				import { Fragment, jsx as h } from '${astroJsxRuntimeModulePath}';
 				${layout ? `import Layout from ${JSON.stringify(layout)};` : ""}
 
 				const html = ${JSON.stringify(html)};

package/dist/vite-plugin-utils/index.js

@@ -1,4 +1,4 @@
-import { appendForwardSlash } from "../core/path.js";
+import { appendExtension, appendForwardSlash } from "../core/path.js";
 function getFileInfo(id, config) {
   const sitePathname = appendForwardSlash(
     config.site ? new URL(config.base, config.site).pathname : config.base
@@ -8,6 +8,9 @@ function getFileInfo(id, config) {
   if (fileUrl && config.trailingSlash === "always") {
     fileUrl = appendForwardSlash(fileUrl);
   }
+  if (fileUrl && config.build.format === "file") {
+    fileUrl = appendExtension(fileUrl, "html");
+  }
   return { fileId, fileUrl };
 }
 function isValidAstroData(obj) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.2.8",
+  "version": "1.3.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -83,10 +83,10 @@
   ],
   "dependencies": {
     "@astrojs/compiler": "^0.24.0",
-    "@astrojs/language-server": "^0.23.0",
+    "@astrojs/language-server": "^0.26.2",
     "@astrojs/markdown-remark": "^1.1.2",
     "@astrojs/telemetry": "^1.0.0",
-    "@astrojs/webapi": "^1.0.0",
+    "@astrojs/webapi": "^1.1.0",
     "@babel/core": "^7.18.2",
     "@babel/generator": "^7.18.2",
     "@babel/parser": "^7.18.4",
@@ -134,6 +134,7 @@
     "strip-ansi": "^7.0.1",
     "supports-esm": "^1.0.0",
     "tsconfig-resolver": "^3.0.1",
+    "typescript": "*",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2",
     "vite": "~3.1.3",
@@ -160,7 +161,7 @@
     "@types/send": "^0.17.1",
     "@types/unist": "^2.0.6",
     "ast-types": "^0.14.2",
-    "astro-scripts": "0.0.7",
+    "astro-scripts": "0.0.8",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",
     "mocha": "^9.2.2",