Merge branch 'next' into feat/styleProps-explicit

.circleci/config.yml

@@ -398,6 +398,207 @@ jobs:
       - run:
           name: Upload screenshots to Argos CI
           command: yarn test:argos
+  test_bundling_prepare:
+    <<: *defaults
+    steps:
+      - checkout
+      - install_js
+      - run:
+          name: Build packages for fixtures
+          command: yarn lerna run --scope "@material-ui/*" build
+      - persist_to_workspace:
+          root: packages
+          paths:
+            - '*/build'
+
+  test_bundling_node-esm:
+    <<: *defaults
+    working_directory: /tmp/material-ui/test/bundling/fixtures/node-esm/
+    steps:
+      - checkout:
+          path: /tmp/material-ui
+      - attach_workspace:
+          at: /tmp/material-ui/packages
+      - run:
+          name: Prepare fixture
+          command: |
+            node ../../scripts/useBuildFromSource.js .
+            node ../../scripts/createFixture node-esm
+      - run:
+          name: Install dependencies
+          command: yarn
+      - run:
+          name: Test fixture
+          command: |
+            # TODO: Known failure
+            set +e
+            yarn start
+            exit 0
+  test_bundling_next-webpack4:
+    <<: *defaults
+    working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/
+    docker:
+      - image: mcr.microsoft.com/playwright@sha256:1700531ce01a3d974cc440bb8efcf43d31d58ee5f1d354fc21563ea5fe4291e6
+        environment:
+          NODE_ENV: development # Needed if playwright is in `devDependencies`
+    steps:
+      - checkout:
+          path: /tmp/material-ui
+      - attach_workspace:
+          at: /tmp/material-ui/packages
+      - run:
+          name: Prepare fixture
+          command: |
+            node ../../scripts/useBuildFromSource.js .
+            node ../../scripts/createFixture next-webpack4
+      - run:
+          name: Install dependencies
+          command: yarn
+      - run:
+          name: Test fixture
+          command: yarn start
+  test_bundling_next-webpack5:
+    <<: *defaults
+    working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/
+    docker:
+      - image: mcr.microsoft.com/playwright@sha256:1700531ce01a3d974cc440bb8efcf43d31d58ee5f1d354fc21563ea5fe4291e6
+        environment:
+          NODE_ENV: development # Needed if playwright is in `devDependencies`
+    steps:
+      - checkout:
+          path: /tmp/material-ui
+      - attach_workspace:
+          at: /tmp/material-ui/packages
+      - run:
+          name: Prepare fixture
+          command: |
+            node ../../scripts/useBuildFromSource.js .
+            node ../../scripts/createFixture next-webpack5
+      - run:
+          name: Install dependencies
+          command: yarn
+      - run:
+          name: Test fixture
+          command: yarn start
+  test_bundling_create-react-app:
+    <<: *defaults
+    working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/
+    docker:
+      - image: mcr.microsoft.com/playwright@sha256:1700531ce01a3d974cc440bb8efcf43d31d58ee5f1d354fc21563ea5fe4291e6
+        environment:
+          NODE_ENV: development # Needed if playwright is in `devDependencies`
+    steps:
+      - checkout:
+          path: /tmp/material-ui
+      - attach_workspace:
+          at: /tmp/material-ui/packages
+      - run:
+          name: Prepare fixture
+          command: |
+            node ../../scripts/useBuildFromSource.js .
+            node ../../scripts/createFixture create-react-app
+      - run:
+          name: Install dependencies
+          command: yarn
+      - run:
+          name: Test fixture
+          command: yarn start
+  test_bundling_snowpack:
+    <<: *defaults
+    working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/
+    docker:
+      - image: mcr.microsoft.com/playwright@sha256:1700531ce01a3d974cc440bb8efcf43d31d58ee5f1d354fc21563ea5fe4291e6
+        environment:
+          NODE_ENV: development # Needed if playwright is in `devDependencies`
+    steps:
+      - checkout:
+          path: /tmp/material-ui
+      - attach_workspace:
+          at: /tmp/material-ui/packages
+      - run:
+          name: Prepare fixture
+          command: |
+            node ../../scripts/useBuildFromSource.js .
+            node ../../scripts/createFixture snowpack
+      - run:
+          name: Install dependencies
+          command: yarn
+      - run:
+          name: Test fixture
+          command: yarn start
+  test_bundling_vite:
+    <<: *defaults
+    working_directory: /tmp/material-ui/test/bundling/fixtures/vite/
+    docker:
+      - image: mcr.microsoft.com/playwright@sha256:1700531ce01a3d974cc440bb8efcf43d31d58ee5f1d354fc21563ea5fe4291e6
+        environment:
+          NODE_ENV: development # Needed if playwright is in `devDependencies`
+    steps:
+      - checkout:
+          path: /tmp/material-ui
+      - attach_workspace:
+          at: /tmp/material-ui/packages
+      - run:
+          name: Prepare fixture
+          command: |
+            node ../../scripts/useBuildFromSource.js .
+            node ../../scripts/createFixture vite
+      - run:
+          name: Install dependencies
+          command: yarn
+      - run:
+          name: Test fixture
+          command: yarn start
+  test_bundling_esbuild:
+    <<: *defaults
+    working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/
+    docker:
+      - image: mcr.microsoft.com/playwright@sha256:1700531ce01a3d974cc440bb8efcf43d31d58ee5f1d354fc21563ea5fe4291e6
+        environment:
+          NODE_ENV: development # Needed if playwright is in `devDependencies`
+    steps:
+      - checkout:
+          path: /tmp/material-ui
+      - attach_workspace:
+          at: /tmp/material-ui/packages
+      - run:
+          name: Prepare fixture
+          command: |
+            node ../../scripts/useBuildFromSource.js .
+            node ../../scripts/createFixture esbuild
+      - run:
+          name: Install dependencies
+          command: yarn
+      - run:
+          name: Test fixture
+          command: |
+            # TODO: Known failure
+            set +e
+            yarn start
+            exit 0
+  test_bundling_gatsby:
+    <<: *defaults
+    working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/
+    docker:
+      - image: mcr.microsoft.com/playwright@sha256:1700531ce01a3d974cc440bb8efcf43d31d58ee5f1d354fc21563ea5fe4291e6
+        environment:
+          NODE_ENV: development # Needed if playwright is in `devDependencies`
+    steps:
+      - checkout:
+          path: /tmp/material-ui
+      - attach_workspace:
+          at: /tmp/material-ui/packages
+      - run:
+          name: Prepare fixture
+          command: |
+            node ../../scripts/useBuildFromSource.js .
+            node ../../scripts/createFixture gatsby
+      - run:
+          name: Install dependencies
+          command: yarn
+      - run:
+          name: Test fixture
+          command: yarn start
 workflows:
   version: 2
   pipeline:
@@ -426,6 +627,35 @@ workflows:
       - test_e2e:
           requires:
             - checkout
+  bundling:
+    when:
+      equal: [bundling, << pipeline.parameters.workflow >>]
+    jobs:
+      - test_bundling_prepare
+      - test_bundling_node-esm:
+          requires:
+            - test_bundling_prepare
+      - test_bundling_next-webpack4:
+          requires:
+            - test_bundling_prepare
+      - test_bundling_next-webpack5:
+          requires:
+            - test_bundling_prepare
+      - test_bundling_create-react-app:
+          requires:
+            - test_bundling_prepare
+      - test_bundling_snowpack:
+          requires:
+            - test_bundling_prepare
+      - test_bundling_vite:
+          requires:
+            - test_bundling_prepare
+      - test_bundling_esbuild:
+          requires:
+            - test_bundling_prepare
+      - test_bundling_gatsby:
+          requires:
+            - test_bundling_prepare
   profile:
     when:
       equal: [profile, << pipeline.parameters.workflow >>]

.eslintignore

@@ -2,7 +2,6 @@
 /.yarn
 /benchmark/**/dist
 /coverage
-/docs/.next
 /docs/export
 /examples/create-react-app*/src/serviceWorker.js
 /examples/gatsby/public/
@@ -22,6 +21,12 @@
 /packages/material-ui-utils/macros/__fixtures__/
 # Ignore fixtures
 /packages/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
+/test/bundling/fixtures/gatsby/.cache
+/test/bundling/fixtures/gatsby/public
 /tmp
+.next
 build
 node_modules

.eslintrc.js

@@ -369,5 +369,12 @@ module.exports = {
         ],
       },
     },
+    {
+      files: ['test/bundling/scripts/**/*.js'],
+      rules: {
+        // ES modules need extensions
+        'import/extensions': ['error', 'ignorePackages'],
+      },
+    },
   ],
 };

.git-blame-ignore-revs

@@ -1,3 +1,7 @@
+# Enable via `git config blame.ignoreRevsFile .git-blame-ignore-revs`
+# DO NOT ENABLE THIS CONFIG GLOBALLY
+# OTHERWISE git-blame WILL CRASH IN ANY REPOSITORY WITHOUT SUCH A FILE
+
 # changes to prettier config
 5dc1cbca1055c8440ae8c02fffbad7e6a1e2674e
 ef96151de118fe2560682bdedf130e69739082ea

.gitattributes

@@ -7,3 +7,7 @@ packages/**/*.d.ts -linguist-vendored
 # Kept so that we can review the impact when changing the generation script.
 packages/material-ui-icons/lib linguist-generated
 packages/material-ui-icons/material-icons linguist-vendored
+# bundling fixtures
+test/fixtures/bundling/node-esm/index.js linguist-generated
+test/fixtures/bundling/next-webpack4/pages/index.js linguist-generated
+test/fixtures/bundling/packages.js linguist-generated

.gitignore

@@ -10,14 +10,20 @@
 /benchmark/**/dist
 /coverage
 /docs/.env.local
-/docs/.next
 /docs/export
 /examples/**/.cache
 /packages/material-ui-codemod/lib
 /packages/material-ui-envinfo/*.tgz
 /packages/material-ui-icons/src/*.js
+/test/bundling/fixtures/*/yarn.lock
+# created by test/bundling/scripts/createFixture
+/test/bundling/fixtures/**/*.fixture.js
+# created by test/bundling/fixtures/gatsby gatsby build
+/test/bundling/fixtures/gatsby/.cache
+/test/bundling/fixtures/gatsby/public
 /test/regressions/screenshots
 /tmp
+.next
 build
 node_modules
 package-lock.json