chore: cleanup hasContentFlag

withastro · Apr 26, 2023 · 4443690 · 4443690
1 parent 0ee02c9
commit 4443690
Showing 1 changed file with 2 additions and 8 deletions.
diff --git 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);