Skip to content

Commit

Permalink
Merge branch 'next' into direct-logs-to-stdout
Browse files Browse the repository at this point in the history
  • Loading branch information
ndelangen committed Oct 17, 2022
2 parents 1342ba0 + a2ca823 commit b125118
Show file tree
Hide file tree
Showing 1,000 changed files with 4,513 additions and 29,090 deletions.
50 changes: 35 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ executors:
default: 'medium'
working_directory: /tmp/storybook
docker:
- image: cimg/node:14.19
- image: cimg/node:16.17.1
environment:
NODE_OPTIONS: --max_old_space_size=3076
resource_class: <<parameters.class>>
Expand All @@ -23,7 +23,7 @@ executors:
default: 'medium'
working_directory: /tmp/storybook
docker:
- image: cimg/node:14.19-browsers
- image: cimg/node:16.17.1-browsers
environment:
NODE_OPTIONS: --max_old_space_size=3076
resource_class: <<parameters.class>>
Expand Down Expand Up @@ -75,6 +75,22 @@ commands:
fi
jobs:
check:
executor:
class: xlarge
name: sb_node_14_classic
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
- restore_cache:
name: Restore Yarn cache
keys:
- build-yarn-2-cache-v4--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
- run:
name: Compile
command: |
yarn task --task check --start-from=auto --no-link --debug
git diff --exit-code
build:
executor:
class: xlarge
Expand Down Expand Up @@ -106,6 +122,7 @@ jobs:
- code/addons
- code/frameworks
- code/lib
- code/ui
- code/renderers
- code/presets
chromatic:
Expand All @@ -125,7 +142,7 @@ jobs:
executor:
class: medium+
name: sb_node_14_browsers
parallelism: 12
parallelism: 4
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
Expand Down Expand Up @@ -207,16 +224,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
Expand Down Expand Up @@ -305,7 +322,7 @@ jobs:
executor:
class: medium+
name: sb_node_14_browsers
parallelism: 15
parallelism: 20
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
Expand All @@ -324,7 +341,7 @@ jobs:
executor:
class: medium+
name: sb_node_14_browsers
parallelism: 14
parallelism: 15
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
Expand All @@ -339,7 +356,7 @@ jobs:
executor:
class: medium+
name: sb_node_14_browsers
parallelism: 15
parallelism: 20
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
Expand All @@ -358,7 +375,7 @@ jobs:
executor:
class: medium+
name: sb_node_14_browsers
parallelism: 15
parallelism: 18
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
Expand All @@ -373,7 +390,7 @@ jobs:
executor:
class: medium+
name: sb_node_14_browsers
parallelism: 15
parallelism: 20
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
Expand All @@ -388,7 +405,7 @@ jobs:
executor:
class: medium+
name: sb_playwright
parallelism: 15
parallelism: 20
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
Expand All @@ -410,6 +427,9 @@ workflows:
- lint:
requires:
- build
- check:
requires:
- build
- examples:
requires:
- build
Expand Down Expand Up @@ -439,9 +459,9 @@ workflows:
- create-sandboxes:
requires:
- publish
- smoke-test-sandboxes:
requires:
- create-sandboxes
# - smoke-test-sandboxes: # disabled for now
# requires:
# - create-sandboxes
- build-sandboxes:
requires:
- create-sandboxes
Expand Down
25 changes: 0 additions & 25 deletions .github/autolabeler.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/cron-weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
check-links:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: gaurav-nelson/github-action-markdown-link-check@v1
# checks all markdown files from important folders including all subfolders
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/danger-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
steps:
- uses: actions/setup-node@v2
with:
node-version: '14'
- uses: actions/checkout@master
node-version: '16'
- uses: actions/checkout@v3
- name: Danger JS
uses: danger/[email protected]
env:
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/generate-repros-next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ on:
push:
branches:
- vite-frameworks-xyz
- norbert/sb-524-webpack5react18ts
- norbert/sb-525-webpack5react17js

jobs:
generate:
Expand All @@ -19,17 +17,16 @@ jobs:
steps:
- uses: actions/setup-node@v2
with:
node-version: 14
- uses: actions/checkout@v2
node-version: 16
- uses: actions/checkout@v3
- name: Setup git user
run: |
git config --global user.name "Storybook Bot"
git config --global user.email "[email protected]"
- name: Install dependencies
run: node ./scripts/check-dependencies.js
- name: Bootstrap Storybook libraries
run: yarn task --task compile --start-from=auto --no-link
working-directory: ./code
- name: Compile Storybook libraries
run: yarn task --task publish --start-from=auto --no-link
- name: Generate repros
run: yarn generate-repros-next --local-registry
working-directory: ./code
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/generate-repros.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
steps:
- uses: actions/setup-node@v2
with:
node-version: 14
- uses: actions/checkout@v2
node-version: 16
- uses: actions/checkout@v3
- name: Setup git user
run: |
git config --global user.name "Storybook Bot"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/handle-release-branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
if: ${{ needs.branch-checks.outputs.is-latest-branch == 'true' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- run: curl -X POST "https://api.netlify.com/build_hooks/${{ secrets.FRONTPAGE_HOOK }}"

Expand All @@ -32,7 +32,7 @@ jobs:
if: ${{ needs.branch-checks.outputs.is-next-branch == 'true' || needs.branch-checks.outputs.is-release-branch == 'true' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: next
path: next
Expand All @@ -54,7 +54,7 @@ jobs:
if: ${{ needs.branch-checks.outputs.is-next-branch == 'true' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
node_version: [14, 16]
node_version: [16]
include:
- os: macos-latest
node_version: 16
- os: windows-latest
node_version: 16
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set node version to ${{ matrix.node_version }}
uses: actions/setup-node@v2
with:
Expand Down
51 changes: 19 additions & 32 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -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>/**"
]
}
]
}
}
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"deepscan.enable": true
"deepscan.enable": true,
"typescript.tsdk": "./code/node_modules/typescript/lib"
}
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.2.3.cjs
installStatePath: "./.yarn/root-install-state.gz"
Loading

0 comments on commit b125118

Please sign in to comment.