Merge branch 'next' into pr/18962

storybookjs · Sep 7, 2022 · 6e6d53c · 6e6d53c
2 parents b15e527 + 3726dd9
commit 6e6d53c
Show file tree

Hide file tree

Showing 640 changed files with 14,083 additions and 8,068 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -42,6 +42,19 @@ executors:
         environment:
           NODE_OPTIONS: --max_old_space_size=3076
     resource_class: <<parameters.class>>
+  sb_playwright:
+    parameters:
+      class:
+        description: The Resource class
+        type: enum
+        enum: ['small', 'medium', 'medium+', 'large', 'xlarge']
+        default: 'medium'
+    working_directory: /tmp/storybook
+    docker:
+      - image: mcr.microsoft.com/playwright:v1.25.1-focal
+        environment:
+          NODE_OPTIONS: --max_old_space_size=3076
+    resource_class: <<parameters.class>>
 
 orbs:
   git-shallow-clone: guitarrapc/[email protected]
@@ -195,13 +208,13 @@ jobs:
           name: running local registry
           command: |
             cd code
-            yarn local-registry --port 6000 --open
+            yarn local-registry --port 6001 --open
           background: true
       - run:
           name: Wait for registry
           command: |
             cd code
-            yarn wait-on http://localhost:6000
+            yarn wait-on http://localhost:6001
       - run:
           name: Run E2E (extended) tests
           command: |
@@ -225,13 +238,13 @@ jobs:
           name: Running local registry
           command: |
             cd code
-            yarn local-registry --port 6000 --open
+            yarn local-registry --port 6001 --open
           background: true
       - run:
           name: Wait for registry
           command: |
             cd code
-            yarn wait-on http://localhost:6000
+            yarn wait-on http://localhost:6001
       - run:
           name: Run E2E (core) tests
           # Do not test CRA here because it's done in PnP part
@@ -257,49 +270,44 @@ jobs:
   #   executor:
   #     class: large
   #     name: sb_cypress_8_node_14
-  #   parallelism: 2
+  #   parallelism: 8
   #   steps:
   #     - git-shallow-clone/checkout_advanced:
   #         clone_options: '--depth 1 --verbose'
   #     - attach_workspace:
   #         at: .
   #     - run:
   #         name: Running local registry
-  #         command: yarn local-registry --port 6000 --open
+  #         command: yarn local-registry --port 6001 --open
   #         background: true
   #     - run:
   #         name: Wait for registry
-  #         command: yarn wait-on http://localhost:6000
+  #         command: yarn wait-on http://localhost:6001
   #     - run:
   #         name: Run smoke tests
   #         command: yarn test:e2e-framework angular_modern_inline_rendering --test-runner --docs-mode
   #         no_output_timeout: 5m
   cra-bench:
     executor:
-      class: medium
-      name: sb_cypress_8_node_14
+      class: medium+
+      name: sb_playwright
     working_directory: /tmp/storybook
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
       - attach_workspace:
           at: .
-      - run:
-          name: install playright
-          command: |
-            cd code
-            npx playwright install
       - run:
           name: Running local registry
           command: |
             cd code
-            yarn local-registry --port 6000 --open
+            yarn local-registry --port 6001 --open
           background: true
       - run:
           name: Wait for registry
           command: |
             cd code
-            yarn wait-on http://localhost:6000
+            yarn wait-on http://localhost:6001
       - run:
           name: set up cra repro, skip tests
           command: |
@@ -309,7 +317,14 @@ jobs:
           name: Run @storybook/bench on repro
           command: |
             cd ./cra-bench
-            npx @storybook/[email protected] 'echo noop' --label cra
+            npx -p @storybook/[email protected] sb-bench 'echo noop' --label cra
+      - run:
+          name: prep artifacts
+          when: always
+          command: tar cvzf /tmp/sb-bench.tar.gz ./cra-bench
+      - store_artifacts:
+          path: /tmp/sb-bench.tar.gz
+          destination: sb-bench.tar.gz
   e2e-tests-pnp:
     executor:
       class: medium
@@ -324,13 +339,13 @@ jobs:
           name: Running local registry
           command: |
             cd code
-            yarn local-registry --port 6000 --open
+            yarn local-registry --port 6001 --open
           background: true
       - run:
           name: Wait for registry
           command: |
             cd code
-            yarn wait-on http://localhost:6000
+            yarn wait-on http://localhost:6001
       - run:
           name: run e2e tests cra
           command: |
@@ -462,7 +477,7 @@ jobs:
     executor:
       class: medium+
       name: sb_node_14_browsers
-    parallelism: 2
+    parallelism: 7
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
@@ -482,7 +497,7 @@ jobs:
     executor:
       class: medium+
       name: sb_node_14_browsers
-    parallelism: 2
+    parallelism: 7
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
@@ -498,7 +513,7 @@ jobs:
     executor:
       class: medium+
       name: sb_node_14_browsers
-    parallelism: 2
+    parallelism: 7
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
@@ -518,7 +533,7 @@ jobs:
     executor:
       class: medium+
       name: sb_node_14_browsers
-    parallelism: 2
+    parallelism: 7
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
@@ -534,7 +549,7 @@ jobs:
     executor:
       class: medium+
       name: sb_node_14_browsers
-    parallelism: 2
+    parallelism: 7
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
@@ -547,9 +562,10 @@ jobs:
       - store_test_results:
           path: code/test-results
   e2e-sandboxes:
-    docker:
-      - image: mcr.microsoft.com/playwright:v1.24.0-focal
-    parallelism: 2
+    executor:
+      class: medium+
+      name: sb_playwright
+    parallelism: 7
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'

diff --git a/.github/workflows/generate-repros-next.yml b/.github/workflows/generate-repros-next.yml
@@ -2,19 +2,22 @@ name: Generate and push repros to the next branch
 
 on:
   schedule:
-    - cron: "2 2 */1 * *"
+    - cron: '2 2 */1 * *'
   workflow_dispatch:
   # To remove when the branch will be merged
   push:
     branches:
-      - shilman/add-angular-repro-template
+      - vite-frameworks-xyz
 
 jobs:
   generate:
     runs-on: ubuntu-latest
     env:
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
     steps:
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 14
       - uses: actions/checkout@v2
       - name: Setup git user
         run: |
@@ -26,7 +29,7 @@ jobs:
         run: yarn bootstrap --prep
         working-directory: ./code
       - name: Generate repros
-        run: yarn generate-repros-next
+        run: yarn generate-repros-next --local-registry
         working-directory: ./code
       - name: Publish repros to GitHub
         run: yarn publish-repros --remote=https://storybook-bot:${{ secrets.PAT_STORYBOOK_BOT}}@github.com/storybookjs/repro-templates-temp.git --push

diff --git a/.github/workflows/generate-repros.yml b/.github/workflows/generate-repros.yml
@@ -15,6 +15,9 @@ jobs:
     env:
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
     steps:
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 14
       - uses: actions/checkout@v2
       - name: Setup git user
         run: |

diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,6 @@ dist
 junit.xml
 /repros
 /sandbox
-/built-sandboxes
 .verdaccio-cache
 
 # Yarn stuff

diff --git a/.ignore b/.ignore
@@ -0,0 +1 @@
+!/sandbox