Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: storybookjs/storybook
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 748710ce10a4f16d599f183f215455e450e25d32
Choose a base ref
...
head repository: storybookjs/storybook
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e89e51ad5d422dbaa83b6e2e5342fa1ad362b2e4
Choose a head ref
Loading
Showing 796 changed files with 46,999 additions and 8,678 deletions.
198 changes: 148 additions & 50 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -3,63 +3,115 @@ version: 2.1
executors:
sb_node:
parameters:
class:
description: The Resource class
type: enum
enum: ["small", "medium", "large", "xlarge"]
default: "medium"
class:
description: The Resource class
type: enum
enum: ['small', 'medium', 'large', 'xlarge']
default: 'medium'
working_directory: /tmp/storybook
docker:
- image: circleci/node:10-browsers
environment:
NODE_OPTIONS: --max_old_space_size=4096
resource_class: <<parameters.class>>
sb_node_12:
parameters:
class:
description: The Resource class
type: enum
enum: ['small', 'medium', 'large', 'xlarge']
default: 'medium'
working_directory: /tmp/storybook
docker:
- image: circleci/node:12-browsers
environment:
NODE_OPTIONS: --max_old_space_size=4096
resource_class: <<parameters.class>>

jobs:
install:
executor: sb_node
build:
executor:
class: medium
name: sb_node
steps:
- checkout
- run:
name: Remove examples
command: rm -rf examples/
- restore_cache:
name: Restore core dependencies cache
name: Restore Yarn cache
keys:
- core-dependencies-v5-{{ checksum "yarn.lock" }}
- core-dependencies-v5-
- build-yarn-cache-v4--{{ checksum "yarn.lock" }}
- build-yarn-cache-v4--
- run:
name: Install dependencies
command: yarn install
command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
- run:
name: Check that yarn.lock is not corrupted
command: yarn repo-dirty-check
name: Bootstrap
command: yarn bootstrap --core
- save_cache:
name: Cache core dependencies
key: core-dependencies-v5-{{ checksum "yarn.lock" }}
name: Save Yarn cache
key: build-yarn-cache-v4--{{ checksum "yarn.lock" }}
paths:
- node_modules
- ~/.cache/yarn
- persist_to_workspace:
root: .
paths:
- node_modules
- examples
- addons
- dev-kits
- app
- lib
build:
executor: sb_node
install-examples-deps:
executor:
class: medium
name: sb_node
steps:
- checkout
- attach_workspace:
at: .
- restore_cache:
name: Restore Yarn cache
keys:
- install-examples-deps-yarn-cache-v4--{{ checksum "yarn.lock" }}
- install-examples-deps-yarn-cache-v4--
- run:
name: Bootstrap
command: yarn bootstrap --core
name: Install dependencies
command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
- save_cache:
name: Save Yarn cache
key: install-examples-deps-yarn-cache-v4--{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn
- persist_to_workspace:
root: .
paths:
- examples
- addons
- dev-kits
- app
- lib
- node_modules
install-e2e-deps:
executor:
class: medium
name: sb_node
steps:
- checkout
- run:
name: Keep only root package
command: rm -rf examples/ && rm -rf addons/ && rm -rf app/ && rm -rf lib/
- restore_cache:
name: Restore Yarn cache
keys:
- install-e2e-deps-yarn-cache-v4--{{ checksum "yarn.lock" }}
- install-e2e-deps-yarn-cache-v4--
- run:
name: Install dependencies
command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
- save_cache:
name: Save Yarn cache
key: install-e2e-deps-yarn-cache-v4--{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn
- persist_to_workspace:
root: .
paths:
- examples
- node_modules
chromatic:
executor: sb_node
parallelism: 11
@@ -72,7 +124,9 @@ jobs:
command: |
yarn run-chromatics
packtracker:
executor: sb_node
executor:
class: medium
name: sb_node
steps:
- checkout
- attach_workspace:
@@ -83,7 +137,9 @@ jobs:
cd examples/official-storybook
yarn packtracker
examples:
executor: sb_node
executor:
class: medium
name: sb_node
parallelism: 11
steps:
- checkout
@@ -98,7 +154,9 @@ jobs:
paths:
- built-storybooks
publish:
executor: sb_node
executor:
class: medium
name: sb_node
steps:
- checkout
- attach_workspace:
@@ -111,10 +169,9 @@ jobs:
paths:
- .verdaccio-cache
examples-v2:
docker:
- image: cypress/included:4.7.0
environment:
TERM: xterm
executor:
class: medium
name: sb_node
working_directory: /tmp/storybook
parallelism: 10
steps:
@@ -134,19 +191,51 @@ jobs:
- run:
name: test local registry
command: yarn info @storybook/core
- run:
name: Install Cypress binary
command: yarn cypress install
- run:
name: run e2e tests
command: yarn test:e2e-framework
- store_artifacts:
path: /tmp/storybook/cypress
destination: cypress
examples-v2-cra-bench:
executor:
class: medium
name: sb_node_12
working_directory: /tmp/storybook
steps:
- checkout
- attach_workspace:
at: .
- run:
name: Running local registry
command: yarn local-registry --port 6000 --open
background: true
- run:
name: Wait for registry
command: yarn wait-on http://localhost:6000
- run:
name: Set registry
command: yarn config set registry http://localhost:6000/
- run:
name: Test local registry
command: yarn info @storybook/core
- run:
name: Install Cypress binary
command: yarn cypress install
- run:
name: Run @storybook/bench on a CRA project
command: yarn test:e2e-framework cra_bench
- store_artifacts:
path: /tmp/storybook/cypress
destination: cypress
examples-v2-yarn-2:
docker:
- image: cypress/included:4.7.0
environment:
TERM: xterm
executor:
class: medium
name: sb_node
working_directory: /tmp/storybook
# parallelism: 10
steps:
- checkout
- attach_workspace:
@@ -164,9 +253,12 @@ jobs:
- run:
name: test local registry
command: yarn info @storybook/core
- run:
name: Install Cypress binary
command: yarn cypress install
- run:
name: run e2e tests
command: yarn test:e2e-framework --use-yarn-2 cra
command: yarn test:e2e-framework --use-yarn-2 sfcVue cra
- store_artifacts:
path: /tmp/storybook/cypress
destination: cypress
@@ -195,7 +287,9 @@ jobs:
destination: cypress

smoke-tests:
executor: sb_node
executor:
class: medium
name: sb_node
steps:
- checkout
- attach_workspace:
@@ -264,10 +358,6 @@ jobs:
executor: sb_node
steps:
- checkout
- restore_cache:
name: Restore core dependencies cache
keys:
- core-dependencies-v5-{{ checksum "yarn.lock" }}
- run:
name: Install dependencies
command: yarn bootstrap --install
@@ -313,27 +403,31 @@ jobs:
workflows:
test:
jobs:
- install
- build:
requires:
- install
- build
- install-e2e-deps
- install-examples-deps
- lint:
requires:
- install-examples-deps
- build
- examples:
requires:
- install-examples-deps
- build
- e2e:
requires:
- examples
- smoke-tests:
requires:
- install-examples-deps
- build
- packtracker:
requires:
- install-examples-deps
- build
- test:
requires:
- install-examples-deps
- build
- coverage:
requires:
@@ -343,13 +437,17 @@ workflows:
- examples
- publish:
requires:
- install-e2e-deps
- build
- examples-v2:
requires:
- publish
- examples-v2-yarn-2:
requires:
- publish
- examples-v2-cra-bench:
requires:
- publish
deploy:
jobs:
- frontpage
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ docs/public
storybook-static
built-storybooks
lib/cli/test
lib/core/prebuilt
lib/codemod/src/transforms/__testfixtures__
scripts/storage
*.bundle.js
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ If applicable, add screenshots to help explain your problem.
**Code snippets**
If applicable, add code samples to help explain your problem.

**System:**
**System**
Please paste the results of `npx sb@next info` here.

**Additional context**
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ about: Suggest an idea for this project

---

**Is your feature request related to a problem? Please describe.**
**Is your feature request related to a problem? Please describe**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
@@ -13,7 +13,7 @@ A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Are you able to assist bring the feature to reality?**
**Are you able to assist to bring the feature to reality?**
no | yes, I can...

**Additional context**
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ If your answer is yes to any of these, please make sure to include it in your PR

<!--
Everybody: Please submit all PRs to the `next` branch unless they are specific to current release. Storybook maintainers cherry-pick bug and documentation fixes into the `master` branch as part of the release process, so you shouldn't need to worry about this.
Everybody: Please submit all PRs to the `next` branch unless they are specific to the current release. Storybook maintainers cherry-pick bug and documentation fixes into the `master` branch as part of the release process, so you shouldn't need to worry about this.
Maintainers: Please tag your pull request with at least one of the following:
`["cleanup", "BREAKING CHANGE", "feature request", "bug", "documentation", "maintenance", "dependencies", "other"]`
6 changes: 3 additions & 3 deletions .github/automention.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
'app: angular': ['kroeder', 'igor-dv', 'MaximSagan', 'Marklb']
'app: ember': ['gabrielcsapo', 'gossi', 'meirish']
'app: angular': ['kroeder', 'MaximSagan', 'Marklb']
'app: ember': ['gabrielcsapo', 'gossi', 'meirish', 'dbendaou']
'app: html': ['Hypnosphi']
'app: marko': ['nm123github']
'app: preact': ['BartWaardenburg']
'app: rax': ['SoloJiang']
'app: svelte': ['rixo', 'plumpNation']
'app: svelte': ['BlackFenix2']
'app: vue': ['backbone87', 'elevatebart', 'pksunkara', 'Aaron-Pool', 'pocka']
'app: web-components': ['daKmoR']
'api: addons': ['ndelangen']
Loading