Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move mdx import out of loader into compile #20

Merged
merged 1 commit into from
Feb 13, 2023
Merged

Move mdx import out of loader into compile #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
const { dirname } = require('path');
const { compile } = require('./dist/index');

// FIXME: we shouldn't be doing this, but we need it
Expand All @@ -9,10 +8,8 @@ const { compile } = require('./dist/index');
// Which generates the code:
//
// export const foo = () => <div>hi</div>;
const mdxReactPackage = dirname(require.resolve('@mdx-js/react/package.json'));
const DEFAULT_RENDERER = `
import React from 'react';
import { mdx } from '${mdxReactPackage}';
`;

// Lifted from MDXv1 loader
Expand Down
12 changes: 8 additions & 4 deletions src/sb-mdx-plugin.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,13 @@ function clean(content: any) {
}

function compile(content: any) {
const code = mdx.sync(content, {
// filepath: filePath,
compilers: [createCompiler({})],
});
const code = mdx
.sync(content, {
// filepath: filePath,
compilers: [createCompiler({})],
})
// sanitize resolved path so test is same on any machine
.replace(/import { mdx } from (.*)/, "import { mdx } from '@mdx-js/react';");

return prettier
.format(code, {
Expand Down Expand Up @@ -971,6 +974,7 @@ describe('docs-mdx-compiler-plugin', () => {
).toMatchInlineSnapshot(`
/* @jsxRuntime classic */
/* @jsx mdx */
import { mdx } from '@mdx-js/react';
import { assertIsFn, AddContext } from '@storybook/addon-docs';

import { Meta } from '@storybook/addon-docs';
Expand Down
5 changes: 4 additions & 1 deletion src/sb-mdx-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { dirname } from 'path';
import { toJSX } from '@mdx-js/mdx/mdx-hast-to-jsx';
import { parse, parseExpression } from '@babel/parser';
import * as t from '@babel/types';
Expand Down Expand Up @@ -508,8 +509,10 @@ function extractExports(root: Element, options: CompilerOptions) {
metaExport.includeStories = JSON.stringify(includeStories);

const defaultJsx = toJSX(root, {}, { ...options, skipExport: true });
const mdxReactPackage = dirname(require.resolve('@mdx-js/react/package.json'));
const fullJsx = [
'import { assertIsFn, AddContext } from "@storybook/addon-docs";',
`import { mdx } from '${mdxReactPackage}';
import { assertIsFn, AddContext } from "@storybook/addon-docs";`,
defaultJsx,
...storyExports,
`const componentMeta = ${stringifyMeta(metaExport)};`,
Expand Down