diff options
Diffstat (limited to 'packages/astro/src')
| -rw-r--r-- | packages/astro/src/core/config/vite-load.ts | 21 | ||||
| -rw-r--r-- | packages/astro/src/core/create-vite.ts | 2 | ||||
| -rw-r--r-- | packages/astro/src/vite-plugin-load-fallback/index.ts | 30 |
3 files changed, 34 insertions, 19 deletions
diff --git a/packages/astro/src/core/config/vite-load.ts b/packages/astro/src/core/config/vite-load.ts index 7946015a5..a864c784f 100644 --- a/packages/astro/src/core/config/vite-load.ts +++ b/packages/astro/src/core/config/vite-load.ts @@ -3,6 +3,7 @@ import npath from 'path'; import { pathToFileURL } from 'url'; import * as vite from 'vite'; import { AstroError, AstroErrorData } from '../errors/index.js'; +import loadFallbackPlugin from '../../vite-plugin-load-fallback/index.js'; // Fallback for legacy import load from '@proload/core'; @@ -15,7 +16,7 @@ export interface ViteLoader { viteServer: vite.ViteDevServer; } -async function createViteLoader(root: string): Promise<ViteLoader> { +async function createViteLoader(root: string, fs: typeof fsType): Promise<ViteLoader> { const viteServer = await vite.createServer({ server: { middlewareMode: true, hmr: false }, optimizeDeps: { entries: [] }, @@ -27,6 +28,7 @@ async function createViteLoader(root: string): Promise<ViteLoader> { // avoid `vite.createServer` and use `loadConfigFromFile` instead. external: ['@astrojs/tailwind', '@astrojs/mdx', '@astrojs/react'], }, + plugins: [ loadFallbackPlugin({ fs, root: pathToFileURL(root) })] }); return { @@ -103,17 +105,22 @@ export async function loadConfigWithVite({ // Try loading with Node import() if (/\.[cm]?js$/.test(file)) { - const config = await import(pathToFileURL(file).toString()); - return { - value: config.default ?? {}, - filePath: file, - }; + try { + const config = await import(pathToFileURL(file).toString()); + return { + value: config.default ?? {}, + filePath: file, + }; + } catch { + // We do not need to keep the error here because with fallback the error will be rethrown + // when/if it fails in Proload. + } } // Try Loading with Vite let loader: ViteLoader | undefined; try { - loader = await createViteLoader(root); + loader = await createViteLoader(root, fs); const mod = await loader.viteServer.ssrLoadModule(file); return { value: mod.default ?? {}, diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts index e725451d9..0b075e21a 100644 --- a/packages/astro/src/core/create-vite.ts +++ b/packages/astro/src/core/create-vite.ts @@ -97,7 +97,7 @@ export async function createVite( }, plugins: [ configAliasVitePlugin({ settings }), - astroLoadFallbackPlugin({ fs, settings }), + astroLoadFallbackPlugin({ fs, root: settings.config.root }), astroVitePlugin({ settings, logging }), astroScriptsPlugin({ settings }), // The server plugin is for dev only and having it run during the build causes diff --git a/packages/astro/src/vite-plugin-load-fallback/index.ts b/packages/astro/src/vite-plugin-load-fallback/index.ts index eaff71bfc..6a37af223 100644 --- a/packages/astro/src/vite-plugin-load-fallback/index.ts +++ b/packages/astro/src/vite-plugin-load-fallback/index.ts @@ -8,12 +8,12 @@ type NodeFileSystemModule = typeof nodeFs; export interface LoadFallbackPluginParams { fs?: NodeFileSystemModule; - settings: AstroSettings; + root: URL; } export default function loadFallbackPlugin({ fs, - settings, + root, }: LoadFallbackPluginParams): vite.Plugin[] | false { // Only add this plugin if a custom fs implementation is provided. if (!fs || fs === nodeFs) { @@ -29,7 +29,7 @@ export default function loadFallbackPlugin({ return await fs.promises.readFile(id, 'utf-8'); } catch (e2) { try { - const fullpath = new URL('.' + id, settings.config.root); + const fullpath = new URL('.' + id, root); return await fs.promises.readFile(fullpath, 'utf-8'); } catch (e3) { // Let fall through to the next @@ -43,15 +43,23 @@ export default function loadFallbackPlugin({ name: 'astro:load-fallback', enforce: 'post', async resolveId(id, parent) { - if (id.startsWith('.') && parent && fs.existsSync(parent)) { - return npath.posix.join(npath.posix.dirname(parent), id); - } else { - let resolved = await this.resolve(id, parent, { skipSelf: true }); - if (resolved) { - return resolved.id; - } - return slashify(id); + // See if this can be loaded from our fs + if (parent) { + const candidateId = npath.posix.join(npath.posix.dirname(parent), id); + try { + // Check to see if this file exists and is not a directory. + const stats = await fs.promises.stat(candidateId); + if(!stats.isDirectory()) { + return candidateId; + } + } catch {} + } + + let resolved = await this.resolve(id, parent, { skipSelf: true }); + if (resolved) { + return resolved.id; } + return slashify(id); }, async load(id) { const source = await tryLoadModule(id); |