feat: add astroPropagatedAssets flag with vite

withastro · Apr 26, 2023 · 2993e80 · 2993e80
1 parent ac08dc3
commit 2993e80
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/examples/with-markdoc/markdoc.config.mjs b/examples/with-markdoc/markdoc.config.mjs
@@ -1,5 +1,5 @@
 import { defineMarkdocConfig } from '@astrojs/markdoc/config';
-import Aside from './src/components/Aside.astro?astroPropagatedAssets';
+import Aside from './src/components/Aside.astro';
 
 export default defineMarkdocConfig({
 	tags: {

diff --git a/packages/integrations/markdoc/src/index.ts b/packages/integrations/markdoc/src/index.ts
@@ -31,7 +31,11 @@ export default function markdocIntegration(legacyConfig: any): AstroIntegration
 		name: '@astrojs/markdoc',
 		hooks: {
 			'astro:config:setup': async (params) => {
-				const { config: astroConfig, addContentEntryType } = params as SetupHookParams;
+				const {
+					config: astroConfig,
+					updateConfig,
+					addContentEntryType,
+				} = params as SetupHookParams;
 
 				const configLoadResult = await loadMarkdocConfig(astroConfig);
 				const userMarkdocConfig = configLoadResult?.config ?? {};
@@ -127,6 +131,27 @@ export const Content = createComponent({
 						'utf-8'
 					),
 				});
+
+				updateConfig({
+					vite: {
+						plugins: [
+							{
+								name: '@astrojs/markdoc:astro-propagated-assets',
+								enforce: 'pre',
+								// Astro component styles and scripts should only be injected
+								// When a given Markdoc file actually uses that component.
+								// Add the `astroPropagatedAssets` flag to inject only when rendered.
+								resolveId(this: rollup.TransformPluginContext, id: string, importer: string) {
+									if (importer === configLoadResult?.fileUrl.pathname && id.endsWith('.astro')) {
+										return this.resolve(id + '?astroPropagatedAssets', importer, {
+											skipSelf: true,
+										});
+									}
+								},
+							},
+						],
+					},
+				});
 			},
 		},
 	};

diff --git a/packages/integrations/markdoc/src/load-config.ts b/packages/integrations/markdoc/src/load-config.ts
@@ -63,7 +63,7 @@ async function bundleConfigFile({
 			{
 				name: 'stub-astro-imports',
 				setup(build) {
-					build.onResolve({ filter: /.*\.astro\?astroPropagatedAssets$/ }, () => {
+					build.onResolve({ filter: /.*\.astro$/ }, () => {
 						return {
 							// Stub with an unused default export
 							path: 'data:text/javascript,export default true',