astro 1.4.5 → 1.4.7

package/config.mjs

@@ -1,43 +1 @@
-export function defineConfig(config) {
-	return config;
-}
-
-export function getViteConfig(inlineConfig) {
-	// Return an async Vite config getter which exposes a resolved `mode` and `command`
-	return async ({ mode, command }) => {
-		// Vite `command` is `serve | build`, but Astro uses `dev | build`
-		const cmd = command === 'serve' ? 'dev' : command;
-
-		// Use dynamic import to avoid pulling in deps unless used
-		const [
-			{ mergeConfig },
-			{ nodeLogDestination },
-			{ openConfig },
-			{ createVite },
-			{ runHookConfigSetup, runHookConfigDone },
-		] = await Promise.all([
-			import('vite'),
-			import('./dist/core/logger/node.js'),
-			import('./dist/core/config.js'),
-			import('./dist/core/create-vite.js'),
-			import('./dist/integrations/index.js'),
-		]);
-		const logging = {
-			dest: nodeLogDestination,
-			level: 'info',
-		};
-		const { astroConfig: config } = await openConfig({
-			cmd,
-			logging,
-		});
-		await runHookConfigSetup({ config, command: cmd });
-		const viteConfig = await createVite(
-			{
-				mode,
-			},
-			{ astroConfig: config, logging: logging, mode }
-		);
-		await runHookConfigDone({ config });
-		return mergeConfig(viteConfig, inlineConfig);
-	};
-}
+export { defineConfig, getViteConfig } from './dist/config/index.js';

package/dist/@types/astro.d.ts

@@ -384,22 +384,13 @@ export interface AstroUserConfig {
      * @name base
      * @type {string}
      * @description
-     * The base path you're deploying to. Astro will match this pathname during development so that your development experience matches your build environment as closely as possible. In the example below, `astro dev` will start your server at `/docs`.
+     * The base path to deploy to. Astro will build your pages and assets using this path as the root. Currently, this has no effect during development.
      *
      * ```js
      * {
      *   base: '/docs'
      * }
      * ```
-     *
-     * When using this option, you should mind that all of your imports will be affected. In this example, all of the imports including static resources and codes should add a prefix `/docs/`.
-     *
-     * For example, if you want to use a image in your Astro component, you need to change it from '/someimg.png' into '/docs/someimg.png'.
-     *
-     * ```astro
-     * <!-- <img src="/someimg.png"> is not correct. -->
-     * <img src="/docs/someimg.png">
-     * ```
      */
     base?: string;
     /**

package/dist/config/index.d.ts

@@ -0,0 +1,7 @@
+import type { UserConfig } from 'vite';
+import type { AstroUserConfig } from '../@types/astro';
+export declare function defineConfig(config: AstroUserConfig): AstroUserConfig;
+export declare function getViteConfig(inlineConfig: UserConfig): ({ mode, command }: {
+    mode: string;
+    command: 'serve' | 'build';
+}) => Promise<Record<string, any>>;

package/dist/config/index.js

@@ -0,0 +1,48 @@
+function defineConfig(config) {
+  return config;
+}
+function getViteConfig(inlineConfig) {
+  return async ({ mode, command }) => {
+    const cmd = command === "serve" ? "dev" : command;
+    const [
+      { mergeConfig },
+      { nodeLogDestination },
+      { openConfig, createSettings, loadTSConfig },
+      { createVite },
+      { runHookConfigSetup, runHookConfigDone }
+    ] = await Promise.all([
+      import("vite"),
+      import("../core/logger/node.js"),
+      import("../core/config/index.js"),
+      import("../core/create-vite.js"),
+      import("../integrations/index.js")
+    ]);
+    const logging = {
+      dest: nodeLogDestination,
+      level: "info"
+    };
+    const { astroConfig: config } = await openConfig({
+      cmd,
+      logging
+    });
+    const initialTsConfig = loadTSConfig(inlineConfig.root);
+    const settings = createSettings({
+      config,
+      tsConfig: initialTsConfig == null ? void 0 : initialTsConfig.config,
+      tsConfigPath: initialTsConfig == null ? void 0 : initialTsConfig.path
+    });
+    await runHookConfigSetup({ settings, command: cmd, logging });
+    const viteConfig = await createVite(
+      {
+        mode
+      },
+      { settings, logging, mode }
+    );
+    await runHookConfigDone({ settings, logging });
+    return mergeConfig(viteConfig, inlineConfig);
+  };
+}
+export {
+  defineConfig,
+  getViteConfig
+};

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

@@ -5,8 +5,9 @@ import path from "path";
 import { fileURLToPath } from "url";
 import * as vite from "vite";
 import { createBuildInternals } from "../../core/build/internal.js";
+import { emptyDir, removeDir } from "../../core/fs/index.js";
 import { prependForwardSlash } from "../../core/path.js";
-import { emptyDir, isModeServerWithNoAdapter, removeDir } from "../../core/util.js";
+import { isModeServerWithNoAdapter } from "../../core/util.js";
 import { runHookBuildSetup } from "../../integrations/index.js";
 import { PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
 import { info } from "../logger/core.js";

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

@@ -2,7 +2,6 @@ import crypto from "crypto";
 import esbuild from "esbuild";
 import npath from "path";
 import { isCSSRequest } from "../render/util.js";
-import { relativeToSrcDir } from "../util.js";
 import { getTopLevelPages, moduleIsTopLevelPage, walkParentInfos } from "./graph.js";
 import {
   eachPageData,
@@ -11,32 +10,22 @@ import {
   getPageDatasByHoistedScriptId,
   isHoistedScript
 } from "./internal.js";
-const MAX_NAME_LENGTH = 70;
 function rollupPluginAstroBuildCSS(options) {
   const { internals, buildOptions } = options;
   const { settings } = buildOptions;
   let resolvedConfig;
-  function nameifyPage(id) {
-    let rel = relativeToSrcDir(settings.config, id);
-    if (rel.startsWith("pages/")) {
-      rel = rel.slice(6);
-    }
-    const ext = npath.extname(rel);
-    const noext = rel.slice(0, rel.length - ext.length);
-    const named = noext.replace(/\//g, "-");
-    return named;
-  }
   function createNameForParentPages(id, ctx) {
+    var _a;
     const parents = Array.from(getTopLevelPages(id, ctx));
-    const proposedName = parents.map(([page]) => nameifyPage(page.id)).sort().join("-");
-    if (proposedName.length <= MAX_NAME_LENGTH) {
-      return proposedName;
-    }
+    const firstParentId = (_a = parents[0]) == null ? void 0 : _a[0].id;
+    const firstParentName = firstParentId ? npath.parse(firstParentId).name : "index";
     const hash = crypto.createHash("sha256");
     for (const [page] of parents) {
       hash.update(page.id, "utf-8");
     }
-    return hash.digest("hex").slice(0, 8);
+    const h = hash.digest("hex").slice(0, 8);
+    const proposedName = firstParentName + "." + h;
+    return proposedName;
   }
   function* getParentClientOnlys(id, ctx) {
     for (const [info] of walkParentInfos(id, ctx)) {

package/dist/core/dev/index.js

@@ -49,7 +49,7 @@ async function dev(settings, options) {
       isRestart
     })
   );
-  const currentVersion = "1.4.5";
+  const currentVersion = "1.4.7";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/fs/index.d.ts

@@ -0,0 +1,3 @@
+/** An fs utility, similar to `rimraf` or `rm -rf` */
+export declare function removeDir(_dir: URL): void;
+export declare function emptyDir(_dir: URL, skip?: Set<string>): void;

package/dist/core/fs/index.js

@@ -0,0 +1,79 @@
+import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+const isWindows = process.platform === "win32";
+function removeDir(_dir) {
+  const dir = fileURLToPath(_dir);
+  fs.rmSync(dir, { recursive: true, force: true, maxRetries: 3 });
+}
+function emptyDir(_dir, skip) {
+  const dir = fileURLToPath(_dir);
+  if (!fs.existsSync(dir))
+    return void 0;
+  for (const file of fs.readdirSync(dir)) {
+    if (skip == null ? void 0 : skip.has(file)) {
+      continue;
+    }
+    const p = path.resolve(dir, file);
+    const rmOptions = { recursive: true, force: true, maxRetries: 3 };
+    try {
+      fs.rmSync(p, rmOptions);
+    } catch (er) {
+      if (er.code === "ENOENT") {
+        return;
+      }
+      if (er.code === "EPERM" && isWindows) {
+        fixWinEPERMSync(p, rmOptions, er);
+      }
+    }
+  }
+}
+/**
+ * https://github.com/isaacs/rimraf/blob/8c10fb8d685d5cc35708e0ffc4dac9ec5dd5b444/rimraf.js#L183
+ * @license ISC
+ * The ISC License
+ *
+ * Copyright (c) Isaac Z. Schlueter and Contributors
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+const fixWinEPERMSync = (p, options, er) => {
+  try {
+    fs.chmodSync(p, 438);
+  } catch (er2) {
+    if (er2.code === "ENOENT") {
+      return;
+    } else {
+      throw er;
+    }
+  }
+  let stats;
+  try {
+    stats = fs.statSync(p);
+  } catch (er3) {
+    if (er3.code === "ENOENT") {
+      return;
+    } else {
+      throw er;
+    }
+  }
+  if (stats.isDirectory()) {
+    fs.rmdirSync(p, options);
+  } else {
+    fs.unlinkSync(p);
+  }
+};
+export {
+  emptyDir,
+  removeDir
+};

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   site,
   isRestart = false
 }) {
-  const version = "1.4.5";
+  const version = "1.4.7";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -250,7 +250,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"1.4.5"}`
+        `v${"1.4.7"}`
       )} ${headline}`
     );
   }

package/dist/core/util.d.ts

@@ -33,9 +33,6 @@ export declare function resolveDependency(dep: string, projectRoot: URL): string
 export declare function viteID(filePath: URL): string;
 export declare const VALID_ID_PREFIX = "/@id/";
 export declare function unwrapId(id: string): string;
-/** An fs utility, similar to `rimraf` or `rm -rf` */
-export declare function removeDir(_dir: URL): void;
-export declare function emptyDir(_dir: URL, skip?: Set<string>): void;
 export declare function resolvePages(config: AstroConfig): URL;
 export declare function isPage(file: URL, settings: AstroSettings): boolean;
 export declare function isModeServerWithNoAdapter(settings: AstroSettings): boolean;

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.4.5";
+const ASTRO_VERSION = "1.4.7";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }
@@ -93,21 +93,6 @@ const VALID_ID_PREFIX = `/@id/`;
 function unwrapId(id) {
   return id.startsWith(VALID_ID_PREFIX) ? id.slice(VALID_ID_PREFIX.length) : id;
 }
-function removeDir(_dir) {
-  const dir = fileURLToPath(_dir);
-  fs.rmSync(dir, { recursive: true, force: true, maxRetries: 3 });
-}
-function emptyDir(_dir, skip) {
-  const dir = fileURLToPath(_dir);
-  if (!fs.existsSync(dir))
-    return void 0;
-  for (const file of fs.readdirSync(dir)) {
-    if (skip == null ? void 0 : skip.has(file)) {
-      continue;
-    }
-    fs.rmSync(path.resolve(dir, file), { recursive: true, force: true, maxRetries: 3 });
-  }
-}
 function resolvePages(config) {
   return new URL("./pages", config.srcDir);
 }
@@ -197,7 +182,6 @@ export {
   codeFrame,
   createSafeError,
   emoji,
-  emptyDir,
   getLocalAddress,
   getOutputFilename,
   isModeServerWithNoAdapter,
@@ -206,7 +190,6 @@ export {
   padMultilineString,
   parseNpmName,
   relativeToSrcDir,
-  removeDir,
   resolveDependency,
   resolveIdToUrl,
   resolveJsToTs,

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

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

package/dist/runtime/server/hydration.js

@@ -84,7 +84,7 @@ async function generateHydrateScript(scriptOptions, metadata) {
   };
   if (attrs) {
     for (const [key, value] of Object.entries(attrs)) {
-      island.props[key] = value;
+      island.props[key] = escapeHTML(value);
     }
   }
   island.props["component-url"] = await result.resolve(decodeURI(componentUrl));

package/dist/runtime/server/render/page.js

@@ -14,6 +14,7 @@ async function iterableToHTMLBytes(result, iterable, onDocTypeInjection) {
   for await (const chunk of iterable) {
     if (isHTMLString(chunk)) {
       if (i === 0) {
+        i++;
         if (!/<!doctype html/i.test(String(chunk))) {
           parts.append("<!DOCTYPE html>\n", result);
           if (onDocTypeInjection) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",