Dedupe

mui · Jul 9, 2024 · 6ac9e5e · 6ac9e5e
1 parent 33eb3e7
commit 6ac9e5e
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 192 deletions.
diff --git a/apps/pigment-css-next-app/package.json b/apps/pigment-css-next-app/package.json
@@ -23,7 +23,7 @@
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@pigment-css/nextjs-plugin": "https://pkg.csb.dev/mui/pigment-css/commit/747b907d/@pigment-css/nextjs-plugin",
+    "@pigment-css/nextjs-plugin": "https://pkg.csb.dev/mui/pigment-css/commit/e96284a9/@pigment-css/nextjs-plugin",
     "@types/node": "^20.5.7",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",

diff --git a/apps/pigment-css-next-app/src/app/material-ui/page.tsx b/apps/pigment-css-next-app/src/app/material-ui/page.tsx
@@ -6,7 +6,9 @@ import path from 'path';
 import { css } from '@mui/material-pigment-css';
 
 export default async function MaterialUIPage() {
-  const rootPaths = await fs.readdir(path.join(process.cwd(), `src/app/material-ui`));
+  const rootPaths = (await fs.readdir(path.join(process.cwd(), `src/app/material-ui`))).filter(
+    (path) => !path.startsWith('.'),
+  );
   return (
     <div>
       <h1>Material UI Components</h1>

diff --git a/apps/pigment-css-vite-app/package.json b/apps/pigment-css-vite-app/package.json
@@ -9,6 +9,8 @@
     "build": "vite build"
   },
   "dependencies": {
+    "@emotion/react": "^11.11.4",
+    "@emotion/styled": "^11.11.5",
     "@mui/material-pigment-css": "workspace:^",
     "@mui/utils": "workspace:^",
     "@mui/base": "workspace:^",
@@ -26,7 +28,7 @@
   "devDependencies": {
     "@babel/preset-react": "^7.24.7",
     "@babel/preset-typescript": "^7.24.7",
-    "@pigment-css/vite-plugin": "https://pkg.csb.dev/mui/pigment-css/commit/747b907d/@pigment-css/vite-plugin",
+    "@pigment-css/vite-plugin": "https://pkg.csb.dev/mui/pigment-css/commit/e96284a9/@pigment-css/vite-plugin",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@vitejs/plugin-react": "^4.3.1",

diff --git a/package.json b/package.json
@@ -209,10 +209,10 @@
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
     "cross-fetch": "^4.0.0",
-    "@pigment-css/react": "https://pkg.csb.dev/mui/pigment-css/commit/747b907d/@pigment-css/react",
-    "@pigment-css/unplugin": "https://pkg.csb.dev/mui/pigment-css/commit/747b907d/@pigment-css/unplugin",
-    "@pigment-css/nextjs-plugin": "https://pkg.csb.dev/mui/pigment-css/commit/747b907d/@pigment-css/nextjs-plugin",
-    "@pigment-css/vite-plugin": "https://pkg.csb.dev/mui/pigment-css/commit/747b907d/@pigment-css/vite-plugin"
+    "@pigment-css/react": "https://pkg.csb.dev/mui/pigment-css/commit/e96284a9/@pigment-css/react",
+    "@pigment-css/unplugin": "https://pkg.csb.dev/mui/pigment-css/commit/e96284a9/@pigment-css/unplugin",
+    "@pigment-css/nextjs-plugin": "https://pkg.csb.dev/mui/pigment-css/commit/e96284a9/@pigment-css/nextjs-plugin",
+    "@pigment-css/vite-plugin": "https://pkg.csb.dev/mui/pigment-css/commit/e96284a9/@pigment-css/vite-plugin"
   },
   "nyc": {
     "include": [

diff --git a/packages/mui-material-pigment-css/package.json b/packages/mui-material-pigment-css/package.json
@@ -40,7 +40,7 @@
     "typescript:module-augmentation": "node scripts/testModuleAugmentation.js"
   },
   "dependencies": {
-    "@pigment-css/react": "https://pkg.csb.dev/mui/pigment-css/commit/747b907d/@pigment-css/react"
+    "@pigment-css/react": "https://pkg.csb.dev/mui/pigment-css/commit/e96284a9/@pigment-css/react"
   },
   "sideEffects": false,
   "publishConfig": {

diff --git a/packages/mui-material/package.json b/packages/mui-material/package.json
@@ -104,5 +104,18 @@
   },
   "engines": {
     "node": ">=12.0.0"
+  },
+  "pigment-css": {
+    "vite": {
+      "include": [
+        "prop-types",
+        "react-is",
+        "hoist-non-react-statics",
+        "react",
+        "react-dom",
+        "@emotion/react",
+        "@emotion/styled"
+      ]
+    }
   }
 }