astro 0.22.9 → 0.22.13
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/page-data.js +4 -4
- package/dist/core/build/static-build.js +76 -14
- package/dist/core/create-vite.js +1 -2
- package/dist/core/dev/template/4xx.js +45 -38
- package/dist/core/path.js +6 -2
- package/dist/core/preview/index.js +53 -76
- package/dist/core/ssr/index.js +21 -22
- package/dist/core/ssr/route-cache.js +44 -0
- package/dist/core/ssr/sitemap.js +2 -2
- package/dist/runtime/server/hydration.js +4 -4
- package/dist/runtime/server/index.js +4 -4
- package/dist/runtime/server/metadata.js +10 -4
- package/dist/types/@types/astro.d.ts +9 -3
- 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 +1 -0
- package/dist/types/core/ssr/index.d.ts +2 -1
- package/dist/types/core/ssr/route-cache.d.ts +8 -0
- package/dist/types/runtime/server/index.d.ts +1 -1
- package/dist/vite-plugin-build-css/index.js +36 -12
- package/dist/vite-plugin-build-html/index.js +2 -3
- package/package.json +3 -3
|
@@ -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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
|
|
@@ -3,8 +3,8 @@ import * as colors from "kleur/colors";
|
|
|
3
3
|
import { debug } from "../logger.js";
|
|
4
4
|
import { preload as ssrPreload } from "../ssr/index.js";
|
|
5
5
|
import { validateGetStaticPathsModule, validateGetStaticPathsResult } from "../ssr/routing.js";
|
|
6
|
-
import { generatePaginateFunction } from "../ssr/paginate.js";
|
|
7
6
|
import { generateRssFunction } from "../ssr/rss.js";
|
|
7
|
+
import { assignStaticPaths } from "../ssr/route-cache.js";
|
|
8
8
|
async function collectPagesData(opts) {
|
|
9
9
|
const { astroConfig, logging, manifest, origin, routeCache, viteServer } = opts;
|
|
10
10
|
const assets = {};
|
|
@@ -78,8 +78,8 @@ async function getStaticPathsForRoute(opts, route) {
|
|
|
78
78
|
const mod = await viteServer.ssrLoadModule(fileURLToPath(filePath));
|
|
79
79
|
validateGetStaticPathsModule(mod);
|
|
80
80
|
const rss = generateRssFunction(astroConfig.buildOptions.site, route);
|
|
81
|
-
|
|
82
|
-
routeCache[route.component]
|
|
81
|
+
await assignStaticPaths(routeCache, route, mod, rss.generator);
|
|
82
|
+
const staticPaths = routeCache[route.component];
|
|
83
83
|
validateGetStaticPathsResult(staticPaths, logging);
|
|
84
84
|
return {
|
|
85
85
|
paths: staticPaths.map((staticPath) => staticPath.params && route.generate(staticPath.params)).filter(Boolean),
|
|
@@ -89,4 +89,4 @@ async function getStaticPathsForRoute(opts, route) {
|
|
|
89
89
|
export {
|
|
90
90
|
collectPagesData
|
|
91
91
|
};
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvYnVpbGQvcGFnZS1kYXRhLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBS0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUVBO0FBQ0E7QUFpQkEsZ0NBQXVDLE1BQWdFO0FBQ3RHLFFBQU0sRUFBRSxhQUFhLFNBQVMsVUFBVSxRQUFRLFlBQVksZUFBZTtBQUUzRSxRQUFNLFNBQWlDO0FBQ3ZDLFFBQU0sV0FBeUI7QUFNL0IsUUFBTSxRQUFRLElBQ2IsU0FBUyxPQUFPLElBQUksT0FBTyxVQUFVO0FBeEN2QztBQTBDRyxRQUFJLE1BQU0sVUFBVTtBQUNuQixlQUFTLE1BQU0sYUFBYTtBQUFBLFFBQzNCO0FBQUEsUUFDQSxPQUFPLENBQUMsTUFBTTtBQUFBLFFBQ2QsU0FBUyxNQUFNLFdBQVc7QUFBQSxVQUN6QjtBQUFBLFVBQ0EsVUFBVSxJQUFJLElBQUksS0FBSyxNQUFNLGFBQWEsWUFBWTtBQUFBLFVBQ3REO0FBQUEsVUFDQSxNQUFNO0FBQUEsVUFDTjtBQUFBLFVBQ0EsVUFBVSxNQUFNO0FBQUEsVUFDaEI7QUFBQSxVQUNBO0FBQUEsVUFDQTtBQUFBLFdBRUMsS0FBSyxDQUFDLFdBQVc7QUFDakIsZ0JBQU0sT0FBTyxHQUFHLE1BQU0sV0FBVyxRQUFRLFFBQVE7QUFDakQsZ0JBQU0sU0FBUyxTQUFTLHNCQUFPLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBUyxNQUFNLG9CQUFlLE9BQU8sT0FBTztBQUNwRyxpQkFBTztBQUFBLFdBRVAsTUFBTSxDQUFDLFFBQVE7QUFDZixnQkFBTSxTQUFTLFNBQVMsc0JBQU8sT0FBTyxLQUFLLE9BQU8sSUFBSSxjQUFTLE1BQU07QUFDckUsZ0JBQU07QUFBQTtBQUFBO0FBR1Q7QUFBQTtBQUdELFVBQU0sU0FBUyxNQUFNLHVCQUF1QixNQUFNLE9BQ2hELEtBQUssQ0FBQyxXQUFXO0FBQ2pCLFlBQU0sUUFBUSxPQUFPLE1BQU0sV0FBVyxJQUFJLFNBQVM7QUFDbkQsWUFBTSxTQUFTLFNBQVMsc0JBQU8sT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFTLE1BQU0sb0JBQWUsT0FBTyxRQUFRLElBQUksT0FBTyxNQUFNLFVBQVU7QUFDaEksYUFBTztBQUFBLE9BRVAsTUFBTSxDQUFDLFFBQVE7QUFDZixZQUFNLFNBQVMsU0FBUyxzQkFBTyxPQUFPLEtBQUssT0FBTyxJQUFJLGNBQVMsTUFBTTtBQUNyRSxZQUFNO0FBQUE7QUFFUixRQUFJLGFBQU8sUUFBUCxtQkFBWSxLQUFLO0FBQ3BCLFlBQU0sVUFBVSxJQUFJLElBQUksT0FBTyxJQUFJLElBQUksUUFBUSxRQUFRLE9BQU8sWUFBWTtBQUMxRSxVQUFJLE9BQU8sY0FBYyxXQUFXO0FBQ25DLGNBQU0sSUFBSSxNQUFNLDZCQUE2QixPQUFPLElBQUk7QUFBQSxtRUFBeUYsTUFBTTtBQUFBO0FBRXhKLGFBQU8sY0FBYyxZQUFZLE9BQU8sSUFBSTtBQUFBO0FBRTdDLGFBQVMsTUFBTSxhQUFhO0FBQUEsTUFDM0I7QUFBQSxNQUNBLE9BQU8sT0FBTztBQUFBLE1BQ2QsU0FBUyxNQUFNLFdBQVc7QUFBQSxRQUN6QjtBQUFBLFFBQ0EsVUFBVSxJQUFJLElBQUksS0FBSyxNQUFNLGFBQWEsWUFBWTtBQUFBLFFBQ3REO0FBQUEsUUFDQSxNQUFNO0FBQUEsUUFDTjtBQUFBLFFBQ0EsVUFBVSxPQUFPLE1BQU07QUFBQSxRQUN2QjtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUE7QUFBQTtBQUFBO0FBTUosU0FBTyxFQUFFLFFBQVE7QUFBQTtBQUdsQixzQ0FBc0MsTUFBK0IsT0FBaUU7QUFDckksUUFBTSxFQUFFLGFBQWEsU0FBUyxZQUFZLGVBQWU7QUFDekQsTUFBSSxDQUFDO0FBQVksVUFBTSxJQUFJLE1BQU07QUFDakMsUUFBTSxXQUFXLElBQUksSUFBSSxLQUFLLE1BQU0sYUFBYSxZQUFZO0FBQzdELFFBQU0sTUFBTyxNQUFNLFdBQVcsY0FBYyxjQUFjO0FBQzFELCtCQUE2QjtBQUM3QixRQUFNLE1BQU0sb0JBQW9CLFlBQVksYUFBYSxNQUFNO0FBQy9ELFFBQU0sa0JBQWtCLFlBQVksT0FBTyxLQUFLLElBQUk7QUFDcEQsUUFBTSxjQUFjLFdBQVcsTUFBTTtBQUNyQywrQkFBNkIsYUFBYTtBQUMxQyxTQUFPO0FBQUEsSUFDTixPQUFPLFlBQVksSUFBSSxDQUFDLGVBQWUsV0FBVyxVQUFVLE1BQU0sU0FBUyxXQUFXLFNBQVMsT0FBTztBQUFBLElBQ3RHLEtBQUssSUFBSTtBQUFBO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
|
@@ -9,11 +9,47 @@ 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
|
+
const MAX_CONCURRENT_RENDERS = 10;
|
|
14
|
+
function addPageName(pathname, opts) {
|
|
15
|
+
const pathrepl = opts.astroConfig.buildOptions.pageUrlFormat === "directory" ? "/index.html" : pathname === "/" ? "index.html" : ".html";
|
|
16
|
+
opts.pageNames.push(pathname.replace(/\/?$/, pathrepl).replace(/^\//, ""));
|
|
17
|
+
}
|
|
18
|
+
function chunkIsPage(output, internals) {
|
|
19
|
+
if (output.type !== "chunk") {
|
|
20
|
+
return false;
|
|
21
|
+
}
|
|
22
|
+
const chunk = output;
|
|
23
|
+
return chunk.facadeModuleId && (internals.entrySpecifierToBundleMap.has(chunk.facadeModuleId) || internals.entrySpecifierToBundleMap.has("/" + chunk.facadeModuleId));
|
|
24
|
+
}
|
|
25
|
+
function* throttle(max, inPaths) {
|
|
26
|
+
let tmp = [];
|
|
27
|
+
let i = 0;
|
|
28
|
+
for (let path of inPaths) {
|
|
29
|
+
tmp.push(path);
|
|
30
|
+
if (i === max) {
|
|
31
|
+
yield tmp;
|
|
32
|
+
tmp.length = 0;
|
|
33
|
+
i = 0;
|
|
34
|
+
} else {
|
|
35
|
+
i++;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
if (tmp.length) {
|
|
39
|
+
yield tmp;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
12
42
|
async function staticBuild(opts) {
|
|
13
43
|
const { allPages, astroConfig } = opts;
|
|
14
44
|
const pageInput = new Set();
|
|
15
45
|
const jsInput = new Set();
|
|
16
46
|
const facadeIdToPageDataMap = new Map();
|
|
47
|
+
const polyfills = getRenderers(opts).flatMap((renderer) => {
|
|
48
|
+
return (renderer.polyfills || []).concat(renderer.hydrationPolyfills || []);
|
|
49
|
+
});
|
|
50
|
+
for (const polyfill of polyfills) {
|
|
51
|
+
jsInput.add(polyfill);
|
|
52
|
+
}
|
|
17
53
|
for (const [component, pageData] of Object.entries(allPages)) {
|
|
18
54
|
const [renderers, mod] = pageData.preload;
|
|
19
55
|
const metadata = mod.$$metadata;
|
|
@@ -30,6 +66,7 @@ async function staticBuild(opts) {
|
|
|
30
66
|
facadeIdToPageDataMap.set(astroModuleId, pageData);
|
|
31
67
|
}
|
|
32
68
|
const internals = createBuildInternals();
|
|
69
|
+
prepareOutDir(astroConfig);
|
|
33
70
|
const [ssrResult] = await Promise.all([ssrBuild(opts, internals, pageInput), clientBuild(opts, internals, jsInput)]);
|
|
34
71
|
await generatePages(ssrResult, opts, internals, facadeIdToPageDataMap);
|
|
35
72
|
await cleanSsrOutput(opts);
|
|
@@ -40,7 +77,7 @@ async function ssrBuild(opts, internals, input) {
|
|
|
40
77
|
logLevel: "error",
|
|
41
78
|
mode: "production",
|
|
42
79
|
build: {
|
|
43
|
-
emptyOutDir:
|
|
80
|
+
emptyOutDir: false,
|
|
44
81
|
minify: false,
|
|
45
82
|
outDir: fileURLToPath(astroConfig.dist),
|
|
46
83
|
ssr: true,
|
|
@@ -101,17 +138,35 @@ async function clientBuild(opts, internals, input) {
|
|
|
101
138
|
base: astroConfig.buildOptions.site ? new URL(astroConfig.buildOptions.site).pathname : "/"
|
|
102
139
|
});
|
|
103
140
|
}
|
|
141
|
+
function getRenderers(opts) {
|
|
142
|
+
const pageData = Object.values(opts.allPages)[0];
|
|
143
|
+
const viteLoadedRenderers = pageData.preload[0];
|
|
144
|
+
return viteLoadedRenderers;
|
|
145
|
+
}
|
|
146
|
+
async function collectRenderers(opts) {
|
|
147
|
+
const viteLoadedRenderers = getRenderers(opts);
|
|
148
|
+
const renderers = await Promise.all(viteLoadedRenderers.map(async (r) => {
|
|
149
|
+
const mod = await import(r.serverEntry);
|
|
150
|
+
return Object.create(r, {
|
|
151
|
+
ssr: {
|
|
152
|
+
value: mod.default
|
|
153
|
+
}
|
|
154
|
+
});
|
|
155
|
+
}));
|
|
156
|
+
return renderers;
|
|
157
|
+
}
|
|
104
158
|
async function generatePages(result, opts, internals, facadeIdToPageDataMap) {
|
|
105
159
|
debug(opts.logging, "generate", "End build step, now generating");
|
|
160
|
+
const renderers = await collectRenderers(opts);
|
|
106
161
|
const generationPromises = [];
|
|
107
162
|
for (let output of result.output) {
|
|
108
|
-
if (output
|
|
109
|
-
generationPromises.push(generatePage(output, opts, internals, facadeIdToPageDataMap));
|
|
163
|
+
if (chunkIsPage(output, internals)) {
|
|
164
|
+
generationPromises.push(generatePage(output, opts, internals, facadeIdToPageDataMap, renderers));
|
|
110
165
|
}
|
|
111
166
|
}
|
|
112
167
|
await Promise.all(generationPromises);
|
|
113
168
|
}
|
|
114
|
-
async function generatePage(output, opts, internals, facadeIdToPageDataMap) {
|
|
169
|
+
async function generatePage(output, opts, internals, facadeIdToPageDataMap, renderers) {
|
|
115
170
|
const { astroConfig } = opts;
|
|
116
171
|
let url = new URL("./" + output.fileName, astroConfig.dist);
|
|
117
172
|
const facadeId = output.facadeModuleId;
|
|
@@ -126,24 +181,31 @@ async function generatePage(output, opts, internals, facadeIdToPageDataMap) {
|
|
|
126
181
|
pageData,
|
|
127
182
|
internals,
|
|
128
183
|
linkIds,
|
|
129
|
-
Component
|
|
184
|
+
Component,
|
|
185
|
+
renderers
|
|
130
186
|
};
|
|
131
|
-
const renderPromises =
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
187
|
+
const renderPromises = [];
|
|
188
|
+
for (const paths of throttle(MAX_CONCURRENT_RENDERS, pageData.paths)) {
|
|
189
|
+
for (const path of paths) {
|
|
190
|
+
renderPromises.push(generatePath(path, opts, generationOptions));
|
|
191
|
+
}
|
|
192
|
+
await Promise.all(renderPromises);
|
|
193
|
+
renderPromises.length = 0;
|
|
194
|
+
}
|
|
135
195
|
}
|
|
136
196
|
async function generatePath(pathname, opts, gopts) {
|
|
137
|
-
const { astroConfig, logging, origin, routeCache } = opts;
|
|
138
|
-
const { Component, internals, linkIds, pageData } = gopts;
|
|
139
|
-
|
|
197
|
+
const { astroConfig, logging, origin, pageNames, routeCache } = opts;
|
|
198
|
+
const { Component, internals, linkIds, pageData, renderers } = gopts;
|
|
199
|
+
addPageName(pathname, opts);
|
|
200
|
+
const [, mod] = pageData.preload;
|
|
140
201
|
try {
|
|
141
202
|
const [params, pageProps] = await getParamsAndProps({
|
|
142
203
|
route: pageData.route,
|
|
143
204
|
routeCache,
|
|
144
205
|
logging,
|
|
145
206
|
pathname,
|
|
146
|
-
mod
|
|
207
|
+
mod,
|
|
208
|
+
validate: false
|
|
147
209
|
});
|
|
148
210
|
debug(logging, "generate", `Generating: ${pathname}`);
|
|
149
211
|
const result = createResult({ astroConfig, origin, params, pathname, renderers });
|
|
@@ -240,4 +302,4 @@ export {
|
|
|
240
302
|
staticBuild,
|
|
241
303
|
vitePluginNewBuild
|
|
242
304
|
};
|
|
243
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
305
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvYnVpbGQvc3RhdGljLWJ1aWxkLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBVUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBWUEsTUFBTSx5QkFBeUI7QUFFL0IscUJBQXFCLFVBQWtCLE1BQWdDO0FBQ3RFLFFBQU0sV0FBVyxLQUFLLFlBQVksYUFBYSxrQkFBa0IsY0FBYyxnQkFBZ0IsYUFBYSxNQUFNLGVBQWU7QUFDakksT0FBSyxVQUFVLEtBQUssU0FBUyxRQUFRLFFBQVEsVUFBVSxRQUFRLE9BQU87QUFBQTtBQUl2RSxxQkFBcUIsUUFBbUMsV0FBMkI7QUFDbEYsTUFBSSxPQUFPLFNBQVMsU0FBUztBQUM1QixXQUFPO0FBQUE7QUFFUixRQUFNLFFBQVE7QUFDZCxTQUFPLE1BQU0sa0JBQW1CLFdBQVUsMEJBQTBCLElBQUksTUFBTSxtQkFBbUIsVUFBVSwwQkFBMEIsSUFBSSxNQUFNLE1BQU07QUFBQTtBQUl0SixtQkFBbUIsS0FBYSxTQUFtQjtBQUNsRCxNQUFJLE1BQU07QUFDVixNQUFJLElBQUk7QUFDUixXQUFTLFFBQVEsU0FBUztBQUN6QixRQUFJLEtBQUs7QUFDVCxRQUFJLE1BQU0sS0FBSztBQUNkLFlBQU07QUFFTixVQUFJLFNBQVM7QUFDYixVQUFJO0FBQUEsV0FDRTtBQUNOO0FBQUE7QUFBQTtBQU1GLE1BQUksSUFBSSxRQUFRO0FBQ2YsVUFBTTtBQUFBO0FBQUE7QUFJUiwyQkFBa0MsTUFBMEI7QUFDM0QsUUFBTSxFQUFFLFVBQVUsZ0JBQWdCO0FBR2xDLFFBQU0sWUFBWSxJQUFJO0FBR3RCLFFBQU0sVUFBVSxJQUFJO0FBSXBCLFFBQU0sd0JBQXdCLElBQUk7QUFHbEMsUUFBTSxZQUFZLGFBQWEsTUFBTSxRQUFRLENBQUMsYUFBYTtBQUMxRCxXQUFRLFVBQVMsYUFBYSxJQUFJLE9BQU8sU0FBUyxzQkFBc0I7QUFBQTtBQUV6RSxhQUFX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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==
|
package/dist/core/path.js
CHANGED
|
@@ -27,6 +27,9 @@ function prependDotSlash(path) {
|
|
|
27
27
|
}
|
|
28
28
|
return "./" + path;
|
|
29
29
|
}
|
|
30
|
+
function trimSlashes(path) {
|
|
31
|
+
return path.replace(/^\/|\/$/g, "");
|
|
32
|
+
}
|
|
30
33
|
export {
|
|
31
34
|
appendForwardSlash,
|
|
32
35
|
isRelativePath,
|
|
@@ -34,6 +37,7 @@ export {
|
|
|
34
37
|
prependForwardSlash,
|
|
35
38
|
removeEndingForwardSlash,
|
|
36
39
|
startsWithDotDotSlash,
|
|
37
|
-
startsWithDotSlash
|
|
40
|
+
startsWithDotSlash,
|
|
41
|
+
trimSlashes
|
|
38
42
|
};
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NvcmUvcGF0aC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUFPLDRCQUE0QixNQUFjO0FBQ2hELFNBQU8sS0FBSyxTQUFTLE9BQU8sT0FBTyxPQUFPO0FBQUE7QUFHcEMsNkJBQTZCLE1BQWM7QUFDakQsU0FBTyxLQUFLLE9BQU8sTUFBTSxPQUFPLE1BQU07QUFBQTtBQUdoQyxrQ0FBa0MsTUFBYztBQUN0RCxTQUFPLEtBQUssU0FBUyxPQUFPLEtBQUssTUFBTSxHQUFHLEtBQUssU0FBUyxLQUFLO0FBQUE7QUFHdkQsK0JBQStCLE1BQWM7QUFDbkQsUUFBTSxLQUFLLEtBQUs7QUFDaEIsUUFBTSxLQUFLLEtBQUs7QUFDaEIsUUFBTSxLQUFLLEtBQUs7QUFDaEIsU0FBTyxPQUFPLE9BQU8sT0FBTyxPQUFPLE9BQU87QUFBQTtBQUdwQyw0QkFBNEIsTUFBYztBQUNoRCxRQUFNLEtBQUssS0FBSztBQUNoQixRQUFNLEtBQUssS0FBSztBQUNoQixTQUFPLE9BQU8sT0FBTyxPQUFPO0FBQUE7QUFHdEIsd0JBQXdCLE1BQWM7QUFDNUMsU0FBTyxzQkFBc0IsU0FBUyxtQkFBbUI7QUFBQTtBQUduRCx5QkFBeUIsTUFBYztBQUM3QyxNQUFJLGVBQWUsT0FBTztBQUN6QixXQUFPO0FBQUE7QUFHUixTQUFPLE9BQU87QUFBQTtBQUdSLHFCQUFxQixNQUFjO0FBQ3pDLFNBQU8sS0FBSyxRQUFRLFlBQVk7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -2,90 +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,
|
|
8
|
-
import {
|
|
9
|
-
import * as npath from "path";
|
|
10
|
-
function removeBase(base, pathname) {
|
|
11
|
-
if (base === pathname) {
|
|
12
|
-
return "/";
|
|
13
|
-
}
|
|
14
|
-
let requrl = pathname.substr(base.length);
|
|
15
|
-
return prependForwardSlash(requrl);
|
|
16
|
-
}
|
|
8
|
+
import { subpathNotUsedTemplate, notFoundTemplate } from "../dev/template/4xx.js";
|
|
9
|
+
import { appendForwardSlash, trimSlashes } from "../path.js";
|
|
17
10
|
async function preview(config, { logging }) {
|
|
18
11
|
const startServerTime = performance.now();
|
|
19
|
-
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);
|
|
20
24
|
const server = http.createServer((req, res) => {
|
|
21
|
-
|
|
22
|
-
if (!
|
|
25
|
+
const requestURL = new URL(req.url, defaultOrigin);
|
|
26
|
+
if (!requestURL.pathname.startsWith(baseURL.pathname)) {
|
|
23
27
|
res.statusCode = 404;
|
|
24
|
-
res.end(subpathNotUsedTemplate(
|
|
28
|
+
res.end(subpathNotUsedTemplate(baseURL.pathname, requestURL.pathname));
|
|
25
29
|
return;
|
|
26
30
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
return;
|
|
37
|
-
}
|
|
38
|
-
break;
|
|
39
|
-
}
|
|
40
|
-
case "never": {
|
|
41
|
-
if ((_b = req.url) == null ? void 0 : _b.endsWith("/")) {
|
|
42
|
-
res.statusCode = 404;
|
|
43
|
-
res.end(template({
|
|
44
|
-
title: "Not found",
|
|
45
|
-
tabTitle: "Not found",
|
|
46
|
-
pathname: req.url
|
|
47
|
-
}));
|
|
48
|
-
return;
|
|
49
|
-
}
|
|
50
|
-
break;
|
|
51
|
-
}
|
|
52
|
-
case "ignore": {
|
|
53
|
-
break;
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
let sendpath = removeBase(base, req.url);
|
|
57
|
-
const sendOptions = {
|
|
58
|
-
root: fileURLToPath(config.dist)
|
|
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));
|
|
59
40
|
};
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
case
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
send(req, sendpath, sendOptions).once("directory", function(_res, path) {
|
|
83
|
-
if (config.buildOptions.pageUrlFormat === "directory" && !path.endsWith("index.html")) {
|
|
84
|
-
return this.sendIndex(path);
|
|
85
|
-
} else {
|
|
86
|
-
this.error(404);
|
|
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);
|
|
87
63
|
}
|
|
88
|
-
}
|
|
64
|
+
};
|
|
65
|
+
fs.stat(url = new URL(trimSlashes(pathname), config.dist), onStat);
|
|
89
66
|
});
|
|
90
67
|
let { hostname, port } = config.devOptions;
|
|
91
68
|
let httpServer;
|
|
@@ -97,7 +74,7 @@ async function preview(config, { logging }) {
|
|
|
97
74
|
httpServer = server.listen(port, hostname, () => {
|
|
98
75
|
if (!showedListenMsg) {
|
|
99
76
|
info(logging, "astro", msg.devStart({ startupTime: performance.now() - timerStart }));
|
|
100
|
-
info(logging, "astro", msg.devHost({ host: `http://${hostname}:${port}${
|
|
77
|
+
info(logging, "astro", msg.devHost({ host: `http://${hostname}:${port}${baseURL.pathname}` }));
|
|
101
78
|
}
|
|
102
79
|
showedListenMsg = true;
|
|
103
80
|
resolve();
|
|
@@ -134,4 +111,4 @@ async function preview(config, { logging }) {
|
|
|
134
111
|
export {
|
|
135
112
|
preview as default
|
|
136
113
|
};
|
|
137
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
114
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvcHJldmlldy9pbmRleC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUlBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQWNBLHVCQUFzQyxRQUFxQixFQUFFLFdBQW1EO0FBQy9HLFFBQU0sa0JBQWtCLFlBQVk7QUFDcEMsUUFBTSxnQkFBZ0IsT0FBTyxhQUFhO0FBQzFDLFFBQU0sZ0JBQWdCLE9BQU8sV0FBVztBQUN4QyxRQUFNLHFCQUFxQixrQkFBa0I7QUFDN0MsUUFBTSxxQkFBcUIsa0JBQWtCO0FBRzdDLFFBQU0sY0FBYztBQUVwQixRQUFNLGdCQUFnQjtBQUV0QixRQUFNLGNBQWM7QUFBQSxJQUNuQixZQUFZLGtCQUFrQixTQUFTLENBQUMsVUFBVTtBQUFBLElBQ2xELE9BQU87QUFBQSxJQUNQLE1BQU0sY0FBYyxPQUFPO0FBQUE7QUFJNUIsTUFBSSxVQUFVLElBQUksSUFBSSxtQkFBbUIsT0FBTyxhQUFhLFFBQVEsS0FBSztBQUcxRSxRQUFNLFNBQVMsS0FBSyxhQUFhLENBQUMsS0FBSyxRQUFRO0FBQzlDLFVBQU0sYUFBYSxJQUFJLElBQUksSUFBSSxLQUFlO0FBRzlDLFFBQUksQ0FBQyxXQUFXLFNBQVMsV0FBVyxRQUFRLFdBQVc7QUFDdEQsVUFBSSxhQUFhO0FBQ2pCLFVBQUksSUFBSSx1QkFBdUIsUUFBUSxVQUFVLFdBQVc7QUFDNUQ7QUFBQTtBQUlELFVBQU0sV0FBVyxXQUFXLFNBQVMsTUFBTSxRQUFRLFNBQVMsU0FBUztBQUVyRSxVQUFNLFNBQVMsYUFBYTtBQUM1QixVQUFNLG1CQUFtQixVQUFVLFNBQVMsU0FBUztBQUVyRCxRQUFJLG1CQUFtQjtBQUN2QixRQUFJLG1CQUFtQjtBQUV2QixRQUFJO0FBRUosVUFBTSxRQUFRLENBQUMsWUFBb0I7QUFDbEMsVUFBSSxhQUFhO0FBQ2pCLFVBQUksSUFBSSxpQkFBaUIsVUFBVTtBQUFBO0FBR3BDLFVBQU0sU0FBUyxDQUFDLEtBQW1DLFNBQWdCO0FBQ2xFLGNBQVE7QUFBQSxhQUVGLFFBQU8sb0JBQW9CLG9CQUFvQixDQUFDO0FBQUEsYUFDaEQsUUFBTyxvQkFBb0IsQ0FBQyxvQkFBb0IsQ0FBQyxzQkFBc0IsQ0FBQyxTQUFTLFNBQVM7QUFDOUYsNkJBQW1CO0FBQ25CLGlCQUFPLEdBQUcsS0FBTSxNQUFNLElBQUksSUFBSSxJQUFJLFdBQVcsU0FBUyxNQUFPO0FBQUEsYUFHekQsUUFBUTtBQUNaLGlCQUFPLE1BQU07QUFBQSxhQUdULE1BQUssaUJBQWlCLG9CQUFvQixzQkFBc0IsQ0FBQztBQUNyRSxpQkFBTyxNQUFNO0FBQUEsYUFHVCxNQUFLLGlCQUFpQixDQUFDLG9CQUFvQixzQkFBc0IsQ0FBQztBQUN0RSxpQkFBTyxNQUFNO0FBQUEsYUFHVCxNQUFLLGlCQUFpQjtBQUMxQiw2QkFBbUI7QUFDbkIsaUJBQU8sR0FBRyxLQUFNLE1BQU0sSUFBSSxJQUFJLElBQUksV0FBWSxLQUFJLFNBQVMsU0FBUyxPQUFPLGNBQWMsTUFBTSxjQUFjLE1BQU87QUFBQSxhQUdoSCxLQUFLO0FBQ1QsaUJBQU8sTUFBTTtBQUFBO0FBSWIsZUFBSyxLQUFLLGNBQWMsTUFBTTtBQUFBLFlBQzdCLFlBQVk7QUFBQSxZQUNaLE9BQU87QUFBQSxhQUNMLEtBQUs7QUFBQTtBQUFBO0FBSVgsT0FBRyxLQUFNLE1BQU0sSUFBSSxJQUFJLFlBQVksV0FBVyxPQUFPLE9BQVE7QUFBQTtBQUc5RCxNQUFJLEVBQUUsVUFBVSxTQUFTLE9BQU87QUFFaEMsTUFBSTtBQUdKLHVCQUFxQixZQUFtQztBQUN2RCxRQUFJLHFCQUFxQjtBQUN6QixRQUFJLGtCQUFrQjtBQUN0QixXQUFPLElBQUksUUFBYyxDQUFDLFNBQVMsV0FBVztBQUM3QyxZQUFNLFNBQVMsTUFBTTtBQUNwQixxQkFBYSxPQUFPLE9BQU8sTUFBTSxVQUFVLE1BQU07QUFDaEQsY0FBSSxDQUFDLGlCQUFpQjtBQUNyQixpQkFBSyxTQUFTLFNBQVMsSUFBSSxTQUFTLEVBQUUsYUFBYSxZQUFZLFFBQVE7QUFDdkUsaUJBQUssU0FBUyxTQUFTLElBQUksUUFBUSxFQUFFLE1BQU0sVUFBVSxZQUFZLE9BQU8sUUFBUTtBQUFBO0FBRWpGLDRCQUFrQjtBQUNsQjtBQUFBO0FBRUQsaURBQVksR0FBRyxTQUFTO0FBQUE7QUFHekIsWUFBTSxVQUFVLENBQUMsUUFBK0I7QUFDL0MsWUFBSSxJQUFJLFFBQVEsSUFBSSxTQUFTLGNBQWM7QUFDMUMsY0FBSSxDQUFDLG9CQUFvQjtBQUN4QixpQkFBSyxTQUFTLFNBQVMsSUFBSSxVQUFVLEVBQUU7QUFDdkMsaUNBQXFCO0FBQUE7QUFFdEI7QUFDQSxpQkFBTztBQUFBLGVBQ0Q7QUFDTixnQkFBTSxTQUFTLFNBQVMsSUFBSTtBQUM1QixtREFBWSxlQUFlLFNBQVM7QUFDcEMsaUJBQU87QUFBQTtBQUFBO0FBSVQ7QUFBQTtBQUFBO0FBS0YsUUFBTSxZQUFZO0FBRWxCLFNBQU87QUFBQSxJQUNOO0FBQUEsSUFDQTtBQUFBLElBQ0EsUUFBUTtBQUFBLElBQ1IsTUFBTSxZQUFZO0FBQ2pCLGlCQUFXO0FBQUE7QUFBQTtBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
|
package/dist/core/ssr/index.js
CHANGED
|
@@ -22,9 +22,9 @@ import { renderPage } from "../../runtime/server/index.js";
|
|
|
22
22
|
import { codeFrame, resolveDependency } from "../util.js";
|
|
23
23
|
import { getStylesForURL } from "./css.js";
|
|
24
24
|
import { injectTags } from "./html.js";
|
|
25
|
-
import { generatePaginateFunction } from "./paginate.js";
|
|
26
25
|
import { getParams, validateGetStaticPathsModule, validateGetStaticPathsResult } from "./routing.js";
|
|
27
26
|
import { createResult } from "./result.js";
|
|
27
|
+
import { assignStaticPaths, ensureRouteCached, findPathItemByKey } from "./route-cache.js";
|
|
28
28
|
const svelteStylesRE = /svelte\?svelte&type=style/;
|
|
29
29
|
const cache = new Map();
|
|
30
30
|
async function resolveRenderer(viteServer, renderer, astroConfig) {
|
|
@@ -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;
|
|
@@ -94,10 +95,11 @@ async function getParamsAndProps({
|
|
|
94
95
|
routeCache,
|
|
95
96
|
logging,
|
|
96
97
|
pathname,
|
|
97
|
-
mod
|
|
98
|
+
mod,
|
|
99
|
+
validate = true
|
|
98
100
|
}) {
|
|
99
101
|
let params = {};
|
|
100
|
-
let pageProps
|
|
102
|
+
let pageProps;
|
|
101
103
|
if (route && !route.pathname) {
|
|
102
104
|
if (route.params.length) {
|
|
103
105
|
const paramsMatch = route.pattern.exec(pathname);
|
|
@@ -105,21 +107,24 @@ async function getParamsAndProps({
|
|
|
105
107
|
params = getParams(route.params)(paramsMatch);
|
|
106
108
|
}
|
|
107
109
|
}
|
|
108
|
-
|
|
110
|
+
if (validate) {
|
|
111
|
+
validateGetStaticPathsModule(mod);
|
|
112
|
+
}
|
|
109
113
|
if (!routeCache[route.component]) {
|
|
110
|
-
|
|
111
|
-
paginate: generatePaginateFunction(route),
|
|
112
|
-
rss: () => {
|
|
113
|
-
}
|
|
114
|
-
})).flat();
|
|
114
|
+
await assignStaticPaths(routeCache, route, mod);
|
|
115
115
|
}
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
116
|
+
if (validate) {
|
|
117
|
+
validateGetStaticPathsResult(routeCache[route.component], logging);
|
|
118
|
+
}
|
|
119
|
+
const staticPaths = routeCache[route.component];
|
|
120
|
+
const paramsKey = JSON.stringify(params);
|
|
121
|
+
const matchedStaticPath = findPathItemByKey(staticPaths, paramsKey, logging);
|
|
119
122
|
if (!matchedStaticPath) {
|
|
120
123
|
throw new Error(`[getStaticPaths] route pattern matched, but no matching static path found. (${pathname})`);
|
|
121
124
|
}
|
|
122
|
-
pageProps =
|
|
125
|
+
pageProps = Object.create(matchedStaticPath.props || Object.prototype);
|
|
126
|
+
} else {
|
|
127
|
+
pageProps = {};
|
|
123
128
|
}
|
|
124
129
|
return [params, pageProps];
|
|
125
130
|
}
|
|
@@ -135,13 +140,7 @@ async function render(renderers, mod, ssrOpts) {
|
|
|
135
140
|
}
|
|
136
141
|
}
|
|
137
142
|
validateGetStaticPathsModule(mod);
|
|
138
|
-
|
|
139
|
-
routeCache[route.component] = await (await mod.getStaticPaths({
|
|
140
|
-
paginate: generatePaginateFunction(route),
|
|
141
|
-
rss: () => {
|
|
142
|
-
}
|
|
143
|
-
})).flat();
|
|
144
|
-
}
|
|
143
|
+
await ensureRouteCached(routeCache, route, mod);
|
|
145
144
|
validateGetStaticPathsResult(routeCache[route.component], logging);
|
|
146
145
|
const routePathParams = routeCache[route.component];
|
|
147
146
|
const matchedStaticPath = routePathParams.find(({ params: _params }) => JSON.stringify(_params) === JSON.stringify(params));
|
|
@@ -227,4 +226,4 @@ export {
|
|
|
227
226
|
render,
|
|
228
227
|
ssr
|
|
229
228
|
};
|
|
230
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
229
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvc3NyL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7OztBQWtCQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBRUE7QUFDQTtBQUNBO0FBRUEsTUFBTSxpQkFBaUI7QUF1QnZCLE1BQU0sUUFBUSxJQUFJO0FBR2xCLCtCQUErQixZQUFnQyxVQUFrQixhQUEwQjtBQUMxRyxRQUFNLG1CQUF3QjtBQUk5QixRQUFNO0FBQUEsSUFDTCxTQUFTLEVBQUUsTUFBTSxRQUFRLFdBQVcsb0JBQW9CO0FBQUEsTUFDckQsTUFBTSxPQUFPLGtCQUFrQixVQUFVO0FBRTdDLG1CQUFpQixPQUFPO0FBQ3hCLE1BQUk7QUFBUSxxQkFBaUIsU0FBUyxLQUFLLE1BQU0sS0FBSyxVQUFVO0FBQ2hFLG1CQUFpQixjQUFjLEtBQUssTUFBTSxLQUFLLFVBQVU7QUFDekQsTUFBSSxNQUFNLFFBQVE7QUFBcUIscUJBQWlCLHFCQUFxQixtQkFBbUIsSUFBSSxDQUFDLFFBQWdCLEtBQUssTUFBTSxLQUFLLFVBQVU7QUFDL0ksTUFBSSxNQUFNLFFBQVE7QUFBWSxxQkFBaUIsWUFBWSxVQUFVLElBQUksQ0FBQyxRQUFnQixLQUFLLE1BQU0sS0FBSyxVQUFVO0FBQ3BILFFBQU0sRUFBRSxRQUFRLE1BQU0sV0FBVyxZQUFZLG1CQUFtQixpQkFBaUI7QUFDakYsUUFBTSxFQUFFLFNBQVMsZ0JBQWdCLE1BQU0sV0FBVyxjQUFjO0FBQ2hFLG1CQUFpQixNQUFNO0FBRXZCLFFBQU0sb0JBQThCO0FBQ3BDLFNBQU87QUFBQTtBQUdSLGdDQUFnQyxZQUFnQyxhQUErQztBQUM5RyxRQUFNLE1BQWdCLFlBQVk7QUFDbEMsUUFBTSxZQUFZLE1BQU0sUUFBUSxJQUMvQixJQUFJLElBQUksQ0FBQyxhQUFhO0FBQ3JCLFFBQUksTUFBTSxJQUFJO0FBQVcsYUFBTyxNQUFNLElBQUk7QUFDMUMsUUFBSSxVQUFVLGdCQUFnQixZQUFZLFVBQVU7QUFDcEQsVUFBTSxJQUFJLFVBQVU7QUFDcEIsV0FBTztBQUFBO0FBSVQsU0FBTztBQUFBO0FBUVIsNEJBQTRCLEdBQVksRUFBRSxZQUFZLFlBQWlDO0FBRXRGLE1BQUssRUFBVSxPQUFPO0FBQ3JCLElBQUMsRUFBVSxRQUFRLElBQUksR0FBSSxFQUFVO0FBQUE7QUFJdEMsTUFBSSxhQUFhLE9BQU87QUFDdkIsZUFBVyxpQkFBaUI7QUFBQTtBQUk3QixNQUFJLE1BQU0sUUFBUyxFQUFVLFNBQVM7QUFDckMsVUFBTSxFQUFFLFVBQVUsWUFBWSxTQUFVLEVBQWtCLE9BQU87QUFDakUsVUFBTSxNQUFNO0FBQ1osUUFBSTtBQUFVLFVBQUksTUFBTSxFQUFFLE1BQU0sU0FBUyxNQUFNLE1BQU0sU0FBUyxNQUFNLFFBQVEsU0FBUztBQUNyRixRQUFJLE1BQU0sSUFBSTtBQUNkLFFBQUksQ0FBQyxPQUFPLElBQUksTUFBTSxHQUFHLFdBQVcsSUFBSTtBQUFLLFlBQU0sTUFBTSxHQUFHLFNBQVMsU0FBUyxJQUFJLElBQUk7QUFDdEYsUUFBSSxDQUFDO0FBQUssWUFBTSxNQUFNLEdBQUcsU0FBUyxTQUFTLFVBQVU7QUFDckQsUUFBSSxRQUFRLFVBQVUsS0FBSyxJQUFJO0FBQy9CLFFBQUksS0FBSyxxQ0FBVTtBQUNuQixRQUFJLFVBQVUsR0FBRyxxQ0FBVSxTQUFTO0FBQUEsRUFDcEMsSUFBSTtBQUFBO0FBRUosUUFBSTtBQUFZLFVBQUksU0FBUztBQUM3QixVQUFNO0FBQUE7QUFJUCxRQUFNO0FBQUE7QUFLUCx1QkFBOEIsRUFBRSxhQUFhLFVBQVUsY0FBcUQ7QUFFM0csUUFBTSxZQUFZLE1BQU0saUJBQWlCLFlBQVk7QUFFckQsUUFBTSxNQUFPLE1BQU0sV0FBVyxjQUFjLGNBQWM7QUFFMUQsU0FBTyxDQUFDLFdBQVc7QUFBQTtBQUdwQixpQ0FBd0M7QUFBQSxFQUN2QztBQUFBLEVBQ0E7QUFBQSxFQUNBO0FBQUEsRUFDQTtBQUFBLEVBQ0E7QUFBQSxFQUNBLFdBQVc7QUFBQSxHQVFpQjtBQUU1QixNQUFJLFNBQWlCO0FBQ3JCLE1BQUk7QUFDSixNQUFJLFNBQVMsQ0FBQyxNQUFNLFVBQVU7QUFDN0IsUUFBSSxNQUFNLE9BQU8sUUFBUTtBQUN4QixZQUFNLGNBQWMsTUFBTSxRQUFRLEtBQUs7QUFDdkMsVUFBSSxhQUFhO0FBQ2hCLGlCQUFTLFVBQVUsTUFBTSxRQUFRO0FBQUE7QUFBQTtBQUduQyxRQUFJLFVBQVU7QUFDYixtQ0FBNkI7QUFBQTtBQUU5QixRQUFJLENBQUMsV0FBVyxNQUFNLFlBQVk7QUFDakMsWUFBTSxrQkFBa0IsWUFBWSxPQUFPO0FBQUE7QUFFNUMsUUFBSSxVQUFVO0FBRWIsbUNBQTZCLFdBQVcsTUFBTSxZQUFZO0FBQUE7QUFFM0QsVUFBTSxjQUF5QyxXQUFXLE1BQU07QUFDaEUsVUFBTSxZQUFZLEtBQUssVUFBVTtBQUNqQyxVQUFNLG9CQUFvQixrQkFBa0IsYUFBYSxXQUFXO0FBQ3BFLFFBQUksQ0FBQyxtQkFBbUI7QUFDdkIsWUFBTSxJQUFJLE1BQU0sK0VBQStFO0FBQUE7QUFJaEcsZ0JBQVksT0FBTyxPQUFPLGtCQUFrQixTQUFTLE9BQU87QUFBQSxTQUN0RDtBQUNOLGdCQUFZO0FBQUE7QUFFYixTQUFPLENBQUMsUUFBUTtBQUFBO0FBSWpCLHNCQUE2QixXQUF1QixLQUF3QixTQUFzQztBQUNqSCxRQUFNLEVBQUUsYUFBYSxVQUFVLFNBQVMsTUFBTSxRQUFRLFVBQVUsT0FBTyxZQUFZLGVBQWU7QUFHbEcsTUFBSSxTQUFpQjtBQUNyQixNQUFJLFlBQW1CO0FBQ3ZCLE1BQUksU0FBUyxDQUFDLE1BQU0sVUFBVTtBQUM3QixRQUFJLE1BQU0sT0FBTyxRQUFRO0FBQ3hCLFlBQU0sY0FBYyxNQUFNLFFBQVEsS0FBSztBQUN2QyxVQUFJLGFBQWE7QUFDaEIsaUJBQVMsVUFBVSxNQUFNLFFBQVE7QUFBQTtBQUFBO0FBR25DLGlDQUE2QjtBQUM3QixVQUFNLGtCQUFrQixZQUFZLE9BQU87QUFDM0MsaUNBQTZCLFdBQVcsTUFBTSxZQUFZO0FBQzFELFVBQU0sa0JBQXdDLFdBQVcsTUFBTTtBQUMvRCxVQUFNLG9CQUFvQixnQkFBZ0IsS0FBSyxDQUFDLEVBQUUsUUFBUSxjQUFjLEtBQUssVUFBVSxhQUFhLEtBQUssVUFBVTtBQUNuSCxRQUFJLENBQUMsbUJBQW1CO0FBQ3ZCLFlBQU0sSUFBSSxNQUFNLCtFQUErRTtBQUFBO0FBRWhHLGdCQUFZLG1CQUFLLGtCQUFrQixVQUFXO0FBQUE7QUFJL0MsUUFBTSxZQUFZLE1BQU0sSUFBSTtBQUM1QixNQUFJLENBQUM7QUFBVyxVQUFNLElBQUksTUFBTSw0REFBNEQsT0FBTztBQUNuRyxNQUFJLENBQUMsVUFBVTtBQUF5QixVQUFNLElBQUksTUFBTSxzQ0FBc0MsK0JBQU87QUFFckcsUUFBTSxTQUFTLGFBQWEsRUFBRSxhQUFhLFFBQVEsUUFBUSxVQUFVO0FBRXJFLFNBQU8sVUFBVSxPQUFPLE1BQWM7QUFJckMsUUFBSSxZQUFZLGFBQWEseUJBQXlCO0FBQ3JELFlBQU0sQ0FBQyxFQUFFLGdCQUFnQixNQUFNLFdBQVcsWUFBWSxXQUFXO0FBQ2pFLGFBQU87QUFBQSxXQUNEO0FBQ04sYUFBTztBQUFBO0FBQUE7QUFJVCxNQUFJLE9BQU8sTUFBTSxXQUFXLFFBQVEsV0FBVyxXQUFXO0FBRzFELFFBQU0sT0FBaUM7QUFHdkMsTUFBSSxTQUFTLGVBQWU7QUFDM0IsU0FBSyxLQUFLO0FBQUEsTUFDVCxLQUFLO0FBQUEsTUFDTCxPQUFPLEVBQUUsTUFBTTtBQUFBLE1BR2YsVUFBVSxNQUFNO0FBQUEsTUFDaEIsVUFBVTtBQUFBO0FBQUE7QUFLWixHQUFDLEdBQUcsZ0JBQWdCLFVBQVUsYUFBYSxRQUFRLENBQUMsU0FBUztBQUM1RCxRQUFJLFNBQVMsaUJBQWlCLGVBQWUsS0FBSyxPQUFPO0FBQ3hELFdBQUssS0FBSztBQUFBLFFBQ1QsS0FBSztBQUFBLFFBQ0wsT0FBTyxFQUFFLE1BQU0sVUFBVSxLQUFLO0FBQUEsUUFDOUIsVUFBVTtBQUFBO0FBQUEsV0FFTDtBQUNOLFdBQUssS0FBSztBQUFBLFFBQ1QsS0FBSztBQUFBLFFBQ0wsT0FBTztBQUFBLFVBQ04sS0FBSztBQUFBLFVBQ0w7QUFBQSxVQUNBLHVCQUF1QjtBQUFBO0FBQUEsUUFFeEIsVUFBVTtBQUFBO0FBQUE7QUFBQTtBQU1iLFNBQU8sV0FBVyxNQUFNO0FBR3hCLE1BQUksU0FBUyxpQkFBaUIsQ0FBQyxZQUFZLGFBQWEseUJBQXlCO0FBQ2hGLFVBQU0sY0FBYyxTQUFTLEtBQUssUUFBUSxZQUFZLFlBQVksTUFBTTtBQUN4RSxXQUFPLE1BQU0sV0FBVyxtQkFBbUIsYUFBYSxNQUFNO0FBQUE7QUFJL0QsTUFBSSxDQUFDLGtCQUFrQixLQUFLLE9BQU87QUFDbEMsV0FBTyxzQkFBc0I7QUFBQTtBQUc5QixTQUFPO0FBQUE7QUFHUixJQUFJO0FBQ0osOEJBQThCO0FBQzdCLE1BQUk7QUFBVyxXQUFPO0FBQ3RCLFFBQU0sV0FBVyxjQUFjLElBQUksSUFBSSwrQkFBK0IsWUFBWTtBQUNsRixRQUFNLFVBQVUsTUFBTSxHQUFHLFNBQVMsU0FBUztBQUMzQyxjQUFZLFFBQVE7QUFDcEIsU0FBTztBQUFBO0FBR1IsbUJBQTBCLFNBQXNDO0FBQy9ELE1BQUk7QUFDSCxVQUFNLENBQUMsV0FBVyxPQUFPLE1BQU0sUUFBUTtBQUN2QyxXQUFPLE1BQU0sT0FBTyxXQUFXLEtBQUs7QUFBQSxXQUM1QixHQUFQO0FBQ0QsVUFBTSxhQUFhLEdBQUcsRUFBRSxZQUFZLFFBQVEsWUFBWSxVQUFVLFFBQVE7QUFDMUUsVUFBTTtBQUFBO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { debug } from "../logger.js";
|
|
2
|
+
import { generatePaginateFunction } from "../ssr/paginate.js";
|
|
3
|
+
async function callGetStaticPaths(mod, route, rssFn) {
|
|
4
|
+
const staticPaths = await (await mod.getStaticPaths({
|
|
5
|
+
paginate: generatePaginateFunction(route),
|
|
6
|
+
rss: rssFn || (() => {
|
|
7
|
+
})
|
|
8
|
+
})).flat();
|
|
9
|
+
const keyedStaticPaths = staticPaths;
|
|
10
|
+
keyedStaticPaths.keyed = new Map();
|
|
11
|
+
for (const sp of keyedStaticPaths) {
|
|
12
|
+
const paramsKey = JSON.stringify(sp.params);
|
|
13
|
+
keyedStaticPaths.keyed.set(paramsKey, sp);
|
|
14
|
+
}
|
|
15
|
+
return keyedStaticPaths;
|
|
16
|
+
}
|
|
17
|
+
async function assignStaticPaths(routeCache, route, mod, rssFn) {
|
|
18
|
+
const staticPaths = await callGetStaticPaths(mod, route, rssFn);
|
|
19
|
+
routeCache[route.component] = staticPaths;
|
|
20
|
+
}
|
|
21
|
+
async function ensureRouteCached(routeCache, route, mod, rssFn) {
|
|
22
|
+
if (!routeCache[route.component]) {
|
|
23
|
+
const staticPaths = await callGetStaticPaths(mod, route, rssFn);
|
|
24
|
+
routeCache[route.component] = staticPaths;
|
|
25
|
+
return staticPaths;
|
|
26
|
+
} else {
|
|
27
|
+
return routeCache[route.component];
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
function findPathItemByKey(staticPaths, paramsKey, logging) {
|
|
31
|
+
let matchedStaticPath = staticPaths.keyed.get(paramsKey);
|
|
32
|
+
if (matchedStaticPath) {
|
|
33
|
+
return matchedStaticPath;
|
|
34
|
+
}
|
|
35
|
+
debug(logging, "findPathItemByKey", `Unexpected cache miss looking for ${paramsKey}`);
|
|
36
|
+
matchedStaticPath = staticPaths.find(({ params: _params }) => JSON.stringify(_params) === paramsKey);
|
|
37
|
+
}
|
|
38
|
+
export {
|
|
39
|
+
assignStaticPaths,
|
|
40
|
+
callGetStaticPaths,
|
|
41
|
+
ensureRouteCached,
|
|
42
|
+
findPathItemByKey
|
|
43
|
+
};
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvc3NyL3JvdXRlLWNhY2hlLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBR0E7QUFDQTtBQUlBLGtDQUF5QyxLQUF3QixPQUFrQixPQUFtRDtBQUNySSxRQUFNLGNBQW9DLE1BQ3pDLE9BQU0sSUFBSSxlQUFnQjtBQUFBLElBQ3pCLFVBQVUseUJBQXlCO0FBQUEsSUFDbkMsS0FDQyxTQUNDLE9BQU07QUFBQTtBQUFBLE1BSVI7QUFFRixRQUFNLG1CQUFtQjtBQUN6QixtQkFBaUIsUUFBUSxJQUFJO0FBQzdCLGFBQVcsTUFBTSxrQkFBa0I7QUFDbEMsVUFBTSxZQUFZLEtBQUssVUFBVSxHQUFHO0FBQ3BDLHFCQUFpQixNQUFNLElBQUksV0FBVztBQUFBO0FBR3ZDLFNBQU87QUFBQTtBQUdSLGlDQUF3QyxZQUF3QixPQUFrQixLQUF3QixPQUE4QjtBQUN2SSxRQUFNLGNBQWMsTUFBTSxtQkFBbUIsS0FBSyxPQUFPO0FBQ3pELGFBQVcsTUFBTSxhQUFhO0FBQUE7QUFHL0IsaUNBQXdDLFlBQXdCLE9BQWtCLEtBQXdCLE9BQW1EO0FBQzVKLE1BQUksQ0FBQyxXQUFXLE1BQU0sWUFBWTtBQUNqQyxVQUFNLGNBQWMsTUFBTSxtQkFBbUIsS0FBSyxPQUFPO0FBQ3pELGVBQVcsTUFBTSxhQUFhO0FBQzlCLFdBQU87QUFBQSxTQUNEO0FBQ04sV0FBTyxXQUFXLE1BQU07QUFBQTtBQUFBO0FBSW5CLDJCQUEyQixhQUF3QyxXQUFtQixTQUFxQjtBQUNqSCxNQUFJLG9CQUFvQixZQUFZLE1BQU0sSUFBSTtBQUM5QyxNQUFJLG1CQUFtQjtBQUN0QixXQUFPO0FBQUE7QUFHUixRQUFNLFNBQVMscUJBQXFCLHFDQUFxQztBQUN6RSxzQkFBb0IsWUFBWSxLQUFLLENBQUMsRUFBRSxRQUFRLGNBQWMsS0FBSyxVQUFVLGFBQWE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|
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==
|
|
@@ -91,13 +91,13 @@ async function generateHydrateScript(scriptOptions, metadata) {
|
|
|
91
91
|
}
|
|
92
92
|
let hydrationSource = "";
|
|
93
93
|
if (renderer.hydrationPolyfills) {
|
|
94
|
-
hydrationSource += `await Promise.all([${renderer.hydrationPolyfills.map((src) => `
|
|
95
|
-
import("${src}")`).join(", ")}]);
|
|
94
|
+
hydrationSource += `await Promise.all([${(await Promise.all(renderer.hydrationPolyfills.map(async (src) => `
|
|
95
|
+
import("${await result.resolve(src)}")`))).join(", ")}]);
|
|
96
96
|
`;
|
|
97
97
|
}
|
|
98
98
|
hydrationSource += renderer.source ? `const [{ ${componentExport.value}: Component }, { default: hydrate }] = await Promise.all([import("${await result.resolve(componentUrl)}"), import("${await result.resolve(renderer.source)}")]);
|
|
99
99
|
return (el, children) => hydrate(el)(Component, ${serializeProps(props)}, children);
|
|
100
|
-
` : `await import("${componentUrl}");
|
|
100
|
+
` : `await import("${await result.resolve(componentUrl)}");
|
|
101
101
|
return () => {};
|
|
102
102
|
`;
|
|
103
103
|
const hydrationScript = {
|
|
@@ -115,4 +115,4 @@ export {
|
|
|
115
115
|
generateHydrateScript,
|
|
116
116
|
serializeProps
|
|
117
117
|
};
|
|
118
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL3J1bnRpbWUvc2VydmVyL2h5ZHJhdGlvbi50cyJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFQTtBQUNBO0FBQ0E7QUFFQSxNQUFNLEVBQUUsVUFBVSxjQUFjO0FBTWhDLE1BQU0sa0JBQXFDLGlDQUN2QyxZQUR1QztBQUFBLEVBRTFDLFFBQVEsTUFBTSxPQUFPO0FBQ3BCLFFBQUksS0FBSyxPQUFPLE1BQU07QUFHckIsWUFBTSxNQUFNLEtBQUssSUFBSSxRQUFRLGNBQWE7QUFBQSxXQUNwQztBQUNOLGdCQUFVLFFBQVEsTUFBTTtBQUFBO0FBQUE7QUFBQTtBQU9wQix3QkFBd0IsT0FBWTtBQUMxQyxTQUFPLFNBQVMsY0FBYyxRQUFRO0FBQUEsSUFDckMsV0FBVztBQUFBO0FBQUE7QUFJYixNQUFNLHNCQUFzQixDQUFDLFFBQVEsUUFBUSxTQUFTLFdBQVc7QUFjMUQsMkJBQTJCLFlBQTBEO0FBQzNGLE1BQUksWUFBNEI7QUFBQSxJQUMvQixXQUFXO0FBQUEsSUFDWCxPQUFPO0FBQUE7QUFFUixhQUFXLENBQUMsS0FBSyxVQUFVLE9BQU8sUUFBUSxhQUFhO0FBQ3RELFFBQUksSUFBSSxXQUFXLFlBQVk7QUFDOUIsVUFBSSxDQUFDLFVBQVUsV0FBVztBQUN6QixrQkFBVSxZQUFZO0FBQUEsVUFDckIsV0FBVztBQUFBLFVBQ1gsT0FBTztBQUFBLFVBQ1AsY0FBYztBQUFBLFVBQ2QsaUJBQWlCLEVBQUUsT0FBTztBQUFBO0FBQUE7QUFHNUIsY0FBUTtBQUFBLGFBQ0YseUJBQXlCO0FBQzdCLG9CQUFVLFVBQVUsZUFBZTtBQUNuQztBQUFBO0FBQUEsYUFFSSwyQkFBMkI7QUFDL0Isb0JBQVUsVUFBVSxnQkFBZ0IsUUFBUTtBQUM1QztBQUFBO0FBQUEsYUFJSSw4QkFBOEI7QUFDbEM7QUFBQTtBQUFBLGlCQUVRO0FBQ1Isb0JBQVUsVUFBVSxZQUFZLElBQUksTUFBTSxLQUFLO0FBQy9DLG9CQUFVLFVBQVUsUUFBUTtBQUc1QixjQUFJLG9CQUFvQixRQUFRLFVBQVUsVUFBVSxhQUFhLEdBQUc7QUFDbkUsa0JBQU0sSUFBSSxNQUFNLHVDQUF1QyxzQ0FBc0Msb0JBQW9CLElBQUksQ0FBQyxNQUFNLFdBQVcsTUFBTSxLQUFLO0FBQUE7QUFJbkosY0FBSSxVQUFVLFVBQVUsY0FBYyxXQUFXLE9BQU8sVUFBVSxVQUFVLFVBQVUsVUFBVTtBQUMvRixrQkFBTSxJQUFJLE1BQU07QUFBQTtBQUdqQjtBQUFBO0FBQUE7QUFBQSxlQUdRLFFBQVEsY0FBYztBQUVoQyxnQkFBVSxNQUFNLElBQUksTUFBTSxHQUFHLE9BQU8sbUJBQW1CO0FBQUEsV0FDakQ7QUFDTixnQkFBVSxNQUFNLE9BQU87QUFBQTtBQUFBO0FBSXpCLFNBQU87QUFBQTtBQVdSLHFDQUE0QyxlQUFxQyxVQUFpRTtBQUNqSixRQUFNLEVBQUUsVUFBVSxRQUFRLFNBQVMsVUFBVTtBQUM3QyxRQUFNLEVBQUUsU0FBUyxjQUFjLG9CQUFvQjtBQUVuRCxNQUFJLENBQUMsaUJBQWlCO0FBQ3JCLFVBQU0sSUFBSSxNQUFNLDRDQUE0QyxTQUFTO0FBQUE7QUFHdEUsTUFBSSxrQkFBa0I7QUFDdEIsTUFBSSxTQUFTLG9CQUFvQjtBQUNoQyx1QkFBbUIsc0JBQXVCLE9BQU0sUUFBUSxJQUFJLFNBQVMsbUJBQW1CLElBQUksT0FBTyxRQUFnQjtBQUFBLFlBQWUsTUFBTSxPQUFPLFFBQVEsWUFBWSxLQUNsSztBQUFBO0FBQUE7QUFJRixxQkFBbUIsU0FBUyxTQUN6QixZQUFZLGdCQUFnQiwwRUFBMEUsTUFBTSxPQUFPLFFBQVEsNEJBQTRCLE1BQU0sT0FBTyxRQUNwSyxTQUFTO0FBQUEsb0RBRXVDLGVBQWU7QUFBQSxJQUUvRCxpQkFBaUIsTUFBTSxPQUFPLFFBQVE7QUFBQTtBQUFBO0FBSXpDLFFBQU0sa0JBQWtCO0FBQUEsSUFDdkIsT0FBTyxFQUFFLE1BQU0sVUFBVSxrQ0FBa0M7QUFBQSxJQUMzRCxVQUFVLHNCQUFzQixNQUFNLE9BQU8sUUFBUSxtQkFBbUI7QUFBQSxTQUNqRSxjQUFjLFNBQVMsY0FBYyxVQUFVLEtBQUssVUFBVSxTQUFTLGlCQUFpQjtBQUFBLElBQzdGO0FBQUE7QUFBQTtBQUFBO0FBS0gsU0FBTztBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
|
|
@@ -200,7 +200,7 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
|
|
|
200
200
|
for (const src of renderer.polyfills) {
|
|
201
201
|
result.scripts.add({
|
|
202
202
|
props: { type: "module" },
|
|
203
|
-
children: `import "${src}";`
|
|
203
|
+
children: `import "${await result.resolve(src)}";`
|
|
204
204
|
});
|
|
205
205
|
}
|
|
206
206
|
}
|
|
@@ -233,8 +233,8 @@ function createFetchContentFn(url) {
|
|
|
233
233
|
};
|
|
234
234
|
return fetchContent;
|
|
235
235
|
}
|
|
236
|
-
function createAstro(
|
|
237
|
-
const url = new URL(
|
|
236
|
+
function createAstro(filePathname, site, projectRootStr) {
|
|
237
|
+
const url = new URL(filePathname, site);
|
|
238
238
|
const projectRoot = new URL(projectRootStr);
|
|
239
239
|
const fetchContent = createFetchContentFn(url);
|
|
240
240
|
return {
|
|
@@ -364,4 +364,4 @@ export {
|
|
|
364
364
|
renderToString,
|
|
365
365
|
spreadAttributes
|
|
366
366
|
};
|
|
367
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
367
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/runtime/server/index.ts"],
  "mappings": "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",
  "names": []
}

|
|
@@ -23,7 +23,7 @@ class Metadata {
|
|
|
23
23
|
const found = new Set();
|
|
24
24
|
for (const metadata of this.deepMetadata()) {
|
|
25
25
|
for (const component of metadata.hydratedComponents) {
|
|
26
|
-
const path =
|
|
26
|
+
const path = metadata.getPath(component);
|
|
27
27
|
if (path && !found.has(path)) {
|
|
28
28
|
found.add(path);
|
|
29
29
|
yield path;
|
|
@@ -32,8 +32,14 @@ class Metadata {
|
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
*hydrationDirectiveSpecifiers() {
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
const found = new Set();
|
|
36
|
+
for (const metadata of this.deepMetadata()) {
|
|
37
|
+
for (const directive of metadata.hydrationDirectives) {
|
|
38
|
+
if (!found.has(directive)) {
|
|
39
|
+
found.add(directive);
|
|
40
|
+
yield hydrationSpecifier(directive);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
37
43
|
}
|
|
38
44
|
}
|
|
39
45
|
*deepMetadata() {
|
|
@@ -89,4 +95,4 @@ export {
|
|
|
89
95
|
Metadata,
|
|
90
96
|
createMetadata
|
|
91
97
|
};
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL3J1bnRpbWUvc2VydmVyL21ldGFkYXRhLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBQUE7QUFtQk8sZUFBZTtBQUFBLEVBU3JCLFlBQVksY0FBc0IsTUFBNkI7QUFDOUQsU0FBSyxVQUFVLEtBQUs7QUFDcEIsU0FBSyxVQUFVLEtBQUs7QUFDcEIsU0FBSyxxQkFBcUIsS0FBSztBQUMvQixTQUFLLHNCQUFzQixLQUFLO0FBQ2hDLFNBQUssVUFBVSxJQUFJLElBQUksY0FBYztBQUNyQyxTQUFLLGdCQUFnQixJQUFJO0FBQUE7QUFBQSxFQUcxQixZQUFZLFdBQTJCO0FBQ3RDLFdBQU8sVUFBVSxXQUFXLE9BQU8sSUFBSSxJQUFJLFdBQVcsS0FBSyxTQUFTLFdBQVc7QUFBQTtBQUFBLEVBR2hGLFFBQVEsV0FBK0I7QUFDdEMsVUFBTSxXQUFXLEtBQUsscUJBQXFCO0FBQzNDLFdBQU8sc0NBQVUsaUJBQWdCO0FBQUE7QUFBQSxFQUdsQyxVQUFVLFdBQStCO0FBQ3hDLFVBQU0sV0FBVyxLQUFLLHFCQUFxQjtBQUMzQyxXQUFPLHNDQUFVLG9CQUFtQjtBQUFBO0FBQUEsR0FPcEMseUJBQXlCO0FBQ3pCLFVBQU0sUUFBUSxJQUFJO0FBQ2xCLGVBQVcsWUFBWSxLQUFLLGdCQUFnQjtBQUMzQyxpQkFBVyxhQUFhLFNBQVMsb0JBQW9CO0FBQ3BELGNBQU0sT0FBTyxTQUFTLFFBQVE7QUFDOUIsWUFBSSxRQUFRLENBQUMsTUFBTSxJQUFJLE9BQU87QUFDN0IsZ0JBQU0sSUFBSTtBQUNWLGdCQUFNO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSxHQVNULCtCQUErQjtBQUMvQixVQUFNLFFBQVEsSUFBSTtBQUNsQixlQUFXLFlBQVksS0FBSyxnQkFBZ0I7QUFDM0MsaUJBQVcsYUFBYSxTQUFTLHFCQUFxQjtBQUNyRCxZQUFJLENBQUMsTUFBTSxJQUFJLFlBQVk7QUFDMUIsZ0JBQU0sSUFBSTtBQUNWLGdCQUFNLG1CQUFtQjtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEsR0FNcEIsZUFBbUQ7QUFFM0QsVUFBTTtBQUVOLFVBQU0sT0FBTyxJQUFJO0FBQ2pCLGVBQVcsRUFBRSxRQUFRLFNBQVMsS0FBSyxTQUFTO0FBQzNDLFVBQUksT0FBTyxJQUFJLGVBQWUsYUFBYTtBQUMxQyxjQUFNLEtBQUssSUFBSTtBQUdmLG1CQUFXLGdCQUFnQixHQUFHLGdCQUFnQjtBQUM3QyxjQUFJLENBQUMsS0FBSyxJQUFJLGVBQWU7QUFDNUIsaUJBQUssSUFBSTtBQUNULGtCQUFNO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBLEVBT0gscUJBQXFCLFdBQTBDO0FBQ3RFLFFBQUksS0FBSyxjQUFjLElBQUksWUFBWTtBQUN0QyxhQUFPLEtBQUssY0FBYyxJQUFJO0FBQUE7QUFFL0IsVUFBTSxXQUFXLEtBQUssc0JBQXNCO0FBQzVDLFNBQUssY0FBYyxJQUFJLFdBQVc7QUFDbEMsV0FBTztBQUFBO0FBQUEsRUFHQSxzQkFBc0IsV0FBMEM7QUFDdkUsVUFBTSxrQkFBa0IsT0FBTyxjQUFjO0FBQzdDLGVBQVcsRUFBRSxRQUFRLGVBQWUsS0FBSyxTQUFTO0FBQ2pELFlBQU0sS0FBSyxLQUFLLFlBQVk7QUFDNUIsaUJBQVcsQ0FBQyxLQUFLLFVBQVUsT0FBTyxRQUFRLFNBQVM7QUFDbEQsWUFBSSxpQkFBaUI7QUFDcEIsY0FBSSxRQUFRLGFBQWEsY0FBYyxPQUFPO0FBQzdDLG1CQUFPO0FBQUEsY0FDTixpQkFBaUI7QUFBQSxjQUNqQixjQUFjO0FBQUE7QUFBQTtBQUFBLG1CQUdOLGNBQWMsT0FBTztBQUMvQixpQkFBTztBQUFBLFlBQ04saUJBQWlCO0FBQUEsWUFDakIsY0FBYztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBS2xCLFdBQU87QUFBQTtBQUFBO0FBSUYsd0JBQXdCLGNBQXNCLFNBQWdDO0FBQ3BGLFNBQU8sSUFBSSxTQUFTLGNBQWM7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -158,10 +158,14 @@ export declare type GetHydrateCallback = () => Promise<(element: Element, innerH
|
|
|
158
158
|
paginate?: PaginateFunction;
|
|
159
159
|
rss?: (...args: any[]) => any;
|
|
160
160
|
}
|
|
161
|
-
export declare type
|
|
161
|
+
export declare type GetStaticPathsItem = {
|
|
162
162
|
params: Params;
|
|
163
163
|
props?: Props;
|
|
164
|
-
}
|
|
164
|
+
};
|
|
165
|
+
export declare type GetStaticPathsResult = GetStaticPathsItem[];
|
|
166
|
+
export declare type GetStaticPathsResultKeyed = GetStaticPathsResult & {
|
|
167
|
+
keyed: Map<string, GetStaticPathsItem>;
|
|
168
|
+
};
|
|
165
169
|
export interface HydrateOptions {
|
|
166
170
|
value?: string;
|
|
167
171
|
}
|
|
@@ -253,6 +257,8 @@ export interface Renderer {
|
|
|
253
257
|
name: string;
|
|
254
258
|
/** Import statement for renderer */
|
|
255
259
|
source?: string;
|
|
260
|
+
/** Import statement for the server renderer */
|
|
261
|
+
serverEntry: string;
|
|
256
262
|
/** Scripts to be injected before component */
|
|
257
263
|
polyfills?: string[];
|
|
258
264
|
/** Polyfills that need to run before hydration ever occurs */
|
|
@@ -286,7 +292,7 @@ export interface RouteData {
|
|
|
286
292
|
pattern: RegExp;
|
|
287
293
|
type: 'page';
|
|
288
294
|
}
|
|
289
|
-
export declare type RouteCache = Record<string,
|
|
295
|
+
export declare type RouteCache = Record<string, GetStaticPathsResultKeyed>;
|
|
290
296
|
export declare type RuntimeMode = 'development' | 'production';
|
|
291
297
|
/**
|
|
292
298
|
* RSS
|
|
@@ -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 {};
|
|
@@ -5,3 +5,4 @@ export declare function startsWithDotDotSlash(path: string): boolean;
|
|
|
5
5
|
export declare function startsWithDotSlash(path: string): boolean;
|
|
6
6
|
export declare function isRelativePath(path: string): boolean;
|
|
7
7
|
export declare function prependDotSlash(path: string): string;
|
|
8
|
+
export declare function trimSlashes(path: string): string;
|
|
@@ -23,12 +23,13 @@ interface SSROptions {
|
|
|
23
23
|
}
|
|
24
24
|
export declare type ComponentPreload = [Renderer[], ComponentInstance];
|
|
25
25
|
export declare function preload({ astroConfig, filePath, viteServer }: SSROptions): Promise<ComponentPreload>;
|
|
26
|
-
export declare function getParamsAndProps({ route, routeCache, logging, pathname, mod, }: {
|
|
26
|
+
export declare function getParamsAndProps({ route, routeCache, logging, pathname, mod, validate, }: {
|
|
27
27
|
route: RouteData | undefined;
|
|
28
28
|
routeCache: RouteCache;
|
|
29
29
|
pathname: string;
|
|
30
30
|
mod: ComponentInstance;
|
|
31
31
|
logging: LogOptions;
|
|
32
|
+
validate?: boolean;
|
|
32
33
|
}): Promise<[Params, Props]>;
|
|
33
34
|
/** use Vite to SSR */
|
|
34
35
|
export declare function render(renderers: Renderer[], mod: ComponentInstance, ssrOpts: SSROptions): Promise<string>;
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { ComponentInstance, GetStaticPathsItem, GetStaticPathsResultKeyed, RouteCache, RouteData } from '../../@types/astro';
|
|
2
|
+
import type { LogOptions } from '../logger';
|
|
3
|
+
declare type RSSFn = (...args: any[]) => any;
|
|
4
|
+
export declare function callGetStaticPaths(mod: ComponentInstance, route: RouteData, rssFn?: RSSFn): Promise<GetStaticPathsResultKeyed>;
|
|
5
|
+
export declare function assignStaticPaths(routeCache: RouteCache, route: RouteData, mod: ComponentInstance, rssFn?: RSSFn): Promise<void>;
|
|
6
|
+
export declare function ensureRouteCached(routeCache: RouteCache, route: RouteData, mod: ComponentInstance, rssFn?: RSSFn): Promise<GetStaticPathsResultKeyed>;
|
|
7
|
+
export declare function findPathItemByKey(staticPaths: GetStaticPathsResultKeyed, paramsKey: string, logging: LogOptions): GetStaticPathsItem | undefined;
|
|
8
|
+
export {};
|
|
@@ -17,7 +17,7 @@ export declare function createComponent(cb: AstroComponentFactory): AstroCompone
|
|
|
17
17
|
export declare function renderSlot(_result: any, slotted: string, fallback?: any): Promise<any>;
|
|
18
18
|
export declare const Fragment: unique symbol;
|
|
19
19
|
export declare function renderComponent(result: SSRResult, displayName: string, Component: unknown, _props: Record<string | number, any>, slots?: any): Promise<any>;
|
|
20
|
-
export declare function createAstro(
|
|
20
|
+
export declare function createAstro(filePathname: string, site: string, projectRootStr: string): AstroGlobalPartial;
|
|
21
21
|
export declare function addAttribute(value: any, key: string): string;
|
|
22
22
|
export declare function spreadAttributes(values: Record<any, any>): string;
|
|
23
23
|
export declare function defineStyleVars(selector: string, vars: Record<any, any>): string;
|
|
@@ -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,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLWJ1aWxkLWNzcy9pbmRleC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUdBO0FBQ0E7QUFFQTtBQUVBLE1BQU0sY0FBYztBQUdwQixNQUFNLHFCQUFxQjtBQUUzQixNQUFNLDBCQUEwQjtBQUVoQyxNQUFNLFFBQVEsSUFBSSxPQUNqQixPQUFPLE1BQU0sS0FBSyxrQkFDaEIsSUFBSSxDQUFDLE1BQU0sRUFBRSxNQUFNLElBQ25CLEtBQUs7QUFFUixNQUFNLGVBQWUsQ0FBQyxZQUE2QixNQUFNLEtBQUs7QUFFdkQsNkJBQTZCLFVBQWtCO0FBQ3JELE1BQUksVUFBVSwwQkFBMEI7QUFDeEMsTUFBSSxRQUFRLFNBQVMsTUFBTTtBQUMxQixlQUFXO0FBQUE7QUFFWixhQUFXO0FBQ1gsU0FBTztBQUFBO0FBR0QseUJBQXlCLFVBQWtCO0FBQ2pELE1BQUksVUFBVSxxQkFBcUI7QUFDbkMsTUFBSSxRQUFRLFNBQVMsTUFBTTtBQUMxQixlQUFXO0FBQUE7QUFFWixTQUFPO0FBQUE7QUFHRCxpQ0FBaUMsSUFBWTtBQUNuRCxTQUFPLEdBQUcsT0FBTyxtQkFBbUIsU0FBUztBQUFBO0FBRzlDLDhCQUE4QixJQUFZO0FBQ3pDLFNBQU8sR0FBRyxXQUFXO0FBQUE7QUFHdEIsa0NBQWtDLElBQVk7QUFDN0MsU0FBTyxHQUFHLFdBQVc7QUFBQTtBQU9mLG1DQUFtQyxTQUFvQztBQUM3RSxRQUFNLEVBQUUsY0FBYztBQUN0QixRQUFNLGlCQUFpQixJQUFJO0FBRTNCLFNBQU87QUFBQSxJQUNOLE1BQU07QUFBQSxJQUVOLGVBQWUsZ0JBQWdCO0FBSzlCLFlBQU0sVUFBVSxlQUFlO0FBQy9CLFlBQU0sbUJBQW1CLGVBQWUsUUFBUSxVQUFVLENBQUMsTUFBTSxFQUFFLFNBQVM7QUFDNUUsVUFBSSxxQkFBcUIsSUFBSTtBQUM1QixjQUFNLGNBQWMsUUFBUTtBQUc1QixlQUFPLFlBQVk7QUFDbkIsZUFBTyxZQUFZO0FBR25CLGNBQU0sV0FBVyxRQUFRLFVBQVUsQ0FBQyxNQUFNLEVBQUUsU0FBUztBQUNyRCxjQUFNLFlBQVksUUFBUTtBQUcxQixnQkFBUSxPQUFPLFVBQVU7QUFDekIsZ0JBQVEsT0FBTyxtQkFBbUIsR0FBRyxHQUFHO0FBQUE7QUFBQTtBQUFBLFVBSXBDLFVBQVUsSUFBSTtBQUNuQixVQUFJLHlCQUF5QixLQUFLO0FBQ2pDLGVBQU87QUFBQTtBQUVSLFVBQUkscUJBQXFCLEtBQUs7QUFDN0IsZUFBTztBQUFBO0FBRVIsYUFBTztBQUFBO0FBQUEsVUFHRixLQUFLLElBQUk7QUFDZCxVQUFJLHlCQUF5QixLQUFLO0FBQ2pDLGVBQU8sVUFBVSxrQkFBa0IsSUFBSSxPQUFPO0FBQUE7QUFFL0MsVUFBSSxxQkFBcUIsS0FBSztBQUM3QixlQUFPLFVBQVUsY0FBYyxJQUFJLE9BQU87QUFBQTtBQUUzQyxhQUFPO0FBQUE7QUFBQSxVQUdGLFVBQVUsT0FBTyxJQUFJO0FBQzFCLFVBQUkscUJBQXFCLEtBQUs7QUFDN0IsdUJBQWUsSUFBSSxJQUFJO0FBQUE7QUFFeEIsVUFBSSxhQUFhLEtBQUs7QUFDckIsdUJBQWUsSUFBSSxJQUFJO0FBQUE7QUFFeEIsYUFBTztBQUFBO0FBQUEsVUFHRixZQUFZLE9BQU8sT0FBTztBQUMvQixVQUFJLFdBQVc7QUFDZixVQUFJLFlBQVk7QUFDaEIsaUJBQVcsQ0FBQyxPQUFPLE9BQU8sUUFBUSxNQUFNLFVBQVU7QUFDakQsWUFBSSxDQUFDLGFBQWEsT0FBTyxDQUFDLHlCQUF5QixLQUFLO0FBQ3ZELHNCQUFZO0FBQUE7QUFFYixZQUFJLGVBQWUsSUFBSSxLQUFLO0FBQzNCLHNCQUFZLGVBQWUsSUFBSTtBQUFBO0FBQUE7QUFJakMsVUFBSSxDQUFDO0FBQVUsZUFBTztBQUV0QixVQUFJLFdBQVc7QUFDZCxrQkFBVSxjQUFjLElBQUk7QUFBQTtBQUc3QixZQUFNLEVBQUUsTUFBTSxnQkFBZ0IsTUFBTSxRQUFRLFVBQVUsVUFBVTtBQUFBLFFBQy9ELFFBQVE7QUFBQSxRQUNSLFFBQVE7QUFBQTtBQUVULFlBQU0sY0FBYyxLQUFLLFNBQVM7QUFBQSxRQUNqQyxNQUFNLE1BQU0sT0FBTztBQUFBLFFBQ25CLE1BQU07QUFBQSxRQUNOLFFBQVE7QUFBQTtBQUdULGdCQUFVLHNCQUFzQixJQUFJLE1BQU0sVUFBVTtBQUNwRCxVQUFJLE1BQU0sU0FBUyxTQUFTO0FBQzNCLGNBQU0sV0FBVyxLQUFLLFlBQVk7QUFDbEMsWUFBSSxNQUFNLGdCQUFnQjtBQUN6QixnQkFBTSxXQUFXLE1BQU07QUFDdkIsY0FBSSxDQUFDLFVBQVUsb0JBQW9CLElBQUksV0FBVztBQUNqRCxzQkFBVSxvQkFBb0IsSUFBSSxVQUFVO0FBQUE7QUFFN0Msb0JBQVUsb0JBQW9CLElBQUksVUFBVyxLQUFLO0FBQUE7QUFBQTtBQUlwRCxhQUFPO0FBQUE7QUFBQSxJQUlSLGVBQWUsTUFBTSxRQUFRO0FBQzVCLFlBQU0sbUJBQW1CLFVBQVUsY0FBYztBQUNqRCxZQUFNLHFCQUFxQixJQUFJLElBQUksQ0FBQyxHQUFHLFVBQVUsZUFBZSxJQUFJLENBQUMsVUFBVSxNQUFNO0FBQ3JGLFlBQU0sa0JBQWtCLENBQUMsR0FBRyxvQkFDMUIsSUFBSSxDQUFDLFNBQVMsS0FBSyxTQUFTLE9BQzVCLEtBQUssS0FDTCxRQUFRLE9BQU87QUFDakIsWUFBTSxlQUFlLElBQUksT0FBTyxLQUFLLFdBQVcsT0FBTyx5QkFBeUI7QUFBQSxLQUEwQiw2QkFBNkI7QUFBQSxJQUE0QjtBQUVuSyxpQkFBVyxDQUFDLFNBQVMsVUFBVSxPQUFPLFFBQVEsU0FBUztBQUN0RCxZQUFJLE1BQU0sU0FBUyxTQUFTO0FBSTNCLGNBQUksTUFBTSxnQkFBZ0I7QUFDekIsZ0JBQUksQ0FBQyxVQUFVLG9CQUFvQixJQUFJLE1BQU0saUJBQWlCO0FBQzdELHdCQUFVLG9CQUFvQixJQUFJLE1BQU0sZ0JBQWdCO0FBQUE7QUFFekQsa0JBQU0sU0FBUyxVQUFVLG9CQUFvQixJQUFJLE1BQU07QUFDdkQsa0JBQU0sV0FBVyxJQUFJLElBQUk7QUFDekIsdUJBQVcsT0FBTyxNQUFNLFNBQVM7QUFDaEMsa0JBQUksVUFBVSxzQkFBc0IsSUFBSSxRQUFRLENBQUMsbUJBQW1CLElBQUksTUFBTTtBQUM3RSxzQkFBTSxjQUFjLFVBQVUsc0JBQXNCLElBQUk7QUFDeEQsc0JBQU0sV0FBVyxLQUFLLFlBQVk7QUFDbEMsb0JBQUksQ0FBQyxTQUFTLElBQUksV0FBVztBQUM1QiwyQkFBUyxJQUFJO0FBQ2IseUJBQU8sS0FBSztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBT2hCLGNBQUksa0JBQWtCO0FBQ3JCLGdCQUFJLFVBQVUsY0FBYyxJQUFJLFFBQVE7QUFHdkMscUJBQU8sT0FBTztBQUFBLG1CQUNSO0FBR04sb0JBQU0sT0FBTyxNQUFNLEtBQUssUUFDdkIsY0FFQSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsT0FBTyxFQUFFLFNBQVM7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -61,8 +61,7 @@ function rollupPluginAstroBuildHTML(options) {
|
|
|
61
61
|
jsInput.add(path);
|
|
62
62
|
}
|
|
63
63
|
for (const pathname of pageData.paths) {
|
|
64
|
-
|
|
65
|
-
pageNames.push(pathname.replace(/\/?$/, pathrepl).replace(/^\//, ""));
|
|
64
|
+
pageNames.push(pathname.replace(/\/?$/, "/").replace(/^\//, ""));
|
|
66
65
|
const id = ASTRO_PAGE_PREFIX + pathname;
|
|
67
66
|
const html = await ssrRender(renderers, mod, {
|
|
68
67
|
astroConfig,
|
|
@@ -399,4 +398,4 @@ function rollupPluginAstroBuildHTML(options) {
|
|
|
399
398
|
export {
|
|
400
399
|
rollupPluginAstroBuildHTML
|
|
401
400
|
};
|
|
402
|
-
//# 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.13",
|
|
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",
|
|
@@ -56,12 +56,12 @@
|
|
|
56
56
|
"test": "mocha --parallel --timeout 15000"
|
|
57
57
|
},
|
|
58
58
|
"dependencies": {
|
|
59
|
-
"@astrojs/compiler": "^0.
|
|
59
|
+
"@astrojs/compiler": "^0.8.0",
|
|
60
60
|
"@astrojs/language-server": "^0.8.6",
|
|
61
61
|
"@astrojs/markdown-remark": "^0.6.0",
|
|
62
62
|
"@astrojs/prism": "0.4.0",
|
|
63
63
|
"@astrojs/renderer-preact": "^0.4.0",
|
|
64
|
-
"@astrojs/renderer-react": "0.4.
|
|
64
|
+
"@astrojs/renderer-react": "0.4.1",
|
|
65
65
|
"@astrojs/renderer-svelte": "0.3.1",
|
|
66
66
|
"@astrojs/renderer-vue": "0.3.0",
|
|
67
67
|
"@astropub/webapi": "^0.10.1",
|