diff --git a/.changeset/nervous-cups-switch.md b/.changeset/nervous-cups-switch.md new file mode 100644 index 0000000..81116be --- /dev/null +++ b/.changeset/nervous-cups-switch.md @@ -0,0 +1,5 @@ +--- +"@studiocms/markdown-remark": patch +--- + +Update CSS and add flags to prevent vite dynamic import warnings diff --git a/package.json b/package.json index 5bf68f7..add6da3 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ }, "scripts": { "build": "pnpm --filter @studiocms/markdown-remark build", - "dev": "pnpm --filter @studiocms/markdown-remark dev", + "package:dev": "pnpm --filter @studiocms/markdown-remark dev", + "dev": "pnpm --stream --filter @studiocms/markdown-remark --filter @markdown-remark/tests -r -parallel dev", "test": "pnpm --filter @studiocms/markdown-remark test", "lint": "biome check .", "lint:fix": "biome check --write .", diff --git a/packages/markdown-remark/assets/headings.css b/packages/markdown-remark/assets/headings.css index 3fa8c21..15fcdf5 100644 --- a/packages/markdown-remark/assets/headings.css +++ b/packages/markdown-remark/assets/headings.css @@ -54,18 +54,3 @@ .anchor-link:focus { opacity: 1; } - -@media (min-width: 95em) { - .heading-wrapper { - display: flex; - flex-direction: row-reverse; - justify-content: flex-end; - gap: var(--icon-spacing); - margin-inline-start: calc(-1 * var(--icon-size) + var(--icon-spacing)); - } - - .heading-wrapper > :first-child, - .anchor-link { - margin: 0; - } -} diff --git a/packages/markdown-remark/src/processor/import-plugin-browser.ts b/packages/markdown-remark/src/processor/import-plugin-browser.ts index 5fb90ad..2a72cea 100644 --- a/packages/markdown-remark/src/processor/import-plugin-browser.ts +++ b/packages/markdown-remark/src/processor/import-plugin-browser.ts @@ -3,6 +3,6 @@ import type * as unified from 'unified'; // In the browser, we can try to do a plain import export async function importPlugin(p: string): Promise { - const importResult = await import(p); + const importResult = await import(/* @vite-ignore */ p); return importResult.default; } diff --git a/packages/markdown-remark/src/processor/import-plugin-default.ts b/packages/markdown-remark/src/processor/import-plugin-default.ts index 1b6778f..2b898aa 100644 --- a/packages/markdown-remark/src/processor/import-plugin-default.ts +++ b/packages/markdown-remark/src/processor/import-plugin-default.ts @@ -10,13 +10,13 @@ let cwdUrlStr: string | undefined; export async function importPlugin(p: string): Promise { // Try import from this package first try { - const importResult = await import(p); + const importResult = await import(/* @vite-ignore */ p); return importResult.default; } catch {} // Try import from user project cwdUrlStr ??= pathToFileURL(path.join(process.cwd(), 'package.json')).toString(); const resolved = importMetaResolve(p, cwdUrlStr); - const importResult = await import(resolved); + const importResult = await import(/* @vite-ignore */ resolved); return importResult.default; } diff --git a/packages/markdown-remark/tests/astro-integration.test.ts b/packages/markdown-remark/tests/astro-integration.test.ts index a3df459..4da5598 100644 --- a/packages/markdown-remark/tests/astro-integration.test.ts +++ b/packages/markdown-remark/tests/astro-integration.test.ts @@ -36,7 +36,8 @@ describe('Markdown-Remark Astro Integration Tests', () => { const content = await fixture.readFile('direct/index.html'); expect(content).toContain( - `` + ` +

Lorem ipsum dolor sit amet, consectetur adipiscing elit sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

` ); }); @@ -152,7 +153,7 @@ describe('Markdown-Remark Astro Integration Tests', () => { expect( content ).toContain(` -

This web site is using @studiocms/markdown-remark.

`); +

This web site is using @studiocms/markdown-remark.

`); }); }); }); diff --git a/packages/markdown-remark/tests/fixture/astro/package.json b/packages/markdown-remark/tests/fixture/astro/package.json index 8137915..d84e87f 100644 --- a/packages/markdown-remark/tests/fixture/astro/package.json +++ b/packages/markdown-remark/tests/fixture/astro/package.json @@ -7,6 +7,7 @@ "astro": "astro", "build": "astro build", "preview": "astro preview", + "dev": "astro dev", "test:dev": "astro dev", "test:build": "pnpm build && pnpm preview" }, diff --git a/packages/markdown-remark/tests/fixture/astro/src/layouts/layout.astro b/packages/markdown-remark/tests/fixture/astro/src/layouts/layout.astro new file mode 100644 index 0000000..933a521 --- /dev/null +++ b/packages/markdown-remark/tests/fixture/astro/src/layouts/layout.astro @@ -0,0 +1,17 @@ +--- +interface Props { + title: string; +} + +const { title } = Astro.props; +--- + + + + + Test - {title} + + + + + \ No newline at end of file diff --git a/packages/markdown-remark/tests/fixture/astro/src/pages/basic-render/index.astro b/packages/markdown-remark/tests/fixture/astro/src/pages/basic-render/index.astro index 3cb4484..a205291 100644 --- a/packages/markdown-remark/tests/fixture/astro/src/pages/basic-render/index.astro +++ b/packages/markdown-remark/tests/fixture/astro/src/pages/basic-render/index.astro @@ -1,16 +1,10 @@ --- import { render } from 'studiocms:markdown-remark'; +import Layout from '../../layouts/layout.astro'; import content from './_md/md.txt?raw'; const { html } = await render(content); --- - - - - - Test - Basic - - - {html} - - \ No newline at end of file + + {html} + \ No newline at end of file diff --git a/packages/markdown-remark/tests/fixture/astro/src/pages/basic/index.astro b/packages/markdown-remark/tests/fixture/astro/src/pages/basic/index.astro index 1fb5633..04eaebc 100644 --- a/packages/markdown-remark/tests/fixture/astro/src/pages/basic/index.astro +++ b/packages/markdown-remark/tests/fixture/astro/src/pages/basic/index.astro @@ -1,14 +1,8 @@ --- import { Markdown } from 'studiocms:markdown-remark'; +import Layout from '../../layouts/layout.astro'; import content from './_md/md.txt?raw'; --- - - - - - Test - Basic - - - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/packages/markdown-remark/tests/fixture/astro/src/pages/direct/_md/md.txt b/packages/markdown-remark/tests/fixture/astro/src/pages/direct/_md/md.txt new file mode 100644 index 0000000..a8bcef2 --- /dev/null +++ b/packages/markdown-remark/tests/fixture/astro/src/pages/direct/_md/md.txt @@ -0,0 +1,3 @@ +# Hello World! + +Lorem ipsum dolor sit amet, consectetur adipiscing elit sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. \ No newline at end of file diff --git a/packages/markdown-remark/tests/fixture/astro/src/pages/direct/index.astro b/packages/markdown-remark/tests/fixture/astro/src/pages/direct/index.astro index 1c0eb9a..dbc7ce9 100644 --- a/packages/markdown-remark/tests/fixture/astro/src/pages/direct/index.astro +++ b/packages/markdown-remark/tests/fixture/astro/src/pages/direct/index.astro @@ -3,6 +3,8 @@ import { type MarkdownProcessorRenderOptions, createMarkdownProcessor, } from '@studiocms/markdown-remark'; +import Layout from '../../layouts/layout.astro'; +import contentRaw from './_md/md.txt?raw'; const processor = await createMarkdownProcessor(); @@ -15,15 +17,8 @@ async function render(content: string, options?: MarkdownProcessorRenderOptions) }; } -const content = await render('# Hello World!'); +const content = await render(contentRaw); --- - - - - - Test - Basic - - - {content.html} - - \ No newline at end of file + + {content.html} + \ No newline at end of file diff --git a/packages/markdown-remark/tests/fixture/astro/src/pages/index.astro b/packages/markdown-remark/tests/fixture/astro/src/pages/index.astro new file mode 100644 index 0000000..8c95593 --- /dev/null +++ b/packages/markdown-remark/tests/fixture/astro/src/pages/index.astro @@ -0,0 +1,11 @@ +--- +import Layout from '../layouts/layout.astro'; +--- + + + \ No newline at end of file diff --git a/packages/markdown-remark/tests/fixture/astro/src/pages/syntax/index.astro b/packages/markdown-remark/tests/fixture/astro/src/pages/syntax/index.astro index 3284d2f..b8052a2 100644 --- a/packages/markdown-remark/tests/fixture/astro/src/pages/syntax/index.astro +++ b/packages/markdown-remark/tests/fixture/astro/src/pages/syntax/index.astro @@ -1,14 +1,8 @@ --- import { Markdown } from 'studiocms:markdown-remark'; +import Layout from '../../layouts/layout.astro'; import content from './_md/md.txt?raw'; --- - - - - - Test - Syntax Test - - - - - \ No newline at end of file + + + \ No newline at end of file