astro 0.21.3 → 0.21.7

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.
@@ -17,7 +17,7 @@ export declare function createComponent(cb: AstroComponentFactory): AstroCompone
17
17
  export declare function renderSlot(_result: any, slotted: string, fallback?: any): Promise<any>;
18
18
  export declare const Fragment: unique symbol;
19
19
  export declare function renderComponent(result: SSRResult, displayName: string, Component: unknown, _props: Record<string | number, any>, slots?: any): Promise<any>;
20
- export declare function createAstro(fileURLStr: string, site: string): AstroGlobalPartial;
20
+ export declare function createAstro(fileURLStr: string, site: string, projectRootStr: string): AstroGlobalPartial;
21
21
  export declare function addAttribute(value: any, key: string): string;
22
22
  export declare function spreadAttributes(values: Record<any, any>): string;
23
23
  export declare function defineStyleVars(selector: string, vars: Record<any, any>): string;
@@ -1,7 +1,6 @@
1
1
  import esbuild from "esbuild";
2
2
  import fs from "fs";
3
3
  import { fileURLToPath } from "url";
4
- import os from "os";
5
4
  import { transform } from "@astrojs/compiler";
6
5
  import { getViteTransform, transformWithVite } from "./styles.js";
7
6
  function isSSR(options) {
@@ -17,13 +16,11 @@ function isSSR(options) {
17
16
  return false;
18
17
  }
19
18
  function astro({ config, devServer }) {
20
- let platform;
21
19
  let viteTransform;
22
20
  return {
23
21
  name: "@astrojs/vite-plugin-astro",
24
22
  enforce: "pre",
25
23
  configResolved(resolvedConfig) {
26
- platform = os.platform();
27
24
  viteTransform = getViteTransform(resolvedConfig);
28
25
  },
29
26
  async load(id, opts) {
@@ -34,30 +31,38 @@ function astro({ config, devServer }) {
34
31
  const isPage = normalizedID.startsWith(fileURLToPath(config.pages)) || normalizedID.startsWith(fileURLToPath(config.layouts));
35
32
  let source = await fs.promises.readFile(id, "utf8");
36
33
  let tsResult;
34
+ let cssTransformError;
37
35
  try {
38
36
  tsResult = await transform(source, {
39
37
  as: isPage ? "document" : "fragment",
38
+ projectRoot: config.projectRoot.toString(),
40
39
  site: config.buildOptions.site,
41
40
  sourcefile: id,
42
41
  sourcemap: "both",
43
42
  internalURL: "astro/internal",
44
43
  preprocessStyle: async (value, attrs) => {
45
44
  const lang = `.${(attrs == null ? void 0 : attrs.lang) || "css"}`.toLowerCase();
46
- const result = await transformWithVite({ value, lang, id, transformHook: viteTransform, ssr: isSSR(opts) });
47
- if (!result) {
48
- return result;
49
- }
50
- let map2;
51
- if (result.map) {
52
- if (typeof result.map === "string") {
53
- map2 = result.map;
54
- } else if (result.map.mappings) {
55
- map2 = result.map.toString();
45
+ try {
46
+ const result = await transformWithVite({ value, lang, id, transformHook: viteTransform, ssr: isSSR(opts) });
47
+ let map2;
48
+ if (!result)
49
+ return null;
50
+ if (result.map) {
51
+ if (typeof result.map === "string") {
52
+ map2 = result.map;
53
+ } else if (result.map.mappings) {
54
+ map2 = result.map.toString();
55
+ }
56
56
  }
57
+ return { code: result.code, map: map2 };
58
+ } catch (err) {
59
+ cssTransformError = err;
60
+ return null;
57
61
  }
58
- return { code: result.code, map: map2 };
59
62
  }
60
63
  });
64
+ if (cssTransformError)
65
+ throw cssTransformError;
61
66
  const { code, map } = await esbuild.transform(tsResult.code, { loader: "ts", sourcemap: "external", sourcefile: id });
62
67
  return {
63
68
  code,
@@ -94,4 +99,4 @@ ${err.url}`;
94
99
  export {
95
100
  astro as default
96
101
  };
97
- //# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLWFzdHJvL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBS0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUVBO0FBUUEsZUFBZSxTQUEwRDtBQUN2RSxNQUFJLFlBQVksUUFBVztBQUN6QixXQUFPO0FBQUE7QUFFVCxNQUFJLE9BQU8sWUFBWSxXQUFXO0FBQ2hDLFdBQU87QUFBQTtBQUVULE1BQUksT0FBTyxXQUFXLFVBQVU7QUFDOUIsV0FBTyxDQUFDLENBQUMsUUFBUTtBQUFBO0FBRW5CLFNBQU87QUFBQTtBQUlNLGVBQWUsRUFBRSxRQUFRLGFBQThDO0FBQ3BGLE1BQUk7QUFDSixNQUFJO0FBQ0osU0FBTztBQUFBLElBQ0wsTUFBTTtBQUFBLElBQ04sU0FBUztBQUFBLElBQ1QsZUFBZSxnQkFBZ0I7QUFDN0IsaUJBQVcsR0FBRztBQUNkLHNCQUFnQixpQkFBaUI7QUFBQTtBQUFBLFVBRzdCLEtBQUssSUFBSSxNQUFNO0FBQ25CLFVBQUksQ0FBQyxHQUFHLFNBQVMsV0FBVztBQUMxQixlQUFPO0FBQUE7QUFJVCxZQUFNLGVBQWUsY0FBYyxJQUFJLElBQUksVUFBVTtBQUNyRCxZQUFNLFNBQVMsYUFBYSxXQUFXLGNBQWMsT0FBTyxXQUFXLGFBQWEsV0FBVyxjQUFjLE9BQU87QUFDcEgsVUFBSSxTQUFTLE1BQU0sR0FBRyxTQUFTLFNBQVMsSUFBSTtBQUM1QyxVQUFJO0FBRUosVUFBSTtBQUlGLG1CQUFXLE1BQU0sVUFBVSxRQUFRO0FBQUEsVUFDakMsSUFBSSxTQUFTLGFBQWE7QUFBQSxVQUMxQixNQUFNLE9BQU8sYUFBYTtBQUFBLFVBQzFCLFlBQVk7QUFBQSxVQUNaLFdBQVc7QUFBQSxVQUNYLGFBQWE7QUFBQSxVQUNiLGlCQUFpQixPQUFPLE9BQWUsVUFBa0M7QUFDdkUsa0JBQU0sT0FBTyxJQUFJLGdDQUFPLFNBQVEsUUFBUTtBQUN4QyxrQkFBTSxTQUFTLE1BQU0sa0JBQWtCLEVBQUUsT0FBTyxNQUFNLElBQUksZUFBZSxlQUFlLEtBQUssTUFBTTtBQUNuRyxnQkFBSSxDQUFDLFFBQVE7QUFFWCxxQkFBTztBQUFBO0FBRVQsZ0JBQUk7QUFDSixnQkFBSSxPQUFPLEtBQUs7QUFDZCxrQkFBSSxPQUFPLE9BQU8sUUFBUSxVQUFVO0FBQ2xDLHVCQUFNLE9BQU87QUFBQSx5QkFDSixPQUFPLElBQUksVUFBVTtBQUM5Qix1QkFBTSxPQUFPLElBQUk7QUFBQTtBQUFBO0FBR3JCLG1CQUFPLEVBQUUsTUFBTSxPQUFPLE1BQU07QUFBQTtBQUFBO0FBS2hDLGNBQU0sRUFBRSxNQUFNLFFBQVEsTUFBTSxRQUFRLFVBQVUsU0FBUyxNQUFNLEVBQUUsUUFBUSxNQUFNLFdBQVcsWUFBWSxZQUFZO0FBRWhILGVBQU87QUFBQSxVQUNMO0FBQUEsVUFDQTtBQUFBO0FBQUEsZUFFSyxLQUFQO0FBRUEsWUFBSSxJQUFJLE1BQU0sU0FBUyxrQkFBa0I7QUFDdkMsZ0JBQU0sU0FBUyxJQUFJLGdCQUFnQjtBQUFBLFlBQ2pDLFFBQVE7QUFBQSxZQUNSLE9BQU87QUFBQSxZQUNQLE1BQU07QUFBQTtBQUFBO0FBQUE7QUFBQSxJQUlkLEdBQUcsUUFBUSxjQUFjLE9BQU8sY0FBYztBQUFBO0FBQUEsRUFFaEQ7QUFBQTtBQUFBO0FBQUE7QUFJUSxjQUFJLE1BQU0saURBQWlELE9BQU87QUFDbEUsY0FBSSxVQUFVO0FBQUE7QUFBQTtBQUFBO0FBQUEsRUFJdEIsSUFBSTtBQUVJLGNBQUksUUFBUSxVQUFVO0FBQUE7QUFHeEIsY0FBTTtBQUFBO0FBQUE7QUFBQTtBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
102
+ //# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLWFzdHJvL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBS0E7QUFDQTtBQUNBO0FBQ0E7QUFFQTtBQVFBLGVBQWUsU0FBMEQ7QUFDdkUsTUFBSSxZQUFZLFFBQVc7QUFDekIsV0FBTztBQUFBO0FBRVQsTUFBSSxPQUFPLFlBQVksV0FBVztBQUNoQyxXQUFPO0FBQUE7QUFFVCxNQUFJLE9BQU8sV0FBVyxVQUFVO0FBQzlCLFdBQU8sQ0FBQyxDQUFDLFFBQVE7QUFBQTtBQUVuQixTQUFPO0FBQUE7QUFJTSxlQUFlLEVBQUUsUUFBUSxhQUE4QztBQUNwRixNQUFJO0FBQ0osU0FBTztBQUFBLElBQ0wsTUFBTTtBQUFBLElBQ04sU0FBUztBQUFBLElBQ1QsZUFBZSxnQkFBZ0I7QUFDN0Isc0JBQWdCLGlCQUFpQjtBQUFBO0FBQUEsVUFHN0IsS0FBSyxJQUFJLE1BQU07QUFDbkIsVUFBSSxDQUFDLEdBQUcsU0FBUyxXQUFXO0FBQzFCLGVBQU87QUFBQTtBQUlULFlBQU0sZUFBZSxjQUFjLElBQUksSUFBSSxVQUFVO0FBQ3JELFlBQU0sU0FBUyxhQUFhLFdBQVcsY0FBYyxPQUFPLFdBQVcsYUFBYSxXQUFXLGNBQWMsT0FBTztBQUNwSCxVQUFJLFNBQVMsTUFBTSxHQUFHLFNBQVMsU0FBUyxJQUFJO0FBQzVDLFVBQUk7QUFDSixVQUFJO0FBRUosVUFBSTtBQUlGLG1CQUFXLE1BQU0sVUFBVSxRQUFRO0FBQUEsVUFDakMsSUFBSSxTQUFTLGFBQWE7QUFBQSxVQUMxQixhQUFhLE9BQU8sWUFBWTtBQUFBLFVBQ2hDLE1BQU0sT0FBTyxhQUFhO0FBQUEsVUFDMUIsWUFBWTtBQUFBLFVBQ1osV0FBVztBQUFBLFVBQ1gsYUFBYTtBQUFBLFVBQ2IsaUJBQWlCLE9BQU8sT0FBZSxVQUFrQztBQUN2RSxrQkFBTSxPQUFPLElBQUksZ0NBQU8sU0FBUSxRQUFRO0FBQ3hDLGdCQUFJO0FBQ0Ysb0JBQU0sU0FBUyxNQUFNLGtCQUFrQixFQUFFLE9BQU8sTUFBTSxJQUFJLGVBQWUsZUFBZSxLQUFLLE1BQU07QUFDbkcsa0JBQUk7QUFDSixrQkFBSSxDQUFDO0FBQVEsdUJBQU87QUFDcEIsa0JBQUksT0FBTyxLQUFLO0FBQ2Qsb0JBQUksT0FBTyxPQUFPLFFBQVEsVUFBVTtBQUNsQyx5QkFBTSxPQUFPO0FBQUEsMkJBQ0osT0FBTyxJQUFJLFVBQVU7QUFDOUIseUJBQU0sT0FBTyxJQUFJO0FBQUE7QUFBQTtBQUdyQixxQkFBTyxFQUFFLE1BQU0sT0FBTyxNQUFNO0FBQUEscUJBQ3JCLEtBQVA7QUFFQSxrQ0FBb0I7QUFDcEIscUJBQU87QUFBQTtBQUFBO0FBQUE7QUFNYixZQUFJO0FBQW1CLGdCQUFNO0FBRzdCLGNBQU0sRUFBRSxNQUFNLFFBQVEsTUFBTSxRQUFRLFVBQVUsU0FBUyxNQUFNLEVBQUUsUUFBUSxNQUFNLFdBQVcsWUFBWSxZQUFZO0FBRWhILGVBQU87QUFBQSxVQUNMO0FBQUEsVUFDQTtBQUFBO0FBQUEsZUFFSyxLQUFQO0FBRUEsWUFBSSxJQUFJLE1BQU0sU0FBUyxrQkFBa0I7QUFDdkMsZ0JBQU0sU0FBUyxJQUFJLGdCQUFnQjtBQUFBLFlBQ2pDLFFBQVE7QUFBQSxZQUNSLE9BQU87QUFBQSxZQUNQLE1BQU07QUFBQTtBQUFBO0FBQUE7QUFBQSxJQUlkLEdBQUcsUUFBUSxjQUFjLE9BQU8sY0FBYztBQUFBO0FBQUEsRUFFaEQ7QUFBQTtBQUFBO0FBQUE7QUFJUSxjQUFJLE1BQU0saURBQWlELE9BQU87QUFDbEUsY0FBSSxVQUFVO0FBQUE7QUFBQTtBQUFBO0FBQUEsRUFJdEIsSUFBSTtBQUVJLGNBQUksUUFBUSxVQUFVO0FBQUE7QUFHeEIsY0FBTTtBQUFBO0FBQUE7QUFBQTtBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
@@ -59,18 +59,16 @@ function rollupPluginAstroBuildCSS(options) {
59
59
  },
60
60
  async load(id) {
61
61
  if (isPageStyleVirtualModule(id)) {
62
- const source = astroPageStyleMap.get(id);
63
- return source;
62
+ return astroPageStyleMap.get(id) || null;
64
63
  }
65
64
  if (isStyleVirtualModule(id)) {
66
- return astroStyleMap.get(id);
65
+ return astroStyleMap.get(id) || null;
67
66
  }
68
67
  return null;
69
68
  },
70
69
  async transform(value, id) {
71
70
  if (isStyleVirtualModule(id)) {
72
71
  styleSourceMap.set(id, value);
73
- return null;
74
72
  }
75
73
  if (isCSSRequest(id)) {
76
74
  styleSourceMap.set(id, value);
@@ -88,6 +86,8 @@ function rollupPluginAstroBuildCSS(options) {
88
86
  chunkCSS += styleSourceMap.get(id);
89
87
  }
90
88
  }
89
+ if (!chunkCSS)
90
+ return null;
91
91
  if (isPureCSS) {
92
92
  const { code: minifiedCSS } = await esbuild.transform(chunkCSS, {
93
93
  loader: "css",
@@ -129,4 +129,4 @@ export {
129
129
  getAstroStylePathFromId,
130
130
  rollupPluginAstroBuildCSS
131
131
  };
132
- //# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLWJ1aWxkLWNzcy9pbmRleC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUdBO0FBQ0E7QUFDQTtBQUVBLE1BQU0sY0FBYztBQUdwQixNQUFNLHFCQUFxQjtBQUUzQixNQUFNLDBCQUEwQjtBQUVoQyxNQUFNLGVBQWUsQ0FBQyxZQUFvQixpQkFBaUIsSUFBSSxLQUFLLFFBQVE7QUFFckUsNkJBQTZCLFVBQWtCO0FBQ3BELE1BQUksVUFBVSwwQkFBMEI7QUFDeEMsTUFBSSxRQUFRLFNBQVMsTUFBTTtBQUN6QixlQUFXO0FBQUE7QUFFYixhQUFXO0FBQ1gsU0FBTztBQUFBO0FBR0YseUJBQXlCLFVBQWtCO0FBQ2hELE1BQUksVUFBVSxxQkFBcUI7QUFDbkMsTUFBSSxRQUFRLFNBQVMsTUFBTTtBQUN6QixlQUFXO0FBQUE7QUFFYixhQUFXO0FBQ1gsU0FBTztBQUFBO0FBR0YsaUNBQWlDLElBQVk7QUFDbEQsU0FBTyxHQUFHLE9BQU8sbUJBQW1CLFNBQVM7QUFBQTtBQUcvQyw4QkFBOEIsSUFBWTtBQUN4QyxTQUFPLEdBQUcsV0FBVztBQUFBO0FBR3ZCLGtDQUFrQyxJQUFZO0FBQzVDLFNBQU8sR0FBRyxXQUFXO0FBQUE7QUFVaEIsbUNBQW1DLFNBQW9DO0FBQzVFLFFBQU0sRUFBRSxtQkFBbUIsZUFBZSx1QkFBdUIsa0JBQWtCO0FBQ25GLFFBQU0saUJBQWlCLElBQUk7QUFFM0IsU0FBTztBQUFBLElBQ0wsTUFBTTtBQUFBLElBRU4sZUFBZSxnQkFBZ0I7QUFLN0IsWUFBTSxVQUFVLGVBQWU7QUFDL0IsWUFBTSxtQkFBbUIsZUFBZSxRQUFRLFVBQVUsQ0FBQyxNQUFNLEVBQUUsU0FBUztBQUM1RSxVQUFJLHFCQUFxQixJQUFJO0FBQzNCLGNBQU0sY0FBYyxRQUFRO0FBRzVCLGVBQU8sWUFBWTtBQUNuQixlQUFPLFlBQVk7QUFHbkIsY0FBTSxXQUFXLFFBQVEsVUFBVSxDQUFDLE1BQU0sRUFBRSxTQUFTO0FBQ3JELGNBQU0sWUFBWSxRQUFRO0FBRzFCLGdCQUFRLE9BQU8sVUFBVTtBQUN6QixnQkFBUSxPQUFPLG1CQUFtQixHQUFHLEdBQUc7QUFBQTtBQUFBO0FBQUEsVUFJdEMsVUFBVSxJQUFJO0FBQ2xCLFVBQUkseUJBQXlCLEtBQUs7QUFDaEMsZUFBTztBQUFBO0FBRVQsVUFBSSxxQkFBcUIsS0FBSztBQUM1QixlQUFPO0FBQUE7QUFFVCxhQUFPO0FBQUE7QUFBQSxVQUdILEtBQUssSUFBSTtBQUNiLFVBQUkseUJBQXlCLEtBQUs7QUFDaEMsY0FBTSxTQUFTLGtCQUFrQixJQUFJO0FBQ3JDLGVBQU87QUFBQTtBQUVULFVBQUkscUJBQXFCLEtBQUs7QUFDNUIsZUFBTyxjQUFjLElBQUk7QUFBQTtBQUUzQixhQUFPO0FBQUE7QUFBQSxVQUdILFVBQVUsT0FBTyxJQUFJO0FBQ3pCLFVBQUkscUJBQXFCLEtBQUs7QUFDNUIsdUJBQWUsSUFBSSxJQUFJO0FBQ3ZCLGVBQU87QUFBQTtBQUdULFVBQUksYUFBYSxLQUFLO0FBQ3BCLHVCQUFlLElBQUksSUFBSTtBQUFBO0FBR3pCLGFBQU87QUFBQTtBQUFBLFVBR0gsWUFBWSxPQUFPLE9BQU87QUFDOUIsVUFBSSxXQUFXO0FBQ2YsVUFBSSxZQUFZO0FBQ2hCLGlCQUFXLENBQUMsT0FBTyxPQUFPLFFBQVEsTUFBTSxVQUFVO0FBQ2hELFlBQUksQ0FBQyxhQUFhLE9BQU8sQ0FBQyx5QkFBeUIsS0FBSztBQUN0RCxzQkFBWTtBQUFBO0FBRWQsWUFBSSxlQUFlLElBQUksS0FBSztBQUMxQixzQkFBWSxlQUFlLElBQUk7QUFBQTtBQUFBO0FBSW5DLFVBQUksV0FBVztBQUNiLGNBQU0sRUFBRSxNQUFNLGdCQUFnQixNQUFNLFFBQVEsVUFBVSxVQUFVO0FBQUEsVUFDOUQsUUFBUTtBQUFBLFVBQ1IsUUFBUTtBQUFBO0FBRVYsY0FBTSxjQUFjLEtBQUssU0FBUztBQUFBLFVBQ2hDLE1BQU0sTUFBTSxPQUFPO0FBQUEsVUFDbkIsTUFBTTtBQUFBLFVBQ04sUUFBUTtBQUFBO0FBRVYsc0JBQWMsSUFBSTtBQUNsQiw4QkFBc0IsSUFBSSxNQUFNLFVBQVU7QUFBQTtBQUc1QyxhQUFPO0FBQUE7QUFBQSxJQUlULGVBQWUsTUFBTSxRQUFRO0FBQzNCLFVBQUksY0FBYyxNQUFNO0FBQ3RCLGNBQU0scUJBQXFCLElBQUksSUFBSSxDQUFDLEdBQUcsZUFBZSxJQUFJLENBQUMsVUFBVSxNQUFNO0FBQzNFLGNBQU0sa0JBQWtCLENBQUMsR0FBRyxvQkFDekIsSUFBSSxDQUFDLFNBQVMsS0FBSyxTQUFTLE9BQzVCLEtBQUssS0FDTCxRQUFRLE9BQU87QUFDbEIsY0FBTSxlQUFlLElBQUksT0FBTyxLQUFLLFdBQVcsT0FBTyx5QkFBeUI7QUFBQSxLQUEwQiw2QkFBNkI7QUFBQSxJQUE0QjtBQUVuSyxtQkFBVyxDQUFDLFNBQVMsVUFBVSxPQUFPLFFBQVEsU0FBUztBQUNyRCxjQUFJLE1BQU0sU0FBUyxTQUFTO0FBQzFCLGdCQUFJLGNBQWMsSUFBSSxRQUFRO0FBRzVCLHFCQUFPLE9BQU87QUFBQSxtQkFDVDtBQUdMLG9CQUFNLE9BQU8sTUFBTSxLQUFLLFFBQ3RCLGNBRUEsQ0FBQyxNQUFNLGdCQUFnQixHQUFHLE9BQU8sRUFBRSxTQUFTO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==
132
+ //# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLWJ1aWxkLWNzcy9pbmRleC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUdBO0FBQ0E7QUFDQTtBQUVBLE1BQU0sY0FBYztBQUdwQixNQUFNLHFCQUFxQjtBQUUzQixNQUFNLDBCQUEwQjtBQUVoQyxNQUFNLGVBQWUsQ0FBQyxZQUFvQixpQkFBaUIsSUFBSSxLQUFLLFFBQVE7QUFFckUsNkJBQTZCLFVBQWtCO0FBQ3BELE1BQUksVUFBVSwwQkFBMEI7QUFDeEMsTUFBSSxRQUFRLFNBQVMsTUFBTTtBQUN6QixlQUFXO0FBQUE7QUFFYixhQUFXO0FBQ1gsU0FBTztBQUFBO0FBR0YseUJBQXlCLFVBQWtCO0FBQ2hELE1BQUksVUFBVSxxQkFBcUI7QUFDbkMsTUFBSSxRQUFRLFNBQVMsTUFBTTtBQUN6QixlQUFXO0FBQUE7QUFFYixhQUFXO0FBQ1gsU0FBTztBQUFBO0FBR0YsaUNBQWlDLElBQVk7QUFDbEQsU0FBTyxHQUFHLE9BQU8sbUJBQW1CLFNBQVM7QUFBQTtBQUcvQyw4QkFBOEIsSUFBWTtBQUN4QyxTQUFPLEdBQUcsV0FBVztBQUFBO0FBR3ZCLGtDQUFrQyxJQUFZO0FBQzVDLFNBQU8sR0FBRyxXQUFXO0FBQUE7QUFVaEIsbUNBQW1DLFNBQW9DO0FBQzVFLFFBQU0sRUFBRSxtQkFBbUIsZUFBZSx1QkFBdUIsa0JBQWtCO0FBQ25GLFFBQU0saUJBQWlCLElBQUk7QUFFM0IsU0FBTztBQUFBLElBQ0wsTUFBTTtBQUFBLElBRU4sZUFBZSxnQkFBZ0I7QUFLN0IsWUFBTSxVQUFVLGVBQWU7QUFDL0IsWUFBTSxtQkFBbUIsZUFBZSxRQUFRLFVBQVUsQ0FBQyxNQUFNLEVBQUUsU0FBUztBQUM1RSxVQUFJLHFCQUFxQixJQUFJO0FBQzNCLGNBQU0sY0FBYyxRQUFRO0FBRzVCLGVBQU8sWUFBWTtBQUNuQixlQUFPLFlBQVk7QUFHbkIsY0FBTSxXQUFXLFFBQVEsVUFBVSxDQUFDLE1BQU0sRUFBRSxTQUFTO0FBQ3JELGNBQU0sWUFBWSxRQUFRO0FBRzFCLGdCQUFRLE9BQU8sVUFBVTtBQUN6QixnQkFBUSxPQUFPLG1CQUFtQixHQUFHLEdBQUc7QUFBQTtBQUFBO0FBQUEsVUFJdEMsVUFBVSxJQUFJO0FBQ2xCLFVBQUkseUJBQXlCLEtBQUs7QUFDaEMsZUFBTztBQUFBO0FBRVQsVUFBSSxxQkFBcUIsS0FBSztBQUM1QixlQUFPO0FBQUE7QUFFVCxhQUFPO0FBQUE7QUFBQSxVQUdILEtBQUssSUFBSTtBQUNiLFVBQUkseUJBQXlCLEtBQUs7QUFDaEMsZUFBTyxrQkFBa0IsSUFBSSxPQUFPO0FBQUE7QUFFdEMsVUFBSSxxQkFBcUIsS0FBSztBQUM1QixlQUFPLGNBQWMsSUFBSSxPQUFPO0FBQUE7QUFFbEMsYUFBTztBQUFBO0FBQUEsVUFHSCxVQUFVLE9BQU8sSUFBSTtBQUN6QixVQUFJLHFCQUFxQixLQUFLO0FBQzVCLHVCQUFlLElBQUksSUFBSTtBQUFBO0FBRXpCLFVBQUksYUFBYSxLQUFLO0FBQ3BCLHVCQUFlLElBQUksSUFBSTtBQUFBO0FBRXpCLGFBQU87QUFBQTtBQUFBLFVBR0gsWUFBWSxPQUFPLE9BQU87QUFDOUIsVUFBSSxXQUFXO0FBQ2YsVUFBSSxZQUFZO0FBQ2hCLGlCQUFXLENBQUMsT0FBTyxPQUFPLFFBQVEsTUFBTSxVQUFVO0FBQ2hELFlBQUksQ0FBQyxhQUFhLE9BQU8sQ0FBQyx5QkFBeUIsS0FBSztBQUN0RCxzQkFBWTtBQUFBO0FBRWQsWUFBSSxlQUFlLElBQUksS0FBSztBQUMxQixzQkFBWSxlQUFlLElBQUk7QUFBQTtBQUFBO0FBSW5DLFVBQUksQ0FBQztBQUFVLGVBQU87QUFFdEIsVUFBSSxXQUFXO0FBQ2IsY0FBTSxFQUFFLE1BQU0sZ0JBQWdCLE1BQU0sUUFBUSxVQUFVLFVBQVU7QUFBQSxVQUM5RCxRQUFRO0FBQUEsVUFDUixRQUFRO0FBQUE7QUFFVixjQUFNLGNBQWMsS0FBSyxTQUFTO0FBQUEsVUFDaEMsTUFBTSxNQUFNLE9BQU87QUFBQSxVQUNuQixNQUFNO0FBQUEsVUFDTixRQUFRO0FBQUE7QUFFVixzQkFBYyxJQUFJO0FBQ2xCLDhCQUFzQixJQUFJLE1BQU0sVUFBVTtBQUFBO0FBRzVDLGFBQU87QUFBQTtBQUFBLElBSVQsZUFBZSxNQUFNLFFBQVE7QUFDM0IsVUFBSSxjQUFjLE1BQU07QUFDdEIsY0FBTSxxQkFBcUIsSUFBSSxJQUFJLENBQUMsR0FBRyxlQUFlLElBQUksQ0FBQyxVQUFVLE1BQU07QUFDM0UsY0FBTSxrQkFBa0IsQ0FBQyxHQUFHLG9CQUN6QixJQUFJLENBQUMsU0FBUyxLQUFLLFNBQVMsT0FDNUIsS0FBSyxLQUNMLFFBQVEsT0FBTztBQUNsQixjQUFNLGVBQWUsSUFBSSxPQUFPLEtBQUssV0FBVyxPQUFPLHlCQUF5QjtBQUFBLEtBQTBCLDZCQUE2QjtBQUFBLElBQTRCO0FBRW5LLG1CQUFXLENBQUMsU0FBUyxVQUFVLE9BQU8sUUFBUSxTQUFTO0FBQ3JELGNBQUksTUFBTSxTQUFTLFNBQVM7QUFDMUIsZ0JBQUksY0FBYyxJQUFJLFFBQVE7QUFHNUIscUJBQU8sT0FBTztBQUFBLG1CQUNUO0FBR0wsb0JBQU0sT0FBTyxNQUFNLEtBQUssUUFDdEIsY0FFQSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsT0FBTyxFQUFFLFNBQVM7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
@@ -42,6 +42,7 @@ function rollupPluginAstroBuildHTML(options) {
42
42
  const astroPageMap = new Map();
43
43
  const astroAssetMap = new Map();
44
44
  const cssChunkMap = new Map();
45
+ const pageStyleImportOrder = [];
45
46
  return {
46
47
  name: PLUGIN_NAME,
47
48
  enforce: "pre",
@@ -114,6 +115,9 @@ function rollupPluginAstroBuildHTML(options) {
114
115
  const src = getAttribute(node, "src");
115
116
  if ((src == null ? void 0 : src.startsWith(srcRoot)) && !astroAssetMap.has(src)) {
116
117
  astroAssetMap.set(src, fs.readFile(new URL(`file://${src}`)));
118
+ } else if ((src == null ? void 0 : src.startsWith(srcRootWeb)) && !astroAssetMap.has(src)) {
119
+ const resolved = new URL("." + src, astroConfig.projectRoot);
120
+ astroAssetMap.set(src, fs.readFile(resolved));
117
121
  }
118
122
  }
119
123
  if (hasSrcSet(node)) {
@@ -121,6 +125,9 @@ function rollupPluginAstroBuildHTML(options) {
121
125
  for (const { url } of candidates) {
122
126
  if (url.startsWith(srcRoot) && !astroAssetMap.has(url)) {
123
127
  astroAssetMap.set(url, fs.readFile(new URL(`file://${url}`)));
128
+ } else if (url.startsWith(srcRootWeb) && !astroAssetMap.has(url)) {
129
+ const resolved = new URL("." + url, astroConfig.projectRoot);
130
+ astroAssetMap.set(url, fs.readFile(resolved));
124
131
  }
125
132
  }
126
133
  }
@@ -140,6 +147,10 @@ function rollupPluginAstroBuildHTML(options) {
140
147
  const jsSource = assetImports.map((sid) => `import '${sid}';`).join("\n");
141
148
  astroPageStyleMap.set(pageStyleId, jsSource);
142
149
  assetInput.add(pageStyleId);
150
+ for (const assetHref of assetImports) {
151
+ if (!pageStyleImportOrder.includes(assetHref))
152
+ pageStyleImportOrder.push(assetHref);
153
+ }
143
154
  }
144
155
  }
145
156
  }
@@ -209,16 +220,30 @@ function rollupPluginAstroBuildHTML(options) {
209
220
  });
210
221
  assetIdMap.set(assetPath, referenceId);
211
222
  }
212
- for (const chunk of pureCSSChunks) {
213
- const referenceId = chunkToReferenceIdMap.get(chunk.fileName);
214
- const chunkReferenceIds = [referenceId];
215
- for (const imp of chunk.imports) {
216
- if (chunkToReferenceIdMap.has(imp)) {
217
- chunkReferenceIds.push(chunkToReferenceIdMap.get(imp));
218
- }
223
+ const sortedCSSChunks = [...pureCSSChunks];
224
+ sortedCSSChunks.sort((a, b) => {
225
+ let aIndex = Math.min(...Object.keys(a.modules).map((id) => {
226
+ const i = pageStyleImportOrder.findIndex((url) => id.endsWith(url));
227
+ return i >= 0 ? i : Infinity;
228
+ }));
229
+ let bIndex = Math.min(...Object.keys(b.modules).map((id) => {
230
+ const i = pageStyleImportOrder.findIndex((url) => id.endsWith(url));
231
+ return i >= 0 ? i : Infinity;
232
+ }));
233
+ return aIndex - bIndex;
234
+ });
235
+ const sortedChunkNames = sortedCSSChunks.map(({ fileName }) => fileName);
236
+ for (const chunk of sortedCSSChunks) {
237
+ const chunkModules = [chunk.fileName, ...chunk.imports];
238
+ chunkModules.sort((a, b) => sortedChunkNames.indexOf(a) - sortedChunkNames.indexOf(b));
239
+ const referenceIDs = [];
240
+ for (const chunkID of chunkModules) {
241
+ const referenceID = chunkToReferenceIdMap.get(chunkID);
242
+ if (referenceID)
243
+ referenceIDs.push(referenceID);
219
244
  }
220
- for (const [id] of Object.entries(chunk.modules)) {
221
- cssChunkMap.set(id, chunkReferenceIds);
245
+ for (const id of Object.keys(chunk.modules)) {
246
+ cssChunkMap.set(id, referenceIDs);
222
247
  }
223
248
  }
224
249
  const linkChunksAdded = new Set();
@@ -276,7 +301,10 @@ function rollupPluginAstroBuildHTML(options) {
276
301
  }
277
302
  remove(script);
278
303
  } else if (isInSrcDirectory(script, "src", srcRoot, srcRootWeb)) {
279
- const src = getAttribute(script, "src");
304
+ let src = getAttribute(script, "src");
305
+ if (src == null ? void 0 : src.startsWith(srcRootWeb)) {
306
+ src = new URL("." + src, astroConfig.projectRoot).pathname;
307
+ }
280
308
  if (src && (facadeIdMap.has(src) || facadeIdMap.has(src.substr(1)))) {
281
309
  const assetRootPath = "/" + (facadeIdMap.get(src) || facadeIdMap.get(src.substr(1)));
282
310
  const relPath = npath.posix.relative(pathname, assetRootPath);
@@ -366,4 +394,4 @@ function rollupPluginAstroBuildHTML(options) {
366
394
  export {
367
395
  rollupPluginAstroBuildHTML
368
396
  };
369
- //# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/vite-plugin-build-html/index.ts"],
  "mappings": "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",
  "names": []
}

397
+ //# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/vite-plugin-build-html/index.ts"],
  "mappings": ";;;;;;;;;;;;;;;;;;;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA,MAAM,cAAmC,YAAoB;AAE7D,MAAM,cAAc;AACpB,MAAM,oBAAoB;AAC1B,MAAM,sBAAsB;AAE5B,MAAM,cAAc;AACpB,MAAM,iBAAiB;AAgBhB,oCAAoC,SAAoC;AAC7E,QAAM,EAAE,aAAa,eAAe,mBAAmB,uBAAuB,eAAe,SAAS,QAAQ,UAAU,YAAY,YAAY,cAAc;AAG9J,QAAM,UAAU,YAAY,IAAI;AAEhC,QAAM,aAAa,QAAQ,OAAO,YAAY,YAAY,SAAS,SAAS;AAG5E,QAAM,kBAAkB,IAAI;AAG5B,QAAM,iBAAiB,IAAI;AAC3B,QAAM,eAAe,IAAI;AACzB,QAAM,gBAAgB,IAAI;AAE1B,QAAM,cAAc,IAAI;AACxB,QAAM,uBAAiC;AAEvC,SAAO;AAAA,IACL,MAAM;AAAA,IAEN,SAAS;AAAA,UAEH,QAAQ,cAAc;AAC1B,YAAM,YAAyB,IAAI;AACnC,YAAM,aAA0B,IAAI;AACpC,YAAM,UAAuB,IAAI;AAEjC,iBAAW,CAAC,WAAW,aAAa,OAAO,QAAQ,WAAW;AAC5D,cAAM,CAAC,WAAW,OAAO,SAAS;AAGlC,mBAAW,QAAQ,IAAI,WAAW,gCAAgC;AAChE,kBAAQ,IAAI;AAAA;AAGd,mBAAW,YAAY,SAAS,OAAO;AACrC,oBAAU,KAAK,SAAS,QAAQ,QAAQ,eAAe,QAAQ,OAAO;AACtE,gBAAM,KAAK,oBAAoB;AAC/B,gBAAM,OAAO,MAAM,UAAU,WAAW,KAAK;AAAA,YAC3C;AAAA,YACA,UAAU,IAAI,IAAI,KAAK,aAAa,YAAY;AAAA,YAChD;AAAA,YACA,MAAM;AAAA,YACN;AAAA,YACA;AAAA,YACA,OAAO,SAAS;AAAA,YAChB;AAAA,YACA;AAAA;AAEF,0BAAgB,IAAI,IAAI;AAExB,gBAAM,WAAW,OAAO,MAAM,MAAM;AAAA,YAClC,wBAAwB;AAAA;AAG1B,gBAAM,kBAAkB;AACxB,qBAAW,UAAU,kBAAkB,WAAW;AAChD,kBAAM,cAAc,aAAa,QAAQ;AACzC,gBAAI,aAAa;AACf,oBAAM,KAAK,eAAe;AAC1B,oBAAM,WAAW,sBAAsB;AACvC,8BAAgB,KAAK;AACrB,6BAAe,IAAI,UAAU;AAAA;AAAA;AAIjC,qBAAW,UAAU,oBAAoB,WAAW;AAClD,gBAAI,gBAAgB,SAAS;AAC3B,oBAAM,cAAc,aAAa,QAAQ;AACzC,oBAAM,MAAM,aAAa,QAAQ;AACjC,kBAAI,aAAa;AACf,sBAAM,KAAK,WAAW;AACtB,sBAAM,WAAW,sBAAsB;AACvC,gCAAgB,KAAK;AACrB,+BAAe,IAAI,UAAU;AAAA;AAAA,uBAEtB,iBAAiB,QAAQ,OAAO,SAAS,aAAa;AAC/D,oBAAM,MAAM,aAAa,QAAQ;AACjC,kBAAI;AAAK,wBAAQ,IAAI;AAAA;AAAA;AAIzB,cAAI,SAAS;AACb,qBAAW,QAAQ,iBAAiB,WAAW;AAC7C,gBAAI,aAAa,MAAM,gBAAgB;AACrC,wBAAU,eAAe;AAAA;AAAA;AAI7B,gBAAM,eAAe;AACrB,mBAAS,QAAQ,WAAW,WAAW;AACrC,gBAAI,gBAAgB,MAAM,SAAS,aAAa;AAC9C,oBAAM,OAAO,aAAa,MAAM;AAChC,2BAAa,KAAK;AAAA;AAGpB,gBAAI,iBAAiB,MAAM,SAAS,aAAa;AAC/C,oBAAM,MAAM,aAAa,MAAM;AAC/B,kBAAI,4BAAK,WAAW,aAAY,CAAC,cAAc,IAAI,MAAM;AACvD,8BAAc,IAAI,KAAK,GAAG,SAAS,IAAI,IAAI,UAAU;AAAA,yBAC5C,4BAAK,WAAW,gBAAe,CAAC,cAAc,IAAI,MAAM;AACjE,sBAAM,WAAW,IAAI,IAAI,MAAM,KAAK,YAAY;AAChD,8BAAc,IAAI,KAAK,GAAG,SAAS;AAAA;AAAA;AAIvC,gBAAI,UAAU,OAAO;AACnB,oBAAM,aAAa,YAAY,aAAa,MAAM;AAClD,yBAAW,EAAE,SAAS,YAAY;AAChC,oBAAI,IAAI,WAAW,YAAY,CAAC,cAAc,IAAI,MAAM;AACtD,gCAAc,IAAI,KAAK,GAAG,SAAS,IAAI,IAAI,UAAU;AAAA,2BAC5C,IAAI,WAAW,eAAe,CAAC,cAAc,IAAI,MAAM;AAChE,wBAAM,WAAW,IAAI,IAAI,MAAM,KAAK,YAAY;AAChD,gCAAc,IAAI,KAAK,GAAG,SAAS;AAAA;AAAA;AAAA;AAAA;AAM3C,cAAI,QAAQ;AACV,kBAAM,UAAU,gBAAgB;AAChC,0BAAc,IAAI,SAAS;AAE3B,yBAAa,QAAQ;AAAA;AAGvB,cAAI,gBAAgB,QAAQ;AAC1B,sBAAU,IAAI;AACd,kBAAM,WAAW,gBAAgB,IAAI,CAAC,QAAQ,WAAW,SAAS,KAAK;AACvE,yBAAa,IAAI,IAAI;AAAA;AAGvB,cAAI,aAAa,QAAQ;AACvB,kBAAM,cAAc,oBAAoB;AACxC,kBAAM,WAAW,aAAa,IAAI,CAAC,QAAQ,WAAW,SAAS,KAAK;AACpE,8BAAkB,IAAI,aAAa;AACnC,uBAAW,IAAI;AAGf,uBAAW,aAAa,cAAc;AACpC,kBAAI,CAAC,qBAAqB,SAAS;AAAY,qCAAqB,KAAK;AAAA;AAAA;AAAA;AAAA;AAMjF,YAAM,YAAY,IAAI,IAAI,CAAC,GAAG,SAAS,GAAG,WAAW,GAAG;AAExD,UAAI,CAAC,UAAU,MAAM;AACnB,kBAAU,IAAI;AAAA;AAEhB,YAAM,aAAa,eAAe,cAAc,MAAM,KAAK;AAC3D,aAAO;AAAA;AAAA,UAGH,UAAU,IAAI;AAClB,cAAQ;AAAA,aACD,eAAe,IAAI;AAAA,aACnB,aAAa,IAAI;AAAA,aACjB,OAAO,aAAa;AACvB,iBAAO;AAAA;AAAA;AAIX,aAAO;AAAA;AAAA,UAGH,KAAK,IAAI;AAEb,UAAI,aAAa,IAAI,KAAK;AACxB,eAAO,aAAa,IAAI;AAAA;AAG1B,UAAI,eAAe,IAAI,KAAK;AAC1B,eAAO,eAAe,IAAI;AAAA;AAG5B,UAAI,OAAO,aAAa;AACtB,eAAO;AAAA;AAGT,aAAO;AAAA;AAAA,IAGT,cAAc,eAAe;AAC3B,aAAO,OAAO,eAAe;AAAA,QAC3B,eAAe,OAAyB;AAEtC,cAAI,MAAM,KAAK,WAAW,oBAAoB;AAC5C,gBAAI,WAAW,MAAM,KAAK,OAAO,kBAAkB,SAAS;AAC5D,gBAAI,CAAC,UAAU;AACb,yBAAW;AAAA;AAEb,mBAAO,UAAU;AAAA;AAEnB,iBAAO;AAAA;AAAA;AAGX,aAAO;AAAA;AAAA,UAGH,eAAe,UAAU,QAAQ;AACrC,YAAM,cAAc,IAAI;AACxB,iBAAW,CAAC,SAAS,WAAW,OAAO,QAAQ,SAAS;AACtD,YAAI,OAAO,SAAS,SAAS;AAC3B,gBAAM,QAAQ;AACd,gBAAM,KAAK,MAAM;AACjB,cAAI,OAAO,aAAa;AACtB,mBAAO,OAAO;AAAA,qBACL,IAAI;AACb,wBAAY,IAAI,IAAI,MAAM;AAAA;AAAA;AAAA;AAMhC,YAAM,aAAa,IAAI;AACvB,iBAAW,CAAC,WAAW,gBAAgB,eAAe;AACpD,cAAM,cAAc,KAAK,SAAS;AAAA,UAChC,MAAM;AAAA,UACN,MAAM,MAAM,SAAS;AAAA,UACrB,QAAQ,MAAM;AAAA;AAEhB,mBAAW,IAAI,WAAW;AAAA;AAK5B,YAAM,kBAAkB,CAAC,GAAG;AAC5B,sBAAgB,KAAK,CAAC,GAAG,MAAM;AAC7B,YAAI,SAAS,KAAK,IAChB,GAAG,OAAO,KAAK,EAAE,SAAS,IAAI,CAAC,OAAO;AACpC,gBAAM,IAAI,qBAAqB,UAAU,CAAC,QAAQ,GAAG,SAAS;AAC9D,iBAAO,KAAK,IAAI,IAAI;AAAA;AAGxB,YAAI,SAAS,KAAK,IAChB,GAAG,OAAO,KAAK,EAAE,SAAS,IAAI,CAAC,OAAO;AACpC,gBAAM,IAAI,qBAAqB,UAAU,CAAC,QAAQ,GAAG,SAAS;AAC9D,iBAAO,KAAK,IAAI,IAAI;AAAA;AAGxB,eAAO,SAAS;AAAA;AAElB,YAAM,mBAAmB,gBAAgB,IAAI,CAAC,EAAE,eAAe;AAI/D,iBAAW,SAAS,iBAAiB;AACnC,cAAM,eAAe,CAAC,MAAM,UAAU,GAAG,MAAM;AAK/C,qBAAa,KAAK,CAAC,GAAG,MAAM,iBAAiB,QAAQ,KAAK,iBAAiB,QAAQ;AAEnF,cAAM,eAAyB;AAC/B,mBAAW,WAAW,cAAc;AAClC,gBAAM,cAAc,sBAAsB,IAAI;AAC9C,cAAI;AAAa,yBAAa,KAAK;AAAA;AAErC,mBAAW,MAAM,OAAO,KAAK,MAAM,UAAU;AAC3C,sBAAY,IAAI,IAAI;AAAA;AAAA;AAKxB,YAAM,kBAAkB,IAAI;AAC5B,YAAM,0BAA0B,CAAC,KAAqB,UAAkB,cAAoC,QAA6B,OAAO;AAC9I,YAAI,QAAQ;AACZ,YAAI,cAAc;AAChB,gBAAM,WAAW;AACjB,qBAAW,eAAe,cAAc;AACtC,kBAAM,gBAAgB,KAAK,YAAY;AACvC,kBAAM,UAAU,MAAM,MAAM,SAAS,UAAU,MAAM;AAGrD,kBAAM,MAAM,WAAW,UAAU,MAAM,OAAO;AAC9C,gBAAI,CAAC,gBAAgB,IAAI,MAAM;AAC7B,8BAAgB,IAAI;AACpB,2BACE,SAAS,YACT,cAAc,QAAQ;AAAA,gBACpB,KAAK;AAAA,iBACF,QAFiB;AAAA,gBAGpB,MAAM;AAAA,mBAER;AAEF,sBAAQ;AAAA;AAAA;AAAA;AAId,eAAO;AAAA;AAGT,iBAAW,CAAC,IAAI,SAAS,iBAAiB;AACxC,cAAM,WAAW,GAAG,OAAO,kBAAkB;AAC7C,cAAM,WAAW,OAAO,MAAM,MAAM;AAAA,UAClC,wBAAwB;AAAA;AAK1B,cAAM,cAAc,YAAY,IAAI;AACpC,cAAM,aAAa,MAAM;AAGzB,YAAI,kBAAkB;AAGtB,iBAAS,UAAU,kBAAkB,WAAW;AAC9C,cAAI,aAAa,QAAQ,mBAAmB,OAAO,gBAAgB,UAAU;AAC3E,gBAAI,CAAC,iBAAiB;AACpB,gCAAkB;AAClB,oBAAM,UAAU,MAAM,MAAM,SAAS,UAAU;AAC/C,2BACE,OAAO,YACP,aAAa;AAAA,gBACX,MAAM;AAAA,gBACN,KAAK;AAAA,kBAEP;AAAA;AAGJ,mBAAO;AAAA;AAAA;AAKX,iBAAS,UAAU,oBAAoB,WAAW;AAChD,cAAI,aAAa,QAAQ,mBAAmB,OAAO,gBAAgB,UAAU;AAC3E,gBAAI,CAAC,iBAAiB;AACpB,gCAAkB;AAClB,oBAAM,UAAU,MAAM,MAAM,SAAS,UAAU;AAC/C,2BACE,OAAO,YACP,aAAa;AAAA,gBACX,MAAM;AAAA,gBACN,KAAK;AAAA,kBAEP;AAAA;AAGJ,mBAAO;AAAA,qBACE,iBAAiB,QAAQ,OAAO,SAAS,aAAa;AAC/D,gBAAI,MAAM,aAAa,QAAQ;AAE/B,gBAAI,2BAAK,WAAW,aAAa;AAC/B,oBAAM,IAAI,IAAI,MAAM,KAAK,YAAY,aAAa;AAAA;AAGpD,gBAAI,OAAQ,aAAY,IAAI,QAAQ,YAAY,IAAI,IAAI,OAAO,MAAM;AACnE,oBAAM,gBAAgB,MAAO,aAAY,IAAI,QAAQ,YAAY,IAAI,IAAI,OAAO;AAChF,oBAAM,UAAU,MAAM,MAAM,SAAS,UAAU;AAC/C,oBAAM,QAAQ,cAAc;AAC5B,2BACE,OAAO,YACP,aAAa,iCACR,QADQ;AAAA,gBAEX,KAAK;AAAA,mBAEP;AAEF,qBAAO;AAAA;AAAA;AAAA;AAKb,cAAM,UAAU,oBAAoB;AACpC,YAAI,eAAe;AACnB,mBAAW,QAAQ,WAAW,WAAW;AACvC,cAAI,gBAAgB,MAAM,SAAS,aAAa;AAC9C,kBAAM,MAAM,aAAa,MAAM;AAC/B,oBAAQ;AAAA,mBACD,cAAc;AACjB,oBAAI,CAAC,cAAc;AACjB,wBAAM,QAAQ,cAAc;AAC5B,yBAAO,MAAM;AACb,iCAAe,wBAAwB,MAAM,UAAU,YAAY,IAAI,UAAU;AAAA;AAEnF,uBAAO;AACP;AAAA;AAAA,mBAEG,WAAW;AACd,oBAAI,aAAa,MAAM,UAAU,SAAS;AACxC,wBAAM,QAAQ,cAAc;AAC5B,0CAAwB,MAAM,UAAU,YAAY,IAAI,UAAU;AAClE,yBAAO;AAAA;AAAA;AAAA;AAAA;AAMf,cAAI,iBAAiB,MAAM,SAAS,aAAa;AAC/C,kBAAM,MAAM,aAAa,MAAM;AAC/B,kBAAM,cAAc,WAAW,IAAI;AACnC,gBAAI,aAAa;AACf,oBAAM,WAAW,KAAK,YAAY;AAClC,oBAAM,UAAU,MAAM,MAAM,SAAS,UAAU,MAAM;AACrD,2BAAa,MAAM,OAAO;AAAA;AAAA;AAK9B,cAAI,UAAU,OAAO;AACnB,kBAAM,SAAS,aAAa,MAAM;AAClC,gBAAI,gBAAgB;AACpB,kBAAM,OAAO,YAAY,QAAQ,IAAI,CAAC,MAAM,EAAE;AAC9C,uBAAW,OAAO,MAAM;AACtB,kBAAI,WAAW,IAAI,MAAM;AACvB,sBAAM,cAAc,WAAW,IAAI;AACnC,sBAAM,WAAW,KAAK,YAAY;AAClC,sBAAM,UAAU,MAAM,MAAM,SAAS,UAAU,MAAM;AACrD,gCAAgB,cAAc,QAAQ,KAAK;AAAA;AAAA;AAI/C,gBAAI,kBAAkB,QAAQ;AAC5B,2BAAa,MAAM,UAAU;AAAA;AAAA;AAAA;AAMnC,mBAAW,SAAS,iBAAiB,WAAW;AAC9C,cAAI,aAAa,OAAO,gBAAgB;AACtC,gBAAI,CAAC,cAAc;AACjB,6BAAe,wBAAwB,OAAO,UAAU,YAAY,IAAI;AAAA;AAG1E,mBAAO;AAAA;AAAA;AAIX,cAAM,UAAU,OAAO,UAAU;AACjC,cAAM,OAAO,SAAS,OAAO;AAC7B,YAAI;AAIJ,YAAI,KAAK,MAAM,iBAAiB;AAC9B,oBAAU,MAAM,MAAM,KAAK,GAAG;AAAA,eACzB;AACL,oBAAU,MAAM,MAAM,KAAK,MAAM;AAAA;AAGnC,aAAK,SAAS;AAAA,UACZ,UAAU;AAAA,UACV,QAAQ;AAAA,UACR,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA;",
  "names": []
}

@@ -55,7 +55,13 @@ ${astroResult}
55
55
  astroResult = `${prelude}
56
56
  ${astroResult}`;
57
57
  }
58
- let { code: tsResult } = await transform(astroResult, { sourcefile: id, sourcemap: "inline", internalURL: "astro/internal" });
58
+ let { code: tsResult } = await transform(astroResult, {
59
+ projectRoot: config.projectRoot.toString(),
60
+ site: config.buildOptions.site,
61
+ sourcefile: id,
62
+ sourcemap: "inline",
63
+ internalURL: "astro/internal"
64
+ });
59
65
  tsResult = `
60
66
  export const metadata = ${JSON.stringify(metadata)};
61
67
  export const frontmatter = ${JSON.stringify(content)};
@@ -73,4 +79,4 @@ ${tsResult}`;
73
79
  export {
74
80
  markdown as default
75
81
  };
76
- //# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLW1hcmtkb3duL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7O0FBR0E7QUFDQTtBQUNBO0FBU2Usa0JBQWtCLEVBQUUsVUFBc0M7QUFDdkUsU0FBTztBQUFBLElBQ0wsTUFBTTtBQUFBLElBQ04sU0FBUztBQUFBLFVBQ0gsS0FBSyxJQUFJO0FBQ2IsVUFBSSxHQUFHLFNBQVMsUUFBUTtBQUN0QixZQUFJLFNBQVMsTUFBTSxHQUFHLFNBQVMsU0FBUyxJQUFJO0FBRzVDLFlBQUksU0FBUyxPQUFPLGdCQUFnQjtBQUNwQyxZQUFJLGFBQWE7QUFDakIsWUFBSSxNQUFNLFFBQVEsU0FBUztBQUN6Qix1QkFBYSxPQUFPO0FBQ3BCLG1CQUFTLE9BQU87QUFBQTtBQUVsQixZQUFJLE9BQU8sV0FBVyxVQUFVO0FBQzlCLFVBQUMsR0FBRSxTQUFTLFdBQVcsTUFBTSxPQUFPO0FBQUE7QUFFdEMsWUFBSSxlQUFlLE1BQU0sT0FBTyxRQUFRO0FBQ3hDLFlBQUksRUFBRSxhQUFhLFVBQVUsTUFBTSxnQkFBZ0I7QUFHbkQsY0FBaUUsa0JBQXpELFdBQVMsSUFBSSxhQUFhLElBQUksUUFBUSxPQUFtQixJQUFaLG9CQUFZLElBQVosQ0FBN0MsVUFBYSxjQUFpQjtBQUN0QyxnQkFBUSxRQUFRO0FBQ2hCLGNBQU0sVUFBVTtBQUFBLEVBQ3RCLFNBQVMsdUJBQXVCLGFBQWE7QUFBQSxFQUM3QyxhQUFhLGtCQUFrQixpQkFBaUI7QUFBQSxFQUNoRDtBQUFBLG9CQUNrQixLQUFLLFVBQVU7QUFBQTtBQUUzQixjQUFNLFVBQVUsR0FBRyxTQUFTLHVCQUF1QixhQUFhO0FBQUEsRUFDdEUsUUFBUTtBQUVGLFlBQUksYUFBYSxLQUFLLFVBQVU7QUFDOUIsd0JBQWMsR0FBRztBQUFBO0FBQUE7QUFBQSxFQUE0QztBQUFBO0FBQUE7QUFBQSxlQUN4RDtBQUNMLHdCQUFjLEdBQUc7QUFBQSxFQUFZO0FBQUE7QUFJL0IsWUFBSSxFQUFFLE1BQU0sYUFBYSxNQUFNLFVBQVUsYUFBYSxFQUFFLFlBQVksSUFBSSxXQUFXLFVBQVUsYUFBYTtBQUUxRyxtQkFBVztBQUFBLDBCQUE2QixLQUFLLFVBQVU7QUFBQSw2QkFDbEMsS0FBSyxVQUFVO0FBQUEsRUFDMUM7QUFHTSxjQUFNLEVBQUUsTUFBTSxRQUFRLE1BQU0sUUFBUSxVQUFVLFVBQVUsRUFBRSxRQUFRLE1BQU0sV0FBVyxVQUFVLFlBQVk7QUFFekcsZUFBTztBQUFBLFVBQ0w7QUFBQSxVQUNBLEtBQUs7QUFBQTtBQUFBO0FBSVQsYUFBTztBQUFBO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
82
+ //# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLW1hcmtkb3duL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7O0FBR0E7QUFDQTtBQUNBO0FBU2Usa0JBQWtCLEVBQUUsVUFBc0M7QUFDdkUsU0FBTztBQUFBLElBQ0wsTUFBTTtBQUFBLElBQ04sU0FBUztBQUFBLFVBQ0gsS0FBSyxJQUFJO0FBQ2IsVUFBSSxHQUFHLFNBQVMsUUFBUTtBQUN0QixZQUFJLFNBQVMsTUFBTSxHQUFHLFNBQVMsU0FBUyxJQUFJO0FBRzVDLFlBQUksU0FBUyxPQUFPLGdCQUFnQjtBQUNwQyxZQUFJLGFBQWE7QUFDakIsWUFBSSxNQUFNLFFBQVEsU0FBUztBQUN6Qix1QkFBYSxPQUFPO0FBQ3BCLG1CQUFTLE9BQU87QUFBQTtBQUVsQixZQUFJLE9BQU8sV0FBVyxVQUFVO0FBQzlCLFVBQUMsR0FBRSxTQUFTLFdBQVcsTUFBTSxPQUFPO0FBQUE7QUFFdEMsWUFBSSxlQUFlLE1BQU0sT0FBTyxRQUFRO0FBQ3hDLFlBQUksRUFBRSxhQUFhLFVBQVUsTUFBTSxnQkFBZ0I7QUFHbkQsY0FBaUUsa0JBQXpELFdBQVMsSUFBSSxhQUFhLElBQUksUUFBUSxPQUFtQixJQUFaLG9CQUFZLElBQVosQ0FBN0MsVUFBYSxjQUFpQjtBQUN0QyxnQkFBUSxRQUFRO0FBQ2hCLGNBQU0sVUFBVTtBQUFBLEVBQ3RCLFNBQVMsdUJBQXVCLGFBQWE7QUFBQSxFQUM3QyxhQUFhLGtCQUFrQixpQkFBaUI7QUFBQSxFQUNoRDtBQUFBLG9CQUNrQixLQUFLLFVBQVU7QUFBQTtBQUUzQixjQUFNLFVBQVUsR0FBRyxTQUFTLHVCQUF1QixhQUFhO0FBQUEsRUFDdEUsUUFBUTtBQUVGLFlBQUksYUFBYSxLQUFLLFVBQVU7QUFDOUIsd0JBQWMsR0FBRztBQUFBO0FBQUE7QUFBQSxFQUE0QztBQUFBO0FBQUE7QUFBQSxlQUN4RDtBQUNMLHdCQUFjLEdBQUc7QUFBQSxFQUFZO0FBQUE7QUFJL0IsWUFBSSxFQUFFLE1BQU0sYUFBYSxNQUFNLFVBQVUsYUFBYTtBQUFBLFVBQ3BELGFBQWEsT0FBTyxZQUFZO0FBQUEsVUFDaEMsTUFBTSxPQUFPLGFBQWE7QUFBQSxVQUMxQixZQUFZO0FBQUEsVUFDWixXQUFXO0FBQUEsVUFDWCxhQUFhO0FBQUE7QUFHZixtQkFBVztBQUFBLDBCQUE2QixLQUFLLFVBQVU7QUFBQSw2QkFDbEMsS0FBSyxVQUFVO0FBQUEsRUFDMUM7QUFHTSxjQUFNLEVBQUUsTUFBTSxRQUFRLE1BQU0sUUFBUSxVQUFVLFVBQVUsRUFBRSxRQUFRLE1BQU0sV0FBVyxVQUFVLFlBQVk7QUFFekcsZUFBTztBQUFBLFVBQ0w7QUFBQSxVQUNBLEtBQUs7QUFBQTtBQUFBO0FBSVQsYUFBTztBQUFBO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "astro",
3
- "version": "0.21.3",
3
+ "version": "0.21.7",
4
4
  "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
5
5
  "author": "withastro",
6
6
  "license": "MIT",
@@ -55,14 +55,14 @@
55
55
  "test": "mocha --parallel --timeout 15000"
56
56
  },
57
57
  "dependencies": {
58
- "@astrojs/compiler": "^0.3.8",
58
+ "@astrojs/compiler": "^0.5.4",
59
59
  "@astrojs/language-server": "^0.7.16",
60
60
  "@astrojs/markdown-remark": "^0.5.0",
61
61
  "@astrojs/prism": "0.3.0",
62
- "@astrojs/renderer-preact": "^0.3.0",
63
- "@astrojs/renderer-react": "0.3.0",
64
- "@astrojs/renderer-svelte": "0.2.1",
65
- "@astrojs/renderer-vue": "0.2.0",
62
+ "@astrojs/renderer-preact": "^0.3.1",
63
+ "@astrojs/renderer-react": "0.3.1",
64
+ "@astrojs/renderer-svelte": "0.2.2",
65
+ "@astrojs/renderer-vue": "0.2.1",
66
66
  "@babel/core": "^7.15.8",
67
67
  "@babel/traverse": "^7.15.4",
68
68
  "@proload/core": "^0.2.1",
@@ -56982,8 +56982,13 @@ const devHtmlHook = async (html, { path: htmlPath, server, originalUrl }) => {
56982
56982
  .join('');
56983
56983
  // add HTML Proxy to Map
56984
56984
  addToHTMLProxyCache(config, url, scriptModuleIndex, contents);
56985
- // inline js module. convert to src="proxy"
56986
- s.overwrite(node.loc.start.offset, node.loc.end.offset, `<script type="module" src="${config.base + url.slice(1)}?html-proxy&index=${scriptModuleIndex}.js"></script>`);
56985
+ const modulePath = `${config.base + htmlPath.slice(1)}?html-proxy&index=${scriptModuleIndex}.js`;
56986
+ // invalidate the module so the newly cached contents will be served
56987
+ const module = server === null || server === void 0 ? void 0 : server.moduleGraph.getModuleById(modulePath);
56988
+ if (module) {
56989
+ server === null || server === void 0 ? void 0 : server.moduleGraph.invalidateModule(module);
56990
+ }
56991
+ s.overwrite(node.loc.start.offset, node.loc.end.offset, `<script type="module" src="${modulePath}"></script>`);
56987
56992
  }
56988
56993
  }
56989
56994
  // elements with [href/src] attrs