merge master

.circleci/config.yml

@@ -166,17 +166,17 @@ jobs:
               echo "no changes"
             fi
       - run:
-          name: typescript-to-proptypes
+          name: internal-scripts
           command: |
             # latest commit
             LATEST_COMMIT=$(git rev-parse HEAD)
 
-            # latest commit where packages/typescript-to-proptypes was changed
-            FOLDER_COMMIT=$(git log -1 --format=format:%H --full-diff packages/typescript-to-proptypes)
+            # latest commit where internal-scripts was changed
+            FOLDER_COMMIT=$(git log -1 --format=format:%H --full-diff packages-internal/scripts)
 
             if [ $FOLDER_COMMIT = $LATEST_COMMIT ]; then
               echo "changes, let's run the tests"
-              pnpm --filter typescript-to-proptypes test
+              pnpm --filter @mui/internal-scripts test
             else
               echo "no changes"
             fi
@@ -260,6 +260,8 @@ jobs:
       - run:
           name: Tests TypeScript definitions
           command: pnpm typescript:ci
+          environment:
+            NODE_OPTIONS: --max-old-space-size=3072
       - run:
           name: Test module augmentation
           command: |

.codesandbox/ci.json

@@ -3,6 +3,8 @@
   "installCommand": "install:codesandbox",
   "node": "18",
   "packages": [
+    "packages/docs-utils",
+    "packages/mui-babel-macros",
     "packages/mui-base",
     "packages/mui-codemod",
     "packages/mui-core-downloads-tracker",
@@ -19,32 +21,30 @@
     "packages/mui-system",
     "packages/mui-types",
     "packages/mui-utils",
-    "packages/docs-utils",
-    "packages/typescript-to-proptypes"
+    "packages-internal/scripts"
   ],
   "publishDirectory": {
     "@mui/base": "packages/mui-base/build",
     "@mui/codemod": "packages/mui-codemod/build",
     "@mui/core-downloads-tracker": "packages/mui-core-downloads-tracker/build",
     "@mui/icons-material": "packages/mui-icons-material/build",
+    "@mui/internal-babel-macros": "packages/mui-babel-macros",
+    "@mui/internal-scripts": "packages-internal/scripts",
     "@mui/joy": "packages/mui-joy/build",
     "@mui/lab": "packages/mui-lab/build",
     "@mui/material-next": "packages/mui-material-next/build",
     "@mui/material-nextjs": "packages/mui-material-nextjs/build",
     "@mui/material": "packages/mui-material/build",
     "@mui/private-theming": "packages/mui-private-theming/build",
-    "@mui/styled-engine-sc": "packages/mui-styled-engine-sc/build",
     "@mui/styled-engine": "packages/mui-styled-engine/build",
+    "@mui/styled-engine-sc": "packages/mui-styled-engine-sc/build",
     "@mui/styles": "packages/mui-styles/build",
     "@mui/system": "packages/mui-system/build",
     "@mui/types": "packages/mui-types/build",
     "@mui/utils": "packages/mui-utils/build",
-    "@mui-internal/docs-utils": "packages/docs-utils",
-    "@mui-internal/typescript-to-proptypes": "packages/typescript-to-proptypes"
+    "@mui-internal/docs-utils": "packages/docs-utils"
   },
   "sandboxes": [
-    "material-ui-issue-latest-s2dsx",
-    "/examples/material-ui-cra",
     "/examples/material-ui-cra-ts",
     "/examples/joy-ui-cra-ts",
     "/examples/base-ui-cra-ts"

.eslintignore

@@ -23,9 +23,10 @@
 /packages/zero-runtime/processors/
 /packages/zero-runtime/exports/
 /packages/zero-runtime/theme/
+/packages/zero-runtime/tests/fixtures/
 /packages/zero-next-plugin/loader.js
 # Ignore fixtures
-/packages/typescript-to-proptypes/test/*/*
+/packages-internal/scripts/typescript-to-proptypes/test/*/*
 /test/bundling/fixtures/**/*.fixture.js
 # just an import that reports eslint errors depending on whether the fixture (which is not checked in) exists
 /test/bundling/fixtures/create-react-app/src/index.js

.eslintrc.js

@@ -413,7 +413,7 @@ module.exports = {
       },
     },
     {
-      files: ['packages/typescript-to-proptypes/src/**/*.ts'],
+      files: ['packages-internal/scripts/typescript-to-proptypes/src/**/*.ts'],
       rules: {
         // Working with flags is common in TypeScript compiler
         'no-bitwise': 'off',

.github/workflows/ci.yml

@@ -32,12 +32,12 @@ jobs:
       - name: Set up pnpm
         uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # v2.4.0
       - name: Use Node.js 18.x
-        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
           node-version: 18
           cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
       - run: pnpm install
-      - run: pnpm release:build
+      - run: pnpm build:ci
       - run: pnpm release:changelog
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.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@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
+        uses: github/codeql-action/init@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
         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@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
+        uses: github/codeql-action/analyze@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0

.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@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
+        uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
         with:
           sarif_file: results.sarif

.github/workflows/vale-action.yml

@@ -13,7 +13,7 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: errata-ai/vale-action@c4213d4de3d5f718b8497bd86161531c78992084 # v2.0.1
+      - uses: errata-ai/vale-action@38bf078c328061f59879b347ca344a718a736018 # v2.1.0
         continue-on-error: true
         with:
           reporter: github-pr-review

.gitignore

@@ -39,6 +39,5 @@ package-lock.json
 size-snapshot.json
 docs/public/static/blog/feed/*
 # vale downloaded config
-.github/styles/Google
-.github/styles/write-good
+.github/styles/
 .nx/cache

.vale.ini

@@ -2,20 +2,14 @@
 StylesPath = .github/styles
 MinAlertLevel = suggestion
 
-Packages = Google
+# The docs/writing-rules.zip is generated by `pnpm docs:zipRules`
+Packages = Google, docs/writing-rules.zip
 
 [*.md]
 # Ignore code injection which start with {{...
 BlockIgnores = {{.*
 
-# Custom syle
-# BasedOnStyles = Blog
-
-Blog.ComposedWords = YES
-Blog.NamingConventions = YES
-Blog.Typos = YES
-Blog.BrandName = YES
-Blog.NoCompanyName = YES
+BasedOnStyles = writing-rules
 
 # Google:
 Google.FirstPerson = YES # Avoid first-person pronouns such as I, me, ...'.