astro 0.21.0-next.7 → 0.21.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/CHANGELOG.md +70 -0
- package/components/Debug.astro +3 -1
- package/dist/cli/check.js +8 -8
- package/dist/cli/index.js +17 -17
- package/dist/core/build/index.js +24 -24
- package/dist/core/config.js +4 -4
- package/dist/core/create-vite.js +12 -12
- package/dist/core/dev/index.js +44 -34
- package/dist/core/dev/messages.js +8 -8
- package/dist/core/dev/template/4xx.js +4 -4
- package/dist/core/dev/template/5xx.js +4 -4
- package/dist/core/logger.js +6 -6
- package/dist/core/preview/index.js +11 -11
- package/dist/core/ssr/css.js +7 -5
- package/dist/core/ssr/html.js +4 -4
- package/dist/core/ssr/index.js +55 -42
- package/dist/core/ssr/paginate.js +5 -5
- package/dist/core/ssr/routing.js +5 -5
- package/dist/core/ssr/rss.js +6 -6
- package/dist/core/ssr/sitemap.js +2 -2
- package/dist/core/util.js +6 -5
- package/dist/core/vite.js +1 -1
- package/dist/runtime/client/hmr.js +3 -3
- package/dist/runtime/client/media.js +2 -2
- package/dist/runtime/server/hydration.js +10 -10
- package/dist/runtime/server/index.js +29 -21
- package/dist/runtime/server/metadata.js +3 -3
- package/dist/types/core/config.d.ts +10 -10
- package/dist/types/core/dev/index.d.ts +1 -2
- package/dist/types/core/util.d.ts +8 -1
- package/dist/vite-plugin-astro/index.js +8 -25
- package/dist/vite-plugin-astro/styles.js +4 -4
- package/dist/vite-plugin-astro-postprocess/index.js +6 -6
- package/dist/vite-plugin-build-css/index.js +4 -4
- package/dist/vite-plugin-build-css/resolve.js +2 -2
- package/dist/vite-plugin-build-html/add-rollup-input.js +3 -3
- package/dist/vite-plugin-build-html/extract-assets.js +5 -4
- package/dist/vite-plugin-build-html/index.js +21 -22
- package/dist/vite-plugin-config-alias/index.js +6 -6
- package/dist/vite-plugin-fetch/index.js +2 -2
- package/dist/vite-plugin-jsx/index.js +24 -18
- package/dist/vite-plugin-markdown/index.js +11 -9
- package/package.json +19 -16
- package/vendor/vite/dist/node/chunks/dep-35df7f96.js +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,75 @@
|
|
|
1
1
|
# astro
|
|
2
2
|
|
|
3
|
+
## 0.21.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 8775730e: Fix CSS scanning bug that could lead to infinite loops
|
|
8
|
+
- aec4e8da: Fix client:only behavior when only a single renderer is configured
|
|
9
|
+
|
|
10
|
+
## 0.21.0
|
|
11
|
+
|
|
12
|
+
### Minor Changes
|
|
13
|
+
|
|
14
|
+
- e6aaeff5: Astro 0.21 is here! [Read the complete migration guide](https://docs.astro.build/migration/0.21.0/).
|
|
15
|
+
|
|
16
|
+
This new version of Astro includes:
|
|
17
|
+
|
|
18
|
+
- A new, faster, [Go-based compiler](https://github.com/snowpackjs/astro-compiler)
|
|
19
|
+
- A completely new runtime backed by [Vite](https://vitejs.dev/), with significantly dev experience improvements
|
|
20
|
+
- Improved support for loading Astro config files, including `.cjs`, `.js`, and `.ts` files
|
|
21
|
+
- And [many more features](https://astro.build/blog/astro-021-preview/)!
|
|
22
|
+
|
|
23
|
+
### Patch Changes
|
|
24
|
+
|
|
25
|
+
- Updated dependencies [e6aaeff5]
|
|
26
|
+
- Updated dependencies [e6aaeff5]
|
|
27
|
+
- Updated dependencies [e6aaeff5]
|
|
28
|
+
- @astrojs/renderer-preact@0.3.0
|
|
29
|
+
- @astrojs/renderer-react@0.3.0
|
|
30
|
+
- @astrojs/renderer-svelte@0.2.0
|
|
31
|
+
- @astrojs/renderer-vue@0.2.0
|
|
32
|
+
- @astrojs/markdown-remark@0.4.0
|
|
33
|
+
- @astrojs/prism@0.3.0
|
|
34
|
+
|
|
35
|
+
## 0.21.0-next.12
|
|
36
|
+
|
|
37
|
+
### Patch Changes
|
|
38
|
+
|
|
39
|
+
- 8733599e: Adds missing vite dependency, vixing svelte and vue
|
|
40
|
+
- 2e0c790b: Fix Lit renderer built
|
|
41
|
+
|
|
42
|
+
## 0.21.0-next.11
|
|
43
|
+
|
|
44
|
+
### Patch Changes
|
|
45
|
+
|
|
46
|
+
- 00d2b625: Add Vite dependencies to astro
|
|
47
|
+
- Updated dependencies [00d2b625]
|
|
48
|
+
- @astrojs/markdown-remark@0.4.0-next.2
|
|
49
|
+
|
|
50
|
+
## 0.21.0-next.10
|
|
51
|
+
|
|
52
|
+
### Patch Changes
|
|
53
|
+
|
|
54
|
+
- c7682168: Fix build by making vendored vite resolve to copy
|
|
55
|
+
|
|
56
|
+
## 0.21.0-next.9
|
|
57
|
+
|
|
58
|
+
### Patch Changes
|
|
59
|
+
|
|
60
|
+
- 41c6a772: Fix for dev server not starting
|
|
61
|
+
- 3b511059: Fix for OSX .astro file corruption
|
|
62
|
+
|
|
63
|
+
## 0.21.0-next.8
|
|
64
|
+
|
|
65
|
+
### Patch Changes
|
|
66
|
+
|
|
67
|
+
- c82ceff7: Bug fix for Debug when passed JSON contain HTML strings
|
|
68
|
+
- 53d9cf5e: Fixes dev server not stopping cleanly
|
|
69
|
+
- 8986d33b: Improve error display
|
|
70
|
+
- Updated dependencies [8986d33b]
|
|
71
|
+
- @astrojs/renderer-vue@0.2.0-next.2
|
|
72
|
+
|
|
3
73
|
## 0.21.0-next.7
|
|
4
74
|
|
|
5
75
|
### Patch Changes
|
package/components/Debug.astro
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
---
|
|
2
|
+
import Code from './Code.astro';
|
|
3
|
+
|
|
2
4
|
const key = Object.keys(Astro.props)[0];
|
|
3
5
|
const value = Astro.props[key];
|
|
4
6
|
---
|
|
@@ -8,7 +10,7 @@ const value = Astro.props[key];
|
|
|
8
10
|
<h2 class="debug-title"><span class="debug-label">Debug</span> <span class="debug-name">"{key}"</span></h2>
|
|
9
11
|
</div>
|
|
10
12
|
|
|
11
|
-
<
|
|
13
|
+
<Code code={JSON.stringify(value, null, 2)} />
|
|
12
14
|
</div>
|
|
13
15
|
|
|
14
16
|
<style>
|
package/dist/cli/check.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {AstroCheck, DiagnosticSeverity} from "@astrojs/language-server";
|
|
2
|
-
import {bold, black, bgWhite, red, cyan, yellow} from "kleur/colors";
|
|
1
|
+
import { AstroCheck, DiagnosticSeverity } from "@astrojs/language-server";
|
|
2
|
+
import { bold, black, bgWhite, red, cyan, yellow } from "kleur/colors";
|
|
3
3
|
import glob from "fast-glob";
|
|
4
4
|
import * as path from "path";
|
|
5
|
-
import {pathToFileURL} from "url";
|
|
5
|
+
import { pathToFileURL } from "url";
|
|
6
6
|
import * as fs from "fs";
|
|
7
7
|
async function openAllDocuments(workspaceUri, filePathsToIgnore, checker) {
|
|
8
8
|
const files = await glob("**/*.astro", {
|
|
@@ -18,7 +18,7 @@ async function openAllDocuments(workspaceUri, filePathsToIgnore, checker) {
|
|
|
18
18
|
});
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
function offsetAt({line, character}, text) {
|
|
21
|
+
function offsetAt({ line, character }, text) {
|
|
22
22
|
let i = 0;
|
|
23
23
|
let l = 0;
|
|
24
24
|
let c = 0;
|
|
@@ -43,7 +43,7 @@ function offsetAt({line, character}, text) {
|
|
|
43
43
|
return i;
|
|
44
44
|
}
|
|
45
45
|
function pad(str, len) {
|
|
46
|
-
return Array.from({length: len}, () => str).join("");
|
|
46
|
+
return Array.from({ length: len }, () => str).join("");
|
|
47
47
|
}
|
|
48
48
|
async function run() {
|
|
49
49
|
}
|
|
@@ -61,8 +61,8 @@ async function check(astroConfig) {
|
|
|
61
61
|
switch (d.severity) {
|
|
62
62
|
case DiagnosticSeverity.Error: {
|
|
63
63
|
console.error(`${bold(cyan(path.relative(root.pathname, diag.filePath)))}:${bold(yellow(d.range.start.line))}:${bold(yellow(d.range.start.character))} - ${d.message}`);
|
|
64
|
-
let startOffset = offsetAt({line: d.range.start.line, character: 0}, diag.text);
|
|
65
|
-
let endOffset = offsetAt({line: d.range.start.line + 1, character: 0}, diag.text);
|
|
64
|
+
let startOffset = offsetAt({ line: d.range.start.line, character: 0 }, diag.text);
|
|
65
|
+
let endOffset = offsetAt({ line: d.range.start.line + 1, character: 0 }, diag.text);
|
|
66
66
|
let str = diag.text.substring(startOffset, endOffset - 1);
|
|
67
67
|
const lineNumStr = d.range.start.line.toString();
|
|
68
68
|
const lineNumLen = lineNumStr.length;
|
|
@@ -91,4 +91,4 @@ export {
|
|
|
91
91
|
check,
|
|
92
92
|
run
|
|
93
93
|
};
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
94
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NsaS9jaGVjay50cyJdLAogICJtYXBwaW5ncyI6ICJBQUNBO0FBR0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUVBLGdDQUFnQyxjQUFtQixtQkFBNkIsU0FBcUI7QUFDbkcsUUFBTSxRQUFRLE1BQU0sS0FBSyxjQUFjO0FBQUEsSUFDckMsS0FBSyxhQUFhO0FBQUEsSUFDbEIsUUFBUSxDQUFDLG1CQUFtQixPQUFPLGtCQUFrQixJQUFJLENBQUMsV0FBVyxHQUFHO0FBQUE7QUFFMUUsUUFBTSxlQUFlLE1BQU0sSUFBSSxDQUFDLE1BQU0sS0FBSyxRQUFRLGFBQWEsVUFBVTtBQUUxRSxhQUFXLGVBQWUsY0FBYztBQUN0QyxVQUFNLE9BQU8sR0FBRyxhQUFhLGFBQWE7QUFDMUMsWUFBUSxlQUFlO0FBQUEsTUFDckIsS0FBSyxjQUFjLGFBQWE7QUFBQSxNQUNoQztBQUFBO0FBQUE7QUFBQTtBQVVOLGtCQUFrQixFQUFFLE1BQU0sYUFBa0QsTUFBYztBQUN4RixNQUFJLElBQUk7QUFDUixNQUFJLElBQUk7QUFDUixNQUFJLElBQUk7QUFDUixTQUFPLElBQUksS0FBSyxRQUFRO0FBQ3RCLFFBQUksTUFBTSxRQUFRLE1BQU0sV0FBVztBQUNqQztBQUFBO0FBR0YsUUFBSSxPQUFPLEtBQUs7QUFDaEIsWUFBUTtBQUFBLFdBQ0QsTUFBTTtBQUNUO0FBQ0EsWUFBSTtBQUNKO0FBQUE7QUFBQSxlQUVPO0FBQ1A7QUFDQTtBQUFBO0FBQUE7QUFJSjtBQUFBO0FBR0YsU0FBTztBQUFBO0FBR1QsYUFBYSxLQUFhLEtBQWE7QUFDckMsU0FBTyxNQUFNLEtBQUssRUFBRSxRQUFRLE9BQU8sTUFBTSxLQUFLLEtBQUs7QUFBQTtBQUdyRCxxQkFBNEI7QUFBQTtBQUU1QixxQkFBNEIsYUFBMEI7QUFDcEQsUUFBTSxPQUFPLFlBQVk7QUFDekIsTUFBSSxVQUFVLElBQUksV0FBVyxLQUFLO0FBQ2xDLFFBQU0saUJBQWlCLE1BQU0sSUFBSTtBQUVqQyxNQUFJLGNBQWMsTUFBTSxRQUFRO0FBRWhDLE1BQUksU0FBaUI7QUFBQSxJQUNuQixRQUFRO0FBQUEsSUFDUixVQUFVO0FBQUE7QUFHWixjQUFZLFFBQVEsQ0FBQyxTQUFTO0FBQzVCLFNBQUssWUFBWSxRQUFRLENBQUMsTUFBTTtBQUM5QixjQUFRLEVBQUU7QUFBQSxhQUNILG1CQUFtQixPQUFPO0FBQzdCLGtCQUFRLE1BQU0sR0FBRyxLQUFLLEtBQUssS0FBSyxTQUFTLEtBQUssVUFBVSxLQUFLLGVBQWUsS0FBSyxPQUFPLEVBQUUsTUFBTSxNQUFNLFVBQVUsS0FBSyxPQUFPLEVBQUUsTUFBTSxNQUFNLGlCQUFpQixFQUFFO0FBQzdKLGNBQUksY0FBYyxTQUFTLEVBQUUsTUFBTSxFQUFFLE1BQU0sTUFBTSxNQUFNLFdBQVcsS0FBSyxLQUFLO0FBQzVFLGNBQUksWUFBWSxTQUFTLEVBQUUsTUFBTSxFQUFFLE1BQU0sTUFBTSxPQUFPLEdBQUcsV0FBVyxLQUFLLEtBQUs7QUFDOUUsY0FBSSxNQUFNLEtBQUssS0FBSyxVQUFVLGFBQWEsWUFBWTtBQUN2RCxnQkFBTSxhQUFhLEVBQUUsTUFBTSxNQUFNLEtBQUs7QUFDdEMsZ0JBQU0sYUFBYSxXQUFXO0FBQzlCLGtCQUFRLE1BQU0sR0FBRyxRQUFRLE1BQU0saUJBQWlCO0FBQ2hELGNBQUksU0FBUyxJQUFJLEtBQUssRUFBRSxNQUFNLElBQUksWUFBWSxFQUFFLE1BQU0sTUFBTTtBQUM1RCxjQUFJLFNBQVMsSUFBSSxLQUFLLEVBQUUsTUFBTSxNQUFNLFlBQVksYUFBYTtBQUM3RCxrQkFBUSxNQUFNLE1BQU0sU0FBUyxLQUFLLElBQUk7QUFBQTtBQUN0QyxpQkFBTztBQUNQO0FBQUE7QUFBQSxhQUVHLG1CQUFtQixTQUFTO0FBQy9CLGlCQUFPO0FBQ1A7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQU1SLE1BQUksT0FBTyxRQUFRO0FBQ2pCLFlBQVEsTUFBTSxTQUFTLE9BQU87QUFBQTtBQUdoQyxRQUFNLFdBQVcsT0FBTyxTQUFTLElBQUk7QUFDckMsU0FBTztBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
|
package/dist/cli/index.js
CHANGED
|
@@ -2,7 +2,7 @@ var __defProp = Object.defineProperty;
|
|
|
2
2
|
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
3
3
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
4
4
|
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
5
|
-
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {enumerable: true, configurable: true, writable: true, value}) : obj[key] = value;
|
|
5
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
6
6
|
var __spreadValues = (a, b) => {
|
|
7
7
|
for (var prop in b || (b = {}))
|
|
8
8
|
if (__hasOwnProp.call(b, prop))
|
|
@@ -17,13 +17,13 @@ var __spreadValues = (a, b) => {
|
|
|
17
17
|
import * as colors from "kleur/colors";
|
|
18
18
|
import fs from "fs";
|
|
19
19
|
import yargs from "yargs-parser";
|
|
20
|
-
import {z} from "zod";
|
|
21
|
-
import {defaultLogDestination} from "../core/logger.js";
|
|
20
|
+
import { z } from "zod";
|
|
21
|
+
import { defaultLogDestination } from "../core/logger.js";
|
|
22
22
|
import build from "../core/build/index.js";
|
|
23
23
|
import devServer from "../core/dev/index.js";
|
|
24
24
|
import preview from "../core/preview/index.js";
|
|
25
|
-
import {check} from "./check.js";
|
|
26
|
-
import {formatConfigError, loadConfig} from "../core/config.js";
|
|
25
|
+
import { check } from "./check.js";
|
|
26
|
+
import { formatConfigError, loadConfig } from "../core/config.js";
|
|
27
27
|
function resolveArgs(flags) {
|
|
28
28
|
const options = {
|
|
29
29
|
projectRoot: typeof flags.projectRoot === "string" ? flags.projectRoot : void 0,
|
|
@@ -33,22 +33,22 @@ function resolveArgs(flags) {
|
|
|
33
33
|
config: typeof flags.config === "string" ? flags.config : void 0
|
|
34
34
|
};
|
|
35
35
|
if (flags.version) {
|
|
36
|
-
return {cmd: "version", options};
|
|
36
|
+
return { cmd: "version", options };
|
|
37
37
|
} else if (flags.help) {
|
|
38
|
-
return {cmd: "help", options};
|
|
38
|
+
return { cmd: "help", options };
|
|
39
39
|
}
|
|
40
40
|
const cmd = flags._[2];
|
|
41
41
|
switch (cmd) {
|
|
42
42
|
case "dev":
|
|
43
|
-
return {cmd: "dev", options};
|
|
43
|
+
return { cmd: "dev", options };
|
|
44
44
|
case "build":
|
|
45
|
-
return {cmd: "build", options};
|
|
45
|
+
return { cmd: "build", options };
|
|
46
46
|
case "preview":
|
|
47
|
-
return {cmd: "preview", options};
|
|
47
|
+
return { cmd: "preview", options };
|
|
48
48
|
case "check":
|
|
49
|
-
return {cmd: "check", options};
|
|
49
|
+
return { cmd: "check", options };
|
|
50
50
|
default:
|
|
51
|
-
return {cmd: "help", options};
|
|
51
|
+
return { cmd: "help", options };
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
function printHelp() {
|
|
@@ -98,7 +98,7 @@ async function cli(args) {
|
|
|
98
98
|
logging.level = "silent";
|
|
99
99
|
let config;
|
|
100
100
|
try {
|
|
101
|
-
config = await loadConfig({cwd: projectRoot, filename: options.config});
|
|
101
|
+
config = await loadConfig({ cwd: projectRoot, filename: options.config });
|
|
102
102
|
mergeCLIFlags(config, options);
|
|
103
103
|
} catch (err) {
|
|
104
104
|
if (err instanceof z.ZodError) {
|
|
@@ -121,7 +121,7 @@ async function cli(args) {
|
|
|
121
121
|
}
|
|
122
122
|
case "dev": {
|
|
123
123
|
try {
|
|
124
|
-
const server = await devServer(config, {logging});
|
|
124
|
+
const server = await devServer(config, { logging });
|
|
125
125
|
await new Promise(() => {
|
|
126
126
|
});
|
|
127
127
|
} catch (err) {
|
|
@@ -131,7 +131,7 @@ async function cli(args) {
|
|
|
131
131
|
}
|
|
132
132
|
case "build": {
|
|
133
133
|
try {
|
|
134
|
-
await build(config, {logging});
|
|
134
|
+
await build(config, { logging });
|
|
135
135
|
process.exit(0);
|
|
136
136
|
} catch (err) {
|
|
137
137
|
throwAndExit(err);
|
|
@@ -145,7 +145,7 @@ async function cli(args) {
|
|
|
145
145
|
}
|
|
146
146
|
case "preview": {
|
|
147
147
|
try {
|
|
148
|
-
await preview(config, {logging});
|
|
148
|
+
await preview(config, { logging });
|
|
149
149
|
} catch (err) {
|
|
150
150
|
throwAndExit(err);
|
|
151
151
|
}
|
|
@@ -163,4 +163,4 @@ function throwAndExit(err) {
|
|
|
163
163
|
export {
|
|
164
164
|
cli
|
|
165
165
|
};
|
|
166
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
166
|
+
//# sourceMappingURL=data:application/json;base64,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
|
package/dist/core/build/index.js
CHANGED
|
@@ -1,18 +1,18 @@
|
|
|
1
|
-
import {rollupPluginAstroBuildHTML} from "../../vite-plugin-build-html/index.js";
|
|
2
|
-
import {rollupPluginAstroBuildCSS} from "../../vite-plugin-build-css/index.js";
|
|
1
|
+
import { rollupPluginAstroBuildHTML } from "../../vite-plugin-build-html/index.js";
|
|
2
|
+
import { rollupPluginAstroBuildCSS } from "../../vite-plugin-build-css/index.js";
|
|
3
3
|
import fs from "fs";
|
|
4
4
|
import * as colors from "kleur/colors";
|
|
5
|
-
import {performance} from "perf_hooks";
|
|
5
|
+
import { performance } from "perf_hooks";
|
|
6
6
|
import vite from "../vite.js";
|
|
7
|
-
import {fileURLToPath} from "url";
|
|
8
|
-
import {createVite} from "../create-vite.js";
|
|
9
|
-
import {debug, defaultLogOptions, info, levels, timerMessage, warn} from "../logger.js";
|
|
10
|
-
import {preload as ssrPreload} from "../ssr/index.js";
|
|
11
|
-
import {generatePaginateFunction} from "../ssr/paginate.js";
|
|
12
|
-
import {createRouteManifest, validateGetStaticPathsModule, validateGetStaticPathsResult} from "../ssr/routing.js";
|
|
13
|
-
import {generateRssFunction} from "../ssr/rss.js";
|
|
14
|
-
import {generateSitemap} from "../ssr/sitemap.js";
|
|
15
|
-
async function build(config, options = {logging: defaultLogOptions}) {
|
|
7
|
+
import { fileURLToPath } from "url";
|
|
8
|
+
import { createVite } from "../create-vite.js";
|
|
9
|
+
import { debug, defaultLogOptions, info, levels, timerMessage, warn } from "../logger.js";
|
|
10
|
+
import { preload as ssrPreload } from "../ssr/index.js";
|
|
11
|
+
import { generatePaginateFunction } from "../ssr/paginate.js";
|
|
12
|
+
import { createRouteManifest, validateGetStaticPathsModule, validateGetStaticPathsResult } from "../ssr/routing.js";
|
|
13
|
+
import { generateRssFunction } from "../ssr/rss.js";
|
|
14
|
+
import { generateSitemap } from "../ssr/sitemap.js";
|
|
15
|
+
async function build(config, options = { logging: defaultLogOptions }) {
|
|
16
16
|
const builder = new AstroBuilder(config, options);
|
|
17
17
|
await builder.build();
|
|
18
18
|
}
|
|
@@ -29,20 +29,20 @@ class AstroBuilder {
|
|
|
29
29
|
const port = config.devOptions.port;
|
|
30
30
|
this.logging = options.logging;
|
|
31
31
|
this.origin = config.buildOptions.site ? new URL(config.buildOptions.site).origin : `http://localhost:${port}`;
|
|
32
|
-
this.manifest = createRouteManifest({config});
|
|
32
|
+
this.manifest = createRouteManifest({ config });
|
|
33
33
|
}
|
|
34
34
|
async build() {
|
|
35
|
-
const {logging, origin} = this;
|
|
35
|
+
const { logging, origin } = this;
|
|
36
36
|
const timer = {};
|
|
37
37
|
timer.init = performance.now();
|
|
38
38
|
timer.viteStart = performance.now();
|
|
39
39
|
const viteConfig = await createVite(vite.mergeConfig({
|
|
40
40
|
mode: this.mode,
|
|
41
41
|
server: {
|
|
42
|
-
hmr: {overlay: false},
|
|
42
|
+
hmr: { overlay: false },
|
|
43
43
|
middlewareMode: "ssr"
|
|
44
44
|
}
|
|
45
|
-
}, this.config.vite || {}), {astroConfig: this.config, logging});
|
|
45
|
+
}, this.config.vite || {}), { astroConfig: this.config, logging });
|
|
46
46
|
const viteServer = await vite.createServer(viteConfig);
|
|
47
47
|
this.viteServer = viteServer;
|
|
48
48
|
debug(logging, "build", timerMessage("Vite started", timer.viteStart));
|
|
@@ -70,7 +70,7 @@ class AstroBuilder {
|
|
|
70
70
|
debug(logging, "build", `\u251C\u2500\u2500 ${colors.bold(colors.green("\u2714"))} ${route.component} \u2192 ${colors.yellow(html)}`);
|
|
71
71
|
return routes;
|
|
72
72
|
}).catch((err) => {
|
|
73
|
-
debug(logging, "build", `\u251C\u2500\u2500 ${colors.bold(colors.red("
|
|
73
|
+
debug(logging, "build", `\u251C\u2500\u2500 ${colors.bold(colors.red("\u2718"))} ${route.component}`);
|
|
74
74
|
throw err;
|
|
75
75
|
})
|
|
76
76
|
};
|
|
@@ -124,7 +124,7 @@ Use \`rss(data, {url: '...'})\` to choose a unique, custom URL. (${route.compone
|
|
|
124
124
|
outDir: fileURLToPath(this.config.dist),
|
|
125
125
|
rollupOptions: {
|
|
126
126
|
input: [],
|
|
127
|
-
output: {format: "esm"}
|
|
127
|
+
output: { format: "esm" }
|
|
128
128
|
},
|
|
129
129
|
target: "es2020"
|
|
130
130
|
},
|
|
@@ -161,7 +161,7 @@ Use \`rss(data, {url: '...'})\` to choose a unique, custom URL. (${route.compone
|
|
|
161
161
|
if (!assets[k])
|
|
162
162
|
return;
|
|
163
163
|
const filePath = new URL(`file://${k}`);
|
|
164
|
-
fs.mkdirSync(new URL("./", filePath), {recursive: true});
|
|
164
|
+
fs.mkdirSync(new URL("./", filePath), { recursive: true });
|
|
165
165
|
fs.writeFileSync(filePath, assets[k], "utf8");
|
|
166
166
|
delete assets[k];
|
|
167
167
|
});
|
|
@@ -170,13 +170,13 @@ Use \`rss(data, {url: '...'})\` to choose a unique, custom URL. (${route.compone
|
|
|
170
170
|
if (this.config.buildOptions.sitemap && this.config.buildOptions.site) {
|
|
171
171
|
const sitemap = generateSitemap(pageNames.map((pageName) => new URL(`/${pageName}`, this.config.buildOptions.site).href));
|
|
172
172
|
const sitemapPath = new URL("./sitemap.xml", this.config.dist);
|
|
173
|
-
await fs.promises.mkdir(new URL("./", sitemapPath), {recursive: true});
|
|
173
|
+
await fs.promises.mkdir(new URL("./", sitemapPath), { recursive: true });
|
|
174
174
|
await fs.promises.writeFile(sitemapPath, sitemap, "utf8");
|
|
175
175
|
}
|
|
176
176
|
debug(logging, "build", timerMessage("Sitemap built", timer.sitemapStart));
|
|
177
177
|
await viteServer.close();
|
|
178
178
|
if (logging.level && levels[logging.level] <= levels["info"]) {
|
|
179
|
-
await this.printStats({logging, timeStart: timer.init, pageCount: pageNames.length});
|
|
179
|
+
await this.printStats({ logging, timeStart: timer.init, pageCount: pageNames.length });
|
|
180
180
|
}
|
|
181
181
|
}
|
|
182
182
|
async getStaticPathsForRoute(route) {
|
|
@@ -186,7 +186,7 @@ Use \`rss(data, {url: '...'})\` to choose a unique, custom URL. (${route.compone
|
|
|
186
186
|
const mod = await this.viteServer.ssrLoadModule(fileURLToPath(filePath));
|
|
187
187
|
validateGetStaticPathsModule(mod);
|
|
188
188
|
const rss = generateRssFunction(this.config.buildOptions.site, route);
|
|
189
|
-
const staticPaths = (await mod.getStaticPaths({paginate: generatePaginateFunction(route), rss: rss.generator})).flat();
|
|
189
|
+
const staticPaths = (await mod.getStaticPaths({ paginate: generatePaginateFunction(route), rss: rss.generator })).flat();
|
|
190
190
|
this.routeCache[route.component] = staticPaths;
|
|
191
191
|
validateGetStaticPathsResult(staticPaths, this.logging);
|
|
192
192
|
return {
|
|
@@ -194,7 +194,7 @@ Use \`rss(data, {url: '...'})\` to choose a unique, custom URL. (${route.compone
|
|
|
194
194
|
rss: rss.rss
|
|
195
195
|
};
|
|
196
196
|
}
|
|
197
|
-
async printStats({logging, timeStart, pageCount}) {
|
|
197
|
+
async printStats({ logging, timeStart, pageCount }) {
|
|
198
198
|
debug(logging, "");
|
|
199
199
|
const buildTime = performance.now() - timeStart;
|
|
200
200
|
const total = buildTime < 750 ? `${Math.round(buildTime)}ms` : `${(buildTime / 1e3).toFixed(2)}s`;
|
|
@@ -206,4 +206,4 @@ Use \`rss(data, {url: '...'})\` to choose a unique, custom URL. (${route.compone
|
|
|
206
206
|
export {
|
|
207
207
|
build as default
|
|
208
208
|
};
|
|
209
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
209
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NvcmUvYnVpbGQvaW5kZXgudHMiXSwKICAibWFwcGluZ3MiOiAiQUFLQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBUUEscUJBQW9DLFFBQXFCLFVBQXdCLEVBQUUsU0FBUyxxQkFBb0M7QUFDOUgsUUFBTSxVQUFVLElBQUksYUFBYSxRQUFRO0FBQ3pDLFFBQU0sUUFBUTtBQUFBO0FBR2hCLG1CQUFtQjtBQUFBLEVBU2pCLFlBQVksUUFBcUIsU0FBdUI7QUFOaEQsZ0JBQU87QUFFUCxzQkFBeUI7QUFLL0IsUUFBSSxDQUFDLE9BQU8sYUFBYSxRQUFRLE9BQU8sYUFBYSxZQUFZLE9BQU87QUFDdEUsV0FBSyxRQUFRLFNBQVMsVUFBVTtBQUFBO0FBR2xDLFFBQUksUUFBUTtBQUFNLFdBQUssT0FBTyxRQUFRO0FBQ3RDLFNBQUssU0FBUztBQUNkLFVBQU0sT0FBTyxPQUFPLFdBQVc7QUFDL0IsU0FBSyxVQUFVLFFBQVE7QUFDdkIsU0FBSyxTQUFTLE9BQU8sYUFBYSxPQUFPLElBQUksSUFBSSxPQUFPLGFBQWEsTUFBTSxTQUFTLG9CQUFvQjtBQUN4RyxTQUFLLFdBQVcsb0JBQW9CLEVBQUU7QUFBQTtBQUFBLFFBR2xDLFFBQVE7QUFDWixVQUFNLEVBQUUsU0FBUyxXQUFXO0FBQzVCLFVBQU0sUUFBZ0M7QUFDdEMsVUFBTSxPQUFPLFlBQVk7QUFDekIsVUFBTSxZQUFZLFlBQVk7QUFDOUIsVUFBTSxhQUFhLE1BQU0sV0FDdkIsS0FBSyxZQUNIO0FBQUEsTUFDRSxNQUFNLEtBQUs7QUFBQSxNQUNYLFFBQVE7QUFBQSxRQUNOLEtBQUssRUFBRSxTQUFTO0FBQUEsUUFDaEIsZ0JBQWdCO0FBQUE7QUFBQSxPQUdwQixLQUFLLE9BQU8sUUFBUSxLQUV0QixFQUFFLGFBQWEsS0FBSyxRQUFRO0FBRTlCLFVBQU0sYUFBYSxNQUFNLEtBQUssYUFBYTtBQUMz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LE1BQU07QUFDbkgsWUFBTSxjQUFjLElBQUksSUFBSSxpQkFBaUIsS0FBSyxPQUFPO0FBQ3pELFlBQU0sR0FBRyxTQUFTLE1BQU0sSUFBSSxJQUFJLE1BQU0sY0FBYyxFQUFFLFdBQVc7QUFDakUsWUFBTSxHQUFHLFNBQVMsVUFBVSxhQUFhLFNBQVM7QUFBQTtBQUVwRCxVQUFNLFNBQVMsU0FBUyxhQUFhLGlCQUFpQixNQUFNO0FBRzVELFVBQU0sV0FBVztBQUNqQixRQUFJLFFBQVEsU0FBUyxPQUFPLFFBQVEsVUFBVSxPQUFPLFNBQVM7QUFDNUQsWUFBTSxLQUFLLFdBQVcsRUFBRSxTQUFTLFdBQVcsTUFBTSxNQUFNLFdBQVcsVUFBVTtBQUFBO0FBQUE7QUFBQSxRQUtuRSx1QkFBdUIsT0FBaUU7QUFDcEcsUUFBSSxDQUFDLEtBQUs7QUFBWSxZQUFNLElBQUksTUFBTTtBQUN0QyxVQUFNLFdBQVcsSUFBSSxJQUFJLEtBQUssTUFBTSxhQUFhLEtBQUssT0FBTztBQUM3RCxVQUFNLE1BQU8sTUFBTSxLQUFLLFdBQVcsY0FBYyxjQUFjO0FBQy9ELGlDQUE2QjtBQUM3QixVQUFNLE1BQU0sb0JBQW9CLEtBQUssT0FBTyxhQUFhLE1BQU07QUFDL0QsVUFBTSxjQUFxQyxPQUFNLElBQUksZUFBZ0IsRUFBRSxVQUFVLHlCQUF5QixRQUFRLEtBQUssSUFBSSxjQUFjO0FBQ3pJLFNBQUssV0FBVyxNQUFNLGFBQWE7QUFDbkMsaUNBQTZCLGFBQWEsS0FBSztBQUMvQyxXQUFPO0FBQUEsTUFDTCxPQUFPLFlBQVksSUFBSSxDQUFDLGVBQWUsV0FBVyxVQUFVLE1BQU0sU0FBUyxXQUFXLFNBQVMsT0FBTztBQUFBLE1BQ3RHLEtBQUssSUFBSTtBQUFBO0FBQUE7QUFBQSxRQUtDLFdBQVcsRUFBRSxTQUFTLFdBQVcsYUFBNEU7QUFFekgsVUFBTSxTQUFTO0FBQ2YsVUFBTSxZQUFZLFlBQVksUUFBUTtBQUN0QyxVQUFNLFFBQVEsWUFBWSxNQUFNLEdBQUcsS0FBSyxNQUFNLGlCQUFpQixHQUFJLGFBQVksS0FBTSxRQUFRO0FBQzdGLFVBQU0sVUFBVSxHQUFHLEtBQUssTUFBTSxZQUFZO0FBQzFDLFNBQUssU0FBUyxTQUFTLEdBQUcsNEJBQTRCLE9BQU8sS0FBSyxVQUFVLE9BQU8sSUFBSSxJQUFJO0FBQzNGLFNBQUssU0FBUyxTQUFTLGFBQU0sT0FBTyxLQUFLLE9BQU8sS0FBSztBQUFBO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
package/dist/core/config.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as colors from "kleur/colors";
|
|
2
2
|
import path from "path";
|
|
3
|
-
import {pathToFileURL, fileURLToPath} from "url";
|
|
4
|
-
import {z} from "zod";
|
|
3
|
+
import { pathToFileURL, fileURLToPath } from "url";
|
|
4
|
+
import { z } from "zod";
|
|
5
5
|
import load from "@proload/core";
|
|
6
6
|
import loadTypeScript from "@proload/plugin-tsm";
|
|
7
7
|
load.use([loadTypeScript]);
|
|
@@ -53,7 +53,7 @@ async function loadConfig(options) {
|
|
|
53
53
|
userConfigPath = /^\.*\//.test(options.filename) ? options.filename : `./${options.filename}`;
|
|
54
54
|
userConfigPath = fileURLToPath(new URL(userConfigPath, `file://${root}/`));
|
|
55
55
|
}
|
|
56
|
-
const config = await load("astro", {mustExist: false, cwd: root, filePath: userConfigPath});
|
|
56
|
+
const config = await load("astro", { mustExist: false, cwd: root, filePath: userConfigPath });
|
|
57
57
|
if (config) {
|
|
58
58
|
userConfig = config.value;
|
|
59
59
|
}
|
|
@@ -70,4 +70,4 @@ export {
|
|
|
70
70
|
loadConfig,
|
|
71
71
|
validateConfig
|
|
72
72
|
};
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NvcmUvY29uZmlnLnRzIl0sCiAgIm1hcHBpbmdzIjogIkFBRUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBRUEsS0FBSyxJQUFJLENBQUM7QUFFSCxNQUFNLG9CQUFvQixFQUFFLE9BQU87QUFBQSxFQUN4QyxhQUFhLEVBQ1YsU0FDQSxXQUNBLFFBQVEsS0FDUixVQUFVLENBQUMsUUFBUSxJQUFJLElBQUk7QUFBQSxFQUM5QixLQUFLLEVBQ0YsU0FDQSxXQUNBLFFBQVEsU0FDUixVQUFVLENBQUMsUUFBUSxJQUFJLElBQUk7QUFBQSxFQUM5QixPQUFPLEVBQ0osU0FDQSxXQUNBLFFBQVEsZUFDUixVQUFVLENBQUMsUUFBUSxJQUFJLElBQUk7QUFBQSxFQUM5QixTQUFTLEVBQ04sU0FDQSxXQUNBLFFBQVEsaUJBQ1IsVUFBVSxDQUFDLFFBQVEsSUFBSSxJQUFJO0FBQUEsRUFDOUIsUUFBUSxFQUNMLFNBQ0EsV0FDQSxRQUFRLFlBQ1IsVUFBVSxDQUFDLFFBQVEsSUFBSSxJQUFJO0FBQUEsRUFDOUIsTUFBTSxFQUNILFNBQ0EsV0FDQSxRQUFRLFVBQ1IsVUFBVSxDQUFDLFFBQVEsSUFBSSxJQUFJO0FBQUEsRUFDOUIsV0FBVyxFQUFFLE1BQU0sRUFBRSxVQUFVLFdBQVcsUUFBUSxDQUFDLDRCQUE0Qix5QkFBeUIsMkJBQTJCO0FBQUEsRUFDbkksaUJBQWlCLEVBQ2QsT0FBTztBQUFBLElBQ04sV0FBVyxFQUFFLFVBQVU7QUFBQSxJQUN2QixLQUFLLEVBQUUsVUFBVTtBQUFBLElBQ2pCLFFBQVEsRUFBRSxNQUFNLFdBQVcsUUFBUSxDQUFDLDRCQUE0QjtBQUFBLEtBRWpFLFdBQ0EsUUFBUTtBQUFBLEVBQ1gsY0FBYyxFQUNYLE9BQU87QUFBQSxJQUNOLE1BQU0sRUFBRSxTQUFTO0FBQUEsSUFDakIsU0FBUyxFQUFFLFVBQVUsV0FBVyxRQUFRO0FBQUEsSUFDeEMsZUFBZSxFQUNaLE1BQU0sQ0FBQyxFQUFFLFFBQVEsU0FBUyxFQUFFLFFBQVEsZUFDcEMsV0FDQSxRQUFRO0FBQUEsS0FFWixXQUNBLFFBQVE7QUFBQSxFQUNYLFlBQVksRUFDVCxPQUFPO0FBQUEsSUFDTixVQUFVLEVBQUUsU0FBUyxXQUFXLFFBQVE7QUFBQSxJQUN4QyxNQUFNLEVBQUUsU0FBUyxXQUFXLFFBQVE7QUFBQSxJQUNwQyxlQUFlLEVBQ1osTUFBTSxDQUFDLEVBQUUsUUFBUSxXQUFXLEVBQUUsUUFBUSxVQUFVLEVBQUUsUUFBUSxZQUMxRCxXQUNBLFFBQVE7QUFBQSxLQUVaLFdBQ0EsUUFBUTtBQUFBLEVBQ1gsTUFBTSxFQUFFLE1BQU0sV0FBVyxRQUFRO0FBQUE7QUFJbkMsOEJBQXFDLFlBQWlCLE1BQW9DO0FBQ3hGLFFBQU0sbUJBQW1CLGNBQWMsT0FBTyxLQUFLO0FBR25ELFFBQU0sNEJBQTRCLGtCQUFrQixPQUFPO0FBQUEsSUFDekQsYUFBYSxFQUNWLFNBQ0EsUUFBUSxLQUNSLFVBQVUsQ0FBQyxRQUFRLElBQUksSUFBSSxpQkFBaUIsTUFBTTtBQUFBLElBQ3JELEtBQUssRUFDRixTQUNBLFFBQVEsU0FDUixVQUFVLENBQUMsUUFBUSxJQUFJLElBQUksaUJBQWlCLE1BQU07QUFBQSxJQUNyRCxPQUFPLEVBQ0osU0FDQSxRQUFRLGVBQ1IsVUFBVSxDQUFDLFFBQVEsSUFBSSxJQUFJLGlCQUFpQixNQUFNO0FBQUEsSUFDckQsU0FBUyxFQUNOLFNBQ0EsUUFBUSxpQkFDUixVQUFVLENBQUMsUUFBUSxJQUFJLElBQUksaUJBQWlCLE1BQU07QUFBQSxJQUNyRCxRQUFRLEVBQ0wsU0FDQSxRQUFRLFlBQ1IsVUFBVSxDQUFDLFFBQVEsSUFBSSxJQUFJLGlCQUFpQixNQUFNO0FBQUEsSUFDckQsTUFBTSxFQUNILFNBQ0EsUUFBUSxVQUNSLFVBQVUsQ0FBQyxRQUFRLElBQUksSUFBSSxpQkFBaUIsTUFBTTtBQUFBO0FBRXZELFNBQU8sMEJBQTBCLFdBQVc7QUFBQTtBQUk5QywwQkFBMEIsS0FBcUI7QUFDN0MsU0FBTyxJQUFJLFFBQVEsUUFBUTtBQUFBO0FBUzdCLDBCQUFpQyxTQUFrRDtBQUNqRixRQUFNLE9BQU8sUUFBUSxNQUFNLEtBQUssUUFBUSxRQUFRLE9BQU8sUUFBUTtBQUMvRCxNQUFJLGFBQThCO0FBQ2xDLE1BQUk7QUFFSixNQUFJLFFBQVEsVUFBVTtBQUNwQixxQkFBaUIsU0FBUyxLQUFLLFFBQVEsWUFBWSxRQUFRLFdBQVcsS0FBSyxRQUFRO0FBQ25GLHFCQUFpQixjQUFjLElBQUksSUFBSSxnQkFBZ0IsVUFBVTtBQUFBO0FBSW5FLFFBQU0sU0FBUyxNQUFNLEtBQUssU0FBUyxFQUFFLFdBQVcsT0FBTyxLQUFLLE1BQU0sVUFBVTtBQUM1RSxNQUFJLFFBQVE7QUFDVixpQkFBYSxPQUFPO0FBQUE7QUFHdEIsU0FBTyxlQUFlLFlBQVk7QUFBQTtBQUc3QiwyQkFBMkIsS0FBaUI7QUFDakQsUUFBTSxZQUFZLElBQUksT0FBTyxJQUFJLENBQUMsVUFBVSxPQUFPLE9BQU8sS0FBSyxNQUFNLEtBQUssS0FBSyxVQUFVLE9BQU8sSUFBSSxNQUFNLFVBQVU7QUFDcEgsU0FBTyxHQUFHLE9BQU8sSUFBSTtBQUFBLEVBQThELFVBQVUsS0FBSztBQUFBOyIsCiAgIm5hbWVzIjogW10KfQo=
|
package/dist/core/create-vite.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {builtinModules} from "module";
|
|
2
|
-
import {fileURLToPath} from "url";
|
|
1
|
+
import { builtinModules } from "module";
|
|
2
|
+
import { fileURLToPath } from "url";
|
|
3
3
|
import vite from "./vite.js";
|
|
4
4
|
import astroVitePlugin from "../vite-plugin-astro/index.js";
|
|
5
5
|
import astroPostprocessVitePlugin from "../vite-plugin-astro-postprocess/index.js";
|
|
@@ -7,7 +7,7 @@ import configAliasVitePlugin from "../vite-plugin-config-alias/index.js";
|
|
|
7
7
|
import markdownVitePlugin from "../vite-plugin-markdown/index.js";
|
|
8
8
|
import jsxVitePlugin from "../vite-plugin-jsx/index.js";
|
|
9
9
|
import fetchVitePlugin from "../vite-plugin-fetch/index.js";
|
|
10
|
-
import {resolveDependency} from "./util.js";
|
|
10
|
+
import { resolveDependency } from "./util.js";
|
|
11
11
|
const ALWAYS_EXTERNAL = new Set([
|
|
12
12
|
...builtinModules.map((name) => `node:${name}`),
|
|
13
13
|
"@sveltejs/vite-plugin-svelte",
|
|
@@ -23,7 +23,7 @@ const ALWAYS_EXTERNAL = new Set([
|
|
|
23
23
|
const ALWAYS_NOEXTERNAL = new Set([
|
|
24
24
|
"astro"
|
|
25
25
|
]);
|
|
26
|
-
async function createVite(inlineConfig, {astroConfig, logging, devServer}) {
|
|
26
|
+
async function createVite(inlineConfig, { astroConfig, logging, devServer }) {
|
|
27
27
|
let viteConfig = {
|
|
28
28
|
cacheDir: fileURLToPath(new URL("./node_modules/.vite/", astroConfig.projectRoot)),
|
|
29
29
|
clearScreen: false,
|
|
@@ -32,11 +32,11 @@ async function createVite(inlineConfig, {astroConfig, logging, devServer}) {
|
|
|
32
32
|
entries: ["src/**/*"]
|
|
33
33
|
},
|
|
34
34
|
plugins: [
|
|
35
|
-
configAliasVitePlugin({config: astroConfig}),
|
|
36
|
-
astroVitePlugin({config: astroConfig, devServer}),
|
|
37
|
-
markdownVitePlugin({config: astroConfig, devServer}),
|
|
38
|
-
jsxVitePlugin({config: astroConfig, logging}),
|
|
39
|
-
astroPostprocessVitePlugin({config: astroConfig, devServer}),
|
|
35
|
+
configAliasVitePlugin({ config: astroConfig }),
|
|
36
|
+
astroVitePlugin({ config: astroConfig, devServer }),
|
|
37
|
+
markdownVitePlugin({ config: astroConfig, devServer }),
|
|
38
|
+
jsxVitePlugin({ config: astroConfig, logging }),
|
|
39
|
+
astroPostprocessVitePlugin({ config: astroConfig, devServer }),
|
|
40
40
|
fetchVitePlugin()
|
|
41
41
|
],
|
|
42
42
|
publicDir: fileURLToPath(astroConfig.public),
|
|
@@ -54,14 +54,14 @@ async function createVite(inlineConfig, {astroConfig, logging, devServer}) {
|
|
|
54
54
|
};
|
|
55
55
|
for (const name of astroConfig.renderers) {
|
|
56
56
|
try {
|
|
57
|
-
const {default: renderer} = await import(resolveDependency(name, astroConfig));
|
|
57
|
+
const { default: renderer } = await import(resolveDependency(name, astroConfig));
|
|
58
58
|
if (!renderer)
|
|
59
59
|
continue;
|
|
60
60
|
if (renderer.viteConfig) {
|
|
61
61
|
if (typeof renderer.viteConfig !== "function") {
|
|
62
62
|
throw new Error(`${name}: viteConfig(options) must be a function! Got ${typeof renderer.viteConfig}.`);
|
|
63
63
|
}
|
|
64
|
-
const rendererConfig = await renderer.viteConfig({mode: inlineConfig.mode, command: inlineConfig.mode === "production" ? "build" : "serve"});
|
|
64
|
+
const rendererConfig = await renderer.viteConfig({ mode: inlineConfig.mode, command: inlineConfig.mode === "production" ? "build" : "serve" });
|
|
65
65
|
viteConfig = vite.mergeConfig(viteConfig, rendererConfig);
|
|
66
66
|
}
|
|
67
67
|
} catch (err) {
|
|
@@ -75,4 +75,4 @@ async function createVite(inlineConfig, {astroConfig, logging, devServer}) {
|
|
|
75
75
|
export {
|
|
76
76
|
createVite
|
|
77
77
|
};
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2NvcmUvY3JlYXRlLXZpdGUudHMiXSwKICAibWFwcGluZ3MiOiAiQUFJQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUdBLE1BQU0sa0JBQWtCLElBQUksSUFBSTtBQUFBLEVBQzlCLEdBQUcsZUFBZSxJQUFJLENBQUMsU0FBUyxRQUFRO0FBQUEsRUFDeEM7QUFBQSxFQUNBO0FBQUEsRUFDQTtBQUFBLEVBQ0E7QUFBQSxFQUNBO0FBQUEsRUFDQTtBQUFBLEVBQ0E7QUFBQSxFQUNBO0FBQUEsRUFDQTtBQUFBO0FBRUYsTUFBTSxvQkFBb0IsSUFBSSxJQUFJO0FBQUEsRUFDaEM7QUFBQTtBQWFGLDBCQUFpQyxjQUFpQyxFQUFFLGFBQWEsU0FBUyxhQUE0RDtBQUVwSixNQUFJLGFBQWdDO0FBQUEsSUFDbEMsVUFBVSxjQUFjLElBQUksSUFBSSx5QkFBeUIsWUFBWTtBQUFBLElBQ3JFLGFBQWE7QUFBQSxJQUNiLFVBQVU7QUFBQSxJQUNWLGNBQWM7QUFBQSxNQUNaLFNBQVMsQ0FBQztBQUFBO0FBQUEsSUFFWixTQUFTO0FBQUEsTUFDUCxzQkFBc0IsRUFBRSxRQUFRO0FBQUEsTUFDaEMsZ0JBQWdCLEVBQUUsUUFBUSxhQUFhO0FBQUEsTUFDdkMsbUJBQW1CLEVBQUUsUUFBUSxhQUFhO0FBQUEsTUFDMUMsY0FBYyxFQUFFLFFBQVEsYUFBYTtBQUFBLE1BQ3JDLDJCQUEyQixFQUFFLFFBQVEsYUFBYTtBQUFBLE1BQ2xEO0FBQUE7QUFBQSxJQUVGLFdBQVcsY0FBYyxZQUFZO0FBQUEsSUFDckMsTUFBTSxjQUFjLFlBQVk7QUFBQSxJQUNoQyxXQUFXO0FBQUEsSUFDWCxRQUFRO0FBQUEsTUFDTixPQUFPO0FBQUEsTUFDUCxLQUFLLFFBQVEsSUFBSSxhQUFhLFVBQVUsUUFBUSxJQUFJLGFBQWEsZUFBZSxRQUFRO0FBQUEsTUFFeEYsT0FBTztBQUFBO0FBQUEsSUFLVCxLQUFLO0FBQUEsTUFDSCxVQUFVLENBQUMsR0FBRztBQUFBLE1BQ2QsWUFBWSxDQUFDLEdBQUc7QUFBQTtBQUFBO0FBS3BCLGFBQVcsUUFBUSxZQUFZLFdBQVc7QUFDeEMsUUFBSTtBQUNGLFlBQU0sRUFBRSxTQUFTLGFBQWEsTUFBTSxPQUFPLGtCQUFrQixNQUFNO0FBQ25FLFVBQUksQ0FBQztBQUFVO0FBRWYsVUFBSSxTQUFTLFlBQVk7QUFDdkIsWUFBSSxPQUFPLFNBQVMsZUFBZSxZQUFZO0FBQzdDLGdCQUFNLElBQUksTUFBTSxHQUFHLHFEQUFxRCxPQUFPLFNBQVM7QUFBQTtBQUUxRixjQUFNLGlCQUFpQixNQUFNLFNBQVMsV0FBVyxFQUFFLE1BQU0sYUFBYSxNQUFNLFNBQVMsYUFBYSxTQUFTLGVBQWUsVUFBVTtBQUNwSSxxQkFBYSxLQUFLLFlBQVksWUFBWTtBQUFBO0FBQUEsYUFFckMsS0FBUDtBQUNBLFlBQU0sSUFBSSxNQUFNLEdBQUcsU0FBUztBQUFBO0FBQUE7QUFLaEMsZUFBYSxLQUFLLFlBQVksWUFBWSxZQUFZLFFBQVE7QUFDOUQsZUFBYSxLQUFLLFlBQVksWUFBWTtBQUMxQyxTQUFPO0FBQUE7IiwKICAibmFtZXMiOiBbXQp9Cg==
|