Merge branch 'next' of github.com:storybookjs/storybook into jeppe/en…

…force-manager-builder-first

.circleci/config.yml

@@ -36,7 +36,7 @@ executors:
         default: 'medium'
     working_directory: /tmp/storybook
     docker:
-      - image: mcr.microsoft.com/playwright:v1.26.0-focal
+      - image: mcr.microsoft.com/playwright:v1.27.0-focal
         environment:
           NODE_OPTIONS: --max_old_space_size=3076
     resource_class: <<parameters.class>>
@@ -85,26 +85,15 @@ jobs:
       - restore_cache:
           name: Restore Yarn cache
           keys:
-            - build-yarn-2-cache-v3--{{ checksum "code/yarn.lock" }}
+            - build-yarn-2-cache-v4--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
       - run:
-          name: Install dependencies
+          name: Compile
           command: |
-            cd code
-            yarn install --immutable
-      - run:
-          name: Install script dependencies
-          command: |
-            cd scripts
-            yarn install --immutable
-      - run:
-          name: Bootstrap
-          command: |
-            cd code
-            yarn bootstrap --build
+            yarn task --task compile --start-from=auto --no-link --debug
             git diff --exit-code
       - save_cache:
           name: Save Yarn cache
-          key: build-yarn-2-cache-v3--{{ checksum "code/yarn.lock" }}
+          key: build-yarn-2-cache-v4--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
           paths:
             - ~/.yarn/berry/cache
       - persist_to_workspace:
@@ -136,7 +125,7 @@ jobs:
     executor:
       class: medium+
       name: sb_node_14_browsers
-    parallelism: 12
+    parallelism: 6
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
@@ -218,16 +207,16 @@ jobs:
           name: set up cra repro, skip tests
           command: |
             cd code
-            node ./lib/cli/bin/index.js repro -t cra --e2e ../cra-bench
+            node ./lib/cli/bin/index.js repro -t cra --e2e ../../cra-bench
       - run:
           name: Run @storybook/bench on repro
           command: |
-            cd ./cra-bench
+            cd ../cra-bench
             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
+          command: tar cvzf /tmp/sb-bench.tar.gz ../cra-bench
       - store_artifacts:
           path: /tmp/sb-bench.tar.gz
           destination: sb-bench.tar.gz
@@ -316,54 +305,51 @@ jobs:
     executor:
       class: medium+
       name: sb_node_14_browsers
-    parallelism: 12
+    parallelism: 16
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
       - attach_workspace:
           at: .
       - run:
           name: Creating Sandboxes
-          command: yarn task --task create --template $(yarn get-template ci create) --force --no-before --junit
-          working_directory: code
+          command: yarn task --task sandbox --template $(yarn get-template ci create) --no-link --start-from=never --junit
       - persist_to_workspace:
           root: .
           paths:
             - sandbox
       - store_test_results:
-          path: code/test-results
+          path: test-results
   smoke-test-sandboxes:
     executor:
       class: medium+
       name: sb_node_14_browsers
-    parallelism: 12
+    parallelism: 15
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
       - attach_workspace:
           at: .
       - run:
           name: Smoke Testing Sandboxes
-          command: yarn task --task smoke-test --template $(yarn get-template ci smoke-test) --force --no-before --junit
-          working_directory: code
+          command: yarn task --task smoke-test --template $(yarn get-template ci smoke-test) --no-link --start-from=never --junit
       - store_test_results:
-          path: code/test-results
+          path: test-results
   build-sandboxes:
     executor:
       class: medium+
       name: sb_node_14_browsers
-    parallelism: 12
+    parallelism: 16
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
       - attach_workspace:
           at: .
       - run:
           name: Building Sandboxes
-          command: yarn task --task build --template $(yarn get-template ci build) --force --no-before --junit
-          working_directory: code
+          command: yarn task --task build --template $(yarn get-template ci build) --no-link --start-from=never --junit
       - store_test_results:
-          path: code/test-results
+          path: test-results
       - persist_to_workspace:
           root: .
           paths:
@@ -372,50 +358,47 @@ jobs:
     executor:
       class: medium+
       name: sb_node_14_browsers
-    parallelism: 12
+    parallelism: 16
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
       - attach_workspace:
           at: .
       - run:
           name: Running Test Runner
-          command: yarn task --task test-runner --template $(yarn get-template ci test-runner) --force --no-before --junit
-          working_directory: code
+          command: yarn task --task test-runner --template $(yarn get-template ci test-runner) --no-link --start-from=never --junit
       - store_test_results:
-          path: code/test-results
+          path: test-results
   chromatic-sandboxes:
     executor:
       class: medium+
       name: sb_node_14_browsers
-    parallelism: 12
+    parallelism: 16
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
       - attach_workspace:
           at: .
       - run:
           name: Running Chromatic
-          command: yarn task --task chromatic --template $(yarn get-template ci chromatic) --force --no-before --junit
-          working_directory: code
+          command: yarn task --task chromatic --template $(yarn get-template ci chromatic) --no-link --start-from=never --junit
       - store_test_results:
-          path: code/test-results
+          path: test-results
   e2e-sandboxes:
     executor:
       class: medium+
       name: sb_playwright
-    parallelism: 12
+    parallelism: 16
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
       - attach_workspace:
           at: .
       - run:
           name: Running E2E Tests
-          command: yarn task --task e2e-tests --template $(yarn get-template ci e2e-tests) --force --no-before --junit
-          working_directory: code
+          command: yarn task --task e2e-tests --template $(yarn get-template ci e2e-tests) --no-link --start-from=never --junit
       - store_test_results:
-          path: code/test-results
+          path: test-results
       - store_artifacts: # this is where playwright puts more complex stuff
           path: code/playwright-results/
           destination: playwright

.github/workflows/generate-repros-next.yml

@@ -8,8 +8,7 @@ on:
   push:
     branches:
       - vite-frameworks-xyz
-      - norbert/sb-524-webpack5react18ts
-      - norbert/sb-525-webpack5react17js
+      - norbert/sb-565-javascript
 
 jobs:
   generate:
@@ -28,8 +27,7 @@ jobs:
       - name: Install dependencies
         run: node ./scripts/check-dependencies.js
       - name: Bootstrap Storybook libraries
-        run: yarn bootstrap --prep
-        working-directory: ./code
+        run: yarn task --task compile --start-from=auto --no-link
       - name: Generate repros
         run: yarn generate-repros-next --local-registry
         working-directory: ./code

.github/workflows/tests-unit.yml

@@ -29,12 +29,7 @@ jobs:
         with:
           node-version: ${{ matrix.node_version }}
           cache: yarn
-      - name: install, bootstrap
-        run: |
-          cd code
-          yarn install --immutable
-          yarn bootstrap --core
+      - name: install and compile
+        run: yarn task --task compile --start-from=auto
       - name: test
-        run: |
-          cd code
-          yarn test --runInBand --ci
+        run: yarn test --runInBand --ci

.gitignore

@@ -18,4 +18,4 @@ junit.xml
 !/**/.yarn/sdks
 !/**/.yarn/versions
 /**/.pnp.*
-/yarn.lock
+!/node_modules

.vscode/launch.json

@@ -3,36 +3,23 @@
   // Hover to view descriptions of existing attributes.
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
-  "configurations": [{
-    "type": "node",
-    "request": "launch",
-    "name": "official-storybook",
-    "runtimeExecutable": "npm",
-    "cwd": "${workspaceFolder}/code/examples/official-storybook",
-    "runtimeArgs": [
-      "run-script",
-      "debug"
-    ],
-    "port": 9229,
-    "skipFiles": [
-      "<node_internals>/**"
-    ]
-  }, {
-    "type": "node",
-    "request": "launch",
-    "name": "cli html",
-    "cwd": "${workspaceFolder}/code/lib/cli/stories",
-    "runtimeArgs": [
-      "--inspect-brk",
-      "${workspaceFolder}/code/lib/cli/bin/index.js",
-      "init",
-      "--type",
-      "html"
-    ],
-    "port": 9229,
-    "skipFiles": [
-      "<node_internals>/**"
-    ]
-  }
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "cli html",
+      "cwd": "${workspaceFolder}/code/lib/cli/stories",
+      "runtimeArgs": [
+        "--inspect-brk",
+        "${workspaceFolder}/code/lib/cli/bin/index.js",
+        "init",
+        "--type",
+        "html"
+      ],
+      "port": 9229,
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
+    }
   ]
-}
+}