Merge branch 'next' into replace-aside

storybookjs · Nov 7, 2023 · be0dd8d · be0dd8d
2 parents 6279536 + 063d79a
commit be0dd8d
Show file tree

Hide file tree

Showing 13 changed files with 196 additions and 2,569 deletions.
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -48,7 +48,7 @@ This document outlines some of the processes that the maintainers should adhere
 | maintenance                    | Issue, or pull request related to Storybook's internal maintenance                                                                                   |
 | mdx                            | Issue, bug, or pull request related to MDX and Storybook                                                                                             |
 | medium                         | Issue or pull request that involves a significant amount of work within Storybook                                                                    |
-| monorepos                      | Issue, bug, or pull request related to Storybook and monorepos (e.g., [lerna](https://lerna.js.org/) )                                               |
+| monorepos                      | Issue, bug, or pull request related to Storybook and monorepos                                                                                       |
 | mui                            | Issue, bug, or pull request that affects Storybook and [Material-UI](https://material-ui.com/)                                                       |
 | multiframework                 | Issue, bug, or pull request that affects multiple supported frameworks (e.g., React, Vue)                                                            |
 | needs more info                | Issue, or bug that requires additional context from the author                                                                                       |

diff --git a/README.md b/README.md
@@ -187,7 +187,7 @@ Looking for a first issue to tackle?
 
 ### Development scripts
 
-Storybook is organized as a monorepo using [Lerna](https://lerna.js.org/). Useful scripts include:
+Storybook is organized as a monorepo. Useful scripts include:
 
 #### `yarn start`
 

diff --git a/code/lerna.json b/code/lerna.json
diff --git a/code/lib/cli/scripts/generate-sb-packages-versions.js b/code/lib/cli/scripts/generate-sb-packages-versions.js
diff --git a/code/package.json b/code/package.json
@@ -26,7 +26,7 @@
   },
   "scripts": {
     "await-serve-storybooks": "wait-on http://localhost:8001",
-    "build": "NODE_ENV=production node ../scripts/build-package.js",
+    "build": "NODE_ENV=production ts-node --swc --esm ../scripts/build-package.ts",
     "changelog": "pr-log --sloppy --cherry-pick",
     "changelog:next": "pr-log --sloppy --since-prerelease",
     "check": "NODE_ENV=production node ../scripts/check-package.js",
@@ -43,9 +43,6 @@
     "lint:package": "sort-package-json",
     "local-registry": "ts-node --swc --project=../scripts/tsconfig.json ../scripts/run-registry.ts",
     "publish-sandboxes": "ts-node --swc ../scripts/sandbox/publish.ts",
-    "publish:debug": "npm run publish:latest -- --npm-tag=debug --no-push",
-    "publish:latest": "lerna publish --exact --concurrency 1 --force-publish",
-    "publish:next": "npm run publish:latest -- --npm-tag=next",
     "storybook:blocks": "STORYBOOK_BLOCKS_ONLY=true yarn storybook:ui",
     "storybook:blocks:build": "STORYBOOK_BLOCKS_ONLY=true yarn storybook:ui:build",
     "storybook:blocks:chromatic": "STORYBOOK_BLOCKS_ONLY=true yarn storybook:ui:chromatic --project-token=${CHROMATIC_TOKEN_STORYBOOK_BLOCKS:-MISSING_PROJECT_TOKEN}",
@@ -243,7 +240,6 @@
     "jest-os-detection": "^1.3.1",
     "jest-serializer-html": "^7.1.0",
     "jest-watch-typeahead": "^2.2.1",
-    "lerna": "^6.4.0",
     "lint-staged": "^13.2.2",
     "lodash": "^4.17.21",
     "node-gyp": "^9.3.1",

diff --git a/code/ui/blocks/src/components/Preview.tsx b/code/ui/blocks/src/components/Preview.tsx
@@ -52,7 +52,6 @@ const ChildrenContainer = styled.div<PreviewProps & { layout: Layout }>(
     layout === 'centered' || layout === 'padded'
       ? {
           padding: '30px 20px',
-          margin: -10,
           '& .innerZoomElementWrapper > *': {
             width: 'auto',
             border: '10px solid transparent!important',

diff --git a/code/ui/manager/src/components/sidebar/Brand.tsx b/code/ui/manager/src/components/sidebar/Brand.tsx
@@ -11,10 +11,9 @@ export const StorybookLogoStyled = styled(StorybookLogo)(({ theme }) => ({
 }));
 
 export const Img = styled.img({
-  width: 'auto',
-  height: 'auto',
   display: 'block',
-  maxWidth: '100%',
+  maxWidth: '150px',
+  maxHeight: '100px',
 });
 
 export const LogoLink = styled.a(({ theme }) => ({