astro 0.22.7 → 0.22.11
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/core/build/fs.js +28 -0
- package/dist/core/build/index.js +2 -1
- package/dist/core/build/static-build.js +55 -9
- package/dist/core/create-vite.js +1 -2
- package/dist/core/dev/template/4xx.js +45 -38
- package/dist/core/path.js +43 -0
- package/dist/core/preview/index.js +55 -9
- package/dist/core/ssr/index.js +3 -2
- package/dist/core/ssr/sitemap.js +2 -2
- package/dist/types/@types/astro.d.ts +2 -0
- package/dist/types/core/build/fs.d.ts +3 -0
- package/dist/types/core/build/static-build.d.ts +1 -0
- package/dist/types/core/dev/template/4xx.d.ts +1 -0
- package/dist/types/core/path.d.ts +8 -0
- package/dist/types/core/preview/index.d.ts +1 -1
- package/dist/vite-plugin-astro/index.js +5 -2
- package/dist/vite-plugin-build-css/index.js +36 -12
- package/dist/vite-plugin-build-html/index.js +15 -10
- package/package.json +3 -1
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import fs from "fs";
|
|
2
|
+
import npath from "path";
|
|
3
|
+
import { fileURLToPath } from "url";
|
|
4
|
+
function emptyDir(dir, skip) {
|
|
5
|
+
for (const file of fs.readdirSync(dir)) {
|
|
6
|
+
if (skip == null ? void 0 : skip.has(file)) {
|
|
7
|
+
continue;
|
|
8
|
+
}
|
|
9
|
+
const abs = npath.resolve(dir, file);
|
|
10
|
+
if (fs.lstatSync(abs).isDirectory()) {
|
|
11
|
+
emptyDir(abs);
|
|
12
|
+
fs.rmdirSync(abs);
|
|
13
|
+
} else {
|
|
14
|
+
fs.unlinkSync(abs);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
function prepareOutDir(astroConfig) {
|
|
19
|
+
const outDir = fileURLToPath(astroConfig.dist);
|
|
20
|
+
if (fs.existsSync(outDir)) {
|
|
21
|
+
return emptyDir(outDir, new Set([".git"]));
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
export {
|
|
25
|
+
emptyDir,
|
|
26
|
+
prepareOutDir
|
|
27
|
+
};
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvYnVpbGQvZnMudHMiXSwKICAibWFwcGluZ3MiOiAiQUFFQTtBQUNBO0FBQ0E7QUFFTyxrQkFBa0IsS0FBYSxNQUEwQjtBQUMvRCxhQUFXLFFBQVEsR0FBRyxZQUFZLE1BQU07QUFDdkMsUUFBSSw2QkFBTSxJQUFJLE9BQU87QUFDcEI7QUFBQTtBQUVELFVBQU0sTUFBTSxNQUFNLFFBQVEsS0FBSztBQUUvQixRQUFJLEdBQUcsVUFBVSxLQUFLLGVBQWU7QUFDcEMsZUFBUztBQUNULFNBQUcsVUFBVTtBQUFBLFdBQ1A7QUFDTixTQUFHLFdBQVc7QUFBQTtBQUFBO0FBQUE7QUFLVix1QkFBdUIsYUFBMEI7QUFDdkQsUUFBTSxTQUFTLGNBQWMsWUFBWTtBQUN6QyxNQUFJLEdBQUcsV0FBVyxTQUFTO0FBQzFCLFdBQU8sU0FBUyxRQUFRLElBQUksSUFBSSxDQUFDO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|
package/dist/core/build/index.js
CHANGED
|
@@ -66,6 +66,7 @@ class AstroBuilder {
|
|
|
66
66
|
astroConfig: this.config,
|
|
67
67
|
logging: this.logging,
|
|
68
68
|
origin: this.origin,
|
|
69
|
+
pageNames,
|
|
69
70
|
routeCache: this.routeCache,
|
|
70
71
|
viteConfig: this.viteConfig
|
|
71
72
|
});
|
|
@@ -117,4 +118,4 @@ class AstroBuilder {
|
|
|
117
118
|
export {
|
|
118
119
|
build as default
|
|
119
120
|
};
|
|
120
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
121
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvYnVpbGQvaW5kZXgudHMiXSwKICAibWFwcGluZ3MiOiAiQUFHQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFRQSxxQkFBb0MsUUFBcUIsVUFBd0IsRUFBRSxTQUFTLHFCQUFvQztBQUUvSCxXQUFTLFlBQVk7QUFBQSxJQUNwQixTQUFTO0FBQUE7QUFHVixRQUFNLFVBQVUsSUFBSSxhQUFhLFFBQVE7QUFDekMsUUFBTSxRQUFRO0FBQUE7QUFHZixtQkFBbUI7QUFBQSxFQVVsQixZQUFZLFFBQXFCLFNBQXVCO0FBUGhELGdCQUFPO0FBRVAsc0JBQXlCO0FBTWhDLFFBQUksQ0FBQyxPQUFPLGFBQWEsUUFBUSxPQUFPLGFBQWEsWUFBWSxPQUFPO0FBQ3ZFLFdBQUssUUFBUSxTQUFTLFVBQVU7QUFBQTtBQUdqQyxRQUFJLFFBQVE7QUFBTSxXQUFLLE9BQU8sUUFBUTtBQUN0QyxTQUFLLFNBQVM7QUFDZCxVQUFNLE9BQU8sT0FBTyxXQUFXO0FBQy9CLFNBQUssVUFBVSxRQUFRO0FBQ3ZCLFNBQUssU0FBUyxPQUFPLGFBQWEsT0FBTyxJQUFJLElBQUksT0FBTyxhQUFhLE1BQU0sU0FBUyxvQkFBb0I7QUFDeEcsU0FBSyxXQUFXLG9CQUFvQixFQUFFLFVBQVUsS0FBSztBQUFBO0FBQUEsUUFHaEQsUUFBUTtBQUNiLFVBQU0sRUFBRSxTQUFTLFdBQVc7QUFDNUIsVUFBTSxRQUFnQztBQUN0QyxVQUFNLE9BQU8sWUFBWTtBQUN6QixVQUFNLFlBQVksWUFBWTtBQUM5QixVQUFNLGFBQWEsTUFBTSxXQUN4QixLQUFLLFlBQ0o7QUFBQSxNQUNDLE1BQU0sS0FBSztBQUFBLE1BQ1gsUUFBUTtBQUFBLFFBQ1AsS0FBSyxFQUFFLFNBQVM7QUFBQSxRQUNoQixnQkFBZ0I7QUFBQTtBQUFBLE9BR2xCLEtBQUssT0FBTyxRQUFRLEtBRXJCLEVBQUUsYUFBYSxLQUFLLFFBQVE7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
|
|
@@ -9,6 +9,18 @@ import { rollupPluginAstroBuildCSS } from "../../vite-plugin-build-css/index.js"
|
|
|
9
9
|
import { getParamsAndProps } from "../ssr/index.js";
|
|
10
10
|
import { createResult } from "../ssr/result.js";
|
|
11
11
|
import { renderPage } from "../../runtime/server/index.js";
|
|
12
|
+
import { prepareOutDir } from "./fs.js";
|
|
13
|
+
function addPageName(pathname, opts) {
|
|
14
|
+
const pathrepl = opts.astroConfig.buildOptions.pageUrlFormat === "directory" ? "/index.html" : pathname === "/" ? "index.html" : ".html";
|
|
15
|
+
opts.pageNames.push(pathname.replace(/\/?$/, pathrepl).replace(/^\//, ""));
|
|
16
|
+
}
|
|
17
|
+
function chunkIsPage(output, internals) {
|
|
18
|
+
if (output.type !== "chunk") {
|
|
19
|
+
return false;
|
|
20
|
+
}
|
|
21
|
+
const chunk = output;
|
|
22
|
+
return chunk.facadeModuleId && (internals.entrySpecifierToBundleMap.has(chunk.facadeModuleId) || internals.entrySpecifierToBundleMap.has("/" + chunk.facadeModuleId));
|
|
23
|
+
}
|
|
12
24
|
async function staticBuild(opts) {
|
|
13
25
|
const { allPages, astroConfig } = opts;
|
|
14
26
|
const pageInput = new Set();
|
|
@@ -30,6 +42,7 @@ async function staticBuild(opts) {
|
|
|
30
42
|
facadeIdToPageDataMap.set(astroModuleId, pageData);
|
|
31
43
|
}
|
|
32
44
|
const internals = createBuildInternals();
|
|
45
|
+
prepareOutDir(astroConfig);
|
|
33
46
|
const [ssrResult] = await Promise.all([ssrBuild(opts, internals, pageInput), clientBuild(opts, internals, jsInput)]);
|
|
34
47
|
await generatePages(ssrResult, opts, internals, facadeIdToPageDataMap);
|
|
35
48
|
await cleanSsrOutput(opts);
|
|
@@ -40,7 +53,7 @@ async function ssrBuild(opts, internals, input) {
|
|
|
40
53
|
logLevel: "error",
|
|
41
54
|
mode: "production",
|
|
42
55
|
build: {
|
|
43
|
-
emptyOutDir:
|
|
56
|
+
emptyOutDir: false,
|
|
44
57
|
minify: false,
|
|
45
58
|
outDir: fileURLToPath(astroConfig.dist),
|
|
46
59
|
ssr: true,
|
|
@@ -68,6 +81,9 @@ async function ssrBuild(opts, internals, input) {
|
|
|
68
81
|
}
|
|
69
82
|
async function clientBuild(opts, internals, input) {
|
|
70
83
|
const { astroConfig, viteConfig } = opts;
|
|
84
|
+
if (!input.size) {
|
|
85
|
+
return null;
|
|
86
|
+
}
|
|
71
87
|
return await vite.build({
|
|
72
88
|
logLevel: "error",
|
|
73
89
|
mode: "production",
|
|
@@ -98,17 +114,31 @@ async function clientBuild(opts, internals, input) {
|
|
|
98
114
|
base: astroConfig.buildOptions.site ? new URL(astroConfig.buildOptions.site).pathname : "/"
|
|
99
115
|
});
|
|
100
116
|
}
|
|
117
|
+
async function collectRenderers(opts) {
|
|
118
|
+
const pageData = Object.values(opts.allPages)[0];
|
|
119
|
+
const viteLoadedRenderers = pageData.preload[0];
|
|
120
|
+
const renderers = await Promise.all(viteLoadedRenderers.map(async (r) => {
|
|
121
|
+
const mod = await import(r.serverEntry);
|
|
122
|
+
return Object.create(r, {
|
|
123
|
+
ssr: {
|
|
124
|
+
value: mod.default
|
|
125
|
+
}
|
|
126
|
+
});
|
|
127
|
+
}));
|
|
128
|
+
return renderers;
|
|
129
|
+
}
|
|
101
130
|
async function generatePages(result, opts, internals, facadeIdToPageDataMap) {
|
|
102
131
|
debug(opts.logging, "generate", "End build step, now generating");
|
|
132
|
+
const renderers = await collectRenderers(opts);
|
|
103
133
|
const generationPromises = [];
|
|
104
134
|
for (let output of result.output) {
|
|
105
|
-
if (output
|
|
106
|
-
generationPromises.push(generatePage(output, opts, internals, facadeIdToPageDataMap));
|
|
135
|
+
if (chunkIsPage(output, internals)) {
|
|
136
|
+
generationPromises.push(generatePage(output, opts, internals, facadeIdToPageDataMap, renderers));
|
|
107
137
|
}
|
|
108
138
|
}
|
|
109
139
|
await Promise.all(generationPromises);
|
|
110
140
|
}
|
|
111
|
-
async function generatePage(output, opts, internals, facadeIdToPageDataMap) {
|
|
141
|
+
async function generatePage(output, opts, internals, facadeIdToPageDataMap, renderers) {
|
|
112
142
|
const { astroConfig } = opts;
|
|
113
143
|
let url = new URL("./" + output.fileName, astroConfig.dist);
|
|
114
144
|
const facadeId = output.facadeModuleId;
|
|
@@ -123,7 +153,8 @@ async function generatePage(output, opts, internals, facadeIdToPageDataMap) {
|
|
|
123
153
|
pageData,
|
|
124
154
|
internals,
|
|
125
155
|
linkIds,
|
|
126
|
-
Component
|
|
156
|
+
Component,
|
|
157
|
+
renderers
|
|
127
158
|
};
|
|
128
159
|
const renderPromises = pageData.paths.map((path) => {
|
|
129
160
|
return generatePath(path, opts, generationOptions);
|
|
@@ -131,9 +162,10 @@ async function generatePage(output, opts, internals, facadeIdToPageDataMap) {
|
|
|
131
162
|
return await Promise.all(renderPromises);
|
|
132
163
|
}
|
|
133
164
|
async function generatePath(pathname, opts, gopts) {
|
|
134
|
-
const { astroConfig, logging, origin, routeCache } = opts;
|
|
135
|
-
const { Component, internals, linkIds, pageData } = gopts;
|
|
136
|
-
|
|
165
|
+
const { astroConfig, logging, origin, pageNames, routeCache } = opts;
|
|
166
|
+
const { Component, internals, linkIds, pageData, renderers } = gopts;
|
|
167
|
+
addPageName(pathname, opts);
|
|
168
|
+
const [, mod] = pageData.preload;
|
|
137
169
|
try {
|
|
138
170
|
const [params, pageProps] = await getParamsAndProps({
|
|
139
171
|
route: pageData.route,
|
|
@@ -181,6 +213,20 @@ async function cleanSsrOutput(opts) {
|
|
|
181
213
|
function vitePluginNewBuild(input, internals, ext) {
|
|
182
214
|
return {
|
|
183
215
|
name: "@astro/rollup-plugin-new-build",
|
|
216
|
+
config(config, options) {
|
|
217
|
+
var _a;
|
|
218
|
+
const extra = {};
|
|
219
|
+
const noExternal = [], external = [];
|
|
220
|
+
if (options.command === "build" && ((_a = config.build) == null ? void 0 : _a.ssr)) {
|
|
221
|
+
noExternal.push("astro");
|
|
222
|
+
external.push("shiki");
|
|
223
|
+
}
|
|
224
|
+
extra.ssr = {
|
|
225
|
+
external,
|
|
226
|
+
noExternal
|
|
227
|
+
};
|
|
228
|
+
return extra;
|
|
229
|
+
},
|
|
184
230
|
configResolved(resolvedConfig) {
|
|
185
231
|
const plugins = resolvedConfig.plugins;
|
|
186
232
|
const viteAsset = plugins.find((p) => p.name === "vite:asset");
|
|
@@ -223,4 +269,4 @@ export {
|
|
|
223
269
|
staticBuild,
|
|
224
270
|
vitePluginNewBuild
|
|
225
271
|
};
|
|
226
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
272
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvYnVpbGQvc3RhdGljLWJ1aWxkLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBVUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBWUEscUJBQXFCLFVBQWtCLE1BQWdDO0FBQ3RFLFFBQU0sV0FBVyxLQUFLLFlBQVksYUFBYSxrQkFBa0IsY0FBYyxnQkFBZ0IsYUFBYSxNQUFNLGVBQWU7QUFDakksT0FBSyxVQUFVLEtBQUssU0FBUyxRQUFRLFFBQVEsVUFBVSxRQUFRLE9BQU87QUFBQTtBQUl2RSxxQkFBcUIsUUFBbUMsV0FBMkI7QUFDbEYsTUFBSSxPQUFPLFNBQVMsU0FBUztBQUM1QixXQUFPO0FBQUE7QUFFUixRQUFNLFFBQVE7QUFDZCxTQUFPLE1BQU0sa0JBQW1CLFdBQVUsMEJBQTBCLElBQUksTUFBTSxtQkFBbUIsVUFBVSwwQkFBMEIsSUFBSSxNQUFNLE1BQU07QUFBQTtBQUd0SiwyQkFBa0MsTUFBMEI7QUFDM0QsUUFBTSxFQUFFLFVBQVUsZ0JBQWdCO0FBR2xDLFFBQU0sWUFBWSxJQUFJO0FBR3RCLFFBQU0sVUFBVSxJQUFJO0FBSXBCLFFBQU0sd0JBQXdCLElBQUk7QUFFbEMsYUFBVyxDQUFDLFdBQVcsYUFBYSxPQUFPLFFBQVEsV0FBVztBQUM3RCxVQUFNLENBQUMsV0FBVyxPQUFPLFNBQVM7QUFDbEMsVUFBTSxXQUFXLElBQUk7QUFFckIsVUFBTSxrQkFBa0IsSUFBSSxJQUFJO0FBQUEsTUFFL0IsR0FBRyxTQUFTO0FBQUEsTUFFWixHQUFHLFNBQVM7QUFBQSxNQUVaLEdBQUcsVUFBVSxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUMsU0FBUyxRQUFRLElBQUksQ0FBQyxhQUFhLFNBQVM7QUFBQTtBQUdqRixlQUFXLGFBQWEsaUJBQWlCO0FBQ3hDLGNBQVEsSUFBSTtBQUFBO0FBR2IsUUFBSSxnQkFBZ0IsSUFBSSxJQUFJLE9BQU8sV0FBVyxZQUFZ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
|
package/dist/core/create-vite.js
CHANGED
|
@@ -66,11 +66,10 @@ async function createVite(inlineConfig, { astroConfig, logging, devServer }) {
|
|
|
66
66
|
throw new Error(`${name}: ${err}`);
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
|
-
viteConfig = vite.mergeConfig(viteConfig, astroConfig.vite || {});
|
|
70
69
|
viteConfig = vite.mergeConfig(viteConfig, inlineConfig);
|
|
71
70
|
return viteConfig;
|
|
72
71
|
}
|
|
73
72
|
export {
|
|
74
73
|
createVite
|
|
75
74
|
};
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NvcmUvY3JlYXRlLXZpdGUudHMiXSwKICAibWFwcGluZ3MiOiAiQUFJQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFHQSxNQUFNLGtCQUFrQixJQUFJLElBQUk7QUFBQSxFQUMvQixHQUFHLGVBQWUsSUFBSSxDQUFDLFNBQVMsUUFBUTtBQUFBLEVBQ3hDO0FBQUEsRUFDQTtBQUFBLEVBQ0E7QUFBQSxFQUNBO0FBQUEsRUFDQTtBQUFBLEVBQ0E7QUFBQSxFQUNBO0FBQUEsRUFDQTtBQUFBLEVBQ0E7QUFBQTtBQUVELE1BQU0sb0JBQW9CLElBQUksSUFBSTtBQUFBLEVBQ2pDO0FBQUE7QUFhRCwwQkFBaUMsY0FBaUMsRUFBRSxhQUFhLFNBQVMsYUFBNEQ7QUFFckosTUFBSSxhQUFnQztBQUFBLElBQ25DLFVBQVUsY0FBYyxJQUFJLElBQUkseUJBQXlCLFlBQVk7QUFBQSxJQUNyRSxhQUFhO0FBQUEsSUFDYixVQUFVO0FBQUEsSUFDVixjQUFjO0FBQUEsTUFDYixTQUFTLENBQUM7QUFBQTtBQUFBLElBRVgsU0FBUztBQUFBLE1BQ1Isc0JBQXNCLEVBQUUsUUFBUTtBQUFBLE1BQ2hDLGdCQUFnQixFQUFFLFFBQVEsYUFBYSxXQUFXO0FBQUEsTUFDbEQsbUJBQW1CLEVBQUUsUUFBUSxhQUFhO0FBQUEsTUFDMUMsY0FBYyxFQUFFLFFBQVEsYUFBYTtBQUFBLE1BQ3JDLDJCQUEyQixFQUFFLFFBQVEsYUFBYTtBQUFBO0FBQUEsSUFFbkQsV0FBVyxjQUFjLFlBQVk7QUFBQSxJQUNyQyxNQUFNLGNBQWMsWUFBWTtBQUFBLElBQ2hDLFdBQVc7QUFBQSxJQUNYLFFBQVE7QUFBQSxNQUNQLE9BQU87QUFBQSxNQUNQLEtBQUssUUFBUSxJQUFJLGFBQWEsVUFBVSxRQUFRLElBQUksYUFBYSxlQUFlLFFBQVE7QUFBQSxNQUV4RixPQUFPO0FBQUE7QUFBQSxJQUtSLEtBQUs7QUFBQSxNQUNKLFVBQVUsQ0FBQyxHQUFHO0FBQUEsTUFDZCxZQUFZLENBQUMsR0FBRztBQUFBO0FBQUE7QUFLbEIsYUFBVyxRQUFRLFlBQVksV0FBVztBQUN6QyxRQUFJO0FBQ0gsWUFBTSxFQUFFLFNBQVMsYUFBYSxNQUFNLE9BQU8sa0JBQWtCLE1BQU07QUFDbkUsVUFBSSxDQUFDO0FBQVU7QUFFZixVQUFJLFNBQVMsWUFBWTtBQUN4QixZQUFJLE9BQU8sU0FBUyxlQUFlLFlBQVk7QUFDOUMsZ0JBQU0sSUFBSSxNQUFNLEdBQUcscURBQXFELE9BQU8sU0FBUztBQUFBO0FBRXpGLGNBQU0saUJBQWlCLE1BQU0sU0FBUyxXQUFXLEVBQUUsTUFBTSxhQUFhLE1BQU0sU0FBUyxhQUFhLFNBQVMsZUFBZSxVQUFVO0FBQ3BJLHFCQUFhLEtBQUssWUFBWSxZQUFZO0FBQUE7QUFBQSxhQUVuQyxLQUFQO0FBQ0QsWUFBTSxJQUFJLE1BQU0sR0FBRyxTQUFTO0FBQUE7QUFBQTtBQUk5QixlQUFhLEtBQUssWUFBWSxZQUFZO0FBQzFDLFNBQU87QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -2,42 +2,42 @@ import { encode } from "html-entities";
|
|
|
2
2
|
import { baseCSS } from "./css.js";
|
|
3
3
|
function template({ title, pathname, statusCode = 404, tabTitle, body }) {
|
|
4
4
|
return `<!doctype html>
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
5
|
+
<html lang="en">
|
|
6
|
+
<head>
|
|
7
|
+
<meta charset="UTF-8">
|
|
8
|
+
<title>${tabTitle}</title>
|
|
9
|
+
<style>
|
|
10
|
+
${baseCSS}
|
|
11
11
|
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
12
|
+
.center {
|
|
13
|
+
display: flex;
|
|
14
|
+
flex-direction: column;
|
|
15
|
+
justify-content: center;
|
|
16
|
+
align-items: center;
|
|
17
|
+
height: 100vh;
|
|
18
|
+
width: 100vw;
|
|
19
|
+
}
|
|
20
20
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
.statusCode {
|
|
22
|
+
color: var(--orange);
|
|
23
|
+
}
|
|
24
24
|
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
25
|
+
.astro {
|
|
26
|
+
height: 120px;
|
|
27
|
+
width: 120px;
|
|
28
|
+
}
|
|
29
|
+
</style>
|
|
30
|
+
</head>
|
|
31
|
+
<body>
|
|
32
|
+
<main class="center">
|
|
33
|
+
<svg class="astro" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M163.008 18.929c1.944 2.413 2.935 5.67 4.917 12.181l43.309 142.27a180.277 180.277 0 00-51.778-17.53l-28.198-95.29a3.67 3.67 0 00-7.042.01l-27.857 95.232a180.225 180.225 0 00-52.01 17.557l43.52-142.281c1.99-6.502 2.983-9.752 4.927-12.16a15.999 15.999 0 016.484-4.798c2.872-1.154 6.271-1.154 13.07-1.154h31.085c6.807 0 10.211 0 13.086 1.157a16.004 16.004 0 016.487 4.806z" fill="white"></path><path fill-rule="evenodd" clip-rule="evenodd" d="M168.19 180.151c-7.139 6.105-21.39 10.268-37.804 10.268-20.147 0-37.033-6.272-41.513-14.707-1.602 4.835-1.961 10.367-1.961 13.902 0 0-1.056 17.355 11.015 29.426 0-6.268 5.081-11.349 11.349-11.349 10.743 0 10.731 9.373 10.721 16.977v.679c0 11.542 7.054 21.436 17.086 25.606a23.27 23.27 0 01-2.339-10.2c0-11.008 6.463-15.107 13.974-19.87 5.976-3.79 12.616-8.001 17.192-16.449a31.024 31.024 0 003.743-14.82c0-3.299-.513-6.479-1.463-9.463z" fill="#ff5d01"></path></svg>
|
|
34
|
+
<h1>${statusCode ? `<span class="statusCode">${statusCode}: </span> ` : ""}<span class="statusMessage">${title}</span></h1>
|
|
35
|
+
${body || `
|
|
36
|
+
<pre>Path: ${encode(pathname)}</pre>
|
|
37
|
+
`}
|
|
38
|
+
</main>
|
|
39
|
+
</body>
|
|
40
|
+
</html>`;
|
|
41
41
|
}
|
|
42
42
|
function subpathNotUsedTemplate(base, pathname) {
|
|
43
43
|
return template({
|
|
@@ -45,14 +45,21 @@ function subpathNotUsedTemplate(base, pathname) {
|
|
|
45
45
|
statusCode: 404,
|
|
46
46
|
title: "Not found",
|
|
47
47
|
tabTitle: "404: Not Found",
|
|
48
|
-
body:
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
48
|
+
body: `<p>In your <code>buildOptions.site</code> you have your base path set to <a href="${base}">${base}</a>. Do you want to go there instead?</p>
|
|
49
|
+
<p>Come to our <a href="https://astro.build/chat">Discord</a> if you need help.</p>`
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
function notFoundTemplate(pathname, message = "Not found") {
|
|
53
|
+
return template({
|
|
54
|
+
pathname,
|
|
55
|
+
statusCode: 404,
|
|
56
|
+
title: message,
|
|
57
|
+
tabTitle: `404: ${message}`
|
|
52
58
|
});
|
|
53
59
|
}
|
|
54
60
|
export {
|
|
55
61
|
template as default,
|
|
62
|
+
notFoundTemplate,
|
|
56
63
|
subpathNotUsedTemplate
|
|
57
64
|
};
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vLi4vc3JjL2NvcmUvZGV2L3RlbXBsYXRlLzR4eC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUFBO0FBQ0E7QUFnQmUsa0JBQWtCLEVBQUUsT0FBTyxVQUFVLGFBQWEsS0FBSyxVQUFVLFFBQXNDO0FBQ3JILFNBQU87QUFBQTtBQUFBO0FBQUE7QUFBQSxXQUlHO0FBQUE7QUFBQSxLQUVOO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBLFNBd0JJLGFBQWEsNEJBQTRCLHlCQUF5QixpQ0FBaUM7QUFBQSxLQUV4RyxRQUNBO0FBQUEsaUJBQ2EsT0FBTztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFRakIsZ0NBQWdDLE1BQWMsVUFBa0I7QUFDdEUsU0FBTyxTQUFTO0FBQUEsSUFDZjtBQUFBLElBQ0EsWUFBWTtBQUFBLElBQ1osT0FBTztBQUFBLElBQ1AsVUFBVTtBQUFBLElBQ1YsTUFBTSxxRkFBcUYsU0FBUztBQUFBO0FBQUE7QUFBQTtBQUsvRiwwQkFBMEIsVUFBa0IsVUFBVSxhQUFhO0FBQ3pFLFNBQU8sU0FBUztBQUFBLElBQ2Y7QUFBQSxJQUNBLFlBQVk7QUFBQSxJQUNaLE9BQU87QUFBQSxJQUNQLFVBQVUsUUFBUTtBQUFBO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
function appendForwardSlash(path) {
|
|
2
|
+
return path.endsWith("/") ? path : path + "/";
|
|
3
|
+
}
|
|
4
|
+
function prependForwardSlash(path) {
|
|
5
|
+
return path[0] === "/" ? path : "/" + path;
|
|
6
|
+
}
|
|
7
|
+
function removeEndingForwardSlash(path) {
|
|
8
|
+
return path.endsWith("/") ? path.slice(0, path.length - 1) : path;
|
|
9
|
+
}
|
|
10
|
+
function startsWithDotDotSlash(path) {
|
|
11
|
+
const c1 = path[0];
|
|
12
|
+
const c2 = path[1];
|
|
13
|
+
const c3 = path[2];
|
|
14
|
+
return c1 === "." && c2 === "." && c3 === "/";
|
|
15
|
+
}
|
|
16
|
+
function startsWithDotSlash(path) {
|
|
17
|
+
const c1 = path[0];
|
|
18
|
+
const c2 = path[1];
|
|
19
|
+
return c1 === "." && c2 === "/";
|
|
20
|
+
}
|
|
21
|
+
function isRelativePath(path) {
|
|
22
|
+
return startsWithDotDotSlash(path) || startsWithDotSlash(path);
|
|
23
|
+
}
|
|
24
|
+
function prependDotSlash(path) {
|
|
25
|
+
if (isRelativePath(path)) {
|
|
26
|
+
return path;
|
|
27
|
+
}
|
|
28
|
+
return "./" + path;
|
|
29
|
+
}
|
|
30
|
+
function trimSlashes(path) {
|
|
31
|
+
return path.replace(/^\/|\/$/g, "");
|
|
32
|
+
}
|
|
33
|
+
export {
|
|
34
|
+
appendForwardSlash,
|
|
35
|
+
isRelativePath,
|
|
36
|
+
prependDotSlash,
|
|
37
|
+
prependForwardSlash,
|
|
38
|
+
removeEndingForwardSlash,
|
|
39
|
+
startsWithDotDotSlash,
|
|
40
|
+
startsWithDotSlash,
|
|
41
|
+
trimSlashes
|
|
42
|
+
};
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NvcmUvcGF0aC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUFPLDRCQUE0QixNQUFjO0FBQ2hELFNBQU8sS0FBSyxTQUFTLE9BQU8sT0FBTyxPQUFPO0FBQUE7QUFHcEMsNkJBQTZCLE1BQWM7QUFDakQsU0FBTyxLQUFLLE9BQU8sTUFBTSxPQUFPLE1BQU07QUFBQTtBQUdoQyxrQ0FBa0MsTUFBYztBQUN0RCxTQUFPLEtBQUssU0FBUyxPQUFPLEtBQUssTUFBTSxHQUFHLEtBQUssU0FBUyxLQUFLO0FBQUE7QUFHdkQsK0JBQStCLE1BQWM7QUFDbkQsUUFBTSxLQUFLLEtBQUs7QUFDaEIsUUFBTSxLQUFLLEtBQUs7QUFDaEIsUUFBTSxLQUFLLEtBQUs7QUFDaEIsU0FBTyxPQUFPLE9BQU8sT0FBTyxPQUFPLE9BQU87QUFBQTtBQUdwQyw0QkFBNEIsTUFBYztBQUNoRCxRQUFNLEtBQUssS0FBSztBQUNoQixRQUFNLEtBQUssS0FBSztBQUNoQixTQUFPLE9BQU8sT0FBTyxPQUFPO0FBQUE7QUFHdEIsd0JBQXdCLE1BQWM7QUFDNUMsU0FBTyxzQkFBc0IsU0FBUyxtQkFBbUI7QUFBQTtBQUduRCx5QkFBeUIsTUFBYztBQUM3QyxNQUFJLGVBQWUsT0FBTztBQUN6QixXQUFPO0FBQUE7QUFHUixTQUFPLE9BQU87QUFBQTtBQUdSLHFCQUFxQixNQUFjO0FBQ3pDLFNBQU8sS0FBSyxRQUFRLFlBQVk7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -2,21 +2,67 @@ import http from "http";
|
|
|
2
2
|
import { performance } from "perf_hooks";
|
|
3
3
|
import send from "send";
|
|
4
4
|
import { fileURLToPath } from "url";
|
|
5
|
+
import fs from "fs";
|
|
5
6
|
import * as msg from "../dev/messages.js";
|
|
6
7
|
import { error, info } from "../logger.js";
|
|
7
|
-
import { subpathNotUsedTemplate } from "../dev/template/4xx.js";
|
|
8
|
+
import { subpathNotUsedTemplate, notFoundTemplate } from "../dev/template/4xx.js";
|
|
9
|
+
import { appendForwardSlash, trimSlashes } from "../path.js";
|
|
8
10
|
async function preview(config, { logging }) {
|
|
9
11
|
const startServerTime = performance.now();
|
|
10
|
-
const
|
|
12
|
+
const pageUrlFormat = config.buildOptions.pageUrlFormat;
|
|
13
|
+
const trailingSlash = config.devOptions.trailingSlash;
|
|
14
|
+
const forceTrailingSlash = trailingSlash === "always";
|
|
15
|
+
const blockTrailingSlash = trailingSlash === "never";
|
|
16
|
+
const defaultFile = "index.html";
|
|
17
|
+
const defaultOrigin = "http://localhost";
|
|
18
|
+
const sendOptions = {
|
|
19
|
+
extensions: pageUrlFormat === "file" ? ["html"] : false,
|
|
20
|
+
index: false,
|
|
21
|
+
root: fileURLToPath(config.dist)
|
|
22
|
+
};
|
|
23
|
+
let baseURL = new URL(appendForwardSlash(config.buildOptions.site || ""), defaultOrigin);
|
|
11
24
|
const server = http.createServer((req, res) => {
|
|
12
|
-
|
|
25
|
+
const requestURL = new URL(req.url, defaultOrigin);
|
|
26
|
+
if (!requestURL.pathname.startsWith(baseURL.pathname)) {
|
|
13
27
|
res.statusCode = 404;
|
|
14
|
-
res.end(subpathNotUsedTemplate(
|
|
28
|
+
res.end(subpathNotUsedTemplate(baseURL.pathname, requestURL.pathname));
|
|
15
29
|
return;
|
|
16
30
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
31
|
+
const pathname = requestURL.pathname.slice(baseURL.pathname.length - 1);
|
|
32
|
+
const isRoot = pathname === "/";
|
|
33
|
+
const hasTrailingSlash = isRoot || pathname.endsWith("/");
|
|
34
|
+
let tryTrailingSlash = true;
|
|
35
|
+
let tryHtmlExtension = true;
|
|
36
|
+
let url;
|
|
37
|
+
const onErr = (message) => {
|
|
38
|
+
res.statusCode = 404;
|
|
39
|
+
res.end(notFoundTemplate(pathname, message));
|
|
40
|
+
};
|
|
41
|
+
const onStat = (err, stat) => {
|
|
42
|
+
switch (true) {
|
|
43
|
+
case (err && tryHtmlExtension && hasTrailingSlash && !blockTrailingSlash):
|
|
44
|
+
case (err && tryHtmlExtension && !hasTrailingSlash && !forceTrailingSlash && !pathname.endsWith(".html")):
|
|
45
|
+
tryHtmlExtension = false;
|
|
46
|
+
return fs.stat(url = new URL(url.pathname + ".html", url), onStat);
|
|
47
|
+
case err !== null:
|
|
48
|
+
return onErr("Path not found");
|
|
49
|
+
case (stat.isDirectory() && hasTrailingSlash && blockTrailingSlash && !isRoot):
|
|
50
|
+
return onErr("Prohibited trailing slash");
|
|
51
|
+
case (stat.isDirectory() && !hasTrailingSlash && forceTrailingSlash && !isRoot):
|
|
52
|
+
return onErr("Required trailing slash");
|
|
53
|
+
case (stat.isDirectory() && tryTrailingSlash):
|
|
54
|
+
tryTrailingSlash = false;
|
|
55
|
+
return fs.stat(url = new URL(url.pathname + (url.pathname.endsWith("/") ? defaultFile : "/" + defaultFile), url), onStat);
|
|
56
|
+
case stat.isDirectory():
|
|
57
|
+
return onErr("Path not found");
|
|
58
|
+
default:
|
|
59
|
+
send(req, fileURLToPath(url), {
|
|
60
|
+
extensions: false,
|
|
61
|
+
index: false
|
|
62
|
+
}).pipe(res);
|
|
63
|
+
}
|
|
64
|
+
};
|
|
65
|
+
fs.stat(url = new URL(trimSlashes(pathname), config.dist), onStat);
|
|
20
66
|
});
|
|
21
67
|
let { hostname, port } = config.devOptions;
|
|
22
68
|
let httpServer;
|
|
@@ -28,7 +74,7 @@ async function preview(config, { logging }) {
|
|
|
28
74
|
httpServer = server.listen(port, hostname, () => {
|
|
29
75
|
if (!showedListenMsg) {
|
|
30
76
|
info(logging, "astro", msg.devStart({ startupTime: performance.now() - timerStart }));
|
|
31
|
-
info(logging, "astro", msg.devHost({ host: `http://${hostname}:${port}${
|
|
77
|
+
info(logging, "astro", msg.devHost({ host: `http://${hostname}:${port}${baseURL.pathname}` }));
|
|
32
78
|
}
|
|
33
79
|
showedListenMsg = true;
|
|
34
80
|
resolve();
|
|
@@ -65,4 +111,4 @@ async function preview(config, { logging }) {
|
|
|
65
111
|
export {
|
|
66
112
|
preview as default
|
|
67
113
|
};
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
114
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvcHJldmlldy9pbmRleC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUlBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQWNBLHVCQUFzQyxRQUFxQixFQUFFLFdBQW1EO0FBQy9HLFFBQU0sa0JBQWtCLFlBQVk7QUFDcEMsUUFBTSxnQkFBZ0IsT0FBTyxhQUFhO0FBQzFDLFFBQU0sZ0JBQWdCLE9BQU8sV0FBVztBQUN4QyxRQUFNLHFCQUFxQixrQkFBa0I7QUFDN0MsUUFBTSxxQkFBcUIsa0JBQWtCO0FBRzdDLFFBQU0sY0FBYztBQUVwQixRQUFNLGdCQUFnQjtBQUV0QixRQUFNLGNBQWM7QUFBQSxJQUNuQixZQUFZLGtCQUFrQixTQUFTLENBQUMsVUFBVTtBQUFBLElBQ2xELE9BQU87QUFBQSxJQUNQLE1BQU0sY0FBYyxPQUFPO0FBQUE7QUFJNUIsTUFBSSxVQUFVLElBQUksSUFBSSxtQkFBbUIsT0FBTyxhQUFhLFFBQVEsS0FBSztBQUcxRSxRQUFNLFNBQVMsS0FBSyxhQUFhLENBQUMsS0FBSyxRQUFRO0FBQzlDLFVBQU0sYUFBYSxJQUFJLElBQUksSUFBSSxLQUFlO0FBRzlDLFFBQUksQ0FBQyxXQUFXLFNBQVMsV0FBVyxRQUFRLFdBQVc7QUFDdEQsVUFBSSxhQUFhO0FBQ2pCLFVBQUksSUFBSSx1QkFBdUIsUUFBUSxVQUFVLFdBQVc7QUFDNUQ7QUFBQTtBQUlELFVBQU0sV0FBVyxXQUFXLFNBQVMsTUFBTSxRQUFRLFNBQVMsU0FBUztBQUVyRSxVQUFNLFNBQVMsYUFBYTtBQUM1QixVQUFNLG1CQUFtQixVQUFVLFNBQVMsU0FBUztBQUVyRCxRQUFJLG1CQUFtQjtBQUN2QixRQUFJLG1CQUFtQjtBQUV2QixRQUFJO0FBRUosVUFBTSxRQUFRLENBQUMsWUFBb0I7QUFDbEMsVUFBSSxhQUFhO0FBQ2pCLFVBQUksSUFBSSxpQkFBaUIsVUFBVTtBQUFBO0FBR3BDLFVBQU0sU0FBUyxDQUFDLEtBQW1DLFNBQWdCO0FBQ2xFLGNBQVE7QUFBQSxhQUVGLFFBQU8sb0JBQW9CLG9CQUFvQixDQUFDO0FBQUEsYUFDaEQsUUFBTyxvQkFBb0IsQ0FBQyxvQkFBb0IsQ0FBQyxzQkFBc0IsQ0FBQyxTQUFTLFNBQVM7QUFDOUYsNkJBQW1CO0FBQ25CLGlCQUFPLEdBQUcsS0FBTSxNQUFNLElBQUksSUFBSSxJQUFJLFdBQVcsU0FBUyxNQUFPO0FBQUEsYUFHekQsUUFBUTtBQUNaLGlCQUFPLE1BQU07QUFBQSxhQUdULE1BQUssaUJBQWlCLG9CQUFvQixzQkFBc0IsQ0FBQztBQUNyRSxpQkFBTyxNQUFNO0FBQUEsYUFHVCxNQUFLLGlCQUFpQixDQUFDLG9CQUFvQixzQkFBc0IsQ0FBQztBQUN0RSxpQkFBTyxNQUFNO0FBQUEsYUFHVCxNQUFLLGlCQUFpQjtBQUMxQiw2QkFBbUI7QUFDbkIsaUJBQU8sR0FBRyxLQUFNLE1BQU0sSUFBSSxJQUFJLElBQUksV0FBWSxLQUFJLFNBQVMsU0FBUyxPQUFPLGNBQWMsTUFBTSxjQUFjLE1BQU87QUFBQSxhQUdoSCxLQUFLO0FBQ1QsaUJBQU8sTUFBTTtBQUFBO0FBSWIsZUFBSyxLQUFLLGNBQWMsTUFBTTtBQUFBLFlBQzdCLFlBQVk7QUFBQSxZQUNaLE9BQU87QUFBQSxhQUNMLEtBQUs7QUFBQTtBQUFBO0FBSVgsT0FBRyxLQUFNLE1BQU0sSUFBSSxJQUFJLFlBQVksV0FBVyxPQUFPLE9BQVE7QUFBQTtBQUc5RCxNQUFJLEVBQUUsVUFBVSxTQUFTLE9BQU87QUFFaEMsTUFBSTtBQUdKLHVCQUFxQixZQUFtQztBQUN2RCxRQUFJLHFCQUFxQjtBQUN6QixRQUFJLGtCQUFrQjtBQUN0QixXQUFPLElBQUksUUFBYyxDQUFDLFNBQVMsV0FBVztBQUM3QyxZQUFNLFNBQVMsTUFBTTtBQUNwQixxQkFBYSxPQUFPLE9BQU8sTUFBTSxVQUFVLE1BQU07QUFDaEQsY0FBSSxDQUFDLGlCQUFpQjtBQUNyQixpQkFBSyxTQUFTLFNBQVMsSUFBSSxTQUFTLEVBQUUsYUFBYSxZQUFZLFFBQVE7QUFDdkUsaUJBQUssU0FBUyxTQUFTLElBQUksUUFBUSxFQUFFLE1BQU0sVUFBVSxZQUFZLE9BQU8sUUFBUTtBQUFBO0FBRWpGLDRCQUFrQjtBQUNsQjtBQUFBO0FBRUQsaURBQVksR0FBRyxTQUFTO0FBQUE7QUFHekIsWUFBTSxVQUFVLENBQUMsUUFBK0I7QUFDL0MsWUFBSSxJQUFJLFFBQVEsSUFBSSxTQUFTLGNBQWM7QUFDMUMsY0FBSSxDQUFDLG9CQUFvQjtBQUN4QixpQkFBSyxTQUFTLFNBQVMsSUFBSSxVQUFVLEVBQUU7QUFDdkMsaUNBQXFCO0FBQUE7QUFFdEI7QUFDQSxpQkFBTztBQUFBLGVBQ0Q7QUFDTixnQkFBTSxTQUFTLFNBQVMsSUFBSTtBQUM1QixtREFBWSxlQUFlLFNBQVM7QUFDcEMsaUJBQU87QUFBQTtBQUFBO0FBSVQ7QUFBQTtBQUFBO0FBS0YsUUFBTSxZQUFZO0FBRWxCLFNBQU87QUFBQSxJQUNOO0FBQUEsSUFDQTtBQUFBLElBQ0EsUUFBUTtBQUFBLElBQ1IsTUFBTSxZQUFZO0FBQ2pCLGlCQUFXO0FBQUE7QUFBQTtBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
|
package/dist/core/ssr/index.js
CHANGED
|
@@ -35,11 +35,12 @@ async function resolveRenderer(viteServer, renderer, astroConfig) {
|
|
|
35
35
|
resolvedRenderer.name = name;
|
|
36
36
|
if (client)
|
|
37
37
|
resolvedRenderer.source = path.posix.join(renderer, client);
|
|
38
|
+
resolvedRenderer.serverEntry = path.posix.join(renderer, server);
|
|
38
39
|
if (Array.isArray(hydrationPolyfills))
|
|
39
40
|
resolvedRenderer.hydrationPolyfills = hydrationPolyfills.map((src) => path.posix.join(renderer, src));
|
|
40
41
|
if (Array.isArray(polyfills))
|
|
41
42
|
resolvedRenderer.polyfills = polyfills.map((src) => path.posix.join(renderer, src));
|
|
42
|
-
const { url } = await viteServer.moduleGraph.ensureEntryFromUrl(
|
|
43
|
+
const { url } = await viteServer.moduleGraph.ensureEntryFromUrl(resolvedRenderer.serverEntry);
|
|
43
44
|
const { default: rendererSSR } = await viteServer.ssrLoadModule(url);
|
|
44
45
|
resolvedRenderer.ssr = rendererSSR;
|
|
45
46
|
const completedRenderer = resolvedRenderer;
|
|
@@ -227,4 +228,4 @@ export {
|
|
|
227
228
|
render,
|
|
228
229
|
ssr
|
|
229
230
|
};
|
|
230
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
231
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvc3NyL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7OztBQUtBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFFQSxNQUFNLGlCQUFpQjtBQXVCdkIsTUFBTSxRQUFRLElBQUk7QUFHbEIsK0JBQStCLFlBQWdDLFVBQWtCLGFBQTBCO0FBQzFHLFFBQU0sbUJBQXdCO0FBSTlCLFFBQU07QUFBQSxJQUNMLFNBQVMsRUFBRSxNQUFNLFFBQVEsV0FBVyxvQkFBb0I7QUFBQSxNQUNyRCxNQUFNLE9BQU8sa0JBQWtCLFVBQVU7QUFFN0MsbUJBQWlCLE9BQU87QUFDeEIsTUFBSTtBQUFRLHFCQUFpQixTQUFTLEtBQUssTUFBTSxLQUFLLFVBQVU7QUFDaEUsbUJBQWlCLGNBQWMsS0FBSyxNQUFNLEtBQUssVUFBVTtBQUN6RCxNQUFJLE1BQU0sUUFBUTtBQUFxQixxQkFBaUIscUJBQXFCLG1CQUFtQixJQUFJLENBQUMsUUFBZ0IsS0FBSyxNQUFNLEtBQUssVUFBVTtBQUMvSSxNQUFJLE1BQU0sUUFBUTtBQUFZLHFCQUFpQixZQUFZLFVBQVUsSUFBSSxDQUFDLFFBQWdCLEtBQUssTUFBTSxLQUFLLFVBQVU7QUFDcEgsUUFBTSxFQUFFLFFBQVEsTUFBTSxXQUFXLFlBQVksbUJBQW1CLGlCQUFpQjtBQUNqRixRQUFNLEVBQUUsU0FBUyxnQkFBZ0IsTUFBTSxXQUFXLGNBQWM7QUFDaEUsbUJBQWlCLE1BQU07QUFFdkIsUUFBTSxvQkFBOEI7QUFDcEMsU0FBTztBQUFBO0FBR1IsZ0NBQWdDLFlBQWdDLGFBQStDO0FBQzlHLFFBQU0sTUFBZ0IsWUFBWTtBQUNsQyxRQUFNLFlBQVksTUFBTSxRQUFRLElBQy9CLElBQUksSUFBSSxDQUFDLGFBQWE7QUFDckIsUUFBSSxNQUFNLElBQUk7QUFBVyxhQUFPLE1BQU0sSUFBSTtBQUMxQyxRQUFJLFVBQVUsZ0JBQWdC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
|
package/dist/core/ssr/sitemap.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
function generateSitemap(pages) {
|
|
2
|
-
const urls = [...pages].filter((url) =>
|
|
2
|
+
const urls = [...pages].filter((url) => !/404\/?$/.test(url));
|
|
3
3
|
urls.sort((a, b) => a.localeCompare(b, "en", { numeric: true }));
|
|
4
4
|
let sitemap = `<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">`;
|
|
5
5
|
for (const url of urls) {
|
|
@@ -12,4 +12,4 @@ function generateSitemap(pages) {
|
|
|
12
12
|
export {
|
|
13
13
|
generateSitemap
|
|
14
14
|
};
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvc3NyL3NpdGVtYXAudHMiXSwKICAibWFwcGluZ3MiOiAiQUFDTyx5QkFBeUIsT0FBeUI7QUFPeEQsUUFBTSxPQUFPLENBQUMsR0FBRyxPQUFPLE9BQU8sQ0FBQyxRQUFRLENBQUMsVUFBVSxLQUFLO0FBQ3hELE9BQUssS0FBSyxDQUFDLEdBQUcsTUFBTSxFQUFFLGNBQWMsR0FBRyxNQUFNLEVBQUUsU0FBUztBQUN4RCxNQUFJLFVBQVU7QUFDZCxhQUFXLE9BQU8sTUFBTTtBQUN2QixlQUFXLGFBQWE7QUFBQTtBQUV6QixhQUFXO0FBQUE7QUFDWCxTQUFPO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
|
@@ -253,6 +253,8 @@ export interface Renderer {
|
|
|
253
253
|
name: string;
|
|
254
254
|
/** Import statement for renderer */
|
|
255
255
|
source?: string;
|
|
256
|
+
/** Import statement for the server renderer */
|
|
257
|
+
serverEntry: string;
|
|
256
258
|
/** Scripts to be injected before component */
|
|
257
259
|
polyfills?: string[];
|
|
258
260
|
/** Polyfills that need to run before hydration ever occurs */
|
|
@@ -13,4 +13,5 @@ interface ErrorTemplateOptions {
|
|
|
13
13
|
/** Display all errors */
|
|
14
14
|
export default function template({ title, pathname, statusCode, tabTitle, body }: ErrorTemplateOptions): string;
|
|
15
15
|
export declare function subpathNotUsedTemplate(base: string, pathname: string): string;
|
|
16
|
+
export declare function notFoundTemplate(pathname: string, message?: string): string;
|
|
16
17
|
export {};
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export declare function appendForwardSlash(path: string): string;
|
|
2
|
+
export declare function prependForwardSlash(path: string): string;
|
|
3
|
+
export declare function removeEndingForwardSlash(path: string): string;
|
|
4
|
+
export declare function startsWithDotDotSlash(path: string): boolean;
|
|
5
|
+
export declare function startsWithDotSlash(path: string): boolean;
|
|
6
|
+
export declare function isRelativePath(path: string): boolean;
|
|
7
|
+
export declare function prependDotSlash(path: string): string;
|
|
8
|
+
export declare function trimSlashes(path: string): string;
|
|
@@ -3,6 +3,7 @@ import { fileURLToPath } from "url";
|
|
|
3
3
|
import { getViteTransform } from "./styles.js";
|
|
4
4
|
import { parseAstroRequest } from "./query.js";
|
|
5
5
|
import { cachedCompilation, invalidateCompilation } from "./compile.js";
|
|
6
|
+
import ancestor from "common-ancestor-path";
|
|
6
7
|
const FRONTMATTER_PARSE_REGEXP = /^\-\-\-(.*)^\-\-\-/ms;
|
|
7
8
|
function astro({ config, logging }) {
|
|
8
9
|
let viteTransform;
|
|
@@ -21,7 +22,9 @@ function astro({ config, logging }) {
|
|
|
21
22
|
let { filename, query } = parseAstroRequest(id);
|
|
22
23
|
if (query.astro) {
|
|
23
24
|
if (query.type === "style") {
|
|
24
|
-
if (filename.startsWith("
|
|
25
|
+
if (filename.startsWith("/@fs")) {
|
|
26
|
+
filename = filename.slice("/@fs".length);
|
|
27
|
+
} else if (filename.startsWith("/") && !ancestor(filename, config.projectRoot.pathname)) {
|
|
25
28
|
filename = new URL("." + filename, config.projectRoot).pathname;
|
|
26
29
|
}
|
|
27
30
|
const transformResult = await cachedCompilation(config, filename, null, viteTransform, opts);
|
|
@@ -99,4 +102,4 @@ function astro({ config, logging }) {
|
|
|
99
102
|
export {
|
|
100
103
|
astro as default
|
|
101
104
|
};
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
105
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLWFzdHJvL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBSUE7QUFDQTtBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBRUEsTUFBTSwyQkFBMkI7QUFRbEIsZUFBZSxFQUFFLFFBQVEsV0FBNEM7QUFDbkYsTUFBSTtBQUNKLFNBQU87QUFBQSxJQUNOLE1BQU07QUFBQSxJQUNOLFNBQVM7QUFBQSxJQUNULGVBQWUsZ0JBQWdCO0FBQzlCLHNCQUFnQixpQkFBaUI7QUFBQTtBQUFBLFVBRzVCLFVBQVUsSUFBSTtBQUVuQixVQUFJLGtCQUFrQixJQUFJLE1BQU0sT0FBTztBQUN0QyxlQUFPO0FBQUE7QUFBQTtBQUFBLFVBR0gsS0FBSyxJQUFJLE1BQU07QUFDcEIsVUFBSSxFQUFFLFVBQVUsVUFBVSxrQkFBa0I7QUFDNUMsVUFBSSxNQUFNLE9BQU87QUFDaEIsWUFBSSxNQUFNLFNBQVMsU0FBUztBQUMzQixjQUFJLFNBQVMsV0FBVyxTQUFTO0FBQ2hDLHVCQUFXLFNBQVMsTUFBTSxPQUFPO0FBQUEscUJBQ3ZCLFNBQVMsV0FBVyxRQUFRLENBQUMsU0FBUyxVQUFVLE9BQU8sWUFBWSxXQUFXO0FBQ3hGLHVCQUFXLElBQUksSUFBSSxNQUFNLFVBQVUsT0FBTyxhQUFhO0FBQUE7QUFFeEQsZ0JBQU0sa0JBQWtCLE1BQU0sa0JBQWtCLFFBQVEsVUFBVSxNQUFNLGVBQWU7QUFFdkYsY0FBSSxPQUFPLE1BQU0sVUFBVSxhQUFhO0FBQ3ZDLGtCQUFNLElBQUksTUFBTTtBQUFBO0FBR2pCLGdCQUFNLFFBQVEsZ0JBQWdCO0FBQzlCLGdCQUFNLE9BQU8sTUFBTSxNQUFNO0FBRXpCLGlCQUFPO0FBQUEsWUFDTjtBQUFBO0FBQUE7QUFBQTtBQUtILGFBQU87QUFBQTtBQUFBLFVBRUYsVUFBVSxRQUFRLElBQUksTUFBTTtBQUNqQyxVQUFJLENBQUMsR0FBRyxTQUFTLFdBQVc7QUFDM0I7QUFBQTtBQUdELFVBQUk7QUFDSCxjQUFNLGtCQUFrQixNQUFNLGtCQUFrQixRQUFRLElBQUksUUFBUSxlQUFlO0FBSW5GLGNBQU0sRUFBRSxNQUFNLFFBQVEsTUFBTSxRQUFRLFVBQVUsZ0JBQWdCLE1BQU07QUFBQSxVQUNuRSxRQUFRO0FBQUEsVUFDUixXQUFXO0FBQUEsVUFDWCxZQUFZO0FBQUE7QUFHYixlQUFPO0FBQUEsVUFDTjtBQUFBLFVBQ0E7QUFBQTtBQUFBLGVBRU8sS0FBUDtBQVNELGNBQU0scUJBQXFCLHlCQUF5QixLQUFLO0FBQ3pELFlBQUksb0JBQW9CO0FBQ3ZCLGNBQUk7QUFDSCxrQkFBTSxRQUFRLFVBQVUsbUJBQW1CLElBQUksRUFBRSxRQUFRLE1BQU0sV0FBVyxPQUFPLFlBQVk7QUFBQSxtQkFDckYsZ0JBQVA7QUFHRCxnQkFBSSxrQkFBa0IsZUFBZSxTQUFTO0FBQzdDLDZCQUFlLFVBQVUsZUFBZSxRQUFRLFFBQVEsZUFBZTtBQUFBO0FBRXhFLGtCQUFNO0FBQUE7QUFBQTtBQUtSLFlBQUksSUFBSSxNQUFNLFNBQVMsa0JBQWtCO0FBQ3hDLGdCQUFNLFNBQVMsSUFBSSxnQkFBZ0I7QUFBQSxZQUNsQyxRQUFRO0FBQUEsWUFDUixPQUFPO0FBQUEsWUFDUCxNQUFNO0FBQUE7QUFBQTtBQUFBO0FBQUEsUUFJSixHQUFHLFFBQVEsY0FBYyxPQUFPLGNBQWM7QUFBQTtBQUFBLE1BRWhEO0FBQUE7QUFBQTtBQUFBO0FBSUQsY0FBSSxNQUFNLGlEQUFpRCxPQUFPO0FBQ2xFLGNBQUksVUFBVTtBQUFBO0FBQUE7QUFBQTtBQUFBLE1BSWIsSUFBSTtBQUVMLGNBQUksUUFBUSxVQUFVLFNBQVM7QUFFOUIsZ0JBQUksUUFBUSxVQUFVO0FBQUE7QUFBQTtBQUl4QixjQUFNO0FBQUE7QUFBQTtBQUFBLFVBR0YsZ0JBQWdCLFNBQVM7QUFFOUIsNEJBQXNCLFFBQVEsUUFBUTtBQUFBO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -4,7 +4,8 @@ import { STYLE_EXTENSIONS } from "../core/ssr/css.js";
|
|
|
4
4
|
const PLUGIN_NAME = "@astrojs/rollup-plugin-build-css";
|
|
5
5
|
const ASTRO_STYLE_PREFIX = "@astro-inline-style";
|
|
6
6
|
const ASTRO_PAGE_STYLE_PREFIX = "@astro-page-all-styles";
|
|
7
|
-
const
|
|
7
|
+
const cssRe = new RegExp(`\\.(${Array.from(STYLE_EXTENSIONS).map((s) => s.slice(1)).join("|")})($|\\?)`);
|
|
8
|
+
const isCSSRequest = (request) => cssRe.test(request);
|
|
8
9
|
function getAstroPageStyleId(pathname) {
|
|
9
10
|
let styleId = ASTRO_PAGE_STYLE_PREFIX + pathname;
|
|
10
11
|
if (styleId.endsWith("/")) {
|
|
@@ -85,6 +86,8 @@ function rollupPluginAstroBuildCSS(options) {
|
|
|
85
86
|
chunkCSS += styleSourceMap.get(id);
|
|
86
87
|
}
|
|
87
88
|
}
|
|
89
|
+
if (!chunkCSS)
|
|
90
|
+
return null;
|
|
88
91
|
if (isPureCSS) {
|
|
89
92
|
internals.pureCSSChunks.add(chunk);
|
|
90
93
|
}
|
|
@@ -99,23 +102,44 @@ function rollupPluginAstroBuildCSS(options) {
|
|
|
99
102
|
});
|
|
100
103
|
internals.chunkToReferenceIdMap.set(chunk.fileName, referenceId);
|
|
101
104
|
if (chunk.type === "chunk") {
|
|
102
|
-
const
|
|
103
|
-
if (
|
|
104
|
-
|
|
105
|
+
const fileName = this.getFileName(referenceId);
|
|
106
|
+
if (chunk.facadeModuleId) {
|
|
107
|
+
const facadeId = chunk.facadeModuleId;
|
|
108
|
+
if (!internals.facadeIdToAssetsMap.has(facadeId)) {
|
|
109
|
+
internals.facadeIdToAssetsMap.set(facadeId, []);
|
|
110
|
+
}
|
|
111
|
+
internals.facadeIdToAssetsMap.get(facadeId).push(fileName);
|
|
105
112
|
}
|
|
106
|
-
internals.facadeIdToAssetsMap.get(facadeId).push(this.getFileName(referenceId));
|
|
107
113
|
}
|
|
108
114
|
return null;
|
|
109
115
|
},
|
|
110
116
|
generateBundle(opts, bundle) {
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
117
|
+
const hasPureCSSChunks = internals.pureCSSChunks.size;
|
|
118
|
+
const pureChunkFilenames = new Set([...internals.pureCSSChunks].map((chunk) => chunk.fileName));
|
|
119
|
+
const emptyChunkFiles = [...pureChunkFilenames].map((file) => path.basename(file)).join("|").replace(/\./g, "\\.");
|
|
120
|
+
const emptyChunkRE = new RegExp(opts.format === "es" ? `\\bimport\\s*"[^"]*(?:${emptyChunkFiles})";
|
|
115
121
|
?` : `\\brequire\\(\\s*"[^"]*(?:${emptyChunkFiles})"\\);
|
|
116
122
|
?`, "g");
|
|
117
|
-
|
|
118
|
-
|
|
123
|
+
for (const [chunkId, chunk] of Object.entries(bundle)) {
|
|
124
|
+
if (chunk.type === "chunk") {
|
|
125
|
+
if (chunk.facadeModuleId) {
|
|
126
|
+
if (!internals.facadeIdToAssetsMap.has(chunk.facadeModuleId)) {
|
|
127
|
+
internals.facadeIdToAssetsMap.set(chunk.facadeModuleId, []);
|
|
128
|
+
}
|
|
129
|
+
const assets = internals.facadeIdToAssetsMap.get(chunk.facadeModuleId);
|
|
130
|
+
const assetSet = new Set(assets);
|
|
131
|
+
for (const imp of chunk.imports) {
|
|
132
|
+
if (internals.chunkToReferenceIdMap.has(imp) && !pureChunkFilenames.has(imp)) {
|
|
133
|
+
const referenceId = internals.chunkToReferenceIdMap.get(imp);
|
|
134
|
+
const fileName = this.getFileName(referenceId);
|
|
135
|
+
if (!assetSet.has(fileName)) {
|
|
136
|
+
assetSet.add(fileName);
|
|
137
|
+
assets.push(fileName);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
if (hasPureCSSChunks) {
|
|
119
143
|
if (internals.pureCSSChunks.has(chunk)) {
|
|
120
144
|
delete bundle[chunkId];
|
|
121
145
|
} else {
|
|
@@ -133,4 +157,4 @@ export {
|
|
|
133
157
|
getAstroStylePathFromId,
|
|
134
158
|
rollupPluginAstroBuildCSS
|
|
135
159
|
};
|
|
136
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
160
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLWJ1aWxkLWNzcy9pbmRleC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUdBO0FBQ0E7QUFFQTtBQUVBLE1BQU0sY0FBYztBQUdwQixNQUFNLHFCQUFxQjtBQUUzQixNQUFNLDBCQUEwQjtBQUVoQyxNQUFNLFFBQVEsSUFBSSxPQUNqQixPQUFPLE1BQU0sS0FBSyxrQkFDaEIsSUFBSSxDQUFDLE1BQU0sRUFBRSxNQUFNLElBQ25CLEtBQUs7QUFFUixNQUFNLGVBQWUsQ0FBQyxZQUE2QixNQUFNLEtBQUs7QUFFdkQsNkJBQTZCLFVBQWtCO0FBQ3JELE1BQUksVUFBVSwwQkFBMEI7QUFDeEMsTUFBSSxRQUFRLFNBQVMsTUFBTTtBQUMxQixlQUFXO0FBQUE7QUFFWixhQUFXO0FBQ1gsU0FBTztBQUFBO0FBR0QseUJBQXlCLFVBQWtCO0FBQ2pELE1BQUksVUFBVSxxQkFBcUI7QUFDbkMsTUFBSSxRQUFRLFNBQVMsTUFBTTtBQUMxQixlQUFXO0FBQUE7QUFFWixTQUFPO0FBQUE7QUFHRCxpQ0FBaUMsSUFBWTtBQUNuRCxTQUFPLEdBQUcsT0FBTyxtQkFBbUIsU0FBUztBQUFBO0FBRzlDLDhCQUE4QixJQUFZO0FBQ3pDLFNBQU8sR0FBRyxXQUFXO0FBQUE7QUFHdEIsa0NBQWtDLElBQVk7QUFDN0MsU0FBTyxHQUFHLFdBQVc7QUFBQTtBQU9mLG1DQUFtQyxTQUFvQztBQUM3RSxRQUFNLEVBQUUsY0FBYztBQUN0QixRQUFNLGlCQUFpQixJQUFJO0FBRTNCLFNBQU87QUFBQSxJQUNOLE1BQU07QUFBQSxJQUVOLGVBQWUsZ0JBQWdCO0FBSzlCLFlBQU0sVUFBVSxlQUFlO0FBQy9CLFlBQU0sbUJBQW1CLGVBQWUsUUFBUSxVQUFVLENBQUMsTUFBTSxFQUFFLFNBQVM7QUFDNUUsVUFBSSxxQkFBcUIsSUFBSTtBQUM1QixjQUFNLGNBQWMsUUFBUTtBQUc1QixlQUFPLFlBQVk7QUFDbkIsZUFBTyxZQUFZO0FBR25CLGNBQU0s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
|
|
@@ -27,12 +27,17 @@ import { findAssets, findExternalScripts, findInlineScripts, findInlineStyles, g
|
|
|
27
27
|
import { isBuildableImage, isBuildableLink, isHoistedScript, isInSrcDirectory, hasSrcSet } from "./util.js";
|
|
28
28
|
import { render as ssrRender } from "../core/ssr/index.js";
|
|
29
29
|
import { getAstroStyleId, getAstroPageStyleId } from "../vite-plugin-build-css/index.js";
|
|
30
|
+
import { prependDotSlash, removeEndingForwardSlash } from "../core/path.js";
|
|
30
31
|
const matchSrcset = srcsetParse.default;
|
|
31
32
|
const PLUGIN_NAME = "@astro/rollup-plugin-build";
|
|
32
33
|
const ASTRO_PAGE_PREFIX = "@astro-page";
|
|
33
34
|
const ASTRO_SCRIPT_PREFIX = "@astro-script";
|
|
34
35
|
const ASTRO_EMPTY = "@astro-empty";
|
|
35
36
|
const STATUS_CODE_RE = /^404$/;
|
|
37
|
+
function relativePath(from, to) {
|
|
38
|
+
const rel = npath.posix.relative(from, to);
|
|
39
|
+
return prependDotSlash(rel);
|
|
40
|
+
}
|
|
36
41
|
function rollupPluginAstroBuildHTML(options) {
|
|
37
42
|
const { astroConfig, internals, logging, origin, allPages, routeCache, viteServer, pageNames } = options;
|
|
38
43
|
const srcRoot = astroConfig.src.pathname;
|
|
@@ -56,7 +61,7 @@ function rollupPluginAstroBuildHTML(options) {
|
|
|
56
61
|
jsInput.add(path);
|
|
57
62
|
}
|
|
58
63
|
for (const pathname of pageData.paths) {
|
|
59
|
-
pageNames.push(pathname.replace(/\/?$/, "/
|
|
64
|
+
pageNames.push(pathname.replace(/\/?$/, "/").replace(/^\//, ""));
|
|
60
65
|
const id = ASTRO_PAGE_PREFIX + pathname;
|
|
61
66
|
const html = await ssrRender(renderers, mod, {
|
|
62
67
|
astroConfig,
|
|
@@ -252,7 +257,7 @@ function rollupPluginAstroBuildHTML(options) {
|
|
|
252
257
|
const lastNode = ref;
|
|
253
258
|
for (const referenceId of referenceIds) {
|
|
254
259
|
const chunkFileName = this.getFileName(referenceId);
|
|
255
|
-
const relPath =
|
|
260
|
+
const relPath = relativePath(pathname, "/" + chunkFileName);
|
|
256
261
|
const key = pathname + relPath + attrs.rel || "stylesheet";
|
|
257
262
|
if (!linkChunksAdded.has(key)) {
|
|
258
263
|
linkChunksAdded.add(key);
|
|
@@ -279,7 +284,7 @@ function rollupPluginAstroBuildHTML(options) {
|
|
|
279
284
|
if (getAttribute(script, "astro-script") && typeof pageAssetId === "string") {
|
|
280
285
|
if (!pageBundleAdded) {
|
|
281
286
|
pageBundleAdded = true;
|
|
282
|
-
const relPath =
|
|
287
|
+
const relPath = relativePath(pathname, bundlePath);
|
|
283
288
|
insertBefore(script.parentNode, createScript({
|
|
284
289
|
type: "module",
|
|
285
290
|
src: relPath
|
|
@@ -292,7 +297,7 @@ function rollupPluginAstroBuildHTML(options) {
|
|
|
292
297
|
if (getAttribute(script, "astro-script") && typeof pageAssetId === "string") {
|
|
293
298
|
if (!pageBundleAdded) {
|
|
294
299
|
pageBundleAdded = true;
|
|
295
|
-
const relPath =
|
|
300
|
+
const relPath = relativePath(pathname, bundlePath);
|
|
296
301
|
insertBefore(script.parentNode, createScript({
|
|
297
302
|
type: "module",
|
|
298
303
|
src: relPath
|
|
@@ -306,7 +311,7 @@ function rollupPluginAstroBuildHTML(options) {
|
|
|
306
311
|
}
|
|
307
312
|
if (src && (facadeIdMap.has(src) || facadeIdMap.has(src.substr(1)))) {
|
|
308
313
|
const assetRootPath = "/" + (facadeIdMap.get(src) || facadeIdMap.get(src.substr(1)));
|
|
309
|
-
const relPath =
|
|
314
|
+
const relPath = relativePath(pathname, assetRootPath);
|
|
310
315
|
const attrs = getAttributes(script);
|
|
311
316
|
insertBefore(script.parentNode, createScript(__spreadProps(__spreadValues({}, attrs), {
|
|
312
317
|
src: relPath
|
|
@@ -344,7 +349,7 @@ function rollupPluginAstroBuildHTML(options) {
|
|
|
344
349
|
const referenceId = assetIdMap.get(src);
|
|
345
350
|
if (referenceId) {
|
|
346
351
|
const fileName = this.getFileName(referenceId);
|
|
347
|
-
const relPath =
|
|
352
|
+
const relPath = relativePath(pathname, "/" + fileName);
|
|
348
353
|
setAttribute(node, "src", relPath);
|
|
349
354
|
}
|
|
350
355
|
}
|
|
@@ -356,7 +361,7 @@ function rollupPluginAstroBuildHTML(options) {
|
|
|
356
361
|
if (assetIdMap.has(url)) {
|
|
357
362
|
const referenceId = assetIdMap.get(url);
|
|
358
363
|
const fileName = this.getFileName(referenceId);
|
|
359
|
-
const relPath =
|
|
364
|
+
const relPath = relativePath(pathname, "/" + fileName);
|
|
360
365
|
changedSrcset = changedSrcset.replace(url, relPath);
|
|
361
366
|
}
|
|
362
367
|
}
|
|
@@ -376,8 +381,8 @@ function rollupPluginAstroBuildHTML(options) {
|
|
|
376
381
|
const outHTML = parse5.serialize(document);
|
|
377
382
|
const name = pathname.substr(1);
|
|
378
383
|
let outPath;
|
|
379
|
-
if (name.match(STATUS_CODE_RE)) {
|
|
380
|
-
outPath =
|
|
384
|
+
if (name.match(STATUS_CODE_RE) || astroConfig.buildOptions.pageUrlFormat === "file") {
|
|
385
|
+
outPath = `${removeEndingForwardSlash(name || "index")}.html`;
|
|
381
386
|
} else {
|
|
382
387
|
outPath = npath.posix.join(name, "index.html");
|
|
383
388
|
}
|
|
@@ -393,4 +398,4 @@ function rollupPluginAstroBuildHTML(options) {
|
|
|
393
398
|
export {
|
|
394
399
|
rollupPluginAstroBuildHTML
|
|
395
400
|
};
|
|
396
|
-
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/vite-plugin-build-html/index.ts"],
  "mappings": "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",
  "names": []
}

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

|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "astro",
|
|
3
|
-
"version": "0.22.
|
|
3
|
+
"version": "0.22.11",
|
|
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",
|
|
@@ -73,6 +73,7 @@
|
|
|
73
73
|
"@web/parse5-utils": "^1.3.0",
|
|
74
74
|
"astring": "^1.7.5",
|
|
75
75
|
"ci-info": "^3.2.0",
|
|
76
|
+
"common-ancestor-path": "^1.0.1",
|
|
76
77
|
"connect": "^3.7.0",
|
|
77
78
|
"eol": "^0.9.1",
|
|
78
79
|
"es-module-lexer": "^0.9.3",
|
|
@@ -115,6 +116,7 @@
|
|
|
115
116
|
"@astrojs/parser": "^0.22.0",
|
|
116
117
|
"@babel/types": "^7.15.6",
|
|
117
118
|
"@types/chai": "^4.2.22",
|
|
119
|
+
"@types/common-ancestor-path": "^1.0.0",
|
|
118
120
|
"@types/connect": "^3.4.35",
|
|
119
121
|
"@types/mime": "^2.0.3",
|
|
120
122
|
"@types/mocha": "^9.0.0",
|