Skip to content

Commit

Permalink
Merge pull request #19581 from storybookjs/shilman/fix-test-runner-ve…
Browse files Browse the repository at this point in the history 
…rsion-conflicts

Fix test-runner version conflicts
  • Loading branch information
@shilman
shilman authored Oct 22, 2022
2 parents 0760956 + 6466e55 commit 31c93aa
Show file tree
Hide file tree
Showing 38 changed files with 84 additions and 82 deletions.
2 changes: 1 addition & 1 deletion code/addons/a11y/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/components": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/theming": "7.0.0-alpha.41",
"axe-core": "^4.2.0",
"global": "^4.4.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/actions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/components": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/theming": "7.0.0-alpha.41",
"dequal": "^2.0.2",
"global": "^4.4.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/backgrounds/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/components": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/theming": "7.0.0-alpha.41",
"global": "^4.4.0",
"memoizerific": "^1.11.3",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/controls/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/components": "7.0.0-alpha.41",
"@storybook/core-common": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/node-logger": "7.0.0-alpha.41",
"@storybook/store": "7.0.0-alpha.41",
"@storybook/theming": "7.0.0-alpha.41",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/docs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@storybook/components": "7.0.0-alpha.41",
"@storybook/core-common": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/csf-tools": "7.0.0-alpha.41",
"@storybook/docs-tools": "7.0.0-alpha.41",
"@storybook/mdx2-csf": "0.1.0-next.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/interactions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"@storybook/components": "7.0.0-alpha.41",
"@storybook/core-common": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/instrumenter": "7.0.0-alpha.41",
"@storybook/theming": "7.0.0-alpha.41",
"global": "^4.4.0",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/links/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"@storybook/addons": "7.0.0-alpha.41",
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/router": "7.0.0-alpha.41",
"global": "^4.4.0",
"prop-types": "^15.7.2",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/measure/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/components": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"global": "^4.4.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion code/addons/outline/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/components": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"global": "^4.4.0",
"ts-dedent": "^2.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion code/addons/storyshots/storyshots-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@storybook/core-client": "7.0.0-alpha.41",
"@storybook/core-common": "7.0.0-alpha.41",
"@storybook/core-webpack": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@types/glob": "^7.1.3",
"@types/jest": "^26.0.16",
"@types/jest-specific-snapshot": "^0.5.3",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/storyshots/storyshots-puppeteer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"dependencies": {
"@axe-core/puppeteer": "^4.2.0",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/node-logger": "7.0.0-alpha.41",
"@types/jest-image-snapshot": "^4.1.3",
"jest-image-snapshot": "^4.3.0"
Expand Down
2 changes: 1 addition & 1 deletion code/examples/external-docs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@storybook/addon-essentials": "7.0.0-alpha.41",
"@storybook/blocks": "7.0.0-alpha.41",
"@storybook/components": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/preview-web": "7.0.0-alpha.41",
"@storybook/react": "7.0.0-alpha.41",
"@storybook/react-webpack5": "7.0.0-alpha.41",
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/angular/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/core-server": "7.0.0-alpha.41",
"@storybook/core-webpack": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/docs-tools": "7.0.0-alpha.41",
"@storybook/node-logger": "7.0.0-alpha.41",
"@storybook/store": "7.0.0-alpha.41",
Expand Down
2 changes: 1 addition & 1 deletion code/lib/addons/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@storybook/channels": "7.0.0-alpha.41",
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/router": "7.0.0-alpha.41",
"@storybook/theming": "7.0.0-alpha.41",
"global": "^4.4.0"
Expand Down
2 changes: 1 addition & 1 deletion code/lib/api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@storybook/channels": "7.0.0-alpha.41",
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/router": "7.0.0-alpha.41",
"@storybook/theming": "7.0.0-alpha.41",
"dequal": "^2.0.2",
Expand Down
2 changes: 1 addition & 1 deletion code/lib/blocks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/components": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/docs-tools": "7.0.0-alpha.41",
"@storybook/preview-web": "7.0.0-alpha.41",
"@storybook/store": "7.0.0-alpha.41",
Expand Down
2 changes: 1 addition & 1 deletion code/lib/client-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"dependencies": {
"@storybook/addons": "7.0.0-alpha.41",
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/store": "7.0.0-alpha.41",
"@types/qs": "^6.9.5",
"@types/webpack-env": "^1.16.4",
Expand Down
2 changes: 1 addition & 1 deletion code/lib/codemod/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"dependencies": {
"@babel/types": "^7.12.11",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/csf-tools": "7.0.0-alpha.41",
"@storybook/node-logger": "7.0.0-alpha.41",
"cross-spawn": "^7.0.3",
Expand Down
2 changes: 1 addition & 1 deletion code/lib/components/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"dependencies": {
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/theming": "7.0.0-alpha.41",
"memoizerific": "^1.11.3",
"util-deprecate": "^1.0.2"
Expand Down
2 changes: 1 addition & 1 deletion code/lib/core-client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@storybook/client-api": "7.0.0-alpha.41",
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/preview-web": "7.0.0-alpha.41",
"@storybook/store": "7.0.0-alpha.41",
"@storybook/ui": "7.0.0-alpha.41",
Expand Down
2 changes: 1 addition & 1 deletion code/lib/core-common/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
"dependencies": {
"@babel/core": "^7.12.10",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/node-logger": "7.0.0-alpha.41",
"@types/babel__core": "^7.0.0",
"@types/express": "^4.7.0",
Expand Down
2 changes: 1 addition & 1 deletion code/lib/core-server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@storybook/core-client": "7.0.0-alpha.41",
"@storybook/core-common": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/csf-tools": "7.0.0-alpha.41",
"@storybook/docs-mdx": "0.0.1-canary.12433cf.0",
"@storybook/node-logger": "7.0.0-alpha.41",
Expand Down
2 changes: 1 addition & 1 deletion code/lib/csf-tools/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@babel/parser": "^7.12.11",
"@babel/traverse": "^7.12.11",
"@babel/types": "^7.12.11",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"fs-extra": "^9.0.1",
"ts-dedent": "^2.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion code/lib/docs-tools/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"dependencies": {
"@babel/core": "^7.12.10",
"@storybook/core-common": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/store": "7.0.0-alpha.41",
"doctrine": "^3.0.0",
"lodash": "^4.17.21"
Expand Down
2 changes: 1 addition & 1 deletion code/lib/preview-web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@storybook/channels": "7.0.0-alpha.41",
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/store": "7.0.0-alpha.41",
"ansi-to-html": "^0.6.11",
"global": "^4.4.0",
Expand Down
2 changes: 1 addition & 1 deletion code/lib/source-loader/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"estraverse": "^5.2.0",
"lodash": "^4.17.21",
"prettier": ">=2.2.1 <=2.3.0"
Expand Down
2 changes: 1 addition & 1 deletion code/lib/store/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@storybook/addons": "7.0.0-alpha.41",
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"dequal": "^2.0.2",
"global": "^4.4.0",
"lodash": "^4.17.21",
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/html/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"dependencies": {
"@storybook/addons": "7.0.0-alpha.41",
"@storybook/core-client": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/docs-tools": "7.0.0-alpha.41",
"@storybook/preview-web": "7.0.0-alpha.41",
"@storybook/store": "7.0.0-alpha.41",
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/preact/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"dependencies": {
"@storybook/addons": "7.0.0-alpha.41",
"@storybook/core-client": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/store": "7.0.0-alpha.41",
"global": "^4.4.0",
"react": "16.14.0",
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@storybook/addons": "7.0.0-alpha.41",
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/core-client": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/docs-tools": "7.0.0-alpha.41",
"@storybook/store": "7.0.0-alpha.41",
"@types/estree": "^0.0.51",
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"dependencies": {
"@storybook/addons": "7.0.0-alpha.41",
"@storybook/core-client": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/preview-web": "7.0.0-alpha.41",
"@storybook/store": "7.0.0-alpha.41",
"global": "^4.4.0",
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/svelte/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@storybook/addons": "7.0.0-alpha.41",
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/core-client": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/docs-tools": "7.0.0-alpha.41",
"@storybook/store": "7.0.0-alpha.41",
"global": "^4.4.0",
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@storybook/addons": "7.0.0-alpha.41",
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/core-client": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/docs-tools": "7.0.0-alpha.41",
"@storybook/store": "7.0.0-alpha.41",
"global": "^4.4.0",
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/vue3/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"dependencies": {
"@storybook/addons": "7.0.0-alpha.41",
"@storybook/core-client": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/docs-tools": "7.0.0-alpha.41",
"@storybook/store": "7.0.0-alpha.41",
"global": "^4.4.0",
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/web-components/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@storybook/api": "7.0.0-alpha.41",
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/core-client": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/docs-tools": "7.0.0-alpha.41",
"@storybook/preview-web": "7.0.0-alpha.41",
"@storybook/store": "7.0.0-alpha.41",
Expand Down
2 changes: 1 addition & 1 deletion code/ui/manager/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@storybook/client-logger": "7.0.0-alpha.41",
"@storybook/components": "7.0.0-alpha.41",
"@storybook/core-events": "7.0.0-alpha.41",
"@storybook/csf": "0.0.2--canary.49.258942b.0",
"@storybook/csf": "next",
"@storybook/router": "7.0.0-alpha.41",
"@storybook/theming": "7.0.0-alpha.41",
"@testing-library/react": "^11.2.2",
Expand Down
Loading

0 comments on commit 31c93aa

Please sign in to comment.