astro 0.24.1 → 0.24.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/config.d.ts ADDED
@@ -0,0 +1,7 @@
1
+ type AstroUserConfig = import('./dist/types/@types/astro').AstroUserConfig;
2
+
3
+ /**
4
+ * See the full Astro Configuration API Documentation
5
+ * https://astro.build/config
6
+ */
7
+ export function defineConfig(config: AstroUserConfig): AstroUserConfig;
package/config.mjs ADDED
@@ -0,0 +1,3 @@
1
+ export function defineConfig(config) {
2
+ return config;
3
+ }
package/dist/cli/index.js CHANGED
@@ -39,7 +39,7 @@ function printHelp() {
39
39
  console.log();
40
40
  }
41
41
  function headline(name, tagline) {
42
- console.log(` ${colors.bgGreen(colors.black(` ${name} `))} ${colors.green(`v${"0.24.1"}`)} ${tagline}`);
42
+ console.log(` ${colors.bgGreen(colors.black(` ${name} `))} ${colors.green(`v${"0.24.2"}`)} ${tagline}`);
43
43
  }
44
44
  function title(label) {
45
45
  console.log(` ${colors.bgWhite(colors.black(` ${label} `))}`);
@@ -65,7 +65,7 @@ function printHelp() {
65
65
  }
66
66
  }
67
67
  async function printVersion() {
68
- const version = "0.24.1";
68
+ const version = "0.24.2";
69
69
  console.log();
70
70
  console.log(` ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
71
71
  }
@@ -22,7 +22,7 @@ async function dev(config, options = { logging: defaultLogOptions }) {
22
22
  const devServerAddressInfo = viteServer.httpServer.address();
23
23
  const site = config.buildOptions.site ? new URL(config.buildOptions.site) : void 0;
24
24
  info(options.logging, null, msg.devStart({ startupTime: performance.now() - devStart, config, devServerAddressInfo, site, https: !!((_a = viteUserConfig.server) == null ? void 0 : _a.https) }));
25
- const currentVersion = "0.24.1";
25
+ const currentVersion = "0.24.2";
26
26
  if (currentVersion.includes("-")) {
27
27
  warn(options.logging, null, msg.prerelease({ currentVersion }));
28
28
  }
@@ -2,6 +2,7 @@ import { bold, cyan, dim, red, grey, underline, yellow, reset } from "kleur/colo
2
2
  import { performance } from "perf_hooks";
3
3
  import { Writable } from "stream";
4
4
  import stringWidth from "string-width";
5
+ import * as readline from "readline";
5
6
  import debugPackage from "debug";
6
7
  import { format as utilFormat } from "util";
7
8
  function getLoggerLocale() {
@@ -56,9 +57,9 @@ const defaultLogDestination = new Writable({
56
57
  lines = Math.ceil(len / cols);
57
58
  }
58
59
  for (let i = 0; i < lines; i++) {
59
- dest.clearLine(0);
60
- dest.cursorTo(0);
61
- dest.moveCursor(0, -1);
60
+ readline.clearLine(dest, 0);
61
+ readline.cursorTo(dest, 0);
62
+ readline.moveCursor(dest, 0, -1);
62
63
  }
63
64
  }
64
65
  message = `${message} ${yellow(`(x${lastMessageCount})`)}`;
@@ -176,4 +177,4 @@ export {
176
177
  timerMessage,
177
178
  warn
178
179
  };
179
- //# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NvcmUvbG9nZ2VyLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBRUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBTUEsMkJBQW1DO0FBQ2xDLFFBQU0sZ0JBQWdCO0FBQ3RCLE1BQUksUUFBUSxJQUFJLE1BQU07QUFDckIsVUFBTSxrQkFBa0IsUUFBUSxJQUFJLEtBQUssTUFBTSxHQUFHLEVBQUUsR0FBRyxRQUFRLE1BQU0sR0FBRztBQUd4RSxRQUFJLGdCQUFnQixTQUFTO0FBQUcsYUFBTztBQUFBO0FBQ2xDLGFBQU8sZ0JBQWdCLFVBQVUsR0FBRyxDQUFDO0FBQUEsRUFDM0M7QUFBTyxXQUFPO0FBQ2Y7QUFFQSxNQUFNLEtBQUssSUFBSSxLQUFLLGVBQWUsZ0JBQWdCLEdBQUc7QUFBQSxFQUNyRCxNQUFNO0FBQUEsRUFDTixRQUFRO0FBQUEsRUFDUixRQUFRO0FBQ1QsQ0FBQztBQUVELElBQUk7QUFDSixJQUFJLG1CQUFtQjtBQUNoQixNQUFNLHdCQUF3QixJQUFJLFNBQVM7QUFBQSxFQUNqRCxZQUFZO0FBQUEsRUFDWixNQUFNLE9BQW1CLEdBQUcsVUFBVTtBQUNyQyxRQUFJLE9BQXNCLFFBQVE7QUFDbEMsUUFBSSxPQUFPLE1BQU0sU0FBUyxPQUFPLFVBQVU7QUFDMUMsYUFBTyxRQUFRO0FBQUEsSUFDaEI7QUFFQSx5QkFBcUI7QUFDcEIsVUFBSSxTQUFTO0FBQ2IsVUFBSSxPQUFPLE1BQU07QUFDakIsVUFBSSxNQUFNO0FBRVQsa0JBQVUsSUFBSSxHQUFHLE9BQU8sSUFBSSxLQUFLLENBQUMsSUFBSSxHQUFHO0FBQ3pDLFlBQUksTUFBTSxVQUFVLFFBQVE7QUFDM0IsaUJBQU8sS0FBSyxLQUFLLElBQUksT0FBTyxDQUFDO0FBQUEsUUFDOUIsV0FBVyxNQUFNLFVBQVUsUUFBUTtBQUNsQyxpQkFBTyxLQUFLLE9BQU8sSUFBSSxPQUFPLENBQUM7QUFBQSxRQUNoQyxXQUFXLE1BQU0sVUFBVSxTQUFTO0FBQ25DLGlCQUFP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
180
+ //# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NvcmUvbG9nZ2VyLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBRUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFNQSwyQkFBbUM7QUFDbEMsUUFBTSxnQkFBZ0I7QUFDdEIsTUFBSSxRQUFRLElBQUksTUFBTTtBQUNyQixVQUFNLGtCQUFrQixRQUFRLElBQUksS0FBSyxNQUFNLEdBQUcsRUFBRSxHQUFHLFFBQVEsTUFBTSxHQUFHO0FBR3hFLFFBQUksZ0JBQWdCLFNBQVM7QUFBRyxhQUFPO0FBQUE7QUFDbEMsYUFBTyxnQkFBZ0IsVUFBVSxHQUFHLENBQUM7QUFBQSxFQUMzQztBQUFPLFdBQU87QUFDZjtBQUVBLE1BQU0sS0FBSyxJQUFJLEtBQUssZUFBZSxnQkFBZ0IsR0FBRztBQUFBLEVBQ3JELE1BQU07QUFBQSxFQUNOLFFBQVE7QUFBQSxFQUNSLFFBQVE7QUFDVCxDQUFDO0FBRUQsSUFBSTtBQUNKLElBQUksbUJBQW1CO0FBQ2hCLE1BQU0sd0JBQXdCLElBQUksU0FBUztBQUFBLEVBQ2pELFlBQVk7QUFBQSxFQUNaLE1BQU0sT0FBbUIsR0FBRyxVQUFVO0FBQ3JDLFFBQUksT0FBc0IsUUFBUTtBQUNsQyxRQUFJLE9BQU8sTUFBTSxTQUFTLE9BQU8sVUFBVTtBQUMxQyxhQUFPLFFBQVE7QUFBQSxJQUNoQjtBQUVBLHlCQUFxQjtBQUNwQixVQUFJLFNBQVM7QUFDYixVQUFJLE9BQU8sTUFBTTtBQUNqQixVQUFJLE1BQU07QUFFVCxrQkFBVSxJQUFJLEdBQUcsT0FBTyxJQUFJLEtBQUssQ0FBQyxJQUFJLEdBQUc7QUFDekMsWUFBSSxNQUFNLFVBQVUsUUFBUTtBQUMzQixpQkFBTyxLQUFLLEtBQUssSUFBSSxPQUFPLENBQUM7QUFBQSxRQUM5QixXQUFXLE1BQU0sVUFBVSxRQUFRO0FBQ2xDLGlCQUFPLEtBQUssT0FBTyxJQUFJLE9BQU8sQ0FBQztBQUFBLFFBQ2hDLFdBQVcsTUFBTSxVQUFVLFNBQVM7QUFDbkMsaUJBQU8sS0FBSyxJQUFJLElBQUksT0FBTyxDQUFDO0FBQUEsUUFDN0I7QUFFQSxrQkFBVSxHQUFHO0FBQUEsTUFDZDtBQUNBLGFBQU8sTUFBTSxNQUFNO0FBQUEsSUFDcEI7QUFFQSxRQUFJLFVBQVUsV0FBVyxHQUFHLE1BQU0sSUFBSTtBQUV0QyxRQUFJLFlBQVksYUFBYTtBQUM1QjtBQUNBLFVBQUksT0FBTyxNQUFNLFNBQVMsT0FBTyxVQUFVO0FBQzFDLFlBQUksUUFBUTtBQUNaLFlBQUksTUFBTSxZQUFZLEdBQUcsVUFBVSxJQUFJLFNBQVM7QUFDaEQsWUFBSSxPQUFRLEtBQStCO0FBQzNDLFlBQUksTUFBTSxNQUFNO0FBQ2Ysa0JBQVEsS0FBSyxLQUFLLE1BQU0sSUFBSTtBQUFBLFFBQzdCO0FBQ0EsaUJBQVMsSUFBSSxHQUFHLElBQUksT0FBTyxLQUFLO0FBQy9CLG1CQUFTLFVBQVUsTUFBTSxDQUFDO0FBQzFCLG1CQUFTLFNBQVMsTUFBTSxDQUFDO0FBQ3pCLG1CQUFTLFdBQVcsTUFBTSxHQUFHLEVBQUU7QUFBQSxRQUNoQztBQUFBLE1BQ0Q7QUFDQSxnQkFBVSxHQUFHLFdBQVcsT0FBTyxLQUFLLG1CQUFtQjtBQUFBLElBQ3hELE9BQU87QUFDTixvQkFBYztBQUNkLHlCQUFtQjtBQUFBLElBQ3BCO0FBQ0EsU0FBSyxNQUFNLFVBQVUsQ0FBQztBQUN0QixTQUFLLE1BQU0sT0FBTztBQUNsQixTQUFLLE1BQU0sSUFBSTtBQUVmLGFBQVM7QUFBQSxFQUNWO0FBQ0QsQ0FBQztBQWNNLE1BQU0sb0JBQTBDO0FBQUEsRUFDdEQsTUFBTTtBQUFBLEVBQ04sT0FBTztBQUNSO0FBU08sTUFBTSxTQUFzQztBQUFBLEVBQ2xELE9BQU87QUFBQSxFQUNQLE1BQU07QUFBQSxFQUNOLE1BQU07QUFBQSxFQUNOLE9BQU87QUFBQSxFQUNQLFFBQVE7QUFDVDtBQUVPLGdDQUFnQztBQUN0QyxlQUFhLE9BQU8sVUFBVTtBQUM5QixRQUFNLE9BQU8sb0RBQW9EO0FBQ2pFLFFBQU0sT0FBTyx5R0FBeUc7QUFDdkg7QUFHTyxhQUFhLE9BQW1CLENBQUMsR0FBRyxPQUFvQixTQUF3QixNQUFrQjtBQUN4RyxRQUFNLFdBQVcsS0FBSyxTQUFTLGtCQUFrQjtBQUNqRCxRQUFNLE9BQU8sS0FBSyxRQUFRLGtCQUFrQjtBQUM1QyxRQUFNLFFBQW9CO0FBQUEsSUFDekI7QUFBQSxJQUNBO0FBQUEsSUFDQTtBQUFBLElBQ0EsU0FBUztBQUFBLEVBQ1Y7QUFHQSxNQUFJLE9BQU8sWUFBWSxPQUFPLFFBQVE7QUFDckM7QUFBQSxFQUNEO0FBRUEsT0FBSyxNQUFNLEtBQUs7QUFDakI7QUFFQSxNQUFNLFlBQTBELENBQUM7QUFPMUQsZUFBZSxTQUFpQixVQUFzQjtBQUM1RCxRQUFNLFlBQVksU0FBUztBQUMzQixZQUFVLGFBQWEsVUFBVSxjQUFjLGFBQWEsU0FBUztBQUNyRSxTQUFPLFVBQVUsV0FBVyxHQUFHLFFBQVE7QUFDeEM7QUFHTyxjQUFjLE1BQWtCLFNBQXdCLFVBQXNCO0FBQ3BGLFNBQU8sSUFBSSxNQUFNLFFBQVEsTUFBTSxHQUFHLFFBQVE7QUFDM0M7QUFHTyxjQUFjLE1BQWtCLFNBQXdCLFVBQXNCO0FBQ3BGLFNBQU8sSUFBSSxNQUFNLFFBQVEsTUFBTSxHQUFHLFFBQVE7QUFDM0M7QUFHTyxlQUFlLE1BQWtCLFNBQXdCLFVBQXNCO0FBQ3JGLFNBQU8sSUFBSSxNQUFNLFNBQVMsTUFBTSxHQUFHLFFBQVE7QUFDNUM7QUFJTyxlQUFlLE1BQWtCLFNBQW1CO0FBQzFELFNBQU8sa0JBQWtCLFVBQWlCLE9BQW1CO0FBQzVELFVBQU0sV0FBVyxRQUFRLElBQUksQ0FBQyxLQUFLLE1BQU0sT0FBTyxNQUFNLEdBQUcsU0FBUyxHQUFHLEdBQUcsQ0FBQztBQUN6RSxVQUFNLE1BQU0sTUFBTSxHQUFHLFFBQVE7QUFBQSxFQUM5QjtBQUNEO0FBR08sb0JBQW9CLE1BQWtCLEtBQW1CO0FBQy9ELE1BQUksQ0FBQyxJQUFJLE9BQU87QUFDZixXQUFPLE1BQU0sTUFBTSxlQUFlLElBQUksV0FBVyxHQUFHO0FBQUEsRUFDckQ7QUFFQSxNQUFJLFFBQVEsSUFBSSxNQUVkLFFBQVEsa0JBQWtCLEdBQUcsS0FBSyxJQUFJLFVBQUssRUFFM0MsUUFBUSxtQkFBbUIsS0FBSyxJQUFJLElBQUksQ0FBQyxDQUFDLEVBRTFDLFFBQVEsT0FBTyxLQUFLO0FBRXRCLFFBQ0MsTUFDQSxlQUNBO0FBQUEsR0FDQyxVQUFVLEtBQUssS0FBSyxHQUFHLElBQUksWUFBWSxNQUFNLElBQUksTUFBTSxRQUFRLElBQUksTUFBTSxRQUFRLENBQUMsQ0FBQztBQUFBLEdBQ25GLEtBQUssSUFBSSxhQUFNLElBQUksU0FBUyxDQUFDO0FBQUEsRUFDOUI7QUFBQSxDQUVEO0FBQ0Q7QUFHTyxNQUFNLFNBQVM7QUFBQSxFQUNyQixNQUFNLEtBQUssS0FBSyxNQUFNLGlCQUFpQjtBQUFBLEVBQ3ZDLE1BQU0sS0FBSyxLQUFLLE1BQU0saUJBQWlCO0FBQUEsRUFDdkMsT0FBTyxNQUFNLEtBQUssTUFBTSxpQkFBaUI7QUFDMUM7QUFFQSxnQkFBZ0IsS0FBYSxLQUFhO0FBQ3pDLFFBQU0sU0FBUyxZQUFZLEdBQUc7QUFDOUIsTUFBSSxTQUFTLEtBQUs7QUFDakIsV0FBTyxJQUFJLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSTtBQUFBLEVBQ3BDO0FBQ0EsUUFBTSxTQUFTLE1BQU0sS0FBSyxFQUFFLFFBQVEsTUFBTSxPQUFPLEdBQUcsTUFBTSxHQUFHLEVBQUUsS0FBSyxFQUFFO0FBQ3RFLFNBQU8sTUFBTTtBQUNkO0FBRU8sSUFBSTtBQUNYLElBQUksUUFBUSxLQUFLLFNBQVMsV0FBVyxHQUFHO0FBQ3ZDLG9CQUFrQjtBQUNuQixXQUFXLFFBQVEsS0FBSyxTQUFTLFVBQVUsR0FBRztBQUM3QyxvQkFBa0I7QUFDbkIsT0FBTztBQUNOLG9CQUFrQjtBQUNuQjtBQUdPLHNCQUFzQixTQUFpQixZQUFvQixZQUFZLElBQUksR0FBRztBQUNwRixNQUFJLFdBQVcsWUFBWSxJQUFJLElBQUk7QUFDbkMsTUFBSSxjQUFjLFdBQVcsTUFBTSxHQUFHLEtBQUssTUFBTSxRQUFRLFFBQVEsR0FBSSxZQUFXLEtBQU0sUUFBUSxDQUFDO0FBQy9GLFNBQU8sR0FBRyxhQUFhLElBQUksV0FBVztBQUN2QzsiLAogICJuYW1lcyI6IFtdCn0K
@@ -28,7 +28,7 @@ function devStart({
28
28
  https,
29
29
  site
30
30
  }) {
31
- const version = "0.24.1";
31
+ const version = "0.24.2";
32
32
  const rootPath = site ? site.pathname : "/";
33
33
  const localPrefix = `${dim("\u2503")} Local `;
34
34
  const networkPrefix = `${dim("\u2503")} Network `;
@@ -6,11 +6,17 @@ const isCSSRequest = (request) => cssRe.test(request);
6
6
  function getStylesForURL(filePath, viteServer) {
7
7
  const css = /* @__PURE__ */ new Set();
8
8
  function crawlCSS(id, scanned = /* @__PURE__ */ new Set()) {
9
- const moduleName = viteServer.moduleGraph.idToModuleMap.get(id);
10
- if (!moduleName || !moduleName.id)
11
- return;
12
- scanned.add(moduleName.id);
13
- for (const importedModule of moduleName.importedModules) {
9
+ const relatedMods = viteServer.moduleGraph.getModulesByFile(id) ?? /* @__PURE__ */ new Set();
10
+ const importedModules = /* @__PURE__ */ new Set();
11
+ for (const relatedMod of relatedMods) {
12
+ if (id === relatedMod.id) {
13
+ scanned.add(id);
14
+ for (const importedMod of relatedMod.importedModules) {
15
+ importedModules.add(importedMod);
16
+ }
17
+ }
18
+ }
19
+ for (const importedModule of importedModules) {
14
20
  if (!importedModule.id || scanned.has(importedModule.id))
15
21
  continue;
16
22
  const ext = path.extname(importedModule.url.toLowerCase());
@@ -28,4 +34,4 @@ export {
28
34
  getStylesForURL,
29
35
  isCSSRequest
30
36
  };
31
- //# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vLi4vc3JjL2NvcmUvcmVuZGVyL2Rldi9jc3MudHMiXSwKICAibWFwcGluZ3MiOiAiQUFFQTtBQUNBO0FBR08sTUFBTSxtQkFBbUIsb0JBQUksSUFBSSxDQUFDLFFBQVEsU0FBUyxZQUFZLFNBQVMsU0FBUyxTQUFTLFdBQVcsT0FBTyxDQUFDO0FBRXBILE1BQU0sUUFBUSxJQUFJLE9BQ2pCLE9BQU8sTUFBTSxLQUFLLGdCQUFnQixFQUNoQyxJQUFJLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDLEVBQ3JCLEtBQUssR0FBRyxXQUNYO0FBQ08sTUFBTSxlQUFlLENBQUMsWUFBNkIsTUFBTSxLQUFLLE9BQU87QUFNckUseUJBQXlCLFVBQWUsWUFBNkM7QUFDM0YsUUFBTSxNQUFNLG9CQUFJLElBQVk7QUFHNUIsb0JBQWtCLElBQVksVUFBVSxvQkFBSSxJQUFZLEdBQUc7QUFHMUQsVUFBTSxhQUFhLFdBQVcsWUFBWSxjQUFjLElBQUksRUFBRTtBQUM5RCxRQUFJLENBQUMsY0FBYyxDQUFDLFdBQVc7QUFBSTtBQUVuQyxZQUFRLElBQUksV0FBVyxFQUFFO0FBR3pCLGVBQVcsa0JBQWtCLFdBQVcsaUJBQWlCO0FBQ3hELFVBQUksQ0FBQyxlQUFlLE1BQU0sUUFBUSxJQUFJLGVBQWUsRUFBRTtBQUFHO0FBQzFELFlBQU0sTUFBTSxLQUFLLFFBQVEsZUFBZSxJQUFJLFlBQVksQ0FBQztBQUN6RCxVQUFJLGlCQUFpQixJQUFJLEdBQUcsR0FBRztBQUM5QixZQUFJLElBQUksZUFBZSxHQUFHO0FBQUEsTUFDM0I7QUFDQSxlQUFTLGVBQWUsSUFBSSxPQUFPO0FBQUEsSUFDcEM7QUFBQSxFQUNEO0FBRUEsV0FBUyxPQUFPLFFBQVEsQ0FBQztBQUV6QixTQUFPO0FBQ1I7IiwKICAibmFtZXMiOiBbXQp9Cg==
37
+ //# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vLi4vc3JjL2NvcmUvcmVuZGVyL2Rldi9jc3MudHMiXSwKICAibWFwcGluZ3MiOiAiQUFFQTtBQUNBO0FBR08sTUFBTSxtQkFBbUIsb0JBQUksSUFBSSxDQUFDLFFBQVEsU0FBUyxZQUFZLFNBQVMsU0FBUyxTQUFTLFdBQVcsT0FBTyxDQUFDO0FBRXBILE1BQU0sUUFBUSxJQUFJLE9BQ2pCLE9BQU8sTUFBTSxLQUFLLGdCQUFnQixFQUNoQyxJQUFJLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDLEVBQ3JCLEtBQUssR0FBRyxXQUNYO0FBQ08sTUFBTSxlQUFlLENBQUMsWUFBNkIsTUFBTSxLQUFLLE9BQU87QUFNckUseUJBQXlCLFVBQWUsWUFBNkM7QUFDM0YsUUFBTSxNQUFNLG9CQUFJLElBQVk7QUFHNUIsb0JBQWtCLElBQVksVUFBVSxvQkFBSSxJQUFZLEdBQUc7QUFHMUQsVUFBTSxjQUFjLFdBQVcsWUFBWSxpQkFBaUIsRUFBRSxLQUFLLG9CQUFJLElBQUk7QUFDM0UsVUFBTSxrQkFBa0Isb0JBQUksSUFBcUI7QUFFakQsZUFBVyxjQUFjLGFBQWE7QUFDckMsVUFBSSxPQUFPLFdBQVcsSUFBSTtBQUN6QixnQkFBUSxJQUFJLEVBQUU7QUFDZCxtQkFBVyxlQUFlLFdBQVcsaUJBQWlCO0FBQ3JELDBCQUFnQixJQUFJLFdBQVc7QUFBQSxRQUNoQztBQUFBLE1BQ0Q7QUFBQSxJQUNEO0FBR0EsZUFBVyxrQkFBa0IsaUJBQWlCO0FBQzdDLFVBQUksQ0FBQyxlQUFlLE1BQU0sUUFBUSxJQUFJLGVBQWUsRUFBRTtBQUFHO0FBQzFELFlBQU0sTUFBTSxLQUFLLFFBQVEsZUFBZSxJQUFJLFlBQVksQ0FBQztBQUN6RCxVQUFJLGlCQUFpQixJQUFJLEdBQUcsR0FBRztBQUM5QixZQUFJLElBQUksZUFBZSxHQUFHO0FBQUEsTUFDM0I7QUFDQSxlQUFTLGVBQWUsSUFBSSxPQUFPO0FBQUEsSUFDcEM7QUFBQSxFQUNEO0FBRUEsV0FBUyxPQUFPLFFBQVEsQ0FBQztBQUV6QixTQUFPO0FBQ1I7IiwKICAibmFtZXMiOiBbXQp9Cg==
@@ -1,16 +1,19 @@
1
- const entities = { '"': "quot", "&": "amp", "'": "apos", "<": "lt", ">": "gt" };
2
- const escapeHTML = (str) => str.replace(/["'&<>]/g, (char) => "&" + entities[char] + ";");
3
- class UnescapedString extends String {
1
+ import { escape } from "html-escaper";
2
+ const escapeHTML = escape;
3
+ class HTMLString extends String {
4
4
  }
5
- const unescapeHTML = (value) => {
5
+ const markHTMLString = (value) => {
6
+ if (value instanceof HTMLString) {
7
+ return value;
8
+ }
6
9
  if (typeof value === "string") {
7
- return new UnescapedString(value);
10
+ return new HTMLString(value);
8
11
  }
9
12
  return value;
10
13
  };
11
14
  export {
12
- UnescapedString,
15
+ HTMLString,
13
16
  escapeHTML,
14
- unescapeHTML
17
+ markHTMLString
15
18
  };
16
- //# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL3J1bnRpbWUvc2VydmVyL2VzY2FwZS50cyJdLAogICJtYXBwaW5ncyI6ICJBQUFBLE1BQU0sV0FBVyxFQUFFLEtBQUssUUFBUSxLQUFLLE9BQU8sS0FBSyxRQUFRLEtBQUssTUFBTSxLQUFLLEtBQUs7QUFHdkUsTUFBTSxhQUFhLENBQUMsUUFBZ0IsSUFBSSxRQUFRLFlBQVksQ0FBQyxTQUFpQixNQUFNLFNBQVMsUUFBaUMsR0FBRztBQU1qSSxNQUFNLHdCQUF3QixPQUFPO0FBQUM7QUFNdEMsTUFBTSxlQUFlLENBQUMsVUFBZTtBQUczQyxNQUFJLE9BQU8sVUFBVSxVQUFVO0FBQzlCLFdBQU8sSUFBSSxnQkFBZ0IsS0FBSztBQUFBLEVBQ2pDO0FBR0EsU0FBTztBQUNSOyIsCiAgIm5hbWVzIjogW10KfQo=
19
+ //# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL3J1bnRpbWUvc2VydmVyL2VzY2FwZS50cyJdLAogICJtYXBwaW5ncyI6ICJBQUFBO0FBR08sTUFBTSxhQUFhO0FBTW5CLE1BQU0sbUJBQW1CLE9BQU87QUFBQztBQU9qQyxNQUFNLGlCQUFpQixDQUFDLFVBQWU7QUFFN0MsTUFBSSxpQkFBaUIsWUFBWTtBQUNoQyxXQUFPO0FBQUEsRUFDUjtBQUlBLE1BQUksT0FBTyxVQUFVLFVBQVU7QUFDOUIsV0FBTyxJQUFJLFdBQVcsS0FBSztBQUFBLEVBQzVCO0FBR0EsU0FBTztBQUNSOyIsCiAgIm5hbWVzIjogW10KfQo=
@@ -32,26 +32,27 @@ var __objRest = (source, exclude) => {
32
32
  import shorthash from "shorthash";
33
33
  import { extractDirectives, generateHydrateScript } from "./hydration.js";
34
34
  import { serializeListValue } from "./util.js";
35
- import { escapeHTML, UnescapedString, unescapeHTML } from "./escape.js";
35
+ import { escapeHTML, HTMLString, markHTMLString } from "./escape.js";
36
36
  import { createMetadata } from "./metadata.js";
37
- import { unescapeHTML as unescapeHTML2 } from "./escape.js";
37
+ import { markHTMLString as markHTMLString2 } from "./escape.js";
38
+ import { markHTMLString as markHTMLString3 } from "./escape.js";
38
39
  const voidElementNames = /^(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/i;
39
40
  const htmlBooleanAttributes = /^(allowfullscreen|async|autofocus|autoplay|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|hidden|loop|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|itemscope)$/i;
40
41
  const htmlEnumAttributes = /^(contenteditable|draggable|spellcheck|value)$/i;
41
42
  const svgEnumAttributes = /^(autoReverse|externalResourcesRequired|focusable|preserveAlpha)$/i;
42
43
  async function _render(child) {
43
44
  child = await child;
44
- if (child instanceof UnescapedString) {
45
+ if (child instanceof HTMLString) {
45
46
  return child;
46
47
  } else if (Array.isArray(child)) {
47
- return unescapeHTML((await Promise.all(child.map((value) => _render(value)))).join(""));
48
+ return markHTMLString((await Promise.all(child.map((value) => _render(value)))).join(""));
48
49
  } else if (typeof child === "function") {
49
50
  return _render(child());
50
51
  } else if (typeof child === "string") {
51
- return escapeHTML(child);
52
+ return markHTMLString(escapeHTML(child));
52
53
  } else if (!child && child !== 0) {
53
54
  } else if (child instanceof AstroComponent || Object.prototype.toString.call(child) === "[object AstroComponent]") {
54
- return unescapeHTML(await renderAstroComponent(child));
55
+ return markHTMLString(await renderAstroComponent(child));
55
56
  } else {
56
57
  return child;
57
58
  }
@@ -69,7 +70,7 @@ class AstroComponent {
69
70
  for (let i = 0; i < htmlParts.length; i++) {
70
71
  const html = htmlParts[i];
71
72
  const expression = expressions[i];
72
- yield unescapeHTML(html);
73
+ yield markHTMLString(html);
73
74
  yield _render(expression);
74
75
  }
75
76
  }
@@ -116,11 +117,11 @@ async function renderComponent(result, displayName, Component, _props, slots = {
116
117
  if (children == null) {
117
118
  return children;
118
119
  }
119
- return unescapeHTML(children);
120
+ return markHTMLString(children);
120
121
  }
121
122
  if (Component && Component.isAstroComponentFactory) {
122
123
  const output = await renderToString(result, Component, _props, slots);
123
- return unescapeHTML(output);
124
+ return markHTMLString(output);
124
125
  }
125
126
  if (Component === null && !_props["client:only"]) {
126
127
  throw new Error(`Unable to render ${displayName} because it is ${Component}!
@@ -211,7 +212,7 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
211
212
  }
212
213
  }
213
214
  if (!html && typeof Component === "string") {
214
- html = await renderAstroComponent(await render`<${Component}${spreadAttributes(props)}${unescapeHTML((children == null || children == "") && voidElementNames.test(Component) ? `/>` : `>${children}</${Component}>`)}`);
215
+ html = await renderAstroComponent(await render`<${Component}${spreadAttributes(props)}${markHTMLString((children == null || children == "") && voidElementNames.test(Component) ? `/>` : `>${children}</${Component}>`)}`);
215
216
  }
216
217
  if ((_b = renderer == null ? void 0 : renderer.polyfills) == null ? void 0 : _b.length) {
217
218
  for (const src of renderer.polyfills) {
@@ -222,14 +223,14 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
222
223
  }
223
224
  }
224
225
  if (!hydration) {
225
- return unescapeHTML(html.replace(/\<\/?astro-fragment\>/g, ""));
226
+ return markHTMLString(html.replace(/\<\/?astro-fragment\>/g, ""));
226
227
  }
227
228
  const astroId = shorthash.unique(`<!--${metadata.componentExport.value}:${metadata.componentUrl}-->
228
229
  ${html}`);
229
230
  result.scripts.add(await generateHydrateScript({ renderer, result, astroId, props }, metadata));
230
231
  const needsAstroTemplate = children && !/<\/?astro-fragment\>/.test(html);
231
232
  const template = needsAstroTemplate ? `<template data-astro-template>${children}</template>` : "";
232
- return unescapeHTML(`<astro-root uid="${astroId}"${needsAstroTemplate ? " tmpl" : ""}>${html ?? ""}${template}</astro-root>`);
233
+ return markHTMLString(`<astro-root uid="${astroId}"${needsAstroTemplate ? " tmpl" : ""}>${html ?? ""}${template}</astro-root>`);
233
234
  }
234
235
  function createFetchContentFn(url, site) {
235
236
  let sitePathname = site.pathname;
@@ -278,7 +279,7 @@ function addAttribute(value, key, shouldEscape = true) {
278
279
  }
279
280
  if (value === false) {
280
281
  if (htmlEnumAttributes.test(key) || svgEnumAttributes.test(key)) {
281
- return unescapeHTML(` ${key}="false"`);
282
+ return markHTMLString(` ${key}="false"`);
282
283
  }
283
284
  return "";
284
285
  }
@@ -289,12 +290,12 @@ Make sure to use the static attribute syntax (\`${key}={value}\`) instead of the
289
290
  return "";
290
291
  }
291
292
  if (key === "class:list") {
292
- return unescapeHTML(` ${key.slice(0, -5)}="${toAttributeString(serializeListValue(value))}"`);
293
+ return markHTMLString(` ${key.slice(0, -5)}="${toAttributeString(serializeListValue(value))}"`);
293
294
  }
294
295
  if (value === true && (key.startsWith("data-") || htmlBooleanAttributes.test(key))) {
295
- return unescapeHTML(` ${key}`);
296
+ return markHTMLString(` ${key}`);
296
297
  } else {
297
- return unescapeHTML(` ${key}="${toAttributeString(value, shouldEscape)}"`);
298
+ return markHTMLString(` ${key}="${toAttributeString(value, shouldEscape)}"`);
298
299
  }
299
300
  }
300
301
  function spreadAttributes(values, shouldEscape = true) {
@@ -302,7 +303,7 @@ function spreadAttributes(values, shouldEscape = true) {
302
303
  for (const [key, value] of Object.entries(values)) {
303
304
  output += addAttribute(value, key, shouldEscape);
304
305
  }
305
- return unescapeHTML(output);
306
+ return markHTMLString(output);
306
307
  }
307
308
  function defineStyleVars(selector, vars) {
308
309
  let output = "\n";
@@ -310,7 +311,7 @@ function defineStyleVars(selector, vars) {
310
311
  output += ` --${key}: ${value};
311
312
  `;
312
313
  }
313
- return unescapeHTML(`${selector} {${output}}`);
314
+ return markHTMLString(`${selector} {${output}}`);
314
315
  }
315
316
  function defineScriptVars(vars) {
316
317
  let output = "";
@@ -318,7 +319,7 @@ function defineScriptVars(vars) {
318
319
  output += `let ${key} = ${JSON.stringify(value)};
319
320
  `;
320
321
  }
321
- return unescapeHTML(output);
322
+ return markHTMLString(output);
322
323
  }
323
324
  async function renderEndpoint(mod, params) {
324
325
  const method = "get";
@@ -363,7 +364,7 @@ async function renderHead(result) {
363
364
  styles.push(renderElement("style", { props: { "astro-style": true }, children: "astro-root, astro-fragment { display: contents; }" }));
364
365
  }
365
366
  const links = Array.from(result.links).filter(uniqueElements).map((link) => renderElement("link", link, false));
366
- return unescapeHTML(links.join("\n") + styles.join("\n") + scripts.join("\n") + "\n<!--astro:head:injected-->");
367
+ return markHTMLString(links.join("\n") + styles.join("\n") + scripts.join("\n") + "\n<!--astro:head:injected-->");
367
368
  }
368
369
  async function renderAstroComponent(component) {
369
370
  let template = [];
@@ -372,7 +373,7 @@ async function renderAstroComponent(component) {
372
373
  template.push(value);
373
374
  }
374
375
  }
375
- return unescapeHTML(await _render(template));
376
+ return markHTMLString(await _render(template));
376
377
  }
377
378
  function componentIsHTMLElement(Component) {
378
379
  return typeof HTMLElement !== "undefined" && HTMLElement.isPrototypeOf(Component);
@@ -383,7 +384,7 @@ async function renderHTMLElement(result, constructor, props, slots) {
383
384
  for (const attr in props) {
384
385
  attrHTML += ` ${attr}="${toAttributeString(await props[attr])}"`;
385
386
  }
386
- return unescapeHTML(`<${name}${attrHTML}>${await renderSlot(result, slots == null ? void 0 : slots.default)}</${name}>`);
387
+ return markHTMLString(`<${name}${attrHTML}>${await renderSlot(result, slots == null ? void 0 : slots.default)}</${name}>`);
387
388
  }
388
389
  function getHTMLElementName(constructor) {
389
390
  const definedName = customElements.getName(constructor);
@@ -419,6 +420,7 @@ export {
419
420
  createMetadata,
420
421
  defineScriptVars,
421
422
  defineStyleVars,
423
+ markHTMLString2 as markHTMLString,
422
424
  render,
423
425
  renderAstroComponent,
424
426
  renderComponent,
@@ -428,6 +430,6 @@ export {
428
430
  renderSlot,
429
431
  renderToString,
430
432
  spreadAttributes,
431
- unescapeHTML2 as unescapeHTML
433
+ markHTMLString3 as unescapeHTML
432
434
  };
433
- //# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/runtime/server/index.ts"],
  "mappings": "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",
  "names": []
}

435
+ //# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/runtime/server/index.ts"],
  "mappings": "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",
  "names": []
}

@@ -1,12 +1,14 @@
1
- export declare const escapeHTML: (str: string) => string;
1
+ import { escape } from 'html-escaper';
2
+ export declare const escapeHTML: typeof escape;
2
3
  /**
3
- * RawString is a "blessed" version of String
4
- * that is not subject to escaping.
4
+ * A "blessed" extension of String that tells Astro that the string
5
+ * has already been escaped. This helps prevent double-escaping of HTML.
5
6
  */
6
- export declare class UnescapedString extends String {
7
+ export declare class HTMLString extends String {
7
8
  }
8
9
  /**
9
- * unescapeHTML marks a string as raw, unescaped HTML.
10
- * This should only be generated internally, not a public API.
10
+ * markHTMLString marks a string as raw or "already escaped" by returning
11
+ * a `HTMLString` instance. This is meant for internal use, and should not
12
+ * be returned through any public JS API.
11
13
  */
12
- export declare const unescapeHTML: (value: any) => any;
14
+ export declare const markHTMLString: (value: any) => any;
@@ -2,7 +2,8 @@ import type { EndpointHandler } from '../../@types/astro';
2
2
  import type { AstroGlobalPartial, SSRResult } from '../../@types/astro';
3
3
  export type { Metadata } from './metadata';
4
4
  export { createMetadata } from './metadata.js';
5
- export { unescapeHTML } from './escape.js';
5
+ export { markHTMLString } from './escape.js';
6
+ export { markHTMLString as unescapeHTML } from './escape.js';
6
7
  export declare class AstroComponent {
7
8
  private htmlParts;
8
9
  private expressions;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "astro",
3
- "version": "0.24.1",
3
+ "version": "0.24.2",
4
4
  "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
5
5
  "type": "module",
6
6
  "author": "withastro",
@@ -16,6 +16,7 @@
16
16
  "exports": {
17
17
  ".": "./astro.js",
18
18
  "./env": "./env.d.ts",
19
+ "./config": "./config.mjs",
19
20
  "./internal": "./internal.js",
20
21
  "./app/node": "./dist/core/app/node.js",
21
22
  "./client/*": "./dist/runtime/client/*",
@@ -45,6 +46,8 @@
45
46
  "components",
46
47
  "dist",
47
48
  "astro.js",
49
+ "config.d.ts",
50
+ "config.mjs",
48
51
  "env.d.ts",
49
52
  "README.md",
50
53
  "vendor"
@@ -74,6 +77,7 @@
74
77
  "fast-glob": "^3.2.11",
75
78
  "fast-xml-parser": "^4.0.6",
76
79
  "html-entities": "^2.3.2",
80
+ "html-escaper": "^3.0.3",
77
81
  "htmlparser2": "^7.2.0",
78
82
  "kleur": "^4.1.4",
79
83
  "magic-string": "^0.25.9",
@@ -112,6 +116,7 @@
112
116
  "@types/connect": "^3.4.35",
113
117
  "@types/debug": "^4.1.7",
114
118
  "@types/estree": "^0.0.51",
119
+ "@types/html-escaper": "^3.0.0",
115
120
  "@types/mime": "^2.0.3",
116
121
  "@types/mocha": "^9.1.0",
117
122
  "@types/parse5": "^6.0.3",