astro 0.22.16 → 0.22.20
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/dist/cli/index.js +19 -68
- package/dist/core/build/index.js +2 -2
- package/dist/core/build/internal.js +5 -1
- package/dist/core/build/page-data.js +22 -17
- package/dist/core/build/static-build.js +36 -12
- package/dist/core/build/vite-plugin-hoisted-scripts.js +38 -0
- package/dist/core/config.js +38 -6
- package/dist/core/ssr/index.js +17 -3
- package/dist/core/ssr/result.js +4 -3
- package/dist/core/ssr/rss.js +12 -9
- package/dist/core/util.js +10 -1
- package/dist/runtime/server/escape.js +6 -0
- package/dist/runtime/server/index.js +34 -2
- package/dist/runtime/server/metadata.js +12 -3
- package/dist/types/@types/astro.d.ts +16 -0
- package/dist/types/core/build/internal.d.ts +2 -0
- package/dist/types/core/build/vite-plugin-hoisted-scripts.d.ts +3 -0
- package/dist/types/core/config.d.ts +3 -2
- package/dist/types/core/ssr/result.d.ts +3 -1
- package/dist/types/core/ssr/rss.d.ts +1 -2
- package/dist/types/core/util.d.ts +2 -0
- package/dist/types/runtime/server/escape.d.ts +1 -0
- package/dist/types/runtime/server/index.d.ts +2 -0
- package/dist/types/runtime/server/metadata.d.ts +2 -1
- package/dist/vite-plugin-astro/compile.js +10 -2
- package/dist/vite-plugin-astro/index.js +32 -8
- package/package.json +4 -6
- package/vendor/vite/dist/client/client.mjs +14 -2
- package/dist/types/vite-plugin-fetch/index.d.ts +0 -2
- package/dist/vite-plugin-fetch/index.js +0 -72
package/dist/cli/index.js
CHANGED
|
@@ -1,19 +1,3 @@
|
|
|
1
|
-
var __defProp = Object.defineProperty;
|
|
2
|
-
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
3
|
-
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
4
|
-
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
5
|
-
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
6
|
-
var __spreadValues = (a, b) => {
|
|
7
|
-
for (var prop in b || (b = {}))
|
|
8
|
-
if (__hasOwnProp.call(b, prop))
|
|
9
|
-
__defNormalProp(a, prop, b[prop]);
|
|
10
|
-
if (__getOwnPropSymbols)
|
|
11
|
-
for (var prop of __getOwnPropSymbols(b)) {
|
|
12
|
-
if (__propIsEnum.call(b, prop))
|
|
13
|
-
__defNormalProp(a, prop, b[prop]);
|
|
14
|
-
}
|
|
15
|
-
return a;
|
|
16
|
-
};
|
|
17
1
|
import * as colors from "kleur/colors";
|
|
18
2
|
import fs from "fs";
|
|
19
3
|
import yargs from "yargs-parser";
|
|
@@ -24,36 +8,6 @@ import devServer from "../core/dev/index.js";
|
|
|
24
8
|
import preview from "../core/preview/index.js";
|
|
25
9
|
import { check } from "./check.js";
|
|
26
10
|
import { formatConfigError, loadConfig } from "../core/config.js";
|
|
27
|
-
function resolveArgs(flags) {
|
|
28
|
-
const options = {
|
|
29
|
-
projectRoot: typeof flags.projectRoot === "string" ? flags.projectRoot : void 0,
|
|
30
|
-
site: typeof flags.site === "string" ? flags.site : void 0,
|
|
31
|
-
sitemap: typeof flags.sitemap === "boolean" ? flags.sitemap : void 0,
|
|
32
|
-
port: typeof flags.port === "number" ? flags.port : void 0,
|
|
33
|
-
config: typeof flags.config === "string" ? flags.config : void 0,
|
|
34
|
-
hostname: typeof flags.hostname === "string" ? flags.hostname : void 0,
|
|
35
|
-
experimentalStaticBuild: typeof flags.experimentalStaticBuild === "boolean" ? flags.experimentalStaticBuild : false,
|
|
36
|
-
drafts: typeof flags.drafts === "boolean" ? flags.drafts : false
|
|
37
|
-
};
|
|
38
|
-
if (flags.version) {
|
|
39
|
-
return { cmd: "version", options };
|
|
40
|
-
} else if (flags.help) {
|
|
41
|
-
return { cmd: "help", options };
|
|
42
|
-
}
|
|
43
|
-
const cmd = flags._[2];
|
|
44
|
-
switch (cmd) {
|
|
45
|
-
case "dev":
|
|
46
|
-
return { cmd: "dev", options };
|
|
47
|
-
case "build":
|
|
48
|
-
return { cmd: "build", options };
|
|
49
|
-
case "preview":
|
|
50
|
-
return { cmd: "preview", options };
|
|
51
|
-
case "check":
|
|
52
|
-
return { cmd: "check", options };
|
|
53
|
-
default:
|
|
54
|
-
return { cmd: "help", options };
|
|
55
|
-
}
|
|
56
|
-
}
|
|
57
11
|
function printHelp() {
|
|
58
12
|
console.log(` ${colors.bold("astro")} - Futuristic web development tool.
|
|
59
13
|
${colors.bold("Commands:")}
|
|
@@ -80,26 +34,24 @@ async function printVersion() {
|
|
|
80
34
|
const pkgVersion = pkg.version;
|
|
81
35
|
console.log(pkgVersion);
|
|
82
36
|
}
|
|
83
|
-
function
|
|
84
|
-
if (
|
|
85
|
-
|
|
86
|
-
if (
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
astroConfig.buildOptions.drafts = flags.drafts;
|
|
37
|
+
function resolveCommand(flags) {
|
|
38
|
+
if (flags.version) {
|
|
39
|
+
return "version";
|
|
40
|
+
} else if (flags.help) {
|
|
41
|
+
return "help";
|
|
42
|
+
}
|
|
43
|
+
const cmd = flags._[2];
|
|
44
|
+
const supportedCommands = new Set(["dev", "build", "preview", "check"]);
|
|
45
|
+
if (supportedCommands.has(cmd)) {
|
|
46
|
+
return cmd;
|
|
47
|
+
}
|
|
48
|
+
return "help";
|
|
96
49
|
}
|
|
97
50
|
async function cli(args) {
|
|
98
51
|
const flags = yargs(args);
|
|
99
|
-
const
|
|
100
|
-
const
|
|
101
|
-
|
|
102
|
-
switch (state.cmd) {
|
|
52
|
+
const cmd = resolveCommand(flags);
|
|
53
|
+
const projectRoot = flags.projectRoot || flags._[3];
|
|
54
|
+
switch (cmd) {
|
|
103
55
|
case "help":
|
|
104
56
|
printHelp();
|
|
105
57
|
return process.exit(0);
|
|
@@ -117,8 +69,7 @@ async function cli(args) {
|
|
|
117
69
|
logging.level = "silent";
|
|
118
70
|
let config;
|
|
119
71
|
try {
|
|
120
|
-
config = await loadConfig({ cwd: projectRoot,
|
|
121
|
-
mergeCLIFlags(config, options);
|
|
72
|
+
config = await loadConfig({ cwd: projectRoot, flags });
|
|
122
73
|
} catch (err) {
|
|
123
74
|
if (err instanceof z.ZodError) {
|
|
124
75
|
console.error(formatConfigError(err));
|
|
@@ -127,7 +78,7 @@ async function cli(args) {
|
|
|
127
78
|
}
|
|
128
79
|
process.exit(1);
|
|
129
80
|
}
|
|
130
|
-
switch (
|
|
81
|
+
switch (cmd) {
|
|
131
82
|
case "dev": {
|
|
132
83
|
try {
|
|
133
84
|
await devServer(config, { logging });
|
|
@@ -160,7 +111,7 @@ async function cli(args) {
|
|
|
160
111
|
return;
|
|
161
112
|
}
|
|
162
113
|
default: {
|
|
163
|
-
throw new Error(`Error running ${
|
|
114
|
+
throw new Error(`Error running ${cmd}`);
|
|
164
115
|
}
|
|
165
116
|
}
|
|
166
117
|
}
|
|
@@ -171,4 +122,4 @@ function throwAndExit(err) {
|
|
|
171
122
|
export {
|
|
172
123
|
cli
|
|
173
124
|
};
|
|
174
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
125
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NsaS9pbmRleC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUtBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBTUEscUJBQXFCO0FBQ3BCLFVBQVEsSUFBSSxLQUFLLE9BQU8sS0FBSztBQUFBLElBQzFCLE9BQU8sS0FBSztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSxJQU1aLE9BQU8sS0FBSztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFjaEIsOEJBQThCO0FBQzdCLFFBQU0sU0FBUyxJQUFJLElBQUksc0JBQXNCLFlBQVk7QUFDekQsUUFBTSxNQUFNLEtBQUssTUFBTSxNQUFNLEdBQUcsU0FBUyxTQUFTLFFBQVE7QUFDMUQsUUFBTSxhQUFhLElBQUk7QUFFdkIsVUFBUSxJQUFJO0FBQUE7QUFJYix3QkFBd0IsT0FBOEI7QUFDckQsTUFBSSxNQUFNLFNBQVM7QUFDbEIsV0FBTztBQUFBLGFBQ0csTUFBTSxNQUFNO0FBQ3RCLFdBQU87QUFBQTtBQUVSLFFBQU0sTUFBTSxNQUFNLEVBQUU7QUFDcEIsUUFBTSxvQkFBb0IsSUFBSSxJQUFJLENBQUMsT0FBTyxTQUFTLFdBQVc7QUFDOUQsTUFBSSxrQkFBa0IsSUFBSSxNQUFNO0FBQy9CLFdBQU87QUFBQTtBQUVSLFNBQU87QUFBQTtBQUlSLG1CQUEwQixNQUFnQjtBQUN6QyxRQUFNLFFBQVEsTUFBTTtBQUNwQixRQUFNLE1BQU0sZUFBZTtBQUMzQixRQUFNLGNBQWMsTUFBTSxlQUFlLE1BQU0sRUFBRTtBQUVqRCxVQUFRO0FBQUEsU0FDRjtBQUNKO0FBQ0EsYUFBTyxRQUFRLEtBQUs7QUFBQSxTQUNoQjtBQUNKLFlBQU07QUFDTixhQUFPLFFBQVEsS0FBSztBQUFBO0FBSXRCLE1BQUksVUFBc0I7QUFBQSxJQUN6QixNQUFNO0FBQUEsSUFDTixPQUFPO0FBQUE7QUFHUixNQUFJLE1BQU07QUFBUyxZQUFRLFFBQVE7QUFDbkMsTUFBSSxNQUFNO0FBQVEsWUFBUSxRQUFRO0FBQ2xDLE1BQUk7QUFDSixNQUFJO0FBQ0gsYUFBUyxNQUFNLFdBQVcsRUFBRSxLQUFLLGFBQWE7QUFBQSxXQUN0QyxLQUFQO0FBQ0QsUUFBSSxlQUFlLEVBQUUsVUFBVTtBQUM5QixjQUFRLE1BQU0sa0JBQWtCO0FBQUEsV0FDMUI7QUFDTixjQUFRLE1BQU0sT0FBTyxJQUFLLElBQVksY0FBYztBQUFBO0FBRXJELFlBQVEsS0FBSztBQUFBO0FBR2QsVUFBUTtBQUFBLFNBQ0YsT0FBTztBQUNYLFVBQUk7QUFDSCxjQUFNLFVBQVUsUUFBUSxFQUFFO0FBRTFCLGNBQU0sSUFBSSxRQUFRLE1BQU07QUFBQTtBQUFBLGVBQ2hCLEtBQVA7QUFDRCxxQkFBYTtBQUFBO0FBR2Q7QUFBQTtBQUFBLFNBR0ksU0FBUztBQUNiLFVBQUk7QUFDSCxjQUFNLE1BQU0sUUFBUSxFQUFFO0FBQ3RCLGdCQUFRLEtBQUs7QUFBQSxlQUNMLEtBQVA7QUFDRCxxQkFBYTtBQUFBO0FBRWQ7QUFBQTtBQUFBLFNBR0ksU0FBUztBQUNiLFlBQU0sTUFBTSxNQUFNLE1BQU07QUFDeEIsYUFBTyxRQUFRLEtBQUs7QUFBQTtBQUFBLFNBR2hCLFdBQVc7QUFDZixVQUFJO0FBQ0gsY0FBTSxRQUFRLFFBQVEsRUFBRTtBQUFBLGVBQ2hCLEtBQVA7QUFDRCxxQkFBYTtBQUFBO0FBRWQ7QUFBQTtBQUFBLGFBR1E7QUFDUixZQUFNLElBQUksTUFBTSxpQkFBaUI7QUFBQTtBQUFBO0FBQUE7QUFNcEMsc0JBQXNCLEtBQVU7QUFDL0IsVUFBUSxNQUFNLE9BQU8sSUFBSSxJQUFJLGNBQWM7QUFDM0MsVUFBUSxLQUFLO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
package/dist/core/build/index.js
CHANGED
|
@@ -104,7 +104,7 @@ class AstroBuilder {
|
|
|
104
104
|
debug(logging, "build", timerMessage("Additional assets copied", timer.assetsStart));
|
|
105
105
|
timer.sitemapStart = performance.now();
|
|
106
106
|
if (this.config.buildOptions.sitemap && this.config.buildOptions.site) {
|
|
107
|
-
const sitemap = generateSitemap(pageNames.map((pageName) => new URL(
|
|
107
|
+
const sitemap = generateSitemap(pageNames.map((pageName) => new URL(pageName, this.config.buildOptions.site).href));
|
|
108
108
|
const sitemapPath = new URL("./sitemap.xml", this.config.dist);
|
|
109
109
|
await fs.promises.mkdir(new URL("./", sitemapPath), { recursive: true });
|
|
110
110
|
await fs.promises.writeFile(sitemapPath, sitemap, "utf8");
|
|
@@ -127,4 +127,4 @@ class AstroBuilder {
|
|
|
127
127
|
export {
|
|
128
128
|
build as default
|
|
129
129
|
};
|
|
130
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
130
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvYnVpbGQvaW5kZXgudHMiXSwKICAibWFwcGluZ3MiOiAiQUFHQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFRQSxxQkFBb0MsUUFBcUIsVUFBd0IsRUFBRSxTQUFTLHFCQUFvQztBQUUvSCxXQUFTLFlBQVk7QUFBQSxJQUNwQixTQUFTO0FBQUE7QUFHVixRQUFNLFVBQVUsSUFBSSxhQUFhLFFBQVE7QUFDekMsUUFBTSxRQUFRO0FBQUE7QUFHZixtQkFBbUI7QUFBQSxFQVVsQixZQUFZLFFBQXFCLFNBQXVCO0FBUGhELGdCQUFPO0FBRVAsc0JBQXlCO0FBTWhDLFFBQUksQ0FBQyxPQUFPLGFBQWEsUUFBUSxPQUFPLGFBQWEsWUFBWSxPQUFPO0FBQ3ZFLFdBQUssUUFBUSxTQUFTLFVBQVU7QUFBQTtBQUdqQyxRQUFJLFFBQVE7QUFBTSxXQUFLLE9BQU8sUUFBUTtBQUN0QyxTQUFLLFNBQVM7QUFDZCxVQUFNLE9BQU8sT0FBTyxXQUFXO0FBQy9CLFNBQUssVUFBVSxRQUFRO0FBQ3ZCLFNBQUssU0FBUyxPQUFPLGFBQWEsT0FBTyxJQUFJLElBQUksT0FBTyxhQUFhLE1BQU0sU0FBUyxvQkFBb0I7QUFDeEcsU0FBSyxXQUFXLG9CQUFvQixFQUFFLFVBQVUsS0FBSztBQUFBO0FBQUEsUUFHaEQsUUFBUTtBQUNiLFVBQU0sRUFBRSxTQUFTLFdBQVc7QUFDNUIsVUFBTSxRQUFnQztBQUN0QyxVQUFNLE9BQU8sWUFBWTtBQUN6QixVQUFNLFlBQVksWUFBWTtBQUM5QixVQUFNLGFBQWEsTUFBTSxXQUN4QixLQUFLLFlBQ0o7QUFBQSxNQUNDLE1BQU0sS0FBSztBQUFBLE1BQ1gsUUFBUTtBQUFBLFFBQ1AsS0FBSyxFQUFFLFNBQVM7QUFBQSxRQUNoQixnQkFBZ0I7QUFBQTtBQUFBLE9BR2xCLEtBQUssT0FBTyxRQUFRLEtBRXJCLEVBQUUsYUFBYSxLQUFLLFFBQVE7QUFFN0IsU0FBSyxhQUFhO0FBQ2xCLFVBQU0sYUFBYSxNQUFNLEtBQUssYUFBYTtBQUMzQyxTQUFLLGFBQWE7QUFDbEIsVUFBTSxTQUFTLFNBQVMsYUFBYSxnQkFBZ0IsTUFBTTtBQUUzRCxVQUFNLFlBQVksWUFBWTtBQUM5QixVQUFNLEVBQUUsUUFBUSxhQUFhLE1BQU0saUJBQWlCO0FBQUEsTUFDbkQsYUFBYSxLQUFLO0FBQUEsTUFDbEIsU0FBUyxLQUFLO0FBQUEsTUFDZCxVQUFVLEtBQUs7QUFBQSxNQUNmO0FBQUEsTUFDQSxZQUFZLEtBQUs7QUFBQSxNQUNqQixZQUFZLEtBQUs7QUFBQTtBQUlsQixXQUFPLFFBQVEsVUFBVSxRQUFRLENBQUMsQ0FBQyxNQUFNLFVBQVU7QUFDbEQsVUFBSSxpQkFBaUIsS0FBSyxRQUFRLElBQUk7QUFFckMsY0FBTSxjQUFlLEtBQUssUUFBUSxHQUFXO0FBQzdDLFlBQUksUUFBUSxZQUFZLFVBQVUsQ0FBQyxLQUFLLE9BQU8sYUFBYSxRQUFRO0FBQ25FLGdCQUFNLFNBQVMsU0FBUyxhQUFhLHVCQUF1QixRQUFRLE1BQU07QUFDMUUsaUJBQU8sU0FBUztBQUFBO0FBQUE7QUFBQTtBQUtuQixVQUFNLFNBQVMsU0FBUyxhQUFhLG9CQUFvQixNQUFNO0FBRy9ELFVBQU0sWUFBc0I7QUFJNUIsVUFBTSxhQUFhLFlBQVk7QUFHL0IsUUFBSSxLQUFLLE9BQU8sYUFBYSx5QkFBeUI7QUFDckQsWUFBTSxZQUFZO0FBQUEsUUFDakI7QUFBQSxRQUNBLGFBQWEsS0FBSztBQUFBLFFBQ2xCLFNBQVMsS0FBSztBQUFBLFFBQ2QsUUFBUSxLQUFLO0FBQUEsUUFDYjtBQUFBLFFBQ0EsWUFBWSxLQUFLO0FBQUEsUUFDakIsWUFBWSxLQUFLO0FBQUE7QUFBQSxXQUVaO0FBQ04sWUFBTSxlQUFlO0FBQUEsUUFDcEI7QUFBQSxRQUNBLGFBQWEsS0FBSztBQUFBLFFBQ2xCLFNBQVMsS0FBSztBQUFBLFFBQ2QsUUFBUSxLQUFLO0FBQUEsUUFDYjtBQUFBLFFBQ0EsWUFBWSxLQUFLO0FBQUEsUUFDakIsWUFBWSxLQUFLO0FBQUEsUUFDakIsWUFBWSxLQUFLO0FBQUE7QUFBQTtBQUduQixVQUFNLFNBQVMsU0FBUyxhQUFhLHVCQUF1QixNQUFNO0FBR2xFLFVBQU0sY0FBYyxZQUFZO0FBQ2hDLFdBQU8sS0FBSyxRQUFRLElBQUksQ0FBQyxNQUFNO0FBQzlCLFVBQUksQ0FBQyxPQUFPO0FBQUk7QUFDaEIsWUFBTSxXQUFXLElBQUksSUFBSSxVQUFVO0FBQ25DLFNBQUcsVUFBVSxJQUFJLElBQUksTUFBTSxXQUFXLEVBQUUsV0FBVztBQUNuRCxTQUFHLGNBQWMsVUFBVSxPQUFPLElBQUk7QUFDdEMsYUFBTyxPQUFPO0FBQUE7QUFFZixVQUFNLFNBQVMsU0FBUyxhQUFhLDRCQUE0QixNQUFNO0FBR3ZFLFVBQU0sZUFBZSxZQUFZO0FBQ2pDLFFBQUksS0FBSyxPQUFPLGFBQWEsV0FBVyxLQUFLLE9BQU8sYUFBYSxNQUFNO0FBQ3RFLFlBQU0sVUFBVSxnQkFBZ0IsVUFBVSxJQUFJLENBQUMsYUFBYSxJQUFJLElBQUksVUFBVSxLQUFLLE9BQU8sYUFBYSxNQUFNO0FBQzdHLFlBQU0sY0FBYyxJQUFJLElBQUksaUJBQWlCLEtBQUssT0FBTztBQUN6RCxZQUFNLEdBQUcsU0FBUyxNQUFNLElBQUksSUFBSSxNQUFNLGNBQWMsRUFBRSxXQUFXO0FBQ2pFLFlBQU0sR0FBRyxTQUFTLFVBQVUsYUFBYSxTQUFTO0FBQUE7QUFFbkQsVUFBTSxTQUFTLFNBQVMsYUFBYSxpQkFBaUIsTUFBTTtBQUc1RCxVQUFNLFdBQVc7QUFDakIsUUFBSSxRQUFRLFNBQVMsT0FBTyxRQUFRLFVBQVUsT0FBTyxTQUFTO0FBQzdELFlBQU0sS0FBSyxXQUFXLEVBQUUsU0FBUyxXQUFXLE1BQU0sTUFBTSxXQUFXLFVBQVU7QUFBQTtBQUFBO0FBQUEsUUFLakUsV0FBVyxFQUFFLFNBQVMsV0FBVyxhQUE0RTtBQUUxSCxVQUFNLFNBQVM7QUFDZixVQUFNLFlBQVksWUFBWSxRQUFRO0FBQ3RDLFVBQU0sUUFBUSxZQUFZLE1BQU0sR0FBRyxLQUFLLE1BQU0saUJBQWlCLEdBQUksYUFBWSxLQUFNLFFBQVE7QUFDN0YsVUFBTSxVQUFVLEdBQUcsS0FBSyxNQUFNLFlBQVk7QUFDMUMsU0FBSyxTQUFTLFNBQVMsR0FBRyw0QkFBNEIsT0FBTyxLQUFLLFVBQVUsT0FBTyxJQUFJLElBQUk7QUFDM0YsU0FBSyxTQUFTLFNBQVMsYUFBTSxPQUFPLEtBQUssT0FBTyxLQUFLO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -4,16 +4,20 @@ function createBuildInternals() {
|
|
|
4
4
|
const astroStyleMap = new Map();
|
|
5
5
|
const astroPageStyleMap = new Map();
|
|
6
6
|
const facadeIdToAssetsMap = new Map();
|
|
7
|
+
const hoistedScriptIdToHoistedMap = new Map();
|
|
8
|
+
const facadeIdToHoistedEntryMap = new Map();
|
|
7
9
|
return {
|
|
8
10
|
pureCSSChunks,
|
|
9
11
|
chunkToReferenceIdMap,
|
|
10
12
|
astroStyleMap,
|
|
11
13
|
astroPageStyleMap,
|
|
12
14
|
facadeIdToAssetsMap,
|
|
15
|
+
hoistedScriptIdToHoistedMap,
|
|
16
|
+
facadeIdToHoistedEntryMap,
|
|
13
17
|
entrySpecifierToBundleMap: new Map()
|
|
14
18
|
};
|
|
15
19
|
}
|
|
16
20
|
export {
|
|
17
21
|
createBuildInternals
|
|
18
22
|
};
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvYnVpbGQvaW50ZXJuYWwudHMiXSwKICAibWFwcGluZ3MiOiAiQUE2Qk8sZ0NBQWdEO0FBR3RELFFBQU0sZ0JBQWdCLElBQUk7QUFDMUIsUUFBTSx3QkFBd0IsSUFBSTtBQUlsQyxRQUFNLGdCQUFnQixJQUFJO0FBRTFCLFFBQU0sb0JBQW9CLElBQUk7QUFHOUIsUUFBTSxzQkFBc0IsSUFBSTtBQUdoQyxRQUFNLDhCQUE4QixJQUFJO0FBQ3hDLFFBQU0sNEJBQTRCLElBQUk7QUFFdEMsU0FBTztBQUFBLElBQ047QUFBQSxJQUNBO0FBQUEsSUFDQTtBQUFBLElBQ0E7QUFBQSxJQUNBO0FBQUEsSUFDQTtBQUFBLElBQ0E7QUFBQSxJQUNBLDJCQUEyQixJQUFJO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -10,7 +10,7 @@ async function collectPagesData(opts) {
|
|
|
10
10
|
const assets = {};
|
|
11
11
|
const allPages = {};
|
|
12
12
|
await Promise.all(manifest.routes.map(async (route) => {
|
|
13
|
-
var _a, _b
|
|
13
|
+
var _a, _b;
|
|
14
14
|
if (route.pathname) {
|
|
15
15
|
allPages[route.component] = {
|
|
16
16
|
route,
|
|
@@ -44,25 +44,30 @@ async function collectPagesData(opts) {
|
|
|
44
44
|
debug(logging, "build", `\u251C\u2500\u2500 ${colors.bold(colors.red("\u2717"))} ${route.component}`);
|
|
45
45
|
throw err;
|
|
46
46
|
});
|
|
47
|
-
if ((_a = result.rss) == null ? void 0 : _a.
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
47
|
+
if ((_a = result.rss) == null ? void 0 : _a.length) {
|
|
48
|
+
for (let i = 0; i < result.rss.length; i++) {
|
|
49
|
+
const rss = result.rss[i];
|
|
50
|
+
if (rss.xml) {
|
|
51
|
+
const { url, content } = rss.xml;
|
|
52
|
+
if (content) {
|
|
53
|
+
const rssFile = new URL(url.replace(/^\/?/, "./"), astroConfig.dist);
|
|
54
|
+
if (assets[fileURLToPath(rssFile)]) {
|
|
55
|
+
throw new Error(`[getStaticPaths] RSS feed ${url} already exists.
|
|
53
56
|
Use \`rss(data, {url: '...'})\` to choose a unique, custom URL. (${route.component})`);
|
|
57
|
+
}
|
|
58
|
+
assets[fileURLToPath(rssFile)] = content;
|
|
59
|
+
}
|
|
54
60
|
}
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
const stylesheetFile = new URL(url.replace(/^\/?/, "./"), astroConfig.dist);
|
|
61
|
-
if (assets[fileURLToPath(stylesheetFile)]) {
|
|
62
|
-
throw new Error(`[getStaticPaths] RSS feed stylesheet ${url} already exists.
|
|
61
|
+
if ((_b = rss.xsl) == null ? void 0 : _b.content) {
|
|
62
|
+
const { url, content } = rss.xsl;
|
|
63
|
+
const stylesheetFile = new URL(url.replace(/^\/?/, "./"), astroConfig.dist);
|
|
64
|
+
if (assets[fileURLToPath(stylesheetFile)]) {
|
|
65
|
+
throw new Error(`[getStaticPaths] RSS feed stylesheet ${url} already exists.
|
|
63
66
|
Use \`rss(data, {stylesheet: '...'})\` to choose a unique, custom URL. (${route.component})`);
|
|
67
|
+
}
|
|
68
|
+
assets[fileURLToPath(stylesheetFile)] = content;
|
|
69
|
+
}
|
|
64
70
|
}
|
|
65
|
-
assets[fileURLToPath(stylesheetFile)] = content;
|
|
66
71
|
}
|
|
67
72
|
allPages[route.component] = {
|
|
68
73
|
route,
|
|
@@ -101,4 +106,4 @@ async function getStaticPathsForRoute(opts, route) {
|
|
|
101
106
|
export {
|
|
102
107
|
collectPagesData
|
|
103
108
|
};
|
|
104
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
109
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvYnVpbGQvcGFnZS1kYXRhLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBS0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUVBO0FBQ0E7QUFpQkEsZ0NBQXVDLE1BQWdFO0FBQ3RHLFFBQU0sRUFBRSxhQUFhLFNBQVMsVUFBVSxRQUFRLFlBQVksZUFBZTtBQUUzRSxRQUFNLFNBQWlDO0FBQ3ZDLFFBQU0sV0FBeUI7QUFNL0IsUUFBTSxRQUFRLElBQ2IsU0FBUyxPQUFPLElBQUksT0FBTyxVQUFVO0FBeEN2QztBQTBDRyxRQUFJLE1BQU0sVUFBVTtBQUNuQixlQUFTLE1BQU0sYUFBYTtBQUFBLFFBQzNCO0FBQUEsUUFDQSxPQUFPLENBQUMsTUFBTTtBQUFBLFFBQ2QsU0FBUyxNQUFNLFdBQVc7QUFBQSxVQUN6QjtBQUFBLFVBQ0EsVUFBVSxJQUFJLElBQUksS0FBSyxNQUFNLGFBQWEsWUFBWTtBQUFBLFVBQ3REO0FBQUEsVUFDQSxNQUFNO0FBQUEsVUFDTjtBQUFBLFVBQ0EsVUFBVSxNQUFNO0FBQUEsVUFDaEI7QUFBQSxVQUNBO0FBQUEsVUFDQTtBQUFBLFdBRUMsS0FBSyxDQUFDLFdBQVc7QUFDakIsZ0JBQU0sT0FBTyxHQUFHLE1BQU0sV0FBVyxRQUFRLFFBQVE7QUFDakQsZ0JBQU0sU0FBUyxTQUFTLHNCQUFPLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBUyxNQUFNLG9CQUFlLE9BQU8sT0FBTztBQUNwRyxpQkFBTztBQUFBLFdBRVAsTUFBTSxDQUFDLFFBQVE7QUFDZixnQkFBTSxTQUFTLFNBQVMsc0JBQU8sT0FBTyxLQUFLLE9BQU8sSUFBSSxjQUFTLE1BQU07QUFDckUsZ0JBQU07QUFBQTtBQUFBO0FBR1Q7QUFBQTtBQUdELFVBQU0sU0FBUyxNQUFNLHVCQUF1QixNQUFNLE9BQ2hELEtBQUssQ0FBQyxXQUFXO0FBQ2pCLFlBQU0sUUFBUSxPQUFPLE1BQU0sV0FBVyxJQUFJLFNBQVM7QUFDbkQsWUFBTSxTQUFTLFNBQVMsc0JBQU8sT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFTLE1BQU0sb0JBQWUsT0FBTyxRQUFRLElBQUksT0FBTyxNQUFNLFVBQVU7QUFDaEksYUFBTztBQUFBLE9BRVAsTUFBTSxDQUFDLFFBQVE7QUFDZixZQUFNLFNBQVMsU0FBUyxzQkFBTyxPQUFPLEtBQUssT0FBTyxJQUFJLGNBQVMsTUFBTTtBQUNyRSxZQUFNO0FBQUE7QUFFUixRQUFJLGFBQU8sUUFBUCxtQkFBWSxRQUFRO0FBQ3ZCLGVBQVMsSUFBSSxHQUFHLElBQUksT0FBTyxJQUFJLFFBQVEsS0FBSztBQUMzQyxjQUFNLE1BQU0sT0FBTyxJQUFJO0FBQ3ZCLFlBQUksSUFBSSxLQUFLO0FBQ1osZ0JBQU0sRUFBRSxLQUFLLFlBQVksSUFBSTtBQUM3QixjQUFJLFNBQVM7QUFDWixrQkFBTSxVQUFVLElBQUksSUFBSSxJQUFJLFFBQVEsUUFBUSxPQUFPLFlBQVk7QUFDL0QsZ0JBQUksT0FBTyxjQUFjLFdBQVc7QUFDbkMsb0JBQU0sSUFBSSxNQUFNLDZCQUE2QjtBQUFBLG1FQUF5RixNQUFNO0FBQUE7QUFFN0ksbUJBQU8sY0FBYyxZQUFZO0FBQUE7QUFBQTtBQUduQyxZQUFJLFVBQUksUUFBSixtQkFBUyxTQUFTO0FBQ3JCLGdCQUFNLEVBQUUsS0FBSyxZQUFZLElBQUk7QUFDN0IsZ0JBQU0saUJBQWlCLElBQUksSUFBSSxJQUFJLFFBQVEsUUFBUSxPQUFPLFlBQVk7QUFDdEUsY0FBSSxPQUFPLGNBQWMsa0JBQWtCO0FBQzFDLGtCQUFNLElBQUksTUFDVCx3Q0FBd0M7QUFBQSwwRUFBZ0csTUFBTTtBQUFBO0FBR2hKLGlCQUFPLGNBQWMsbUJBQW1CO0FBQUE7QUFBQTtBQUFBO0FBSTNDLGFBQVMsTUFBTSxhQUFhO0FBQUEsTUFDM0I7QUFBQSxNQUNBLE9BQU8sT0FBTztBQUFBLE1BQ2QsU0FBUyxNQUFNLFdBQVc7QUFBQSxRQUN6QjtBQUFBLFFBQ0EsVUFBVSxJQUFJLElBQUksS0FBSyxNQUFNLGFBQWEsWUFBWTtBQUFBLFFBQ3REO0FBQUEsUUFDQSxNQUFNO0FBQUEsUUFDTjtBQUFBLFFBQ0EsVUFBVSxPQUFPLE1BQU07QUFBQSxRQUN2QjtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUE7QUFBQTtBQUFBO0FBTUosU0FBTyxFQUFFLFFBQVE7QUFBQTtBQUdsQixzQ0FBc0MsTUFBK0IsT0FBbUU7QUFDdkksUUFBTSxFQUFFLGFBQWEsU0FBUyxZQUFZLGVBQWU7QUFDekQsTUFBSSxDQUFDO0FBQVksVUFBTSxJQUFJLE1BQU07QUFDakMsUUFBTSxXQUFXLElBQUksSUFBSSxLQUFLLE1BQU0sYUFBYSxZQUFZO0FBQzdELFFBQU0sTUFBTyxNQUFNLFdBQVcsY0FBYyxjQUFjO0FBQzFELCtCQUE2QjtBQUM3QixRQUFNLE1BQU0sb0JBQW9CLFlBQVksYUFBYSxNQUFNO0FBQy9ELFFBQU0sa0JBQWtCLFlBQVksT0FBTyxLQUFLLElBQUk7QUFDcEQsUUFBTSxjQUFjLFdBQVcsTUFBTTtBQUNyQywrQkFBNkIsYUFBYTtBQUMxQyxTQUFPO0FBQUEsSUFDTixPQUFPLFlBQVksSUFBSSxDQUFDLGVBQWUsV0FBVyxVQUFVLE1BQU0sU0FBUyxXQUFXLFNBQVMsT0FBTztBQUFBLElBQ3RHLEtBQUssSUFBSTtBQUFBO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
|
@@ -10,6 +10,7 @@ import { getParamsAndProps } from "../ssr/index.js";
|
|
|
10
10
|
import { createResult } from "../ssr/result.js";
|
|
11
11
|
import { renderPage } from "../../runtime/server/index.js";
|
|
12
12
|
import { prepareOutDir } from "./fs.js";
|
|
13
|
+
import { vitePluginHoistedScripts } from "./vite-plugin-hoisted-scripts.js";
|
|
13
14
|
const MAX_CONCURRENT_RENDERS = 10;
|
|
14
15
|
function addPageName(pathname, opts) {
|
|
15
16
|
const pathrepl = opts.astroConfig.buildOptions.pageUrlFormat === "directory" ? "/index.html" : pathname === "/" ? "index.html" : ".html";
|
|
@@ -39,6 +40,9 @@ function* throttle(max, inPaths) {
|
|
|
39
40
|
yield tmp;
|
|
40
41
|
}
|
|
41
42
|
}
|
|
43
|
+
function getByFacadeId(facadeId, map) {
|
|
44
|
+
return map.get(facadeId) || map.get("/" + facadeId);
|
|
45
|
+
}
|
|
42
46
|
async function staticBuild(opts) {
|
|
43
47
|
const { allPages, astroConfig } = opts;
|
|
44
48
|
const pageInput = new Set();
|
|
@@ -50,7 +54,10 @@ async function staticBuild(opts) {
|
|
|
50
54
|
for (const polyfill of polyfills) {
|
|
51
55
|
jsInput.add(polyfill);
|
|
52
56
|
}
|
|
57
|
+
const internals = createBuildInternals();
|
|
53
58
|
for (const [component, pageData] of Object.entries(allPages)) {
|
|
59
|
+
const astroModuleURL = new URL("./" + component, astroConfig.projectRoot);
|
|
60
|
+
const astroModuleId = astroModuleURL.pathname;
|
|
54
61
|
const [renderers, mod] = pageData.preload;
|
|
55
62
|
const metadata = mod.$$metadata;
|
|
56
63
|
const topLevelImports = new Set([
|
|
@@ -58,14 +65,18 @@ async function staticBuild(opts) {
|
|
|
58
65
|
...metadata.hydrationDirectiveSpecifiers(),
|
|
59
66
|
...renderers.filter((renderer) => !!renderer.source).map((renderer) => renderer.source)
|
|
60
67
|
]);
|
|
68
|
+
const hoistedScripts = new Set(metadata.hoistedScriptPaths());
|
|
69
|
+
if (hoistedScripts.size) {
|
|
70
|
+
const moduleId = new URL("./hoisted.js", astroModuleURL + "/").pathname;
|
|
71
|
+
internals.hoistedScriptIdToHoistedMap.set(moduleId, hoistedScripts);
|
|
72
|
+
topLevelImports.add(moduleId);
|
|
73
|
+
}
|
|
61
74
|
for (const specifier of topLevelImports) {
|
|
62
75
|
jsInput.add(specifier);
|
|
63
76
|
}
|
|
64
|
-
let astroModuleId = new URL("./" + component, astroConfig.projectRoot).pathname;
|
|
65
77
|
pageInput.add(astroModuleId);
|
|
66
78
|
facadeIdToPageDataMap.set(astroModuleId, pageData);
|
|
67
79
|
}
|
|
68
|
-
const internals = createBuildInternals();
|
|
69
80
|
prepareOutDir(astroConfig);
|
|
70
81
|
const [ssrResult] = await Promise.all([ssrBuild(opts, internals, pageInput), clientBuild(opts, internals, jsInput)]);
|
|
71
82
|
await generatePages(ssrResult, opts, internals, facadeIdToPageDataMap);
|
|
@@ -87,7 +98,7 @@ async function ssrBuild(opts, internals, input) {
|
|
|
87
98
|
format: "esm"
|
|
88
99
|
}
|
|
89
100
|
},
|
|
90
|
-
target: "
|
|
101
|
+
target: "esnext"
|
|
91
102
|
},
|
|
92
103
|
plugins: [
|
|
93
104
|
vitePluginNewBuild(input, internals, "mjs"),
|
|
@@ -100,7 +111,8 @@ async function ssrBuild(opts, internals, input) {
|
|
|
100
111
|
root: viteConfig.root,
|
|
101
112
|
envPrefix: "PUBLIC_",
|
|
102
113
|
server: viteConfig.server,
|
|
103
|
-
base: astroConfig.buildOptions.site ? new URL(astroConfig.buildOptions.site).pathname : "/"
|
|
114
|
+
base: astroConfig.buildOptions.site ? new URL(astroConfig.buildOptions.site).pathname : "/",
|
|
115
|
+
ssr: viteConfig.ssr
|
|
104
116
|
});
|
|
105
117
|
}
|
|
106
118
|
async function clientBuild(opts, internals, input) {
|
|
@@ -122,10 +134,11 @@ async function clientBuild(opts, internals, input) {
|
|
|
122
134
|
},
|
|
123
135
|
preserveEntrySignatures: "exports-only"
|
|
124
136
|
},
|
|
125
|
-
target: "
|
|
137
|
+
target: "esnext"
|
|
126
138
|
},
|
|
127
139
|
plugins: [
|
|
128
140
|
vitePluginNewBuild(input, internals, "js"),
|
|
141
|
+
vitePluginHoistedScripts(internals),
|
|
129
142
|
rollupPluginAstroBuildCSS({
|
|
130
143
|
internals
|
|
131
144
|
}),
|
|
@@ -170,17 +183,19 @@ async function generatePage(output, opts, internals, facadeIdToPageDataMap, rend
|
|
|
170
183
|
const { astroConfig } = opts;
|
|
171
184
|
let url = new URL("./" + output.fileName, astroConfig.dist);
|
|
172
185
|
const facadeId = output.facadeModuleId;
|
|
173
|
-
let pageData =
|
|
186
|
+
let pageData = getByFacadeId(facadeId, facadeIdToPageDataMap);
|
|
174
187
|
if (!pageData) {
|
|
175
188
|
throw new Error(`Unable to find a PageBuildData for the Astro page: ${facadeId}. There are the PageBuilDatas we have ${Array.from(facadeIdToPageDataMap.keys()).join(", ")}`);
|
|
176
189
|
}
|
|
177
|
-
|
|
190
|
+
const linkIds = getByFacadeId(facadeId, internals.facadeIdToAssetsMap) || [];
|
|
191
|
+
const hoistedId = getByFacadeId(facadeId, internals.facadeIdToHoistedEntryMap) || null;
|
|
178
192
|
let compiledModule = await import(url.toString());
|
|
179
193
|
let Component = compiledModule.default;
|
|
180
194
|
const generationOptions = {
|
|
181
195
|
pageData,
|
|
182
196
|
internals,
|
|
183
197
|
linkIds,
|
|
198
|
+
hoistedId,
|
|
184
199
|
Component,
|
|
185
200
|
renderers
|
|
186
201
|
};
|
|
@@ -194,8 +209,8 @@ async function generatePage(output, opts, internals, facadeIdToPageDataMap, rend
|
|
|
194
209
|
}
|
|
195
210
|
}
|
|
196
211
|
async function generatePath(pathname, opts, gopts) {
|
|
197
|
-
const { astroConfig, logging, origin,
|
|
198
|
-
const { Component, internals, linkIds, pageData, renderers } = gopts;
|
|
212
|
+
const { astroConfig, logging, origin, routeCache } = opts;
|
|
213
|
+
const { Component, internals, linkIds, hoistedId, pageData, renderers } = gopts;
|
|
199
214
|
addPageName(pathname, opts);
|
|
200
215
|
const [, mod] = pageData.preload;
|
|
201
216
|
try {
|
|
@@ -209,14 +224,23 @@ async function generatePath(pathname, opts, gopts) {
|
|
|
209
224
|
});
|
|
210
225
|
debug(logging, "generate", `Generating: ${pathname}`);
|
|
211
226
|
const rootpath = new URL(astroConfig.buildOptions.site || "http://localhost/").pathname;
|
|
212
|
-
const
|
|
213
|
-
result.links = new Set(linkIds.map((href) => ({
|
|
227
|
+
const links = new Set(linkIds.map((href) => ({
|
|
214
228
|
props: {
|
|
215
229
|
rel: "stylesheet",
|
|
216
230
|
href: npath.posix.join(rootpath, href)
|
|
217
231
|
},
|
|
218
232
|
children: ""
|
|
219
233
|
})));
|
|
234
|
+
const scripts = hoistedId ? new Set([
|
|
235
|
+
{
|
|
236
|
+
props: {
|
|
237
|
+
type: "module",
|
|
238
|
+
src: npath.posix.join(rootpath, hoistedId)
|
|
239
|
+
},
|
|
240
|
+
children: ""
|
|
241
|
+
}
|
|
242
|
+
]) : new Set();
|
|
243
|
+
const result = createResult({ astroConfig, logging, origin, params, pathname, renderers, links, scripts });
|
|
220
244
|
result.resolve = async (specifier) => {
|
|
221
245
|
const hashedFilePath = internals.entrySpecifierToBundleMap.get(specifier);
|
|
222
246
|
if (typeof hashedFilePath !== "string") {
|
|
@@ -303,4 +327,4 @@ export {
|
|
|
303
327
|
staticBuild,
|
|
304
328
|
vitePluginNewBuild
|
|
305
329
|
};
|
|
306
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
330
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/core/build/static-build.ts"],
  "mappings": "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",
  "names": []
}

|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
function virtualHoistedEntry(id) {
|
|
2
|
+
return id.endsWith(".astro/hoisted.js") || id.endsWith(".md/hoisted.js");
|
|
3
|
+
}
|
|
4
|
+
function vitePluginHoistedScripts(internals) {
|
|
5
|
+
return {
|
|
6
|
+
name: "@astro/rollup-plugin-astro-hoisted-scripts",
|
|
7
|
+
resolveId(id) {
|
|
8
|
+
if (virtualHoistedEntry(id)) {
|
|
9
|
+
return id;
|
|
10
|
+
}
|
|
11
|
+
},
|
|
12
|
+
load(id) {
|
|
13
|
+
if (virtualHoistedEntry(id)) {
|
|
14
|
+
let code = "";
|
|
15
|
+
for (let path of internals.hoistedScriptIdToHoistedMap.get(id)) {
|
|
16
|
+
code += `import "${path}";`;
|
|
17
|
+
}
|
|
18
|
+
return {
|
|
19
|
+
code
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
return void 0;
|
|
23
|
+
},
|
|
24
|
+
async generateBundle(_options, bundle) {
|
|
25
|
+
for (const [id, output] of Object.entries(bundle)) {
|
|
26
|
+
if (output.type === "chunk" && output.facadeModuleId && virtualHoistedEntry(output.facadeModuleId)) {
|
|
27
|
+
const facadeId = output.facadeModuleId;
|
|
28
|
+
const filename = facadeId.slice(0, facadeId.length - "/hoisted.js".length);
|
|
29
|
+
internals.facadeIdToHoistedEntryMap.set(filename, id);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
export {
|
|
36
|
+
vitePluginHoistedScripts
|
|
37
|
+
};
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvYnVpbGQvdml0ZS1wbHVnaW4taG9pc3RlZC1zY3JpcHRzLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBR0EsNkJBQTZCLElBQVk7QUFDeEMsU0FBTyxHQUFHLFNBQVMsd0JBQXdCLEdBQUcsU0FBUztBQUFBO0FBR2pELGtDQUFrQyxXQUF1QztBQUMvRSxTQUFPO0FBQUEsSUFDTixNQUFNO0FBQUEsSUFFTixVQUFVLElBQUk7QUFDYixVQUFJLG9CQUFvQixLQUFLO0FBQzVCLGVBQU87QUFBQTtBQUFBO0FBQUEsSUFJVCxLQUFLLElBQUk7QUFDUixVQUFJLG9CQUFvQixLQUFLO0FBQzVCLFlBQUksT0FBTztBQUNYLGlCQUFTLFFBQVEsVUFBVSw0QkFBNEIsSUFBSSxLQUFNO0FBQ2hFLGtCQUFRLFdBQVc7QUFBQTtBQUVwQixlQUFPO0FBQUEsVUFDTjtBQUFBO0FBQUE7QUFHRixhQUFPO0FBQUE7QUFBQSxVQUdGLGVBQWUsVUFBVSxRQUFRO0FBR3RDLGlCQUFXLENBQUMsSUFBSSxXQUFXLE9BQU8sUUFBUSxTQUFTO0FBQ2xELFlBQUksT0FBTyxTQUFTLFdBQVcsT0FBTyxrQkFBa0Isb0JBQW9CLE9BQU8saUJBQWlCO0FBQ25HLGdCQUFNLFdBQVcsT0FBTztBQUN4QixnQkFBTSxXQUFXLFNBQVMsTUFBTSxHQUFHLFNBQVMsU0FBUyxjQUFjO0FBQ25FLG9CQUFVLDBCQUEwQixJQUFJLFVBQVU7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
|
package/dist/core/config.js
CHANGED
|
@@ -47,19 +47,51 @@ async function validateConfig(userConfig, root) {
|
|
|
47
47
|
function addTrailingSlash(str) {
|
|
48
48
|
return str.replace(/\/*$/, "/");
|
|
49
49
|
}
|
|
50
|
-
|
|
51
|
-
|
|
50
|
+
function resolveFlags(flags) {
|
|
51
|
+
return {
|
|
52
|
+
projectRoot: typeof flags.projectRoot === "string" ? flags.projectRoot : void 0,
|
|
53
|
+
site: typeof flags.site === "string" ? flags.site : void 0,
|
|
54
|
+
sitemap: typeof flags.sitemap === "boolean" ? flags.sitemap : void 0,
|
|
55
|
+
port: typeof flags.port === "number" ? flags.port : void 0,
|
|
56
|
+
config: typeof flags.config === "string" ? flags.config : void 0,
|
|
57
|
+
hostname: typeof flags.hostname === "string" ? flags.hostname : void 0,
|
|
58
|
+
experimentalStaticBuild: typeof flags.experimentalStaticBuild === "boolean" ? flags.experimentalStaticBuild : false,
|
|
59
|
+
drafts: typeof flags.drafts === "boolean" ? flags.drafts : false
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
function mergeCLIFlags(astroConfig, flags) {
|
|
63
|
+
astroConfig.buildOptions = astroConfig.buildOptions || {};
|
|
64
|
+
astroConfig.devOptions = astroConfig.devOptions || {};
|
|
65
|
+
if (typeof flags.sitemap === "boolean")
|
|
66
|
+
astroConfig.buildOptions.sitemap = flags.sitemap;
|
|
67
|
+
if (typeof flags.site === "string")
|
|
68
|
+
astroConfig.buildOptions.site = flags.site;
|
|
69
|
+
if (typeof flags.port === "number")
|
|
70
|
+
astroConfig.devOptions.port = flags.port;
|
|
71
|
+
if (typeof flags.hostname === "string")
|
|
72
|
+
astroConfig.devOptions.hostname = flags.hostname;
|
|
73
|
+
if (typeof flags.experimentalStaticBuild === "boolean")
|
|
74
|
+
astroConfig.buildOptions.experimentalStaticBuild = flags.experimentalStaticBuild;
|
|
75
|
+
if (typeof flags.drafts === "boolean")
|
|
76
|
+
astroConfig.buildOptions.drafts = flags.drafts;
|
|
77
|
+
return astroConfig;
|
|
78
|
+
}
|
|
79
|
+
async function loadConfig(configOptions) {
|
|
80
|
+
const root = configOptions.cwd ? path.resolve(configOptions.cwd) : process.cwd();
|
|
81
|
+
const flags = resolveFlags(configOptions.flags || {});
|
|
52
82
|
let userConfig = {};
|
|
53
83
|
let userConfigPath;
|
|
54
|
-
if (
|
|
55
|
-
userConfigPath = /^\.*\//.test(
|
|
84
|
+
if (flags == null ? void 0 : flags.config) {
|
|
85
|
+
userConfigPath = /^\.*\//.test(flags.config) ? flags.config : `./${flags.config}`;
|
|
56
86
|
userConfigPath = fileURLToPath(new URL(userConfigPath, `file://${root}/`));
|
|
57
87
|
}
|
|
58
88
|
const config = await load("astro", { mustExist: false, cwd: root, filePath: userConfigPath });
|
|
59
89
|
if (config) {
|
|
60
90
|
userConfig = config.value;
|
|
61
91
|
}
|
|
62
|
-
|
|
92
|
+
const mergedConfig = mergeCLIFlags(userConfig, flags);
|
|
93
|
+
const validatedConfig = await validateConfig(mergedConfig, root);
|
|
94
|
+
return validatedConfig;
|
|
63
95
|
}
|
|
64
96
|
function formatConfigError(err) {
|
|
65
97
|
const errorList = err.issues.map((issue) => ` ! ${colors.bold(issue.path.join("."))} ${colors.red(issue.message + ".")}`);
|
|
@@ -72,4 +104,4 @@ export {
|
|
|
72
104
|
loadConfig,
|
|
73
105
|
validateConfig
|
|
74
106
|
};
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
107
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NvcmUvY29uZmlnLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBR0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBRUEsS0FBSyxJQUFJLENBQUM7QUFFSCxNQUFNLG9CQUFvQixFQUFFLE9BQU87QUFBQSxFQUN6QyxhQUFhLEVBQ1gsU0FDQSxXQUNBLFFBQVEsS0FDUixVQUFVLENBQUMsUUFBUSxJQUFJLElBQUk7QUFBQSxFQUM3QixLQUFLLEVBQ0gsU0FDQSxXQUNBLFFBQVEsU0FDUixVQUFVLENBQUMsUUFBUSxJQUFJLElBQUk7QUFBQSxFQUM3QixPQUFPLEVBQ0wsU0FDQSxXQUNBLFFBQVEsZUFDUixVQUFVLENBQUMsUUFBUSxJQUFJLElBQUk7QUFBQSxFQUM3QixTQUFTLEVBQ1AsU0FDQSxXQUNBLFFBQVEsaUJBQ1IsVUFBVSxDQUFDLFFBQVEsSUFBSSxJQUFJO0FBQUEsRUFDN0IsUUFBUSxFQUNOLFNBQ0EsV0FDQSxRQUFRLFlBQ1IsVUFBVSxDQUFDLFFBQVEsSUFBSSxJQUFJO0FBQUEsRUFDN0IsTUFBTSxFQUNKLFNBQ0EsV0FDQSxRQUFRLFVBQ1IsVUFBVSxDQUFDLFFBQVEsSUFBSSxJQUFJO0FBQUEsRUFDN0IsV0FBVyxFQUFFLE1BQU0sRUFBRSxVQUFVLFdBQVcsUUFBUSxDQUFDLDRCQUE0Qix5QkFBeUIsMkJBQTJCO0FBQUEsRUFDbkksaUJBQWlCLEVBQ2YsT0FBTztBQUFBLElBQ1AsV0FBVyxFQUFFLFVBQVU7QUFBQSxJQUN2QixLQUFLLEVBQUUsVUFBVTtBQUFBLElBQ2pCLFFBQVEsRUFBRSxNQUFNLFdBQVcsUUFBUSxDQUFDLDRCQUE0QjtBQUFBLEtBRWhFLFNBQ0EsV0FDQSxRQUFRO0FBQUEsRUFDVixjQUFjLEVBQ1osT0FBTztBQUFBLElBQ1AsTUFBTSxFQUFFLFNBQVM7QUFBQSxJQUNqQixTQUFTLEVBQUUsVUFBVSxXQUFXLFFBQVE7QUFBQSxJQUN4QyxlQUFlLEVBQ2IsTUFBTSxDQUFDLEVBQUUsUUFB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
|
package/dist/core/ssr/index.js
CHANGED
|
@@ -154,7 +154,21 @@ async function render(renderers, mod, ssrOpts) {
|
|
|
154
154
|
throw new Error(`Expected an exported Astro component but received typeof ${typeof Component}`);
|
|
155
155
|
if (!Component.isAstroComponentFactory)
|
|
156
156
|
throw new Error(`Unable to SSR non-Astro component (${route == null ? void 0 : route.component})`);
|
|
157
|
-
const
|
|
157
|
+
const scripts = astroConfig.buildOptions.experimentalStaticBuild ? new Set(Array.from(mod.$$metadata.hoistedScriptPaths()).map((src) => ({
|
|
158
|
+
props: { type: "module", src },
|
|
159
|
+
children: ""
|
|
160
|
+
}))) : new Set();
|
|
161
|
+
if (mode === "development" && astroConfig.buildOptions.experimentalStaticBuild) {
|
|
162
|
+
scripts.add({
|
|
163
|
+
props: { type: "module", src: "/@vite/client" },
|
|
164
|
+
children: ""
|
|
165
|
+
});
|
|
166
|
+
scripts.add({
|
|
167
|
+
props: { type: "module", src: new URL("../../runtime/client/hmr.js", import.meta.url).pathname },
|
|
168
|
+
children: ""
|
|
169
|
+
});
|
|
170
|
+
}
|
|
171
|
+
const result = createResult({ astroConfig, logging, origin, params, pathname, renderers, scripts });
|
|
158
172
|
result.resolve = async (s) => {
|
|
159
173
|
if (astroConfig.buildOptions.experimentalStaticBuild) {
|
|
160
174
|
const [, resolvedPath] = await viteServer.moduleGraph.resolveUrl(s);
|
|
@@ -165,7 +179,7 @@ async function render(renderers, mod, ssrOpts) {
|
|
|
165
179
|
};
|
|
166
180
|
let html = await renderPage(result, Component, pageProps, null);
|
|
167
181
|
const tags = [];
|
|
168
|
-
if (mode === "development") {
|
|
182
|
+
if (mode === "development" && !astroConfig.buildOptions.experimentalStaticBuild) {
|
|
169
183
|
tags.push({
|
|
170
184
|
tag: "script",
|
|
171
185
|
attrs: { type: "module" },
|
|
@@ -226,4 +240,4 @@ export {
|
|
|
226
240
|
render,
|
|
227
241
|
ssr
|
|
228
242
|
};
|
|
229
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
243
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvc3NyL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7OztBQWtCQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBRUE7QUFDQTtBQUNBO0FBRUEsTUFBTSxpQkFBaUI7QUF1QnZCLE1BQU0sUUFBUSxJQUFJO0FBR2xCLCtCQUErQixZQUFnQyxVQUFrQixhQUEwQjtBQUMxRyxRQUFNLG1CQUF3QjtBQUk5QixRQUFNO0FBQUEsSUFDTCxTQUFTLEVBQUUsTUFBTSxRQUFRLFdBQVcsb0JBQW9CO0FBQUEsTUFDckQsTUFBTSxPQUFPLGtCQUFrQixVQUFVO0FBRTdDLG1CQUFpQixPQUFPO0FBQ3hCLE1BQUk7QUFBUSxxQkFBaUIsU0FBUyxLQUFLLE1BQU0sS0FBSyxVQUFVO0FBQ2hFLG1CQUFpQixjQUFjLEtBQUssTUFBTSxLQUFLLFVBQVU7QUFDekQsTUFBSSxNQUFNLFFBQVE7QUFBcUIscUJBQWlCLHFCQUFxQixtQkFBbUIsSUFBSSxDQUFDLFFBQWdCLEtBQUssTUFBTSxLQUFLLFVBQVU7QUFDL0ksTUFBSSxNQUFNLFFBQVE7QUFBWSxxQkFBaUIsWUFBWSxVQUFVLElBQUksQ0FBQyxRQUFnQixLQUFLLE1BQU0sS0FBSyxVQUFVO0FBQ3BILFFBQU0sRUFBRSxRQUFRLE1BQU0sV0FBVyxZQUFZLG1CQUFtQixpQkFBaUI7QUFDakYsUUFBTSxFQUFFLFNBQVMsZ0JBQWdCLE1BQU0sV0FBVyxjQUFjO0FBQ2hFLG1CQUFpQixNQUFNO0FBRXZCLFFBQU0sb0JBQThCO0FBQ3BDLFNBQU87QUFBQTtBQUdSLGdDQUFnQyxZQUFnQyxhQUErQztBQUM5RyxRQUFNLE1BQWdCLFlBQVk7QUFDbEMsUUFBTSxZQUFZLE1BQU0sUUFBUSxJQUMvQixJQUFJLElBQUksQ0FBQyxhQUFhO0FBQ3JCLFFBQUksTUFBTSxJQUFJO0FBQVcsYUFBTyxNQUFNLElBQUk7QUFDMUMsUUFBSSxVQUFVLGdCQUFn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
|