@next/mdx 15.0.4 → 15.1.0

package/index.js

@@ -1,29 +1,50 @@
 module.exports =
   (pluginOptions = {}) =>
-  (nextConfig = {}) => {
+  (inputConfig = {}) => {
     const extension = pluginOptions.extension || /\.mdx$/
+    const userProvidedMdxOptions = pluginOptions.options
 
-    const mdxRsOptions = nextConfig?.experimental?.mdxRs
+    const mdxRsOptions = inputConfig?.experimental?.mdxRs
     const loader = mdxRsOptions
       ? {
           loader: require.resolve('./mdx-rs-loader'),
           options: {
             providerImportSource: 'next-mdx-import-source-file',
-            ...pluginOptions.options,
+            ...userProvidedMdxOptions,
             // mdxRsOptions is a union of boolean and object type of MdxTransformOptions
             ...(mdxRsOptions === true ? {} : mdxRsOptions),
           },
         }
       : {
-          loader: require.resolve('@mdx-js/loader'),
+          loader: require.resolve('./mdx-js-loader'),
           options: {
             providerImportSource: 'next-mdx-import-source-file',
-            ...pluginOptions.options,
+            ...userProvidedMdxOptions,
           },
         }
 
-    return Object.assign({}, nextConfig, {
-      experimental: Object.assign({}, nextConfig?.experimental, {
+    let nextConfig = Object.assign({}, inputConfig, {
+      webpack(config, options) {
+        config.resolve.alias['next-mdx-import-source-file'] = [
+          'private-next-root-dir/src/mdx-components',
+          'private-next-root-dir/mdx-components',
+          '@mdx-js/react',
+        ]
+        config.module.rules.push({
+          test: extension,
+          use: [options.defaultLoaders.babel, loader],
+        })
+
+        if (typeof inputConfig.webpack === 'function') {
+          return inputConfig.webpack(config, options)
+        }
+
+        return config
+      },
+    })
+
+    if (process.env.TURBOPACK) {
+      nextConfig.experimental = Object.assign({}, nextConfig?.experimental, {
         turbo: Object.assign({}, nextConfig?.experimental?.turbo, {
           rules: Object.assign({}, nextConfig?.experimental?.turbo?.rules, {
             '*.mdx': {
@@ -40,23 +61,8 @@ module.exports =
             }
           ),
         }),
-      }),
-      webpack(config, options) {
-        config.resolve.alias['next-mdx-import-source-file'] = [
-          'private-next-root-dir/src/mdx-components',
-          'private-next-root-dir/mdx-components',
-          '@mdx-js/react',
-        ]
-        config.module.rules.push({
-          test: extension,
-          use: [options.defaultLoaders.babel, loader],
-        })
-
-        if (typeof nextConfig.webpack === 'function') {
-          return nextConfig.webpack(config, options)
-        }
+      })
+    }
 
-        return config
-      },
-    })
+    return nextConfig
   }

package/mdx-js-loader.js

@@ -0,0 +1,66 @@
+const mdxLoader = require('@mdx-js/loader')
+
+function interopDefault(mod) {
+  return mod.default || mod
+}
+
+async function importPlugin(plugin, projectRoot) {
+  if (Array.isArray(plugin) && typeof plugin[0] === 'string') {
+    plugin[0] = interopDefault(
+      await import(require.resolve(plugin[0], { paths: [projectRoot] }))
+    )
+  }
+  return plugin
+}
+
+async function getOptions(options, projectRoot) {
+  const {
+    recmaPlugins = [],
+    rehypePlugins = [],
+    remarkPlugins = [],
+    ...rest
+  } = options
+
+  const [updatedRecma, updatedRehype, updatedRemark] = await Promise.all([
+    Promise.all(
+      recmaPlugins.map((plugin) => importPlugin(plugin, projectRoot))
+    ),
+    Promise.all(
+      rehypePlugins.map((plugin) => importPlugin(plugin, projectRoot))
+    ),
+    Promise.all(
+      remarkPlugins.map((plugin) => importPlugin(plugin, projectRoot))
+    ),
+  ])
+
+  return {
+    ...rest,
+    recmaPlugins: updatedRecma,
+    rehypePlugins: updatedRehype,
+    remarkPlugins: updatedRemark,
+  }
+}
+
+module.exports = function nextMdxLoader(...args) {
+  const options = this.getOptions()
+  const callback = this.async().bind(this)
+  const loaderContext = this
+
+  getOptions(options, this.context).then((userProvidedMdxOptions) => {
+    const proxy = new Proxy(loaderContext, {
+      get(target, prop, receiver) {
+        if (prop === 'getOptions') {
+          return () => userProvidedMdxOptions
+        }
+
+        if (prop === 'async') {
+          return () => callback
+        }
+
+        return Reflect.get(target, prop, receiver)
+      },
+    })
+
+    mdxLoader.call(proxy, ...args)
+  })
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "15.0.4",
+  "version": "15.1.0",
   "main": "index.js",
   "license": "MIT",
   "repository": {