Merge branch 'master' into radio-checked-when-string

.browserslistrc

@@ -7,44 +7,45 @@ node 14
 
 # Default/Fallback
 # `npx browserslist --mobile-to-desktop "> 0.5%, last 2 versions, Firefox ESR, not dead, not IE 11"` when the last major is released.
-# On update check all #stable-snapshot markers
+# Manually downgrading to ios_saf 12.4 for iPhone 6 and webpack 4 support.
+# On update, sync references where "#stable-snapshot" is mentioned in the codebase.
 [stable]
-and_chr 85
-and_ff 80
+and_chr 91
+and_ff 89
 and_qq 10.4
 and_uc 12.12
-android 85
+android 91
 baidu 7.12
-chrome 84
-edge 85
+chrome 90
+edge 91
 firefox 78
-ios_saf 12.2
+ios_saf 12.4
 kaios 2.5
 op_mini all
-op_mob 70
-opera 70
-safari 13.1
-samsung 11.1-11.2
+op_mob 76
+opera 76
+safari 14
+samsung 13.0
 
 # Same as `stable` but with IE 11
 [legacy]
-IE 11
-and_chr 85
-and_ff 80
+ie 11
+and_chr 91
+and_ff 89
 and_qq 10.4
 and_uc 12.12
-android 85
+android 91
 baidu 7.12
-chrome 84
-edge 85
+chrome 90
+edge 91
 firefox 78
-ios_saf 12.2
+ios_saf 12.4
 kaios 2.5
 op_mini all
-op_mob 70
-opera 70
-safari 13.1
-samsung 11.1-11.2
+op_mob 76
+opera 76
+safari 14
+samsung 13.0
 
 # snapshot of `npx browserslist "maintained node versions"`
 # On update check all #stable-snapshot markers

.circleci/config.yml

@@ -1,6 +1,10 @@
 version: 2.1
 
 parameters:
+  browserstack-force:
+    description: Whether to force browserstack usage. We have limited resources on browserstack so the pipeline might decide to skip browserstack if this parameter isn't set to true.
+    type: boolean
+    default: false
   react-dist-tag:
     description: The dist-tag of react to be used
     type: string
@@ -24,6 +28,7 @@ defaults: &defaults
     # Keep in sync with "Save playwright cache"
     PLAYWRIGHT_BROWSERS_PATH: /tmp/pw-browsers
     # expose it globally otherwise we have to thread it from each job to the install command
+    BROWSERSTACK_FORCE: << pipeline.parameters.browserstack-force >>
     REACT_DIST_TAG: << parameters.react-dist-tag >>
     TEST_GATE: << parameters.test-gate >>
   working_directory: /tmp/material-ui
@@ -147,13 +152,13 @@ jobs:
             # latest commit
             LATEST_COMMIT=$(git rev-parse HEAD)
 
-            # latest commit where packages/material-ui-icons was changed
-            FOLDER_COMMIT=$(git log -1 --format=format:%H --full-diff packages/material-ui-icons)
+            # latest commit where packages/mui-icons-material was changed
+            FOLDER_COMMIT=$(git log -1 --format=format:%H --full-diff packages/mui-icons-material)
 
             if [ $FOLDER_COMMIT = $LATEST_COMMIT ]; then
               echo "changes, let's run the tests"
-              yarn workspace @material-ui/icons build:typings
-              yarn workspace @material-ui/icons test:built-typings
+              yarn workspace @mui/icons-material build:typings
+              yarn workspace @mui/icons-material test:built-typings
             else
               echo "no changes"
             fi
@@ -243,22 +248,23 @@ jobs:
       - run:
           name: Test module augmenation
           command: |
-            yarn workspace @material-ui/core typescript:module-augmentation
-            yarn workspace @material-ui/unstyled typescript:module-augmentation
+            yarn workspace @mui/material typescript:module-augmentation
+            yarn workspace @mui/core typescript:module-augmentation
 
       - restore_cache:
           name: Restore generated declaration files
           keys:
-            # We assume that the target branch is `next` and that declaration files are persisted in commit order.
+            # #default-branch-switch
+            # We assume that the target branch is `master` and that declaration files are persisted in commit order.
             # "If there are multiple matches, the most recently generated cache will be used."
-            - typescript-declaration-files-next
+            - typescript-declaration-files-master
 
       - run:
           name: Diff declaration files
           command: |
-            git add -f packages/material-ui/build || echo '/core declarations do not exist'
-            git add -f packages/material-ui-lab/build || echo '/lab declarations do not exist'
-            git add -f packages/material-ui-utils/build || echo '/utils declarations do not exist'
+            git add -f packages/mui-material/build || echo '/core declarations do not exist'
+            git add -f packages/mui-lab/build || echo '/lab declarations do not exist'
+            git add -f packages/mui-utils/build || echo '/utils declarations do not exist'
             yarn lerna run --parallel build:types
             git --no-pager diff
 
@@ -270,9 +276,9 @@ jobs:
           key: typescript-declaration-files-{{ .Branch }}-{{ .Revision }}
           paths:
             # packages with generated declaration files
-            - packages/material-ui/build
-            - packages/material-ui-lab/build
-            - packages/material-ui-utils/build
+            - packages/mui-material/build
+            - packages/mui-lab/build
+            - packages/mui-utils/build
   test_types_next:
     <<: *defaults
     steps:
@@ -306,9 +312,9 @@ jobs:
       - run:
           name: Diff declaration files
           command: |
-            git add -f packages/material-ui/build || echo '/core declarations do not exist'
-            git add -f packages/material-ui-lab/build || echo '/lab declarations do not exist'
-            git add -f packages/material-ui-utils/build || echo '/utils declarations do not exist'
+            git add -f packages/mui-material/build || echo '/core declarations do not exist'
+            git add -f packages/mui-lab/build || echo '/lab declarations do not exist'
+            git add -f packages/mui-utils/build || echo '/utils declarations do not exist'
             yarn lerna run --parallel build:types
             git --no-pager diff
 
@@ -362,8 +368,8 @@ jobs:
           name: yarn test:e2e
           command: yarn test:e2e
       - run:
-          name: Can we generate the @material-ui/core umd build?
-          command: yarn workspace @material-ui/core build:umd
+          name: Can we generate the @mui/material umd build?
+          command: yarn workspace @mui/material build:umd
       - run:
           name: Test umd release
           command: yarn test:umd
@@ -417,7 +423,7 @@ jobs:
       - install_js
       - run:
           name: Build packages for fixtures
-          command: yarn lerna run --scope "@material-ui/*" build
+          command: yarn lerna run --scope "@mui/*" build
       - persist_to_workspace:
           root: packages
           paths:

.codesandbox/ci.json

@@ -3,32 +3,34 @@
   "installCommand": "install:codesandbox",
   "node": "12",
   "packages": [
-    "packages/material-ui",
-    "packages/material-ui-codemod",
-    "packages/material-ui-icons",
-    "packages/material-ui-lab",
-    "packages/material-ui-styles",
-    "packages/material-ui-system",
-    "packages/material-ui-private-theming",
-    "packages/material-ui-types",
-    "packages/material-ui-utils",
-    "packages/material-ui-unstyled",
-    "packages/material-ui-styled-engine",
-    "packages/material-ui-styled-engine-sc"
+    "packages/mui-material",
+    "packages/mui-codemod",
+    "packages/mui-icons-material",
+    "packages/mui-lab",
+    "packages/mui-styles",
+    "packages/mui-system",
+    "packages/mui-private-theming",
+    "packages/mui-types",
+    "packages/mui-utils",
+    "packages/mui-core",
+    "packages/mui-styled-engine",
+    "packages/mui-styled-engine-sc",
+    "packages/mui-material-next"
   ],
   "publishDirectory": {
-    "@material-ui/codemod": "packages/material-ui-codemod/build",
-    "@material-ui/core": "packages/material-ui/build",
-    "@material-ui/icons": "packages/material-ui-icons/build",
-    "@material-ui/lab": "packages/material-ui-lab/build",
-    "@material-ui/styles": "packages/material-ui-styles/build",
-    "@material-ui/styled-engine": "packages/material-ui-styled-engine/build",
-    "@material-ui/styled-engine-sc": "packages/material-ui-styled-engine-sc/build",
-    "@material-ui/system": "packages/material-ui-system/build",
-    "@material-ui/private-theming": "packages/material-ui-private-theming/build",
-    "@material-ui/types": "packages/material-ui-types/build",
-    "@material-ui/utils": "packages/material-ui-utils/build",
-    "@material-ui/unstyled": "packages/material-ui-unstyled/build"
+    "@mui/codemod": "packages/mui-codemod/build",
+    "@mui/material": "packages/mui-material/build",
+    "@mui/icons-material": "packages/mui-icons-material/build",
+    "@mui/lab": "packages/mui-lab/build",
+    "@mui/styles": "packages/mui-styles/build",
+    "@mui/styled-engine": "packages/mui-styled-engine/build",
+    "@mui/styled-engine-sc": "packages/mui-styled-engine-sc/build",
+    "@mui/system": "packages/mui-system/build",
+    "@mui/private-theming": "packages/mui-private-theming/build",
+    "@mui/types": "packages/mui-types/build",
+    "@mui/utils": "packages/mui-utils/build",
+    "@mui/core": "packages/mui-core/build",
+    "@mui/material-next": "packages/mui-material-next/build"
   },
   "sandboxes": [
     "material-ui-issue-dh2yh",

.eslintignore

@@ -9,15 +9,15 @@
 /examples/preact/scripts
 # auto-generated by Framer
 /framer/Material-UI.framerfx/design/document.json
-/packages/material-ui-codemod/lib
-/packages/material-ui-codemod/src/*/*.test/*
-/packages/material-ui-icons/fixtures
-/packages/material-ui-icons/legacy
-/packages/material-ui-icons/lib
-/packages/material-ui-icons/material-icons/
-/packages/material-ui-icons/src/*.js
-/packages/material-ui-icons/templateSvgIcon.js
-/packages/material-ui-utils/macros/__fixtures__/
+/packages/mui-codemod/lib
+/packages/mui-codemod/src/*/*.test/*
+/packages/mui-icons-material/fixtures
+/packages/mui-icons-material/legacy
+/packages/mui-icons-material/lib
+/packages/mui-icons-material/material-icons/
+/packages/mui-icons-material/src/*.js
+/packages/mui-icons-material/templateSvgIcon.js
+/packages/mui-utils/macros/__fixtures__/
 # Ignore fixtures
 /packages/typescript-to-proptypes/test/*/*
 /test/bundling/fixtures/**/*.fixture.js