astro 1.1.3 → 1.1.6

package/dist/core/build/internal.js

@@ -1,4 +1,4 @@
-import { prependForwardSlash } from "../path.js";
+import { prependForwardSlash, removeFileExtension } from "../path.js";
 import { viteID } from "../util.js";
 function createBuildInternals() {
   const hoistedScriptIdToHoistedMap = /* @__PURE__ */ new Map();
@@ -45,8 +45,12 @@ function* getPageDatasByChunk(internals, chunk) {
 function* getPageDatasByClientOnlyID(internals, viteid) {
   const pagesByClientOnly = internals.pagesByClientOnly;
   if (pagesByClientOnly.size) {
-    const pathname = `/@fs${prependForwardSlash(viteid)}`;
-    const pageBuildDatas = pagesByClientOnly.get(pathname);
+    let pathname = `/@fs${prependForwardSlash(viteid)}`;
+    let pageBuildDatas = pagesByClientOnly.get(viteid);
+    if (!pageBuildDatas) {
+      pathname = `/@fs${prependForwardSlash(removeFileExtension(viteid))}`;
+      pageBuildDatas = pagesByClientOnly.get(pathname);
+    }
     if (pageBuildDatas) {
       for (const pageData of pageBuildDatas) {
         yield pageData;

package/dist/core/build/static-build.js

@@ -23,9 +23,9 @@ async function staticBuild(opts) {
   if (isModeServerWithNoAdapter(opts.astroConfig)) {
     throw new Error(`Cannot use \`output: 'server'\` without an adapter.
 Install and configure the appropriate server adapter for your final deployment.
-Example:
+Learn more: https://docs.astro.build/en/guides/server-side-rendering/
 
-  // astro.config.js
+  // Example: astro.config.js
   import netlify from '@astrojs/netlify';
   export default {
     output: 'server',

package/dist/core/build/vite-plugin-analyzer.js

@@ -1,5 +1,4 @@
 import { prependForwardSlash } from "../../core/path.js";
-import { resolveClientDevPath } from "../../core/render/dev/resolve.js";
 import { getTopLevelPages } from "./graph.js";
 import { getPageDataByViteID, trackClientOnlyPageDatas } from "./internal.js";
 function vitePluginAnalyzer(internals) {
@@ -66,14 +65,14 @@ function vitePluginAnalyzer(internals) {
           continue;
         const astro = info.meta.astro;
         for (const c of astro.hydratedComponents) {
-          const rid = c.resolvedPath ? resolveClientDevPath(c.resolvedPath) : c.specifier;
+          const rid = c.resolvedPath ? decodeURI(c.resolvedPath) : c.specifier;
           internals.discoveredHydratedComponents.add(rid);
         }
         hoistScanner.scan.call(this, astro.scripts, id);
         if (astro.clientOnlyComponents.length) {
           const clientOnlys = [];
           for (const c of astro.clientOnlyComponents) {
-            const cid = c.resolvedPath ? resolveClientDevPath(c.resolvedPath) : c.specifier;
+            const cid = c.resolvedPath ? decodeURI(c.resolvedPath) : c.specifier;
             internals.discoveredClientOnlyComponents.add(cid);
             clientOnlys.push(cid);
           }

package/dist/core/build/vite-plugin-css.js

@@ -92,6 +92,7 @@ function rollupPluginAstroBuildCSS(options) {
                   if (Object.keys(c.modules).every((id) => internals.cssChunkModuleIds.has(id))) {
                     for (const importedCssImport of meta.importedCss) {
                       delete bundle[importedCssImport];
+                      meta.importedCss.delete(importedCssImport);
                     }
                     return;
                   }

package/dist/core/create-vite.js

@@ -1,4 +1,6 @@
 import fs from "fs";
+import { createRequire } from "module";
+import path from "path";
 import { fileURLToPath } from "url";
 import * as vite from "vite";
 import astroPostprocessVitePlugin from "../vite-plugin-astro-postprocess/index.js";
@@ -116,32 +118,82 @@ function sortPlugins(pluginOptions) {
   pluginOptions.splice(jsxPluginIndex, 0, mdxPlugin);
 }
 async function getAstroPackages({ root }) {
-  const pkgUrl = new URL("./package.json", root);
-  const pkgPath = fileURLToPath(pkgUrl);
-  if (!fs.existsSync(pkgPath))
-    return [];
-  const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
-  const deps = [...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.devDependencies || {})];
-  return deps.filter((dep) => {
-    if (isCommonNotAstro(dep))
-      return false;
-    if (/^astro\-/.test(dep))
-      return true;
-    const depPkgUrl = new URL(`./node_modules/${dep}/package.json`, root);
-    const depPkgPath = fileURLToPath(depPkgUrl);
-    if (!fs.existsSync(depPkgPath))
-      return false;
-    const {
-      dependencies = {},
-      peerDependencies = {},
-      keywords = []
-    } = JSON.parse(fs.readFileSync(depPkgPath, "utf-8"));
-    if (peerDependencies.astro || dependencies.astro)
-      return true;
-    if (keywords.includes("astro") || keywords.includes("astro-component"))
-      return true;
-    return false;
-  });
+  const { astroPackages } = new DependencyWalker(root);
+  return astroPackages;
+}
+class DependencyWalker {
+  constructor(root) {
+    this.astroDeps = /* @__PURE__ */ new Set();
+    this.nonAstroDeps = /* @__PURE__ */ new Set();
+    const pkgUrl = new URL("./package.json", root);
+    this.require = createRequire(pkgUrl);
+    const pkgPath = fileURLToPath(pkgUrl);
+    if (!fs.existsSync(pkgPath))
+      return;
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+    const deps = [
+      ...Object.keys(pkg.dependencies || {}),
+      ...Object.keys(pkg.devDependencies || {})
+    ];
+    this.scanDependencies(deps);
+  }
+  get astroPackages() {
+    return Array.from(this.astroDeps);
+  }
+  seen(dep) {
+    return this.astroDeps.has(dep) || this.nonAstroDeps.has(dep);
+  }
+  readPkgJSON(dir) {
+    try {
+      const filePath = path.join(dir, "package.json");
+      return JSON.parse(fs.readFileSync(filePath, "utf-8"));
+    } catch (e) {
+    }
+  }
+  resolvePkgJSON(dep) {
+    try {
+      const pkgJson = this.require(dep + "/package.json");
+      return pkgJson;
+    } catch (e) {
+      try {
+        let dir = path.dirname(this.require.resolve(dep));
+        while (dir) {
+          const pkgJSON = this.readPkgJSON(dir);
+          if (pkgJSON && pkgJSON.name === dep)
+            return pkgJSON;
+          const parentDir = path.dirname(dir);
+          if (parentDir === dir)
+            break;
+          dir = parentDir;
+        }
+      } catch (e2) {
+      }
+    }
+  }
+  scanDependencies(deps) {
+    const newDeps = [];
+    for (const dep of deps) {
+      if (isCommonNotAstro(dep)) {
+        this.nonAstroDeps.add(dep);
+        continue;
+      }
+      const pkgJson = this.resolvePkgJSON(dep);
+      if (!pkgJson) {
+        this.nonAstroDeps.add(dep);
+        continue;
+      }
+      const { dependencies = {}, peerDependencies = {}, keywords = [] } = pkgJson;
+      if (peerDependencies.astro || dependencies.astro || keywords.includes("astro") || keywords.includes("astro-component") || /^(@[^\/]+\/)?astro\-/.test(dep)) {
+        this.astroDeps.add(dep);
+        const unknownDependencies = Object.keys(dependencies).filter((d) => !this.seen(d));
+        newDeps.push(...unknownDependencies);
+      } else {
+        this.nonAstroDeps.add(dep);
+      }
+    }
+    if (newDeps.length)
+      this.scanDependencies(newDeps);
+  }
 }
 const COMMON_DEPENDENCIES_NOT_ASTRO = [
   "autoprefixer",

package/dist/core/dev/index.js

@@ -46,7 +46,7 @@ async function dev(config, options) {
       https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
     })
   );
-  const currentVersion = "1.1.3";
+  const currentVersion = "1.1.6";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -46,7 +46,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.1.3";
+  const version = "1.1.6";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -225,7 +225,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"1.1.3"}`
+        `v${"1.1.6"}`
       )} ${headline}`
     );
   }

package/dist/core/path.d.ts

@@ -8,3 +8,4 @@ export declare function startsWithDotDotSlash(path: string): boolean;
 export declare function startsWithDotSlash(path: string): boolean;
 export declare function isRelativePath(path: string): boolean;
 export declare function joinPaths(...paths: (string | undefined)[]): string;
+export declare function removeFileExtension(path: string): string;

package/dist/core/path.js

@@ -36,11 +36,16 @@ function isString(path) {
 function joinPaths(...paths) {
   return paths.filter(isString).map(trimSlashes).join("/");
 }
+function removeFileExtension(path) {
+  let idx = path.lastIndexOf(".");
+  return idx === -1 ? path : path.slice(0, idx);
+}
 export {
   appendForwardSlash,
   isRelativePath,
   joinPaths,
   prependForwardSlash,
+  removeFileExtension,
   removeLeadingForwardSlash,
   removeTrailingForwardSlash,
   startsWithDotDotSlash,

package/dist/core/render/dev/css.js

@@ -3,14 +3,14 @@ import { viteID } from "../../util.js";
 import { STYLE_EXTENSIONS } from "../util.js";
 import { crawlGraph } from "./vite.js";
 async function getStylesForURL(filePath, viteServer, mode) {
-  var _a;
   const importedCssUrls = /* @__PURE__ */ new Set();
   const importedStylesMap = /* @__PURE__ */ new Map();
   for await (const importedModule of crawlGraph(viteServer, viteID(filePath), true)) {
     const ext = path.extname(importedModule.url).toLowerCase();
     if (STYLE_EXTENSIONS.has(ext)) {
-      if (mode === "development" && typeof ((_a = importedModule.ssrModule) == null ? void 0 : _a.default) === "string") {
-        importedStylesMap.set(importedModule.url, importedModule.ssrModule.default);
+      const ssrModule = importedModule.ssrModule ?? await viteServer.ssrLoadModule(importedModule.url);
+      if (mode === "development" && typeof (ssrModule == null ? void 0 : ssrModule.default) === "string") {
+        importedStylesMap.set(importedModule.url, ssrModule.default);
       } else {
         importedCssUrls.add(importedModule.url);
       }

package/dist/core/util.js

@@ -5,7 +5,7 @@ import resolve from "resolve";
 import slash from "slash";
 import { fileURLToPath, pathToFileURL } from "url";
 import { prependForwardSlash, removeTrailingForwardSlash } from "./path.js";
-const ASTRO_VERSION = "1.1.3";
+const ASTRO_VERSION = "1.1.6";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }

package/dist/jsx/babel.js

@@ -1,5 +1,6 @@
 import * as t from "@babel/types";
 import { pathToFileURL } from "node:url";
+import { resolveClientDevPath } from "../core/render/dev/resolve.js";
 import { HydrationDirectiveProps } from "../runtime/server/hydration.js";
 const ClientOnlyPlaceholder = "astro-client-only";
 function isComponent(tagName) {
@@ -194,10 +195,7 @@ function astroJSX() {
           let resolvedPath;
           if (meta.path.startsWith(".")) {
             const fileURL = pathToFileURL(state.filename);
-            resolvedPath = `/@fs${new URL(meta.path, fileURL).pathname}`;
-            if (resolvedPath.endsWith(".jsx")) {
-              resolvedPath = resolvedPath.slice(0, -4);
-            }
+            resolvedPath = resolveClientDevPath(`/@fs${new URL(meta.path, fileURL).pathname}`);
           } else {
             resolvedPath = meta.path;
           }
@@ -273,10 +271,7 @@ function astroJSX() {
           let resolvedPath;
           if (meta.path.startsWith(".")) {
             const fileURL = pathToFileURL(state.filename);
-            resolvedPath = `/@fs${new URL(meta.path, fileURL).pathname}`;
-            if (resolvedPath.endsWith(".jsx")) {
-              resolvedPath = resolvedPath.slice(0, -4);
-            }
+            resolvedPath = resolveClientDevPath(`/@fs${new URL(meta.path, fileURL).pathname}`);
           } else {
             resolvedPath = meta.path;
           }

package/dist/runtime/server/astro-global.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.1.3";
+const ASTRO_VERSION = "1.1.6";
 function createDeprecatedFetchContentFn() {
   return () => {
     throw new Error("Deprecated: Astro.fetchContent() has been replaced with Astro.glob().");

package/dist/runtime/server/hydration.js

@@ -85,10 +85,10 @@ async function generateHydrateScript(scriptOptions, metadata) {
       island.props[key] = value;
     }
   }
-  island.props["component-url"] = await result.resolve(componentUrl);
+  island.props["component-url"] = await result.resolve(decodeURI(componentUrl));
   if (renderer.clientEntrypoint) {
     island.props["component-export"] = componentExport.value;
-    island.props["renderer-url"] = await result.resolve(renderer.clientEntrypoint);
+    island.props["renderer-url"] = await result.resolve(decodeURI(renderer.clientEntrypoint));
     island.props["props"] = escapeHTML(serializeProps(props));
   }
   island.props["ssr"] = "";

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

@@ -112,7 +112,7 @@ function jsx({ config, logging }) {
     enforce: "pre",
     async configResolved(resolvedConfig) {
       viteConfig = resolvedConfig;
-      const possibleRenderers = await collectJSXRenderers(config._ctx.renderers);
+      const possibleRenderers = collectJSXRenderers(config._ctx.renderers);
       for (const [importSource, renderer] of possibleRenderers) {
         jsxRenderers.set(importSource, renderer);
         if (importSource === "astro") {
@@ -163,8 +163,8 @@ function jsx({ config, logging }) {
       if (!importSource && IMPORT_KEYWORD_REGEX.test(code)) {
         importSource = await detectImportSourceFromImports(code, id, jsxRenderers);
       }
-      if (!importSource) {
-        const [defaultRendererName] = defaultJSXRendererEntry[0];
+      if (!importSource && defaultJSXRendererEntry) {
+        const [defaultRendererName] = defaultJSXRendererEntry;
         error(
           logging,
           "renderer",
@@ -173,6 +173,16 @@ Unable to resolve a renderer that handles this file! With more than one renderer
 Add ${colors.cyan(
             IMPORT_STATEMENTS[defaultRendererName] || `import '${defaultRendererName}';`
           )} or ${colors.cyan(`/* jsxImportSource: ${defaultRendererName} */`)} to this file.
+`
+        );
+        return null;
+      } else if (!importSource) {
+        error(
+          logging,
+          "renderer",
+          `${colors.yellow(id)}
+Unable to find a renderer for JSX. Do you have one configured in your Astro config? See this page to learn how:
+https://docs.astro.build/en/core-concepts/framework-components/#installing-integrations
 `
         );
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.1.3",
+  "version": "1.1.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -95,7 +95,6 @@
     "@babel/types": "^7.18.4",
     "@proload/core": "^0.3.2",
     "@proload/plugin-tsm": "^0.2.1",
-    "ast-types": "^0.14.2",
     "boxen": "^6.2.1",
     "ci-info": "^3.3.1",
     "common-ancestor-path": "^1.0.1",
@@ -160,6 +159,7 @@
     "@types/send": "^0.17.1",
     "@types/unist": "^2.0.6",
     "@types/yargs-parser": "^21.0.0",
+    "ast-types": "^0.14.2",
     "astro-scripts": "0.0.7",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",