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

fix astro image bad imports (#4279)

Browse source
This commit is contained in:
Fred K. Schott 2022-08-11 16:24:17 -07:00 committed by GitHub
parent e65c772678
commit 42fd6936cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/real-feet-rule.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Handle "not found" imports without throwing an "Invalid URL" error

5
.changeset/strange-meals-march.md Normal file
View file

@ -0,0 +1,5 @@
---
'@astrojs/image': patch
---
Add better warnings if the integration was not properly configured.

12
packages/astro/src/core/render/dev/vite.ts
View file

@ -9,6 +9,8 @@ import { STYLE_EXTENSIONS } from '../util.js';
*/ */
const fileExtensionsToSSR = new Set(['.astro', '.md']); const fileExtensionsToSSR = new Set(['.astro', '.md']);
const STRIP_QUERY_PARAMS_REGEX = /\?.*$/;
/** recursively crawl the module graph to get all style files imported by parent id */ /** recursively crawl the module graph to get all style files imported by parent id */
export async function* crawlGraph( export async function* crawlGraph(
viteServer: vite.ViteDevServer, viteServer: vite.ViteDevServer,
@ -43,16 +45,18 @@ export async function* crawlGraph(
// to only SSR modules that we can safely transform, we check against // to only SSR modules that we can safely transform, we check against
// a list of file extensions based on our built-in vite plugins // a list of file extensions based on our built-in vite plugins
if (importedModule.id) { if (importedModule.id) {
// use URL to strip special query params like "?content" // Strip special query params like "?content".
const { pathname } = new URL(`file://${importedModule.id}`); // NOTE: Cannot use `new URL()` here because not all IDs will be valid paths.
// For example, `virtual:image-loader` if you don't have the plugin installed.
const importedModulePathname = importedModule.id.replace(STRIP_QUERY_PARAMS_REGEX, '');
// If the entry is a style, skip any modules that are not also styles. // If the entry is a style, skip any modules that are not also styles.
// Tools like Tailwind might add HMR dependencies as `importedModules` // Tools like Tailwind might add HMR dependencies as `importedModules`
// but we should skip them--they aren't really imported. Without this, // but we should skip them--they aren't really imported. Without this,
// every hoisted script in the project is added to every page! // every hoisted script in the project is added to every page!
if (entryIsStyle && !STYLE_EXTENSIONS.has(npath.extname(pathname))) { if (entryIsStyle && !STYLE_EXTENSIONS.has(npath.extname(importedModulePathname))) {
continue; continue;
} }
if (fileExtensionsToSSR.has(npath.extname(pathname))) { if (fileExtensionsToSSR.has(npath.extname(importedModulePathname))) {
const mod = viteServer.moduleGraph.getModuleById(importedModule.id); const mod = viteServer.moduleGraph.getModuleById(importedModule.id);
if (!mod?.ssrModule) { if (!mod?.ssrModule) {
await viteServer.ssrLoadModule(importedModule.id); await viteServer.ssrLoadModule(importedModule.id);

4
packages/integrations/image/src/lib/get-image.ts
View file

@ -107,7 +107,9 @@ export async function getImage(
if (!loader) { if (!loader) {
// @ts-ignore // @ts-ignore
const { default: mod } = await import('virtual:image-loader'); const { default: mod } = await import('virtual:image-loader').catch(() => {
throw new Error('[@astrojs/image] Builtin image loader not found. (Did you remember to add the integration to your Astro config?)');
});
loader = mod as ImageService; loader = mod as ImageService;
globalThis.astroImage = globalThis.astroImage || {}; globalThis.astroImage = globalThis.astroImage || {};
globalThis.astroImage.loader = loader; globalThis.astroImage.loader = loader;