astro 0.22.18 → 0.22.19
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/config.js +38 -6
- package/dist/core/ssr/index.js +12 -2
- package/dist/core/ssr/rss.js +4 -4
- package/dist/types/@types/astro.d.ts +16 -0
- package/dist/types/core/config.d.ts +3 -2
- package/dist/types/core/ssr/rss.d.ts +0 -1
- package/dist/vite-plugin-astro/compile.js +4 -1
- package/dist/vite-plugin-astro/index.js +10 -2
- package/package.json +3 -5
- 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/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
|
@@ -158,6 +158,16 @@ async function render(renderers, mod, ssrOpts) {
|
|
|
158
158
|
props: { type: "module", src },
|
|
159
159
|
children: ""
|
|
160
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
|
+
}
|
|
161
171
|
const result = createResult({ astroConfig, logging, origin, params, pathname, renderers, scripts });
|
|
162
172
|
result.resolve = async (s) => {
|
|
163
173
|
if (astroConfig.buildOptions.experimentalStaticBuild) {
|
|
@@ -169,7 +179,7 @@ async function render(renderers, mod, ssrOpts) {
|
|
|
169
179
|
};
|
|
170
180
|
let html = await renderPage(result, Component, pageProps, null);
|
|
171
181
|
const tags = [];
|
|
172
|
-
if (mode === "development") {
|
|
182
|
+
if (mode === "development" && !astroConfig.buildOptions.experimentalStaticBuild) {
|
|
173
183
|
tags.push({
|
|
174
184
|
tag: "script",
|
|
175
185
|
attrs: { type: "module" },
|
|
@@ -230,4 +240,4 @@ export {
|
|
|
230
240
|
render,
|
|
231
241
|
ssr
|
|
232
242
|
};
|
|
233
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
243
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvc3NyL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7OztBQWtCQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBRUE7QUFDQTtBQUNBO0FBRUEsTUFBTSxpQkFBaUI7QUF1QnZCLE1BQU0sUUFBUSxJQUFJO0FBR2xCLCtCQUErQixZQUFnQyxVQUFrQixhQUEwQjtBQUMxRyxRQUFNLG1CQUF3QjtBQUk5QixRQUFNO0FBQUEsSUFDTCxTQUFTLEVBQUUsTUFBTSxRQUFRLFdBQVcsb0JBQW9CO0FBQUEsTUFDckQsTUFBTSxPQUFPLGtCQUFrQixVQUFVO0FBRTdDLG1CQUFpQixPQUFPO0FBQ3hCLE1BQUk7QUFBUSxxQkFBaUIsU0FBUyxLQUFLLE1BQU0sS0FBSyxVQUFVO0FBQ2hFLG1CQUFpQixjQUFjLEtBQUssTUFBTSxLQUFLLFVBQVU7QUFDekQsTUFBSSxNQUFNLFFBQVE7QUFBcUIscUJBQWlCLHFCQUFxQixtQkFBbUIsSUFBSSxDQUFDLFFBQWdCLEtBQUssTUFBTSxLQUFLLFVBQVU7QUFDL0ksTUFBSSxNQUFNLFFBQVE7QUFBWSxxQkFBaUIsWUFBWSxVQUFVLElBQUksQ0FBQyxRQUFnQixLQUFLLE1BQU0sS0FBSyxVQUFVO0FBQ3BILFFBQU0sRUFBRSxRQUFRLE1BQU0sV0FBVyxZQUFZLG1CQUFtQixpQkFBaUI7QUFDakYsUUFBTSxFQUFFLFNBQVMsZ0JBQWdCLE1BQU0sV0FBVyxjQUFjO0FBQ2hFLG1CQUFpQixNQUFNO0FBRXZCLFFBQU0sb0JBQThCO0FBQ3BDLFNBQU87QUFBQTtBQUdSLGdDQUFnQyxZQUFnQyxhQUErQztBQUM5RyxRQUFNLE1BQWdCLFlBQVk7QUFDbEMsUUFBTSxZQUFZLE1BQU0sUUFBUSxJQUMvQixJQUFJLElBQUksQ0FBQyxhQUFhO0FBQ3JCLFFBQUksTUFBTSxJQUFJO0FBQVcsYUFBTyxNQUFNLElBQUk7QUFDMUMsUUFBSSxVQUFVLGdCQUFn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
|
package/dist/core/ssr/rss.js
CHANGED
|
@@ -28,7 +28,7 @@ function validateRSS(args) {
|
|
|
28
28
|
}
|
|
29
29
|
function generateRSS(args) {
|
|
30
30
|
validateRSS(args);
|
|
31
|
-
const { srcFile,
|
|
31
|
+
const { srcFile, rssData, site } = args;
|
|
32
32
|
if (rssData.item)
|
|
33
33
|
throw new Error(`[${srcFile}] rss() \`item()\` function was deprecated, and is now \`items: object[]\`.`);
|
|
34
34
|
let xml = `<?xml version="1.0" encoding="UTF-8"?>`;
|
|
@@ -45,7 +45,7 @@ function generateRSS(args) {
|
|
|
45
45
|
xml += `<channel>`;
|
|
46
46
|
xml += `<title><![CDATA[${rssData.title}]]></title>`;
|
|
47
47
|
xml += `<description><![CDATA[${rssData.description}]]></description>`;
|
|
48
|
-
xml += `<link>${canonicalURL(
|
|
48
|
+
xml += `<link>${canonicalURL(site).href}</link>`;
|
|
49
49
|
if (typeof rssData.customData === "string")
|
|
50
50
|
xml += rssData.customData;
|
|
51
51
|
for (const result of rssData.items) {
|
|
@@ -107,7 +107,7 @@ function generateRssFunction(site, route) {
|
|
|
107
107
|
}
|
|
108
108
|
result.xml = {
|
|
109
109
|
url: feedURL,
|
|
110
|
-
content: generateRSS({ rssData, site, srcFile: route.component
|
|
110
|
+
content: generateRSS({ rssData, site, srcFile: route.component })
|
|
111
111
|
};
|
|
112
112
|
results.push(result);
|
|
113
113
|
},
|
|
@@ -120,4 +120,4 @@ export {
|
|
|
120
120
|
generateRssFunction,
|
|
121
121
|
validateRSS
|
|
122
122
|
};
|
|
123
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvc3NyL3Jzcy50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7OztBQUVBO0FBQ0E7QUFHTyxxQkFBcUIsTUFBNkI7QUFDeEQsUUFBTSxFQUFFLFNBQVMsWUFBWTtBQUM3QixNQUFJLENBQUMsUUFBUTtBQUFPLFVBQU0sSUFBSSxNQUFNLElBQUk7QUFDeEMsTUFBSSxDQUFDLFFBQVE7QUFBYSxVQUFNLElBQUksTUFBTSxJQUFJO0FBQzlDLE1BQUssUUFBZ0I7QUFBTSxVQUFNLElBQUksTUFBTSxJQUFJO0FBQy9DLE1BQUksQ0FBQyxNQUFNLFFBQVEsUUFBUTtBQUFRLFVBQU0sSUFBSSxNQUFNLElBQUk7QUFBQTtBQU1qRCxxQkFBcUIsTUFBK0I7QUFDMUQsY0FBWTtBQUNaLFFBQU0sRUFBRSxTQUFTLFNBQVMsU0FBUztBQUNuQyxNQUFLLFFBQWdCO0FBQU0sVUFBTSxJQUFJLE1BQU0sSUFBSTtBQUUvQyxNQUFJLE1BQU07QUFDVixNQUFJLE9BQU8sUUFBUSxlQUFlLFVBQVU7QUFDM0MsV0FBTywwQkFBMEIsUUFBUTtBQUFBO0FBRTFDLFNBQU87QUFHUCxNQUFJLFFBQVEsT0FBTztBQUNsQixlQUFXLENBQUMsR0FBRyxNQUFNLE9BQU8sUUFBUSxRQUFRLFFBQVE7QUFDbkQsYUFBTyxVQUFVLE1BQU07QUFBQTtBQUFBO0FBR3pCLFNBQU87QUFDUCxTQUFPO0FBR1AsU0FBTyxtQkFBbUIsUUFBUTtBQUNsQyxTQUFPLHlCQUF5QixRQUFRO0FBQ3hDLFNBQU8sU0FBUyxhQUFhLE1BQU07QUFDbkMsTUFBSSxPQUFPLFFBQVEsZUFBZTtBQUFVLFdBQU8sUUFBUTtBQUUzRCxhQUFXLFVBQVUsUUFBUSxPQUFPO0FBQ25DLFdBQU87QUFFUCxRQUFJLE9BQU8sV0FBVztBQUFVLFlBQU0sSUFBSSxNQUFNLElBQUksZ0RBQWdELEtBQUssVUFBVTtBQUNuSCxRQUFJLENBQUMsT0FBTztBQUFPLFlBQU0sSUFBSSxNQUFNLElBQUksa0VBQWtFLEtBQUssVUFBVTtBQUN4SCxRQUFJLENBQUMsT0FBTztBQUFNLFlBQU0sSUFBSSxNQUFNLElBQUksaUVBQWlFLEtBQUssVUFBVTtBQUN0SCxXQUFPLG1CQUFtQixPQUFPO0FBRWpDLFVBQU0sV0FBVyxXQUFXLE9BQU8sUUFBUSxPQUFPLE9BQU8sYUFBYSxPQUFPLE1BQU0sTUFBTTtBQUN6RixXQUFPLFNBQVM7QUFDaEIsV0FBTyxTQUFTO0FBQ2hCLFFBQUksT0FBTztBQUFhLGFBQU8seUJBQXlCLE9BQU87QUFDL0QsUUFBSSxPQUFPLFNBQVM7QUFFbkIsVUFBSSxPQUFPLE9BQU8sWUFBWSxZQUFZLE9BQU8sT0FBTyxZQUFZLFVBQVU7QUFDN0UsZUFBTyxVQUFVLElBQUksS0FBSyxPQUFPO0FBQUEsaUJBQ3ZCLE9BQU8sbUJBQW1CLFNBQVMsT0FBTztBQUNwRCxjQUFNLElBQUksTUFBTTtBQUFBO0FBRWpCLGFBQU8sWUFBWSxPQUFPLFFBQVE7QUFBQTtBQUVuQyxRQUFJLE9BQU8sT0FBTyxlQUFlO0FBQVUsYUFBTyxPQUFPO0FBQ3pELFdBQU87QUFBQTtBQUdSLFNBQU87QUFHUCxRQUFNLFVBQVUsYUFBYSxTQUFTO0FBQ3RDLE1BQUksWUFBWSxNQUFNO0FBRXJCLFVBQU0sSUFBSSxNQUFNO0FBQUE7QUFHakIsU0FBTztBQUFBO0FBR0QsaUNBQWlDO0FBQ3ZDLFNBQU87QUFBQTtBQUlELDZCQUE2QixNQUEwQixPQUFpRTtBQUM5SCxNQUFJLFVBQXVCO0FBQzNCLFNBQU87QUFBQSxJQUNOLFdBQVcsb0JBQW9CLE1BQVc7QUFDekMsVUFBSSxDQUFDLE1BQU07QUFDVixjQUFNLElBQUksTUFBTSxJQUFJLE1BQU07QUFBQTtBQUUzQixVQUFJLFNBQW9CO0FBQ3hCLFlBQTZCLFdBQXJCLFdBQXFCLElBQVosb0JBQVksSUFBWixDQUFUO0FBQ1IsWUFBTSxVQUFVLFFBQVE7QUFDeEIsVUFBSSxRQUFRLGVBQWUsTUFBTTtBQUNoQyxnQkFBUSxhQUFhLFFBQVEsUUFBUSxVQUFVO0FBQy9DLGVBQU8sTUFBTTtBQUFBLFVBQ1osS0FBSyxRQUFRO0FBQUEsVUFDYixTQUFTO0FBQUE7QUFBQSxpQkFFQSxPQUFPLFFBQVEsZUFBZSxVQUFVO0FBQ2xELGVBQU8sTUFBTTtBQUFBLFVBQ1osS0FBSyxRQUFRO0FBQUE7QUFBQTtBQUdmLGFBQU8sTUFBTTtBQUFBLFFBQ1osS0FBSztBQUFBLFFBQ0wsU0FBUyxZQUFZLEVBQUUsU0FBUyxNQUFNLFNBQVMsTUFBTTtBQUFBO0FBRXRELGNBQVEsS0FBSztBQUFBO0FBQUEsSUFFZCxLQUFLO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -19,6 +19,17 @@ export interface AstroComponentMetadata {
|
|
|
19
19
|
namespace?: boolean;
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
|
+
/** The flags supported by the Astro CLI */
|
|
23
|
+
export interface CLIFlags {
|
|
24
|
+
projectRoot?: string;
|
|
25
|
+
site?: string;
|
|
26
|
+
sitemap?: boolean;
|
|
27
|
+
hostname?: string;
|
|
28
|
+
port?: number;
|
|
29
|
+
config?: string;
|
|
30
|
+
experimentalStaticBuild?: boolean;
|
|
31
|
+
drafts?: boolean;
|
|
32
|
+
}
|
|
22
33
|
/**
|
|
23
34
|
* Astro.* available in all components
|
|
24
35
|
* Docs: https://docs.astro.build/reference/api-reference/#astro-global
|
|
@@ -113,6 +124,11 @@ export interface AstroUserConfig {
|
|
|
113
124
|
* Default: false
|
|
114
125
|
*/
|
|
115
126
|
drafts?: boolean;
|
|
127
|
+
/**
|
|
128
|
+
* Experimental: Enables "static build mode" for faster builds.
|
|
129
|
+
* Default: false
|
|
130
|
+
*/
|
|
131
|
+
experimentalStaticBuild?: boolean;
|
|
116
132
|
};
|
|
117
133
|
/** Options for the development server run with `astro dev`. */
|
|
118
134
|
devOptions?: {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { AstroConfig } from '../@types/astro';
|
|
2
|
+
import type { Arguments as Flags } from 'yargs-parser';
|
|
2
3
|
import { z } from 'zod';
|
|
3
4
|
export declare const AstroConfigSchema: z.ZodObject<{
|
|
4
5
|
projectRoot: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
|
|
@@ -111,9 +112,9 @@ export declare const AstroConfigSchema: z.ZodObject<{
|
|
|
111
112
|
export declare function validateConfig(userConfig: any, root: string): Promise<AstroConfig>;
|
|
112
113
|
interface LoadConfigOptions {
|
|
113
114
|
cwd?: string;
|
|
114
|
-
|
|
115
|
+
flags?: Flags;
|
|
115
116
|
}
|
|
116
117
|
/** Attempt to load an `astro.config.mjs` file */
|
|
117
|
-
export declare function loadConfig(
|
|
118
|
+
export declare function loadConfig(configOptions: LoadConfigOptions): Promise<AstroConfig>;
|
|
118
119
|
export declare function formatConfigError(err: z.ZodError): string;
|
|
119
120
|
export {};
|
|
@@ -31,6 +31,9 @@ async function compile(config, filename, source, viteTransform, opts) {
|
|
|
31
31
|
internalURL: "astro/internal",
|
|
32
32
|
experimentalStaticExtraction: config.buildOptions.experimentalStaticBuild,
|
|
33
33
|
preprocessStyle: async (value, attrs) => {
|
|
34
|
+
if (config.buildOptions.experimentalStaticBuild) {
|
|
35
|
+
return { code: value };
|
|
36
|
+
}
|
|
34
37
|
const lang = `.${(attrs == null ? void 0 : attrs.lang) || "css"}`.toLowerCase();
|
|
35
38
|
try {
|
|
36
39
|
const result = await transformWithVite({
|
|
@@ -90,4 +93,4 @@ export {
|
|
|
90
93
|
cachedCompilation,
|
|
91
94
|
invalidateCompilation
|
|
92
95
|
};
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLWFzdHJvL2NvbXBpbGUudHMiXSwKICAibWFwcGluZ3MiOiAiQUFLQTtBQUNBO0FBQ0E7QUFDQTtBQUlBLE1BQU0sY0FBYyxJQUFJO0FBR3hCLGVBQWUsU0FBMEQ7QUFDeEUsTUFBSSxZQUFZLFFBQVc7QUFDMUIsV0FBTztBQUFBO0FBRVIsTUFBSSxPQUFPLFlBQVksV0FBVztBQUNqQyxXQUFPO0FBQUE7QUFFUixNQUFJLE9BQU8sV0FBVyxVQUFVO0FBQy9CLFdBQU8sQ0FBQyxDQUFDLFFBQVE7QUFBQTtBQUVsQixTQUFPO0FBQUE7QUFHUix1QkFBdUIsUUFBcUIsVUFBa0IsUUFBZ0IsZUFBOEIsTUFBMkI7QUFHdEksUUFBTSxjQUFjLElBQUksSUFBSSxVQUFVO0FBQ3RDLFFBQU0sZUFBZSxjQUFjO0FBQ25DLFFBQU0sU0FBUyxhQUFhLFdBQVcsY0FBYyxPQUFPLFdBQVcsYUFBYSxXQUFXLGNBQWMsT0FBTztBQUNwSCxRQUFNLFdBQVcsWUFBWSxTQUFTLE9BQU8sT0FBTyxZQUFZLFNBQVMsU0FBUztBQUVsRixNQUFJO0FBS0osUUFBTSxrQkFBa0IsTUFBTSxVQUFVLFFBQVE7QUFBQSxJQUMvQyxJQUFJLFNBQVMsYUFBYTtBQUFBLElBQzFCO0FBQUEsSUFDQSxhQUFhLE9BQU8sWUFBWTtBQUFBLElBQ2hDLE1BQU0sT0FBTyxhQUFhO0FBQUEsSUFDMUIsWUFBWTtBQUFBLElBQ1osV0FBVztBQUFBLElBQ1gsYUFBYTtBQUFBLElBQ2IsOEJBQThCLE9BQU8sYUFBYTtBQUFBLElBRWxELGlCQUFpQixPQUFPLE9BQWUsVUFBa0M7QUFJeEUsVUFBSSxPQUFPLGFBQWEseUJBQXlCO0FBQ2hELGVBQU8sRUFBRSxNQUFNO0FBQUE7QUFHaEIsWUFBTSxPQUFPLElBQUksZ0NBQU8sU0FBUSxRQUFRO0FBQ3hDLFVBQUk7QUFDSCxjQUFNLFNBQVMsTUFBTSxrQkFBa0I7QUFBQSxVQUN0QztBQUFBLFVBQ0E7QUFBQSxVQUNBLElBQUk7QUFBQSxVQUNKLGVBQWU7QUFBQSxVQUNmLEtBQUssTUFBTTtBQUFBO0FBR1osWUFBSTtBQUNKLFlBQUksQ0FBQztBQUFRLGlCQUFPO0FBQ3BCLFlBQUksT0FBTyxLQUFLO0FBQ2YsY0FBSSxPQUFPLE9BQU8sUUFBUSxVQUFVO0FBQ25DLGtCQUFNLE9BQU87QUFBQSxxQkFDSCxPQUFPLElBQUksVUFBVTtBQUMvQixrQkFBTSxPQUFPLElBQUk7QUFBQTtBQUFBO0FBR25CLGVBQU8sRUFBRSxNQUFNLE9BQU8sTUFBTTtBQUFBLGVBQ3BCLEtBQVA7QUFFRCw0QkFBb0I7QUFDcEIsZUFBTztBQUFBO0FBQUE7QUFBQTtBQU1WLE1BQUk7QUFBbUIsVUFBTTtBQUU3QixTQUFPO0FBQUE7QUFHRCwrQkFBK0IsUUFBcUIsVUFBa0I7QUFDNUUsTUFBSSxZQUFZLElBQUksU0FBUztBQUM1QixVQUFNLFFBQVEsWUFBWSxJQUFJO0FBQzlCLFVBQU0sT0FBTztBQUFBO0FBQUE7QUFJZixpQ0FBd0MsUUFBcUIsVUFBa0IsUUFBdUIsZUFBOEIsTUFBMkI7QUFDOUosTUFBSTtBQUNKLE1BQUksQ0FBQyxZQUFZLElBQUksU0FBUztBQUM3QixZQUFRLElBQUk7QUFDWixnQkFBWSxJQUFJLFFBQVE7QUFBQSxTQUNsQjtBQUNOLFlBQVEsWUFBWSxJQUFJO0FBQUE7QUFFekIsTUFBSSxNQUFNLElBQUksV0FBVztBQUN4QixXQUFPLE1BQU0sSUFBSTtBQUFBO0FBR2xCLE1BQUksV0FBVyxNQUFNO0FBQ3BCLFVBQU0sVUFBVSxJQUFJLElBQUksVUFBVTtBQUNsQyxhQUFTLE1BQU0sR0FBRyxTQUFTLFNBQVMsU0FBUztBQUFBO0FBRTlDLFFBQU0sa0JBQWtCLE1BQU0sUUFBUSxRQUFRLFVBQVUsUUFBUSxlQUFlO0FBQy9FLFFBQU0sSUFBSSxVQUFVO0FBQ3BCLFNBQU87QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import esbuild from "esbuild";
|
|
2
|
+
import npath from "path";
|
|
2
3
|
import { fileURLToPath } from "url";
|
|
3
4
|
import { getViteTransform } from "./styles.js";
|
|
4
5
|
import { parseAstroRequest } from "./query.js";
|
|
@@ -15,6 +16,8 @@ function astro({ config, logging }) {
|
|
|
15
16
|
return filename;
|
|
16
17
|
}
|
|
17
18
|
let viteTransform;
|
|
19
|
+
const srcRootWeb = config.src.pathname.slice(config.projectRoot.pathname.length - 1);
|
|
20
|
+
const isBrowserPath = (path) => path.startsWith(srcRootWeb);
|
|
18
21
|
return {
|
|
19
22
|
name: "@astrojs/vite-plugin-astro",
|
|
20
23
|
enforce: "pre",
|
|
@@ -22,7 +25,12 @@ function astro({ config, logging }) {
|
|
|
22
25
|
viteTransform = getViteTransform(resolvedConfig);
|
|
23
26
|
},
|
|
24
27
|
async resolveId(id) {
|
|
25
|
-
|
|
28
|
+
const { query } = parseAstroRequest(id);
|
|
29
|
+
if (query.astro) {
|
|
30
|
+
if (query.type === "style" && isBrowserPath(id)) {
|
|
31
|
+
const outId = npath.posix.join(config.projectRoot.pathname, id);
|
|
32
|
+
return outId;
|
|
33
|
+
}
|
|
26
34
|
return id;
|
|
27
35
|
}
|
|
28
36
|
},
|
|
@@ -118,4 +126,4 @@ function astro({ config, logging }) {
|
|
|
118
126
|
export {
|
|
119
127
|
astro as default
|
|
120
128
|
};
|
|
121
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
129
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLWFzdHJvL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBSUE7QUFDQTtBQUNBO0FBRUE7QUFDQTtBQUNBO0FBQ0E7QUFFQSxNQUFNLDJCQUEyQjtBQVFsQixlQUFlLEVBQUUsUUFBUSxXQUE0QztBQUNuRiw2QkFBMkIsVUFBa0I7QUFDNUMsUUFBSSxTQUFTLFdBQVcsU0FBUztBQUNoQyxpQkFBVyxTQUFTLE1BQU0sT0FBTztBQUFBLGVBQ3ZCLFNBQVMsV0FBVyxRQUFRLENBQUMsU0FBUyxVQUFVLE9BQU8sWUFBWSxXQUFXO0FBQ3hGLGlCQUFXLElBQUksSUFBSSxNQUFNLFVBQVUsT0FBTyxhQUFhO0FBQUE7QUFFeEQsV0FBTztBQUFBO0FBR1IsTUFBSTtBQUdKLFFBQU0sYUFBYSxPQUFPLElBQUksU0FBUyxNQUFNLE9BQU8sWUFBWSxTQUFTLFNBQVM7QUFDbEYsUUFBTSxnQkFBZ0IsQ0FBQyxTQUFpQixLQUFLLFdBQVc7QUFFeEQsU0FBTztBQUFBLElBQ04sTUFBTTtBQUFBLElBQ04sU0FBUztBQUFBLElBQ1QsZUFBZSxnQkFBZ0I7QUFDOUIsc0JBQWdCLGlCQUFpQjtBQUFBO0FBQUEsVUFHNUIsVUFBVSxJQUFJO0FBRW5CLFlBQU0sRUFBRSxVQUFVLGtCQUFrQjtBQUNwQyxVQUFJLE1BQU0sT0FBTztBQUloQixZQUFJLE1BQU0sU0FBUyxXQUFXLGNBQWMsS0FBSztBQUNoRCxnQkFBTSxRQUFRLE1BQU0sTUFBTSxLQUFLLE9BQU8sWUFBWSxVQUFVO0FBQzVELGlCQUFPO0FBQUE7QUFHUixlQUFPO0FBQUE7QUFBQTtBQUFBLFVBR0gsS0FBSyxJQUFJLE1BQU07QUFDcEIsVUFBSSxFQUFFLFVBQVUsVUFBVSxrQkFBa0I7QUFDNUMsVUFBSSxNQUFNLE9BQU87QUFDaEIsWUFBSSxNQUFNLFNBQVMsU0FBUztBQUMzQixjQUFJLE9BQU8sTUFBTSxVQUFVLGFBQWE7QUFDdkMsa0JBQU0sSUFBSSxNQUFNO0FBQUE7QUFHakIsZ0JBQU0sa0JBQWtCLE1BQU0sa0JBQWtCLFFBQVEsa0JBQWtCLFdBQVcsTUFBTSxlQUFlO0FBQzFHLGdCQUFNLFFBQVEsZ0JBQWdCO0FBQzlCLGdCQUFNLE9BQU8sTUFBTSxNQUFNO0FBRXpCLGlCQUFPO0FBQUEsWUFDTjtBQUFBO0FBQUEsbUJBRVMsTUFBTSxTQUFTLFVBQVU7QUFDbkMsY0FBSSxPQUFPLE1BQU0sVUFBVSxhQUFhO0FBQ3ZDLGtCQUFNLElBQUksTUFBTTtBQUFBO0FBR2pCLGdCQUFNLGtCQUFrQixNQUFNLGtCQUFrQixRQUFRLGtCQUFrQixXQUFXLE1BQU0sZUFBZTtBQUMxRyxnQkFBTSxVQUFVLGdCQUFnQjtBQUNoQyxnQkFBTSxnQkFBZ0IsUUFBUSxNQUFNO0FBRXBDLGNBQUksQ0FBQyxlQUFlO0FBQ25CLGtCQUFNLElBQUksTUFBTSw4QkFBOEIsTUFBTTtBQUFBO0FBR3JELGlCQUFPO0FBQUEsWUFDTixNQUFNLGNBQWMsU0FBUyxXQUFXLGNBQWMsT0FBUSxXQUFXLGNBQWM7QUFBQTtBQUFBO0FBQUE7QUFLMUYsYUFBTztBQUFBO0FBQUEsVUFFRixVQUFVLFFBQVEsSUFBSSxNQUFNO0FBQ2pDLFVBQUksQ0FBQyxHQUFHLFNBQVMsV0FBVztBQUMzQjtBQUFBO0FBR0QsVUFBSTtBQUNILGNBQU0sa0JBQWtCLE1BQU0sa0JBQWtCLFFBQVEsSUFBSSxRQUFRLGVBQWU7QUFJbkYsY0FBTSxFQUFFLE1BQU0sUUFBUSxNQUFNLFFBQVEsVUFBVSxnQkFBZ0IsTUFBTTtBQUFBLFVBQ25FLFFBQVE7QUFBQSxVQUNSLFdBQVc7QUFBQSxVQUNYLFlBQVk7QUFBQTtBQUdiLGVBQU87QUFBQSxVQUNOO0FBQUEsVUFDQTtBQUFBO0FBQUEsZUFFTyxLQUFQO0FBU0QsY0FBTSxxQkFBcUIseUJBQXlCLEtBQUs7QUFDekQsWUFBSSxvQkFBb0I7QUFDdkIsY0FBSTtBQUNILGtCQUFNLFFBQVEsVUFBVSxtQkFBbUIsSUFBSSxFQUFFLFFBQVEsTUFBTSxXQUFXLE9BQU8sWUFBWTtBQUFBLG1CQUNyRixnQkFBUDtBQUdELGdCQUFJLGtCQUFrQixlQUFlLFNBQVM7QUFDN0MsNkJBQWUsVUFBVSxlQUFlLFFBQVEsUUFBUSxlQUFlO0FBQUE7QUFFeEUsa0JBQU07QUFBQTtBQUFBO0FBS1IsWUFBSSxJQUFJLE1BQU0sU0FBUyxrQkFBa0I7QUFDeEMsZ0JBQU0sU0FBUyxJQUFJLGdCQUFnQjtBQUFBLFlBQ2xDLFFBQVE7QUFBQSxZQUNSLE9BQU87QUFBQSxZQUNQLE1BQU07QUFBQTtBQUFBO0FBQUE7QUFBQSxRQUlKLEdBQUcsUUFBUSxjQUFjLE9BQU8sY0FBYztBQUFBO0FBQUEsTUFFaEQ7QUFBQTtBQUFBO0FBQUE7QUFJRCxjQUFJLE1BQU0saURBQWlELE9BQU87QUFDbEUsY0FBSSxVQUFVO0FBQUE7QUFBQTtBQUFBO0FBQUEsTUFJYixJQUFJO0FBRUwsY0FBSSxRQUFRLFVBQVUsU0FBUztBQUU5QixnQkFBSSxRQUFRLFVBQVU7QUFBQTtBQUFBO0FBSXhCLGNBQU07QUFBQTtBQUFBO0FBQUEsVUFHRixnQkFBZ0IsU0FBUztBQUU5Qiw0QkFBc0IsUUFBUSxRQUFRO0FBQUE7QUFBQTtBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "astro",
|
|
3
|
-
"version": "0.22.
|
|
3
|
+
"version": "0.22.19",
|
|
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",
|
|
@@ -28,8 +28,6 @@
|
|
|
28
28
|
"./vite-plugin-astro/*": "./dist/vite-plugin-astro/*",
|
|
29
29
|
"./vite-plugin-astro-postprocess": "./dist/vite-plugin-astro-postprocess/index.js",
|
|
30
30
|
"./vite-plugin-astro-postprocess/*": "./dist/vite-plugin-astro-postprocess/*",
|
|
31
|
-
"./vite-plugin-fetch": "./dist/vite-plugin-fetch/index.js",
|
|
32
|
-
"./vite-plugin-fetch/*": "./dist/vite-plugin-fetch/*",
|
|
33
31
|
"./vite-plugin-jsx/*": "./dist/vite-plugin-jsx/*",
|
|
34
32
|
"./vite-plugin-jsx": "./dist/vite-plugin-jsx/index.js",
|
|
35
33
|
"./vite-plugin-markdown": "./dist/vite-plugin-markdown/index.js",
|
|
@@ -53,7 +51,8 @@
|
|
|
53
51
|
"dev": "astro-scripts dev \"src/**/*.ts\"",
|
|
54
52
|
"postbuild": "astro-scripts copy \"src/**/*.astro\"",
|
|
55
53
|
"benchmark": "node test/benchmark/dev.bench.js && node test/benchmark/build.bench.js",
|
|
56
|
-
"test": "mocha --parallel --timeout 15000"
|
|
54
|
+
"test": "mocha --parallel --timeout 15000 --ignore **/lit-element.test.js && mocha **/lit-element.test.js",
|
|
55
|
+
"test:match": "mocha --timeout 15000 -g"
|
|
57
56
|
},
|
|
58
57
|
"dependencies": {
|
|
59
58
|
"@astrojs/compiler": "^0.9.2",
|
|
@@ -88,7 +87,6 @@
|
|
|
88
87
|
"magic-string": "^0.25.7",
|
|
89
88
|
"mime": "^3.0.0",
|
|
90
89
|
"morphdom": "^2.6.1",
|
|
91
|
-
"node-fetch": "^3.0.0",
|
|
92
90
|
"parse5": "^6.0.1",
|
|
93
91
|
"path-to-regexp": "^6.2.0",
|
|
94
92
|
"postcss": "^8.3.8",
|
|
@@ -199,6 +199,16 @@ function warnFailedFetch(err, path) {
|
|
|
199
199
|
socket.addEventListener('message', async ({ data }) => {
|
|
200
200
|
handleMessage(JSON.parse(data));
|
|
201
201
|
});
|
|
202
|
+
|
|
203
|
+
/**
|
|
204
|
+
* This cleans up the query params and removes the `direct` param which is internal.
|
|
205
|
+
* Other query params are preserved.
|
|
206
|
+
*/
|
|
207
|
+
function cleanUrl(pathname) {
|
|
208
|
+
let url = new URL(pathname, location);
|
|
209
|
+
url.searchParams.delete('direct');
|
|
210
|
+
return url.pathname + url.search;
|
|
211
|
+
}
|
|
202
212
|
let isFirstUpdate = true;
|
|
203
213
|
async function handleMessage(payload) {
|
|
204
214
|
switch (payload.type) {
|
|
@@ -230,11 +240,13 @@ async function handleMessage(payload) {
|
|
|
230
240
|
// css-update
|
|
231
241
|
// this is only sent when a css file referenced with <link> is updated
|
|
232
242
|
let { path, timestamp } = update;
|
|
233
|
-
|
|
243
|
+
let searchUrl = cleanUrl(path);
|
|
234
244
|
// can't use querySelector with `[href*=]` here since the link may be
|
|
235
245
|
// using relative paths so we need to use link.href to grab the full
|
|
236
246
|
// URL for the include check.
|
|
237
|
-
const el = [].slice.call(document.querySelectorAll(`link`)).find((e) =>
|
|
247
|
+
const el = [].slice.call(document.querySelectorAll(`link`)).find((e) => {
|
|
248
|
+
return cleanUrl(e.href).includes(searchUrl)
|
|
249
|
+
});
|
|
238
250
|
if (el) {
|
|
239
251
|
const newPath = `${base}${path.slice(1)}${path.includes('?') ? '&' : '?'}t=${timestamp}`;
|
|
240
252
|
el.href = new URL(newPath, el.href).href;
|
|
@@ -1,72 +0,0 @@
|
|
|
1
|
-
import MagicString from "magic-string";
|
|
2
|
-
import { walk } from "estree-walker";
|
|
3
|
-
function isSSR(options) {
|
|
4
|
-
if (options === void 0) {
|
|
5
|
-
return false;
|
|
6
|
-
}
|
|
7
|
-
if (typeof options === "boolean") {
|
|
8
|
-
return options;
|
|
9
|
-
}
|
|
10
|
-
if (typeof options == "object") {
|
|
11
|
-
return !!options.ssr;
|
|
12
|
-
}
|
|
13
|
-
return false;
|
|
14
|
-
}
|
|
15
|
-
const SUPPORTED_FILES = /\.(astro|svelte|vue|[cm]?js|jsx|[cm]?ts|tsx)$/;
|
|
16
|
-
const IGNORED_MODULES = [/astro\/dist\/runtime\/server/, /\/node-fetch\//];
|
|
17
|
-
const DEFINE_FETCH = `import fetch from 'node-fetch';
|
|
18
|
-
`;
|
|
19
|
-
function isIdentifier(node) {
|
|
20
|
-
return node.type === "Identifier";
|
|
21
|
-
}
|
|
22
|
-
function pluginFetch() {
|
|
23
|
-
return {
|
|
24
|
-
name: "@astrojs/vite-plugin-fetch",
|
|
25
|
-
enforce: "post",
|
|
26
|
-
async transform(code, id, opts) {
|
|
27
|
-
const ssr = isSSR(opts);
|
|
28
|
-
if (!ssr) {
|
|
29
|
-
return null;
|
|
30
|
-
}
|
|
31
|
-
if (!id.match(SUPPORTED_FILES)) {
|
|
32
|
-
return null;
|
|
33
|
-
}
|
|
34
|
-
if (!code.includes("fetch")) {
|
|
35
|
-
return null;
|
|
36
|
-
}
|
|
37
|
-
const ast = this.parse(code);
|
|
38
|
-
let fetchDeclared = false;
|
|
39
|
-
walk(ast, {
|
|
40
|
-
enter(node, parent) {
|
|
41
|
-
if (fetchDeclared)
|
|
42
|
-
return this.skip();
|
|
43
|
-
if (isIdentifier(node)) {
|
|
44
|
-
if (node.name === "fetch" && !parent.type.endsWith("Expression")) {
|
|
45
|
-
fetchDeclared = true;
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
});
|
|
50
|
-
if (fetchDeclared) {
|
|
51
|
-
return null;
|
|
52
|
-
}
|
|
53
|
-
for (const ignored of IGNORED_MODULES) {
|
|
54
|
-
if (id.match(ignored)) {
|
|
55
|
-
return null;
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
const s = new MagicString(code);
|
|
59
|
-
s.prepend(DEFINE_FETCH);
|
|
60
|
-
const result = s.toString();
|
|
61
|
-
const map = s.generateMap({
|
|
62
|
-
source: id,
|
|
63
|
-
includeContent: true
|
|
64
|
-
});
|
|
65
|
-
return { code: result, map };
|
|
66
|
-
}
|
|
67
|
-
};
|
|
68
|
-
}
|
|
69
|
-
export {
|
|
70
|
-
pluginFetch as default
|
|
71
|
-
};
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLWZldGNoL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBRUE7QUFDQTtBQUdBLGVBQWUsU0FBMEQ7QUFDeEUsTUFBSSxZQUFZLFFBQVc7QUFDMUIsV0FBTztBQUFBO0FBRVIsTUFBSSxPQUFPLFlBQVksV0FBVztBQUNqQyxXQUFPO0FBQUE7QUFFUixNQUFJLE9BQU8sV0FBVyxVQUFVO0FBQy9CLFdBQU8sQ0FBQyxDQUFDLFFBQVE7QUFBQTtBQUVsQixTQUFPO0FBQUE7QUFLUixNQUFNLGtCQUFrQjtBQUN4QixNQUFNLGtCQUFrQixDQUFDLGdDQUFnQztBQUN6RCxNQUFNLGVBQWU7QUFBQTtBQUVyQixzQkFBc0IsTUFBb0M7QUFDekQsU0FBTyxLQUFLLFNBQVM7QUFBQTtBQUdQLHVCQUErQjtBQUM3QyxTQUFPO0FBQUEsSUFDTixNQUFNO0FBQUEsSUFDTixTQUFTO0FBQUEsVUFDSCxVQUFVLE1BQU0sSUFBSSxNQUFNO0FBQy9CLFlBQU0sTUFBTSxNQUFNO0FBRWxCLFVBQUksQ0FBQyxLQUFLO0FBQ1QsZUFBTztBQUFBO0FBR1IsVUFBSSxDQUFDLEdBQUcsTUFBTSxrQkFBa0I7QUFDL0IsZUFBTztBQUFBO0FBR1IsVUFBSSxDQUFDLEtBQUssU0FBUyxVQUFVO0FBQzVCLGVBQU87QUFBQTtBQUdSLFlBQU0sTUFBTSxLQUFLLE1BQU07QUFDdkIsVUFBSSxnQkFBZ0I7QUFDcEIsV0FBSyxLQUFLO0FBQUEsUUFDVCxNQUFNLE1BQU0sUUFBUTtBQUNuQixjQUFJO0FBQWUsbUJBQU8sS0FBSztBQUMvQixjQUFJLGFBQWEsT0FBTztBQUV2QixnQkFBSSxLQUFLLFNBQVMsV0FBVyxDQUFDLE9BQU8sS0FBSyxTQUFTLGVBQWU7QUFDakUsOEJBQWdCO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFPcEIsVUFBSSxlQUFlO0FBQ2xCLGVBQU87QUFBQTtBQUlSLGlCQUFXLFdBQVcsaUJBQWlCO0FBQ3RDLFlBQUksR0FBRyxNQUFNLFVBQVU7QUFDdEIsaUJBQU87QUFBQTtBQUFBO0FBR1QsWUFBTSxJQUFJLElBQUksWUFBWTtBQUMxQixRQUFFLFFBQVE7QUFDVixZQUFNLFNBQVMsRUFBRTtBQUNqQixZQUFNLE1BQU0sRUFBRSxZQUFZO0FBQUEsUUFDekIsUUFBUTtBQUFBLFFBQ1IsZ0JBQWdCO0FBQUE7QUFFakIsYUFBTyxFQUFFLE1BQU0sUUFBUTtBQUFBO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|