Merge branch 'next' into isIS-locale-typo

.github/workflows/cherry-pick-next-to-master.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Cherry pick and create the new PR
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        uses: carloscastrojumo/github-cherry-pick-action@a145da1b8142e752d3cbc11aaaa46a535690f0c5 # v1.0.9
+        uses: carloscastrojumo/github-cherry-pick-action@503773289f4a459069c832dc628826685b75b4b3 # v1.0.10
         with:
           branch: master
           body: 'Cherry-pick of #{old_pull_request_id}'

.github/workflows/codeql.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+        uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
         with:
           languages: typescript
           config-file: ./.github/codeql/codeql-config.yml
@@ -30,4 +30,4 @@ jobs:
           # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
           # queries: security-extended,security-and-quality
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+        uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10

.github/workflows/priority-support-validation-prompt.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Find Comment
-        uses: peter-evans/find-comment@d5fe37641ad8451bdd80312415672ba26c86575e # v3
+        uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3
         id: findComment
         with:
           issue-number: ${{ github.event.issue.number }}

.github/workflows/scorecards.yml

@@ -43,6 +43,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+        uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
         with:
           sarif_file: results.sarif

apps/pigment-css-next-app/src/app/layout.tsx

@@ -23,6 +23,7 @@ export default function RootLayout(props: { children: React.ReactNode }) {
         className={`${inter.className} ${css`
           background-color: ${({ theme: t }) => t.vars.palette.background.default};
           color: ${({ theme: t }) => t.vars.palette.text.primary};
+          background-image: url('@/assets/mui.svg');
         `}`}
       >
         <AppRouterCacheProvider>

docs/package.json

@@ -22,14 +22,14 @@
     "@babel/core": "^7.24.4",
     "@babel/plugin-transform-object-assign": "^7.24.1",
     "@babel/runtime": "^7.24.4",
-    "@babel/runtime-corejs2": "^7.24.1",
+    "@babel/runtime-corejs2": "^7.24.4",
     "@docsearch/react": "^3.6.0",
     "@emotion/cache": "^11.11.0",
     "@emotion/react": "^11.11.4",
     "@emotion/server": "^11.11.0",
     "@emotion/styled": "^11.11.5",
-    "@fortawesome/fontawesome-svg-core": "^6.5.1",
-    "@fortawesome/free-solid-svg-icons": "^6.5.1",
+    "@fortawesome/fontawesome-svg-core": "^6.5.2",
+    "@fortawesome/free-solid-svg-icons": "^6.5.2",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@mui/base": "workspace:*",
     "@mui/docs": "workspace:^",
@@ -80,7 +80,7 @@
     "jss-rtl": "^0.3.0",
     "lodash": "^4.17.21",
     "lz-string": "^1.5.0",
-    "markdown-to-jsx": "^7.4.5",
+    "markdown-to-jsx": "^7.4.6",
     "material-ui-popup-state": "^5.1.0",
     "next": "^13.5.1",
     "notistack": "3.0.1",
@@ -103,7 +103,7 @@
     "react-swipeable-views": "^0.14.0",
     "react-swipeable-views-utils": "^0.14.0",
     "react-transition-group": "^4.4.5",
-    "react-virtuoso": "^4.7.7",
+    "react-virtuoso": "^4.7.8",
     "react-window": "^1.8.10",
     "rimraf": "^5.0.5",
     "styled-components": "^6.1.8",
@@ -122,7 +122,7 @@
     "@types/chai": "^4.3.14",
     "@types/css-mediaquery": "^0.1.4",
     "@types/json2mq": "^0.2.2",
-    "@types/node": "^18.19.28",
+    "@types/node": "^18.19.31",
     "@types/prop-types": "^15.7.12",
     "@types/react": "^18.2.55",
     "@types/react-dom": "^18.2.19",

package.json

@@ -116,13 +116,13 @@
     "@mui/utils": "workspace:^",
     "@pigment-css/react": "workspace:^",
     "@next/eslint-plugin-next": "^14.1.4",
-    "@octokit/rest": "^20.0.2",
+    "@octokit/rest": "^20.1.0",
     "@playwright/test": "1.42.1",
     "@types/enzyme": "^3.10.18",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash": "^4.17.0",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^18.19.28",
+    "@types/node": "^18.19.31",
     "@types/prettier": "^2.7.3",
     "@types/react": "^18.2.55",
     "@types/yargs": "^17.0.32",
@@ -186,14 +186,14 @@
     "stylelint-processor-styled-components": "^1.10.0",
     "terser-webpack-plugin": "^5.3.10",
     "tsup": "^8.0.2",
-    "tsx": "^4.7.1",
+    "tsx": "^4.7.2",
     "typescript": "^5.4.3",
     "webpack": "^5.90.3",
     "webpack-bundle-analyzer": "^4.10.1",
     "webpack-cli": "^5.1.4",
     "yargs": "^17.7.2"
   },
-  "packageManager": "pnpm@8.15.5",
+  "packageManager": "pnpm@8.15.6",
   "resolutions": {
     "@babel/core": "^7.24.4",
     "@babel/code-frame": "^7.24.2",
@@ -212,7 +212,7 @@
     "@definitelytyped/header-parser": "^0.2.8",
     "@definitelytyped/typescript-versions": "^0.1.1",
     "@definitelytyped/utils": "^0.1.5",
-    "@types/node": "^18.19.28",
+    "@types/node": "^18.19.31",
     "@types/react": "18.2.55",
     "@types/react-dom": "18.2.19",
     "cross-fetch": "^4.0.0"

packages-internal/scripts/package.json

@@ -42,7 +42,7 @@
     "@types/chai": "^4.3.14",
     "@types/doctrine": "^0.0.9",
     "@types/lodash": "^4.17.0",
-    "@types/node": "^18.19.28",
+    "@types/node": "^18.19.31",
     "@types/prettier": "^2.7.3",
     "@types/react": "^18.2.55",
     "@types/uuid": "^9.0.8",

packages/api-docs-builder-core/package.json

@@ -17,7 +17,7 @@
   "devDependencies": {
     "@types/chai": "^4.3.14",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^18.19.28",
+    "@types/node": "^18.19.31",
     "@types/sinon": "^10.0.20",
     "chai": "^4.4.1",
     "sinon": "^15.2.0",

packages/api-docs-builder/package.json

@@ -32,7 +32,7 @@
     "@types/doctrine": "^0.0.9",
     "@types/mdast": "4.0.3",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^18.19.28",
+    "@types/node": "^18.19.31",
     "@types/react-docgen": "workspace:*",
     "@types/sinon": "^10.0.20",
     "chai": "^4.4.1",

packages/eslint-plugin-material-ui/package.json

@@ -8,7 +8,7 @@
     "emoji-regex": "^10.3.0"
   },
   "devDependencies": {
-    "@types/eslint": "^8.56.6",
+    "@types/eslint": "^8.56.7",
     "@typescript-eslint/parser": "^6.21.0",
     "eslint": "^8.57.0"
   },

packages/mui-babel-macros/package.json

@@ -32,7 +32,7 @@
     "@types/babel-plugin-macros": "^3.1.3",
     "@types/chai": "^4.3.14",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^18.19.28",
+    "@types/node": "^18.19.31",
     "babel-plugin-tester": "^11.0.4",
     "chai": "^4.4.1"
   },

packages/mui-docs/package.json

@@ -43,7 +43,7 @@
   "devDependencies": {
     "@mui/icons-material": "workspace:*",
     "@mui/material": "workspace:*",
-    "@types/node": "^18.19.28",
+    "@types/node": "^18.19.31",
     "@types/prop-types": "^15.7.12",
     "@types/react": "^18.2.55",
     "next": "^13.5.1",

packages/mui-utils/package.json

@@ -50,7 +50,7 @@
     "@mui/types": "workspace:^",
     "@types/chai": "^4.3.14",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^18.19.28",
+    "@types/node": "^18.19.31",
     "@types/react": "^18.2.55",
     "@types/react-dom": "^18.2.19",
     "@types/react-is": "^18.2.4",

packages/pigment-css-nextjs-plugin/src/index.ts

@@ -53,6 +53,7 @@ export function withPigment(nextConfig: NextConfig, pigmentConfig?: PigmentOptio
           isServer,
           outputCss: dev || hasAppDir || !isServer,
           placeholderCssFile: extractionFile,
+          projectPath: dir,
         },
         async asyncResolve(what: string, importer: string, stack: string[]) {
           // Using the same stub file as "next/font". Should be updated in future to

packages/pigment-css-react/package.json

@@ -61,7 +61,7 @@
     "@types/cssesc": "^3.0.2",
     "@types/lodash": "^4.17.0",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^18.19.28",
+    "@types/node": "^18.19.31",
     "@types/react": "^18.2.55",
     "@types/stylis": "^4.2.5",
     "chai": "^4.4.1",

packages/pigment-css-react/src/utils/remove-prop-types-plugin.ts

@@ -11,7 +11,10 @@ export const removePropTypesPlugin = declare<{}>((api) => {
           return;
         }
         const property = left.get('property');
-        if (!property.isIdentifier({ name: 'propTypes' })) {
+        const isPropTypes = property.isIdentifier({ name: 'propTypes' });
+        const isMuiName = property.isIdentifier({ name: 'muiName' });
+
+        if (!isPropTypes && !isMuiName) {
           return;
         }
         const parentExpression = path.findParent((p) => p.isExpressionStatement());

packages/pigment-css-react/tests/styled/fixtures/styled-theme.input.js

@@ -50,3 +50,5 @@ process.env.NODE_ENV !== 'production'
       children: PropTypes.element,
     })
   : void 0;
+
+process.env.NODE_ENV !== 'production' ? (App.muiName = 'App') : void 0;

packages/pigment-css-react/tests/styled/fixtures/styled-theme.output.js

@@ -26,3 +26,4 @@ process.env.NODE_ENV !== 'production'
       children: PropTypes.element,
     })
   : void 0;
+process.env.NODE_ENV !== 'production' ? (App.muiName = 'App') : void 0;

packages/pigment-css-react/tests/styled/fixtures/styled.input.js

@@ -46,3 +46,5 @@ export function App() {
 App.propTypes = {
   children: PropTypes.element,
 };
+
+App.muiName = 'App';

packages/pigment-css-react/tests/styled/fixtures/styled.output.js

@@ -24,3 +24,4 @@ export function App() {
 App.propTypes = {
   children: PropTypes.element,
 };
+App.muiName = 'App';

packages/pigment-css-unplugin/.eslintrc

@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "import/prefer-default-export": "off"
+  }
+}

packages/pigment-css-unplugin/package.json

@@ -25,7 +25,9 @@
     "watch": "tsup --watch --tsconfig tsconfig.build.json",
     "copy-license": "node ../../scripts/pigment-license.mjs",
     "build": "tsup --tsconfig tsconfig.build.json",
-    "typecheck": "tsc --noEmit -p ."
+    "typecheck": "tsc --noEmit -p .",
+    "test": "cd ../../ && cross-env NODE_ENV=test mocha 'packages/pigment-css-unplugin/**/*.test.{js,ts,tsx}'",
+    "test:ci": "cd ../../ && cross-env NODE_ENV=test BABEL_ENV=coverage nyc --reporter=lcov --report-dir=./coverage/pigment-css-unplugin mocha 'packages/pigment-css-unplugin/**/*.test.{js,ts,tsx}'"
   },
   "dependencies": {
     "@babel/core": "^7.24.4",
@@ -36,7 +38,10 @@
     "unplugin": "^1.7.1"
   },
   "devDependencies": {
-    "@types/babel__core": "^7.20.5"
+    "@types/babel__core": "^7.20.5",
+    "@types/chai": "^4.3.14",
+    "@types/mocha": "^10.0.6",
+    "chai": "^4.4.1"
   },
   "sideEffects": false,
   "publishConfig": {