From 444369073ce544233782f63a9cf885ff36db4b82 Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Wed, 26 Apr 2023 17:06:39 -0400 Subject: [PATCH] chore: cleanup hasContentFlag --- .../astro/src/content/vite-plugin-content-assets.ts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/astro/src/content/vite-plugin-content-assets.ts b/packages/astro/src/content/vite-plugin-content-assets.ts index c649b2d5c3daf..91fe08dfb1c96 100644 --- a/packages/astro/src/content/vite-plugin-content-assets.ts +++ b/packages/astro/src/content/vite-plugin-content-assets.ts @@ -20,12 +20,6 @@ import { } from './consts.js'; import { hasContentFlag } from './utils.js'; -// TODO: replace with `hasContentFlag` -function isPropagatedAsset(viteId: string): boolean { - const url = new URL(viteId, 'file://'); - return url.searchParams.has(PROPAGATED_ASSET_FLAG); -} - export function astroContentAssetPropagationPlugin({ mode, settings, @@ -62,7 +56,7 @@ export function astroContentAssetPropagationPlugin({ } }, load(id) { - if (isPropagatedAsset(id)) { + if (hasContentFlag(id, CONTENT_RENDER_FLAG)) { const basePath = id.split('?')[0]; const code = ` function getMod() { @@ -83,7 +77,7 @@ export function astroContentAssetPropagationPlugin({ }, async transform(code, id, options) { if (!options?.ssr) return; - if (devModuleLoader && isPropagatedAsset(id)) { + if (devModuleLoader && hasContentFlag(id, CONTENT_RENDER_FLAG)) { const basePath = id.split('?')[0]; if (!devModuleLoader.getModuleById(basePath)?.ssrModule) { await devModuleLoader.import(basePath);