astro 0.21.5 → 0.21.6
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/dev/index.js +2 -10
- package/dist/core/preview/index.js +36 -21
- package/dist/core/ssr/css.js +9 -15
- package/dist/core/ssr/index.js +3 -2
- package/dist/core/util.js +2 -3
- package/dist/types/core/util.d.ts +2 -2
- package/dist/vite-plugin-astro/index.js +19 -15
- package/package.json +1 -1
- package/CHANGELOG.md +0 -1388
package/dist/core/dev/index.js
CHANGED
|
@@ -15,7 +15,6 @@ import { createVite } from "../create-vite.js";
|
|
|
15
15
|
import * as msg from "./messages.js";
|
|
16
16
|
import notFoundTemplate, { subpathNotUsedTemplate } from "./template/4xx.js";
|
|
17
17
|
import serverErrorTemplate from "./template/5xx.js";
|
|
18
|
-
import { viteifyURL } from "../util.js";
|
|
19
18
|
async function dev(config, options = { logging: defaultLogOptions }) {
|
|
20
19
|
const server = new AstroDevServer(config, options);
|
|
21
20
|
await server.start();
|
|
@@ -236,14 +235,7 @@ class AstroDevServer {
|
|
|
236
235
|
res.end();
|
|
237
236
|
} catch (err) {
|
|
238
237
|
const statusCode = 500;
|
|
239
|
-
|
|
240
|
-
if (mod) {
|
|
241
|
-
for (const m of [mod, ...mod.importedModules]) {
|
|
242
|
-
this.viteServer.moduleGraph.invalidateModule(m);
|
|
243
|
-
}
|
|
244
|
-
} else {
|
|
245
|
-
this.viteServer.moduleGraph.invalidateAll();
|
|
246
|
-
}
|
|
238
|
+
await this.viteServer.moduleGraph.invalidateAll();
|
|
247
239
|
this.viteServer.ws.send({ type: "error", err });
|
|
248
240
|
let html = serverErrorTemplate({
|
|
249
241
|
statusCode,
|
|
@@ -303,4 +295,4 @@ export {
|
|
|
303
295
|
AstroDevServer,
|
|
304
296
|
dev as default
|
|
305
297
|
};
|
|
306
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
298
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/core/dev/index.ts"],
  "mappings": "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",
  "names": []
}

|
|
@@ -20,35 +20,50 @@ async function preview(config, { logging }) {
|
|
|
20
20
|
});
|
|
21
21
|
let port = config.devOptions.port;
|
|
22
22
|
const { hostname } = config.devOptions;
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
23
|
+
let httpServer;
|
|
24
|
+
function startServer(timerStart) {
|
|
25
|
+
let showedPortTakenMsg = false;
|
|
26
|
+
let showedListenMsg = false;
|
|
27
|
+
return new Promise((resolve, reject) => {
|
|
28
|
+
const listen = () => {
|
|
29
|
+
httpServer = server.listen(port, hostname, () => {
|
|
30
|
+
if (!showedListenMsg) {
|
|
31
|
+
info(logging, "astro", msg.devStart({ startupTime: performance.now() - timerStart }));
|
|
32
|
+
info(logging, "astro", msg.devHost({ host: `http://${hostname}:${port}${base}` }));
|
|
33
|
+
}
|
|
34
|
+
showedListenMsg = true;
|
|
35
|
+
resolve();
|
|
36
|
+
});
|
|
37
|
+
httpServer == null ? void 0 : httpServer.on("error", onError);
|
|
38
|
+
};
|
|
39
|
+
const onError = (err) => {
|
|
40
|
+
if (err.code && err.code === "EADDRINUSE") {
|
|
41
|
+
if (!showedPortTakenMsg) {
|
|
42
|
+
info(logging, "astro", msg.portInUse({ port }));
|
|
43
|
+
showedPortTakenMsg = true;
|
|
44
|
+
}
|
|
45
|
+
port++;
|
|
46
|
+
return listen();
|
|
47
|
+
} else {
|
|
48
|
+
error(logging, "astro", err.stack);
|
|
49
|
+
httpServer == null ? void 0 : httpServer.removeListener("error", onError);
|
|
50
|
+
reject(err);
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
listen();
|
|
40
54
|
});
|
|
41
|
-
}
|
|
55
|
+
}
|
|
56
|
+
await startServer(startServerTime);
|
|
42
57
|
return {
|
|
43
58
|
hostname,
|
|
44
59
|
port,
|
|
45
|
-
server,
|
|
60
|
+
server: httpServer,
|
|
46
61
|
stop: async () => {
|
|
47
|
-
|
|
62
|
+
httpServer.close();
|
|
48
63
|
}
|
|
49
64
|
};
|
|
50
65
|
}
|
|
51
66
|
export {
|
|
52
67
|
preview as default
|
|
53
68
|
};
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvcHJldmlldy9pbmRleC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUdBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBY0EsdUJBQXNDLFFBQXFCLEVBQUUsV0FBbUQ7QUFDOUcsUUFBTSxrQkFBa0IsWUFBWTtBQUNwQyxRQUFNLE9BQU8sT0FBTyxhQUFhLE9BQU8sSUFBSSxJQUFJLE9BQU8sYUFBYSxNQUFNLFdBQVc7QUFHckYsUUFBTSxTQUFTLEtBQUssYUFBYSxDQUFDLEtBQUssUUFBUTtBQUM3QyxRQUFJLENBQUMsSUFBSSxJQUFLLFdBQVcsT0FBTztBQUM5QixVQUFJLGFBQWE7QUFDakIsVUFBSSxJQUFJLHVCQUF1QixNQUFNLElBQUk7QUFDekM7QUFBQTtBQUdGLFNBQUssS0FBSyxJQUFJLElBQUssT0FBTyxLQUFLLFNBQVMsSUFBSTtBQUFBLE1BQzFDLE1BQU0sY0FBYyxPQUFPO0FBQUEsT0FDMUIsS0FBSztBQUFBO0FBR1YsTUFBSSxPQUFPLE9BQU8sV0FBVztBQUM3QixRQUFNLEVBQUUsYUFBYSxPQUFPO0FBQzVCLE1BQUk7QUFHSix1QkFBcUIsWUFBbUM7QUFDdEQsUUFBSSxxQkFBcUI7QUFDekIsUUFBSSxrQkFBa0I7QUFDdEIsV0FBTyxJQUFJLFFBQWMsQ0FBQyxTQUFTLFdBQVc7QUFDNUMsWUFBTSxTQUFTLE1BQU07QUFDbkIscUJBQWEsT0FBTyxPQUFPLE1BQU0sVUFBVSxNQUFNO0FBQy9DLGNBQUksQ0FBQyxpQkFBaUI7QUFDcEIsaUJBQUssU0FBUyxTQUFTLElBQUksU0FBUyxFQUFFLGFBQWEsWUFBWSxRQUFRO0FBQ3ZFLGlCQUFLLFNBQVMsU0FBUyxJQUFJLFFBQVEsRUFBRSxNQUFNLFVBQVUsWUFBWSxPQUFPO0FBQUE7QUFFMUUsNEJBQWtCO0FBQ2xCO0FBQUE7QUFFRixpREFBWSxHQUFHLFNBQVM7QUFBQTtBQUcxQixZQUFNLFVBQVUsQ0FBQyxRQUErQjtBQUM5QyxZQUFJLElBQUksUUFBUSxJQUFJLFNBQVMsY0FBYztBQUN6QyxjQUFJLENBQUMsb0JBQW9CO0FBQ3ZCLGlCQUFLLFNBQVMsU0FBUyxJQUFJLFVBQVUsRUFBRTtBQUN2QyxpQ0FBcUI7QUFBQTtBQUV2QjtBQUNBLGlCQUFPO0FBQUEsZUFDRjtBQUNMLGdCQUFNLFNBQVMsU0FBUyxJQUFJO0FBQzVCLG1EQUFZLGVBQWUsU0FBUztBQUNwQyxpQkFBTztBQUFBO0FBQUE7QUFJWDtBQUFBO0FBQUE7QUFLSixRQUFNLFlBQVk7QUFFbEIsU0FBTztBQUFBLElBQ0w7QUFBQSxJQUNBO0FBQUEsSUFDQSxRQUFRO0FBQUEsSUFDUixNQUFNLFlBQVk7QUFDaEIsaUJBQVc7QUFBQTtBQUFBO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
package/dist/core/ssr/css.js
CHANGED
|
@@ -3,28 +3,22 @@ import { viteifyURL } from "../util.js";
|
|
|
3
3
|
const STYLE_EXTENSIONS = new Set([".css", ".pcss", ".postcss", ".scss", ".sass", ".styl", ".stylus", ".less"]);
|
|
4
4
|
function getStylesForURL(filePath, viteServer) {
|
|
5
5
|
const css = new Set();
|
|
6
|
-
const { idToModuleMap } = viteServer.moduleGraph;
|
|
7
6
|
const rootID = viteifyURL(filePath);
|
|
8
|
-
const moduleGraph = idToModuleMap.get(rootID);
|
|
9
|
-
if (!moduleGraph)
|
|
10
|
-
return css;
|
|
11
7
|
function crawlCSS(entryModule, scanned = new Set()) {
|
|
12
|
-
const moduleName =
|
|
13
|
-
if (!moduleName)
|
|
8
|
+
const moduleName = viteServer.moduleGraph.urlToModuleMap.get(entryModule);
|
|
9
|
+
if (!moduleName || !moduleName.id)
|
|
14
10
|
return;
|
|
15
|
-
|
|
16
|
-
return;
|
|
17
|
-
scanned.add(moduleName.id);
|
|
11
|
+
scanned.add(moduleName.url);
|
|
18
12
|
for (const importedModule of moduleName.importedModules) {
|
|
19
|
-
if (!importedModule.
|
|
13
|
+
if (!importedModule.url || scanned.has(importedModule.url))
|
|
20
14
|
continue;
|
|
21
|
-
const ext = path.extname(importedModule.
|
|
15
|
+
const ext = path.extname(importedModule.url.toLowerCase());
|
|
22
16
|
if (STYLE_EXTENSIONS.has(ext)) {
|
|
23
|
-
css.add(importedModule.url
|
|
17
|
+
css.add(importedModule.url);
|
|
24
18
|
} else {
|
|
25
|
-
crawlCSS(importedModule.
|
|
19
|
+
crawlCSS(importedModule.url, scanned);
|
|
26
20
|
}
|
|
27
|
-
scanned.add(importedModule.
|
|
21
|
+
scanned.add(importedModule.url);
|
|
28
22
|
}
|
|
29
23
|
}
|
|
30
24
|
crawlCSS(rootID);
|
|
@@ -34,4 +28,4 @@ export {
|
|
|
34
28
|
STYLE_EXTENSIONS,
|
|
35
29
|
getStylesForURL
|
|
36
30
|
};
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvc3NyL2Nzcy50cyJdLAogICJtYXBwaW5ncyI6ICJBQUVBO0FBQ0E7QUFHTyxNQUFNLG1CQUFtQixJQUFJLElBQUksQ0FBQyxRQUFRLFNBQVMsWUFBWSxTQUFTLFNBQVMsU0FBUyxXQUFXO0FBR3JHLHlCQUF5QixVQUFlLFlBQTZDO0FBQzFGLFFBQU0sTUFBTSxJQUFJO0FBQ2hCLFFBQU0sU0FBUyxXQUFXO0FBRzFCLG9CQUFrQixhQUFxQixVQUFVLElBQUksT0FBZTtBQUNsRSxVQUFNLGFBQWEsV0FBVyxZQUFZLGVBQWUsSUFBSTtBQUM3RCxRQUFJLENBQUMsY0FBYyxDQUFDLFdBQVc7QUFBSTtBQUVuQyxZQUFRLElBQUksV0FBVztBQUN2QixlQUFXLGtCQUFrQixXQUFXLGlCQUFpQjtBQUN2RCxVQUFJLENBQUMsZUFBZSxPQUFPLFFBQVEsSUFBSSxlQUFlO0FBQU07QUFDNUQsWUFBTSxNQUFNLEtBQUssUUFBUSxlQUFlLElBQUk7QUFDNUMsVUFBSSxpQkFBaUIsSUFBSSxNQUFNO0FBQzdCLFlBQUksSUFBSSxlQUFlO0FBQUEsYUFDbEI7QUFDTCxpQkFBUyxlQUFlLEtBQUs7QUFBQTtBQUUvQixjQUFRLElBQUksZUFBZTtBQUFBO0FBQUE7QUFHL0IsV0FBUztBQUVULFNBQU87QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|
package/dist/core/ssr/index.js
CHANGED
|
@@ -190,7 +190,8 @@ async function render(renderers, mod, ssrOpts) {
|
|
|
190
190
|
});
|
|
191
191
|
html = injectTags(html, tags);
|
|
192
192
|
if (mode === "development") {
|
|
193
|
-
|
|
193
|
+
const relativeURL = filePath.href.replace(astroConfig.projectRoot.href, "/");
|
|
194
|
+
html = await viteServer.transformIndexHtml(relativeURL, html, pathname);
|
|
194
195
|
}
|
|
195
196
|
if (!/<!doctype html/i.test(html)) {
|
|
196
197
|
html = "<!DOCTYPE html>\n" + html;
|
|
@@ -220,4 +221,4 @@ export {
|
|
|
220
221
|
render,
|
|
221
222
|
ssr
|
|
222
223
|
};
|
|
223
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
224
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvc3NyL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7OztBQW9CQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUVBLE1BQU0saUJBQWlCO0FBdUJ2QixNQUFNLFFBQVEsSUFBSTtBQUdsQiwrQkFBK0IsWUFBZ0MsVUFBa0IsYUFBMEI7QUFDekcsUUFBTSxtQkFBd0I7QUFJOUIsUUFBTTtBQUFBLElBQ0osU0FBUyxFQUFFLE1BQU0sUUFBUSxXQUFXLG9CQUFvQjtBQUFBLE1BQ3RELE1BQU0sT0FBTyxrQkFBa0IsVUFBVTtBQUU3QyxtQkFBaUIsT0FBTztBQUN4QixNQUFJO0FBQVEscUJBQWlCLFNBQVMsS0FBSyxNQUFNLEtBQUssVUFBVTtBQUNoRSxNQUFJLE1BQU0sUUFBUTtBQUFxQixxQkFBaUIscUJBQXFCLG1CQUFtQixJQUFJLENBQUMsUUFBZ0IsS0FBSyxNQUFNLEtBQUssVUFBVTtBQUMvSSxNQUFJLE1BQU0sUUFBUTtBQUFZLHFCQUFpQixZQUFZLFVBQVUsSUFBSSxDQUFDLFFBQWdCLEtBQUssTUFBTSxLQUFLLFVBQVU7QUFDcEgsUUFBTSxFQUFFLFFBQVEsTUFBTSxXQUFXLFlBQVksbUJBQW1CLEtBQUssTUFBTSxLQUFLLFVBQVU7QUFDMUYsUUFBTSxFQUFFLFNBQVMsZ0JBQWdCLE1BQU0sV0FBVyxjQUFjO0FBQ2hFLG1CQUFpQixNQUFNO0FBRXZCLFFBQU0sb0JBQThCO0FBQ3BDLFNBQU87QUFBQTtBQUdULGdDQUFnQyxZQUFnQyxhQUErQztBQUM3RyxRQUFNLE1BQWdCLFlBQVk7QUFDbEMsUUFBTSxZQUFZLE1BQU0sUUFBUSxJQUM5QixJQUFJLElBQUksQ0FBQyxhQUFhO0FBQ3BCLFFBQUksTUFBTSxJQUFJO0FBQVcsYUFBTyxNQUFNLElBQUk7QUFDMUMsUUFBSSxVQUFVLGdCQUFnQixZQUFZLFVBQVU7QUFDcEQsVUFBTSxJQUFJLFVB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
|
package/dist/core/util.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import eol from "eol";
|
|
2
2
|
import path from "path";
|
|
3
|
-
import slash from "slash";
|
|
4
3
|
import { fileURLToPath, pathToFileURL } from "url";
|
|
5
4
|
import resolve from "resolve";
|
|
6
5
|
function canonicalURL(url, base) {
|
|
@@ -63,7 +62,7 @@ function resolveDependency(dep, astroConfig) {
|
|
|
63
62
|
return pathToFileURL(resolved).toString();
|
|
64
63
|
}
|
|
65
64
|
function viteifyURL(filePath) {
|
|
66
|
-
return
|
|
65
|
+
return `/@fs${filePath.pathname}`;
|
|
67
66
|
}
|
|
68
67
|
export {
|
|
69
68
|
canonicalURL,
|
|
@@ -72,4 +71,4 @@ export {
|
|
|
72
71
|
resolveDependency,
|
|
73
72
|
viteifyURL
|
|
74
73
|
};
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NvcmUvdXRpbC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUVBO0FBQ0E7QUFFQTtBQUNBO0FBR08sc0JBQXNCLEtBQWEsTUFBb0I7QUFDNUQsTUFBSSxXQUFXLElBQUksUUFBUSxpQkFBaUI7QUFDNUMsYUFBVyxTQUFTLFFBQVEsV0FBVztBQUN2QyxNQUFJLENBQUMsS0FBSyxRQUFRO0FBQVcsZUFBVyxTQUFTLFFBQVEsV0FBVztBQUNwRSxhQUFXLFNBQVMsUUFBUSxRQUFRO0FBQ3BDLFNBQU8sSUFBSSxJQUFJLFVBQVU7QUFBQTtBQUlwQixzQkFBc0IsTUFBOEU7QUFFekcsTUFBSSxDQUFDLFFBQVEsS0FBSyxPQUFPLE9BQU8sS0FBSyxPQUFPO0FBQUssV0FBTztBQUV4RCxNQUFJO0FBQ0osTUFBSSxPQUFPO0FBRVgsTUFBSSxRQUFRLEtBQUssTUFBTTtBQUN2QixNQUFJLE1BQU0sR0FBRyxPQUFPLEtBQUs7QUFDdkIsWUFBUSxNQUFNO0FBQ2QsV0FBTyxNQUFNLFVBQVU7QUFBQTtBQUV6QixVQUFRLE1BQU07QUFFZCxNQUFJLFVBQVUsTUFBTSxTQUFTLEtBQUssTUFBTSxLQUFLLFNBQVM7QUFFdEQsU0FBTztBQUFBLElBQ0w7QUFBQSxJQUNBO0FBQUEsSUFDQTtBQUFBO0FBQUE7QUFLRyxtQkFBbUIsS0FBYSxLQUF5QztBQUM5RSxNQUFJLENBQUM7QUFBSyxXQUFPO0FBQ2pCLFFBQU0sUUFBUSxJQUFJLEdBQUcsS0FBSyxNQUFNO0FBRWhDLFFBQU0sZUFBZTtBQUNyQixXQUFTLElBQUksSUFBSSxLQUFLLEdBQUcsS0FBSztBQUM1QixRQUFJLE1BQU0sSUFBSSxPQUFPO0FBQUksbUJBQWEsS0FBSyxJQUFJLE9BQU87QUFBQTtBQUd4RCxNQUFJLGNBQWM7QUFDbEIsYUFBVyxVQUFVLGNBQWM7QUFDakMsUUFBSSxJQUFJLEtBQUs7QUFDYixRQUFJLEVBQUUsU0FBUztBQUFhLG9CQUFjLEVBQUU7QUFBQTtBQUc5QyxNQUFJLFNBQVM7QUFDYixhQUFXLFVBQVUsY0FBYztBQUNqQyxVQUFNLGdCQUFnQixXQUFXLElBQUksT0FBTztBQUM1QyxjQUFVLGdCQUFnQixPQUFPO0FBQ2pDLGNBQVUsR0FBRyxTQUFTLE9BQU8sTUFBTTtBQUFBO0FBQ25DLFFBQUk7QUFBZSxnQkFBVSxHQUFHLENBQUMsR0FBRyxJQUFJLE1BQU0sY0FBYyxLQUFLLFdBQVcsQ0FBQyxHQUFHLElBQUksTUFBTSxJQUFJLFNBQVMsS0FBSztBQUFBO0FBQUE7QUFFOUcsU0FBTztBQUFBO0FBR0YsMkJBQTJCLEtBQWEsYUFBMEI7QUFDdkUsUUFBTSxXQUFXLFFBQVEsS0FBSyxLQUFLO0FBQUEsSUFDakMsU0FBUyxjQUFjLFlBQVk7QUFBQTtBQUdyQyxTQUFPLGNBQWMsVUFBVTtBQUFBO0FBVTFCLG9CQUFvQixVQUF1QjtBQUNoRCxTQUFPLE9BQU8sU0FBUztBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
|
|
@@ -15,7 +15,7 @@ export declare function resolveDependency(dep: string, astroConfig: AstroConfig)
|
|
|
15
15
|
* Vite-ify URL
|
|
16
16
|
* Given a file URL, return an ID that matches Vite’s module graph. Needed for resolution and stack trace fixing.
|
|
17
17
|
* Must match the following format:
|
|
18
|
-
* Linux/Mac: /Users/astro/code/my-project/src/pages/index.astro
|
|
19
|
-
* Windows: C:/Users/astro/code/my-project/src/pages/index.astro
|
|
18
|
+
* Linux/Mac: /@fs/Users/astro/code/my-project/src/pages/index.astro
|
|
19
|
+
* Windows: /@fs/C:/Users/astro/code/my-project/src/pages/index.astro
|
|
20
20
|
*/
|
|
21
21
|
export declare function viteifyURL(filePath: URL): string;
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import esbuild from "esbuild";
|
|
2
2
|
import fs from "fs";
|
|
3
3
|
import { fileURLToPath } from "url";
|
|
4
|
-
import os from "os";
|
|
5
4
|
import { transform } from "@astrojs/compiler";
|
|
6
5
|
import { getViteTransform, transformWithVite } from "./styles.js";
|
|
7
6
|
function isSSR(options) {
|
|
@@ -17,13 +16,11 @@ function isSSR(options) {
|
|
|
17
16
|
return false;
|
|
18
17
|
}
|
|
19
18
|
function astro({ config, devServer }) {
|
|
20
|
-
let platform;
|
|
21
19
|
let viteTransform;
|
|
22
20
|
return {
|
|
23
21
|
name: "@astrojs/vite-plugin-astro",
|
|
24
22
|
enforce: "pre",
|
|
25
23
|
configResolved(resolvedConfig) {
|
|
26
|
-
platform = os.platform();
|
|
27
24
|
viteTransform = getViteTransform(resolvedConfig);
|
|
28
25
|
},
|
|
29
26
|
async load(id, opts) {
|
|
@@ -34,6 +31,7 @@ function astro({ config, devServer }) {
|
|
|
34
31
|
const isPage = normalizedID.startsWith(fileURLToPath(config.pages)) || normalizedID.startsWith(fileURLToPath(config.layouts));
|
|
35
32
|
let source = await fs.promises.readFile(id, "utf8");
|
|
36
33
|
let tsResult;
|
|
34
|
+
let cssTransformError;
|
|
37
35
|
try {
|
|
38
36
|
tsResult = await transform(source, {
|
|
39
37
|
as: isPage ? "document" : "fragment",
|
|
@@ -43,21 +41,27 @@ function astro({ config, devServer }) {
|
|
|
43
41
|
internalURL: "astro/internal",
|
|
44
42
|
preprocessStyle: async (value, attrs) => {
|
|
45
43
|
const lang = `.${(attrs == null ? void 0 : attrs.lang) || "css"}`.toLowerCase();
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
44
|
+
try {
|
|
45
|
+
const result = await transformWithVite({ value, lang, id, transformHook: viteTransform, ssr: isSSR(opts) });
|
|
46
|
+
let map2;
|
|
47
|
+
if (!result)
|
|
48
|
+
return null;
|
|
49
|
+
if (result.map) {
|
|
50
|
+
if (typeof result.map === "string") {
|
|
51
|
+
map2 = result.map;
|
|
52
|
+
} else if (result.map.mappings) {
|
|
53
|
+
map2 = result.map.toString();
|
|
54
|
+
}
|
|
56
55
|
}
|
|
56
|
+
return { code: result.code, map: map2 };
|
|
57
|
+
} catch (err) {
|
|
58
|
+
cssTransformError = err;
|
|
59
|
+
return null;
|
|
57
60
|
}
|
|
58
|
-
return { code: result.code, map: map2 };
|
|
59
61
|
}
|
|
60
62
|
});
|
|
63
|
+
if (cssTransformError)
|
|
64
|
+
throw cssTransformError;
|
|
61
65
|
const { code, map } = await esbuild.transform(tsResult.code, { loader: "ts", sourcemap: "external", sourcefile: id });
|
|
62
66
|
return {
|
|
63
67
|
code,
|
|
@@ -94,4 +98,4 @@ ${err.url}`;
|
|
|
94
98
|
export {
|
|
95
99
|
astro as default
|
|
96
100
|
};
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLWFzdHJvL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBS0E7QUFDQTtBQUNBO0FBQ0E7QUFFQTtBQVFBLGVBQWUsU0FBMEQ7QUFDdkUsTUFBSSxZQUFZLFFBQVc7QUFDekIsV0FBTztBQUFBO0FBRVQsTUFBSSxPQUFPLFlBQVksV0FBVztBQUNoQyxXQUFPO0FBQUE7QUFFVCxNQUFJLE9BQU8sV0FBVyxVQUFVO0FBQzlCLFdBQU8sQ0FBQyxDQUFDLFFBQVE7QUFBQTtBQUVuQixTQUFPO0FBQUE7QUFJTSxlQUFlLEVBQUUsUUFBUSxhQUE4QztBQUNwRixNQUFJO0FBQ0osU0FBTztBQUFBLElBQ0wsTUFBTTtBQUFBLElBQ04sU0FBUztBQUFBLElBQ1QsZUFBZSxnQkFBZ0I7QUFDN0Isc0JBQWdCLGlCQUFpQjtBQUFBO0FBQUEsVUFHN0IsS0FBSyxJQUFJLE1BQU07QUFDbkIsVUFBSSxDQUFDLEdBQUcsU0FBUyxXQUFXO0FBQzFCLGVBQU87QUFBQTtBQUlULFlBQU0sZUFBZSxjQUFjLElBQUksSUFBSSxVQUFVO0FBQ3JELFlBQU0sU0FBUyxhQUFhLFdBQVcsY0FBYyxPQUFPLFdBQVcsYUFBYSxXQUFXLGNBQWMsT0FBTztBQUNwSCxVQUFJLFNBQVMsTUFBTSxHQUFHLFNBQVMsU0FBUyxJQUFJO0FBQzVDLFVBQUk7QUFDSixVQUFJO0FBRUosVUFBSTtBQUlGLG1CQUFXLE1BQU0sVUFBVSxRQUFRO0FBQUEsVUFDakMsSUFBSSxTQUFTLGFBQWE7QUFBQSxVQUMxQixNQUFNLE9BQU8sYUFBYTtBQUFBLFVBQzFCLFlBQVk7QUFBQSxVQUNaLFdBQVc7QUFBQSxVQUNYLGFBQWE7QUFBQSxVQUNiLGlCQUFpQixPQUFPLE9BQWUsVUFBa0M7QUFDdkUsa0JBQU0sT0FBTyxJQUFJLGdDQUFPLFNBQVEsUUFBUTtBQUN4QyxnQkFBSTtBQUNGLG9CQUFNLFNBQVMsTUFBTSxrQkFBa0IsRUFBRSxPQUFPLE1BQU0sSUFBSSxlQUFlLGVBQWUsS0FBSyxNQUFNO0FBQ25HLGtCQUFJO0FBQ0osa0JBQUksQ0FBQztBQUFRLHVCQUFPO0FBQ3BCLGtCQUFJLE9BQU8sS0FBSztBQUNkLG9CQUFJLE9BQU8sT0FBTyxRQUFRLFVBQVU7QUFDbEMseUJBQU0sT0FBTztBQUFBLDJCQUNKLE9BQU8sSUFBSSxVQUFVO0FBQzlCLHlCQUFNLE9BQU8sSUFBSTtBQUFBO0FBQUE7QUFHckIscUJBQU8sRUFBRSxNQUFNLE9BQU8sTUFBTTtBQUFBLHFCQUNyQixLQUFQO0FBRUEsa0NBQW9CO0FBQ3BCLHFCQUFPO0FBQUE7QUFBQTtBQUFBO0FBTWIsWUFBSTtBQUFtQixnQkFBTTtBQUc3QixjQUFNLEVBQUUsTUFBTSxRQUFRLE1BQU0sUUFBUSxVQUFVLFNBQVMsTUFBTSxFQUFFLFFBQVEsTUFBTSxXQUFXLFlBQVksWUFBWTtBQUVoSCxlQUFPO0FBQUEsVUFDTDtBQUFBLFVBQ0E7QUFBQTtBQUFBLGVBRUssS0FBUDtBQUVBLFlBQUksSUFBSSxNQUFNLFNBQVMsa0JBQWtCO0FBQ3ZDLGdCQUFNLFNBQVMsSUFBSSxnQkFBZ0I7QUFBQSxZQUNqQyxRQUFRO0FBQUEsWUFDUixPQUFPO0FBQUEsWUFDUCxNQUFNO0FBQUE7QUFBQTtBQUFBO0FBQUEsSUFJZCxHQUFHLFFBQVEsY0FBYyxPQUFPLGNBQWM7QUFBQTtBQUFBLEVBRWhEO0FBQUE7QUFBQTtBQUFBO0FBSVEsY0FBSSxNQUFNLGlEQUFpRCxPQUFPO0FBQ2xFLGNBQUksVUFBVTtBQUFBO0FBQUE7QUFBQTtBQUFBLEVBSXRCLElBQUk7QUFFSSxjQUFJLFFBQVEsVUFBVTtBQUFBO0FBR3hCLGNBQU07QUFBQTtBQUFBO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|