astro 0.24.0-next.2 → 0.24.0
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 +4 -3
- package/dist/core/config.js +5 -1
- package/dist/core/dev/index.js +8 -10
- package/dist/core/dev/util.js +25 -3
- package/dist/core/messages.js +27 -13
- package/dist/core/preview/index.js +8 -8
- package/dist/core/preview/util.js +16 -0
- package/dist/core/render/dev/index.js +3 -2
- package/dist/types/@types/astro.d.ts +25 -4
- package/dist/types/core/config.d.ts +5 -0
- package/dist/types/core/dev/util.d.ts +6 -1
- package/dist/types/core/messages.d.ts +6 -4
- package/dist/types/core/preview/index.d.ts +1 -1
- package/dist/types/core/preview/util.d.ts +2 -0
- package/package.json +31 -31
package/dist/cli/index.js
CHANGED
|
@@ -25,6 +25,7 @@ function printHelp() {
|
|
|
25
25
|
linebreak();
|
|
26
26
|
title("Flags");
|
|
27
27
|
table([
|
|
28
|
+
["--host [optional IP]", "Expose server on network"],
|
|
28
29
|
["--config <path>", "Specify the path to the Astro config file."],
|
|
29
30
|
["--project-root <path>", "Specify the path to the project root folder."],
|
|
30
31
|
["--no-sitemap", "Disable sitemap generation (build only)."],
|
|
@@ -38,7 +39,7 @@ function printHelp() {
|
|
|
38
39
|
console.log();
|
|
39
40
|
}
|
|
40
41
|
function headline(name, tagline) {
|
|
41
|
-
console.log(` ${colors.bgGreen(colors.black(` ${name} `))} ${colors.green(`v${"0.24.0
|
|
42
|
+
console.log(` ${colors.bgGreen(colors.black(` ${name} `))} ${colors.green(`v${"0.24.0"}`)} ${tagline}`);
|
|
42
43
|
}
|
|
43
44
|
function title(label) {
|
|
44
45
|
console.log(` ${colors.bgWhite(colors.black(` ${label} `))}`);
|
|
@@ -64,7 +65,7 @@ function printHelp() {
|
|
|
64
65
|
}
|
|
65
66
|
}
|
|
66
67
|
async function printVersion() {
|
|
67
|
-
const version = "0.24.0
|
|
68
|
+
const version = "0.24.0";
|
|
68
69
|
console.log();
|
|
69
70
|
console.log(` ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
|
|
70
71
|
}
|
|
@@ -161,4 +162,4 @@ function throwAndExit(err) {
|
|
|
161
162
|
export {
|
|
162
163
|
cli
|
|
163
164
|
};
|
|
164
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
165
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NsaS9pbmRleC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUdBO0FBRUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFNQSxxQkFBcUI7QUFDcEIsWUFBVTtBQUNWLFdBQVMsU0FBUyxrQ0FBa0M7QUFDcEQsWUFBVTtBQUNWLFFBQU0sVUFBVTtBQUNoQixRQUNDO0FBQUEsSUFDQyxDQUFDLE9BQU8sZ0NBQWdDO0FBQUEsSUFDeEMsQ0FBQyxTQUFTLDZDQUE2QztBQUFBLElBQ3ZELENBQUMsV0FBVyw4Q0FBOEM7QUFBQSxJQUMxRCxDQUFDLFNBQVMsZ0NBQWdDO0FBQUEsSUFDMUMsQ0FBQyxhQUFhLG1DQUFtQztBQUFBLElBQ2pELENBQUMsVUFBVSx5QkFBeUI7QUFBQSxFQUNyQyxHQUNBLEVBQUUsU0FBUyxJQUFJLFFBQVEsV0FBVyxDQUNuQztBQUNBLFlBQVU7QUFDVixRQUFNLE9BQU87QUFDYixRQUNDO0FBQUEsSUFDQyxDQUFDLHdCQUF3QiwwQkFBMEI7QUFBQSxJQUNuRCxDQUFDLG1CQUFtQiw0Q0FBNEM7QUFBQSxJQUNoRSxDQUFDLHlCQUF5Qiw4Q0FBOEM7QUFBQSxJQUN4RSxDQUFDLGdCQUFnQiwwQ0FBMEM7QUFBQSxJQUMzRCxDQUFDLGtCQUFrQix3Q0FBd0M7QUFBQSxJQUMzRCxDQUFDLHNCQUFzQix5QkFBeUI7QUFBQSxJQUNoRCxDQUFDLFlBQVksNENBQTRDO0FBQUEsSUFDekQsQ0FBQyxhQUFhLHdCQUF3QjtBQUFBLElBQ3RDLENBQUMsWUFBWSxpQkFBaUI7QUFBQSxFQUMvQixHQUNBLEVBQUUsU0FBUyxJQUFJLFFBQVEsS0FBSyxDQUM3QjtBQUdBLHVCQUFxQjtBQUNwQixZQUFRLElBQUk7QUFBQSxFQUNiO0FBRUEsb0JBQWtCLE1BQWMsU0FBaUI7QUFDaEQsWUFBUSxJQUFJLEtBQUssT0FBTyxRQUFRLE9BQU8sTUFBTSxJQUFJLE9BQU8sQ0FBQyxLQUFLLE9BQU8sTUFB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
|
package/dist/core/config.js
CHANGED
|
@@ -26,6 +26,7 @@ const AstroConfigSchema = z.object({
|
|
|
26
26
|
drafts: z.boolean().optional().default(false)
|
|
27
27
|
}).optional().default({}),
|
|
28
28
|
devOptions: z.object({
|
|
29
|
+
host: z.union([z.string(), z.boolean()]).optional().default(false),
|
|
29
30
|
hostname: z.string().optional().default("localhost"),
|
|
30
31
|
port: z.number().optional().default(3e3),
|
|
31
32
|
trailingSlash: z.union([z.literal("always"), z.literal("never"), z.literal("ignore")]).optional().default("ignore")
|
|
@@ -57,6 +58,7 @@ function resolveFlags(flags) {
|
|
|
57
58
|
port: typeof flags.port === "number" ? flags.port : void 0,
|
|
58
59
|
config: typeof flags.config === "string" ? flags.config : void 0,
|
|
59
60
|
hostname: typeof flags.hostname === "string" ? flags.hostname : void 0,
|
|
61
|
+
host: typeof flags.host === "string" || typeof flags.host === "boolean" ? flags.host : void 0,
|
|
60
62
|
legacyBuild: typeof flags.legacyBuild === "boolean" ? flags.legacyBuild : false,
|
|
61
63
|
experimentalSsr: typeof flags.experimentalSsr === "boolean" ? flags.experimentalSsr : false,
|
|
62
64
|
drafts: typeof flags.drafts === "boolean" ? flags.drafts : false
|
|
@@ -71,6 +73,8 @@ function mergeCLIFlags(astroConfig, flags) {
|
|
|
71
73
|
astroConfig.buildOptions.site = flags.site;
|
|
72
74
|
if (typeof flags.port === "number")
|
|
73
75
|
astroConfig.devOptions.port = flags.port;
|
|
76
|
+
if (typeof flags.host === "string" || typeof flags.host === "boolean")
|
|
77
|
+
astroConfig.devOptions.host = flags.host;
|
|
74
78
|
if (typeof flags.hostname === "string")
|
|
75
79
|
astroConfig.devOptions.hostname = flags.hostname;
|
|
76
80
|
if (typeof flags.legacyBuild === "boolean")
|
|
@@ -113,4 +117,4 @@ export {
|
|
|
113
117
|
loadConfig,
|
|
114
118
|
validateConfig
|
|
115
119
|
};
|
|
116
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
120
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NvcmUvY29uZmlnLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBR0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBRUEsS0FBSyxJQUFJLENBQUMsY0FBYyxDQUFDO0FBRWxCLE1BQU0sb0JBQW9CLEVBQUUsT0FBTztBQUFBLEVBQ3pDLGFBQWEsRUFDWCxPQUFPLEVBQ1AsU0FBUyxFQUNULFFBQVEsR0FBRyxFQUNYLFVBQVUsQ0FBQyxRQUFRLElBQUksSUFBSSxHQUFHLENBQUM7QUFBQSxFQUNqQyxLQUFLLEVBQ0gsT0FBTyxFQUNQLFNBQVMsRUFDVCxRQUFRLE9BQU8sRUFDZixVQUFVLENBQUMsUUFBUSxJQUFJLElBQUksR0FBRyxDQUFDO0FBQUEsRUFDakMsT0FBTyxFQUNMLE9BQU8sRUFDUCxTQUFTLEVBQ1QsUUFBUSxhQUFhLEVBQ3JCLFVBQVUsQ0FBQyxRQUFRLElBQUksSUFBSSxHQUFHLENBQUM7QUFBQSxFQUNqQyxRQUFRLEVBQ04sT0FBTyxFQUNQLFNBQVMsRUFDVCxRQUFRLFVBQVUsRUFDbEIsVUFBVSxDQUFDLFFBQVEsSUFBSSxJQUFJLEdBQUcsQ0FBQztBQUFBLEVBQ2pDLE1BQU0sRUFDSixPQUFPLEVBQ1AsU0FBUyxFQUNULFFBQVEsUUFBUSxFQUNoQixVQUFVLENBQUMsUUFBUSxJQUFJLElBQUksR0FBRyxDQUFDO0FBQUEsRUFDakMsV0FBVyxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsRUFBRSxTQUFTLEVBQUUsUUFBUSxDQUFDLDRCQUE0Qix5QkFBeUIsMkJBQTJCLDBCQUEwQixDQUFDO0FBQUEsRUFDOUosaUJBQWlCLEVBQ2YsT0FBTztBQUFBLElBQ1AsUUFBUSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsUUFBUSxDQUFDLDRCQUE0QixDQUFDLENBQUMsQ0FBQztBQUFBLEVBQ3BFLENBQUMsRUFDQSxPQUFPLEVBQ1AsU0FBUyxFQUNULFFBQVEsQ0FBQyxDQUFDO0FBQUEsRUFDWixjQUFjLEVBQ1osT0FBTztBQUFBLElBQ1AsTUFBTSxFQUNKLE9BQU8sRUFDUCxTQUFTLEVBQ1QsVUFBVSxDQUFDLFFBQVMsTUFBTSxpQkFBaUIsR0FBRyxJQUFJLEdBQUk7QUFBQSxJQUN4RCxlQUFlLEVBQUUsU0FBUyxFQUFFLFNBQVM7QUFBQSxJQUNyQyxTQUFTLEVBQUUsUUFBUSxFQUFFLFNBQVMsRUFBRSxRQUFRLElBQUk7QUFBQSxJQUM1QyxlQUFlLEVBQ2IsTUFBTSxDQUFDLEVBQUUsUUFBUSxNQUFNLEdBQUcsRUFBRSxRQUFRLFdBQVcsQ0FBQyxDQUFDLEVBQ2pELFNBQVMsRUFDVCxRQUFRLFdBQVc7QUFBQSxJQUNyQixhQUFhLEVBQUUsUUFBUSxFQUFFLFNBQVMsRUFBRSxRQUFRLEtBQUs7QUFBQSxJQUNqRCx5QkFBeUIsRUFBRSxRQUFRLEVBQUUsU0FBUyxFQUFFLFFBQVEsSUFBSTtBQUFBLElBQzVELGlCQUFpQixFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsUUFBUSxLQUFLO0FBQUEsSUFDckQsUUFBUSxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsUUFBUSxLQUFLO0FBQUEsRUFDN0MsQ0FBQyxFQUNBLFNBQVMsRUFDVCxRQUFRLENBQUMsQ0FBQztBQUFBLEVBQ1osWUFBWSxFQUNWLE9BQU87QUFBQSxJQUNQLE1BQU0sRUFBRSxNQUFNLENBQUMsRUFBRSxPQUFPLEdBQUcsRUFBRSxRQUFRLENBQUMsQ0FBQyxFQUFFLFNBQVMsRUFBRSxRQUFRLEtBQUs7QUFBQSxJQUNqRSxVQUFVLEVBQUUsT0FBTyxFQUFFLFNBQVMsRUFBRSxRQUFRLFdBQVc7QUFBQSxJQUNuRCxNQUFNLEVBQUUsT0FBTyxFQUFFLFNBQVMsRUFBRSxRQUFRLEdBQUk7QUFBQSxJQUN4QyxlQUFlLEVBQ2IsTUFBTSxDQUFDLEVBQUUsUUFBUSxRQUFRLEdBQUcsRUFBRSxRQUFRLE9BQU8sR0FBRyxFQUFFLFFBQVEsUUFBUSxDQUFDLENBQUMsRUFDcEUsU0FBUyxFQUNULFFBQVEsUUFBUTtBQUFBLEVBQ25CLENBQUMsRUFDQSxTQUFTLEVBQ1QsUUFBUSxDQUFDLENBQUM7QUFBQSxFQUNaLE1BQU0sRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLFFBQVEsQ0FBQyxDQUFDO0FBQ3BDLENBQUM7QUFHRCw4QkFBcUMsWUFBaUIsTUFBb0M7QUFDekYsUUFBTSxtQkFBbUIsY0FBYyxPQUFPLEtBQUssR0FBRztBQUd0RCxRQUFNLDRCQUE0QixrQkFBa0IsT0FBTztBQUFBLElBQzFELGFBQWEsRUFDWCxPQUFPLEVBQ1AsUUFBUSxHQUFHLEVBQ1gsVUFBVSxDQUFDLFFBQVEsSUFBSSxJQUFJLGlCQUFpQixHQUFHLEdBQUcsZ0JBQWdCLENBQUM7QUFBQSxJQUNyRSxLQUFLLEVBQ0gsT0FBTyxFQUNQLFFBQVEsT0FBTyxFQUNmLFVBQVUsQ0FBQyxRQUFRLElBQUksSUFBSSxpQkFBaUIsR0FBRyxHQUFHLGdCQUFnQixDQUFDO0FBQUEsSUFDckUsT0FBTyxFQUNMLE9BQU8sRUFDUCxRQUFRLGFBQWEsRUFDckIsVUFBVSxDQUFDLFFBQVEsSUFBSSxJQUFJLGlCQUFpQixHQUFHLEdBQUcsZ0JBQWdCLENBQUM7QUFBQSxJQUNyRSxRQUFRLEVBQ04sT0FBTyxFQUNQLFFBQVEsVUFBVSxFQUNsQixVQUFVLENBQUMsUUFBUSxJQUFJLElBQUksaUJBQWlCLEdBQUcsR0FBRyxnQkFBZ0IsQ0FBQztBQUFBLElBQ3JFLE1BQU0sRUFDSixPQUFPLEVBQ1AsUUFBUSxRQUFRLEVBQ2hCLFVBQVUsQ0FBQyxRQUFRLElBQUksSUFBSSxpQkFBaUIsR0FBRyxHQUFHLGdCQUFnQixDQUFDO0FBQUEsRUFDdEUsQ0FBQztBQUNELFNBQU8sMEJBQTBCLFdBQVcsVUFBVTtBQUN2RDtBQUdBLDBCQUEwQixLQUFxQjtBQUM5QyxTQUFPLElBQUksUUFBUSxRQUFRLEdBQUc7QUFDL0I7QUFHQSxzQkFBc0IsT0FBaUM7QUFDdEQsTUFBSSxNQUFNLHlCQUF5QjtBQUVsQyxZQUFRLEtBQUssMklBQTJJO0FBQUEsRUFDeko7QUFDQSxTQUFPO0FBQUEsSUFDTixhQUFhLE9BQU8sTUFBTSxnQkFBZ0IsV0FBVyxNQUFNLGNBQWM7QUFBQSxJQUN6RSxNQUFNLE9BQU8sTUFBTSxTQUFTLFdBQVcsTUFBTSxPQUFPO0FBQUEsSUFDcEQsU0FBUyxPQUFPLE1BQU0sWUFBWSxZQUFZLE1BQU0sVUFBVTtBQUFBLElBQzlELE1BQU0sT0FBTyxNQUFNLFNBQVMsV0FBVyxNQUFNLE9BQU87QUFBQSxJQUNwRCxRQUFRLE9BQU8sTUFBTSxXQUFXLFdBQVcsTUFBTSxTQUFTO0FBQUEsSUFDMUQsVUFBVSxPQUFPLE1BQU0sYUFBYSxXQUFXLE1BQU0sV0FBVztBQUFBLElBQ2hFLE1BQU0sT0FBTyxNQUFNLFNBQVMsWUFBWSxPQUFPLE1BQU0sU0FBUyxZQUFZLE1BQU0sT0FBTztBQUFBLElBQ3ZGLGFBQWEsT0FBTyxNQUFNLGdCQUFnQixZQUFZLE1BQU0sY0FBYztBQUFBLElBQzFFLGlCQUFpQixPQUFPLE1BQU0sb0JBQW9CLFlBQVksTUFBTSxrQkFBa0I7QUFBQSxJQUN0RixRQUFRLE9BQU8sTUFBTSxXQUFXLFlBQVksTUFBTSxTQUFTO0FBQUEsRUFDNUQ7QUFDRDtBQUdBLHVCQUF1QixhQUE4QixPQUFpQjtBQUNyRSxjQUFZLGVBQWUsWUFBWSxnQkFBZ0IsQ0FBQztBQUN4RCxjQUFZLGFBQWEsWUFBWSxjQUFjLENBQUM7QUFDcEQsTUFBSSxPQUFPLE1BQU0sWUFBWTtBQUFXLGdCQUFZLGFBQWEsVUFBVSxNQUFNO0FBQ2pGLE1BQUksT0FBTyxNQUFNLFNBQVM7QUFBVSxnQkFBWSxhQUFhLE9BQU8sTUFBTTtBQUMxRSxNQUFJLE9BQU8sTUFBTSxTQUFTO0FBQVUsZ0JBQVksV0FBVyxPQUFPLE1BQU07QUFDeEUsTUFBSSxPQUFPLE1BQU0sU0FBUyxZQUFZLE9BQU8sTUFBTSxTQUFTO0FBQVcsZ0JBQVksV0FBVyxPQUFPLE1BQU07QUFDM0csTUFBSSxPQUFPLE1BQU0sYUFBYTtBQUFVLGdCQUFZLFdBQVcsV0FBVyxNQUFNO0FBQ2hGLE1BQUksT0FBTyxNQUFNLGdCQUFnQjtBQUFXLGdCQUFZLGFBQWEsY0FBYyxNQUFNO0FBQ3pGLE1BQUksT0FBTyxNQUFNLG9CQUFvQixXQUFXO0FBQy9DLGdCQUFZLGFBQWEsa0JBQWtCLE1BQU07QUFDakQsUUFBSSxNQUFNLGlCQUFpQjtBQUMxQixrQkFBWSxhQUFhLGNBQWM7QUFBQSxJQUN4QztBQUFBLEVBQ0Q7QUFDQSxNQUFJLE9BQU8sTUFBTSxXQUFXO0FBQVcsZ0JBQVksYUFBYSxTQUFTLE1BQU07QUFDL0UsU0FBTztBQUNSO0FBUUEsMEJBQWlDLGVBQXdEO0FBQ3hGLFFBQU0sT0FBTyxjQUFjLE1BQU0sS0FBSyxRQUFRLGNBQWMsR0FBRyxJQUFJLFFBQVEsSUFBSTtBQUMvRSxRQUFNLFFBQVEsYUFBYSxjQUFjLFNBQVMsQ0FBQyxDQUFDO0FBQ3BELE1BQUksYUFBOEIsQ0FBQztBQUNuQyxNQUFJO0FBRUosTUFBSSwrQkFBTyxRQUFRO0FBQ2xCLHFCQUFpQixTQUFTLEtBQUssTUFBTSxNQUFNLElBQUksTUFBTSxTQUFTLEtBQUssTUFBTTtBQUN6RSxxQkFBaUIsY0FBYyxJQUFJLElBQUksZ0JBQWdCLFVBQVUsT0FBTyxDQUFDO0FBQUEsRUFDMUU7QUFHQSxRQUFNLFNBQVMsTUFBTSxLQUFLLFNBQVMsRUFBRSxXQUFXLE9BQU8sS0FBSyxNQUFNLFVBQVUsZUFBZSxDQUFDO0FBQzVGLE1BQUksUUFBUTtBQUNYLGlCQUFhLE9BQU87QUFBQSxFQUNyQjtBQUVBLFFBQU0sZUFBZSxjQUFjLFlBQVksS0FBSztBQUNwRCxRQUFNLGtCQUFrQixNQUFNLGVBQWUsY0FBYyxJQUFJO0FBQy9ELFNBQU87QUFDUjtBQUVPLDJCQUEyQixLQUFpQjtBQUNsRCxRQUFNLFlBQVksSUFBSSxPQUFPLElBQUksQ0FBQyxVQUFVLE9BQU8sT0FBTyxLQUFLLE1BQU0sS0FBSyxLQUFLLEdBQUcsQ0FBQyxNQUFNLE9BQU8sSUFBSSxNQUFNLFVBQVUsR0FBRyxHQUFHO0FBQzFILFNBQU8sR0FBRyxPQUFPLElBQUksVUFBVTtBQUFBLEVBQW9ELFVBQVUsS0FBSyxJQUFJO0FBQ3ZHOyIsCiAgIm5hbWVzIjogW10KfQo=
|
package/dist/core/dev/index.js
CHANGED
|
@@ -4,36 +4,34 @@ import { createVite } from "../create-vite.js";
|
|
|
4
4
|
import { defaultLogOptions, info, warn } from "../logger.js";
|
|
5
5
|
import * as vite from "vite";
|
|
6
6
|
import * as msg from "../messages.js";
|
|
7
|
-
import {
|
|
7
|
+
import { getResolvedHostForVite } from "./util.js";
|
|
8
8
|
async function dev(config, options = { logging: defaultLogOptions }) {
|
|
9
9
|
var _a;
|
|
10
10
|
const devStart = performance.now();
|
|
11
11
|
polyfill(globalThis, {
|
|
12
12
|
exclude: "window document"
|
|
13
13
|
});
|
|
14
|
+
const host = getResolvedHostForVite(config);
|
|
14
15
|
const viteUserConfig = vite.mergeConfig({
|
|
15
16
|
mode: "development",
|
|
16
|
-
server: {
|
|
17
|
-
host: config.devOptions.hostname
|
|
18
|
-
}
|
|
17
|
+
server: { host }
|
|
19
18
|
}, config.vite || {});
|
|
20
19
|
const viteConfig = await createVite(viteUserConfig, { astroConfig: config, logging: options.logging, mode: "dev" });
|
|
21
20
|
const viteServer = await vite.createServer(viteConfig);
|
|
22
21
|
await viteServer.listen(config.devOptions.port);
|
|
23
|
-
const
|
|
24
|
-
const localAddress = getLocalAddress(address.address, config.devOptions.hostname);
|
|
22
|
+
const devServerAddressInfo = viteServer.httpServer.address();
|
|
25
23
|
const site = config.buildOptions.site ? new URL(config.buildOptions.site) : void 0;
|
|
26
|
-
info(options.logging, null, msg.devStart({ startupTime: performance.now() - devStart,
|
|
27
|
-
const currentVersion = "0.24.0
|
|
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.0";
|
|
28
26
|
if (currentVersion.includes("-")) {
|
|
29
27
|
warn(options.logging, null, msg.prerelease({ currentVersion }));
|
|
30
28
|
}
|
|
31
29
|
return {
|
|
32
|
-
address,
|
|
30
|
+
address: devServerAddressInfo,
|
|
33
31
|
stop: () => viteServer.close()
|
|
34
32
|
};
|
|
35
33
|
}
|
|
36
34
|
export {
|
|
37
35
|
dev as default
|
|
38
36
|
};
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvZGV2L2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBQUE7QUFFQTtBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFZQSxtQkFBa0MsUUFBcUIsVUFBc0IsRUFBRSxTQUFTLGtCQUFrQixHQUF1QjtBQXBCakk7QUFxQkMsUUFBTSxXQUFXLFlBQVksSUFBSTtBQUVqQyxXQUFTLFlBQVk7QUFBQSxJQUNwQixTQUFTO0FBQUEsRUFDVixDQUFDO0FBR0QsUUFBTSxPQUFPLHVCQUF1QixNQUFNO0FBQzFDLFFBQU0saUJBQWlCLEtBQUssWUFDM0I7QUFBQSxJQUNDLE1BQU07QUFBQSxJQUNOLFFBQVEsRUFBRSxLQUFLO0FBQUEsRUFDaEIsR0FDQSxPQUFPLFFBQVEsQ0FBQyxDQUNqQjtBQUNBLFFBQU0sYUFBYSxNQUFNLFdBQVcsZ0JBQWdCLEVBQUUsYUFBYSxRQUFRLFNBQVMsUUFBUSxTQUFTLE1BQU0sTUFBTSxDQUFDO0FBQ2xILFFBQU0sYUFBYSxNQUFNLEtBQUssYUFBYSxVQUFVO0FBQ3JELFFBQU0sV0FBVyxPQUFPLE9BQU8sV0FBVyxJQUFJO0FBRTlDLFFBQU0sdUJBQXVCLFdBQVcsV0FBWSxRQUFRO0FBQzVELFFBQU0sT0FBTyxPQUFPLGFBQWEsT0FBTyxJQUFJLElBQUksT0FBTyxhQUFhLElBQUksSUFBSTtBQUM1RSxPQUFLLFFBQVEsU0FBUyxNQUFNLElBQUksU0FBUyxFQUFFLGFBQWEsWUFBWSxJQUFJLElBQUksVUFBVSxRQUFRLHNCQUFzQixNQUFNLE9BQU8sQ0FBQyxDQUFDLHNCQUFlLFdBQWYsbUJBQXVCLE9BQU0sQ0FBQyxDQUFDO0FBRWxLLFFBQU0saUJBQWlCO0FBQ3ZCLE1BQUksZUFBZSxTQUFTLEdBQUcsR0FBRztBQUNqQyxTQUFLLFFBQVEsU0FBUyxNQUFNLElBQUksV0FBVyxFQUFFLGVBQWUsQ0FBQyxDQUFDO0FBQUEsRUFDL0Q7QUFFQSxTQUFPO0FBQUEsSUFDTixTQUFTO0FBQUEsSUFDVCxNQUFNLE1BQU0sV0FBVyxNQUFNO0FBQUEsRUFDOUI7QUFDRDsiLAogICJuYW1lcyI6IFtdCn0K
|
package/dist/core/dev/util.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
const localIps = /* @__PURE__ */ new Set(["localhost", "127.0.0.1"]);
|
|
1
2
|
function pad(input, minLength, dir) {
|
|
2
3
|
let output = input;
|
|
3
4
|
while (output.length < minLength) {
|
|
@@ -8,16 +9,37 @@ function pad(input, minLength, dir) {
|
|
|
8
9
|
function emoji(char, fallback) {
|
|
9
10
|
return process.platform !== "win32" ? char : fallback;
|
|
10
11
|
}
|
|
11
|
-
function
|
|
12
|
-
if (
|
|
12
|
+
function getResolvedHostForVite(config) {
|
|
13
|
+
if (config.devOptions.host === false && config.devOptions.hostname !== "localhost") {
|
|
14
|
+
return config.devOptions.hostname;
|
|
15
|
+
} else {
|
|
16
|
+
return config.devOptions.host;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
function getLocalAddress(serverAddress, config) {
|
|
20
|
+
const host = getResolvedHostForVite(config);
|
|
21
|
+
if (typeof host === "boolean" || host === "localhost") {
|
|
13
22
|
return "localhost";
|
|
14
23
|
} else {
|
|
15
24
|
return serverAddress;
|
|
16
25
|
}
|
|
17
26
|
}
|
|
27
|
+
function getNetworkLogging(config) {
|
|
28
|
+
const host = getResolvedHostForVite(config);
|
|
29
|
+
if (host === false) {
|
|
30
|
+
return "host-to-expose";
|
|
31
|
+
} else if (typeof host === "string" && localIps.has(host)) {
|
|
32
|
+
return "none";
|
|
33
|
+
} else {
|
|
34
|
+
return "visible";
|
|
35
|
+
}
|
|
36
|
+
}
|
|
18
37
|
export {
|
|
19
38
|
emoji,
|
|
20
39
|
getLocalAddress,
|
|
40
|
+
getNetworkLogging,
|
|
41
|
+
getResolvedHostForVite,
|
|
42
|
+
localIps,
|
|
21
43
|
pad
|
|
22
44
|
};
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvZGV2L3V0aWwudHMiXSwKICAibWFwcGluZ3MiOiAiQUFFTyxNQUFNLFdBQVcsb0JBQUksSUFBSSxDQUFDLGFBQWEsV0FBVyxDQUFDO0FBR25ELGFBQWEsT0FBZSxXQUFtQixLQUFnQztBQUNyRixNQUFJLFNBQVM7QUFDYixTQUFPLE9BQU8sU0FBUyxXQUFXO0FBQ2pDLGFBQVMsUUFBUSxTQUFTLE1BQU0sU0FBUyxTQUFTO0FBQUEsRUFDbkQ7QUFDQSxTQUFPO0FBQ1I7QUFFTyxlQUFlLE1BQWMsVUFBa0I7QUFDckQsU0FBTyxRQUFRLGFBQWEsVUFBVSxPQUFPO0FBQzlDO0FBR08sZ0NBQWdDLFFBQXFCO0FBQzNELE1BQUksT0FBTyxXQUFXLFNBQVMsU0FBUyxPQUFPLFdBQVcsYUFBYSxhQUFhO0FBQ25GLFdBQU8sT0FBTyxXQUFXO0FBQUEsRUFDMUIsT0FBTztBQUNOLFdBQU8sT0FBTyxXQUFXO0FBQUEsRUFDMUI7QUFDRDtBQUVPLHlCQUF5QixlQUF1QixRQUE2QjtBQUVuRixRQUFNLE9BQU8sdUJBQXVCLE1BQU07QUFDMUMsTUFBSSxPQUFPLFNBQVMsYUFBYSxTQUFTLGFBQWE7QUFDdEQsV0FBTztBQUFBLEVBQ1IsT0FBTztBQUNOLFdBQU87QUFBQSxFQUNSO0FBQ0Q7QUFJTywyQkFBMkIsUUFBcUM7QUFFdEUsUUFBTSxPQUFPLHVCQUF1QixNQUFNO0FBRTFDLE1BQUksU0FBUyxPQUFPO0FBQ25CLFdBQU87QUFBQSxFQUNSLFdBQVcsT0FBTyxTQUFTLFlBQVksU0FBUyxJQUFJLElBQUksR0FBRztBQUMxRCxXQUFPO0FBQUEsRUFDUixPQUFPO0FBQ04sV0FBTztBQUFBLEVBQ1I7QUFDRDsiLAogICJuYW1lcyI6IFtdCn0K
|
package/dist/core/messages.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import stripAnsi from "strip-ansi";
|
|
2
2
|
import { bold, dim, red, green, underline, yellow, bgYellow, cyan, bgGreen, black } from "kleur/colors";
|
|
3
|
-
import { pad, emoji } from "./dev/util.js";
|
|
3
|
+
import { pad, emoji, getLocalAddress, getNetworkLogging } from "./dev/util.js";
|
|
4
|
+
import os from "os";
|
|
4
5
|
const PREFIX_PADDING = 6;
|
|
5
6
|
function req({ url, statusCode, reqTime }) {
|
|
6
7
|
let color = dim;
|
|
@@ -22,22 +23,35 @@ function hmr({ file }) {
|
|
|
22
23
|
}
|
|
23
24
|
function devStart({
|
|
24
25
|
startupTime,
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
networkAddress,
|
|
26
|
+
devServerAddressInfo,
|
|
27
|
+
config,
|
|
28
28
|
https,
|
|
29
29
|
site
|
|
30
30
|
}) {
|
|
31
|
-
const version = "0.24.0
|
|
31
|
+
const version = "0.24.0";
|
|
32
32
|
const rootPath = site ? site.pathname : "/";
|
|
33
|
+
const localPrefix = `${dim("\u2503")} Local `;
|
|
34
|
+
const networkPrefix = `${dim("\u2503")} Network `;
|
|
35
|
+
const { address: networkAddress, port } = devServerAddressInfo;
|
|
36
|
+
const localAddress = getLocalAddress(networkAddress, config);
|
|
37
|
+
const networkLogging = getNetworkLogging(config);
|
|
33
38
|
const toDisplayUrl = (hostname) => `${https ? "https" : "http"}://${hostname}:${port}${rootPath}`;
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
`${
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
let addresses = [];
|
|
40
|
+
if (networkLogging === "none") {
|
|
41
|
+
addresses = [`${localPrefix}${bold(cyan(toDisplayUrl(localAddress)))}`];
|
|
42
|
+
} else if (networkLogging === "host-to-expose") {
|
|
43
|
+
addresses = [`${localPrefix}${bold(cyan(toDisplayUrl(localAddress)))}`, `${networkPrefix}${dim("use --host to expose")}`];
|
|
44
|
+
} else {
|
|
45
|
+
addresses = Object.values(os.networkInterfaces()).flatMap((networkInterface) => networkInterface ?? []).filter((networkInterface) => (networkInterface == null ? void 0 : networkInterface.address) && (networkInterface == null ? void 0 : networkInterface.family) === "IPv4").map(({ address }) => {
|
|
46
|
+
if (address.includes("127.0.0.1")) {
|
|
47
|
+
const displayAddress = address.replace("127.0.0.1", localAddress);
|
|
48
|
+
return `${localPrefix}${bold(cyan(toDisplayUrl(displayAddress)))}`;
|
|
49
|
+
} else {
|
|
50
|
+
return `${networkPrefix}${bold(cyan(toDisplayUrl(address)))}`;
|
|
51
|
+
}
|
|
52
|
+
}).sort((msg) => msg.startsWith(localPrefix) ? -1 : 1);
|
|
53
|
+
}
|
|
54
|
+
const messages = [`${emoji("\u{1F680} ", "")}${bgGreen(black(` astro `))} ${green(`v${version}`)} ${dim(`started in ${Math.round(startupTime)}ms`)}`, "", ...addresses, ""];
|
|
41
55
|
return messages.map((msg) => ` ${msg}`).join("\n");
|
|
42
56
|
}
|
|
43
57
|
function prerelease({ currentVersion }) {
|
|
@@ -70,4 +84,4 @@ export {
|
|
|
70
84
|
reload,
|
|
71
85
|
req
|
|
72
86
|
};
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NvcmUvbWVzc2FnZXMudHMiXSwKICAibWFwcGluZ3MiOiAiQUFJQTtBQUNBO0FBQ0E7QUFDQTtBQUlBLE1BQU0saUJBQWlCO0FBR2hCLGFBQWEsRUFBRSxLQUFLLFlBQVksV0FBMEU7QUFDaEgsTUFBSSxRQUFRO0FBQ1osTUFBSSxjQUFjO0FBQUssWUFBUTtBQUFBLFdBQ3RCLGNBQWM7QUFBSyxZQUFRO0FBQUEsV0FDM0IsY0FBYztBQUFLLFlBQVE7QUFBQSxXQUMzQixjQUFjO0FBQUssWUFBUTtBQUNwQyxTQUFPLEdBQUcsS0FBSyxNQUFNLElBQUksR0FBRyxjQUFjLGNBQWMsQ0FBQyxDQUFDLEtBQUssSUFBSSxLQUFLLEVBQUUsS0FBSyxVQUFVLElBQUksS0FBSyxNQUFNLE9BQU8sSUFBSSxJQUFJLElBQUksS0FBSyxLQUFLO0FBQ3RJO0FBRU8sZ0JBQWdCLEVBQUUsUUFBa0M7QUFDMUQsU0FBTyxHQUFHLE1BQU0sSUFBSSxVQUFVLGNBQWMsQ0FBQyxLQUFLO0FBQ25EO0FBRU8sYUFBYSxFQUFFLFFBQWtDO0FBQ3ZELFNBQU8sR0FBRyxNQUFNLElBQUksVUFBVSxjQUFjLENBQUMsS0FBSztBQUNuRDtBQUdPLGtCQUFrQjtBQUFBLEVBQ3hCO0FBQUEsRUFDQTtBQUFBLEVBQ0E7QUFBQSxFQUNBO0FBQUEsRUFDQTtBQUFBLEdBT1U7QUFFVixRQUFNLFVBQVU7QUFDaEIsUUFBTSxXQUFXLE9BQU8sS0FBSyxXQUFXO0FBQ3hDLFFBQU0sY0FBYyxHQUFHLElBQUksUUFBRztBQUM5QixRQUFNLGdCQUFnQixHQUFHLElBQUksUUFBRztBQUVoQyxRQUFNLEVBQUUsU0FBUyxnQkFBZ0IsU0FBUztBQUMxQyxRQUFNLGVBQWUsZ0JBQWdCLGdCQUFnQixNQUFNO0FBQzNELFFBQU0saUJBQWlCLGtCQUFrQixNQUFNO0FBQy9DLFFBQU0sZUFBZSxDQUFDLGFBQXFCLEdBQUcsUUFBUSxVQUFVLFlBQVksWUFBWSxPQUFPO0FBQy9GLE1BQUks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
|
|
@@ -4,8 +4,8 @@ import { performance } from "perf_hooks";
|
|
|
4
4
|
import { fileURLToPath } from "url";
|
|
5
5
|
import * as msg from "../messages.js";
|
|
6
6
|
import { error, info } from "../logger.js";
|
|
7
|
-
import { getLocalAddress } from "../dev/util.js";
|
|
8
7
|
import { subpathNotUsedTemplate, notFoundTemplate } from "../../template/4xx.js";
|
|
8
|
+
import { getResolvedHostForHttpServer } from "./util.js";
|
|
9
9
|
const HAS_FILE_EXTENSION_REGEXP = /^.*\.[^\\]+$/;
|
|
10
10
|
async function preview(config, { logging }) {
|
|
11
11
|
const startServerTime = performance.now();
|
|
@@ -46,18 +46,18 @@ async function preview(config, { logging }) {
|
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
});
|
|
49
|
-
let {
|
|
49
|
+
let { port } = config.devOptions;
|
|
50
|
+
const host = getResolvedHostForHttpServer(config);
|
|
50
51
|
let httpServer;
|
|
51
52
|
function startServer(timerStart) {
|
|
52
53
|
let showedPortTakenMsg = false;
|
|
53
54
|
let showedListenMsg = false;
|
|
54
55
|
return new Promise((resolve, reject) => {
|
|
55
56
|
const listen = () => {
|
|
56
|
-
httpServer = server.listen(port,
|
|
57
|
+
httpServer = server.listen(port, host, async () => {
|
|
57
58
|
if (!showedListenMsg) {
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
info(logging, null, msg.devStart({ startupTime: performance.now() - timerStart, port, localAddress, networkAddress, https: false, site: baseURL }));
|
|
59
|
+
const devServerAddressInfo = server.address();
|
|
60
|
+
info(logging, null, msg.devStart({ startupTime: performance.now() - timerStart, config, devServerAddressInfo, https: false, site: baseURL }));
|
|
61
61
|
}
|
|
62
62
|
showedListenMsg = true;
|
|
63
63
|
resolve();
|
|
@@ -83,7 +83,7 @@ async function preview(config, { logging }) {
|
|
|
83
83
|
}
|
|
84
84
|
await startServer(startServerTime);
|
|
85
85
|
return {
|
|
86
|
-
|
|
86
|
+
host,
|
|
87
87
|
port,
|
|
88
88
|
server: httpServer,
|
|
89
89
|
stop: async () => {
|
|
@@ -96,4 +96,4 @@ async function preview(config, { logging }) {
|
|
|
96
96
|
export {
|
|
97
97
|
preview as default
|
|
98
98
|
};
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvcHJldmlldy9pbmRleC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUdBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFhQSxNQUFNLDRCQUE0QjtBQUdsQyx1QkFBc0MsUUFBcUIsRUFBRSxXQUFtRDtBQUMvRyxRQUFNLGtCQUFrQixZQUFZLElBQUk7QUFDeEMsUUFBTSxnQkFBZ0I7QUFDdEIsUUFBTSxnQkFBZ0IsT0FBTyxXQUFXO0FBRXhDLE1BQUksVUFBVSxJQUFJLElBQUksT0FBTyxhQUFhLFFBQVEsS0FBSyxhQUFhO0FBQ3BFLFFBQU0sbUJBQW1CLEtBQUssY0FBYyxPQUFPLElBQUksR0FBRztBQUFBLElBQ3pELEtBQUs7QUFBQSxJQUNMLE1BQU07QUFBQSxJQUNOLFFBQVE7QUFBQSxFQUNULENBQUM7QUFFRCxRQUFNLFNBQVMsS0FBSyxhQUFhLENBQUMsS0FBSyxRQUFRO0FBdENoRDtBQXVDRSxVQUFNLGFBQWEsSUFBSSxJQUFJLElBQUksS0FBZSxhQUFhO0FBRzNELFFBQUksQ0FBQyxXQUFXLFNBQVMsV0FBVyxRQUFRLFFBQVEsR0FBRztBQUN0RCxVQUFJLGFBQWE7QUFDakIsVUFBSSxJQUFJLHVCQUF1QixRQUFRLFVBQVUsV0FBVyxRQUFRLENBQUM7QUFDckU7QUFBQSxJQUNEO0FBR0EsVUFBTSxXQUFXLFdBQVcsU0FBUyxNQUFNLFFBQVEsU0FBUyxTQUFTLENBQUM7QUFFdEUsVUFBTSxTQUFTLGFBQWE7QUFDNUIsVUFBTSxtQkFBbUIsVUFBVSxTQUFTLFNBQVMsR0FBRztBQUV4RCx1QkFBbUIsU0FBaUI7QUFDbkMsVUFBSSxhQUFhO0FBQ2pCLFVBQUksSUFBSSxpQkFBaUIsVUFBVSxPQUFPLENBQUM7QUFBQSxJQUM1QztBQUVBLFlBQVE7QUFBQSxXQUNGLHFCQUFvQixpQkFBaUIsV0FBVyxDQUFDO0FBQ3JELGtCQUFVLHdEQUF3RDtBQUNsRTtBQUFBLFdBQ0ksRUFBQyxvQkFBb0IsaUJBQWlCLFlBQVksQ0FBQyxVQUFVLENBQUMsMEJBQTBCLEtBQUssUUFBUTtBQUN6RyxrQkFBVSx5REFBeUQ7QUFDbkU7QUFBQSxlQUNRO0FBRVIsWUFBSSxNQUFNLE1BQU0sV0FBSSxRQUFKLG1CQUFTLFFBQVEsUUFBUSxVQUFVO0FBQ25ELHlCQUFpQixLQUFLLEtBQUssTUFBTSxVQUFVLFdBQVcsQ0FBQztBQUN2RDtBQUFBLE1BQ0Q7QUFBQTtBQUFBLEVBRUYsQ0FBQztBQUVELE1BQUksRUFBRSxTQUFTLE9BQU87QUFDdEIsUUFBTSxPQUFPLDZCQUE2QixNQUFNO0FBRWhELE1BQUk7QUFHSix1QkFBcUIsWUFBbUM7QUFDdkQsUUFBSSxxQkFBcUI7QUFDekIsUUFBSSxrQkFBa0I7QUFDdEIsV0FBTyxJQUFJLFFBQWMsQ0FBQyxTQUFTLFdBQVc7QUFDN0MsWUFBTSxTQUFTLE1BQU07QUFDcEIscUJBQWEsT0FBTyxPQUFPLE1BQU0sTUFBTSxZQUFZO0FBQ2xELGNBQUksQ0FBQyxpQkFBaUI7QUFDckIsa0JBQU0sdUJBQXVCLE9BQU8sUUFBUTtBQUM1QyxpQkFBSyxTQUFTLE1BQU0sSUFBSSxTQUFTLEVBQUUsYUFBYSxZQUFZLElBQUksSUFBSSxZQUFZLFFBQVEsc0JBQXNCLE9BQU8sT0FBTyxNQUFNLFFBQVEsQ0FBQyxDQUFDO0FBQUEsVUFDN0k7QUFDQSw0QkFBa0I7QUFDbEIsa0JBQVE7QUFBQSxRQUNULENBQUM7QUFDRCxpREFBWSxHQUFHLFNBQVM7QUFBQSxNQUN6QjtBQUVBLFlBQU0sVUFBVSxDQUFDLFFBQStCO0FBQy9DLFlBQUksSUFBSSxRQUFRLElBQUksU0FBUyxjQUFjO0FBQzFDLGNBQUksQ0FBQyxvQkFBb0I7QUFDeEIsaUJBQUssU0FBUyxTQUFTLElBQUksVUFBVSxFQUFFLEtBQUssQ0FBQyxDQUFDO0FBQzlDLGlDQUFxQjtBQUFBLFVBQ3RCO0FBQ0E7QUFDQSxpQkFBTyxPQUFPO0FBQUEsUUFDZixPQUFPO0FBQ04sZ0JBQU0sU0FBUyxTQUFTLElBQUksS0FBSztBQUNqQyxtREFBWSxlQUFlLFNBQVM7QUFDcEMsaUJBQU8sR0FBRztBQUFBLFFBQ1g7QUFBQSxNQUNEO0FBRUEsYUFBTztBQUFBLElBQ1IsQ0FBQztBQUFBLEVBQ0Y7QUFHQSxRQUFNLFlBQVksZUFBZTtBQUVqQyxTQUFPO0FBQUEsSUFDTjtBQUFBLElBQ0E7QUFBQSxJQUNBLFFBQVE7QUFBQSxJQUNSLE1BQU0sWUFBWTtBQUNqQixZQUFNLElBQUksUUFBUSxDQUFDLFNBQVMsV0FBVztBQUN0QyxtQkFBVyxNQUFNLENBQUMsUUFBUyxNQUFNLE9BQU8sR0FBRyxJQUFJLFFBQVEsTUFBUyxDQUFFO0FBQUEsTUFDbkUsQ0FBQztBQUFBLElBQ0Y7QUFBQSxFQUNEO0FBQ0Q7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
function getResolvedHostForHttpServer(config) {
|
|
2
|
+
const { host, hostname } = config.devOptions;
|
|
3
|
+
if (host === false && hostname === "localhost") {
|
|
4
|
+
return "127.0.0.1";
|
|
5
|
+
} else if (host === true) {
|
|
6
|
+
return void 0;
|
|
7
|
+
} else if (typeof host === "string") {
|
|
8
|
+
return host;
|
|
9
|
+
} else {
|
|
10
|
+
return hostname;
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
export {
|
|
14
|
+
getResolvedHostForHttpServer
|
|
15
|
+
};
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvcHJldmlldy91dGlsLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBRU8sc0NBQXNDLFFBQXFCO0FBQ2pFLFFBQU0sRUFBRSxNQUFNLGFBQWEsT0FBTztBQUVsQyxNQUFJLFNBQVMsU0FBUyxhQUFhLGFBQWE7QUFFL0MsV0FBTztBQUFBLEVBQ1IsV0FBVyxTQUFTLE1BQU07QUFFekIsV0FBTztBQUFBLEVBQ1IsV0FBVyxPQUFPLFNBQVMsVUFBVTtBQUNwQyxXQUFPO0FBQUEsRUFDUixPQUFPO0FBQ04sV0FBTztBQUFBLEVBQ1I7QUFDRDsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -4,6 +4,7 @@ import { injectTags } from "./html.js";
|
|
|
4
4
|
import { resolveRenderers } from "./renderers.js";
|
|
5
5
|
import { errorHandler } from "./error.js";
|
|
6
6
|
import { getHmrScript } from "./hmr.js";
|
|
7
|
+
import { prependForwardSlash } from "../../path.js";
|
|
7
8
|
import { render as coreRender } from "../core.js";
|
|
8
9
|
import { createModuleScriptElementWithSrcSet } from "../ssr-element.js";
|
|
9
10
|
const svelteStylesRE = /svelte\?svelte&type=style/;
|
|
@@ -58,7 +59,7 @@ async function render(renderers, mod, ssrOpts) {
|
|
|
58
59
|
async resolve(s) {
|
|
59
60
|
if (!astroConfig.buildOptions.legacyBuild) {
|
|
60
61
|
const [, resolvedPath] = await viteServer.moduleGraph.resolveUrl(s);
|
|
61
|
-
return resolvedPath;
|
|
62
|
+
return "/@fs" + prependForwardSlash(resolvedPath);
|
|
62
63
|
} else {
|
|
63
64
|
return s;
|
|
64
65
|
}
|
|
@@ -125,4 +126,4 @@ export {
|
|
|
125
126
|
render,
|
|
126
127
|
ssr
|
|
127
128
|
};
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
129
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vLi4vc3JjL2NvcmUvcmVuZGVyL2Rldi9pbmRleC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUdBO0FBQ0E7QUFDQTtBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQXlCQSxNQUFNLGlCQUFpQjtBQUV2Qix1QkFBOEIsRUFBRSxhQUFhLFVBQVUsY0FBc0c7QUFFNUosUUFBTSxZQUFZLE1BQU0saUJBQWlCLFlBQVksV0FBVztBQUVoRSxRQUFNLE1BQU8sTUFBTSxXQUFXLGNBQWMsY0FBYyxRQUFRLENBQUM7QUFFbkUsU0FBTyxDQUFDLFdBQVcsR0FBRztBQUN2QjtBQUdBLHNCQUE2QixXQUF1QixLQUF3QixTQUFzQztBQUNqSCxRQUFNLEVBQUUsYUFBYSxVQUFVLFNBQVMsTUFBTSxRQUFRLFVBQVUsT0FBTyxZQUFZLGVBQWU7QUFDbEcsUUFBTSxTQUFTLFlBQVksYUFBYTtBQUd4QyxRQUFNLFVBQVUsb0NBQW9DLENBQUMsVUFBVSxJQUFJLGVBQWUsWUFBWSxJQUFJLE1BQU0sS0FBSyxJQUFJLFdBQVcsbUJBQW1CLENBQUMsSUFBSSxDQUFDLENBQUM7QUFHdEosTUFBSSxJQUFJLGVBQWUsWUFBWSxLQUFLLFNBQVMsaUJBQWlCLENBQUMsUUFBUTtBQUMxRSxZQUFRLElBQUk7QUFBQSxNQUNYLE9BQU8sRUFBRSxNQUFNLFVBQVUsS0FBSyxnQkFBZ0I7QUFBQSxNQUM5QyxVQUFVO0FBQUEsSUFDWCxDQUFDO0FBQ0QsWUFBUSxJQUFJO0FBQUEsTUFDWCxPQUFPLEVBQUUsTUFBTSxVQUFVLEtBQUssSUFBSSxJQUFJLGtDQUFrQyxZQUFZLEdBQUcsRUFBRSxTQUFTO0FBQUEsTUFDbEcsVUFBVTtBQUFBLElBQ1gsQ0FBQztBQUFBLEVBQ0Y7QUFHQSxNQUFJLFFBQVEsb0JBQUksSUFBZ0I7QUFDaEMsTUFBSSxDQUFDLFFBQVE7QUFDWixLQUFDLEdBQUcsZ0JBQWdCLFVBQVUsVUFBVSxDQUFDLEVBQUUsUUFBUSxDQUFDLFNBQVM7QUFD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
|
|
@@ -24,6 +24,7 @@ export interface CLIFlags {
|
|
|
24
24
|
projectRoot?: string;
|
|
25
25
|
site?: string;
|
|
26
26
|
sitemap?: boolean;
|
|
27
|
+
host?: string | boolean;
|
|
27
28
|
hostname?: string;
|
|
28
29
|
port?: number;
|
|
29
30
|
config?: string;
|
|
@@ -221,16 +222,20 @@ export interface AstroUserConfig {
|
|
|
221
222
|
/**
|
|
222
223
|
* @docs
|
|
223
224
|
* @name buildOptions.sitemapFilter
|
|
224
|
-
* @
|
|
225
|
-
* @
|
|
225
|
+
* @typeraw {(page: string) => boolean}
|
|
226
|
+
* @see buildOptions.sitemap
|
|
226
227
|
* @description
|
|
227
|
-
*
|
|
228
|
+
* By default, all pages are included in your generated sitemap.
|
|
229
|
+
* You can filter included pages by URL using `buildOptions.sitemapFilter`.
|
|
230
|
+
*
|
|
231
|
+
* The `page` function parameter is the full URL of your rendered page, including your `buildOptions.site` domain.
|
|
232
|
+
* Return `true` to include a page in your sitemap, and `false` to remove it.
|
|
228
233
|
*
|
|
229
234
|
* ```js
|
|
230
235
|
* {
|
|
231
236
|
* buildOptions: {
|
|
232
237
|
* sitemap: true
|
|
233
|
-
* sitemapFilter: (page) =>
|
|
238
|
+
* sitemapFilter: (page) => page !== 'http://example.com/secret-page')
|
|
234
239
|
* }
|
|
235
240
|
* }
|
|
236
241
|
* ```
|
|
@@ -299,12 +304,28 @@ export interface AstroUserConfig {
|
|
|
299
304
|
* @name Dev Options
|
|
300
305
|
*/
|
|
301
306
|
devOptions?: {
|
|
307
|
+
/**
|
|
308
|
+
* @docs
|
|
309
|
+
* @name devOptions.host
|
|
310
|
+
* @type {string | boolean}
|
|
311
|
+
* @default `false`
|
|
312
|
+
* @version 0.24.0
|
|
313
|
+
* @description
|
|
314
|
+
* Set which network IP addresses the dev server should listen on (i.e. non-localhost IPs).
|
|
315
|
+
* - `false` - do not expose on a network IP address
|
|
316
|
+
* - `true` - listen on all addresses, including LAN and public addresses
|
|
317
|
+
* - `[custom-address]` - expose on a network IP address at `[custom-address]`
|
|
318
|
+
*/
|
|
319
|
+
host?: string | boolean;
|
|
302
320
|
/**
|
|
303
321
|
* @docs
|
|
304
322
|
* @name devOptions.hostname
|
|
305
323
|
* @type {string}
|
|
306
324
|
* @default `'localhost'`
|
|
325
|
+
* @deprecated Use `host` instead
|
|
307
326
|
* @description
|
|
327
|
+
* > **This option is deprecated.** Consider using `host` instead.
|
|
328
|
+
*
|
|
308
329
|
* Set which IP addresses the dev server should listen on. Set this to 0.0.0.0 to listen on all addresses, including LAN and public addresses.
|
|
309
330
|
*/
|
|
310
331
|
hostname?: string;
|
|
@@ -44,14 +44,17 @@ export declare const AstroConfigSchema: z.ZodObject<{
|
|
|
44
44
|
drafts?: boolean | undefined;
|
|
45
45
|
}>>>;
|
|
46
46
|
devOptions: z.ZodDefault<z.ZodOptional<z.ZodObject<{
|
|
47
|
+
host: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodBoolean]>>>;
|
|
47
48
|
hostname: z.ZodDefault<z.ZodOptional<z.ZodString>>;
|
|
48
49
|
port: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
|
|
49
50
|
trailingSlash: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"always">, z.ZodLiteral<"never">, z.ZodLiteral<"ignore">]>>>;
|
|
50
51
|
}, "strip", z.ZodTypeAny, {
|
|
52
|
+
host: string | boolean;
|
|
51
53
|
hostname: string;
|
|
52
54
|
port: number;
|
|
53
55
|
trailingSlash: "always" | "never" | "ignore";
|
|
54
56
|
}, {
|
|
57
|
+
host?: string | boolean | undefined;
|
|
55
58
|
hostname?: string | undefined;
|
|
56
59
|
port?: number | undefined;
|
|
57
60
|
trailingSlash?: "always" | "never" | "ignore" | undefined;
|
|
@@ -79,6 +82,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
|
|
|
79
82
|
drafts: boolean;
|
|
80
83
|
};
|
|
81
84
|
devOptions: {
|
|
85
|
+
host: string | boolean;
|
|
82
86
|
hostname: string;
|
|
83
87
|
port: number;
|
|
84
88
|
trailingSlash: "always" | "never" | "ignore";
|
|
@@ -104,6 +108,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
|
|
|
104
108
|
drafts?: boolean | undefined;
|
|
105
109
|
} | undefined;
|
|
106
110
|
devOptions?: {
|
|
111
|
+
host?: string | boolean | undefined;
|
|
107
112
|
hostname?: string | undefined;
|
|
108
113
|
port?: number | undefined;
|
|
109
114
|
trailingSlash?: "always" | "never" | "ignore" | undefined;
|
|
@@ -1,4 +1,9 @@
|
|
|
1
|
+
import type { AstroConfig } from '../../@types/astro';
|
|
2
|
+
export declare const localIps: Set<string>;
|
|
1
3
|
/** Pad string () */
|
|
2
4
|
export declare function pad(input: string, minLength: number, dir?: 'left' | 'right'): string;
|
|
3
5
|
export declare function emoji(char: string, fallback: string): string;
|
|
4
|
-
export declare function
|
|
6
|
+
export declare function getResolvedHostForVite(config: AstroConfig): string | boolean;
|
|
7
|
+
export declare function getLocalAddress(serverAddress: string, config: AstroConfig): string;
|
|
8
|
+
export declare type NetworkLogging = 'none' | 'host-to-expose' | 'visible';
|
|
9
|
+
export declare function getNetworkLogging(config: AstroConfig): NetworkLogging;
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Dev server messages (organized here to prevent clutter)
|
|
3
3
|
*/
|
|
4
|
+
/// <reference types="node" />
|
|
5
|
+
import type { AddressInfo } from 'net';
|
|
6
|
+
import type { AstroConfig } from '../@types/astro';
|
|
4
7
|
/** Display */
|
|
5
8
|
export declare function req({ url, statusCode, reqTime }: {
|
|
6
9
|
url: string;
|
|
@@ -14,11 +17,10 @@ export declare function hmr({ file }: {
|
|
|
14
17
|
file: string;
|
|
15
18
|
}): string;
|
|
16
19
|
/** Display dev server host and startup time */
|
|
17
|
-
export declare function devStart({ startupTime,
|
|
20
|
+
export declare function devStart({ startupTime, devServerAddressInfo, config, https, site, }: {
|
|
18
21
|
startupTime: number;
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
networkAddress: string;
|
|
22
|
+
devServerAddressInfo: AddressInfo;
|
|
23
|
+
config: AstroConfig;
|
|
22
24
|
https: boolean;
|
|
23
25
|
site: URL | undefined;
|
|
24
26
|
}): string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "astro",
|
|
3
|
-
"version": "0.24.0
|
|
3
|
+
"version": "0.24.0",
|
|
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",
|
|
@@ -50,8 +50,8 @@
|
|
|
50
50
|
"vendor"
|
|
51
51
|
],
|
|
52
52
|
"dependencies": {
|
|
53
|
-
"@astrojs/compiler": "^0.12.0
|
|
54
|
-
"@astrojs/language-server": "^0.8.
|
|
53
|
+
"@astrojs/compiler": "^0.12.0",
|
|
54
|
+
"@astrojs/language-server": "^0.8.10",
|
|
55
55
|
"@astrojs/markdown-remark": "^0.6.4",
|
|
56
56
|
"@astrojs/prism": "0.4.0",
|
|
57
57
|
"@astrojs/renderer-preact": "^0.5.0",
|
|
@@ -59,72 +59,72 @@
|
|
|
59
59
|
"@astrojs/renderer-svelte": "0.5.1",
|
|
60
60
|
"@astrojs/renderer-vue": "0.4.0",
|
|
61
61
|
"@astrojs/webapi": "^0.11.0",
|
|
62
|
-
"@babel/core": "^7.
|
|
63
|
-
"@babel/traverse": "^7.
|
|
62
|
+
"@babel/core": "^7.17.5",
|
|
63
|
+
"@babel/traverse": "^7.17.3",
|
|
64
64
|
"@proload/core": "^0.2.2",
|
|
65
|
-
"@proload/plugin-tsm": "^0.1.
|
|
65
|
+
"@proload/plugin-tsm": "^0.1.1",
|
|
66
66
|
"@web/parse5-utils": "^1.3.0",
|
|
67
|
-
"ci-info": "^3.
|
|
67
|
+
"ci-info": "^3.3.0",
|
|
68
68
|
"common-ancestor-path": "^1.0.1",
|
|
69
69
|
"debug": "^4.3.3",
|
|
70
70
|
"eol": "^0.9.1",
|
|
71
71
|
"es-module-lexer": "^0.10.0",
|
|
72
72
|
"esbuild": "0.14.25",
|
|
73
|
-
"estree-walker": "^3.0.
|
|
74
|
-
"fast-glob": "^3.2.
|
|
75
|
-
"fast-xml-parser": "^4.0.
|
|
73
|
+
"estree-walker": "^3.0.1",
|
|
74
|
+
"fast-glob": "^3.2.11",
|
|
75
|
+
"fast-xml-parser": "^4.0.6",
|
|
76
76
|
"html-entities": "^2.3.2",
|
|
77
|
-
"htmlparser2": "^7.
|
|
77
|
+
"htmlparser2": "^7.2.0",
|
|
78
78
|
"kleur": "^4.1.4",
|
|
79
|
-
"magic-string": "^0.25.
|
|
80
|
-
"micromorph": "^0.1.
|
|
79
|
+
"magic-string": "^0.25.9",
|
|
80
|
+
"micromorph": "^0.1.2",
|
|
81
81
|
"mime": "^3.0.0",
|
|
82
82
|
"parse5": "^6.0.1",
|
|
83
83
|
"path-to-regexp": "^6.2.0",
|
|
84
|
-
"postcss": "^8.
|
|
85
|
-
"prismjs": "^1.
|
|
86
|
-
"rehype-slug": "^5.0.
|
|
87
|
-
"resolve": "^1.
|
|
88
|
-
"rollup": "^2.
|
|
84
|
+
"postcss": "^8.4.8",
|
|
85
|
+
"prismjs": "^1.27.0",
|
|
86
|
+
"rehype-slug": "^5.0.1",
|
|
87
|
+
"resolve": "^1.22.0",
|
|
88
|
+
"rollup": "^2.70.0",
|
|
89
89
|
"semver": "^7.3.5",
|
|
90
90
|
"serialize-javascript": "^6.0.0",
|
|
91
|
-
"shiki": "^0.10.
|
|
91
|
+
"shiki": "^0.10.1",
|
|
92
92
|
"shorthash": "^0.0.2",
|
|
93
93
|
"sirv": "^2.0.2",
|
|
94
94
|
"slash": "^4.0.0",
|
|
95
95
|
"sourcemap-codec": "^1.4.8",
|
|
96
96
|
"srcset-parse": "^1.1.0",
|
|
97
|
-
"string-width": "^5.
|
|
97
|
+
"string-width": "^5.1.2",
|
|
98
98
|
"strip-ansi": "^7.0.1",
|
|
99
99
|
"supports-esm": "^1.0.0",
|
|
100
100
|
"tsconfig-resolver": "^3.0.1",
|
|
101
101
|
"vite": "^2.8.6",
|
|
102
|
-
"yargs-parser": "^21.0.
|
|
103
|
-
"zod": "^3.
|
|
102
|
+
"yargs-parser": "^21.0.1",
|
|
103
|
+
"zod": "^3.13.4"
|
|
104
104
|
},
|
|
105
105
|
"devDependencies": {
|
|
106
|
-
"@astrojs/parser": "^0.22.
|
|
107
|
-
"@babel/types": "^7.
|
|
108
|
-
"@types/babel__core": "^7.1.
|
|
106
|
+
"@astrojs/parser": "^0.22.2",
|
|
107
|
+
"@babel/types": "^7.17.0",
|
|
108
|
+
"@types/babel__core": "^7.1.18",
|
|
109
109
|
"@types/babel__traverse": "^7.14.2",
|
|
110
|
-
"@types/chai": "^4.
|
|
110
|
+
"@types/chai": "^4.3.0",
|
|
111
111
|
"@types/common-ancestor-path": "^1.0.0",
|
|
112
112
|
"@types/connect": "^3.4.35",
|
|
113
113
|
"@types/debug": "^4.1.7",
|
|
114
114
|
"@types/estree": "^0.0.51",
|
|
115
115
|
"@types/mime": "^2.0.3",
|
|
116
|
-
"@types/mocha": "^9.
|
|
116
|
+
"@types/mocha": "^9.1.0",
|
|
117
117
|
"@types/parse5": "^6.0.3",
|
|
118
118
|
"@types/resolve": "^1.20.1",
|
|
119
119
|
"@types/rimraf": "^3.0.2",
|
|
120
120
|
"@types/send": "^0.17.1",
|
|
121
121
|
"@types/yargs-parser": "^21.0.0",
|
|
122
122
|
"astro-scripts": "0.0.1",
|
|
123
|
-
"chai": "^4.3.
|
|
123
|
+
"chai": "^4.3.6",
|
|
124
124
|
"cheerio": "^1.0.0-rc.10",
|
|
125
|
-
"execa": "^6.
|
|
126
|
-
"mocha": "^9.1
|
|
127
|
-
"sass": "^1.49.
|
|
125
|
+
"execa": "^6.1.0",
|
|
126
|
+
"mocha": "^9.2.1",
|
|
127
|
+
"sass": "^1.49.9"
|
|
128
128
|
},
|
|
129
129
|
"engines": {
|
|
130
130
|
"node": "^14.15.0 || >=16.0.0",
|