Skip to content

Commit

Permalink
Merge branch 'next' into shilman/bump-mdx2-csf
Browse files Browse the repository at this point in the history
  • Loading branch information
shilman committed Nov 18, 2022
2 parents 1f13ad0 + eaaa0ab commit a866a9d
Show file tree
Hide file tree
Showing 37 changed files with 157 additions and 145 deletions.
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -689,23 +689,23 @@ workflows:
requires:
- build
- create-sandboxes:
parallelism: 14
parallelism: 15
requires:
- build
- build-sandboxes:
parallelism: 14
parallelism: 15
requires:
- create-sandboxes
- test-runner-sandboxes:
parallelism: 14
requires:
- build-sandboxes
- chromatic-sandboxes:
parallelism: 14
parallelism: 15
requires:
- build-sandboxes
- e2e-sandboxes:
parallelism: 14
parallelism: 15
requires:
- build-sandboxes
daily:
Expand All @@ -714,25 +714,25 @@ workflows:
jobs:
- build
- create-sandboxes:
parallelism: 24
parallelism: 25
requires:
- build
# - smoke-test-sandboxes: # disabled for now
# requires:
# - create-sandboxes
- build-sandboxes:
parallelism: 24
parallelism: 25
requires:
- create-sandboxes
- test-runner-sandboxes:
parallelism: 24
requires:
- build-sandboxes
- chromatic-sandboxes:
parallelism: 24
parallelism: 25
requires:
- build-sandboxes
- e2e-sandboxes:
parallelism: 24
parallelism: 25
requires:
- build-sandboxes
2 changes: 1 addition & 1 deletion code/addons/interactions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"devDependencies": {
"@storybook/jest": "^0.0.10",
"@storybook/testing-library": "0.0.14-next.0",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"formik": "^2.2.9",
"typescript": "^4.9.3"
},
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@storybook/node-logger": "7.0.0-alpha.50",
"@storybook/store": "7.0.0-alpha.50",
"@storybook/types": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"@types/react": "^16.14.34",
"@types/react-dom": "^16.9.14",
"@types/semver": "^7.3.4",
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/html-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@storybook/core-common": "7.0.0-alpha.50",
"@storybook/html": "7.0.0-alpha.50",
"@storybook/preset-html-webpack": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"global": "^4.4.0",
"react": "16.14.0",
"react-dom": "16.14.0"
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"@storybook/node-logger": "7.0.0-alpha.50",
"@storybook/preset-react-webpack": "7.0.0-alpha.50",
"@storybook/react": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"find-up": "^5.0.0",
"fs-extra": "^9.0.1",
"image-size": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/preact-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@storybook/core-common": "7.0.0-alpha.50",
"@storybook/preact": "7.0.0-alpha.50",
"@storybook/preset-preact-webpack": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"react": "16.14.0",
"react-dom": "16.14.0"
},
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/react-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"vite": "^3.1.3"
},
"devDependencies": {
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"typescript": "^4.9.3",
"vite": "^3.1.3"
},
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/react-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@storybook/builder-webpack5": "7.0.0-alpha.50",
"@storybook/preset-react-webpack": "7.0.0-alpha.50",
"@storybook/react": "7.0.0-alpha.50",
"@types/node": "^18.11.9"
"@types/node": "^16.18.3"
},
"devDependencies": {
"jest-specific-snapshot": "^6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/server-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@storybook/core-common": "7.0.0-alpha.50",
"@storybook/preset-server-webpack": "7.0.0-alpha.50",
"@storybook/server": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"react": "16.14.0",
"react-dom": "16.14.0"
},
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/svelte-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"vite": "^3.1.3"
},
"devDependencies": {
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"typescript": "^4.9.3",
"vite": "^3.1.3"
},
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/vue-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@storybook/core-common": "7.0.0-alpha.50",
"@storybook/preset-vue-webpack": "7.0.0-alpha.50",
"@storybook/vue": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"react": "16.14.0",
"react-dom": "16.14.0"
},
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/vue3-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"vue-docgen-api": "^4.40.0"
},
"devDependencies": {
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"typescript": "^4.9.3",
"vite": "^3.1.3"
},
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/vue3-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@storybook/core-common": "7.0.0-alpha.50",
"@storybook/preset-vue3-webpack": "7.0.0-alpha.50",
"@storybook/vue3": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"react": "16.14.0",
"react-dom": "16.14.0"
},
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/web-components-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"vite": "3"
},
"devDependencies": {
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"typescript": "^4.9.3",
"vite": "^3.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/web-components-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@storybook/core-common": "7.0.0-alpha.50",
"@storybook/preset-web-components-webpack": "7.0.0-alpha.50",
"@storybook/web-components": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"react": "16.14.0",
"react-dom": "16.14.0"
},
Expand Down
2 changes: 1 addition & 1 deletion code/lib/builder-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"devDependencies": {
"@types/express": "^4.17.13",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"typescript": "^4.9.3",
"vite": "^3.1.3"
},
Expand Down
2 changes: 1 addition & 1 deletion code/lib/builder-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"@storybook/router": "7.0.0-alpha.50",
"@storybook/store": "7.0.0-alpha.50",
"@storybook/theming": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"@types/semver": "^7.3.4",
"babel-loader": "^8.3.0",
"babel-plugin-named-exports-order": "^0.0.2",
Expand Down
15 changes: 14 additions & 1 deletion code/lib/cli/src/repro-templates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,17 @@ export const allTemplates = {
name: 'Angular CLI (latest)',
script:
'npx -p @angular/cli ng new angular-latest --directory . --routing=true --minimal=true --style=scss --strict --skip-git --skip-install --package-manager=yarn',
skipTasks: ['test-runner'],
expected: {
framework: '@storybook/angular',
renderer: '@storybook/angular',
builder: '@storybook/builder-webpack5',
},
},
'angular-cli/14-ts': {
name: 'Angular CLI (Version 14)',
script:
'npx -p @angular/cli@14 ng new angular-v14 --directory . --routing=true --minimal=true --style=scss --strict --skip-git --skip-install --package-manager=yarn',
expected: {
framework: '@storybook/angular',
renderer: '@storybook/angular',
Expand Down Expand Up @@ -251,7 +262,8 @@ type TemplateKey = keyof typeof allTemplates;
export const ci: TemplateKey[] = ['cra/default-ts', 'react-vite/default-ts'];
export const pr: TemplateKey[] = [
...ci,
'angular-cli/default-ts',
// TODO: swap with 'angular-cli/default-ts' once angular 15 fully works with Storybook
'angular-cli/14-ts',
'vue3-vite/default-ts',
'vue-cli/vue2-default-js',
'lit-vite/default-ts',
Expand All @@ -263,6 +275,7 @@ export const merged: TemplateKey[] = [
...pr,
'react-webpack/18-ts',
'react-webpack/17-ts',
'angular-cli/default-ts',
'angular-cli/13-ts',
'preact-webpack5/default-ts',
'html-webpack/default',
Expand Down
2 changes: 1 addition & 1 deletion code/lib/core-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@storybook/types": "7.0.0-alpha.50",
"@types/babel__core": "^7.1.20",
"@types/express": "^4.7.0",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"@types/pretty-hrtime": "^1.0.0",
"chalk": "^4.1.0",
"esbuild": "^0.14.48",
Expand Down
2 changes: 1 addition & 1 deletion code/lib/core-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@storybook/store": "7.0.0-alpha.50",
"@storybook/telemetry": "7.0.0-alpha.50",
"@storybook/types": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"@types/node-fetch": "^2.5.7",
"@types/pretty-hrtime": "^1.0.0",
"@types/semver": "^7.3.4",
Expand Down
2 changes: 1 addition & 1 deletion code/lib/core-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@storybook/core-common": "7.0.0-alpha.50",
"@storybook/node-logger": "7.0.0-alpha.50",
"@storybook/types": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"ts-dedent": "^2.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion code/lib/theming/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@emotion/react": "^11.10.4",
"@emotion/styled": "^11.10.4",
"@types/fs-extra": "^9.0.6",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"deep-object-diff": "^1.1.0",
"fs-extra": "^9.0.1",
"global": "^4.4.0",
Expand Down
2 changes: 1 addition & 1 deletion code/lib/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
"devDependencies": {
"@storybook/csf": "0.0.2-next.7",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"synchronous-promise": "^2.0.15",
"typescript": "^4.9.3"
},
Expand Down
2 changes: 1 addition & 1 deletion code/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
"@types/fs-extra": "^9.0.6",
"@types/js-yaml": "^3.12.6",
"@types/lodash": "^4.14.167",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"@types/node-cleanup": "^2.1.1",
"@types/prompts": "2.0.11",
"@types/react": "^16.14.34",
Expand Down
2 changes: 1 addition & 1 deletion code/presets/html-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
"dependencies": {
"@storybook/core-webpack": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"html-loader": "^3.1.0",
"react": "16.14.0",
"react-dom": "16.14.0",
Expand Down
2 changes: 1 addition & 1 deletion code/presets/preact-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"dependencies": {
"@babel/plugin-transform-react-jsx": "^7.19.0",
"@storybook/core-webpack": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"react": "16.14.0",
"react-dom": "16.14.0"
},
Expand Down
2 changes: 1 addition & 1 deletion code/presets/react-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"@storybook/node-logger": "7.0.0-alpha.50",
"@storybook/react": "7.0.0-alpha.50",
"@storybook/react-docgen-typescript-plugin": "1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"@types/semver": "^7.3.4",
"babel-plugin-add-react-displayname": "^0.0.5",
"babel-plugin-react-docgen": "^4.2.1",
Expand Down
2 changes: 1 addition & 1 deletion code/presets/server-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@storybook/core-server": "7.0.0-alpha.50",
"@storybook/core-webpack": "7.0.0-alpha.50",
"@storybook/server": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"global": "^4.4.0",
"react": "16.14.0",
"react-dom": "16.14.0",
Expand Down
2 changes: 1 addition & 1 deletion code/presets/vue-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"dependencies": {
"@storybook/core-webpack": "7.0.0-alpha.50",
"@storybook/docs-tools": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"react": "16.14.0",
"react-dom": "16.14.0",
"ts-loader": "^9.2.8",
Expand Down
2 changes: 1 addition & 1 deletion code/presets/vue3-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"dependencies": {
"@storybook/core-webpack": "7.0.0-alpha.50",
"@storybook/docs-tools": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"react": "16.14.0",
"react-dom": "16.14.0",
"ts-loader": "^9.2.8",
Expand Down
2 changes: 1 addition & 1 deletion code/presets/web-components-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@babel/plugin-syntax-import-meta": "^7.10.4",
"@babel/preset-env": "^7.20.2",
"@storybook/core-webpack": "7.0.0-alpha.50",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"babel-loader": "^8.3.0",
"babel-plugin-bundled-import-meta": "^0.3.1",
"react": "16.14.0",
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"@storybook/store": "7.0.0-alpha.50",
"@storybook/types": "7.0.0-alpha.50",
"@types/estree": "^0.0.51",
"@types/node": "^18.11.9",
"@types/node": "^16.18.3",
"acorn": "^7.4.1",
"acorn-jsx": "^5.3.1",
"acorn-walk": "^7.2.0",
Expand Down
5 changes: 1 addition & 4 deletions code/ui/components/src/addon-panel/addon-panel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@ export interface AddonPanelProps {

export const AddonPanel = ({ active, children }: AddonPanelProps) => {
return (
// the transform is to prevent a bug where the content would be invisible
// the hidden attribute is an valid html element that's both accessible and works to visually hide content
<div hidden={!active} style={{ transform: 'translateX(0px)' }}>
{useUpdate(active, children)}
</div>
<div hidden={!active}>{useUpdate(active, children)}</div>
);
};
Loading

0 comments on commit a866a9d

Please sign in to comment.