diff --git a/.circleci/config.yml b/.circleci/config.yml index 1f316442d1c9..ec3554b17536 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -114,7 +114,7 @@ jobs: - node_modules chromatic: executor: sb_node - parallelism: 11 + parallelism: 4 steps: - checkout - attach_workspace: @@ -140,7 +140,7 @@ jobs: executor: class: medium name: sb_node - parallelism: 11 + parallelism: 4 steps: - checkout - attach_workspace: @@ -173,7 +173,7 @@ jobs: class: medium name: sb_node working_directory: /tmp/storybook - parallelism: 10 + parallelism: 4 steps: - checkout - attach_workspace: @@ -439,9 +439,10 @@ workflows: requires: - install-e2e-deps - build - - examples-v2: - requires: - - publish + # too slow/expensive. disabling for now + # - examples-v2: + # requires: + # - publish - examples-v2-yarn-2: requires: - publish diff --git a/.gitignore b/.gitignore index 3a78a59470fe..b6db3c6f6062 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ node_modules *.sw* npm-shrinkwrap.json dist -ts3.5 +ts3.4 .tern-port *.DS_Store .cache diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts index 058d7712f8de..c8f48c4ca9c8 100644 --- a/.teamcity/settings.kts +++ b/.teamcity/settings.kts @@ -46,8 +46,6 @@ project { buildType(E2E) buildType(SmokeTests) buildType(Frontpage) - buildType(Docs) - buildType(Lint) buildType(Test) buildType(Coverage) @@ -59,8 +57,6 @@ project { RelativeId("E2E"), RelativeId("SmokeTests"), RelativeId("Frontpage"), - RelativeId("Docs"), - RelativeId("Lint"), RelativeId("Test"), RelativeId("Coverage") ) @@ -437,87 +433,6 @@ object Frontpage : BuildType({ } }) -object Docs : BuildType({ - name = "Docs" - type = Type.DEPLOYMENT - - steps { - script { - workingDir = "docs" - scriptContent = """ - #!/bin/bash - set -e -x - - yarn install - yarn build - """.trimIndent() - dockerImage = "node:10" - dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux - } - } - - triggers { - vcs { - quietPeriodMode = VcsTrigger.QuietPeriodMode.USE_DEFAULT - triggerRules = "-:.teamcity/**" - branchFilter = """ - +: - +:next - +:master - +:pull/* - """.trimIndent() - } - } -}) - -object Lint : BuildType({ - name = "Lint" - - dependencies { - dependency(Build) { - snapshot { - onDependencyFailure = FailureAction.CANCEL - } - artifacts { - artifactRules = "dist.tar.gz!** => ." - } - } - } - - steps { - script { - scriptContent = """ - #!/bin/bash - set -e -x - - yarn install - - # TODO remove after merging - mkdir temp-eslint-teamcity - cd temp-eslint-teamcity - yarn init -y - yarn add -D eslint-teamcity - cd .. - - yarn lint:js --format ./temp-eslint-teamcity/node_modules/eslint-teamcity/index.js . - yarn lint:md . - """.trimIndent() - dockerImage = "node:10" - dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux - } - } - - failureConditions { - failOnMetricChange { - metric = BuildFailureOnMetric.MetricType.INSPECTION_ERROR_COUNT - threshold = 0 - units = BuildFailureOnMetric.MetricUnit.DEFAULT_UNIT - comparison = BuildFailureOnMetric.MetricComparison.MORE - compareTo = value() - } - } -}) - object Test : BuildType({ name = "Test" @@ -594,7 +509,6 @@ object TestWorkflow : BuildType({ dependencies { snapshot(E2E) {} snapshot(SmokeTests) {} - snapshot(Lint) {} snapshot(Coverage) {} } diff --git a/CHANGELOG.md b/CHANGELOG.md index 66aee05cf694..1ca4c7d24889 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,111 @@ +## 6.1.8 (November 27, 2020) + +### Bug Fixes + +- Core: Fix preview URL dropped hashes ([#13308](https://github.com/storybookjs/storybook/pull/13308)) +- Core: Fix template script tag support ([#13271](https://github.com/storybookjs/storybook/pull/13271)) +- Addon-docs: Fix Vue source snippets for function attributes ([#13288](https://github.com/storybookjs/storybook/pull/13288)) +- Components: Fix Zoom for IE11 ([#13302](https://github.com/storybookjs/storybook/pull/13302)) +- React: Don't add FastRefresh if already enabled ([#13303](https://github.com/storybookjs/storybook/pull/13303)) +- CLI: Fix storybook-deployer upgrade warning ([#13306](https://github.com/storybookjs/storybook/pull/13306)) + +### Maintenance + +- React: Expose StorybookConfig types ([#13309](https://github.com/storybookjs/storybook/pull/13309)) +- React: Fix unit tests for react preset ([#13315](https://github.com/storybookjs/storybook/pull/13315)) + +## 6.1.7 (November 27, 2020) + +### Bug Fixes + +- CLI: Fix not printing managerTotalTime when using cached manager ([#13294](https://github.com/storybookjs/storybook/pull/13294)) +- Core: Only apply `express.json()` middleware to /runtime-error route ([#13295](https://github.com/storybookjs/storybook/pull/13295)) +- Core: Don't use prebuilt or cached manager when running smoke test ([#13266](https://github.com/storybookjs/storybook/pull/13266)) +- Core: Detect arg inference for cyclic args and warn ([#13263](https://github.com/storybookjs/storybook/pull/13263)) + +### Dependency Upgrades + +- Remove unused dependency @svgr/webpack ([#13281](https://github.com/storybookjs/storybook/pull/13281)) + +## 6.1.6 (November 25, 2020) + +### Bug Fixes + +- Addon-controls: Fix ensureDocsBeforeControls support for paths ([#13204](https://github.com/storybookjs/storybook/pull/13204)) +- CLI: Add core-js to Preact generator ([#13138](https://github.com/storybookjs/storybook/pull/13138)) +- Core: Improve handling of --static-dir option ([#13245](https://github.com/storybookjs/storybook/pull/13245)) +- Core: Fix webpack5 compatibility check for ProgressPlugin ([#13239](https://github.com/storybookjs/storybook/pull/13239)) + +## 6.1.5 (November 24, 2020) + +### Bug Fixes + +- Core: Resolve react and react-dom from core ([#13195](https://github.com/storybookjs/storybook/pull/13195)) + +## 6.1.4 (November 24, 2020) + +### Bug Fixes + +- Core: Clear manager cache on runtime error ([#13230](https://github.com/storybookjs/storybook/pull/13230)) + +## 6.1.3 (November 23, 2020) + +### Bug Fixes + +- Core: Replace 'trash' with 'fs.remove' ([#13211](https://github.com/storybookjs/storybook/pull/13211)) +- UI: Fix overflow scrolling on layout:centered ([#13217](https://github.com/storybookjs/storybook/pull/13217)) +- CLI: Don't install babel-loader for CRA ([#13220](https://github.com/storybookjs/storybook/pull/13220)) +- Addon-docs: Fix lineheight in typeset component ([#13205](https://github.com/storybookjs/storybook/pull/13205)) + +## 6.1.2 (November 21, 2020) + +### Bug Fixes + +- Storyshots: Fix `beforeScreenshot` and `afterScreenshot` return types ([#13198](https://github.com/storybookjs/storybook/pull/13198)) +- UI: Target only IE10/IE11 for our CSS vertical centering hack ([#13192](https://github.com/storybookjs/storybook/pull/13192)) + +## 6.1.1 (November 20, 2020) + +### Bug Fixes + +- Addon-backgrounds: Fix grid disable ([#13175](https://github.com/storybookjs/storybook/pull/13175)) + +## 6.1.0 (November 19, 2020) + +6.1 is the first in a series of performance-oriented Storybook releases. It includes: + +- [Fast search and navigation](https://storybook.js.org/blog/new-component-finder-and-sidebar/) +- Manager caching for faster startup [#12707](https://github.com/storybookjs/storybook/pull/12707) +- Asynchronous loaders [#12699](https://github.com/storybookjs/storybook/pull/12699) +- React improvements + + - React 17 support [#12972](https://github.com/storybookjs/storybook/pull/12972) [#12975](https://github.com/storybookjs/storybook/pull/12975) + - Fast refresh [#12470](https://github.com/storybookjs/storybook/pull/12470) [#12535](https://github.com/storybookjs/storybook/pull/12535) + - Strict mode [#12781](https://github.com/storybookjs/storybook/pull/12781) + + 6.1 contains hundreds more fixes, features, and tweaks. Browse the [changelogs](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) matching `6.1.0-alpha.*`, `6.1.0-beta.*`, and `6.1.0-rc.*` for the full list of changes. See [Storybook 6 migration guide](https://medium.com/storybookjs/storybook-6-migration-guide-200346241bb5) to upgrade from `5.3` or earlier. + +## 6.1.0-rc.6 (November 19, 2020) + +### Bug Fixes + +- Core: Fix using cached manager on the 2nd run ([#13165](https://github.com/storybookjs/storybook/pull/13165)) +- Addon-docs: Fix Preview scaling with transform instead of zoom ([#12845](https://github.com/storybookjs/storybook/pull/12845)) + +## 6.1.0-rc.5 (November 19, 2020) + +### Features + +- UI: CSS escape hatches for sidebar styling ([#13155](https://github.com/storybookjs/storybook/pull/13155)) + +### Bug Fixes + +- UI: Fix CSS for IE11 ([#13159](https://github.com/storybookjs/storybook/pull/13159)) + +### Maintenance + +- Build: Update example and app to Angular 11 ([#13141](https://github.com/storybookjs/storybook/pull/13141)) + ## 6.1.0-rc.4 (November 17, 2020) ### Maintenance @@ -48,7 +156,7 @@ ### Bug Fixes - React: Don't create a new story function on every render ([#13069](https://github.com/storybookjs/storybook/pull/13069)) -- UI: FZAix search field styling in Safari 13 ([#13070](https://github.com/storybookjs/storybook/pull/13070)) +- UI: Fix search field styling in Safari 13 ([#13070](https://github.com/storybookjs/storybook/pull/13070)) - Addon-docs: Fix spurious warnings ([#13075](https://github.com/storybookjs/storybook/pull/13075)) - UI: Fix Escape key handling perf ([#13073](https://github.com/storybookjs/storybook/pull/13073)) - Storyshots: Fix compatibility for jest-preset-angular 8.3+ ([#13060](https://github.com/storybookjs/storybook/pull/13060)) diff --git a/README.md b/README.md index 2c2a7b52d29a..9c0838335958 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,6 @@ It allows you to browse a component library, view the different states of each c next

- ## Table of contents - 🚀 [Getting Started](#getting-started) @@ -95,19 +94,19 @@ For additional help, join us [in our Discord](https://discord.gg/sMFvFsG) or [Sl | Framework | Demo | | | ----------------------------------------------------------- | --------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- | -| [React](app/react) | [v6.0.x](https://storybookjs.netlify.com/official-storybook/?path=/story/*) | [![React](https://img.shields.io/npm/dm/@storybook/react.svg)](app/react) | +| [React](app/react) | [v6.1.x](https://storybookjs.netlify.com/official-storybook/?path=/story/*) | [![React](https://img.shields.io/npm/dm/@storybook/react.svg)](app/react) | | [React Native](https://github.com/storybookjs/react-native) | - | [![React Native](https://img.shields.io/npm/dm/@storybook/react-native.svg)](app/react-native) | -| [Vue](app/vue) | [v6.0.x](https://storybookjs.netlify.com/vue-kitchen-sink/) | [![Vue](https://img.shields.io/npm/dm/@storybook/vue.svg)](app/vue) | -| [Angular](app/angular) | [v6.0.x](https://storybookjs.netlify.com/angular-cli/) | [![Angular](https://img.shields.io/npm/dm/@storybook/angular.svg)](app/angular) | +| [Vue](app/vue) | [v6.1.x](https://storybookjs.netlify.com/vue-kitchen-sink/) | [![Vue](https://img.shields.io/npm/dm/@storybook/vue.svg)](app/vue) | +| [Angular](app/angular) | [v6.1.x](https://storybookjs.netlify.com/angular-cli/) | [![Angular](https://img.shields.io/npm/dm/@storybook/angular.svg)](app/angular) | | [Marionette.js](app/marionette) | - | [![Marionette.js](https://img.shields.io/npm/dm/@storybook/marionette.svg)](app/marionette) | -| [Mithril](app/mithril) | [v6.0.x](https://storybookjs.netlify.com/mithril-kitchen-sink/) | [![Mithril](https://img.shields.io/npm/dm/@storybook/mithril.svg)](app/mithril) | -| [Marko](app/marko) | [v6.0.x](https://storybookjs.netlify.com/marko-cli/) | [![Marko](https://img.shields.io/npm/dm/@storybook/marko.svg)](app/marko) | -| [HTML](app/html) | [v6.0.x](https://storybookjs.netlify.com/html-kitchen-sink/) | [![HTML](https://img.shields.io/npm/dm/@storybook/html.svg)](app/html) | -| [Svelte](app/svelte) | [v6.0.x](https://storybookjs.netlify.com/svelte-kitchen-sink/) | [![Svelte](https://img.shields.io/npm/dm/@storybook/svelte.svg)](app/svelte) | -| [Riot](app/riot) | [v6.0.x](https://storybookjs.netlify.com/riot-kitchen-sink/) | [![Riot](https://img.shields.io/npm/dm/@storybook/riot.svg)](app/riot) | -| [Ember](app/ember) | [v6.0.x](https://storybookjs.netlify.com/ember-cli/) | [![Ember](https://img.shields.io/npm/dm/@storybook/ember.svg)](app/ember) | -| [Preact](app/preact) | [v6.0.x](https://storybookjs.netlify.com/preact-kitchen-sink/) | [![Preact](https://img.shields.io/npm/dm/@storybook/preact.svg)](app/preact) | -| [Rax](app/rax) | [v6.0.x](https://storybookjs.netlify.com/rax-kitchen-sink/) | [![Rax](https://img.shields.io/npm/dm/@storybook/rax.svg)](app/rax) | +| [Mithril](app/mithril) | [v6.1.x](https://storybookjs.netlify.com/mithril-kitchen-sink/) | [![Mithril](https://img.shields.io/npm/dm/@storybook/mithril.svg)](app/mithril) | +| [Marko](app/marko) | [v6.1.x](https://storybookjs.netlify.com/marko-cli/) | [![Marko](https://img.shields.io/npm/dm/@storybook/marko.svg)](app/marko) | +| [HTML](app/html) | [v6.1.x](https://storybookjs.netlify.com/html-kitchen-sink/) | [![HTML](https://img.shields.io/npm/dm/@storybook/html.svg)](app/html) | +| [Svelte](app/svelte) | [v6.1.x](https://storybookjs.netlify.com/svelte-kitchen-sink/) | [![Svelte](https://img.shields.io/npm/dm/@storybook/svelte.svg)](app/svelte) | +| [Riot](app/riot) | [v6.1.x](https://storybookjs.netlify.com/riot-kitchen-sink/) | [![Riot](https://img.shields.io/npm/dm/@storybook/riot.svg)](app/riot) | +| [Ember](app/ember) | [v6.1.x](https://storybookjs.netlify.com/ember-cli/) | [![Ember](https://img.shields.io/npm/dm/@storybook/ember.svg)](app/ember) | +| [Preact](app/preact) | [v6.1.x](https://storybookjs.netlify.com/preact-kitchen-sink/) | [![Preact](https://img.shields.io/npm/dm/@storybook/preact.svg)](app/preact) | +| [Rax](app/rax) | [v6.1.x](https://storybookjs.netlify.com/rax-kitchen-sink/) | [![Rax](https://img.shields.io/npm/dm/@storybook/rax.svg)](app/rax) | ### Sub Projects diff --git a/addons/a11y/package.json b/addons/a11y/package.json index 6c0bf475519d..89fd617c0f77 100644 --- a/addons/a11y/package.json +++ b/addons/a11y/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-a11y", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "a11y addon for storybook", "keywords": [ "a11y", @@ -22,6 +22,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -33,14 +40,14 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/channels": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/channels": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/theming": "6.1.8", "axe-core": "^4.0.1", "core-js": "^3.0.1", "global": "^4.3.2", @@ -69,12 +76,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/actions/package.json b/addons/actions/package.json index 94fdfa018fba..1c94bbe35337 100644 --- a/addons/actions/package.json +++ b/addons/actions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-actions", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Action Logger addon for storybook", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -28,12 +35,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/theming": "6.1.8", "core-js": "^3.0.1", "fast-deep-equal": "^3.1.1", "global": "^4.3.2", @@ -66,12 +73,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json index f00a77857575..0ea36358dc97 100644 --- a/addons/backgrounds/package.json +++ b/addons/backgrounds/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-backgrounds", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "A storybook addon to show different backgrounds for your preview", "keywords": [ "addon", @@ -21,6 +21,13 @@ "author": "jbaxleyiii", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -32,12 +39,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/theming": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "memoizerific": "^1.11.3", @@ -63,12 +70,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/backgrounds/src/containers/GridSelector.tsx b/addons/backgrounds/src/containers/GridSelector.tsx index ca97ad9ab878..5ab21e54ffc3 100644 --- a/addons/backgrounds/src/containers/GridSelector.tsx +++ b/addons/backgrounds/src/containers/GridSelector.tsx @@ -12,7 +12,7 @@ export const GridSelector: FunctionComponent = memo(() => { grid: { disable: false }, }); - if (grid.disable) { + if (grid?.disable) { return null; } diff --git a/addons/controls/package.json b/addons/controls/package.json index 2be376e23eb8..6bed0cfd5448 100644 --- a/addons/controls/package.json +++ b/addons/controls/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-controls", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Controls for component properties", "keywords": [ "addon", @@ -30,12 +30,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/node-logger": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/node-logger": "6.1.8", + "@storybook/theming": "6.1.8", "core-js": "^3.0.1", "ts-dedent": "^2.0.0" }, @@ -54,5 +54,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b" + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/controls/src/preset/ensureDocsBeforeControls.test.ts b/addons/controls/src/preset/ensureDocsBeforeControls.test.ts index 4c7f9ada8a70..2bfe0c390aca 100644 --- a/addons/controls/src/preset/ensureDocsBeforeControls.test.ts +++ b/addons/controls/src/preset/ensureDocsBeforeControls.test.ts @@ -16,6 +16,7 @@ describe.each([ describe.each([ [['@storybook/addon-docs', '@storybook/addon-controls']], + [['@storybook/addon-docs', 'foo/node_modules/@storybook/addon-controls']], [[{ name: '@storybook/addon-docs' }, '@storybook/addon-controls']], [['@storybook/addon-essentials', '@storybook/addon-controls']], [['@storybook/addon-essentials']], diff --git a/addons/controls/src/preset/ensureDocsBeforeControls.ts b/addons/controls/src/preset/ensureDocsBeforeControls.ts index ca1d7fd1128d..f15c1190c6c0 100644 --- a/addons/controls/src/preset/ensureDocsBeforeControls.ts +++ b/addons/controls/src/preset/ensureDocsBeforeControls.ts @@ -8,7 +8,7 @@ type Entry = string | OptionsEntry; const findIndex = (addon: string, addons: Entry[]) => addons.findIndex((entry) => { const name = (entry as OptionsEntry).name || (entry as string); - return name && name.startsWith(addon); + return name && name.includes(addon); }); const indexOfAddonOrEssentials = (addon: string, addons: Entry[]) => { diff --git a/addons/cssresources/package.json b/addons/cssresources/package.json index 40f562346dfa..f1ffc89fc971 100644 --- a/addons/cssresources/package.json +++ b/addons/cssresources/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-cssresources", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "A storybook addon to switch between css resources at runtime for your story", "keywords": [ "addon", @@ -21,6 +21,13 @@ "author": "nm123github", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -32,11 +39,11 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/theming": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "regenerator-runtime": "^0.13.7" @@ -59,12 +66,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/design-assets/package.json b/addons/design-assets/package.json index 78ad31751f4f..48264982b838 100644 --- a/addons/design-assets/package.json +++ b/addons/design-assets/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-design-assets", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Design asset preview for storybook", "keywords": [ "addon", @@ -23,6 +23,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -34,12 +41,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/theming": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "regenerator-runtime": "^0.13.7", @@ -61,12 +68,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/docs/package.json b/addons/docs/package.json index 3004fbe7c39c..075dcb6e25cf 100644 --- a/addons/docs/package.json +++ b/addons/docs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-docs", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Superior documentation for your components", "keywords": [ "addon", @@ -19,6 +19,13 @@ "license": "MIT", "main": "dist/public_api.js", "types": "dist/public_api.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "angular/**/*", @@ -48,18 +55,18 @@ "@mdx-js/loader": "^1.6.19", "@mdx-js/mdx": "^1.6.19", "@mdx-js/react": "^1.6.19", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/core": "6.1.8", + "@storybook/core-events": "6.1.8", "@storybook/csf": "0.0.1", - "@storybook/node-logger": "6.1.0-rc.4", - "@storybook/postinstall": "6.1.0-rc.4", - "@storybook/source-loader": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/node-logger": "6.1.8", + "@storybook/postinstall": "6.1.8", + "@storybook/source-loader": "6.1.8", + "@storybook/theming": "6.1.8", "acorn": "^7.1.0", "acorn-jsx": "^5.1.0", "acorn-walk": "^7.0.0", @@ -81,13 +88,13 @@ "util-deprecate": "^1.0.2" }, "devDependencies": { - "@angular/core": "^10.2.2", + "@angular/core": "^11.0.0", "@babel/core": "^7.12.3", "@emotion/core": "^10.1.1", "@emotion/styled": "^10.0.23", - "@storybook/react": "6.1.0-rc.4", - "@storybook/vue": "6.1.0-rc.4", - "@storybook/web-components": "6.1.0-rc.4", + "@storybook/react": "6.1.8", + "@storybook/vue": "6.1.8", + "@storybook/web-components": "6.1.8", "@types/cross-spawn": "^6.0.1", "@types/doctrine": "^0.0.3", "@types/enzyme": "^3.10.3", @@ -112,11 +119,11 @@ "tslib": "^2.0.0", "web-component-analyzer": "^1.0.3", "webpack": "^4.44.2", - "zone.js": "^0.10.2" + "zone.js": "^0.11.3" }, "peerDependencies": { "@babel/core": "^7.11.5", - "@storybook/vue": "6.1.0-rc.4", + "@storybook/vue": "6.1.8", "babel-loader": "^8.0.0", "react": "^16.8.0 || ^17.0.0", "react-dom": "^16.8.0 || ^17.0.0", @@ -147,12 +154,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/docs/src/frameworks/vue/sourceDecorator.test.ts b/addons/docs/src/frameworks/vue/sourceDecorator.test.ts index 9f21c563720b..b02569d9aa62 100644 --- a/addons/docs/src/frameworks/vue/sourceDecorator.test.ts +++ b/addons/docs/src/frameworks/vue/sourceDecorator.test.ts @@ -32,7 +32,7 @@ describe('vnodeToString', () => { it('attributes', () => { const MyComponent: ComponentOptions = { - props: ['propA', 'propB', 'propC', 'propD'], + props: ['propA', 'propB', 'propC', 'propD', 'propE', 'propF', 'propG'], template: '
', }; @@ -49,6 +49,13 @@ describe('vnodeToString', () => { propD: { foo: 'bar', }, + propE: true, + propF() { + const foo = 'bar'; + + return foo; + }, + propG: undefined, }, }; }, @@ -56,7 +63,7 @@ describe('vnodeToString', () => { }) ) ).toMatchInlineSnapshot( - `` + `` ); }); diff --git a/addons/docs/src/frameworks/vue/sourceDecorator.ts b/addons/docs/src/frameworks/vue/sourceDecorator.ts index 749ed00ab932..04975f10420c 100644 --- a/addons/docs/src/frameworks/vue/sourceDecorator.ts +++ b/addons/docs/src/frameworks/vue/sourceDecorator.ts @@ -123,7 +123,7 @@ export function vnodeToString(vnode: Vue.VNode): string { } function stringifyAttr(attrName: string, value?: any): string | null { - if (typeof value === 'undefined') { + if (typeof value === 'undefined' || typeof value === 'function') { return null; } diff --git a/addons/essentials/package.json b/addons/essentials/package.json index 218ba2b84a13..2d938dc2b10c 100644 --- a/addons/essentials/package.json +++ b/addons/essentials/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-essentials", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Curated addons to bring out the best of Storybook", "keywords": [ "addon", @@ -19,6 +19,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -28,28 +35,28 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-controls": "6.1.0-rc.4", - "@storybook/addon-docs": "6.1.0-rc.4", - "@storybook/addon-toolbars": "6.1.0-rc.4", - "@storybook/addon-viewport": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/node-logger": "6.1.0-rc.4", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-controls": "6.1.8", + "@storybook/addon-docs": "6.1.8", + "@storybook/addon-toolbars": "6.1.8", + "@storybook/addon-viewport": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/node-logger": "6.1.8", "core-js": "^3.0.1", "regenerator-runtime": "^0.13.7", "ts-dedent": "^2.0.0" }, "devDependencies": { "@babel/core": "^7.9.6", - "@storybook/vue": "6.1.0-rc.4", + "@storybook/vue": "6.1.8", "@types/jest": "^25.1.1", "@types/webpack-env": "^1.15.3" }, "peerDependencies": { "@babel/core": "^7.9.6", - "@storybook/vue": "6.1.0-rc.4", + "@storybook/vue": "6.1.8", "babel-loader": "^8.0.0", "react": "^16.8.0 || ^17.0.0", "react-dom": "^16.8.0 || ^17.0.0", @@ -72,12 +79,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/events/package.json b/addons/events/package.json index bbb65d185be5..9925810a067d 100644 --- a/addons/events/package.json +++ b/addons/events/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-events", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Add events to your Storybook stories.", "keywords": [ "addon", @@ -20,6 +20,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -31,11 +38,11 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/theming": "6.1.8", "core-js": "^3.0.1", "format-json": "^1.0.3", "lodash": "^4.17.15", @@ -62,12 +69,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/google-analytics/README.md b/addons/google-analytics/README.md index 841bab0872ba..d351c32901e2 100644 --- a/addons/google-analytics/README.md +++ b/addons/google-analytics/README.md @@ -20,7 +20,7 @@ module.exports = { } ``` -Then, set an environment variable +Then, set an environment variable in `.storybook/manager.js` ``` window.STORYBOOK_GA_ID = UA-000000-01 diff --git a/addons/google-analytics/package.json b/addons/google-analytics/package.json index c4ae367b8c2a..a83f02dd54b2 100644 --- a/addons/google-analytics/package.json +++ b/addons/google-analytics/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-google-analytics", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook addon for google analytics", "keywords": [ "addon", @@ -20,8 +20,8 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/core-events": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "react-ga": "^2.5.7", @@ -42,5 +42,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b" + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/graphql/package.json b/addons/graphql/package.json index 276c0ebb08d4..a1dc557d1f3a 100644 --- a/addons/graphql/package.json +++ b/addons/graphql/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-graphql", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook addon to display the GraphiQL IDE", "keywords": [ "addon", @@ -18,6 +18,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -31,8 +38,8 @@ "dependencies": { "@babel/core": "^7.12.3", "@babel/plugin-transform-classes": "^7.12.1", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", "@types/webpack": "^4.41.24", "babel-loader": "^8.0.6", "core-js": "^3.0.1", @@ -58,12 +65,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/jest/package.json b/addons/jest/package.json index 8d72c9dae34b..d05c22b94c7a 100644 --- a/addons/jest/package.json +++ b/addons/jest/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-jest", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "React storybook addon that show component jest report", "keywords": [ "addon", @@ -24,6 +24,13 @@ "author": "Renaud Tertrais (https://github.com/renaudtertrais)", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -35,11 +42,11 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/theming": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "react-sizeme": "^2.5.2", @@ -64,12 +71,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/knobs/package.json b/addons/knobs/package.json index 3672ec8b5913..8eb5ed581ee5 100644 --- a/addons/knobs/package.json +++ b/addons/knobs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-knobs", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook Addon Prop Editor Component", "keywords": [ "addon", @@ -18,6 +18,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -29,13 +36,13 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/channels": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/channels": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/theming": "6.1.8", "copy-to-clipboard": "^3.0.8", "core-js": "^3.0.1", "escape-html": "^1.0.3", @@ -73,12 +80,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/links/package.json b/addons/links/package.json index c497f84fb36c..79a53a29409d 100644 --- a/addons/links/package.json +++ b/addons/links/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-links", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Story Links addon for storybook", "keywords": [ "addon", @@ -18,6 +18,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -29,11 +36,11 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/core-events": "6.1.8", "@storybook/csf": "0.0.1", - "@storybook/router": "6.1.0-rc.4", + "@storybook/router": "6.1.8", "@types/qs": "^6.9.0", "core-js": "^3.0.1", "global": "^4.3.2", @@ -60,12 +67,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/queryparams/package.json b/addons/queryparams/package.json index 0c81045f613b..3538fba6e186 100644 --- a/addons/queryparams/package.json +++ b/addons/queryparams/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-queryparams", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "parameter addon for storybook", "keywords": [ "addon", @@ -19,6 +19,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -30,12 +37,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/theming": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "qs": "^6.6.0", @@ -60,12 +67,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/storyshots/storyshots-core/package.json b/addons/storyshots/storyshots-core/package.json index 464d86d9c293..7ce2475bf5c7 100644 --- a/addons/storyshots/storyshots-core/package.json +++ b/addons/storyshots/storyshots-core/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.", "keywords": [ "addon", @@ -18,6 +18,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -33,9 +40,9 @@ }, "dependencies": { "@jest/transform": "^26.0.0", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/core": "6.1.8", "@types/glob": "^7.1.1", "@types/jest": "^25.1.1", "@types/jest-specific-snapshot": "^0.5.3", @@ -51,8 +58,8 @@ "ts-dedent": "^2.0.0" }, "devDependencies": { - "@storybook/addon-docs": "6.1.0-rc.4", - "@storybook/react": "6.1.0-rc.4", + "@storybook/addon-docs": "6.1.8", + "@storybook/react": "6.1.8", "babel-loader": "^8.0.6", "enzyme": "^3.11.0", "enzyme-to-json": "^3.4.1", @@ -91,12 +98,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/storyshots/storyshots-puppeteer/package.json b/addons/storyshots/storyshots-puppeteer/package.json index 1358722d745b..5ed9349ef76e 100644 --- a/addons/storyshots/storyshots-puppeteer/package.json +++ b/addons/storyshots/storyshots-puppeteer/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots-puppeteer", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Image snapshots addition to StoryShots based on puppeteer", "keywords": [ "addon", @@ -18,6 +18,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -30,7 +37,7 @@ }, "dependencies": { "@storybook/csf": "0.0.1", - "@storybook/node-logger": "6.1.0-rc.4", + "@storybook/node-logger": "6.1.8", "@types/jest-image-snapshot": "^2.8.0", "@wordpress/jest-puppeteer-axe": "^1.5.0", "core-js": "^3.0.1", @@ -42,7 +49,7 @@ "@types/puppeteer": "^2.0.0" }, "peerDependencies": { - "@storybook/addon-storyshots": "6.1.0-rc.4", + "@storybook/addon-storyshots": "6.1.8", "puppeteer": "^2.0.0 || ^3.0.0" }, "peerDependenciesMeta": { @@ -53,12 +60,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/storyshots/storyshots-puppeteer/src/config.ts b/addons/storyshots/storyshots-puppeteer/src/config.ts index 0f05f622f5bf..34447cd8c117 100644 --- a/addons/storyshots/storyshots-puppeteer/src/config.ts +++ b/addons/storyshots/storyshots-puppeteer/src/config.ts @@ -39,8 +39,8 @@ export interface PuppeteerTestConfig extends CommonConfig { export interface ImageSnapshotConfig extends CommonConfig { getMatchOptions: (options: Options) => MatchImageSnapshotOptions; getScreenshotOptions: (options: Options) => Base64ScreenShotOptions; - beforeScreenshot: (page: Page, options: Options) => void | ElementHandle; - afterScreenshot: (options: { image: string; context: Context }) => void; + beforeScreenshot: (page: Page, options: Options) => Promise; + afterScreenshot: (options: { image: string; context: Context }) => Promise; } const noop: () => undefined = () => undefined; diff --git a/addons/storysource/package.json b/addons/storysource/package.json index 5ee38e62fd27..4cd78461e8af 100644 --- a/addons/storysource/package.json +++ b/addons/storysource/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storysource", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Stories addon for storybook", "keywords": [ "addon", @@ -18,6 +18,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -29,13 +36,13 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/router": "6.1.0-rc.4", - "@storybook/source-loader": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/router": "6.1.8", + "@storybook/source-loader": "6.1.8", + "@storybook/theming": "6.1.8", "core-js": "^3.0.1", "estraverse": "^4.2.0", "loader-utils": "^2.0.0", @@ -63,12 +70,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/toolbars/package.json b/addons/toolbars/package.json index 0d583c9ef9d4..24d1d1adf0fd 100644 --- a/addons/toolbars/package.json +++ b/addons/toolbars/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-toolbars", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook toolbars addon", "keywords": [ "addon", @@ -30,10 +30,10 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/components": "6.1.8", "core-js": "^3.0.1" }, "peerDependencies": { @@ -51,5 +51,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b" + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/addons/viewport/package.json b/addons/viewport/package.json index da6bb2c122a7..b1ddd3504e23 100644 --- a/addons/viewport/package.json +++ b/addons/viewport/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-viewport", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook addon to change the viewport size to mobile", "keywords": [ "addon", @@ -18,6 +18,13 @@ "license": "MIT", "main": "dist/preview.js", "types": "dist/preview.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -29,12 +36,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/theming": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "memoizerific": "^1.11.3", @@ -56,12 +63,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/app/angular/package.json b/app/angular/package.json index 46c665e64d68..4c8bfd1cbce6 100644 --- a/app/angular/package.json +++ b/app/angular/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/angular", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook for Angular: Develop Angular Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/client/index.js", "types": "dist/client/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "bin": { "build-storybook": "./bin/build.js", "start-storybook": "./bin/index.js", @@ -34,9 +41,9 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", - "@storybook/node-logger": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/core": "6.1.8", + "@storybook/node-logger": "6.1.8", "@types/webpack-env": "^1.15.3", "autoprefixer": "^9.7.6", "core-js": "^3.0.1", @@ -54,14 +61,15 @@ "webpack": "^4.44.2" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.1002.0", - "@angular-devkit/core": "^10.2.0", - "@angular/common": "^10.2.2", - "@angular/compiler": "^10.2.2", - "@angular/core": "^10.2.2", - "@angular/forms": "^10.2.2", - "@angular/platform-browser": "^10.2.2", - "@angular/platform-browser-dynamic": "^10.2.2", + "@angular-devkit/build-angular": "~0.1100.1", + "@angular-devkit/core": "^11.0.1", + "@angular/common": "^11.0.0", + "@angular/compiler": "^11.0.0", + "@angular/compiler-cli": "^11.0.0", + "@angular/core": "^11.0.0", + "@angular/forms": "^11.0.0", + "@angular/platform-browser": "^11.0.0", + "@angular/platform-browser-dynamic": "^11.0.0", "@types/autoprefixer": "^9.4.0" }, "peerDependencies": { @@ -69,6 +77,7 @@ "@angular-devkit/core": "^0.6.1 || >=7.0.0", "@angular/common": ">=6.0.0", "@angular/compiler": ">=6.0.0", + "@angular/compiler-cli": ">=6.0.0", "@angular/core": ">=6.0.0", "@angular/forms": ">=6.0.0", "@angular/platform-browser": ">=6.0.0", @@ -76,7 +85,7 @@ "@babel/core": "*", "rxjs": "^6.0.0", "typescript": "^3.4.0 || >=4.0.0", - "zone.js": "^0.8.29 || ^0.9.0 || ^0.10.0" + "zone.js": "^0.8.29 || ^0.9.0 || ^0.10.0 || ^0.11.0" }, "engines": { "node": ">=8.0.0" @@ -84,12 +93,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/app/aurelia/package.json b/app/aurelia/package.json index de075416d0ca..19304a7ce8c9 100644 --- a/app/aurelia/package.json +++ b/app/aurelia/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/aurelia", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook for Aurelia: Develop Aurelia Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -27,10 +27,10 @@ }, "dependencies": { "@aurelia/webpack-loader": "^0.7.0", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", - "@storybook/node-logger": "6.1.0-rc.4", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/core": "6.1.8", + "@storybook/node-logger": "6.1.8", "fork-ts-checker-webpack-plugin": "^4.0.3", "global": "^4.3.2", "react": "16.13.1", @@ -60,5 +60,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b" + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/app/ember/package.json b/app/ember/package.json index 2dbcd0eefcd9..44b10a1ac706 100644 --- a/app/ember/package.json +++ b/app/ember/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/ember", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.", "homepage": "https://github.com/storybookjs/storybook/tree/master/app/ember", "bugs": { @@ -14,6 +14,13 @@ "license": "MIT", "main": "dist/client/index.js", "jsnext:main": "src/client/index.js", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "bin": { "build-storybook": "./bin/build.js", "start-storybook": "./bin/index.js", @@ -32,7 +39,7 @@ }, "dependencies": { "@ember/test-helpers": "^1.7.0", - "@storybook/core": "6.1.0-rc.4", + "@storybook/core": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "react": "16.13.1", @@ -52,12 +59,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/app/html/package.json b/app/html/package.json index 374f0bfc11b5..fec52579b316 100644 --- a/app/html/package.json +++ b/app/html/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/client/index.js", "types": "dist/client/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "bin": { "build-storybook": "./bin/build.js", "start-storybook": "./bin/index.js", @@ -34,9 +41,9 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/core": "6.1.8", "@types/webpack-env": "^1.15.3", "core-js": "^3.0.1", "global": "^4.3.2", @@ -55,12 +62,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/app/marionette/package.json b/app/marionette/package.json index 850d788ca9df..e109698c2ca7 100644 --- a/app/marionette/package.json +++ b/app/marionette/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/marionette", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook for Marionette: Develop Marionette.js component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -25,7 +25,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/core": "6.1.0-rc.4", + "@storybook/core": "6.1.8", "common-tags": "^1.8.0", "core-js": "^3.0.1", "global": "^4.3.2", @@ -49,5 +49,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b" + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/app/marko/package.json b/app/marko/package.json index 39b4b184666c..9412a5597ba7 100644 --- a/app/marko/package.json +++ b/app/marko/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/marko", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook for Marko: Develop Marko Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -16,6 +16,13 @@ }, "license": "MIT", "main": "dist/client/index.js", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "bin": { "build-storybook": "./bin/build.js", "start-storybook": "./bin/index.js", @@ -34,8 +41,8 @@ }, "dependencies": { "@marko/webpack": "^6.2.8", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", + "@storybook/client-logger": "6.1.8", + "@storybook/core": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "react": "16.13.1", @@ -54,12 +61,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/app/mithril/package.json b/app/mithril/package.json index 601601eb2162..ea2caf519496 100644 --- a/app/mithril/package.json +++ b/app/mithril/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/mithril", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook for Mithril: Develop Mithril Component in isolation.", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/client/index.js", "types": "dist/client/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "bin": { "build-storybook": "./bin/build.js", "start-storybook": "./bin/index.js", @@ -36,8 +43,8 @@ "dependencies": { "@babel/core": "^7.12.3", "@babel/plugin-transform-react-jsx": "^7.12.1", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/core": "6.1.8", "@types/mithril": "^2.0.0", "@types/webpack-env": "^1.15.3", "core-js": "^3.0.1", @@ -60,12 +67,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/app/preact/package.json b/app/preact/package.json index 651dc316f916..f30610883955 100644 --- a/app/preact/package.json +++ b/app/preact/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preact", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook for Preact: Develop Preact Component in isolation.", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/client/index.js", "types": "dist/client/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "bin": { "build-storybook": "./bin/build.js", "start-storybook": "./bin/index.js", @@ -35,8 +42,8 @@ }, "dependencies": { "@babel/plugin-transform-react-jsx": "^7.12.1", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/core": "6.1.8", "@types/webpack-env": "^1.15.3", "core-js": "^3.0.1", "global": "^4.3.2", @@ -58,12 +65,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/app/rax/package.json b/app/rax/package.json index c2085160642b..b095b2006456 100644 --- a/app/rax/package.json +++ b/app/rax/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/rax", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook for Rax: Develop Rax Component in isolation.", "keywords": [ "rax", @@ -17,6 +17,13 @@ }, "license": "MIT", "main": "dist/client/index.js", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "bin": { "build-storybook": "./bin/build.js", "start-storybook": "./bin/index.js", @@ -34,7 +41,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/core": "6.1.0-rc.4", + "@storybook/core": "6.1.8", "babel-preset-rax": "^1.0.0-beta.0", "core-js": "^3.0.1", "driver-dom": "^2.0.0", @@ -54,12 +61,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/app/react/package.json b/app/react/package.json index 01be47a7de9e..2a5f8e3ef715 100644 --- a/app/react/package.json +++ b/app/react/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -25,6 +25,7 @@ "files": [ "bin/**/*", "dist/**/*", + "types/**/*", "README.md", "*.js", "*.d.ts", @@ -37,11 +38,10 @@ "@babel/preset-flow": "^7.12.1", "@babel/preset-react": "^7.12.1", "@pmmmwh/react-refresh-webpack-plugin": "^0.4.2", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", - "@storybook/node-logger": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/core": "6.1.8", + "@storybook/node-logger": "6.1.8", "@storybook/semver": "^7.3.2", - "@svgr/webpack": "^5.4.0", "@types/webpack-env": "^1.15.3", "babel-plugin-add-react-displayname": "^0.0.5", "babel-plugin-named-asset-import": "^0.3.1", @@ -58,7 +58,7 @@ "webpack": "^4.44.2" }, "devDependencies": { - "@storybook/client-api": "6.1.0-rc.4", + "@storybook/client-api": "6.1.8", "@types/node": "^14.0.10", "@types/webpack": "^4.41.24" }, @@ -73,7 +73,7 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9", "typesVersions": { "<3.8": { "types-6-0": [ diff --git a/app/react/src/server/framework-preset-react.test.ts b/app/react/src/server/framework-preset-react.test.ts index 653fd063b3f5..8ddb0898d3a8 100644 --- a/app/react/src/server/framework-preset-react.test.ts +++ b/app/react/src/server/framework-preset-react.test.ts @@ -43,7 +43,7 @@ describe('framework-preset-react', () => { it('should return a config with fast refresh plugin when fast refresh is enabled', async () => { const config = await preset.babel(babelConfigMock, storybookOptions as StorybookOptions); - expect(config.plugins).toEqual([reactRefreshPath]); + expect(config.plugins).toEqual([[reactRefreshPath, {}, 'storybook-react-refresh']]); }); it('should return unchanged config without fast refresh plugin when fast refresh is disabled', async () => { diff --git a/app/react/src/server/framework-preset-react.ts b/app/react/src/server/framework-preset-react.ts index 68da6e308361..63970d052be0 100644 --- a/app/react/src/server/framework-preset-react.ts +++ b/app/react/src/server/framework-preset-react.ts @@ -18,7 +18,10 @@ export async function babel(config: TransformOptions, options: StorybookOptions) return { ...config, - plugins: [require.resolve('react-refresh/babel'), ...(config.plugins || [])], + plugins: [ + [require.resolve('react-refresh/babel'), {}, 'storybook-react-refresh'], + ...(config.plugins || []), + ], }; } const storybookReactDirName = path.dirname(require.resolve('@storybook/react/package.json')); @@ -58,8 +61,16 @@ export async function webpackFinal(config: Configuration, options: StorybookOpti if (!fastRefreshEnabled) { return config; } + // matches the name of the plugin in CRA. + const hasReactRefresh = config.plugins.find((p) => p.constructor.name === 'ReactRefreshPlugin'); + + if (hasReactRefresh) { + logger.warn("=> React refresh is already set. You don't need to set the option"); + return config; + } logger.info('=> Using React fast refresh'); + return { ...config, plugins: [...(config.plugins || []), new ReactRefreshWebpackPlugin()], diff --git a/app/riot/package.json b/app/riot/package.json index 98025062614d..0f451c94548e 100644 --- a/app/riot/package.json +++ b/app/riot/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/riot", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook for riot.js: View riot snippets in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -16,6 +16,13 @@ }, "license": "MIT", "main": "dist/client/index.js", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "bin": { "build-storybook": "./bin/build.js", "start-storybook": "./bin/index.js", @@ -34,7 +41,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/core": "6.1.0-rc.4", + "@storybook/core": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "raw-loader": "^4.0.1", @@ -63,12 +70,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/app/server/package.json b/app/server/package.json index 46ae55da7782..d2a55ed236ad 100644 --- a/app/server/package.json +++ b/app/server/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/server", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/client/index.js", "types": "dist/client/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "bin": { "build-storybook": "./bin/build.js", "start-storybook": "./bin/index.js", @@ -34,11 +41,11 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", - "@storybook/node-logger": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/core": "6.1.8", + "@storybook/node-logger": "6.1.8", "@types/webpack-env": "^1.15.3", "core-js": "^3.0.1", "global": "^4.3.2", @@ -57,12 +64,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/app/svelte/package.json b/app/svelte/package.json index 056b659c10f2..6c24c8c74573 100644 --- a/app/svelte/package.json +++ b/app/svelte/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/client/index.js", "types": "dist/client/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "bin": { "build-storybook": "./bin/build.js", "start-storybook": "./bin/index.js", @@ -34,8 +41,8 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/core": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "react": "16.13.1", @@ -60,12 +67,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/app/vue/package.json b/app/vue/package.json index 4fce3ef440b2..3ba06326a1b1 100644 --- a/app/vue/package.json +++ b/app/vue/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/client/index.js", "types": "dist/client/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "bin": { "build-storybook": "./bin/build.js", "start-storybook": "./bin/index.js", @@ -34,8 +41,8 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/core": "6.1.8", "@types/webpack-env": "^1.15.3", "core-js": "^3.0.1", "global": "^4.3.2", @@ -70,12 +77,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/app/web-components/package.json b/app/web-components/package.json index 07ec52fec9be..8b493360e532 100644 --- a/app/web-components/package.json +++ b/app/web-components/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/web-components", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.", "keywords": [ "lit-html", @@ -19,6 +19,13 @@ "license": "MIT", "main": "dist/client/index.js", "types": "dist/client/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "bin": { "build-storybook": "./bin/build.js", "start-storybook": "./bin/index.js", @@ -39,9 +46,9 @@ "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/preset-env": "^7.12.1", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/core": "6.1.8", "@types/webpack-env": "^1.15.3", "babel-plugin-bundled-import-meta": "^0.3.1", "core-js": "^3.0.1", @@ -65,12 +72,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/dev-kits/addon-decorator/package.json b/dev-kits/addon-decorator/package.json index e1d30c78b07a..24eb9f5fac01 100644 --- a/dev-kits/addon-decorator/package.json +++ b/dev-kits/addon-decorator/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-decorator", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "decorator addon for storybook", "keywords": [ "addon", @@ -24,15 +24,15 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/client-api": "6.1.8", "core-js": "^3.0.1", "global": "^4.4.0" }, "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9", "typesVersions": { "<3.8": { "*": [ diff --git a/dev-kits/addon-parameter/package.json b/dev-kits/addon-parameter/package.json index 7aa0111b93c5..741637770084 100644 --- a/dev-kits/addon-parameter/package.json +++ b/dev-kits/addon-parameter/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-parameter", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "parameter addon for storybook", "keywords": [ "addon", @@ -24,12 +24,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/theming": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "react": "^16.8.0 || ^17.0.0", @@ -38,7 +38,7 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9", "typesVersions": { "<3.8": { "*": [ diff --git a/dev-kits/addon-preview-wrapper/package.json b/dev-kits/addon-preview-wrapper/package.json index 3c8a4ba01100..198270e8ff3a 100644 --- a/dev-kits/addon-preview-wrapper/package.json +++ b/dev-kits/addon-preview-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-preview-wrapper", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "preview wrapper addon for storybook", "keywords": [ "addon", @@ -24,13 +24,13 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", "react": "^16.8.0 || ^17.0.0" }, "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9", "typesVersions": { "<3.8": { "*": [ diff --git a/dev-kits/addon-roundtrip/package.json b/dev-kits/addon-roundtrip/package.json index d9de4da6b504..3043966a2a20 100644 --- a/dev-kits/addon-roundtrip/package.json +++ b/dev-kits/addon-roundtrip/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-roundtrip", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "roundtrip addon for storybook", "keywords": [ "addon", @@ -24,13 +24,13 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/theming": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "react": "^16.8.0 || ^17.0.0", @@ -39,7 +39,7 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9", "typesVersions": { "<3.8": { "*": [ diff --git a/docs/api/writing-presets.md b/docs/api/writing-presets.md index 1d944edf54b3..c849fbaa0c8a 100644 --- a/docs/api/writing-presets.md +++ b/docs/api/writing-presets.md @@ -64,7 +64,7 @@ For example, here is how Storybook automatically adopts `create-react-app`'s con - `webpack` is applied to the preview config after it has been initialized by storybook - `webpackFinal` is applied to the preview config after all user presets have been applied -- `webpackManager` is applied to the manager config +- `managerWebpack` is applied to the manager config ### Manager entries diff --git a/docs/essentials/toolbars-and-globals.md b/docs/essentials/toolbars-and-globals.md index a3aa52496a41..f3722027e2a5 100644 --- a/docs/essentials/toolbars-and-globals.md +++ b/docs/essentials/toolbars-and-globals.md @@ -66,7 +66,7 @@ In your [`.storybook/preview.js`](../configure/overview.md#configure-story-rende -By adding the the configuration element `right`, the text will displayed on the right side in the toolbar menu, once you connect it to a decorator. +By adding the configuration element `right`, the text will be displayed on the right side in the toolbar menu, once you connect it to a decorator. Here's a list of the configuration options available. diff --git a/docs/snippets/common/button-story-hoisted.js.mdx b/docs/snippets/common/button-story-hoisted.js.mdx index 10fa81ccb61d..084885c0500c 100644 --- a/docs/snippets/common/button-story-hoisted.js.mdx +++ b/docs/snippets/common/button-story-hoisted.js.mdx @@ -1,3 +1,4 @@ +```js // Button.stories.js export default { @@ -6,3 +7,4 @@ export default { // This is the only named export in the file, and it matches the component name export const Button = ... +``` diff --git a/docs/snippets/common/storybook-addon-backgrounds-configure-grid.js.mdx b/docs/snippets/common/storybook-addon-backgrounds-configure-grid.js.mdx index 0ce5ab9f7776..bc853883a605 100644 --- a/docs/snippets/common/storybook-addon-backgrounds-configure-grid.js.mdx +++ b/docs/snippets/common/storybook-addon-backgrounds-configure-grid.js.mdx @@ -5,13 +5,15 @@ export default { title: 'Button', parameters: { - grid: { - cellSize: 20, - opacity: 0.5, - cellAmount: 5, - offsetX: 16, // default is 0 if story has 'fullscreen' layout, 16 if layout is 'padded' - offsetY: 16, // default is 0 if story has 'fullscreen' layout, 16 if layout is 'padded' + backgrounds: { + grid: { + cellSize: 20, + opacity: 0.5, + cellAmount: 5, + offsetX: 16, // default is 0 if story has 'fullscreen' layout, 16 if layout is 'padded' + offsetY: 16, // default is 0 if story has 'fullscreen' layout, 16 if layout is 'padded' + }, }, }, }; -``` \ No newline at end of file +``` diff --git a/docs/snippets/common/storybook-preview-with-ordered-pages.js.mdx b/docs/snippets/common/storybook-preview-with-ordered-pages.js.mdx index 127d16a4b2e7..427ca2ee2608 100644 --- a/docs/snippets/common/storybook-preview-with-ordered-pages.js.mdx +++ b/docs/snippets/common/storybook-preview-with-ordered-pages.js.mdx @@ -8,5 +8,4 @@ export const parameters = { }, }, }; - -``` \ No newline at end of file +``` diff --git a/docs/versions/latest.json b/docs/versions/latest.json index 043918ffc049..a7f09b1ee52a 100644 --- a/docs/versions/latest.json +++ b/docs/versions/latest.json @@ -1 +1 @@ -{"version":"6.0.21","info":{"plain":"### Bug Fixes\n\n- Addon-controls: Fix uncontrolled to controlled warning for booleans ([#12322](https://github.com/storybookjs/storybook/pull/12322))\n\n### Maintenance\n\n- Build: Add CRA benchmark ([#12209](https://github.com/storybookjs/storybook/pull/12209))"}} \ No newline at end of file +{"version":"6.1.8","info":{"plain":"### Bug Fixes\n\n- Core: Fix preview URL dropped hashes ([#13308](https://github.com/storybookjs/storybook/pull/13308))\n- Core: Fix template script tag support ([#13271](https://github.com/storybookjs/storybook/pull/13271))\n- Addon-docs: Fix Vue source snippets for function attributes ([#13288](https://github.com/storybookjs/storybook/pull/13288))\n- Components: Fix Zoom for IE11 ([#13302](https://github.com/storybookjs/storybook/pull/13302))\n- React: Don't add FastRefresh if already enabled ([#13303](https://github.com/storybookjs/storybook/pull/13303))\n- CLI: Fix storybook-deployer upgrade warning ([#13306](https://github.com/storybookjs/storybook/pull/13306))\n\n### Maintenance\n\n- React: Expose StorybookConfig types ([#13309](https://github.com/storybookjs/storybook/pull/13309))\n- React: Fix unit tests for react preset ([#13315](https://github.com/storybookjs/storybook/pull/13315))"}} \ No newline at end of file diff --git a/docs/versions/next.json b/docs/versions/next.json index 38ebbc38085b..4f9dcfa196a3 100644 --- a/docs/versions/next.json +++ b/docs/versions/next.json @@ -1 +1 @@ -{"version":"6.1.0-rc.4","info":{"plain":"### Maintenance\n\n- Build: Fix Yarn 2 E2E tests ([#13129](https://github.com/storybookjs/storybook/pull/13129))\n- UI: Reduce rerenders when changing the selected story ([#13107](https://github.com/storybookjs/storybook/pull/13107))\n- Build: Update example to Angular 10 ([#13048](https://github.com/storybookjs/storybook/pull/13048))"}} \ No newline at end of file +{"version":"6.1.0-rc.6","info":{"plain":"### Bug Fixes\n\n- Core: Fix using cached manager on the 2nd run ([#13165](https://github.com/storybookjs/storybook/pull/13165))\n- Addon-docs: Fix Preview scaling with transform instead of zoom ([#12845](https://github.com/storybookjs/storybook/pull/12845))"}} \ No newline at end of file diff --git a/docs/workflows/faq.md b/docs/workflows/faq.md index 797ee4f7e4af..b4f3059f7459 100644 --- a/docs/workflows/faq.md +++ b/docs/workflows/faq.md @@ -115,10 +115,6 @@ For now the addons you're using in a composed Storybook will not work. We're working on overcoming this limitation, soon you'll be able to use them as if you working with a non composed Storybook. -### Why i'm getting errors with react-popper and Storybook? - -If you're using the `react-popper` in your own project and you're experiencing issues with Storybook. You can solve them by adding the `--no-dll` command line flag. Take a look at the [cli options page](../api/cli-options.md) to see how you can use the flag in your project. - ### Which community addons are compatible with the latest version of Storybook? Starting with Storybook version 6.0 we've introduced some great features aimed at streamlining your development workflow. diff --git a/docs/writing-docs/doc-blocks.md b/docs/writing-docs/doc-blocks.md index e07cd130cef3..69844de6bd85 100644 --- a/docs/writing-docs/doc-blocks.md +++ b/docs/writing-docs/doc-blocks.md @@ -83,9 +83,9 @@ The API documentation of `ArgTypes` is detailed in a [separate section](../api/a | **type.required** | The stories to be show, ordered by supplied name | | **description** | A Markdown description for the property | | **table.type.summary** | A short version of the type | -| **table.type.detail** | A long version of the type | -| **table.defaultValue.summary** | A short version of the default value | -| **table.defaultValue.detail** | A long version of the default value | +| **table.type.detail** | A long version of the type | +| **table.defaultValue.summary** | A short version of the default value | +| **table.defaultValue.detail** | A long version of the default value | | **control** | See [addon-controls README ](https://github.com/storybookjs/storybook/tree/next/addons/controls) | For instance: @@ -130,20 +130,17 @@ Looking at the following component: - Similar properties could be grouped together to allow better structuring and organization. We could use the following pattern to group them: -| Field | Category | -| :----------------------------- | :----------------------------------------------------------------------------------------------: | -| **backgroundColor** | Colors | -| **primary** | Colors | -| **label** | Text | -| **onClick** | Events | -| **size** | Sizes | - - +| Field | Category | +| :------------------ | :------: | +| **backgroundColor** | Colors | +| **primary** | Colors | +| **label** | Text | +| **onClick** | Events | +| **size** | Sizes | Which will result in the following story implementation: @@ -161,20 +158,17 @@ And the following change in the Storybook UI: ![button story with args grouped into categories](./button-args-grouped-categories.png) - The formula used above can be improved even further and include subcategories. Turning the table above into: - -| Field | Category | Subcategory | -| :----------------------------- | :----------------------------------------------------------------------------------------------: |:----------------------------------------------------------------------------------------------: -| **backgroundColor** | Colors | Button colors | -| **primary** | Colors | Button style | -| **label** | Text | Button contents | -| **onClick** | Events | Button Events | -| **size** | Sizes | | - +| Field | Category | Subcategory | +| :------------------ | :------: | :-------------: | +| **backgroundColor** | Colors | Button colors | +| **primary** | Colors | Button style | +| **label** | Text | Button contents | +| **onClick** | Events | Button Events | +| **size** | Sizes | | Leading to the following change in the story implementation and UI: @@ -190,7 +184,6 @@ Leading to the following change in the story implementation and UI: ![button story with args grouped into categories](./button-args-grouped-subcategories.png) - #### MDX To customize `argTypes` in MDX, you can set an `mdx` prop on the `Meta` or `Story` components: @@ -285,7 +278,7 @@ The pattern described will be applied to all the stories for the component. If y ### MDX -You can also use the `Source` block in MDX. It accepts either a story ID or `code` snippet. Use the `language` for syntax highlighting. +You can also use the `Source` block in MDX. It accepts either a story ID or `code` snippet. Use the `language` for syntax highlighting. It supports the following languages: `javascript`, `jsx`, `json`, `yml`, ,`md`, `bash`, `css`, `html`, `tsx`, `typescript`, `graphql`. diff --git a/docs/writing-stories/loaders.md b/docs/writing-stories/loaders.md index 84c31a6cfd70..0412db82443c 100644 --- a/docs/writing-stories/loaders.md +++ b/docs/writing-stories/loaders.md @@ -1,12 +1,12 @@ --- -title: 'Loaders' +title: 'Loaders (experimental)' --- -Loaders are asynchronous functions that load data for a story and its [decorators](./decorators.md). A story's loaders run before the story renders, and the loaded data is passed into the story via its render context. +Loaders (experimental) are asynchronous functions that load data for a story and its [decorators](./decorators.md). A story's loaders run before the story renders, and the loaded data is passed into the story via its render context. -Loaders can be used to load any asset (e.g. lazy-loaded components), but they are are typically used to fetch remote API data to be used in a story. +Loaders can be used to load any asset, typically as a performance optimization. They were designed for to lazy load components and other large story imports. They can also be used to load remote API data to be used in a story. However, [Args](./args.md) is the recommended way to manage story data, and we're building up an ecosystem of tools and techniques around Args which might not be compatible with loaded data. -> NOTE: [Args](./args.md) are the recommended way to manage story data, and we're building up an ecosystem of tools and techniques around them. Loaders are an advanced feature ("escape hatch") and we only recommend using them if you have a specific need that can't be fulfilled by other means. +Loaders are an advanced feature ("escape hatch") and we only recommend using them if you have a specific need that can't be fulfilled by other means. They are experimental in Storybook 6.1 and the APIs are subject to change outside of the normal semver cycle. ## Fetching API data diff --git a/examples/angular-cli/angular.json b/examples/angular-cli/angular.json index bd34135f96ce..cc608887c369 100644 --- a/examples/angular-cli/angular.json +++ b/examples/angular-cli/angular.json @@ -38,7 +38,6 @@ "optimization": true, "outputHashing": "all", "sourceMap": false, - "extractCss": true, "namedChunks": false, "aot": true, "extractLicenses": true, diff --git a/examples/angular-cli/jest.config.js b/examples/angular-cli/jest.config.js index cdc5e1372849..422ede7df832 100644 --- a/examples/angular-cli/jest.config.js +++ b/examples/angular-cli/jest.config.js @@ -9,6 +9,12 @@ module.exports = { 'ts-jest': { tsConfig: path.join(__dirname, 'src/tsconfig.spec.json'), stringifyContentPathRegex: '\\.html$', + astTransformers: { + before: [ + 'jest-preset-angular/build/InlineFilesTransformer', + 'jest-preset-angular/build/StripStylesTransformer', + ], + }, }, }, roots: [__dirname], @@ -25,4 +31,5 @@ module.exports = { 'jest-preset-angular/build/HTMLCommentSerializer.js', ], setupFilesAfterEnv: ['./jest-config/setup.ts'], + testPathIgnorePatterns: ['app.component.spec.ts'], }; diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json index 5739746deaf7..208210851e6e 100644 --- a/examples/angular-cli/package.json +++ b/examples/angular-cli/package.json @@ -1,6 +1,6 @@ { "name": "angular-cli", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "license": "MIT", "scripts": { @@ -19,51 +19,51 @@ "test:watch": "jest --watch" }, "dependencies": { - "@angular/common": "^10.2.2", - "@angular/compiler": "^10.2.2", - "@angular/core": "^10.2.2", - "@angular/forms": "^10.2.2", - "@angular/platform-browser": "^10.2.2", - "@angular/platform-browser-dynamic": "^10.2.2", + "@angular/common": "^11.0.0", + "@angular/compiler": "^11.0.0", + "@angular/core": "^11.0.0", + "@angular/forms": "^11.0.0", + "@angular/platform-browser": "^11.0.0", + "@angular/platform-browser-dynamic": "^11.0.0", "@ngrx/store": "^10.0.1", "core-js": "^3.7.0", "node-sass": "^4.14.0", "rxjs": "^6.6.3", - "zone.js": "^0.10.2" + "zone.js": "^0.11.3" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.1002.0", - "@angular-devkit/core": "^10.2.0", - "@angular/cli": "^10.2.0", - "@angular/compiler-cli": "^10.2.2", + "@angular-devkit/build-angular": "~0.1100.1", + "@angular-devkit/core": "^11.0.1", + "@angular/cli": "^11.0.1", + "@angular/compiler-cli": "^11.0.0", "@compodoc/compodoc": "^1.1.11", - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-controls": "6.1.0-rc.4", - "@storybook/addon-docs": "6.1.0-rc.4", - "@storybook/addon-jest": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addon-storyshots": "6.1.0-rc.4", - "@storybook/addon-storysource": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/angular": "6.1.0-rc.4", - "@storybook/source-loader": "6.1.0-rc.4", + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-controls": "6.1.8", + "@storybook/addon-docs": "6.1.8", + "@storybook/addon-jest": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addon-storyshots": "6.1.8", + "@storybook/addon-storysource": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/angular": "6.1.8", + "@storybook/source-loader": "6.1.8", "@types/core-js": "^2.5.0", "@types/jest": "^25.1.1", "@types/node": "^14.0.10", "@types/webpack-env": "^1.15.3", "babel-plugin-require-context-hook": "^1.0.0", "global": "^4.3.2", - "jasmine-core": "~3.5.0", - "jasmine-spec-reporter": "~5.0.2", + "jasmine-core": "~3.6.0", + "jasmine-spec-reporter": "~5.0.0", "jest": "^26.0.0", "jest-preset-angular": "^8.3.2", "protractor": "~7.0.0", "ts-jest": "^26.4.4", "ts-node": "^8.10.2", - "typescript": "^3.9.3" + "typescript": "^4.0.5" }, "storybook": { "chromatic": { diff --git a/examples/angular-cli/src/stories/addon-docs.stories.mdx b/examples/angular-cli/src/stories/addon-docs.stories.mdx index 958e715a2dd7..3823e0bb72a6 100644 --- a/examples/angular-cli/src/stories/addon-docs.stories.mdx +++ b/examples/angular-cli/src/stories/addon-docs.stories.mdx @@ -79,7 +79,7 @@ Let's add another one. The UI updates automatically as you'd expect. We can automatically generate props tables from Angular components: - + ## More info diff --git a/examples/aurelia-kitchen-sink/package.json b/examples/aurelia-kitchen-sink/package.json index 4353e00a440a..85194af317e6 100644 --- a/examples/aurelia-kitchen-sink/package.json +++ b/examples/aurelia-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "aurelia-kitchen-sink", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "description": "An Aurelia client application.", "repository": { @@ -10,7 +10,7 @@ "license": "MIT", "scripts": { "build": "rimraf dist && webpack --env production", - "build-storybook": "build-storybook -s dist", + "build-storybook": "yarn build && build-storybook -s dist", "now-build": "node ../../scripts/bootstrap --core && yarn run build-storybook --quiet", "start": "webpack-dev-server", "storybook": "start-storybook -p 9009 -s dist" @@ -22,18 +22,18 @@ }, "devDependencies": { "@aurelia/webpack-loader": "^0.7.0", - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-docs": "6.1.0-rc.4", - "@storybook/addon-jest": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addon-storyshots": "6.1.0-rc.4", - "@storybook/addon-storysource": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/aurelia": "6.1.0-rc.4", - "@storybook/source-loader": "6.1.0-rc.4", + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-docs": "6.1.8", + "@storybook/addon-jest": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addon-storyshots": "6.1.8", + "@storybook/addon-storysource": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/aurelia": "6.1.8", + "@storybook/source-loader": "6.1.8", "@types/node": "^14.0.10", "css-loader": "^3.0.0", "file-loader": "^4.2.0", diff --git a/examples/cra-kitchen-sink/package.json b/examples/cra-kitchen-sink/package.json index f43ff78c90e6..c7d38bdb6a37 100644 --- a/examples/cra-kitchen-sink/package.json +++ b/examples/cra-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "cra-kitchen-sink", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "build": "react-scripts build", @@ -18,19 +18,19 @@ "react-lifecycles-compat": "^3.0.4" }, "devDependencies": { - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-docs": "6.1.0-rc.4", - "@storybook/addon-events": "6.1.0-rc.4", - "@storybook/addon-jest": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addon-storyshots": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/react": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-docs": "6.1.8", + "@storybook/addon-events": "6.1.8", + "@storybook/addon-jest": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addon-storyshots": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/react": "6.1.8", + "@storybook/theming": "6.1.8", "react-scripts": "^3.0.1" }, "storybook": { diff --git a/examples/cra-react15/package.json b/examples/cra-react15/package.json index c8b3f37e38b2..67403b644a54 100644 --- a/examples/cra-react15/package.json +++ b/examples/cra-react15/package.json @@ -1,6 +1,6 @@ { "name": "cra-react15", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "build": "react-scripts build", @@ -18,11 +18,11 @@ "react-scripts": "3.0.1" }, "devDependencies": { - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/react": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/react": "6.1.8", + "@storybook/theming": "6.1.8", "babel-core": "6", "babel-runtime": "6" }, diff --git a/examples/cra-ts-essentials/package.json b/examples/cra-ts-essentials/package.json index c7f5fa4e45b7..6cfa4e170c51 100644 --- a/examples/cra-ts-essentials/package.json +++ b/examples/cra-ts-essentials/package.json @@ -1,6 +1,6 @@ { "name": "cra-ts-essentials", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "build": "react-scripts build", @@ -34,10 +34,10 @@ "typescript": "^3.9.3" }, "devDependencies": { - "@storybook/addon-essentials": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", + "@storybook/addon-essentials": "6.1.8", + "@storybook/addons": "6.1.8", "@storybook/preset-create-react-app": "^3.1.5", - "@storybook/react": "6.1.0-rc.4" + "@storybook/react": "6.1.8" }, "storybook": { "chromatic": { diff --git a/examples/cra-ts-kitchen-sink/package.json b/examples/cra-ts-kitchen-sink/package.json index 50aa6e68f061..a57fafba3b98 100644 --- a/examples/cra-ts-kitchen-sink/package.json +++ b/examples/cra-ts-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "cra-ts-kitchen-sink", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "build": "react-scripts build", @@ -34,14 +34,14 @@ "typescript": "^3.9.3" }, "devDependencies": { - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-docs": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-docs": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addons": "6.1.8", "@storybook/preset-create-react-app": "^3.1.5", - "@storybook/react": "6.1.0-rc.4", + "@storybook/react": "6.1.8", "@types/enzyme": "^3.9.0", "enzyme": "^3.9.0", "enzyme-adapter-react-16": "^1.9.1", diff --git a/examples/dev-kits/package.json b/examples/dev-kits/package.json index dd5c7d711aae..f3c56979168d 100644 --- a/examples/dev-kits/package.json +++ b/examples/dev-kits/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/example-devkits", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "build-storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true build-storybook -c ./", @@ -8,18 +8,18 @@ "storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true start-storybook -p 9011 -c ./" }, "devDependencies": { - "@storybook/addon-decorator": "6.1.0-rc.4", - "@storybook/addon-parameter": "6.1.0-rc.4", - "@storybook/addon-preview-wrapper": "6.1.0-rc.4", - "@storybook/addon-roundtrip": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/node-logger": "6.1.0-rc.4", - "@storybook/react": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addon-decorator": "6.1.8", + "@storybook/addon-parameter": "6.1.8", + "@storybook/addon-preview-wrapper": "6.1.8", + "@storybook/addon-roundtrip": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/node-logger": "6.1.8", + "@storybook/react": "6.1.8", + "@storybook/theming": "6.1.8", "cors": "^2.8.5", "cross-env": "^7.0.0", "enzyme-to-json": "^3.4.1", diff --git a/examples/ember-cli/package.json b/examples/ember-cli/package.json index 6fe7935fefa1..cd64542355b3 100644 --- a/examples/ember-cli/package.json +++ b/examples/ember-cli/package.json @@ -1,6 +1,6 @@ { "name": "ember-example", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "build": "ember build --output-path ember-output", @@ -17,19 +17,19 @@ "devDependencies": { "@babel/core": "^7.12.3", "@ember/optional-features": "^1.3.0", - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-controls": "6.1.0-rc.4", - "@storybook/addon-docs": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addon-storysource": "6.1.0-rc.4", - "@storybook/addon-viewport": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/ember": "6.1.0-rc.4", + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-controls": "6.1.8", + "@storybook/addon-docs": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addon-storysource": "6.1.8", + "@storybook/addon-viewport": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/ember": "6.1.8", "@storybook/ember-cli-storybook": "^0.2.1", - "@storybook/source-loader": "6.1.0-rc.4", + "@storybook/source-loader": "6.1.8", "babel-loader": "^8", "broccoli-asset-rev": "^3.0.0", "cross-env": "^7.0.0", diff --git a/examples/html-kitchen-sink/package.json b/examples/html-kitchen-sink/package.json index 552214c9129a..679c9b35f225 100644 --- a/examples/html-kitchen-sink/package.json +++ b/examples/html-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "html-kitchen-sink", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "description": "", "keywords": [], @@ -13,24 +13,24 @@ "storybook": "start-storybook -p 9006" }, "devDependencies": { - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-controls": "6.1.0-rc.4", - "@storybook/addon-docs": "6.1.0-rc.4", - "@storybook/addon-events": "6.1.0-rc.4", - "@storybook/addon-jest": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addon-storyshots": "6.1.0-rc.4", - "@storybook/addon-storysource": "6.1.0-rc.4", - "@storybook/addon-viewport": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/html": "6.1.0-rc.4", - "@storybook/source-loader": "6.1.0-rc.4", + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-controls": "6.1.8", + "@storybook/addon-docs": "6.1.8", + "@storybook/addon-events": "6.1.8", + "@storybook/addon-jest": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addon-storyshots": "6.1.8", + "@storybook/addon-storysource": "6.1.8", + "@storybook/addon-viewport": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/core": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/html": "6.1.8", + "@storybook/source-loader": "6.1.8", "eventemitter3": "^4.0.0", "format-json": "^1.0.3", "global": "^4.3.2", diff --git a/examples/marko-cli/package.json b/examples/marko-cli/package.json index cedee8f13305..b593e7174cc6 100644 --- a/examples/marko-cli/package.json +++ b/examples/marko-cli/package.json @@ -1,6 +1,6 @@ { "name": "marko-cli", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "description": "Demo of how to build an app using marko-starter", "repository": { @@ -23,13 +23,13 @@ "marko-starter": "^2.1.0" }, "devDependencies": { - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-storysource": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/marko": "6.1.0-rc.4", - "@storybook/source-loader": "6.1.0-rc.4", + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-storysource": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/marko": "6.1.8", + "@storybook/source-loader": "6.1.8", "prettier": "~2.0.5", "webpack": "^4.44.2" }, diff --git a/examples/mithril-kitchen-sink/package.json b/examples/mithril-kitchen-sink/package.json index 2e219c379e3c..24c56a3091de 100644 --- a/examples/mithril-kitchen-sink/package.json +++ b/examples/mithril-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "mithril-example", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "build-storybook": "build-storybook", @@ -10,17 +10,17 @@ "mithril": "^1.1.6" }, "devDependencies": { - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addon-storyshots": "6.1.0-rc.4", - "@storybook/addon-storysource": "6.1.0-rc.4", - "@storybook/addon-viewport": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/mithril": "6.1.0-rc.4", - "@storybook/source-loader": "6.1.0-rc.4", + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addon-storyshots": "6.1.8", + "@storybook/addon-storysource": "6.1.8", + "@storybook/addon-viewport": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/mithril": "6.1.8", + "@storybook/source-loader": "6.1.8", "webpack": "^4.44.2" }, "storybook": { diff --git a/examples/official-storybook/package.json b/examples/official-storybook/package.json index a981cb13b939..07de4a8167d5 100644 --- a/examples/official-storybook/package.json +++ b/examples/official-storybook/package.json @@ -1,6 +1,6 @@ { "name": "official-storybook", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "build-storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true build-storybook -c ./", @@ -14,33 +14,33 @@ }, "devDependencies": { "@packtracker/webpack-plugin": "^2.0.1", - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-controls": "6.1.0-rc.4", - "@storybook/addon-cssresources": "6.1.0-rc.4", - "@storybook/addon-design-assets": "6.1.0-rc.4", - "@storybook/addon-docs": "6.1.0-rc.4", - "@storybook/addon-events": "6.1.0-rc.4", - "@storybook/addon-graphql": "6.1.0-rc.4", - "@storybook/addon-jest": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addon-queryparams": "6.1.0-rc.4", - "@storybook/addon-storyshots": "6.1.0-rc.4", - "@storybook/addon-storyshots-puppeteer": "6.1.0-rc.4", - "@storybook/addon-storysource": "6.1.0-rc.4", - "@storybook/addon-toolbars": "6.1.0-rc.4", - "@storybook/addon-viewport": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/cli": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-controls": "6.1.8", + "@storybook/addon-cssresources": "6.1.8", + "@storybook/addon-design-assets": "6.1.8", + "@storybook/addon-docs": "6.1.8", + "@storybook/addon-events": "6.1.8", + "@storybook/addon-graphql": "6.1.8", + "@storybook/addon-jest": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addon-queryparams": "6.1.8", + "@storybook/addon-storyshots": "6.1.8", + "@storybook/addon-storyshots-puppeteer": "6.1.8", + "@storybook/addon-storysource": "6.1.8", + "@storybook/addon-toolbars": "6.1.8", + "@storybook/addon-viewport": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/cli": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/core-events": "6.1.8", "@storybook/design-system": "^5.1.0", - "@storybook/node-logger": "6.1.0-rc.4", - "@storybook/react": "6.1.0-rc.4", - "@storybook/source-loader": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/node-logger": "6.1.8", + "@storybook/react": "6.1.8", + "@storybook/source-loader": "6.1.8", + "@storybook/theming": "6.1.8", "chromatic": "^5.0.0", "cors": "^2.8.5", "cross-env": "^7.0.0", diff --git a/examples/official-storybook/stories/addon-controls.stories.tsx b/examples/official-storybook/stories/addon-controls.stories.tsx index b6537a686ad4..81a01ef70ab5 100644 --- a/examples/official-storybook/stories/addon-controls.stories.tsx +++ b/examples/official-storybook/stories/addon-controls.stories.tsx @@ -33,3 +33,14 @@ CustomControls.argTypes = { }; export const NoArgs = () => ; + +const hasCycle: any = {}; +hasCycle.cycle = hasCycle; + +export const CyclicArgs = Template.bind({}); +CyclicArgs.args = { + hasCycle, +}; +CyclicArgs.parameters = { + chromatic: { disable: true }, +}; diff --git a/examples/official-storybook/stories/core/layout.stories.js b/examples/official-storybook/stories/core/layout.stories.js index 3aae4c396c81..61967456a0fe 100644 --- a/examples/official-storybook/stories/core/layout.stories.js +++ b/examples/official-storybook/stories/core/layout.stories.js @@ -1,8 +1,8 @@ import React from 'react'; // eslint-disable-next-line react/prop-types -const Box = ({ children, display = 'block' }) => ( -
{children}
+const Box = ({ children, display = 'block', width, height }) => ( +
{children}
); export default { @@ -29,6 +29,12 @@ CenteredBlock.parameters = { layout: 'centered' }; export const CenteredInline = () => centered; CenteredInline.parameters = { layout: 'centered' }; +export const CenteredTall = () => centered tall; +CenteredTall.parameters = { layout: 'centered' }; + +export const CenteredWide = () => centered wide; +CenteredWide.parameters = { layout: 'centered' }; + export const None = () => none; None.parameters = { layout: 'none' }; diff --git a/examples/preact-kitchen-sink/package.json b/examples/preact-kitchen-sink/package.json index 8f5e8669ff86..79bd27608daf 100644 --- a/examples/preact-kitchen-sink/package.json +++ b/examples/preact-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "preact-example", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "build": "cross-env NODE_ENV=production webpack --progress --hide-modules", @@ -15,17 +15,17 @@ "devDependencies": { "@babel/core": "^7.12.3", "@babel/plugin-transform-runtime": "^7.12.1", - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addon-storyshots": "6.1.0-rc.4", - "@storybook/addon-storysource": "6.1.0-rc.4", - "@storybook/addon-viewport": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/preact": "6.1.0-rc.4", - "@storybook/source-loader": "6.1.0-rc.4", + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addon-storyshots": "6.1.8", + "@storybook/addon-storysource": "6.1.8", + "@storybook/addon-viewport": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/preact": "6.1.8", + "@storybook/source-loader": "6.1.8", "babel-loader": "^8.0.4", "cross-env": "^7.0.0", "file-loader": "^6.0.0", diff --git a/examples/rax-kitchen-sink/package.json b/examples/rax-kitchen-sink/package.json index c39c4582c2c1..9af7fca28b1b 100644 --- a/examples/rax-kitchen-sink/package.json +++ b/examples/rax-kitchen-sink/package.json @@ -1,10 +1,10 @@ { "name": "rax-kitchen-sink", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "build": "build-scripts build", - "build-storybook": "build-storybook -s public", + "build-storybook": "build-storybook", "start": "build-scripts start", "storybook": "start-storybook -p 9009 -s public" }, @@ -20,20 +20,20 @@ "devDependencies": { "@alib/build-scripts": "^0.1.8", "@babel/preset-react": "^7.12.1", - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-events": "6.1.0-rc.4", - "@storybook/addon-jest": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addon-storyshots": "6.1.0-rc.4", - "@storybook/addon-storysource": "6.1.0-rc.4", - "@storybook/addon-viewport": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/rax": "6.1.0-rc.4", - "@storybook/source-loader": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-events": "6.1.8", + "@storybook/addon-jest": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addon-storyshots": "6.1.8", + "@storybook/addon-storysource": "6.1.8", + "@storybook/addon-viewport": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/rax": "6.1.8", + "@storybook/source-loader": "6.1.8", + "@storybook/theming": "6.1.8", "babel-eslint": "^10.0.3", "build-plugin-rax-app": "^0.2.0", "stylesheet-loader": "^0.8.0" diff --git a/examples/react-ts/package.json b/examples/react-ts/package.json index c0b8e7fa2da8..76d9abab474f 100644 --- a/examples/react-ts/package.json +++ b/examples/react-ts/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/example-react-ts", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "build-storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true build-storybook -c ./", @@ -8,9 +8,9 @@ "storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true start-storybook -p 9011 -c ./" }, "dependencies": { - "@storybook/addon-controls": "6.1.0-rc.4", - "@storybook/addon-essentials": "6.1.0-rc.4", - "@storybook/react": "6.1.0-rc.4", + "@storybook/addon-controls": "6.1.8", + "@storybook/addon-essentials": "6.1.8", + "@storybook/react": "6.1.8", "@types/react": "^16.9.35", "@types/react-dom": "^16.9.8", "prop-types": "15.7.2", diff --git a/examples/riot-kitchen-sink/package.json b/examples/riot-kitchen-sink/package.json index 7d8795418dc7..eaee84730915 100644 --- a/examples/riot-kitchen-sink/package.json +++ b/examples/riot-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "riot-example", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "build": "cross-env NODE_ENV=production webpack --progress --hide-modules", @@ -15,17 +15,17 @@ }, "devDependencies": { "@babel/core": "^7.12.3", - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addon-storyshots": "6.1.0-rc.4", - "@storybook/addon-storysource": "6.1.0-rc.4", - "@storybook/addon-viewport": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/riot": "6.1.0-rc.4", - "@storybook/source-loader": "6.1.0-rc.4", + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addon-storyshots": "6.1.8", + "@storybook/addon-storysource": "6.1.8", + "@storybook/addon-viewport": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/riot": "6.1.8", + "@storybook/source-loader": "6.1.8", "babel-loader": "^8.0.4", "cross-env": "^7.0.0", "file-loader": "^6.0.0", diff --git a/examples/server-kitchen-sink/package.json b/examples/server-kitchen-sink/package.json index 5d71edf87bad..91347167f6f2 100644 --- a/examples/server-kitchen-sink/package.json +++ b/examples/server-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "server-kitchen-sink", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "description": "", "keywords": [], @@ -14,13 +14,13 @@ "storybook": "SERVER_PORT=1137 start-storybook -p 9006 --quiet" }, "devDependencies": { - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-controls": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/node-logger": "6.1.0-rc.4", - "@storybook/server": "6.1.0-rc.4", + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-controls": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/node-logger": "6.1.8", + "@storybook/server": "6.1.8", "concurrently": "^5.2.0", "cors": "^2.8.5", "express": "~4.17.1", diff --git a/examples/standalone-preview/package.json b/examples/standalone-preview/package.json index 7609243b203e..5b48d883443f 100644 --- a/examples/standalone-preview/package.json +++ b/examples/standalone-preview/package.json @@ -1,12 +1,12 @@ { "name": "standalone-preview", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "storybook": "parcel ./storybook.html --port 1337" }, "devDependencies": { - "@storybook/react": "6.1.0-rc.4", + "@storybook/react": "6.1.8", "parcel": "^1.12.3", "react": "16.13.1", "react-dom": "16.13.1" diff --git a/examples/svelte-kitchen-sink/package.json b/examples/svelte-kitchen-sink/package.json index bfd3576c6a74..58166ac089b5 100644 --- a/examples/svelte-kitchen-sink/package.json +++ b/examples/svelte-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "svelte-example", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "build-storybook": "build-storybook -s public", @@ -10,19 +10,19 @@ "global": "^4.3.2" }, "devDependencies": { - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-controls": "6.1.0-rc.4", - "@storybook/addon-docs": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addon-storyshots": "6.1.0-rc.4", - "@storybook/addon-storysource": "6.1.0-rc.4", - "@storybook/addon-viewport": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/source-loader": "6.1.0-rc.4", - "@storybook/svelte": "6.1.0-rc.4" + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-controls": "6.1.8", + "@storybook/addon-docs": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addon-storyshots": "6.1.8", + "@storybook/addon-storysource": "6.1.8", + "@storybook/addon-viewport": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/source-loader": "6.1.8", + "@storybook/svelte": "6.1.8" }, "storybook": { "chromatic": { diff --git a/examples/vue-cli/package.json b/examples/vue-cli/package.json index a6a7dfc2b8eb..a7291170da37 100644 --- a/examples/vue-cli/package.json +++ b/examples/vue-cli/package.json @@ -1,6 +1,6 @@ { "name": "vue-cli-example", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "build": "vue-cli-service build", @@ -15,11 +15,11 @@ "vue-property-decorator": "^9.0.0" }, "devDependencies": { - "@storybook/addon-controls": "6.1.0-rc.4", - "@storybook/addon-essentials": "6.1.0-rc.4", + "@storybook/addon-controls": "6.1.8", + "@storybook/addon-essentials": "6.1.8", "@storybook/preset-scss": "^1.0.2", - "@storybook/source-loader": "6.1.0-rc.4", - "@storybook/vue": "6.1.0-rc.4", + "@storybook/source-loader": "6.1.8", + "@storybook/vue": "6.1.8", "@vue/cli-plugin-babel": "~4.3.0", "@vue/cli-plugin-typescript": "~4.3.0", "@vue/cli-service": "~4.3.0", diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json index ffaf5418233d..fca9c5d4bf8b 100644 --- a/examples/vue-kitchen-sink/package.json +++ b/examples/vue-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "vue-example", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "scripts": { "build": "cross-env NODE_ENV=production webpack --progress --hide-modules", @@ -14,19 +14,19 @@ }, "devDependencies": { "@babel/core": "^7.12.3", - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-controls": "6.1.0-rc.4", - "@storybook/addon-docs": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addon-storyshots": "6.1.0-rc.4", - "@storybook/addon-storysource": "6.1.0-rc.4", - "@storybook/addon-viewport": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/source-loader": "6.1.0-rc.4", - "@storybook/vue": "6.1.0-rc.4", + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-controls": "6.1.8", + "@storybook/addon-docs": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addon-storyshots": "6.1.8", + "@storybook/addon-storysource": "6.1.8", + "@storybook/addon-viewport": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/source-loader": "6.1.8", + "@storybook/vue": "6.1.8", "@vue/babel-preset-jsx": "^1.1.2", "babel-loader": "^8.0.5", "cross-env": "^7.0.0", diff --git a/examples/web-components-kitchen-sink/package.json b/examples/web-components-kitchen-sink/package.json index 6be2871f4d35..367019593a57 100644 --- a/examples/web-components-kitchen-sink/package.json +++ b/examples/web-components-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "web-components-kitchen-sink", - "version": "6.1.0-rc.4", + "version": "6.1.8", "private": true, "description": "", "keywords": [], @@ -12,24 +12,24 @@ "storybook": "start-storybook -p 9006" }, "devDependencies": { - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-controls": "6.1.0-rc.4", - "@storybook/addon-docs": "6.1.0-rc.4", - "@storybook/addon-events": "6.1.0-rc.4", - "@storybook/addon-jest": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addon-storyshots": "6.1.0-rc.4", - "@storybook/addon-storysource": "6.1.0-rc.4", - "@storybook/addon-viewport": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/source-loader": "6.1.0-rc.4", - "@storybook/web-components": "6.1.0-rc.4", + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-controls": "6.1.8", + "@storybook/addon-docs": "6.1.8", + "@storybook/addon-events": "6.1.8", + "@storybook/addon-jest": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addon-storyshots": "6.1.8", + "@storybook/addon-storysource": "6.1.8", + "@storybook/addon-viewport": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/core": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/source-loader": "6.1.8", + "@storybook/web-components": "6.1.8", "babel-loader": "^8.0.5", "eventemitter3": "^4.0.0", "format-json": "^1.0.3", diff --git a/lerna.json b/lerna.json index c34ddb8f84a5..e9554e5a61e5 100644 --- a/lerna.json +++ b/lerna.json @@ -2,5 +2,5 @@ "npmClient": "yarn", "useWorkspaces": true, "registry": "https://registry.npmjs.org", - "version": "6.1.0-rc.4" + "version": "6.1.8" } diff --git a/lib/addons/package.json b/lib/addons/package.json index 79cd242efb35..f4dfe9fb7aae 100644 --- a/lib/addons/package.json +++ b/lib/addons/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addons", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook addons store", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/public_api.js", "types": "dist/public_api.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -28,12 +35,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/api": "6.1.0-rc.4", - "@storybook/channels": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/router": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/api": "6.1.8", + "@storybook/channels": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/router": "6.1.8", + "@storybook/theming": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "regenerator-runtime": "^0.13.7" @@ -45,12 +52,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/lib/api/package.json b/lib/api/package.json index b9fa33acef08..3c81387945d0 100644 --- a/lib/api/package.json +++ b/lib/api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/api", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Core Storybook API & Context", "keywords": [ "storybook" @@ -16,6 +16,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -29,13 +36,13 @@ }, "dependencies": { "@reach/router": "^1.3.3", - "@storybook/channels": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", + "@storybook/channels": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/core-events": "6.1.8", "@storybook/csf": "0.0.1", - "@storybook/router": "6.1.0-rc.4", + "@storybook/router": "6.1.8", "@storybook/semver": "^7.3.2", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/theming": "6.1.8", "@types/reach__router": "^1.3.5", "core-js": "^3.0.1", "fast-deep-equal": "^3.1.1", @@ -61,12 +68,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/lib/api/src/version.ts b/lib/api/src/version.ts index be391af06af3..e538c2cf4e9a 100644 --- a/lib/api/src/version.ts +++ b/lib/api/src/version.ts @@ -1 +1 @@ -export const version = '6.1.0-rc.4'; +export const version = '6.1.8'; diff --git a/lib/channel-postmessage/package.json b/lib/channel-postmessage/package.json index 132b6cd5f4fa..ee9a474061e2 100644 --- a/lib/channel-postmessage/package.json +++ b/lib/channel-postmessage/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-postmessage", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -28,9 +35,9 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/channels": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", + "@storybook/channels": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/core-events": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "qs": "^6.6.0", @@ -39,12 +46,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/lib/channel-websocket/package.json b/lib/channel-websocket/package.json index b8320d57b022..641f4be40602 100644 --- a/lib/channel-websocket/package.json +++ b/lib/channel-websocket/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-websocket", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -28,7 +35,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/channels": "6.1.0-rc.4", + "@storybook/channels": "6.1.8", "core-js": "^3.0.1", "global": "^4.3.2", "telejson": "^5.0.2" @@ -36,12 +43,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/lib/channels/package.json b/lib/channels/package.json index 4dfd1df222e5..6d215657f0c7 100644 --- a/lib/channels/package.json +++ b/lib/channels/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channels", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -35,12 +42,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/lib/cli-sb/package.json b/lib/cli-sb/package.json index b844cc66d82c..49aa7b98f818 100644 --- a/lib/cli-sb/package.json +++ b/lib/cli-sb/package.json @@ -1,6 +1,6 @@ { "name": "sb", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook CLI", "keywords": [ "storybook" @@ -22,10 +22,10 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/cli": "6.1.0-rc.4" + "@storybook/cli": "6.1.8" }, "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b" + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/lib/cli-storybook/package.json b/lib/cli-storybook/package.json index da32b916da36..39d495ea058e 100644 --- a/lib/cli-storybook/package.json +++ b/lib/cli-storybook/package.json @@ -1,6 +1,6 @@ { "name": "storybook", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook CLI", "keywords": [ "storybook" @@ -23,10 +23,10 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/cli": "6.1.0-rc.4" + "@storybook/cli": "6.1.8" }, "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b" + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/lib/cli/package.json b/lib/cli/package.json index aeec1c8cd330..d30a419d0acd 100644 --- a/lib/cli/package.json +++ b/lib/cli/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/cli", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook's CLI - easiest method of adding storybook to your projects", "keywords": [ "cli", @@ -18,6 +18,13 @@ }, "license": "MIT", "author": "Storybook Team", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "bin": { "getstorybook": "./bin/index.js", "sb": "./bin/index.js" @@ -39,8 +46,8 @@ "dependencies": { "@babel/core": "^7.12.3", "@babel/preset-env": "^7.12.1", - "@storybook/codemod": "6.1.0-rc.4", - "@storybook/node-logger": "6.1.0-rc.4", + "@storybook/codemod": "6.1.8", + "@storybook/node-logger": "6.1.8", "@storybook/semver": "^7.3.2", "chalk": "^4.0.0", "commander": "^5.0.0", @@ -62,7 +69,7 @@ "update-notifier": "^4.0.0" }, "devDependencies": { - "@storybook/client-api": "6.1.0-rc.4", + "@storybook/client-api": "6.1.8", "@types/cross-spawn": "^6.0.1", "@types/inquirer": "^6.5.0", "@types/puppeteer-core": "^2.0.0", @@ -76,12 +83,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/lib/cli/src/generators/PREACT/index.ts b/lib/cli/src/generators/PREACT/index.ts index 977eb12f6495..2971849f2230 100644 --- a/lib/cli/src/generators/PREACT/index.ts +++ b/lib/cli/src/generators/PREACT/index.ts @@ -1,7 +1,9 @@ import { baseGenerator, Generator } from '../baseGenerator'; const generator: Generator = async (packageManager, npmOptions, options) => { - baseGenerator(packageManager, npmOptions, options, 'preact'); + baseGenerator(packageManager, npmOptions, options, 'preact', { + extraPackages: ['core-js'], + }); }; export default generator; diff --git a/lib/cli/src/generators/REACT_SCRIPTS/index.ts b/lib/cli/src/generators/REACT_SCRIPTS/index.ts index 10db6a1fbebe..5249aaf3b2b1 100644 --- a/lib/cli/src/generators/REACT_SCRIPTS/index.ts +++ b/lib/cli/src/generators/REACT_SCRIPTS/index.ts @@ -9,6 +9,7 @@ const generator: Generator = async (packageManager, npmOptions, options) => { // `@storybook/preset-create-react-app` has `@storybook/node-logger` as peerDep extraPackages: ['@storybook/node-logger'], staticDir: fs.existsSync(path.resolve('./public')) ? 'public' : undefined, + addBabel: false, }); }; diff --git a/lib/cli/src/generators/baseGenerator.ts b/lib/cli/src/generators/baseGenerator.ts index fbe5ed7ef9cc..77f43056fb94 100644 --- a/lib/cli/src/generators/baseGenerator.ts +++ b/lib/cli/src/generators/baseGenerator.ts @@ -15,6 +15,7 @@ export interface FrameworkOptions { staticDir?: string; addScripts?: boolean; addComponents?: boolean; + addBabel?: boolean; } export type Generator = ( @@ -29,6 +30,7 @@ const defaultOptions: FrameworkOptions = { staticDir: undefined, addScripts: true, addComponents: true, + addBabel: true, }; export async function baseGenerator( @@ -38,7 +40,7 @@ export async function baseGenerator( framework: SupportedFrameworks, options: FrameworkOptions = defaultOptions ) { - const { extraAddons, extraPackages, staticDir, addScripts, addComponents } = { + const { extraAddons, extraPackages, staticDir, addScripts, addComponents, addBabel } = { ...defaultOptions, ...options, }; @@ -67,7 +69,7 @@ export async function baseGenerator( } const packageJson = packageManager.retrievePackageJson(); - const babelDependencies = await getBabelDependencies(packageManager, packageJson); + const babelDependencies = addBabel ? await getBabelDependencies(packageManager, packageJson) : []; packageManager.addDependencies({ ...npmOptions, packageJson }, [ ...versionedPackages, ...babelDependencies, diff --git a/lib/cli/src/upgrade.ts b/lib/cli/src/upgrade.ts index 85d43a643498..47992a7daaf0 100644 --- a/lib/cli/src/upgrade.ts +++ b/lib/cli/src/upgrade.ts @@ -30,6 +30,7 @@ const excludeList = [ '@storybook/addon-bench', '@storybook/addon-console', '@storybook/csf', + '@storybook/storybook-deployer', ]; export const isCorePackage = (pkg: string) => pkg.startsWith('@storybook/') && diff --git a/lib/cli/versions.json b/lib/cli/versions.json index be53cb2ed149..2d5410f3ca82 100644 --- a/lib/cli/versions.json +++ b/lib/cli/versions.json @@ -1,55 +1,55 @@ { - "@storybook/addon-a11y": "6.1.0-rc.4", - "@storybook/addon-actions": "6.1.0-rc.4", - "@storybook/addon-backgrounds": "6.1.0-rc.4", - "@storybook/addon-controls": "6.1.0-rc.4", - "@storybook/addon-cssresources": "6.1.0-rc.4", - "@storybook/addon-design-assets": "6.1.0-rc.4", - "@storybook/addon-docs": "6.1.0-rc.4", - "@storybook/addon-essentials": "6.1.0-rc.4", - "@storybook/addon-events": "6.1.0-rc.4", - "@storybook/addon-google-analytics": "6.1.0-rc.4", - "@storybook/addon-graphql": "6.1.0-rc.4", - "@storybook/addon-jest": "6.1.0-rc.4", - "@storybook/addon-knobs": "6.1.0-rc.4", - "@storybook/addon-links": "6.1.0-rc.4", - "@storybook/addon-queryparams": "6.1.0-rc.4", - "@storybook/addon-storyshots": "6.1.0-rc.4", - "@storybook/addon-storyshots-puppeteer": "6.1.0-rc.4", - "@storybook/addon-storysource": "6.1.0-rc.4", - "@storybook/addon-toolbars": "6.1.0-rc.4", - "@storybook/addon-viewport": "6.1.0-rc.4", - "@storybook/addons": "6.1.0-rc.4", - "@storybook/angular": "6.1.0-rc.4", - "@storybook/api": "6.1.0-rc.4", - "@storybook/aurelia": "6.1.0-rc.4", - "@storybook/channel-postmessage": "6.1.0-rc.4", - "@storybook/channel-websocket": "6.1.0-rc.4", - "@storybook/channels": "6.1.0-rc.4", - "@storybook/cli": "6.1.0-rc.4", - "@storybook/client-api": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/codemod": "6.1.0-rc.4", - "@storybook/components": "6.1.0-rc.4", - "@storybook/core": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", - "@storybook/ember": "6.1.0-rc.4", - "@storybook/html": "6.1.0-rc.4", - "@storybook/marionette": "6.1.0-rc.4", - "@storybook/marko": "6.1.0-rc.4", - "@storybook/mithril": "6.1.0-rc.4", - "@storybook/node-logger": "6.1.0-rc.4", - "@storybook/postinstall": "6.1.0-rc.4", - "@storybook/preact": "6.1.0-rc.4", - "@storybook/rax": "6.1.0-rc.4", - "@storybook/react": "6.1.0-rc.4", - "@storybook/riot": "6.1.0-rc.4", - "@storybook/router": "6.1.0-rc.4", - "@storybook/server": "6.1.0-rc.4", - "@storybook/source-loader": "6.1.0-rc.4", - "@storybook/svelte": "6.1.0-rc.4", - "@storybook/theming": "6.1.0-rc.4", - "@storybook/ui": "6.1.0-rc.4", - "@storybook/vue": "6.1.0-rc.4", - "@storybook/web-components": "6.1.0-rc.4" + "@storybook/addon-a11y": "6.1.8", + "@storybook/addon-actions": "6.1.8", + "@storybook/addon-backgrounds": "6.1.8", + "@storybook/addon-controls": "6.1.8", + "@storybook/addon-cssresources": "6.1.8", + "@storybook/addon-design-assets": "6.1.8", + "@storybook/addon-docs": "6.1.8", + "@storybook/addon-essentials": "6.1.8", + "@storybook/addon-events": "6.1.8", + "@storybook/addon-google-analytics": "6.1.8", + "@storybook/addon-graphql": "6.1.8", + "@storybook/addon-jest": "6.1.8", + "@storybook/addon-knobs": "6.1.8", + "@storybook/addon-links": "6.1.8", + "@storybook/addon-queryparams": "6.1.8", + "@storybook/addon-storyshots": "6.1.8", + "@storybook/addon-storyshots-puppeteer": "6.1.8", + "@storybook/addon-storysource": "6.1.8", + "@storybook/addon-toolbars": "6.1.8", + "@storybook/addon-viewport": "6.1.8", + "@storybook/addons": "6.1.8", + "@storybook/angular": "6.1.8", + "@storybook/api": "6.1.8", + "@storybook/aurelia": "6.1.8", + "@storybook/channel-postmessage": "6.1.8", + "@storybook/channel-websocket": "6.1.8", + "@storybook/channels": "6.1.8", + "@storybook/cli": "6.1.8", + "@storybook/client-api": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/codemod": "6.1.8", + "@storybook/components": "6.1.8", + "@storybook/core": "6.1.8", + "@storybook/core-events": "6.1.8", + "@storybook/ember": "6.1.8", + "@storybook/html": "6.1.8", + "@storybook/marionette": "6.1.8", + "@storybook/marko": "6.1.8", + "@storybook/mithril": "6.1.8", + "@storybook/node-logger": "6.1.8", + "@storybook/postinstall": "6.1.8", + "@storybook/preact": "6.1.8", + "@storybook/rax": "6.1.8", + "@storybook/react": "6.1.8", + "@storybook/riot": "6.1.8", + "@storybook/router": "6.1.8", + "@storybook/server": "6.1.8", + "@storybook/source-loader": "6.1.8", + "@storybook/svelte": "6.1.8", + "@storybook/theming": "6.1.8", + "@storybook/ui": "6.1.8", + "@storybook/vue": "6.1.8", + "@storybook/web-components": "6.1.8" } diff --git a/lib/client-api/package.json b/lib/client-api/package.json index 991d2209435d..d47504e73d81 100644 --- a/lib/client-api/package.json +++ b/lib/client-api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/client-api", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Storybook Client API", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -28,11 +35,11 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "6.1.0-rc.4", - "@storybook/channel-postmessage": "6.1.0-rc.4", - "@storybook/channels": "6.1.0-rc.4", - "@storybook/client-logger": "6.1.0-rc.4", - "@storybook/core-events": "6.1.0-rc.4", + "@storybook/addons": "6.1.8", + "@storybook/channel-postmessage": "6.1.8", + "@storybook/channels": "6.1.8", + "@storybook/client-logger": "6.1.8", + "@storybook/core-events": "6.1.8", "@storybook/csf": "0.0.1", "@types/qs": "^6.9.0", "@types/webpack-env": "^1.15.3", @@ -54,12 +61,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/lib/client-api/src/inferArgTypes.ts b/lib/client-api/src/inferArgTypes.ts index 6524b7eac1ad..c3b1642760c6 100644 --- a/lib/client-api/src/inferArgTypes.ts +++ b/lib/client-api/src/inferArgTypes.ts @@ -1,8 +1,10 @@ import mapValues from 'lodash/mapValues'; +import dedent from 'ts-dedent'; +import { logger } from '@storybook/client-logger'; import { SBType, ArgTypesEnhancer } from './types'; import { combineParameters } from './parameters'; -const inferType = (value?: any): SBType => { +const inferType = (value: any, name: string, visited: Set): SBType => { const type = typeof value; switch (type) { case 'boolean': @@ -10,24 +12,40 @@ const inferType = (value?: any): SBType => { case 'number': case 'function': return { name: type }; + case 'symbol': + return { name: 'other', value: 'symbol' }; default: break; } - if (Array.isArray(value)) { - const childType: SBType = - value.length > 0 ? inferType(value[0]) : { name: 'other', value: 'unknown' }; - return { name: 'array', value: childType }; - } if (value) { - const fieldTypes = mapValues(value, (field) => inferType(field)); + if (visited.has(value)) { + logger.warn(dedent` + We've detected a cycle in arg '${name}'. Args should be JSON-serializable (-ish, functions are ok). + + More info: https://storybook.js.org/docs/react/essentials/controls#fully-custom-args + `); + return { name: 'other', value: 'cyclic object' }; + } + visited.add(value); + if (Array.isArray(value)) { + const childType: SBType = + value.length > 0 + ? inferType(value[0], name, new Set(visited)) + : { name: 'other', value: 'unknown' }; + return { name: 'array', value: childType }; + } + const fieldTypes = mapValues(value, (field) => inferType(field, name, new Set(visited))); return { name: 'object', value: fieldTypes }; } return { name: 'object', value: {} }; }; export const inferArgTypes: ArgTypesEnhancer = (context) => { - const { argTypes: userArgTypes = {}, args = {} } = context.parameters; + const { id, parameters } = context; + const { argTypes: userArgTypes = {}, args = {} } = parameters; if (!args) return userArgTypes; - const argTypes = mapValues(args, (arg) => ({ type: inferType(arg) })); + const argTypes = mapValues(args, (arg, key) => ({ + type: inferType(arg, `${id}.${key}`, new Set()), + })); return combineParameters(argTypes, userArgTypes); }; diff --git a/lib/client-api/src/simulate-pageload.ts b/lib/client-api/src/simulate-pageload.ts index 274eaaecf406..488e33289b5e 100644 --- a/lib/client-api/src/simulate-pageload.ts +++ b/lib/client-api/src/simulate-pageload.ts @@ -82,15 +82,17 @@ export function simulatePageLoad($container: any) { const typeAttr = $script.getAttribute('type'); // only run script tags without the type attribute - // or with a javascript mime attribute value - if (!typeAttr || !runScriptTypes.includes(typeAttr)) { + // or with a javascript mime attribute value from the list + if (!typeAttr || runScriptTypes.includes(typeAttr)) { scriptsToExecute.push((callback: any) => insertScript($script, callback, $scriptsRoot)); } }); // insert the script tags sequentially // to preserve execution order - insertScriptsSequentially(scriptsToExecute, simulateDOMContentLoaded, undefined); + if (scriptsToExecute.length) { + insertScriptsSequentially(scriptsToExecute, simulateDOMContentLoaded, undefined); + } } else { simulateDOMContentLoaded(); } diff --git a/lib/client-logger/package.json b/lib/client-logger/package.json index bd6b5114e763..18eeefaf6da8 100644 --- a/lib/client-logger/package.json +++ b/lib/client-logger/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/client-logger", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -34,12 +41,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/lib/codemod/package.json b/lib/codemod/package.json index 2fdf889e5a5f..445c387f053f 100644 --- a/lib/codemod/package.json +++ b/lib/codemod/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/codemod", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "A collection of codemod scripts written with JSCodeshift", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/index.js", "jsnext:main": "src/index.js", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -31,7 +38,7 @@ "dependencies": { "@mdx-js/mdx": "^1.6.19", "@storybook/csf": "0.0.1", - "@storybook/node-logger": "6.1.0-rc.4", + "@storybook/node-logger": "6.1.8", "core-js": "^3.0.1", "cross-spawn": "^7.0.0", "globby": "^11.0.0", @@ -48,12 +55,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/lib/components/package.json b/lib/components/package.json index abacc0646bc6..224356d254d1 100644 --- a/lib/components/package.json +++ b/lib/components/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/components", - "version": "6.1.0-rc.4", + "version": "6.1.8", "description": "Core Storybook Components", "keywords": [ "storybook" @@ -17,6 +17,13 @@ "license": "MIT", "main": "dist/index.js", "types": "dist/index.d.ts", + "typesVersions": { + "<3.8": { + "*": [ + "ts3.4/*" + ] + } + }, "files": [ "dist/**/*", "README.md", @@ -29,9 +36,9 @@ }, "dependencies": { "@popperjs/core": "^2.4.4", - "@storybook/client-logger": "6.1.0-rc.4", + "@storybook/client-logger": "6.1.8", "@storybook/csf": "0.0.1", - "@storybook/theming": "6.1.0-rc.4", + "@storybook/theming": "6.1.8", "@types/overlayscrollbars": "^1.9.0", "@types/react-color": "^3.0.1", "@types/react-syntax-highlighter": "11.0.4", @@ -60,12 +67,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "c174d7429c2593e051cc2dd1361bb28bff71f75b", - "typesVersions": { - "<3.8": { - "*": [ - "ts3.4/*" - ] - } - } + "gitHead": "6c4d0ed4beea726a121cddd365cc5258d6828be9" } diff --git a/lib/components/src/Loader/Loader.tsx b/lib/components/src/Loader/Loader.tsx index 7eab53d55df8..dee0cf076ac9 100644 --- a/lib/components/src/Loader/Loader.tsx +++ b/lib/components/src/Loader/Loader.tsx @@ -1,4 +1,5 @@ import { EventSource, CONFIG_TYPE } from 'global'; +import { transparentize } from 'polished'; import React, { ComponentProps, FunctionComponent, useEffect, useState } from 'react'; import { styled, keyframes } from '@storybook/theming'; import { Icons } from '../icon/icon'; @@ -44,7 +45,7 @@ const ProgressTrack = styled.div(({ theme }) => ({ maxWidth: 300, height: 5, borderRadius: 5, - background: `${theme.color.secondary}33`, + background: transparentize(0.8, theme.color.secondary), overflow: 'hidden', cursor: 'progress', })); diff --git a/lib/components/src/Zoom/Zoom.stories.tsx b/lib/components/src/Zoom/Zoom.stories.tsx new file mode 100644 index 000000000000..9d510a1cc8cc --- /dev/null +++ b/lib/components/src/Zoom/Zoom.stories.tsx @@ -0,0 +1,97 @@ +import React, { CSSProperties, useEffect, useState } from 'react'; +import { Zoom } from './Zoom'; + +export default { + component: Zoom, + title: 'Basics/Zoom', + argTypes: { + scale: { + control: { type: 'range', min: 0.2, max: 30, step: 0.02 }, + }, + }, +}; +const EXAMPLE_ELEMENT = ( +
+); + +const TemplateElement = (args) => ; + +export const elementActualSize = TemplateElement.bind({}); + +elementActualSize.args = { + scale: 1, + children: EXAMPLE_ELEMENT, +}; + +export const elementZoomedIn = TemplateElement.bind({}); + +elementZoomedIn.args = { + scale: 0.7, + children: EXAMPLE_ELEMENT, +}; + +export const elementZoomedOut = TemplateElement.bind({}); + +elementZoomedOut.args = { + scale: 3, + children: EXAMPLE_ELEMENT, +}; + +const style: CSSProperties = { + width: '500px', + height: '500px', + border: '2px solid hotpink', + position: 'relative', +}; + +const TemplateIFrame = (args) => { + const iFrameRef = React.useRef(null); + const [scale, setScale] = useState(1); + const [loaded, hasLoaded] = useState(false); + + useEffect(() => { + if (loaded) { + setScale(args.scale); + } + }, [args.scale, loaded]); + return ( + +