[zero] Move extendTheme to its own subpath (mui#41204)

mnajdova · Mar 8, 2024 · 51ed66a · 51ed66a
1 parent 791ff94
commit 51ed66a
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 7 deletions.
diff --git a/packages/zero-next-plugin/src/index.ts b/packages/zero-next-plugin/src/index.ts
@@ -3,6 +3,7 @@ import type { NextConfig } from 'next';
 import { findPagesDir } from 'next/dist/lib/find-pages-dir';
 import {
   webpack as zeroWebpackPlugin,
+  extendTheme,
   type PluginOptions as BaseZeroPluginConfig,
 } from '@mui/zero-unplugin';
 
@@ -81,3 +82,5 @@ export function withZeroPlugin(nextConfig: NextConfig, zeroConfig: ZeroPluginCon
     webpack,
   };
 }
+
+export { extendTheme };
diff --git a/packages/zero-runtime/.gitignore b/packages/zero-runtime/.gitignore
@@ -1,2 +1,3 @@
 /processors/
 /utils/
+/extendTheme/
diff --git a/packages/zero-runtime/README.md b/packages/zero-runtime/README.md
@@ -319,7 +319,7 @@ const { withZeroPlugin, extendTheme } = require('@mui/zero-next-plugin');
 
 module.exports = withZeroPlugin(
   {
-    // ...other nextConfig
+    // ...nextConfig
   },
   {
     theme: extendTheme({

diff --git a/packages/zero-runtime/package.json b/packages/zero-runtime/package.json
@@ -68,7 +68,8 @@
     "utils",
     "package.json",
     "styles.css",
-    "theme"
+    "theme",
+    "extendTheme"
   ],
   "exports": {
     ".": {
@@ -83,6 +84,15 @@
       "require": "./theme/index.js",
       "default": "./theme/index.js"
     },
+    "./extendTheme": {
+      "types": "./extendTheme/index.d.ts",
+      "import": {
+        "default": "./extendTheme/index.mjs",
+        "types": "./extendTheme/index.d.mts"
+      },
+      "require": "./extendTheme/index.js",
+      "default": "./extendTheme/index.js"
+    },
     "./styles.css": {
       "default": "./styles.css"
     },

diff --git a/packages/zero-runtime/src/extendTheme.ts b/packages/zero-runtime/src/extendTheme.ts
@@ -86,7 +86,7 @@ export type Theme = ExtendTheme;
 /**
  * A utility to tell zero-runtime to generate CSS variables for the theme.
  */
-export default function extendTheme<
+export function extendTheme<
   Options extends {
     colorScheme: string;
     tokens: Record<string, any>;

diff --git a/packages/zero-runtime/src/index.ts b/packages/zero-runtime/src/index.ts
@@ -4,5 +4,3 @@ export { default as keyframes } from './keyframes';
 export { generateAtomics, atomics } from './generateAtomics';
 export { default as css } from './css';
 export { default as createUseThemeProps } from './createUseThemeProps';
-export { default as extendTheme } from './extendTheme';
-export type { Theme, ExtendTheme } from './extendTheme';
diff --git a/packages/zero-runtime/tsup.config.ts b/packages/zero-runtime/tsup.config.ts
@@ -19,6 +19,13 @@ export default defineConfig([
     ...baseConfig,
     entry: ['./src/index.ts', './src/theme.ts'],
   },
+  {
+    ...baseConfig,
+    entry: {
+      index: './src/extendTheme.ts',
+    },
+    outDir: 'extendTheme',
+  },
   {
     ...baseConfig,
     entry: processors.map((fn) => `./src/processors/${fn}.ts`),

diff --git a/packages/zero-unplugin/src/index.ts b/packages/zero-unplugin/src/index.ts
@@ -19,7 +19,8 @@ import {
   generateTokenCss,
   generateThemeTokens,
 } from '@mui/zero-runtime/utils';
-import type { Theme as BaseTheme } from '@mui/zero-runtime';
+import type { Theme as BaseTheme } from '@mui/zero-runtime/extendTheme';
+import { extendTheme } from '@mui/zero-runtime/extendTheme';
 
 type NextMeta = {
   type: 'next';
@@ -341,3 +342,5 @@ export const webpack = plugin.webpack as unknown as UnpluginFactoryOutput<
   PluginOptions,
   WebpackPluginInstance
 >;
+
+export { extendTheme };
diff --git a/packages/zero-vite-plugin/src/index.ts b/packages/zero-vite-plugin/src/index.ts
@@ -4,7 +4,7 @@ import {
   generateTokenCss,
   generateThemeTokens,
 } from '@mui/zero-runtime/utils';
-import type { Theme } from '@mui/zero-runtime';
+import type { Theme } from '@mui/zero-runtime/extendTheme';
 import { transformAsync } from '@babel/core';
 import baseZeroVitePlugin, { type VitePluginOptions } from './zero-vite-plugin';