astro 0.23.0 → 0.23.1
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/components/Code.astro +4 -3
- package/components/Markdown.astro +9 -3
- package/dist/core/build/index.js +1 -1
- package/dist/core/build/scan-based-build.js +1 -1
- package/dist/core/build/static-build.js +1 -1
- package/dist/core/create-vite.js +1 -1
- package/dist/core/dev/index.js +1 -1
- package/dist/core/logger.js +2 -2
- package/dist/core/render/dev/index.js +3 -3
- package/dist/runtime/client/hmr.js +12 -24
- package/dist/types/@types/astro.d.ts +2 -2
- package/dist/types/core/build/page-data.d.ts +1 -1
- package/dist/types/core/build/scan-based-build.d.ts +1 -1
- package/dist/types/core/build/static-build.d.ts +1 -1
- package/dist/types/core/build/vite-plugin-hoisted-scripts.d.ts +1 -1
- package/dist/types/core/create-vite.d.ts +1 -1
- package/dist/types/core/render/dev/css.d.ts +1 -1
- package/dist/types/core/render/dev/error.d.ts +1 -1
- package/dist/types/core/render/dev/html.d.ts +1 -1
- package/dist/types/core/render/dev/index.d.ts +1 -1
- package/dist/types/core/render/dev/renderers.d.ts +1 -1
- package/dist/types/vite-plugin-astro/hmr.d.ts +3 -2
- package/dist/types/vite-plugin-astro/index.d.ts +1 -1
- package/dist/types/vite-plugin-astro/styles.d.ts +1 -1
- package/dist/types/vite-plugin-astro-postprocess/index.d.ts +1 -1
- package/dist/types/vite-plugin-astro-server/index.d.ts +1 -1
- package/dist/types/vite-plugin-build-css/index.d.ts +1 -1
- package/dist/types/vite-plugin-build-css/resolve.d.ts +1 -1
- package/dist/types/vite-plugin-build-html/index.d.ts +1 -1
- package/dist/types/vite-plugin-config-alias/index.d.ts +1 -1
- package/dist/types/vite-plugin-jsx/index.d.ts +1 -1
- package/dist/types/vite-plugin-markdown/index.d.ts +1 -1
- package/dist/vite-plugin-astro/hmr.js +10 -2
- package/dist/vite-plugin-astro/index.js +2 -2
- package/dist/vite-plugin-astro-server/index.js +3 -5
- package/package.json +5 -5
- package/dist/core/vite.js +0 -6
- package/dist/types/core/vite.d.ts +0 -2
package/components/Code.astro
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
---
|
|
2
|
-
import shiki from 'shiki';
|
|
2
|
+
import type * as shiki from 'shiki';
|
|
3
|
+
import { getHighlighter } from 'shiki';
|
|
3
4
|
|
|
4
5
|
export interface Props {
|
|
5
6
|
/** The code to highlight. Required. */
|
|
@@ -49,10 +50,10 @@ function repairShikiTheme(html: string): string {
|
|
|
49
50
|
return html;
|
|
50
51
|
}
|
|
51
52
|
|
|
52
|
-
const highlighter = await
|
|
53
|
+
const highlighter = await getHighlighter({
|
|
53
54
|
theme,
|
|
54
55
|
// Load custom lang if passed an object, otherwise load the default
|
|
55
|
-
langs: typeof lang !== 'string' ? [lang] : undefined
|
|
56
|
+
langs: typeof lang !== 'string' ? [lang] : undefined,
|
|
56
57
|
});
|
|
57
58
|
const _html = highlighter.codeToHtml(code, { lang: typeof lang === 'string' ? lang : lang.id });
|
|
58
59
|
const html = repairShikiTheme(_html);
|
|
@@ -3,11 +3,17 @@ export interface Props {
|
|
|
3
3
|
content?: string;
|
|
4
4
|
}
|
|
5
5
|
|
|
6
|
-
const dedent = (str: string) =>
|
|
7
|
-
str
|
|
6
|
+
const dedent = (str: string) => {
|
|
7
|
+
const _str = str.split('\n').filter(s => s.trimStart().length > 0);
|
|
8
|
+
if (_str.length === 0) {
|
|
9
|
+
return str.trimStart();
|
|
10
|
+
}
|
|
11
|
+
const trimmedSpace = _str[0].replace(_str[0].trimStart(), '');
|
|
12
|
+
return str
|
|
8
13
|
.split('\n')
|
|
9
|
-
.map((ln) => ln.
|
|
14
|
+
.map((ln) => ln.startsWith(trimmedSpace) ? ln.replace(trimmedSpace, '') : ln)
|
|
10
15
|
.join('\n');
|
|
16
|
+
}
|
|
11
17
|
|
|
12
18
|
// Internal props that should not be part of the external interface.
|
|
13
19
|
interface InternalProps extends Props {
|
package/dist/core/build/index.js
CHANGED
|
@@ -2,7 +2,7 @@ import fs from "fs";
|
|
|
2
2
|
import * as colors from "kleur/colors";
|
|
3
3
|
import { polyfill } from "@astropub/webapi";
|
|
4
4
|
import { performance } from "perf_hooks";
|
|
5
|
-
import vite from "
|
|
5
|
+
import * as vite from "vite";
|
|
6
6
|
import { createVite } from "../create-vite.js";
|
|
7
7
|
import { debug, defaultLogOptions, info, levels, timerMessage, warn } from "../logger.js";
|
|
8
8
|
import { createRouteManifest } from "../routing/index.js";
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { fileURLToPath } from "url";
|
|
2
|
-
import vite from "
|
|
2
|
+
import * as vite from "vite";
|
|
3
3
|
import { createBuildInternals } from "../../core/build/internal.js";
|
|
4
4
|
import { rollupPluginAstroBuildHTML } from "../../vite-plugin-build-html/index.js";
|
|
5
5
|
import { rollupPluginAstroBuildCSS } from "../../vite-plugin-build-css/index.js";
|
|
@@ -2,7 +2,7 @@ import fs from "fs";
|
|
|
2
2
|
import npath from "path";
|
|
3
3
|
import { fileURLToPath } from "url";
|
|
4
4
|
import glob from "fast-glob";
|
|
5
|
-
import vite from "
|
|
5
|
+
import * as vite from "vite";
|
|
6
6
|
import { debug, error } from "../../core/logger.js";
|
|
7
7
|
import { prependForwardSlash, appendForwardSlash } from "../../core/path.js";
|
|
8
8
|
import { createBuildInternals } from "../../core/build/internal.js";
|
package/dist/core/create-vite.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { builtinModules } from "module";
|
|
2
2
|
import { fileURLToPath } from "url";
|
|
3
|
-
import vite from "
|
|
3
|
+
import * as vite from "vite";
|
|
4
4
|
import astroVitePlugin from "../vite-plugin-astro/index.js";
|
|
5
5
|
import astroViteServerPlugin from "../vite-plugin-astro-server/index.js";
|
|
6
6
|
import astroPostprocessVitePlugin from "../vite-plugin-astro-postprocess/index.js";
|
package/dist/core/dev/index.js
CHANGED
|
@@ -2,7 +2,7 @@ import { polyfill } from "@astropub/webapi";
|
|
|
2
2
|
import { performance } from "perf_hooks";
|
|
3
3
|
import { createVite } from "../create-vite.js";
|
|
4
4
|
import { defaultLogOptions, info } from "../logger.js";
|
|
5
|
-
import vite from "
|
|
5
|
+
import * as vite from "vite";
|
|
6
6
|
import * as msg from "../messages.js";
|
|
7
7
|
async function dev(config, options = { logging: defaultLogOptions }) {
|
|
8
8
|
var _a;
|
package/dist/core/logger.js
CHANGED
|
@@ -11,7 +11,7 @@ function getLoggerLocale() {
|
|
|
11
11
|
if (extractedLocale.length < 2)
|
|
12
12
|
return defaultLocale;
|
|
13
13
|
else
|
|
14
|
-
return extractedLocale;
|
|
14
|
+
return extractedLocale.substring(0, 5);
|
|
15
15
|
} else
|
|
16
16
|
return defaultLocale;
|
|
17
17
|
}
|
|
@@ -148,4 +148,4 @@ export {
|
|
|
148
148
|
timerMessage,
|
|
149
149
|
warn
|
|
150
150
|
};
|
|
151
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
151
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NvcmUvbG9nZ2VyLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBRUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBTUEsMkJBQW1DO0FBQ2xDLFFBQU0sZ0JBQWdCO0FBQ3RCLE1BQUksUUFBUSxJQUFJLE1BQU07QUFDckIsVUFBTSxrQkFBa0IsUUFBUSxJQUFJLEtBQUssTUFBTSxLQUFLLEdBQUcsUUFBUSxNQUFNO0FBR3JFLFFBQUksZ0JBQWdCLFNBQVM7QUFBRyxhQUFPO0FBQUE7QUFDbEMsYUFBTyxnQkFBZ0IsVUFBVSxHQUFHO0FBQUE7QUFDbkMsV0FBTztBQUFBO0FBR2YsTUFBTSxLQUFLLElBQUksS0FBSyxlQUFlLG1CQUFtQjtBQUFBLEVBQ3JELE1BQU07QUFBQSxFQUNOLFFBQVE7QUFBQTtBQUdGLE1BQU0sd0JBQXdCLElBQUksU0FBUztBQUFBLEVBQ2pELFlBQVk7QUFBQSxFQUNaLE1BQU0sT0FBbUIsR0FBRyxVQUFVO0FBQ3JDLFFBQUksT0FBc0IsUUFBUTtBQUNsQyxRQUFJLE9BQU8sTUFBTSxTQUFTLE9BQU8sVUFBVTtBQUMxQyxhQUFPLFFBQVE7QUFBQTtBQUdoQixTQUFLLE1BQU0sSUFBSSxHQUFHLE9BQU8sSUFBSSxVQUFVO0FBRXZDLFFBQUksT0FBTyxNQUFNO0FBQ2pCLFFBQUksTUFBTTtBQUNULFVBQUksTUFBTSxVQUFVLFFBQVE7QUFDM0IsZUFBTyxLQUFLLEtBQUs7QUFBQSxpQkFDUCxNQUFNLFVBQVUsUUFBUTtBQUNsQyxlQUFPLEtBQUssT0FBTztBQUFBLGlCQUNULE1BQU0sVUFBVSxTQUFTO0FBQ25DLGVBQU8sS0FBSyxJQUFJO0FBQUE7QUFHakIsV0FBSyxNQUFNLElBQUk7QUFBQTtBQUdoQixTQUFLLE1BQU0sV0FBVyxHQUFHLE1BQU07QUFDL0IsU0FBSyxNQUFNO0FBRVg7QUFBQTtBQUFBO0FBZ0JLLE1BQU0sb0JBQTBDO0FBQUEsRUFDdEQsTUFBTTtBQUFBLEVBQ04sT0FBTztBQUFBO0FB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
|
|
@@ -14,8 +14,8 @@ async function preload({ astroConfig, filePath, viteServer }) {
|
|
|
14
14
|
}
|
|
15
15
|
async function render(renderers, mod, ssrOpts) {
|
|
16
16
|
const { astroConfig, filePath, logging, mode, origin, pathname, route, routeCache, viteServer } = ssrOpts;
|
|
17
|
-
const scripts = createModuleScriptElementWithSrcSet(astroConfig.buildOptions.experimentalStaticBuild ? Array.from(mod.$$metadata.hoistedScriptPaths()) : []);
|
|
18
|
-
if (mode === "development" && astroConfig.buildOptions.experimentalStaticBuild) {
|
|
17
|
+
const scripts = createModuleScriptElementWithSrcSet(astroConfig.buildOptions.experimentalStaticBuild && mod.hasOwnProperty("$$metadata") ? Array.from(mod.$$metadata.hoistedScriptPaths()) : []);
|
|
18
|
+
if (mod.hasOwnProperty("$$metadata") && mode === "development" && astroConfig.buildOptions.experimentalStaticBuild) {
|
|
19
19
|
scripts.add({
|
|
20
20
|
props: { type: "module", src: "/@vite/client" },
|
|
21
21
|
children: ""
|
|
@@ -102,4 +102,4 @@ export {
|
|
|
102
102
|
render,
|
|
103
103
|
ssr
|
|
104
104
|
};
|
|
105
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
105
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vLi4vc3JjL2NvcmUvcmVuZGVyL2Rldi9pbmRleC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUdBO0FBQ0E7QUFDQTtBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUF5QkEsTUFBTSxpQkFBaUI7QUFFdkIsdUJBQThCLEVBQUUsYUFBYSxVQUFVLGNBQXFEO0FBRTNHLFFBQU0sWUFBWSxNQUFNLGlCQUFpQixZQUFZO0FBRXJELFFBQU0sTUFBTyxNQUFNLFdBQVcsY0FBYyxjQUFjO0FBRTFELFNBQU8sQ0FBQyxXQUFXO0FBQUE7QUFJcEIsc0JBQTZCLFdBQXVCLEtBQXdCLFNBQXNDO0FBQ2pILFFBQU0sRUFBRSxhQUFhLFVBQVUsU0FBUyxNQUFNLFFBQVEsVUFBVSxPQUFPLFlBQVksZUFBZTtBQUdsRyxRQUFNLFVBQVUsb0NBQ2YsWUFBWSxhQUFhLDJCQUEyQixJQUFJLGVBQWUsZ0JBQWdCLE1BQU0sS0FBSyxJQUFJLFdBQVcsd0JBQXdCO0FBSTFJLE1BQUksSUFBSSxlQUFlLGlCQUFpQixTQUFTLGlCQUFpQixZQUFZLGFBQWEseUJBQXlCO0FBQ25ILFlBQVEsSUFBSTtBQUFBLE1BQ1gsT0FBTyxFQUFFLE1BQU0sVUFBVSxLQUFLO0FBQUEsTUFDOUIsVUFBVTtBQUFBO0FBRVgsWUFBUSxJQUFJO0FBQUEsTUFDWCxPQUFPLEVBQUUsTUFBTSxVQUFVLEtBQUssSUFBSSxJQUFJLGtDQUFrQyxZQUFZLEtBQUs7QUFBQSxNQUN6RixVQUFVO0FBQUE7QUFBQTtBQUlaLE1BQUksVUFBVSxNQUFNLFdBQVc7QUFBQSxJQUM5Qix5QkFBeUIsWUFBWSxhQUFhO0FBQUEsSUFDbEQsT0FBTyxJQUFJO0FBQUEsSUFDWDtBQUFBLElBQ0EsZ0JBQWdCLFlBQVksZ0JBQWdCO0FBQUEsSUFDNUM7QUFBQSxJQUNBO0FBQUEsSUFDQTtBQUFBLElBQ0E7QUFBQSxVQUVNLFFBQVEsR0FBVztBQUl4QixVQUFJLFlBQVksYUFBYSx5QkFBeUI7QUFDckQsY0FBTSxDQUFDLEVBQUUsZ0JBQWdCLE1BQU0sV0FBVyxZQUFZLFdBQVc7QUFDakUsZUFBTztBQUFBLGFBQ0Q7QUFDTixlQUFPO0FBQUE7QUFBQTtBQUFBLElBR1Q7QUFBQSxJQUNBO0FBQUEsSUFDQTtBQUFBLElBQ0EsTUFBTSxZQUFZLGFBQWE7QUFBQTtBQUdoQyxNQUFJLGdDQUFPLFVBQVMsWUFBWTtBQUMvQixXQUFPO0FBQUE7QUFJUixRQUFNLE9BQWlDO0FBR3ZDLE1BQUksU0FBUyxpQkFBaUIsQ0FBQyxZQUFZLGFBQWEseUJBQXlCO0FBQ2hGLFNBQUssS0FBSztBQUFBLE1BQ1QsS0FBSztBQUFBLE1BQ0wsT0FBTyxFQUFFLE1BQU07QUFBQSxNQUdmLFVBQVUsTUFBTTtBQUFBLE1BQ2hCLFVBQVU7QUFBQTtBQUFBO0FBS1osR0FBQyxHQUFHLGdCQUFnQixVQUFVLGFBQWEsUUFBUSxDQUFDLFNBQVM7QUFDNUQsUUFBSSxTQUFTLGlCQUFpQixlQUFlLEtBQUssT0FBTztBQUN4RCxXQUFLLEtBQUs7QUFBQSxRQUNULEtBQUs7QUFBQSxRQUNMLE9BQU8sRUFBRSxNQUFNLFVBQVUsS0FBSztBQUFBLFFBQzlCLFVBQVU7QUFBQTtBQUFBLFdBRUw7QUFDTixXQUFLLEtBQUs7QUFBQSxRQUNULEtBQUs7QUFBQSxRQUNMLE9BQU87QUFBQSxVQUNOLEtBQUs7QUFBQSxVQUNMO0FBQUEsVUFDQSx1QkFBdUI7QUFBQTtBQUFBLFFBRXhCLFVBQVU7QUFBQTtBQUFBO0FBQUE7QUFNYixZQUFVLFdBQVcsU0FBUztBQUc5QixNQUFJLFNBQVMsaUJBQWlCLENBQUMsWUFBWSxhQUFhLHlCQUF5QjtBQUNoRixVQUFNLGNBQWMsU0FBUyxLQUFLLFFBQVEsWUFBWSxZQUFZLE1BQU07QUFDeEUsY0FBVSxNQUFNLFdBQVcsbUJBQW1CLGFBQWEsU0FBUztBQUFBO0FBSXJFLE1BQUksQ0FBQyxrQkFBa0IsS0FBSyxVQUFVO0FBQ3JDLGNBQVUsc0JBQXNCO0FBQUE7QUFHakMsU0FBTztBQUFBO0FBR1IsbUJBQTBCLFNBQXNDO0FBQy9ELE1BQUk7QUFDSCxVQUFNLENBQUMsV0FBVyxPQUFPLE1BQU0sUUFBUTtBQUN2QyxXQUFPLE1BQU0sT0FBTyxXQUFXLEtBQUs7QUFBQSxXQUM1QixHQUFQO0FBQ0QsVUFBTSxhQUFhLEdBQUcsRUFBRSxZQUFZLFFBQVEsWUFBWSxVQUFVLFFBQVE7QUFDMUUsVUFBTTtBQUFBO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
|
@@ -1,30 +1,18 @@
|
|
|
1
1
|
if (import.meta.hot) {
|
|
2
2
|
const parser = new DOMParser();
|
|
3
|
-
import.meta.hot.on("astro:
|
|
4
|
-
const { default:
|
|
3
|
+
import.meta.hot.on("astro:update", async ({ file }) => {
|
|
4
|
+
const { default: diff } = await import("micromorph");
|
|
5
|
+
console.log(`[vite] hot updated: ${file}`);
|
|
6
|
+
const html = await fetch(`${window.location}`).then((res) => res.text());
|
|
5
7
|
const doc = parser.parseFromString(html, "text/html");
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
if (fromEl.tagName === toEl.tagName && (toEl.tagName === "LINK" || toEl.tagName === "SCRIPT")) {
|
|
12
|
-
return false;
|
|
13
|
-
}
|
|
14
|
-
return true;
|
|
8
|
+
for (const root of doc.querySelectorAll("astro-root")) {
|
|
9
|
+
const uid = root.getAttribute("uid");
|
|
10
|
+
const current = document.querySelector(`astro-root[uid="${uid}"]`);
|
|
11
|
+
if (current) {
|
|
12
|
+
root.innerHTML = current == null ? void 0 : current.innerHTML;
|
|
15
13
|
}
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
onBeforeElUpdated(fromEl, toEl) {
|
|
19
|
-
if (fromEl.localName === "astro-root") {
|
|
20
|
-
return fromEl.getAttribute("uid") !== toEl.getAttribute("uid");
|
|
21
|
-
}
|
|
22
|
-
if (fromEl.isEqualNode(toEl)) {
|
|
23
|
-
return false;
|
|
24
|
-
}
|
|
25
|
-
return true;
|
|
26
|
-
}
|
|
27
|
-
});
|
|
14
|
+
}
|
|
15
|
+
diff(document, doc);
|
|
28
16
|
});
|
|
29
17
|
}
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL3J1bnRpbWUvY2xpZW50L2htci50cyJdLAogICJtYXBwaW5ncyI6ICJBQUFBLElBQUksWUFBWSxLQUFLO0FBQ3BCLFFBQU0sU0FBUyxJQUFJO0FBQ25CLGNBQVksSUFBSSxHQUFHLGdCQUFnQixPQUFPLEVBQUUsV0FBVztBQUN0RCxVQUFNLEVBQUUsU0FBUyxTQUFTLE1BQU0sT0FBTztBQUV2QyxZQUFRLElBQUksdUJBQXVCO0FBQ25DLFVBQU0sT0FBTyxNQUFNLE1BQU0sR0FBRyxPQUFPLFlBQVksS0FBSyxDQUFDLFFBQVEsSUFBSTtBQUNqRSxVQUFNLE1BQU0sT0FBTyxnQkFBZ0IsTUFBTTtBQUd6QyxlQUFXLFFBQVEsSUFBSSxpQkFBaUIsZUFBZTtBQUN0RCxZQUFNLE1BQU0sS0FBSyxhQUFhO0FBQzlCLFlBQU0sVUFBVSxTQUFTLGNBQWMsbUJBQW1CO0FBQzFELFVBQUksU0FBUztBQUNaLGFBQUssWUFBWSxtQ0FBUztBQUFBO0FBQUE7QUFHNUIsU0FBSyxVQUFVO0FBQUE7QUFBQTsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type babel from '@babel/core';
|
|
1
|
+
import type * as babel from '@babel/core';
|
|
2
2
|
import type { z } from 'zod';
|
|
3
3
|
import type { AstroConfigSchema } from '../core/config';
|
|
4
4
|
import type { AstroComponentFactory, Metadata } from '../runtime/server';
|
|
5
|
-
import type vite from '
|
|
5
|
+
import type * as vite from 'vite';
|
|
6
6
|
export interface AstroBuiltinProps {
|
|
7
7
|
'client:load'?: boolean;
|
|
8
8
|
'client:idle'?: boolean;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { AstroConfig, ManifestData } from '../../@types/astro';
|
|
2
2
|
import type { AllPagesData } from './types';
|
|
3
3
|
import type { LogOptions } from '../logger';
|
|
4
|
-
import type { ViteDevServer } from '
|
|
4
|
+
import type { ViteDevServer } from 'vite';
|
|
5
5
|
import { RouteCache } from '../render/route-cache.js';
|
|
6
6
|
export interface CollectPagesDataOptions {
|
|
7
7
|
astroConfig: AstroConfig;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { AstroConfig } from '../../@types/astro';
|
|
2
|
-
import type { Plugin as VitePlugin } from '
|
|
2
|
+
import type { Plugin as VitePlugin } from 'vite';
|
|
3
3
|
import type { BuildInternals } from '../../core/build/internal.js';
|
|
4
4
|
export declare function vitePluginHoistedScripts(astroConfig: AstroConfig, internals: BuildInternals): VitePlugin;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type vite from '
|
|
1
|
+
import type * as vite from 'vite';
|
|
2
2
|
/** Inject tags into HTML (note: for best performance, group as many tags as possible into as few calls as you can) */
|
|
3
3
|
export declare function injectTags(html: string, tags: vite.HtmlTagDescriptor[]): string;
|
|
4
4
|
declare type Resource = Record<string, string>;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type vite from '
|
|
1
|
+
import type * as vite from 'vite';
|
|
2
2
|
import type { AstroConfig, ComponentInstance, Renderer, RouteData, RuntimeMode } from '../../../@types/astro';
|
|
3
3
|
import { LogOptions } from '../../logger.js';
|
|
4
4
|
import { RouteCache } from '../route-cache.js';
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { AstroConfig } from '../@types/astro';
|
|
2
|
-
import type {
|
|
2
|
+
import type { LogOptions } from '../core/logger.js';
|
|
3
|
+
import type { ViteDevServer, ModuleNode, HmrContext } from 'vite';
|
|
3
4
|
import type { PluginContext as RollupPluginContext } from 'rollup';
|
|
4
5
|
interface TrackCSSDependenciesOptions {
|
|
5
6
|
viteDevServer: ViteDevServer | null;
|
|
@@ -8,5 +9,5 @@ interface TrackCSSDependenciesOptions {
|
|
|
8
9
|
deps: Set<string>;
|
|
9
10
|
}
|
|
10
11
|
export declare function trackCSSDependencies(this: RollupPluginContext, opts: TrackCSSDependenciesOptions): Promise<void>;
|
|
11
|
-
export declare function handleHotUpdate(ctx: HmrContext, config: AstroConfig): ModuleNode[];
|
|
12
|
+
export declare function handleHotUpdate(ctx: HmrContext, config: AstroConfig, logging: LogOptions): ModuleNode[];
|
|
12
13
|
export {};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type vite from '
|
|
1
|
+
import type * as vite from 'vite';
|
|
2
2
|
export declare type TransformHook = (code: string, id: string, ssr?: boolean) => Promise<vite.TransformResult>;
|
|
3
3
|
/** Load vite:css’ transform() hook */
|
|
4
4
|
export declare function getViteTransform(viteConfig: vite.ResolvedConfig): TransformHook;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { BuildInternals } from '../core/build/internal';
|
|
2
|
-
import { Plugin as VitePlugin } from '
|
|
2
|
+
import { Plugin as VitePlugin } from 'vite';
|
|
3
3
|
export declare function getAstroPageStyleId(pathname: string): string;
|
|
4
4
|
export declare function getAstroStyleId(pathname: string): string;
|
|
5
5
|
export declare function getAstroStylePathFromId(id: string): string;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ResolveIdHook, LoadHook } from 'rollup';
|
|
2
|
-
import type { ResolvedConfig, Plugin as VitePlugin } from '
|
|
2
|
+
import type { ResolvedConfig, Plugin as VitePlugin } from 'vite';
|
|
3
3
|
export declare function getVitePluginByName(viteConfig: ResolvedConfig, pluginName: string): VitePlugin;
|
|
4
4
|
export declare function getViteResolvePlugin(viteConfig: ResolvedConfig): VitePlugin;
|
|
5
5
|
export declare function getViteLoadFallbackPlugin(viteConfig: ResolvedConfig): VitePlugin;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { AstroConfig } from '../@types/astro';
|
|
2
2
|
import type { LogOptions } from '../core/logger.js';
|
|
3
|
-
import type { ViteDevServer, Plugin as VitePlugin } from '
|
|
3
|
+
import type { ViteDevServer, Plugin as VitePlugin } from 'vite';
|
|
4
4
|
import type { AllPagesData } from '../core/build/types';
|
|
5
5
|
import type { BuildInternals } from '../core/build/internal';
|
|
6
6
|
import { RouteCache } from '../core/render/route-cache.js';
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { invalidateCompilation, isCached } from "./compile.js";
|
|
2
|
+
import { logger } from "../core/logger.js";
|
|
3
|
+
import { green } from "kleur/colors";
|
|
2
4
|
async function trackCSSDependencies(opts) {
|
|
3
5
|
const { viteDevServer, filename, deps, id } = opts;
|
|
4
6
|
if (viteDevServer) {
|
|
@@ -19,7 +21,7 @@ async function trackCSSDependencies(opts) {
|
|
|
19
21
|
}
|
|
20
22
|
}
|
|
21
23
|
}
|
|
22
|
-
function handleHotUpdate(ctx, config) {
|
|
24
|
+
function handleHotUpdate(ctx, config, logging) {
|
|
23
25
|
invalidateCompilation(config, ctx.file);
|
|
24
26
|
const filtered = new Set(ctx.modules);
|
|
25
27
|
const files = new Set();
|
|
@@ -38,10 +40,16 @@ function handleHotUpdate(ctx, config) {
|
|
|
38
40
|
for (const file of files) {
|
|
39
41
|
invalidateCompilation(config, file);
|
|
40
42
|
}
|
|
43
|
+
if (ctx.file.endsWith(".astro")) {
|
|
44
|
+
const file = ctx.file.replace(config.projectRoot.pathname, "/");
|
|
45
|
+
logger.info("astro", green("hmr"), `${file}`);
|
|
46
|
+
ctx.server.ws.send({ type: "custom", event: "astro:update", data: { file } });
|
|
47
|
+
return [];
|
|
48
|
+
}
|
|
41
49
|
return Array.from(filtered);
|
|
42
50
|
}
|
|
43
51
|
export {
|
|
44
52
|
handleHotUpdate,
|
|
45
53
|
trackCSSDependencies
|
|
46
54
|
};
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLWFzdHJvL2htci50cyJdLAogICJtYXBwaW5ncyI6ICJBQUlBO0FBQ0E7QUFDQTtBQVNBLG9DQUFzRSxNQUFrRDtBQUN2SCxRQUFNLEVBQUUsZUFBZSxVQUFVLE1BQU0sT0FBTztBQUU5QyxNQUFJLGVBQWU7QUFDbEIsVUFBTSxNQUFNLGNBQWMsWUFBWSxjQUFjO0FBQ3BELFFBQUksS0FBSztBQUNSLFlBQU0sVUFDTCxPQUFNLFFBQVEsSUFDYixNQUFNLEtBQUssTUFBTSxJQUFJLENBQUMsU0FBUztBQUM5QixlQUFPLEtBQUssUUFBUSxNQUFNO0FBQUEsV0FJM0IsT0FBTyxTQUNQLElBQUksQ0FBQyxRQUFTLElBQW1CO0FBRW5DLFlBQU0sRUFBRSxnQkFBZ0I7QUFHeEIsWUFBTSxhQUFhLElBQUksSUFBSSxJQUFJO0FBQy9CLGlCQUFXLE9BQU8sU0FBUztBQUMxQixtQkFBVyxJQUFJLFlBQVksb0JBQW9CO0FBQUE7QUFJaEQsa0JBQVksaUJBQWlCLEtBQUssWUFBWSxJQUFJLE9BQU87QUFDekQsaUJBQVcsT0FBTyxTQUFTO0FBQzFCLGFBQUssYUFBYTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBTWYseUJBQXlCLEtBQWlCLFFBQXFCLFNBQXFCO0FBRTFGLHdCQUFzQixRQUFRLElBQUk7QUFJbEMsUUFBTSxXQUFXLElBQUksSUFBZ0IsSUFBSTtBQUN6QyxRQUFNLFFBQVEsSUFBSTtBQUNsQixhQUFXLE9BQU8sSUFBSSxTQUFTO0FBQzlCLFFBQUksSUFBSSxRQUFRLFNBQVMsUUFBUSxJQUFJLE9BQU87QUFDM0MsZUFBUyxJQUFJO0FBQ2IsWUFBTSxJQUFJLElBQUk7QUFBQTtBQUVmLGVBQVcsT0FBTyxJQUFJLFdBQVc7QUFDaEMsVUFBSSxJQUFJLFFBQVEsU0FBUyxRQUFRLElBQUksT0FBTztBQUMzQyxpQkFBUyxJQUFJO0FBQ2IsY0FBTSxJQUFJLElBQUk7QUFBQTtBQUFBO0FBQUE7QUFPakIsYUFBVyxRQUFRLE9BQU87QUFDekIsMEJBQXNCLFFBQVE7QUFBQTtBQUcvQixNQUFJLElBQUksS0FBSyxTQUFTLFdBQVc7QUFDaEMsVUFBTSxPQUFPLElBQUksS0FBSyxRQUFRLE9BQU8sWUFBWSxVQUFVO0FBQzNELFdBQU8sS0FBSyxTQUFTLE1BQU0sUUFBUSxHQUFHO0FBQ3RDLFFBQUksT0FBTyxHQUFHLEtBQUssRUFBRSxNQUFNLFVBQVUsT0FBTyxnQkFBZ0IsTUFBTSxFQUFFO0FBQ3BFLFdBQU87QUFBQTtBQUdSLFNBQU8sTUFBTSxLQUFLO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
|
@@ -146,11 +146,11 @@ function astro({ config, logging }) {
|
|
|
146
146
|
}
|
|
147
147
|
},
|
|
148
148
|
async handleHotUpdate(context) {
|
|
149
|
-
return handleHotUpdate(context, config);
|
|
149
|
+
return handleHotUpdate(context, config, logging);
|
|
150
150
|
}
|
|
151
151
|
};
|
|
152
152
|
}
|
|
153
153
|
export {
|
|
154
154
|
astro as default
|
|
155
155
|
};
|
|
156
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
156
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLWFzdHJvL2luZGV4LnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBSUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBRUEsTUFBTSwyQkFBMkI7QUFPbEIsZUFBZSxFQUFFLFFBQVEsV0FBNEM7QUFDbkYsNkJBQTJCLFVBQWtCO0FBQzVDLFFBQUksU0FBUyxXQUFXLFNBQVM7QUFDaEMsaUJBQVcsU0FBUyxNQUFNLE9BQU87QUFBQSxlQUN2QixTQUFTLFdBQVcsUUFBUSxDQUFDLFNBQVMsVUFBVSxPQUFPLFlBQVksV0FBVztBQUN4RixpQkFBVyxJQUFJLElBQUksTUFBTSxVQUFVLE9BQU8sYUFBYTtBQUFBO0FBRXhELFdBQU87QUFBQTtBQUVSLDBCQUF3QixVQUFrQjtBQUN6QyxVQUFNLE1BQU0sdUJBQXVCLFlBQVksTUFBTSxXQUFXO0FBQ2hFLFVBQU0sTUFBTSxJQUFJLElBQUksS0FBSyxPQUFPO0FBQ2hDLFdBQU8sTUFBTSxjQUFjLFFBQVEsSUFBSTtBQUFBO0FBR3hDLE1BQUk7QUFDSixNQUFJLGdCQUEyQztBQUcvQyxRQUFNLGFBQWEsT0FBTyxJQUFJLFNBQVMsTUFBTSxPQUFPLFlBQVksU0FBUyxTQUFTO0FBQ2xGLFFBQU0sZ0JBQWdCLENBQUMsU0FBaUIsS0FBSyxXQUFXO0FBRXhELFNBQU87QUFBQSxJQUNOLE1BQU07QUFBQSxJQUNOLFNBQVM7QUFBQSxJQUNULGVBQWUsZ0JBQWdCO0FBQzlCLHNCQUFnQixpQkFBaUI7QUFBQTtBQUFBLElBRWxDLGdCQUFnQixRQUFRO0FBQ3ZCLHNCQUFnQjtBQUFBO0FBQUEsVUFHWCxVQUFVLElBQUksTUFBTTtBQUd6QixVQUFJLE1BQU07QUFDVCxjQUFNLEVBQUUsT0FBTyxXQUFXLGFBQWEsa0JBQWtCO0FBQ3pELFlBQUksVUFBVSxTQUFTLGVBQWUsT0FBTyxVQUFVLFNBQVMsVUFBVTtBQUN6RSxnQkFBTSxjQUFjLElBQUksSUFBSSxJ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
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { info } from "../core/logger.js";
|
|
2
2
|
import { createRouteManifest, matchRoute } from "../core/routing/index.js";
|
|
3
|
-
import mime from "mime";
|
|
4
3
|
import stripAnsi from "strip-ansi";
|
|
5
4
|
import { createSafeError } from "../core/util.js";
|
|
6
5
|
import { ssr } from "../core/render/dev/index.js";
|
|
@@ -18,8 +17,8 @@ function removeViteHttpMiddleware(server) {
|
|
|
18
17
|
}
|
|
19
18
|
function writeHtmlResponse(res, statusCode, html) {
|
|
20
19
|
res.writeHead(statusCode, {
|
|
21
|
-
"Content-Type":
|
|
22
|
-
"Content-Length": Buffer.byteLength(html, "
|
|
20
|
+
"Content-Type": "text/html; charset=utf-8",
|
|
21
|
+
"Content-Length": Buffer.byteLength(html, "utf-8")
|
|
23
22
|
});
|
|
24
23
|
res.write(html);
|
|
25
24
|
res.end();
|
|
@@ -83,7 +82,6 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
|
|
|
83
82
|
routeCache,
|
|
84
83
|
viteServer
|
|
85
84
|
});
|
|
86
|
-
info(logging, "astro", msg.req({ url: pathname, statusCode, reqTime: performance.now() - reqStart }));
|
|
87
85
|
writeHtmlResponse(res, statusCode, html);
|
|
88
86
|
} catch (_err) {
|
|
89
87
|
info(logging, "astro", msg.req({ url: pathname, statusCode: 500 }));
|
|
@@ -121,4 +119,4 @@ function createPlugin({ config, logging }) {
|
|
|
121
119
|
export {
|
|
122
120
|
createPlugin as default
|
|
123
121
|
};
|
|
124
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
122
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZpdGUtcGx1Z2luLWFzdHJvLXNlcnZlci9pbmRleC50cyJdLAogICJtYXBwaW5ncyI6ICJBQUdBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUVBO0FBQ0E7QUFDQTtBQU9BLE1BQU0sc0JBQXNCLENBQUMsMkJBQTJCLHFCQUFxQjtBQUM3RSxrQ0FBa0MsUUFBNkI7QUFDOUQsV0FBUyxJQUFJLE9BQU8sTUFBTSxTQUFTLEdBQUcsSUFBSSxHQUFHLEtBQUs7QUFFakQsUUFBSSxvQkFBb0IsU0FBUyxPQUFPLE1BQU0sR0FBRyxPQUFPLE9BQU87QUFDOUQsYUFBTyxNQUFNLE9BQU8sR0FBRztBQUFBO0FBQUE7QUFBQTtBQUsxQiwyQkFBMkIsS0FBMEIsWUFBb0IsTUFBYztBQUN0RixNQUFJLFVBQVUsWUFBWTtBQUFBLElBQ3pCLGdCQUFnQjtBQUFBLElBQ2hCLGtCQUFrQixPQUFPLFdBQVcsTUFBTTtBQUFBO0FBRTNDLE1BQUksTUFBTTtBQUNWLE1BQUk7QUFBQTtBQUdMLGlDQUFpQyxRQUFnQixRQUFxQixLQUEyQixLQUEwQjtBQUMxSCxRQUFNLE9BQU8sT0FBTyxhQUFhLE9BQU8sSUFBSSxJQUFJLE9BQU8sYUFBYSxRQUFRO0FBQzVFLFFBQU0sVUFBVSxPQUFPLEtBQUssV0FBVztBQUN2QyxRQUFNLFdBQVcsVUFBVSxJQUFJLElBQUksU0FBUyxJQUFJLEtBQUs7QUFDckQsTUFBSSxPQUFPO0FBQ1gsTUFBSSxhQUFhLE9BQU8sQ0FBQyxTQUFTLFdBQVcsVUFBVTtBQUN0RCxXQUFPLHVCQUF1QixTQUFTO0FBQUEsU0FDakM7QUFDTixXQUFPLGlCQUFpQixFQUFFLFlBQVksS0FBSyxPQUFPLGFBQWEsVUFBVSxrQkFBa0I7QUFBQTtBQUU1RixvQkFBa0IsS0FBSyxLQUFLO0FBQUE7QUFHN0IsaUNBQWlDLFlBQWdDLFFBQWdCLEtBQTJCLEtBQTBCLEtBQVU7QUFDL0ksUUFBTSxXQUFXLFVBQVUsSUFBSSxJQUFJLFNBQVMsSUFB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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "astro",
|
|
3
|
-
"version": "0.23.
|
|
3
|
+
"version": "0.23.1",
|
|
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,9 +56,9 @@
|
|
|
56
56
|
"test:match": "mocha --timeout 15000 -g"
|
|
57
57
|
},
|
|
58
58
|
"dependencies": {
|
|
59
|
-
"@astrojs/compiler": "^0.11.
|
|
59
|
+
"@astrojs/compiler": "^0.11.4",
|
|
60
60
|
"@astrojs/language-server": "^0.8.6",
|
|
61
|
-
"@astrojs/markdown-remark": "^0.6.
|
|
61
|
+
"@astrojs/markdown-remark": "^0.6.2",
|
|
62
62
|
"@astrojs/prism": "0.4.0",
|
|
63
63
|
"@astrojs/renderer-preact": "^0.5.0",
|
|
64
64
|
"@astrojs/renderer-react": "0.5.0",
|
|
@@ -71,6 +71,7 @@
|
|
|
71
71
|
"@proload/plugin-tsm": "^0.1.0",
|
|
72
72
|
"@types/babel__core": "^7.1.15",
|
|
73
73
|
"@types/debug": "^4.1.7",
|
|
74
|
+
"@types/yargs-parser": "^20.2.1",
|
|
74
75
|
"@web/parse5-utils": "^1.3.0",
|
|
75
76
|
"ci-info": "^3.2.0",
|
|
76
77
|
"common-ancestor-path": "^1.0.1",
|
|
@@ -84,8 +85,8 @@
|
|
|
84
85
|
"htmlparser2": "^7.1.2",
|
|
85
86
|
"kleur": "^4.1.4",
|
|
86
87
|
"magic-string": "^0.25.7",
|
|
88
|
+
"micromorph": "^0.0.2",
|
|
87
89
|
"mime": "^3.0.0",
|
|
88
|
-
"morphdom": "^2.6.1",
|
|
89
90
|
"parse5": "^6.0.1",
|
|
90
91
|
"path-to-regexp": "^6.2.0",
|
|
91
92
|
"postcss": "^8.3.8",
|
|
@@ -121,7 +122,6 @@
|
|
|
121
122
|
"@types/resolve": "^1.20.1",
|
|
122
123
|
"@types/rimraf": "^3.0.2",
|
|
123
124
|
"@types/send": "^0.17.1",
|
|
124
|
-
"@types/yargs-parser": "^20.2.1",
|
|
125
125
|
"chai": "^4.3.4",
|
|
126
126
|
"cheerio": "^1.0.0-rc.10",
|
|
127
127
|
"execa": "^6.0.0",
|
package/dist/core/vite.js
DELETED
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
export * from "vite";
|
|
2
|
-
import { default as default2 } from "vite";
|
|
3
|
-
export {
|
|
4
|
-
default2 as default
|
|
5
|
-
};
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NvcmUvdml0ZS50cyJdLAogICJtYXBwaW5ncyI6ICJBQUFBO0FBQ0E7IiwKICAibmFtZXMiOiBbXQp9Cg==
|