michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: get build running

Browse source
This commit is contained in:
Nate Moore 2021-12-23 15:37:18 -06:00
parent 12bbe4730e
commit cd365d2a08
3 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/astro/package.json
View file

@ -94,7 +94,7 @@
"prismjs": "^1.25.0", "prismjs": "^1.25.0",
"rehype-slug": "^5.0.0", "rehype-slug": "^5.0.0",
"resolve": "^1.20.0", "resolve": "^1.20.0",
"rollup": "^2.59.0", "rollup": "~2.59.0",
"sass": "^1.43.4", "sass": "^1.43.4",
"semver": "^7.3.5", "semver": "^7.3.5",
"send": "^0.17.1", "send": "^0.17.1",

20
packages/astro/src/vite-plugin-astro/compile.ts
View file

@ -12,21 +12,7 @@ type CompilationCache = Map<string, TransformResult>;
const configCache = new WeakMap<AstroConfig, CompilationCache>(); const configCache = new WeakMap<AstroConfig, CompilationCache>();
// https://github.com/vitejs/vite/discussions/5109#discussioncomment-1450726 async function compile(config: AstroConfig, filename: string, source: string, viteTransform: TransformHook, opts?: { ssr?: boolean }) {
function isSSR(options: undefined | boolean | { ssr: boolean }): boolean {
if (options === undefined) {
return false;
}
if (typeof options === 'boolean') {
return options;
}
if (typeof options == 'object') {
return !!options.ssr;
}
return false;
}
async function compile(config: AstroConfig, filename: string, source: string, viteTransform: TransformHook, opts: boolean | undefined) {
// pages and layouts should be transformed as full documents (implicit <head> <body> etc) // pages and layouts should be transformed as full documents (implicit <head> <body> etc)
// everything else is treated as a fragment // everything else is treated as a fragment
const filenameURL = new URL(`file://${filename}`); const filenameURL = new URL(`file://${filename}`);
@ -57,7 +43,7 @@ async function compile(config: AstroConfig, filename: string, source: string, vi
lang, lang,
id: filename, id: filename,
transformHook: viteTransform, transformHook: viteTransform,
ssr: isSSR(opts), ssr: Boolean(opts?.ssr),
}); });
let map: SourceMapInput | undefined; let map: SourceMapInput | undefined;
@ -91,7 +77,7 @@ export function invalidateCompilation(config: AstroConfig, filename: string) {
} }
} }
export async function cachedCompilation(config: AstroConfig, filename: string, source: string | null, viteTransform: TransformHook, opts: boolean | undefined) { export async function cachedCompilation(config: AstroConfig, filename: string, source: string | null, viteTransform: TransformHook, opts?: { ssr?: boolean; }) {
let cache: CompilationCache; let cache: CompilationCache;
if (!configCache.has(config)) { if (!configCache.has(config)) {
cache = new Map(); cache = new Map();

7
yarn.lock
View file

@ -8087,6 +8087,13 @@ rollup@^2.43.1, rollup@^2.59.0, rollup@^2.60.0:
optionalDependencies: optionalDependencies:
fsevents "~2.3.2" fsevents "~2.3.2"
rollup@~2.59.0:
version "2.59.0"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.59.0.tgz#108c61b0fa0a37ebc8d1f164f281622056f0db59"
integrity sha512-l7s90JQhCQ6JyZjKgo7Lq1dKh2RxatOM+Jr6a9F7WbS9WgKbocyUSeLmZl8evAse7y96Ae98L2k1cBOwWD8nHw==
optionalDependencies:
fsevents "~2.3.2"
run-parallel@^1.1.9: run-parallel@^1.1.9:
version "1.2.0" version "1.2.0"
resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"