From a9ecf533f19ee43a056bd476db1677772f58f82a Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Tue, 9 Jul 2024 13:42:33 +0200 Subject: [PATCH 01/33] Duplicate base cli files -> toolbox --- code/lib/{cli => toolbox}/.eslintrc.cjs | 0 code/lib/{cli => toolbox}/README.md | 0 code/lib/{cli => toolbox}/bin/index.cjs | 0 code/lib/{cli/src => toolbox}/generate.ts | 0 code/lib/{cli => toolbox}/package.json | 0 code/lib/{cli => toolbox}/project.json | 0 code/lib/{cli => toolbox}/tsconfig.json | 0 code/lib/{cli => toolbox}/vitest.config.ts | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename code/lib/{cli => toolbox}/.eslintrc.cjs (100%) rename code/lib/{cli => toolbox}/README.md (100%) rename code/lib/{cli => toolbox}/bin/index.cjs (100%) rename code/lib/{cli/src => toolbox}/generate.ts (100%) rename code/lib/{cli => toolbox}/package.json (100%) rename code/lib/{cli => toolbox}/project.json (100%) rename code/lib/{cli => toolbox}/tsconfig.json (100%) rename code/lib/{cli => toolbox}/vitest.config.ts (100%) diff --git a/code/lib/cli/.eslintrc.cjs b/code/lib/toolbox/.eslintrc.cjs similarity index 100% rename from code/lib/cli/.eslintrc.cjs rename to code/lib/toolbox/.eslintrc.cjs diff --git a/code/lib/cli/README.md b/code/lib/toolbox/README.md similarity index 100% rename from code/lib/cli/README.md rename to code/lib/toolbox/README.md diff --git a/code/lib/cli/bin/index.cjs b/code/lib/toolbox/bin/index.cjs similarity index 100% rename from code/lib/cli/bin/index.cjs rename to code/lib/toolbox/bin/index.cjs diff --git a/code/lib/cli/src/generate.ts b/code/lib/toolbox/generate.ts similarity index 100% rename from code/lib/cli/src/generate.ts rename to code/lib/toolbox/generate.ts diff --git a/code/lib/cli/package.json b/code/lib/toolbox/package.json similarity index 100% rename from code/lib/cli/package.json rename to code/lib/toolbox/package.json diff --git a/code/lib/cli/project.json b/code/lib/toolbox/project.json similarity index 100% rename from code/lib/cli/project.json rename to code/lib/toolbox/project.json diff --git a/code/lib/cli/tsconfig.json b/code/lib/toolbox/tsconfig.json similarity index 100% rename from code/lib/cli/tsconfig.json rename to code/lib/toolbox/tsconfig.json diff --git a/code/lib/cli/vitest.config.ts b/code/lib/toolbox/vitest.config.ts similarity index 100% rename from code/lib/cli/vitest.config.ts rename to code/lib/toolbox/vitest.config.ts From fa1df856560ea9473737b7ee36af9557b11da224 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Tue, 9 Jul 2024 13:49:21 +0200 Subject: [PATCH 02/33] Duplicate base cli files -> create-storybook --- code/lib/{cli => create-storybook}/.eslintrc.cjs | 0 code/lib/{cli => create-storybook}/README.md | 0 code/lib/{cli => create-storybook}/bin/index.cjs | 0 code/lib/{cli/src => create-storybook}/generate.ts | 0 code/lib/{cli => create-storybook}/package.json | 0 code/lib/{cli => create-storybook}/project.json | 0 code/lib/{cli => create-storybook}/tsconfig.json | 0 code/lib/{cli => create-storybook}/vitest.config.ts | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename code/lib/{cli => create-storybook}/.eslintrc.cjs (100%) rename code/lib/{cli => create-storybook}/README.md (100%) rename code/lib/{cli => create-storybook}/bin/index.cjs (100%) rename code/lib/{cli/src => create-storybook}/generate.ts (100%) rename code/lib/{cli => create-storybook}/package.json (100%) rename code/lib/{cli => create-storybook}/project.json (100%) rename code/lib/{cli => create-storybook}/tsconfig.json (100%) rename code/lib/{cli => create-storybook}/vitest.config.ts (100%) diff --git a/code/lib/cli/.eslintrc.cjs b/code/lib/create-storybook/.eslintrc.cjs similarity index 100% rename from code/lib/cli/.eslintrc.cjs rename to code/lib/create-storybook/.eslintrc.cjs diff --git a/code/lib/cli/README.md b/code/lib/create-storybook/README.md similarity index 100% rename from code/lib/cli/README.md rename to code/lib/create-storybook/README.md diff --git a/code/lib/cli/bin/index.cjs b/code/lib/create-storybook/bin/index.cjs similarity index 100% rename from code/lib/cli/bin/index.cjs rename to code/lib/create-storybook/bin/index.cjs diff --git a/code/lib/cli/src/generate.ts b/code/lib/create-storybook/generate.ts similarity index 100% rename from code/lib/cli/src/generate.ts rename to code/lib/create-storybook/generate.ts diff --git a/code/lib/cli/package.json b/code/lib/create-storybook/package.json similarity index 100% rename from code/lib/cli/package.json rename to code/lib/create-storybook/package.json diff --git a/code/lib/cli/project.json b/code/lib/create-storybook/project.json similarity index 100% rename from code/lib/cli/project.json rename to code/lib/create-storybook/project.json diff --git a/code/lib/cli/tsconfig.json b/code/lib/create-storybook/tsconfig.json similarity index 100% rename from code/lib/cli/tsconfig.json rename to code/lib/create-storybook/tsconfig.json diff --git a/code/lib/cli/vitest.config.ts b/code/lib/create-storybook/vitest.config.ts similarity index 100% rename from code/lib/cli/vitest.config.ts rename to code/lib/create-storybook/vitest.config.ts From 912204231da64a07ecb1284a3d7d09d8a77fbf1c Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Tue, 9 Jul 2024 14:22:55 +0200 Subject: [PATCH 03/33] Move generate files to the right location --- code/lib/create-storybook/{ => src}/generate.ts | 0 code/lib/toolbox/{ => src}/generate.ts | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename code/lib/create-storybook/{ => src}/generate.ts (100%) rename code/lib/toolbox/{ => src}/generate.ts (100%) diff --git a/code/lib/create-storybook/generate.ts b/code/lib/create-storybook/src/generate.ts similarity index 100% rename from code/lib/create-storybook/generate.ts rename to code/lib/create-storybook/src/generate.ts diff --git a/code/lib/toolbox/generate.ts b/code/lib/toolbox/src/generate.ts similarity index 100% rename from code/lib/toolbox/generate.ts rename to code/lib/toolbox/src/generate.ts From 7a77829b0dd5dacf518fe6d3d416e12131490d5a Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Tue, 9 Jul 2024 14:38:48 +0200 Subject: [PATCH 04/33] Move files to new locations --- code/{lib/cli/src => core/src/cli}/NpmOptions.ts | 0 code/{lib/cli/src => core/src/cli}/build.ts | 0 code/{lib/cli/src => core/src/cli}/detect.test.ts | 0 code/{lib/cli/src => core/src/cli}/detect.ts | 0 code/{lib/cli/src => core/src/cli}/dev.ts | 0 code/{lib/cli/src => core/src/cli}/dirs.ts | 0 code/{lib/cli/src => core/src/cli}/generate.ts | 0 code/{lib/cli/src => core/src/cli}/helpers.test.ts | 0 code/{lib/cli/src => core/src/cli}/helpers.ts | 0 .../cli/src => core/src/cli}/project_types.test.ts | 0 code/{lib/cli/src => core/src/cli}/project_types.ts | 0 .../rendererAssets/.eslintrc.json | 0 .../rendererAssets/common/Configure.mdx | 0 .../rendererAssets/common/assets/accessibility.png | Bin .../rendererAssets/common/assets/accessibility.svg | 0 .../rendererAssets/common/assets/addon-library.png | Bin .../rendererAssets/common/assets/assets.png | Bin .../common/assets/avif-test-image.avif | Bin .../rendererAssets/common/assets/context.png | Bin .../rendererAssets/common/assets/discord.svg | 0 .../rendererAssets/common/assets/docs.png | Bin .../rendererAssets/common/assets/figma-plugin.png | Bin .../rendererAssets/common/assets/github.svg | 0 .../rendererAssets/common/assets/share.png | Bin .../rendererAssets/common/assets/styling.png | Bin .../rendererAssets/common/assets/testing.png | Bin .../rendererAssets/common/assets/theming.png | Bin .../rendererAssets/common/assets/tutorials.svg | 0 .../rendererAssets/common/assets/youtube.svg | 0 .../rendererAssets/common/button.css | 0 .../rendererAssets/common/header.css | 0 .../rendererAssets/common/page.css | 0 .../src/generators/ANGULAR/helpers.ts | 0 .../src/generators/ANGULAR/index.ts | 0 .../src/generators/EMBER/index.ts | 0 .../src/generators/HTML/index.ts | 0 .../src/generators/NEXTJS/index.ts | 0 .../src/generators/PREACT/index.ts | 0 .../src/generators/QWIK/index.ts | 0 .../src/generators/REACT/index.ts | 0 .../src/generators/REACT_NATIVE/index.ts | 0 .../src/generators/REACT_SCRIPTS/index.ts | 0 .../src/generators/SERVER/index.ts | 0 .../src/generators/SOLID/index.ts | 0 .../src/generators/SVELTE/index.ts | 0 .../src/generators/SVELTEKIT/index.ts | 0 .../src/generators/VUE3/index.ts | 0 .../src/generators/WEB-COMPONENTS/index.ts | 0 .../src/generators/WEBPACK_REACT/index.ts | 0 .../src/generators/baseGenerator.ts | 0 .../src/generators/configure.test.ts | 0 .../src/generators/configure.ts | 0 .../src/generators/types.ts | 0 code/lib/{cli => create-storybook}/src/initiate.ts | 0 .../src/scaffold-new-project.ts | 0 .../template-csf/.storybook/tsconfig.doc.json | 0 .../template-csf/.storybook/tsconfig.json | 0 .../template-csf/.storybook/typings.d.ts | 0 .../library/template-csf/.storybook/tsconfig.json | 0 .../library/template-csf/.storybook/typings.d.ts | 0 .../aurelia/template-csf/.storybook/tsconfig.json | 0 .../aurelia/template-csf/.storybook/typings.d.ts | 0 code/lib/{cli => toolbox}/src/add.test.ts | 0 code/lib/{cli => toolbox}/src/add.ts | 0 .../src/autoblock/block-dependencies-versions.ts | 0 .../src/autoblock/block-node-version.ts | 0 .../src/autoblock/block-storystorev6.ts | 0 .../{cli => toolbox}/src/autoblock/index.test.ts | 0 code/lib/{cli => toolbox}/src/autoblock/index.ts | 0 code/lib/{cli => toolbox}/src/autoblock/types.ts | 0 .../fixes/__test__/main-config-with-wrappers.js | 0 .../fixes/__test__/main-config-without-wrappers.js | 0 .../src/automigrate/fixes/addon-postcss.test.ts | 0 .../src/automigrate/fixes/addon-postcss.ts | 0 .../src/automigrate/fixes/addons-api.test.ts | 0 .../src/automigrate/fixes/addons-api.ts | 0 .../fixes/angular-builders-multiproject.test.ts | 0 .../fixes/angular-builders-multiproject.ts | 0 .../src/automigrate/fixes/angular-builders.test.ts | 0 .../src/automigrate/fixes/angular-builders.ts | 0 .../src/automigrate/fixes/autodocs-tags.test.ts | 0 .../src/automigrate/fixes/autodocs-tags.ts | 0 .../src/automigrate/fixes/autodocs-true.test.ts | 0 .../src/automigrate/fixes/autodocs-true.ts | 0 .../src/automigrate/fixes/builder-vite.test.ts | 0 .../src/automigrate/fixes/builder-vite.ts | 0 .../src/automigrate/fixes/cra5.test.ts | 0 .../{cli => toolbox}/src/automigrate/fixes/cra5.ts | 0 .../src/automigrate/fixes/eslint-plugin.test.ts | 0 .../src/automigrate/fixes/eslint-plugin.ts | 0 .../{cli => toolbox}/src/automigrate/fixes/index.ts | 0 .../src/automigrate/fixes/initial-globals.test.ts | 0 .../src/automigrate/fixes/initial-globals.ts | 0 .../src/automigrate/fixes/mdx-1-to-3.test.ts | 0 .../src/automigrate/fixes/mdx-1-to-3.ts | 0 .../src/automigrate/fixes/mdx-gfm.test.ts | 0 .../src/automigrate/fixes/mdx-gfm.ts | 0 .../src/automigrate/fixes/mdx-to-csf.test.ts | 0 .../src/automigrate/fixes/mdx-to-csf.ts | 0 .../src/automigrate/fixes/new-frameworks.test.ts | 0 .../src/automigrate/fixes/new-frameworks.ts | 0 .../automigrate/fixes/prompt-remove-react.test.ts | 0 .../src/automigrate/fixes/prompt-remove-react.ts | 0 .../src/automigrate/fixes/react-docgen.test.ts | 0 .../src/automigrate/fixes/react-docgen.ts | 0 .../src/automigrate/fixes/remove-argtypes-regex.ts | 0 .../fixes/remove-global-client-apis.test.ts | 0 .../automigrate/fixes/remove-global-client-apis.ts | 0 .../fixes/remove-jest-testing-library.test.ts | 0 .../fixes/remove-jest-testing-library.ts | 0 .../src/automigrate/fixes/remove-legacymdx1.ts | 0 .../src/automigrate/fixes/sb-binary.test.ts | 0 .../src/automigrate/fixes/sb-binary.ts | 0 .../src/automigrate/fixes/sb-scripts.test.ts | 0 .../src/automigrate/fixes/sb-scripts.ts | 0 .../automigrate/fixes/storyshots-migration.test.ts | 0 .../src/automigrate/fixes/storyshots-migration.ts | 0 .../upgrade-storybook-related-dependencies.test.ts | 0 .../fixes/upgrade-storybook-related-dependencies.ts | 0 .../src/automigrate/fixes/vite-config-file.ts | 0 .../src/automigrate/fixes/vta.test.ts | 0 .../{cli => toolbox}/src/automigrate/fixes/vta.ts | 0 .../src/automigrate/fixes/vue3.test.ts | 0 .../{cli => toolbox}/src/automigrate/fixes/vue3.ts | 0 .../fixes/webpack5-compiler-setup.test.ts | 0 .../automigrate/fixes/webpack5-compiler-setup.ts | 0 .../src/automigrate/fixes/webpack5.test.ts | 0 .../src/automigrate/fixes/webpack5.ts | 0 .../src/automigrate/fixes/wrap-require-utils.ts | 0 .../src/automigrate/fixes/wrap-require.test.ts | 0 .../src/automigrate/fixes/wrap-require.ts | 0 .../helpers/checkWebpack5Builder.test.ts | 0 .../src/automigrate/helpers/checkWebpack5Builder.ts | 0 .../src/automigrate/helpers/cleanLog.ts | 0 .../src/automigrate/helpers/detectRenderer.ts | 0 .../src/automigrate/helpers/eslintPlugin.test.ts | 0 .../src/automigrate/helpers/eslintPlugin.ts | 0 .../automigrate/helpers/getMigrationSummary.test.ts | 0 .../src/automigrate/helpers/getMigrationSummary.ts | 0 .../src/automigrate/helpers/mainConfigFile.test.ts | 0 .../src/automigrate/helpers/mainConfigFile.ts | 0 .../helpers/new-frameworks-utils.test.ts | 0 .../src/automigrate/helpers/new-frameworks-utils.ts | 0 .../src/automigrate/helpers/testing-helpers.ts | 0 .../{cli => toolbox}/src/automigrate/index.test.ts | 0 code/lib/{cli => toolbox}/src/automigrate/index.ts | 0 code/lib/{cli => toolbox}/src/automigrate/types.ts | 0 .../src/doctor/getDuplicatedDepsWarnings.ts | 0 .../doctor/getIncompatibleStorybookPackages.test.ts | 0 .../src/doctor/getIncompatibleStorybookPackages.ts | 0 .../src/doctor/getMismatchingVersionsWarning.ts | 0 .../src/doctor/hasMultipleVersions.ts | 0 code/lib/{cli => toolbox}/src/doctor/index.ts | 0 code/lib/{cli => toolbox}/src/doctor/utils.ts | 0 code/lib/{cli => toolbox}/src/index.ts | 0 code/lib/{cli => toolbox}/src/link.ts | 0 code/lib/{cli => toolbox}/src/migrate.ts | 0 code/lib/{cli => toolbox}/src/postinstallAddon.ts | 0 code/lib/{cli => toolbox}/src/sandbox-templates.ts | 0 code/lib/{cli => toolbox}/src/sandbox.ts | 0 code/lib/{cli => toolbox}/src/typings.d.ts | 0 code/lib/{cli => toolbox}/src/upgrade.test.ts | 0 code/lib/{cli => toolbox}/src/upgrade.ts | 0 code/lib/{cli => toolbox}/src/warn.test.ts | 0 code/lib/{cli => toolbox}/src/warn.ts | 0 code/lib/{cli => toolbox}/src/window.d.ts | 0 166 files changed, 0 insertions(+), 0 deletions(-) rename code/{lib/cli/src => core/src/cli}/NpmOptions.ts (100%) rename code/{lib/cli/src => core/src/cli}/build.ts (100%) rename code/{lib/cli/src => core/src/cli}/detect.test.ts (100%) rename code/{lib/cli/src => core/src/cli}/detect.ts (100%) rename code/{lib/cli/src => core/src/cli}/dev.ts (100%) rename code/{lib/cli/src => core/src/cli}/dirs.ts (100%) rename code/{lib/cli/src => core/src/cli}/generate.ts (100%) rename code/{lib/cli/src => core/src/cli}/helpers.test.ts (100%) rename code/{lib/cli/src => core/src/cli}/helpers.ts (100%) rename code/{lib/cli/src => core/src/cli}/project_types.test.ts (100%) rename code/{lib/cli/src => core/src/cli}/project_types.ts (100%) rename code/lib/{cli => create-storybook}/rendererAssets/.eslintrc.json (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/Configure.mdx (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/accessibility.png (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/accessibility.svg (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/addon-library.png (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/assets.png (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/avif-test-image.avif (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/context.png (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/discord.svg (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/docs.png (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/figma-plugin.png (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/github.svg (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/share.png (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/styling.png (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/testing.png (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/theming.png (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/tutorials.svg (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/assets/youtube.svg (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/button.css (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/header.css (100%) rename code/lib/{cli => create-storybook}/rendererAssets/common/page.css (100%) rename code/lib/{cli => create-storybook}/src/generators/ANGULAR/helpers.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/ANGULAR/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/EMBER/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/HTML/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/NEXTJS/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/PREACT/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/QWIK/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/REACT/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/REACT_NATIVE/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/REACT_SCRIPTS/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/SERVER/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/SOLID/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/SVELTE/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/SVELTEKIT/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/VUE3/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/WEB-COMPONENTS/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/WEBPACK_REACT/index.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/baseGenerator.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/configure.test.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/configure.ts (100%) rename code/lib/{cli => create-storybook}/src/generators/types.ts (100%) rename code/lib/{cli => create-storybook}/src/initiate.ts (100%) rename code/lib/{cli => create-storybook}/src/scaffold-new-project.ts (100%) rename code/lib/{cli => create-storybook}/templates/angular/application/template-csf/.storybook/tsconfig.doc.json (100%) rename code/lib/{cli => create-storybook}/templates/angular/application/template-csf/.storybook/tsconfig.json (100%) rename code/lib/{cli => create-storybook}/templates/angular/application/template-csf/.storybook/typings.d.ts (100%) rename code/lib/{cli => create-storybook}/templates/angular/library/template-csf/.storybook/tsconfig.json (100%) rename code/lib/{cli => create-storybook}/templates/angular/library/template-csf/.storybook/typings.d.ts (100%) rename code/lib/{cli => create-storybook}/templates/aurelia/template-csf/.storybook/tsconfig.json (100%) rename code/lib/{cli => create-storybook}/templates/aurelia/template-csf/.storybook/typings.d.ts (100%) rename code/lib/{cli => toolbox}/src/add.test.ts (100%) rename code/lib/{cli => toolbox}/src/add.ts (100%) rename code/lib/{cli => toolbox}/src/autoblock/block-dependencies-versions.ts (100%) rename code/lib/{cli => toolbox}/src/autoblock/block-node-version.ts (100%) rename code/lib/{cli => toolbox}/src/autoblock/block-storystorev6.ts (100%) rename code/lib/{cli => toolbox}/src/autoblock/index.test.ts (100%) rename code/lib/{cli => toolbox}/src/autoblock/index.ts (100%) rename code/lib/{cli => toolbox}/src/autoblock/types.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/__test__/main-config-with-wrappers.js (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/__test__/main-config-without-wrappers.js (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/addon-postcss.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/addon-postcss.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/addons-api.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/addons-api.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/angular-builders-multiproject.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/angular-builders-multiproject.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/angular-builders.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/angular-builders.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/autodocs-tags.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/autodocs-tags.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/autodocs-true.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/autodocs-true.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/builder-vite.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/builder-vite.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/cra5.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/cra5.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/eslint-plugin.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/eslint-plugin.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/index.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/initial-globals.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/initial-globals.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/mdx-1-to-3.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/mdx-1-to-3.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/mdx-gfm.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/mdx-gfm.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/mdx-to-csf.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/mdx-to-csf.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/new-frameworks.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/new-frameworks.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/prompt-remove-react.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/prompt-remove-react.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/react-docgen.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/react-docgen.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/remove-argtypes-regex.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/remove-global-client-apis.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/remove-global-client-apis.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/remove-jest-testing-library.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/remove-jest-testing-library.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/remove-legacymdx1.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/sb-binary.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/sb-binary.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/sb-scripts.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/sb-scripts.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/storyshots-migration.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/storyshots-migration.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/vite-config-file.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/vta.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/vta.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/vue3.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/vue3.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/webpack5-compiler-setup.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/webpack5-compiler-setup.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/webpack5.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/webpack5.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/wrap-require-utils.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/wrap-require.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/fixes/wrap-require.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/helpers/checkWebpack5Builder.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/helpers/checkWebpack5Builder.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/helpers/cleanLog.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/helpers/detectRenderer.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/helpers/eslintPlugin.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/helpers/eslintPlugin.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/helpers/getMigrationSummary.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/helpers/getMigrationSummary.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/helpers/mainConfigFile.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/helpers/mainConfigFile.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/helpers/new-frameworks-utils.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/helpers/new-frameworks-utils.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/helpers/testing-helpers.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/index.test.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/index.ts (100%) rename code/lib/{cli => toolbox}/src/automigrate/types.ts (100%) rename code/lib/{cli => toolbox}/src/doctor/getDuplicatedDepsWarnings.ts (100%) rename code/lib/{cli => toolbox}/src/doctor/getIncompatibleStorybookPackages.test.ts (100%) rename code/lib/{cli => toolbox}/src/doctor/getIncompatibleStorybookPackages.ts (100%) rename code/lib/{cli => toolbox}/src/doctor/getMismatchingVersionsWarning.ts (100%) rename code/lib/{cli => toolbox}/src/doctor/hasMultipleVersions.ts (100%) rename code/lib/{cli => toolbox}/src/doctor/index.ts (100%) rename code/lib/{cli => toolbox}/src/doctor/utils.ts (100%) rename code/lib/{cli => toolbox}/src/index.ts (100%) rename code/lib/{cli => toolbox}/src/link.ts (100%) rename code/lib/{cli => toolbox}/src/migrate.ts (100%) rename code/lib/{cli => toolbox}/src/postinstallAddon.ts (100%) rename code/lib/{cli => toolbox}/src/sandbox-templates.ts (100%) rename code/lib/{cli => toolbox}/src/sandbox.ts (100%) rename code/lib/{cli => toolbox}/src/typings.d.ts (100%) rename code/lib/{cli => toolbox}/src/upgrade.test.ts (100%) rename code/lib/{cli => toolbox}/src/upgrade.ts (100%) rename code/lib/{cli => toolbox}/src/warn.test.ts (100%) rename code/lib/{cli => toolbox}/src/warn.ts (100%) rename code/lib/{cli => toolbox}/src/window.d.ts (100%) diff --git a/code/lib/cli/src/NpmOptions.ts b/code/core/src/cli/NpmOptions.ts similarity index 100% rename from code/lib/cli/src/NpmOptions.ts rename to code/core/src/cli/NpmOptions.ts diff --git a/code/lib/cli/src/build.ts b/code/core/src/cli/build.ts similarity index 100% rename from code/lib/cli/src/build.ts rename to code/core/src/cli/build.ts diff --git a/code/lib/cli/src/detect.test.ts b/code/core/src/cli/detect.test.ts similarity index 100% rename from code/lib/cli/src/detect.test.ts rename to code/core/src/cli/detect.test.ts diff --git a/code/lib/cli/src/detect.ts b/code/core/src/cli/detect.ts similarity index 100% rename from code/lib/cli/src/detect.ts rename to code/core/src/cli/detect.ts diff --git a/code/lib/cli/src/dev.ts b/code/core/src/cli/dev.ts similarity index 100% rename from code/lib/cli/src/dev.ts rename to code/core/src/cli/dev.ts diff --git a/code/lib/cli/src/dirs.ts b/code/core/src/cli/dirs.ts similarity index 100% rename from code/lib/cli/src/dirs.ts rename to code/core/src/cli/dirs.ts diff --git a/code/lib/cli/src/generate.ts b/code/core/src/cli/generate.ts similarity index 100% rename from code/lib/cli/src/generate.ts rename to code/core/src/cli/generate.ts diff --git a/code/lib/cli/src/helpers.test.ts b/code/core/src/cli/helpers.test.ts similarity index 100% rename from code/lib/cli/src/helpers.test.ts rename to code/core/src/cli/helpers.test.ts diff --git a/code/lib/cli/src/helpers.ts b/code/core/src/cli/helpers.ts similarity index 100% rename from code/lib/cli/src/helpers.ts rename to code/core/src/cli/helpers.ts diff --git a/code/lib/cli/src/project_types.test.ts b/code/core/src/cli/project_types.test.ts similarity index 100% rename from code/lib/cli/src/project_types.test.ts rename to code/core/src/cli/project_types.test.ts diff --git a/code/lib/cli/src/project_types.ts b/code/core/src/cli/project_types.ts similarity index 100% rename from code/lib/cli/src/project_types.ts rename to code/core/src/cli/project_types.ts diff --git a/code/lib/cli/rendererAssets/.eslintrc.json b/code/lib/create-storybook/rendererAssets/.eslintrc.json similarity index 100% rename from code/lib/cli/rendererAssets/.eslintrc.json rename to code/lib/create-storybook/rendererAssets/.eslintrc.json diff --git a/code/lib/cli/rendererAssets/common/Configure.mdx b/code/lib/create-storybook/rendererAssets/common/Configure.mdx similarity index 100% rename from code/lib/cli/rendererAssets/common/Configure.mdx rename to code/lib/create-storybook/rendererAssets/common/Configure.mdx diff --git a/code/lib/cli/rendererAssets/common/assets/accessibility.png b/code/lib/create-storybook/rendererAssets/common/assets/accessibility.png similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/accessibility.png rename to code/lib/create-storybook/rendererAssets/common/assets/accessibility.png diff --git a/code/lib/cli/rendererAssets/common/assets/accessibility.svg b/code/lib/create-storybook/rendererAssets/common/assets/accessibility.svg similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/accessibility.svg rename to code/lib/create-storybook/rendererAssets/common/assets/accessibility.svg diff --git a/code/lib/cli/rendererAssets/common/assets/addon-library.png b/code/lib/create-storybook/rendererAssets/common/assets/addon-library.png similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/addon-library.png rename to code/lib/create-storybook/rendererAssets/common/assets/addon-library.png diff --git a/code/lib/cli/rendererAssets/common/assets/assets.png b/code/lib/create-storybook/rendererAssets/common/assets/assets.png similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/assets.png rename to code/lib/create-storybook/rendererAssets/common/assets/assets.png diff --git a/code/lib/cli/rendererAssets/common/assets/avif-test-image.avif b/code/lib/create-storybook/rendererAssets/common/assets/avif-test-image.avif similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/avif-test-image.avif rename to code/lib/create-storybook/rendererAssets/common/assets/avif-test-image.avif diff --git a/code/lib/cli/rendererAssets/common/assets/context.png b/code/lib/create-storybook/rendererAssets/common/assets/context.png similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/context.png rename to code/lib/create-storybook/rendererAssets/common/assets/context.png diff --git a/code/lib/cli/rendererAssets/common/assets/discord.svg b/code/lib/create-storybook/rendererAssets/common/assets/discord.svg similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/discord.svg rename to code/lib/create-storybook/rendererAssets/common/assets/discord.svg diff --git a/code/lib/cli/rendererAssets/common/assets/docs.png b/code/lib/create-storybook/rendererAssets/common/assets/docs.png similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/docs.png rename to code/lib/create-storybook/rendererAssets/common/assets/docs.png diff --git a/code/lib/cli/rendererAssets/common/assets/figma-plugin.png b/code/lib/create-storybook/rendererAssets/common/assets/figma-plugin.png similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/figma-plugin.png rename to code/lib/create-storybook/rendererAssets/common/assets/figma-plugin.png diff --git a/code/lib/cli/rendererAssets/common/assets/github.svg b/code/lib/create-storybook/rendererAssets/common/assets/github.svg similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/github.svg rename to code/lib/create-storybook/rendererAssets/common/assets/github.svg diff --git a/code/lib/cli/rendererAssets/common/assets/share.png b/code/lib/create-storybook/rendererAssets/common/assets/share.png similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/share.png rename to code/lib/create-storybook/rendererAssets/common/assets/share.png diff --git a/code/lib/cli/rendererAssets/common/assets/styling.png b/code/lib/create-storybook/rendererAssets/common/assets/styling.png similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/styling.png rename to code/lib/create-storybook/rendererAssets/common/assets/styling.png diff --git a/code/lib/cli/rendererAssets/common/assets/testing.png b/code/lib/create-storybook/rendererAssets/common/assets/testing.png similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/testing.png rename to code/lib/create-storybook/rendererAssets/common/assets/testing.png diff --git a/code/lib/cli/rendererAssets/common/assets/theming.png b/code/lib/create-storybook/rendererAssets/common/assets/theming.png similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/theming.png rename to code/lib/create-storybook/rendererAssets/common/assets/theming.png diff --git a/code/lib/cli/rendererAssets/common/assets/tutorials.svg b/code/lib/create-storybook/rendererAssets/common/assets/tutorials.svg similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/tutorials.svg rename to code/lib/create-storybook/rendererAssets/common/assets/tutorials.svg diff --git a/code/lib/cli/rendererAssets/common/assets/youtube.svg b/code/lib/create-storybook/rendererAssets/common/assets/youtube.svg similarity index 100% rename from code/lib/cli/rendererAssets/common/assets/youtube.svg rename to code/lib/create-storybook/rendererAssets/common/assets/youtube.svg diff --git a/code/lib/cli/rendererAssets/common/button.css b/code/lib/create-storybook/rendererAssets/common/button.css similarity index 100% rename from code/lib/cli/rendererAssets/common/button.css rename to code/lib/create-storybook/rendererAssets/common/button.css diff --git a/code/lib/cli/rendererAssets/common/header.css b/code/lib/create-storybook/rendererAssets/common/header.css similarity index 100% rename from code/lib/cli/rendererAssets/common/header.css rename to code/lib/create-storybook/rendererAssets/common/header.css diff --git a/code/lib/cli/rendererAssets/common/page.css b/code/lib/create-storybook/rendererAssets/common/page.css similarity index 100% rename from code/lib/cli/rendererAssets/common/page.css rename to code/lib/create-storybook/rendererAssets/common/page.css diff --git a/code/lib/cli/src/generators/ANGULAR/helpers.ts b/code/lib/create-storybook/src/generators/ANGULAR/helpers.ts similarity index 100% rename from code/lib/cli/src/generators/ANGULAR/helpers.ts rename to code/lib/create-storybook/src/generators/ANGULAR/helpers.ts diff --git a/code/lib/cli/src/generators/ANGULAR/index.ts b/code/lib/create-storybook/src/generators/ANGULAR/index.ts similarity index 100% rename from code/lib/cli/src/generators/ANGULAR/index.ts rename to code/lib/create-storybook/src/generators/ANGULAR/index.ts diff --git a/code/lib/cli/src/generators/EMBER/index.ts b/code/lib/create-storybook/src/generators/EMBER/index.ts similarity index 100% rename from code/lib/cli/src/generators/EMBER/index.ts rename to code/lib/create-storybook/src/generators/EMBER/index.ts diff --git a/code/lib/cli/src/generators/HTML/index.ts b/code/lib/create-storybook/src/generators/HTML/index.ts similarity index 100% rename from code/lib/cli/src/generators/HTML/index.ts rename to code/lib/create-storybook/src/generators/HTML/index.ts diff --git a/code/lib/cli/src/generators/NEXTJS/index.ts b/code/lib/create-storybook/src/generators/NEXTJS/index.ts similarity index 100% rename from code/lib/cli/src/generators/NEXTJS/index.ts rename to code/lib/create-storybook/src/generators/NEXTJS/index.ts diff --git a/code/lib/cli/src/generators/PREACT/index.ts b/code/lib/create-storybook/src/generators/PREACT/index.ts similarity index 100% rename from code/lib/cli/src/generators/PREACT/index.ts rename to code/lib/create-storybook/src/generators/PREACT/index.ts diff --git a/code/lib/cli/src/generators/QWIK/index.ts b/code/lib/create-storybook/src/generators/QWIK/index.ts similarity index 100% rename from code/lib/cli/src/generators/QWIK/index.ts rename to code/lib/create-storybook/src/generators/QWIK/index.ts diff --git a/code/lib/cli/src/generators/REACT/index.ts b/code/lib/create-storybook/src/generators/REACT/index.ts similarity index 100% rename from code/lib/cli/src/generators/REACT/index.ts rename to code/lib/create-storybook/src/generators/REACT/index.ts diff --git a/code/lib/cli/src/generators/REACT_NATIVE/index.ts b/code/lib/create-storybook/src/generators/REACT_NATIVE/index.ts similarity index 100% rename from code/lib/cli/src/generators/REACT_NATIVE/index.ts rename to code/lib/create-storybook/src/generators/REACT_NATIVE/index.ts diff --git a/code/lib/cli/src/generators/REACT_SCRIPTS/index.ts b/code/lib/create-storybook/src/generators/REACT_SCRIPTS/index.ts similarity index 100% rename from code/lib/cli/src/generators/REACT_SCRIPTS/index.ts rename to code/lib/create-storybook/src/generators/REACT_SCRIPTS/index.ts diff --git a/code/lib/cli/src/generators/SERVER/index.ts b/code/lib/create-storybook/src/generators/SERVER/index.ts similarity index 100% rename from code/lib/cli/src/generators/SERVER/index.ts rename to code/lib/create-storybook/src/generators/SERVER/index.ts diff --git a/code/lib/cli/src/generators/SOLID/index.ts b/code/lib/create-storybook/src/generators/SOLID/index.ts similarity index 100% rename from code/lib/cli/src/generators/SOLID/index.ts rename to code/lib/create-storybook/src/generators/SOLID/index.ts diff --git a/code/lib/cli/src/generators/SVELTE/index.ts b/code/lib/create-storybook/src/generators/SVELTE/index.ts similarity index 100% rename from code/lib/cli/src/generators/SVELTE/index.ts rename to code/lib/create-storybook/src/generators/SVELTE/index.ts diff --git a/code/lib/cli/src/generators/SVELTEKIT/index.ts b/code/lib/create-storybook/src/generators/SVELTEKIT/index.ts similarity index 100% rename from code/lib/cli/src/generators/SVELTEKIT/index.ts rename to code/lib/create-storybook/src/generators/SVELTEKIT/index.ts diff --git a/code/lib/cli/src/generators/VUE3/index.ts b/code/lib/create-storybook/src/generators/VUE3/index.ts similarity index 100% rename from code/lib/cli/src/generators/VUE3/index.ts rename to code/lib/create-storybook/src/generators/VUE3/index.ts diff --git a/code/lib/cli/src/generators/WEB-COMPONENTS/index.ts b/code/lib/create-storybook/src/generators/WEB-COMPONENTS/index.ts similarity index 100% rename from code/lib/cli/src/generators/WEB-COMPONENTS/index.ts rename to code/lib/create-storybook/src/generators/WEB-COMPONENTS/index.ts diff --git a/code/lib/cli/src/generators/WEBPACK_REACT/index.ts b/code/lib/create-storybook/src/generators/WEBPACK_REACT/index.ts similarity index 100% rename from code/lib/cli/src/generators/WEBPACK_REACT/index.ts rename to code/lib/create-storybook/src/generators/WEBPACK_REACT/index.ts diff --git a/code/lib/cli/src/generators/baseGenerator.ts b/code/lib/create-storybook/src/generators/baseGenerator.ts similarity index 100% rename from code/lib/cli/src/generators/baseGenerator.ts rename to code/lib/create-storybook/src/generators/baseGenerator.ts diff --git a/code/lib/cli/src/generators/configure.test.ts b/code/lib/create-storybook/src/generators/configure.test.ts similarity index 100% rename from code/lib/cli/src/generators/configure.test.ts rename to code/lib/create-storybook/src/generators/configure.test.ts diff --git a/code/lib/cli/src/generators/configure.ts b/code/lib/create-storybook/src/generators/configure.ts similarity index 100% rename from code/lib/cli/src/generators/configure.ts rename to code/lib/create-storybook/src/generators/configure.ts diff --git a/code/lib/cli/src/generators/types.ts b/code/lib/create-storybook/src/generators/types.ts similarity index 100% rename from code/lib/cli/src/generators/types.ts rename to code/lib/create-storybook/src/generators/types.ts diff --git a/code/lib/cli/src/initiate.ts b/code/lib/create-storybook/src/initiate.ts similarity index 100% rename from code/lib/cli/src/initiate.ts rename to code/lib/create-storybook/src/initiate.ts diff --git a/code/lib/cli/src/scaffold-new-project.ts b/code/lib/create-storybook/src/scaffold-new-project.ts similarity index 100% rename from code/lib/cli/src/scaffold-new-project.ts rename to code/lib/create-storybook/src/scaffold-new-project.ts diff --git a/code/lib/cli/templates/angular/application/template-csf/.storybook/tsconfig.doc.json b/code/lib/create-storybook/templates/angular/application/template-csf/.storybook/tsconfig.doc.json similarity index 100% rename from code/lib/cli/templates/angular/application/template-csf/.storybook/tsconfig.doc.json rename to code/lib/create-storybook/templates/angular/application/template-csf/.storybook/tsconfig.doc.json diff --git a/code/lib/cli/templates/angular/application/template-csf/.storybook/tsconfig.json b/code/lib/create-storybook/templates/angular/application/template-csf/.storybook/tsconfig.json similarity index 100% rename from code/lib/cli/templates/angular/application/template-csf/.storybook/tsconfig.json rename to code/lib/create-storybook/templates/angular/application/template-csf/.storybook/tsconfig.json diff --git a/code/lib/cli/templates/angular/application/template-csf/.storybook/typings.d.ts b/code/lib/create-storybook/templates/angular/application/template-csf/.storybook/typings.d.ts similarity index 100% rename from code/lib/cli/templates/angular/application/template-csf/.storybook/typings.d.ts rename to code/lib/create-storybook/templates/angular/application/template-csf/.storybook/typings.d.ts diff --git a/code/lib/cli/templates/angular/library/template-csf/.storybook/tsconfig.json b/code/lib/create-storybook/templates/angular/library/template-csf/.storybook/tsconfig.json similarity index 100% rename from code/lib/cli/templates/angular/library/template-csf/.storybook/tsconfig.json rename to code/lib/create-storybook/templates/angular/library/template-csf/.storybook/tsconfig.json diff --git a/code/lib/cli/templates/angular/library/template-csf/.storybook/typings.d.ts b/code/lib/create-storybook/templates/angular/library/template-csf/.storybook/typings.d.ts similarity index 100% rename from code/lib/cli/templates/angular/library/template-csf/.storybook/typings.d.ts rename to code/lib/create-storybook/templates/angular/library/template-csf/.storybook/typings.d.ts diff --git a/code/lib/cli/templates/aurelia/template-csf/.storybook/tsconfig.json b/code/lib/create-storybook/templates/aurelia/template-csf/.storybook/tsconfig.json similarity index 100% rename from code/lib/cli/templates/aurelia/template-csf/.storybook/tsconfig.json rename to code/lib/create-storybook/templates/aurelia/template-csf/.storybook/tsconfig.json diff --git a/code/lib/cli/templates/aurelia/template-csf/.storybook/typings.d.ts b/code/lib/create-storybook/templates/aurelia/template-csf/.storybook/typings.d.ts similarity index 100% rename from code/lib/cli/templates/aurelia/template-csf/.storybook/typings.d.ts rename to code/lib/create-storybook/templates/aurelia/template-csf/.storybook/typings.d.ts diff --git a/code/lib/cli/src/add.test.ts b/code/lib/toolbox/src/add.test.ts similarity index 100% rename from code/lib/cli/src/add.test.ts rename to code/lib/toolbox/src/add.test.ts diff --git a/code/lib/cli/src/add.ts b/code/lib/toolbox/src/add.ts similarity index 100% rename from code/lib/cli/src/add.ts rename to code/lib/toolbox/src/add.ts diff --git a/code/lib/cli/src/autoblock/block-dependencies-versions.ts b/code/lib/toolbox/src/autoblock/block-dependencies-versions.ts similarity index 100% rename from code/lib/cli/src/autoblock/block-dependencies-versions.ts rename to code/lib/toolbox/src/autoblock/block-dependencies-versions.ts diff --git a/code/lib/cli/src/autoblock/block-node-version.ts b/code/lib/toolbox/src/autoblock/block-node-version.ts similarity index 100% rename from code/lib/cli/src/autoblock/block-node-version.ts rename to code/lib/toolbox/src/autoblock/block-node-version.ts diff --git a/code/lib/cli/src/autoblock/block-storystorev6.ts b/code/lib/toolbox/src/autoblock/block-storystorev6.ts similarity index 100% rename from code/lib/cli/src/autoblock/block-storystorev6.ts rename to code/lib/toolbox/src/autoblock/block-storystorev6.ts diff --git a/code/lib/cli/src/autoblock/index.test.ts b/code/lib/toolbox/src/autoblock/index.test.ts similarity index 100% rename from code/lib/cli/src/autoblock/index.test.ts rename to code/lib/toolbox/src/autoblock/index.test.ts diff --git a/code/lib/cli/src/autoblock/index.ts b/code/lib/toolbox/src/autoblock/index.ts similarity index 100% rename from code/lib/cli/src/autoblock/index.ts rename to code/lib/toolbox/src/autoblock/index.ts diff --git a/code/lib/cli/src/autoblock/types.ts b/code/lib/toolbox/src/autoblock/types.ts similarity index 100% rename from code/lib/cli/src/autoblock/types.ts rename to code/lib/toolbox/src/autoblock/types.ts diff --git a/code/lib/cli/src/automigrate/fixes/__test__/main-config-with-wrappers.js b/code/lib/toolbox/src/automigrate/fixes/__test__/main-config-with-wrappers.js similarity index 100% rename from code/lib/cli/src/automigrate/fixes/__test__/main-config-with-wrappers.js rename to code/lib/toolbox/src/automigrate/fixes/__test__/main-config-with-wrappers.js diff --git a/code/lib/cli/src/automigrate/fixes/__test__/main-config-without-wrappers.js b/code/lib/toolbox/src/automigrate/fixes/__test__/main-config-without-wrappers.js similarity index 100% rename from code/lib/cli/src/automigrate/fixes/__test__/main-config-without-wrappers.js rename to code/lib/toolbox/src/automigrate/fixes/__test__/main-config-without-wrappers.js diff --git a/code/lib/cli/src/automigrate/fixes/addon-postcss.test.ts b/code/lib/toolbox/src/automigrate/fixes/addon-postcss.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/addon-postcss.test.ts rename to code/lib/toolbox/src/automigrate/fixes/addon-postcss.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/addon-postcss.ts b/code/lib/toolbox/src/automigrate/fixes/addon-postcss.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/addon-postcss.ts rename to code/lib/toolbox/src/automigrate/fixes/addon-postcss.ts diff --git a/code/lib/cli/src/automigrate/fixes/addons-api.test.ts b/code/lib/toolbox/src/automigrate/fixes/addons-api.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/addons-api.test.ts rename to code/lib/toolbox/src/automigrate/fixes/addons-api.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/addons-api.ts b/code/lib/toolbox/src/automigrate/fixes/addons-api.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/addons-api.ts rename to code/lib/toolbox/src/automigrate/fixes/addons-api.ts diff --git a/code/lib/cli/src/automigrate/fixes/angular-builders-multiproject.test.ts b/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/angular-builders-multiproject.test.ts rename to code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/angular-builders-multiproject.ts b/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/angular-builders-multiproject.ts rename to code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.ts diff --git a/code/lib/cli/src/automigrate/fixes/angular-builders.test.ts b/code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/angular-builders.test.ts rename to code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/angular-builders.ts b/code/lib/toolbox/src/automigrate/fixes/angular-builders.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/angular-builders.ts rename to code/lib/toolbox/src/automigrate/fixes/angular-builders.ts diff --git a/code/lib/cli/src/automigrate/fixes/autodocs-tags.test.ts b/code/lib/toolbox/src/automigrate/fixes/autodocs-tags.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/autodocs-tags.test.ts rename to code/lib/toolbox/src/automigrate/fixes/autodocs-tags.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/autodocs-tags.ts b/code/lib/toolbox/src/automigrate/fixes/autodocs-tags.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/autodocs-tags.ts rename to code/lib/toolbox/src/automigrate/fixes/autodocs-tags.ts diff --git a/code/lib/cli/src/automigrate/fixes/autodocs-true.test.ts b/code/lib/toolbox/src/automigrate/fixes/autodocs-true.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/autodocs-true.test.ts rename to code/lib/toolbox/src/automigrate/fixes/autodocs-true.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/autodocs-true.ts b/code/lib/toolbox/src/automigrate/fixes/autodocs-true.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/autodocs-true.ts rename to code/lib/toolbox/src/automigrate/fixes/autodocs-true.ts diff --git a/code/lib/cli/src/automigrate/fixes/builder-vite.test.ts b/code/lib/toolbox/src/automigrate/fixes/builder-vite.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/builder-vite.test.ts rename to code/lib/toolbox/src/automigrate/fixes/builder-vite.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/builder-vite.ts b/code/lib/toolbox/src/automigrate/fixes/builder-vite.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/builder-vite.ts rename to code/lib/toolbox/src/automigrate/fixes/builder-vite.ts diff --git a/code/lib/cli/src/automigrate/fixes/cra5.test.ts b/code/lib/toolbox/src/automigrate/fixes/cra5.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/cra5.test.ts rename to code/lib/toolbox/src/automigrate/fixes/cra5.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/cra5.ts b/code/lib/toolbox/src/automigrate/fixes/cra5.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/cra5.ts rename to code/lib/toolbox/src/automigrate/fixes/cra5.ts diff --git a/code/lib/cli/src/automigrate/fixes/eslint-plugin.test.ts b/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/eslint-plugin.test.ts rename to code/lib/toolbox/src/automigrate/fixes/eslint-plugin.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/eslint-plugin.ts b/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/eslint-plugin.ts rename to code/lib/toolbox/src/automigrate/fixes/eslint-plugin.ts diff --git a/code/lib/cli/src/automigrate/fixes/index.ts b/code/lib/toolbox/src/automigrate/fixes/index.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/index.ts rename to code/lib/toolbox/src/automigrate/fixes/index.ts diff --git a/code/lib/cli/src/automigrate/fixes/initial-globals.test.ts b/code/lib/toolbox/src/automigrate/fixes/initial-globals.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/initial-globals.test.ts rename to code/lib/toolbox/src/automigrate/fixes/initial-globals.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/initial-globals.ts b/code/lib/toolbox/src/automigrate/fixes/initial-globals.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/initial-globals.ts rename to code/lib/toolbox/src/automigrate/fixes/initial-globals.ts diff --git a/code/lib/cli/src/automigrate/fixes/mdx-1-to-3.test.ts b/code/lib/toolbox/src/automigrate/fixes/mdx-1-to-3.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/mdx-1-to-3.test.ts rename to code/lib/toolbox/src/automigrate/fixes/mdx-1-to-3.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/mdx-1-to-3.ts b/code/lib/toolbox/src/automigrate/fixes/mdx-1-to-3.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/mdx-1-to-3.ts rename to code/lib/toolbox/src/automigrate/fixes/mdx-1-to-3.ts diff --git a/code/lib/cli/src/automigrate/fixes/mdx-gfm.test.ts b/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/mdx-gfm.test.ts rename to code/lib/toolbox/src/automigrate/fixes/mdx-gfm.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/mdx-gfm.ts b/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/mdx-gfm.ts rename to code/lib/toolbox/src/automigrate/fixes/mdx-gfm.ts diff --git a/code/lib/cli/src/automigrate/fixes/mdx-to-csf.test.ts b/code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/mdx-to-csf.test.ts rename to code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/mdx-to-csf.ts b/code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/mdx-to-csf.ts rename to code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.ts diff --git a/code/lib/cli/src/automigrate/fixes/new-frameworks.test.ts b/code/lib/toolbox/src/automigrate/fixes/new-frameworks.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/new-frameworks.test.ts rename to code/lib/toolbox/src/automigrate/fixes/new-frameworks.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/new-frameworks.ts b/code/lib/toolbox/src/automigrate/fixes/new-frameworks.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/new-frameworks.ts rename to code/lib/toolbox/src/automigrate/fixes/new-frameworks.ts diff --git a/code/lib/cli/src/automigrate/fixes/prompt-remove-react.test.ts b/code/lib/toolbox/src/automigrate/fixes/prompt-remove-react.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/prompt-remove-react.test.ts rename to code/lib/toolbox/src/automigrate/fixes/prompt-remove-react.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/prompt-remove-react.ts b/code/lib/toolbox/src/automigrate/fixes/prompt-remove-react.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/prompt-remove-react.ts rename to code/lib/toolbox/src/automigrate/fixes/prompt-remove-react.ts diff --git a/code/lib/cli/src/automigrate/fixes/react-docgen.test.ts b/code/lib/toolbox/src/automigrate/fixes/react-docgen.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/react-docgen.test.ts rename to code/lib/toolbox/src/automigrate/fixes/react-docgen.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/react-docgen.ts b/code/lib/toolbox/src/automigrate/fixes/react-docgen.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/react-docgen.ts rename to code/lib/toolbox/src/automigrate/fixes/react-docgen.ts diff --git a/code/lib/cli/src/automigrate/fixes/remove-argtypes-regex.ts b/code/lib/toolbox/src/automigrate/fixes/remove-argtypes-regex.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/remove-argtypes-regex.ts rename to code/lib/toolbox/src/automigrate/fixes/remove-argtypes-regex.ts diff --git a/code/lib/cli/src/automigrate/fixes/remove-global-client-apis.test.ts b/code/lib/toolbox/src/automigrate/fixes/remove-global-client-apis.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/remove-global-client-apis.test.ts rename to code/lib/toolbox/src/automigrate/fixes/remove-global-client-apis.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/remove-global-client-apis.ts b/code/lib/toolbox/src/automigrate/fixes/remove-global-client-apis.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/remove-global-client-apis.ts rename to code/lib/toolbox/src/automigrate/fixes/remove-global-client-apis.ts diff --git a/code/lib/cli/src/automigrate/fixes/remove-jest-testing-library.test.ts b/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/remove-jest-testing-library.test.ts rename to code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/remove-jest-testing-library.ts b/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/remove-jest-testing-library.ts rename to code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.ts diff --git a/code/lib/cli/src/automigrate/fixes/remove-legacymdx1.ts b/code/lib/toolbox/src/automigrate/fixes/remove-legacymdx1.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/remove-legacymdx1.ts rename to code/lib/toolbox/src/automigrate/fixes/remove-legacymdx1.ts diff --git a/code/lib/cli/src/automigrate/fixes/sb-binary.test.ts b/code/lib/toolbox/src/automigrate/fixes/sb-binary.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/sb-binary.test.ts rename to code/lib/toolbox/src/automigrate/fixes/sb-binary.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/sb-binary.ts b/code/lib/toolbox/src/automigrate/fixes/sb-binary.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/sb-binary.ts rename to code/lib/toolbox/src/automigrate/fixes/sb-binary.ts diff --git a/code/lib/cli/src/automigrate/fixes/sb-scripts.test.ts b/code/lib/toolbox/src/automigrate/fixes/sb-scripts.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/sb-scripts.test.ts rename to code/lib/toolbox/src/automigrate/fixes/sb-scripts.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/sb-scripts.ts b/code/lib/toolbox/src/automigrate/fixes/sb-scripts.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/sb-scripts.ts rename to code/lib/toolbox/src/automigrate/fixes/sb-scripts.ts diff --git a/code/lib/cli/src/automigrate/fixes/storyshots-migration.test.ts b/code/lib/toolbox/src/automigrate/fixes/storyshots-migration.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/storyshots-migration.test.ts rename to code/lib/toolbox/src/automigrate/fixes/storyshots-migration.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/storyshots-migration.ts b/code/lib/toolbox/src/automigrate/fixes/storyshots-migration.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/storyshots-migration.ts rename to code/lib/toolbox/src/automigrate/fixes/storyshots-migration.ts diff --git a/code/lib/cli/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts b/code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts rename to code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts b/code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts rename to code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts diff --git a/code/lib/cli/src/automigrate/fixes/vite-config-file.ts b/code/lib/toolbox/src/automigrate/fixes/vite-config-file.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/vite-config-file.ts rename to code/lib/toolbox/src/automigrate/fixes/vite-config-file.ts diff --git a/code/lib/cli/src/automigrate/fixes/vta.test.ts b/code/lib/toolbox/src/automigrate/fixes/vta.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/vta.test.ts rename to code/lib/toolbox/src/automigrate/fixes/vta.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/vta.ts b/code/lib/toolbox/src/automigrate/fixes/vta.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/vta.ts rename to code/lib/toolbox/src/automigrate/fixes/vta.ts diff --git a/code/lib/cli/src/automigrate/fixes/vue3.test.ts b/code/lib/toolbox/src/automigrate/fixes/vue3.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/vue3.test.ts rename to code/lib/toolbox/src/automigrate/fixes/vue3.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/vue3.ts b/code/lib/toolbox/src/automigrate/fixes/vue3.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/vue3.ts rename to code/lib/toolbox/src/automigrate/fixes/vue3.ts diff --git a/code/lib/cli/src/automigrate/fixes/webpack5-compiler-setup.test.ts b/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/webpack5-compiler-setup.test.ts rename to code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/webpack5-compiler-setup.ts b/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/webpack5-compiler-setup.ts rename to code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.ts diff --git a/code/lib/cli/src/automigrate/fixes/webpack5.test.ts b/code/lib/toolbox/src/automigrate/fixes/webpack5.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/webpack5.test.ts rename to code/lib/toolbox/src/automigrate/fixes/webpack5.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/webpack5.ts b/code/lib/toolbox/src/automigrate/fixes/webpack5.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/webpack5.ts rename to code/lib/toolbox/src/automigrate/fixes/webpack5.ts diff --git a/code/lib/cli/src/automigrate/fixes/wrap-require-utils.ts b/code/lib/toolbox/src/automigrate/fixes/wrap-require-utils.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/wrap-require-utils.ts rename to code/lib/toolbox/src/automigrate/fixes/wrap-require-utils.ts diff --git a/code/lib/cli/src/automigrate/fixes/wrap-require.test.ts b/code/lib/toolbox/src/automigrate/fixes/wrap-require.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/wrap-require.test.ts rename to code/lib/toolbox/src/automigrate/fixes/wrap-require.test.ts diff --git a/code/lib/cli/src/automigrate/fixes/wrap-require.ts b/code/lib/toolbox/src/automigrate/fixes/wrap-require.ts similarity index 100% rename from code/lib/cli/src/automigrate/fixes/wrap-require.ts rename to code/lib/toolbox/src/automigrate/fixes/wrap-require.ts diff --git a/code/lib/cli/src/automigrate/helpers/checkWebpack5Builder.test.ts b/code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/helpers/checkWebpack5Builder.test.ts rename to code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.test.ts diff --git a/code/lib/cli/src/automigrate/helpers/checkWebpack5Builder.ts b/code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.ts similarity index 100% rename from code/lib/cli/src/automigrate/helpers/checkWebpack5Builder.ts rename to code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.ts diff --git a/code/lib/cli/src/automigrate/helpers/cleanLog.ts b/code/lib/toolbox/src/automigrate/helpers/cleanLog.ts similarity index 100% rename from code/lib/cli/src/automigrate/helpers/cleanLog.ts rename to code/lib/toolbox/src/automigrate/helpers/cleanLog.ts diff --git a/code/lib/cli/src/automigrate/helpers/detectRenderer.ts b/code/lib/toolbox/src/automigrate/helpers/detectRenderer.ts similarity index 100% rename from code/lib/cli/src/automigrate/helpers/detectRenderer.ts rename to code/lib/toolbox/src/automigrate/helpers/detectRenderer.ts diff --git a/code/lib/cli/src/automigrate/helpers/eslintPlugin.test.ts b/code/lib/toolbox/src/automigrate/helpers/eslintPlugin.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/helpers/eslintPlugin.test.ts rename to code/lib/toolbox/src/automigrate/helpers/eslintPlugin.test.ts diff --git a/code/lib/cli/src/automigrate/helpers/eslintPlugin.ts b/code/lib/toolbox/src/automigrate/helpers/eslintPlugin.ts similarity index 100% rename from code/lib/cli/src/automigrate/helpers/eslintPlugin.ts rename to code/lib/toolbox/src/automigrate/helpers/eslintPlugin.ts diff --git a/code/lib/cli/src/automigrate/helpers/getMigrationSummary.test.ts b/code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/helpers/getMigrationSummary.test.ts rename to code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.test.ts diff --git a/code/lib/cli/src/automigrate/helpers/getMigrationSummary.ts b/code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.ts similarity index 100% rename from code/lib/cli/src/automigrate/helpers/getMigrationSummary.ts rename to code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.ts diff --git a/code/lib/cli/src/automigrate/helpers/mainConfigFile.test.ts b/code/lib/toolbox/src/automigrate/helpers/mainConfigFile.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/helpers/mainConfigFile.test.ts rename to code/lib/toolbox/src/automigrate/helpers/mainConfigFile.test.ts diff --git a/code/lib/cli/src/automigrate/helpers/mainConfigFile.ts b/code/lib/toolbox/src/automigrate/helpers/mainConfigFile.ts similarity index 100% rename from code/lib/cli/src/automigrate/helpers/mainConfigFile.ts rename to code/lib/toolbox/src/automigrate/helpers/mainConfigFile.ts diff --git a/code/lib/cli/src/automigrate/helpers/new-frameworks-utils.test.ts b/code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/helpers/new-frameworks-utils.test.ts rename to code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.test.ts diff --git a/code/lib/cli/src/automigrate/helpers/new-frameworks-utils.ts b/code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.ts similarity index 100% rename from code/lib/cli/src/automigrate/helpers/new-frameworks-utils.ts rename to code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.ts diff --git a/code/lib/cli/src/automigrate/helpers/testing-helpers.ts b/code/lib/toolbox/src/automigrate/helpers/testing-helpers.ts similarity index 100% rename from code/lib/cli/src/automigrate/helpers/testing-helpers.ts rename to code/lib/toolbox/src/automigrate/helpers/testing-helpers.ts diff --git a/code/lib/cli/src/automigrate/index.test.ts b/code/lib/toolbox/src/automigrate/index.test.ts similarity index 100% rename from code/lib/cli/src/automigrate/index.test.ts rename to code/lib/toolbox/src/automigrate/index.test.ts diff --git a/code/lib/cli/src/automigrate/index.ts b/code/lib/toolbox/src/automigrate/index.ts similarity index 100% rename from code/lib/cli/src/automigrate/index.ts rename to code/lib/toolbox/src/automigrate/index.ts diff --git a/code/lib/cli/src/automigrate/types.ts b/code/lib/toolbox/src/automigrate/types.ts similarity index 100% rename from code/lib/cli/src/automigrate/types.ts rename to code/lib/toolbox/src/automigrate/types.ts diff --git a/code/lib/cli/src/doctor/getDuplicatedDepsWarnings.ts b/code/lib/toolbox/src/doctor/getDuplicatedDepsWarnings.ts similarity index 100% rename from code/lib/cli/src/doctor/getDuplicatedDepsWarnings.ts rename to code/lib/toolbox/src/doctor/getDuplicatedDepsWarnings.ts diff --git a/code/lib/cli/src/doctor/getIncompatibleStorybookPackages.test.ts b/code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.test.ts similarity index 100% rename from code/lib/cli/src/doctor/getIncompatibleStorybookPackages.test.ts rename to code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.test.ts diff --git a/code/lib/cli/src/doctor/getIncompatibleStorybookPackages.ts b/code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.ts similarity index 100% rename from code/lib/cli/src/doctor/getIncompatibleStorybookPackages.ts rename to code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.ts diff --git a/code/lib/cli/src/doctor/getMismatchingVersionsWarning.ts b/code/lib/toolbox/src/doctor/getMismatchingVersionsWarning.ts similarity index 100% rename from code/lib/cli/src/doctor/getMismatchingVersionsWarning.ts rename to code/lib/toolbox/src/doctor/getMismatchingVersionsWarning.ts diff --git a/code/lib/cli/src/doctor/hasMultipleVersions.ts b/code/lib/toolbox/src/doctor/hasMultipleVersions.ts similarity index 100% rename from code/lib/cli/src/doctor/hasMultipleVersions.ts rename to code/lib/toolbox/src/doctor/hasMultipleVersions.ts diff --git a/code/lib/cli/src/doctor/index.ts b/code/lib/toolbox/src/doctor/index.ts similarity index 100% rename from code/lib/cli/src/doctor/index.ts rename to code/lib/toolbox/src/doctor/index.ts diff --git a/code/lib/cli/src/doctor/utils.ts b/code/lib/toolbox/src/doctor/utils.ts similarity index 100% rename from code/lib/cli/src/doctor/utils.ts rename to code/lib/toolbox/src/doctor/utils.ts diff --git a/code/lib/cli/src/index.ts b/code/lib/toolbox/src/index.ts similarity index 100% rename from code/lib/cli/src/index.ts rename to code/lib/toolbox/src/index.ts diff --git a/code/lib/cli/src/link.ts b/code/lib/toolbox/src/link.ts similarity index 100% rename from code/lib/cli/src/link.ts rename to code/lib/toolbox/src/link.ts diff --git a/code/lib/cli/src/migrate.ts b/code/lib/toolbox/src/migrate.ts similarity index 100% rename from code/lib/cli/src/migrate.ts rename to code/lib/toolbox/src/migrate.ts diff --git a/code/lib/cli/src/postinstallAddon.ts b/code/lib/toolbox/src/postinstallAddon.ts similarity index 100% rename from code/lib/cli/src/postinstallAddon.ts rename to code/lib/toolbox/src/postinstallAddon.ts diff --git a/code/lib/cli/src/sandbox-templates.ts b/code/lib/toolbox/src/sandbox-templates.ts similarity index 100% rename from code/lib/cli/src/sandbox-templates.ts rename to code/lib/toolbox/src/sandbox-templates.ts diff --git a/code/lib/cli/src/sandbox.ts b/code/lib/toolbox/src/sandbox.ts similarity index 100% rename from code/lib/cli/src/sandbox.ts rename to code/lib/toolbox/src/sandbox.ts diff --git a/code/lib/cli/src/typings.d.ts b/code/lib/toolbox/src/typings.d.ts similarity index 100% rename from code/lib/cli/src/typings.d.ts rename to code/lib/toolbox/src/typings.d.ts diff --git a/code/lib/cli/src/upgrade.test.ts b/code/lib/toolbox/src/upgrade.test.ts similarity index 100% rename from code/lib/cli/src/upgrade.test.ts rename to code/lib/toolbox/src/upgrade.test.ts diff --git a/code/lib/cli/src/upgrade.ts b/code/lib/toolbox/src/upgrade.ts similarity index 100% rename from code/lib/cli/src/upgrade.ts rename to code/lib/toolbox/src/upgrade.ts diff --git a/code/lib/cli/src/warn.test.ts b/code/lib/toolbox/src/warn.test.ts similarity index 100% rename from code/lib/cli/src/warn.test.ts rename to code/lib/toolbox/src/warn.test.ts diff --git a/code/lib/cli/src/warn.ts b/code/lib/toolbox/src/warn.ts similarity index 100% rename from code/lib/cli/src/warn.ts rename to code/lib/toolbox/src/warn.ts diff --git a/code/lib/cli/src/window.d.ts b/code/lib/toolbox/src/window.d.ts similarity index 100% rename from code/lib/cli/src/window.d.ts rename to code/lib/toolbox/src/window.d.ts From b03be45da9ba54088039cc98e75127b30367a355 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Tue, 9 Jul 2024 16:28:27 +0200 Subject: [PATCH 05/33] Split generate.ts in 3 --- code/core/src/cli/generate.ts | 192 +------------- code/lib/create-storybook/src/generate.ts | 308 ++-------------------- code/lib/toolbox/src/generate.ts | 135 +--------- 3 files changed, 20 insertions(+), 615 deletions(-) diff --git a/code/core/src/cli/generate.ts b/code/core/src/cli/generate.ts index a73f1889a35c..512dc963924b 100644 --- a/code/core/src/cli/generate.ts +++ b/code/core/src/cli/generate.ts @@ -1,32 +1,15 @@ import program from 'commander'; import chalk from 'chalk'; -import envinfo from 'envinfo'; import leven from 'leven'; import { findPackageSync } from 'fd-package-json'; import invariant from 'tiny-invariant'; import { logger } from '@storybook/core/node-logger'; -import { addToGlobalContext, telemetry } from '@storybook/core/telemetry'; -import { - parseList, - getEnvConfig, - JsPackageManagerFactory, - versions, - removeAddon as remove, -} from '@storybook/core/common'; -import { withTelemetry } from '@storybook/core/core-server'; +import { addToGlobalContext } from '@storybook/core/telemetry'; +import { parseList, getEnvConfig, versions } from '@storybook/core/common'; -import type { CommandOptions } from './generators/types'; -import { initiate } from './initiate'; -import { add } from './add'; -import { migrate } from './migrate'; -import { upgrade, type UpgradeOptions } from './upgrade'; -import { sandbox } from './sandbox'; -import { link } from './link'; -import { doAutomigrate } from './automigrate'; -import { dev } from './dev'; -import { build } from './build'; -import { doctor } from './doctor'; +import { dev } from '../dev'; +import { build } from '../build'; addToGlobalContext('cliVersion', versions.storybook); @@ -46,173 +29,6 @@ const command = (name: string) => .option('--debug', 'Get more logs in debug mode', false) .option('--enable-crash-reports', 'Enable sending crash reports to telemetry data'); -command('init') - .description('Initialize Storybook into your project.') - .option('-f --force', 'Force add Storybook') - .option('-s --skip-install', 'Skip installing deps') - .option('--package-manager ', 'Force package manager for installing deps') - .option('--use-pnp', 'Enable pnp mode for Yarn 2+') - .option('-p --parser ', 'jscodeshift parser') - .option('-t --type ', 'Add Storybook for a specific project type') - .option('-y --yes', 'Answer yes to all prompts') - .option('-b --builder ', 'Builder library') - .option('-l --linkable', 'Prepare installation for link (contributor helper)') - // due to how Commander handles default values and negated options, we have to elevate the default into Commander, and we have to specify `--dev` - // alongside `--no-dev` even if we are unlikely to directly use `--dev`. https://github.com/tj/commander.js/issues/2068#issuecomment-1804524585 - .option( - '--dev', - 'Launch the development server after completing initialization. Enabled by default', - process.env.CI !== 'true' && process.env.IN_STORYBOOK_SANDBOX !== 'true' - ) - .option( - '--no-dev', - 'Complete the initialization of Storybook without launching the Storybook development server' - ) - .action((options: CommandOptions) => { - initiate(options).catch(() => process.exit(1)); - }); - -command('add ') - .description('Add an addon to your Storybook') - .option( - '--package-manager ', - 'Force package manager for installing dependencies' - ) - .option('-c, --config-dir ', 'Directory where to load Storybook configurations from') - .option('-s --skip-postinstall', 'Skip package specific postinstall config modifications') - .action((addonName: string, options: any) => add(addonName, options)); - -command('remove ') - .description('Remove an addon from your Storybook') - .option( - '--package-manager ', - 'Force package manager for installing dependencies' - ) - .action((addonName: string, options: any) => - withTelemetry('remove', { cliOptions: options }, async () => { - await remove(addonName, options); - if (!options.disableTelemetry) { - await telemetry('remove', { addon: addonName, source: 'cli' }); - } - }) - ); - -command('upgrade') - .description(`Upgrade your Storybook packages to v${versions.storybook}`) - .option( - '--package-manager ', - 'Force package manager for installing dependencies' - ) - .option('-y --yes', 'Skip prompting the user') - .option('-f --force', 'force the upgrade, skipping autoblockers') - .option('-n --dry-run', 'Only check for upgrades, do not install') - .option('-s --skip-check', 'Skip postinstall version and automigration checks') - .option('-c, --config-dir ', 'Directory where to load Storybook configurations from') - .action(async (options: UpgradeOptions) => upgrade(options).catch(() => process.exit(1))); - -command('info') - .description('Prints debugging information about the local environment') - .action(async () => { - consoleLogger.log(chalk.bold('\nStorybook Environment Info:')); - const pkgManager = await JsPackageManagerFactory.getPackageManager(); - const activePackageManager = pkgManager.type.replace(/\d/, ''); // 'yarn1' -> 'yarn' - const output = await envinfo.run({ - System: ['OS', 'CPU', 'Shell'], - Binaries: ['Node', 'Yarn', 'npm', 'pnpm'], - Browsers: ['Chrome', 'Edge', 'Firefox', 'Safari'], - npmPackages: '{@storybook/*,*storybook*,sb,chromatic}', - npmGlobalPackages: '{@storybook/*,*storybook*,sb,chromatic}', - }); - const activePackageManagerLine = output.match(new RegExp(`${activePackageManager}:.*`, 'i')); - consoleLogger.log( - output.replace( - activePackageManagerLine, - chalk.bold(`${activePackageManagerLine} <----- active`) - ) - ); - }); - -command('migrate [migration]') - .description('Run a Storybook codemod migration on your source files') - .option('-l --list', 'List available migrations') - .option('-g --glob ', 'Glob for files upon which to apply the migration', '**/*.js') - .option('-p --parser ', 'jscodeshift parser') - .option('-c, --config-dir ', 'Directory where to load Storybook configurations from') - .option( - '-n --dry-run', - 'Dry run: verify the migration exists and show the files to which it will be applied' - ) - .option( - '-r --rename ', - 'Rename suffix of matching files after codemod has been applied, e.g. ".js:.ts"' - ) - .action((migration, { configDir, glob, dryRun, list, rename, parser }) => { - migrate(migration, { - configDir, - glob, - dryRun, - list, - rename, - parser, - }).catch((err) => { - logger.error(err); - process.exit(1); - }); - }); - -command('sandbox [filterValue]') - .alias('repro') // for backwards compatibility - .description('Create a sandbox from a set of possible templates') - .option('-o --output ', 'Define an output directory') - .option('--no-init', 'Whether to download a template without an initialized Storybook', false) - .action((filterValue, options) => - sandbox({ filterValue, ...options }).catch((e) => { - logger.error(e); - process.exit(1); - }) - ); - -command('link ') - .description('Pull down a repro from a URL (or a local directory), link it, and run storybook') - .option('--local', 'Link a local directory already in your file system') - .option('--no-start', 'Start the storybook', true) - .action((target, { local, start }) => - link({ target, local, start }).catch((e) => { - logger.error(e); - process.exit(1); - }) - ); - -command('automigrate [fixId]') - .description('Check storybook for incompatibilities or migrations and apply fixes') - .option('-y --yes', 'Skip prompting the user') - .option('-n --dry-run', 'Only check for fixes, do not actually run them') - .option('--package-manager ', 'Force package manager') - .option('-l --list', 'List available migrations') - .option('-c, --config-dir ', 'Directory of Storybook configurations to migrate') - .option('-s --skip-install', 'Skip installing deps') - .option( - '--renderer ', - 'The renderer package for the framework Storybook is using.' - ) - .action(async (fixId, options) => { - await doAutomigrate({ fixId, ...options }).catch((e) => { - logger.error(e); - process.exit(1); - }); - }); - -command('doctor') - .description('Check Storybook for known problems and provide suggestions or fixes') - .option('--package-manager ', 'Force package manager') - .option('-c, --config-dir ', 'Directory of Storybook configuration') - .action(async (options) => { - await doctor(options).catch((e) => { - logger.error(e); - process.exit(1); - }); - }); - command('dev') .option('-p, --port ', 'Port to run Storybook', (str) => parseInt(str, 10)) .option('-h, --host ', 'Host to run Storybook') diff --git a/code/lib/create-storybook/src/generate.ts b/code/lib/create-storybook/src/generate.ts index a73f1889a35c..be3985089b7e 100644 --- a/code/lib/create-storybook/src/generate.ts +++ b/code/lib/create-storybook/src/generate.ts @@ -1,53 +1,27 @@ import program from 'commander'; -import chalk from 'chalk'; -import envinfo from 'envinfo'; -import leven from 'leven'; import { findPackageSync } from 'fd-package-json'; import invariant from 'tiny-invariant'; - -import { logger } from '@storybook/core/node-logger'; -import { addToGlobalContext, telemetry } from '@storybook/core/telemetry'; -import { - parseList, - getEnvConfig, - JsPackageManagerFactory, - versions, - removeAddon as remove, -} from '@storybook/core/common'; -import { withTelemetry } from '@storybook/core/core-server'; +import { addToGlobalContext } from '@storybook/core/telemetry'; +import { versions } from '@storybook/core/common'; import type { CommandOptions } from './generators/types'; import { initiate } from './initiate'; -import { add } from './add'; -import { migrate } from './migrate'; -import { upgrade, type UpgradeOptions } from './upgrade'; -import { sandbox } from './sandbox'; -import { link } from './link'; -import { doAutomigrate } from './automigrate'; -import { dev } from './dev'; -import { build } from './build'; -import { doctor } from './doctor'; addToGlobalContext('cliVersion', versions.storybook); const pkg = findPackageSync(__dirname); invariant(pkg, 'Failed to find the closest package.json file.'); -const consoleLogger = console; - -const command = (name: string) => - program - .command(name) - .option( - '--disable-telemetry', - 'Disable sending telemetry data', - // default value is false, but if the user sets STORYBOOK_DISABLE_TELEMETRY, it can be true - process.env.STORYBOOK_DISABLE_TELEMETRY && process.env.STORYBOOK_DISABLE_TELEMETRY !== 'false' - ) - .option('--debug', 'Get more logs in debug mode', false) - .option('--enable-crash-reports', 'Enable sending crash reports to telemetry data'); -command('init') - .description('Initialize Storybook into your project.') +program + .name('Initialize Storybook into your project.') + .option( + '--disable-telemetry', + 'Disable sending telemetry data', + // default value is false, but if the user sets STORYBOOK_DISABLE_TELEMETRY, it can be true + process.env.STORYBOOK_DISABLE_TELEMETRY && process.env.STORYBOOK_DISABLE_TELEMETRY !== 'false' + ) + .option('--debug', 'Get more logs in debug mode', false) + .option('--enable-crash-reports', 'Enable sending crash reports to telemetry data') .option('-f --force', 'Force add Storybook') .option('-s --skip-install', 'Skip installing deps') .option('--package-manager ', 'Force package manager for installing deps') @@ -70,258 +44,6 @@ command('init') ) .action((options: CommandOptions) => { initiate(options).catch(() => process.exit(1)); - }); - -command('add ') - .description('Add an addon to your Storybook') - .option( - '--package-manager ', - 'Force package manager for installing dependencies' - ) - .option('-c, --config-dir ', 'Directory where to load Storybook configurations from') - .option('-s --skip-postinstall', 'Skip package specific postinstall config modifications') - .action((addonName: string, options: any) => add(addonName, options)); - -command('remove ') - .description('Remove an addon from your Storybook') - .option( - '--package-manager ', - 'Force package manager for installing dependencies' - ) - .action((addonName: string, options: any) => - withTelemetry('remove', { cliOptions: options }, async () => { - await remove(addonName, options); - if (!options.disableTelemetry) { - await telemetry('remove', { addon: addonName, source: 'cli' }); - } - }) - ); - -command('upgrade') - .description(`Upgrade your Storybook packages to v${versions.storybook}`) - .option( - '--package-manager ', - 'Force package manager for installing dependencies' - ) - .option('-y --yes', 'Skip prompting the user') - .option('-f --force', 'force the upgrade, skipping autoblockers') - .option('-n --dry-run', 'Only check for upgrades, do not install') - .option('-s --skip-check', 'Skip postinstall version and automigration checks') - .option('-c, --config-dir ', 'Directory where to load Storybook configurations from') - .action(async (options: UpgradeOptions) => upgrade(options).catch(() => process.exit(1))); - -command('info') - .description('Prints debugging information about the local environment') - .action(async () => { - consoleLogger.log(chalk.bold('\nStorybook Environment Info:')); - const pkgManager = await JsPackageManagerFactory.getPackageManager(); - const activePackageManager = pkgManager.type.replace(/\d/, ''); // 'yarn1' -> 'yarn' - const output = await envinfo.run({ - System: ['OS', 'CPU', 'Shell'], - Binaries: ['Node', 'Yarn', 'npm', 'pnpm'], - Browsers: ['Chrome', 'Edge', 'Firefox', 'Safari'], - npmPackages: '{@storybook/*,*storybook*,sb,chromatic}', - npmGlobalPackages: '{@storybook/*,*storybook*,sb,chromatic}', - }); - const activePackageManagerLine = output.match(new RegExp(`${activePackageManager}:.*`, 'i')); - consoleLogger.log( - output.replace( - activePackageManagerLine, - chalk.bold(`${activePackageManagerLine} <----- active`) - ) - ); - }); - -command('migrate [migration]') - .description('Run a Storybook codemod migration on your source files') - .option('-l --list', 'List available migrations') - .option('-g --glob ', 'Glob for files upon which to apply the migration', '**/*.js') - .option('-p --parser ', 'jscodeshift parser') - .option('-c, --config-dir ', 'Directory where to load Storybook configurations from') - .option( - '-n --dry-run', - 'Dry run: verify the migration exists and show the files to which it will be applied' - ) - .option( - '-r --rename ', - 'Rename suffix of matching files after codemod has been applied, e.g. ".js:.ts"' - ) - .action((migration, { configDir, glob, dryRun, list, rename, parser }) => { - migrate(migration, { - configDir, - glob, - dryRun, - list, - rename, - parser, - }).catch((err) => { - logger.error(err); - process.exit(1); - }); - }); - -command('sandbox [filterValue]') - .alias('repro') // for backwards compatibility - .description('Create a sandbox from a set of possible templates') - .option('-o --output ', 'Define an output directory') - .option('--no-init', 'Whether to download a template without an initialized Storybook', false) - .action((filterValue, options) => - sandbox({ filterValue, ...options }).catch((e) => { - logger.error(e); - process.exit(1); - }) - ); - -command('link ') - .description('Pull down a repro from a URL (or a local directory), link it, and run storybook') - .option('--local', 'Link a local directory already in your file system') - .option('--no-start', 'Start the storybook', true) - .action((target, { local, start }) => - link({ target, local, start }).catch((e) => { - logger.error(e); - process.exit(1); - }) - ); - -command('automigrate [fixId]') - .description('Check storybook for incompatibilities or migrations and apply fixes') - .option('-y --yes', 'Skip prompting the user') - .option('-n --dry-run', 'Only check for fixes, do not actually run them') - .option('--package-manager ', 'Force package manager') - .option('-l --list', 'List available migrations') - .option('-c, --config-dir ', 'Directory of Storybook configurations to migrate') - .option('-s --skip-install', 'Skip installing deps') - .option( - '--renderer ', - 'The renderer package for the framework Storybook is using.' - ) - .action(async (fixId, options) => { - await doAutomigrate({ fixId, ...options }).catch((e) => { - logger.error(e); - process.exit(1); - }); - }); - -command('doctor') - .description('Check Storybook for known problems and provide suggestions or fixes') - .option('--package-manager ', 'Force package manager') - .option('-c, --config-dir ', 'Directory of Storybook configuration') - .action(async (options) => { - await doctor(options).catch((e) => { - logger.error(e); - process.exit(1); - }); - }); - -command('dev') - .option('-p, --port ', 'Port to run Storybook', (str) => parseInt(str, 10)) - .option('-h, --host ', 'Host to run Storybook') - .option('-c, --config-dir ', 'Directory where to load Storybook configurations from') - .option( - '--https', - 'Serve Storybook over HTTPS. Note: You must provide your own certificate information.' - ) - .option( - '--ssl-ca ', - 'Provide an SSL certificate authority. (Optional with --https, required if using a self-signed certificate)', - parseList - ) - .option('--ssl-cert ', 'Provide an SSL certificate. (Required with --https)') - .option('--ssl-key ', 'Provide an SSL key. (Required with --https)') - .option('--smoke-test', 'Exit after successful start') - .option('--ci', "CI mode (skip interactive prompts, don't open browser)") - .option('--no-open', 'Do not open Storybook automatically in the browser') - .option('--loglevel ', 'Control level of logging during build') - .option('--quiet', 'Suppress verbose build output') - .option('--no-version-updates', 'Suppress update check', true) - .option('--debug-webpack', 'Display final webpack configurations for debugging purposes') - .option( - '--webpack-stats-json [directory]', - 'Write Webpack stats JSON to disk (synonym for `--stats-json`)' - ) - .option('--stats-json [directory]', 'Write stats JSON to disk') - .option( - '--preview-url ', - 'Disables the default storybook preview and lets your use your own' - ) - .option('--force-build-preview', 'Build the preview iframe even if you are using --preview-url') - .option('--docs', 'Build a documentation-only site using addon-docs') - .option('--exact-port', 'Exit early if the desired port is not available') - .option( - '--initial-path [path]', - 'URL path to be appended when visiting Storybook for the first time' - ) - .action(async (options) => { - logger.setLevel(program.loglevel); - consoleLogger.log(chalk.bold(`${pkg.name} v${pkg.version}`) + chalk.reset('\n')); - - // The key is the field created in `options` variable for - // each command line argument. Value is the env variable. - getEnvConfig(options, { - port: 'SBCONFIG_PORT', - host: 'SBCONFIG_HOSTNAME', - staticDir: 'SBCONFIG_STATIC_DIR', - configDir: 'SBCONFIG_CONFIG_DIR', - ci: 'CI', - }); - - if (parseInt(`${options.port}`, 10)) { - options.port = parseInt(`${options.port}`, 10); - } - - await dev({ ...options, packageJson: pkg }).catch(() => process.exit(1)); - }); - -command('build') - .option('-o, --output-dir ', 'Directory where to store built files') - .option('-c, --config-dir ', 'Directory where to load Storybook configurations from') - .option('--quiet', 'Suppress verbose build output') - .option('--loglevel ', 'Control level of logging during build') - .option('--debug-webpack', 'Display final webpack configurations for debugging purposes') - .option( - '--webpack-stats-json [directory]', - 'Write Webpack stats JSON to disk (synonym for `--stats-json`)' - ) - .option('--stats-json [directory]', 'Write stats JSON to disk') - .option( - '--preview-url ', - 'Disables the default storybook preview and lets your use your own' - ) - .option('--force-build-preview', 'Build the preview iframe even if you are using --preview-url') - .option('--docs', 'Build a documentation-only site using addon-docs') - .option('--test', 'Build stories optimized for testing purposes.') - .action(async (options) => { - process.env.NODE_ENV = process.env.NODE_ENV || 'production'; - logger.setLevel(program.loglevel); - consoleLogger.log(chalk.bold(`${pkg.name} v${pkg.version}\n`)); - - // The key is the field created in `options` variable for - // each command line argument. Value is the env variable. - getEnvConfig(options, { - staticDir: 'SBCONFIG_STATIC_DIR', - outputDir: 'SBCONFIG_OUTPUT_DIR', - configDir: 'SBCONFIG_CONFIG_DIR', - }); - - await build({ - ...options, - packageJson: pkg, - test: !!options.test || process.env.SB_TESTBUILD === 'true', - }).catch(() => process.exit(1)); - }); - -program.on('command:*', ([invalidCmd]) => { - consoleLogger.error( - ' Invalid command: %s.\n See --help for a list of available commands.', - invalidCmd - ); - // eslint-disable-next-line no-underscore-dangle - const availableCommands = program.commands.map((cmd) => cmd._name); - const suggestion = availableCommands.find((cmd) => leven(cmd, invalidCmd) < 3); - if (suggestion) { - consoleLogger.info(`\n Did you mean ${suggestion}?`); - } - process.exit(1); -}); - -program.usage(' [options]').version(String(pkg.version)).parse(process.argv); + }) + .version(String(pkg.version)) + .parse(process.argv); diff --git a/code/lib/toolbox/src/generate.ts b/code/lib/toolbox/src/generate.ts index a73f1889a35c..9a842582dcee 100644 --- a/code/lib/toolbox/src/generate.ts +++ b/code/lib/toolbox/src/generate.ts @@ -7,25 +7,15 @@ import invariant from 'tiny-invariant'; import { logger } from '@storybook/core/node-logger'; import { addToGlobalContext, telemetry } from '@storybook/core/telemetry'; -import { - parseList, - getEnvConfig, - JsPackageManagerFactory, - versions, - removeAddon as remove, -} from '@storybook/core/common'; +import { JsPackageManagerFactory, versions, removeAddon as remove } from '@storybook/core/common'; import { withTelemetry } from '@storybook/core/core-server'; -import type { CommandOptions } from './generators/types'; -import { initiate } from './initiate'; import { add } from './add'; import { migrate } from './migrate'; import { upgrade, type UpgradeOptions } from './upgrade'; import { sandbox } from './sandbox'; import { link } from './link'; import { doAutomigrate } from './automigrate'; -import { dev } from './dev'; -import { build } from './build'; import { doctor } from './doctor'; addToGlobalContext('cliVersion', versions.storybook); @@ -46,32 +36,6 @@ const command = (name: string) => .option('--debug', 'Get more logs in debug mode', false) .option('--enable-crash-reports', 'Enable sending crash reports to telemetry data'); -command('init') - .description('Initialize Storybook into your project.') - .option('-f --force', 'Force add Storybook') - .option('-s --skip-install', 'Skip installing deps') - .option('--package-manager ', 'Force package manager for installing deps') - .option('--use-pnp', 'Enable pnp mode for Yarn 2+') - .option('-p --parser ', 'jscodeshift parser') - .option('-t --type ', 'Add Storybook for a specific project type') - .option('-y --yes', 'Answer yes to all prompts') - .option('-b --builder ', 'Builder library') - .option('-l --linkable', 'Prepare installation for link (contributor helper)') - // due to how Commander handles default values and negated options, we have to elevate the default into Commander, and we have to specify `--dev` - // alongside `--no-dev` even if we are unlikely to directly use `--dev`. https://github.com/tj/commander.js/issues/2068#issuecomment-1804524585 - .option( - '--dev', - 'Launch the development server after completing initialization. Enabled by default', - process.env.CI !== 'true' && process.env.IN_STORYBOOK_SANDBOX !== 'true' - ) - .option( - '--no-dev', - 'Complete the initialization of Storybook without launching the Storybook development server' - ) - .action((options: CommandOptions) => { - initiate(options).catch(() => process.exit(1)); - }); - command('add ') .description('Add an addon to your Storybook') .option( @@ -213,103 +177,6 @@ command('doctor') }); }); -command('dev') - .option('-p, --port ', 'Port to run Storybook', (str) => parseInt(str, 10)) - .option('-h, --host ', 'Host to run Storybook') - .option('-c, --config-dir ', 'Directory where to load Storybook configurations from') - .option( - '--https', - 'Serve Storybook over HTTPS. Note: You must provide your own certificate information.' - ) - .option( - '--ssl-ca ', - 'Provide an SSL certificate authority. (Optional with --https, required if using a self-signed certificate)', - parseList - ) - .option('--ssl-cert ', 'Provide an SSL certificate. (Required with --https)') - .option('--ssl-key ', 'Provide an SSL key. (Required with --https)') - .option('--smoke-test', 'Exit after successful start') - .option('--ci', "CI mode (skip interactive prompts, don't open browser)") - .option('--no-open', 'Do not open Storybook automatically in the browser') - .option('--loglevel ', 'Control level of logging during build') - .option('--quiet', 'Suppress verbose build output') - .option('--no-version-updates', 'Suppress update check', true) - .option('--debug-webpack', 'Display final webpack configurations for debugging purposes') - .option( - '--webpack-stats-json [directory]', - 'Write Webpack stats JSON to disk (synonym for `--stats-json`)' - ) - .option('--stats-json [directory]', 'Write stats JSON to disk') - .option( - '--preview-url ', - 'Disables the default storybook preview and lets your use your own' - ) - .option('--force-build-preview', 'Build the preview iframe even if you are using --preview-url') - .option('--docs', 'Build a documentation-only site using addon-docs') - .option('--exact-port', 'Exit early if the desired port is not available') - .option( - '--initial-path [path]', - 'URL path to be appended when visiting Storybook for the first time' - ) - .action(async (options) => { - logger.setLevel(program.loglevel); - consoleLogger.log(chalk.bold(`${pkg.name} v${pkg.version}`) + chalk.reset('\n')); - - // The key is the field created in `options` variable for - // each command line argument. Value is the env variable. - getEnvConfig(options, { - port: 'SBCONFIG_PORT', - host: 'SBCONFIG_HOSTNAME', - staticDir: 'SBCONFIG_STATIC_DIR', - configDir: 'SBCONFIG_CONFIG_DIR', - ci: 'CI', - }); - - if (parseInt(`${options.port}`, 10)) { - options.port = parseInt(`${options.port}`, 10); - } - - await dev({ ...options, packageJson: pkg }).catch(() => process.exit(1)); - }); - -command('build') - .option('-o, --output-dir ', 'Directory where to store built files') - .option('-c, --config-dir ', 'Directory where to load Storybook configurations from') - .option('--quiet', 'Suppress verbose build output') - .option('--loglevel ', 'Control level of logging during build') - .option('--debug-webpack', 'Display final webpack configurations for debugging purposes') - .option( - '--webpack-stats-json [directory]', - 'Write Webpack stats JSON to disk (synonym for `--stats-json`)' - ) - .option('--stats-json [directory]', 'Write stats JSON to disk') - .option( - '--preview-url ', - 'Disables the default storybook preview and lets your use your own' - ) - .option('--force-build-preview', 'Build the preview iframe even if you are using --preview-url') - .option('--docs', 'Build a documentation-only site using addon-docs') - .option('--test', 'Build stories optimized for testing purposes.') - .action(async (options) => { - process.env.NODE_ENV = process.env.NODE_ENV || 'production'; - logger.setLevel(program.loglevel); - consoleLogger.log(chalk.bold(`${pkg.name} v${pkg.version}\n`)); - - // The key is the field created in `options` variable for - // each command line argument. Value is the env variable. - getEnvConfig(options, { - staticDir: 'SBCONFIG_STATIC_DIR', - outputDir: 'SBCONFIG_OUTPUT_DIR', - configDir: 'SBCONFIG_CONFIG_DIR', - }); - - await build({ - ...options, - packageJson: pkg, - test: !!options.test || process.env.SB_TESTBUILD === 'true', - }).catch(() => process.exit(1)); - }); - program.on('command:*', ([invalidCmd]) => { consoleLogger.error( ' Invalid command: %s.\n See --help for a list of available commands.', From 7f5fe72dad38ea1ec69f7e16f3ddc56ab2dfd346 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Tue, 9 Jul 2024 16:32:00 +0200 Subject: [PATCH 06/33] Place generate.ts in bin/index.ts --- code/core/src/cli/{generate.ts => bin/index.ts} | 0 code/lib/create-storybook/src/{generate.ts => bin/index.ts} | 0 code/lib/toolbox/src/{generate.ts => bin/index.ts} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename code/core/src/cli/{generate.ts => bin/index.ts} (100%) rename code/lib/create-storybook/src/{generate.ts => bin/index.ts} (100%) rename code/lib/toolbox/src/{generate.ts => bin/index.ts} (100%) diff --git a/code/core/src/cli/generate.ts b/code/core/src/cli/bin/index.ts similarity index 100% rename from code/core/src/cli/generate.ts rename to code/core/src/cli/bin/index.ts diff --git a/code/lib/create-storybook/src/generate.ts b/code/lib/create-storybook/src/bin/index.ts similarity index 100% rename from code/lib/create-storybook/src/generate.ts rename to code/lib/create-storybook/src/bin/index.ts diff --git a/code/lib/toolbox/src/generate.ts b/code/lib/toolbox/src/bin/index.ts similarity index 100% rename from code/lib/toolbox/src/generate.ts rename to code/lib/toolbox/src/bin/index.ts From 7bd245570fed10b8b72f6c6de6161c54d75aa638 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Wed, 10 Jul 2024 11:44:16 +0200 Subject: [PATCH 07/33] Some more moves --- .../src/generators/ANGULAR => core/src/cli/angular}/helpers.ts | 0 .../src/automigrate/helpers => core/src/cli}/eslintPlugin.test.ts | 0 .../src/automigrate/helpers => core/src/cli}/eslintPlugin.ts | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename code/{lib/create-storybook/src/generators/ANGULAR => core/src/cli/angular}/helpers.ts (100%) rename code/{lib/toolbox/src/automigrate/helpers => core/src/cli}/eslintPlugin.test.ts (100%) rename code/{lib/toolbox/src/automigrate/helpers => core/src/cli}/eslintPlugin.ts (100%) diff --git a/code/lib/create-storybook/src/generators/ANGULAR/helpers.ts b/code/core/src/cli/angular/helpers.ts similarity index 100% rename from code/lib/create-storybook/src/generators/ANGULAR/helpers.ts rename to code/core/src/cli/angular/helpers.ts diff --git a/code/lib/toolbox/src/automigrate/helpers/eslintPlugin.test.ts b/code/core/src/cli/eslintPlugin.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/helpers/eslintPlugin.test.ts rename to code/core/src/cli/eslintPlugin.test.ts diff --git a/code/lib/toolbox/src/automigrate/helpers/eslintPlugin.ts b/code/core/src/cli/eslintPlugin.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/helpers/eslintPlugin.ts rename to code/core/src/cli/eslintPlugin.ts From 309631d4516e08ea1c8a025f2496d5e38e8e0d6e Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Wed, 10 Jul 2024 13:18:56 +0200 Subject: [PATCH 08/33] Split the CLI --- code/core/package.json | 16 + code/core/scripts/entries.ts | 1 + code/core/src/cli/detect.ts | 8 +- code/core/src/cli/dirs.ts | 4 - code/core/src/cli/helpers.test.ts | 4 +- code/core/src/cli/helpers.ts | 19 +- code/core/src/cli/index.ts | 7 + code/core/src/common/versions.ts | 2 + .../utils/warnOnIncompatibleAddons.ts | 2 +- code/lib/cli/bin/index.cjs | 2 +- code/lib/cli/core/cli/index.cjs | 1 + code/lib/cli/core/cli/index.d.ts | 2 + code/lib/cli/core/cli/index.js | 1 + code/lib/cli/package.json | 48 +-- code/lib/cli/src/index.ts | 5 + code/lib/cli/src/proxy.ts | 23 ++ code/lib/create-storybook/bin/index.cjs | 2 +- code/lib/create-storybook/package.json | 267 +---------------- code/lib/create-storybook/project.json | 2 +- code/lib/create-storybook/src/bin/index.ts | 4 +- .../src/generators/ANGULAR/index.ts | 9 +- .../src/generators/EMBER/index.ts | 2 +- .../src/generators/HTML/index.ts | 2 +- .../src/generators/NEXTJS/index.ts | 2 +- .../src/generators/PREACT/index.ts | 2 +- .../src/generators/REACT/index.ts | 4 +- .../src/generators/REACT_NATIVE/index.ts | 7 +- .../src/generators/REACT_SCRIPTS/index.ts | 2 +- .../src/generators/SERVER/index.ts | 2 +- .../src/generators/SOLID/index.ts | 2 +- .../src/generators/SVELTEKIT/index.ts | 2 +- .../src/generators/VUE3/index.ts | 2 +- .../src/generators/WEB-COMPONENTS/index.ts | 2 +- .../src/generators/WEBPACK_REACT/index.ts | 2 +- .../src/generators/baseGenerator.ts | 19 +- .../src/generators/configure.test.ts | 2 +- .../src/generators/configure.ts | 2 +- .../create-storybook/src/generators/types.ts | 4 +- code/lib/create-storybook/src/index.ts | 1 + code/lib/create-storybook/src/initiate.ts | 7 +- code/lib/toolbox/bin/index.cjs | 2 +- code/lib/toolbox/package.json | 279 +----------------- code/lib/toolbox/project.json | 2 +- .../angular-builders-multiproject.test.ts | 17 +- .../fixes/angular-builders-multiproject.ts | 3 +- .../fixes/angular-builders.test.ts | 17 +- .../src/automigrate/fixes/angular-builders.ts | 3 +- .../src/automigrate/fixes/builder-vite.ts | 2 +- .../automigrate/fixes/eslint-plugin.test.ts | 3 + .../src/automigrate/fixes/eslint-plugin.ts | 2 +- .../toolbox/src/automigrate/fixes/mdx-gfm.ts | 2 +- .../src/automigrate/fixes/new-frameworks.ts | 2 +- .../fixes/remove-jest-testing-library.ts | 2 +- .../src/automigrate/fixes/sb-binary.ts | 2 +- .../src/automigrate/fixes/vite-config-file.ts | 2 +- .../fixes/webpack5-compiler-setup.test.ts | 2 +- .../fixes/webpack5-compiler-setup.ts | 4 +- .../automigrate/fixes/wrap-require.test.ts | 6 +- .../src/automigrate/fixes/wrap-require.ts | 2 +- .../src/automigrate/helpers/mainConfigFile.ts | 2 +- code/lib/toolbox/src/bin/index.ts | 14 +- code/lib/toolbox/src/index.ts | 5 - code/lib/toolbox/src/migrate.ts | 2 +- code/lib/toolbox/src/sandbox.ts | 4 +- code/lib/toolbox/src/upgrade.ts | 2 +- code/yarn.lock | 109 ++++--- 66 files changed, 268 insertions(+), 721 deletions(-) create mode 100644 code/core/src/cli/index.ts create mode 100644 code/lib/cli/core/cli/index.cjs create mode 100644 code/lib/cli/core/cli/index.d.ts create mode 100644 code/lib/cli/core/cli/index.js create mode 100644 code/lib/cli/src/index.ts create mode 100644 code/lib/cli/src/proxy.ts create mode 100644 code/lib/create-storybook/src/index.ts diff --git a/code/core/package.json b/code/core/package.json index 188743b7b6e9..4cd6e5541d7a 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -147,6 +147,11 @@ "import": "./dist/preview/globals.js", "require": "./dist/preview/globals.cjs" }, + "./cli": { + "types": "./dist/cli/index.d.ts", + "import": "./dist/cli/index.js", + "require": "./dist/cli/index.cjs" + }, "./package.json": "./package.json" }, "main": "dist/index.cjs", @@ -231,6 +236,9 @@ ], "preview/globals": [ "./dist/preview/globals.d.ts" + ], + "cli": [ + "./dist/cli/index.d.ts" ] } }, @@ -254,6 +262,7 @@ "express": "^4.19.2", "process": "^0.11.10", "recast": "^0.23.5", + "tempy": "^3.1.0", "util": "^0.12.4", "ws": "^8.2.3" }, @@ -273,6 +282,7 @@ "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1", "@fal-works/esbuild-plugin-global-externals": "^2.1.2", "@ndelangen/fs-extra-unified": "^1.0.3", + "@ndelangen/get-tarball": "^3.0.7", "@popperjs/core": "^2.6.0", "@radix-ui/react-dialog": "^1.0.5", "@radix-ui/react-scroll-area": "^1.0.5", @@ -296,6 +306,7 @@ "@types/picomatch": "^2.3.0", "@types/prettier": "^3.0.0", "@types/pretty-hrtime": "^1.0.0", + "@types/prompts": "^2.0.9", "@types/qs": "^6", "@types/react-syntax-highlighter": "11.0.5", "@types/react-transition-group": "^4", @@ -315,6 +326,7 @@ "chai": "^4.4.1", "chalk": "^5.3.0", "cli-table3": "^0.6.1", + "commander": "^6.2.1", "comment-parser": "^1.4.1", "compression": "^1.7.4", "copy-to-clipboard": "^3.3.1", @@ -322,6 +334,7 @@ "css": "^3.0.0", "deep-object-diff": "^1.1.0", "dequal": "^2.0.2", + "detect-indent": "^6.1.0", "detect-package-manager": "^3.0.2", "detect-port": "^1.3.0", "diff": "^5.2.0", @@ -339,12 +352,14 @@ "flush-promises": "^1.0.2", "fs-extra": "^11.1.0", "fuse.js": "^3.6.1", + "get-npm-tarball-url": "^2.0.3", "glob": "^10.0.0", "globby": "^14.0.1", "handlebars": "^4.7.7", "js-yaml": "^4.1.0", "jsdoc-type-pratt-parser": "^4.0.0", "lazy-universal-dotenv": "^4.0.0", + "leven": "^3.1.0", "lodash": "^4.17.21", "markdown-to-jsx": "^7.4.5", "memoizerific": "^1.11.3", @@ -373,6 +388,7 @@ "semver": "^7.3.7", "slash": "^5.0.0", "store2": "^2.14.2", + "strip-json-comments": "^3.1.1", "telejson": "^7.2.0", "tiny-invariant": "^1.3.1", "tinyspy": "^2.2.0", diff --git a/code/core/scripts/entries.ts b/code/core/scripts/entries.ts index 85297c1b0c56..84f64a62b447 100644 --- a/code/core/scripts/entries.ts +++ b/code/core/scripts/entries.ts @@ -40,6 +40,7 @@ export const getEntries = (cwd: string) => { define('src/manager/globals-module-info.ts', ['node'], true), define('src/preview/globals.ts', ['node'], true), + define('src/cli/index.ts', ['node'], true), ]; }; diff --git a/code/core/src/cli/detect.ts b/code/core/src/cli/detect.ts index 440336f74bb8..83b90237aa9b 100644 --- a/code/core/src/cli/detect.ts +++ b/code/core/src/cli/detect.ts @@ -1,5 +1,5 @@ import * as fs from 'fs'; -import findUp from 'find-up'; +import { findUpSync } from 'find-up'; import semver from 'semver'; import { logger } from '@storybook/core/node-logger'; @@ -110,8 +110,8 @@ export function detectFrameworkPreset( * @returns CoreBuilder */ export async function detectBuilder(packageManager: JsPackageManager, projectType: ProjectType) { - const viteConfig = findUp.sync(viteConfigFiles); - const webpackConfig = findUp.sync(webpackConfigFiles); + const viteConfig = findUpSync(viteConfigFiles); + const webpackConfig = findUpSync(webpackConfigFiles); const dependencies = await packageManager.getAllDependencies(); if (viteConfig || (dependencies.vite && dependencies.webpack === undefined)) { @@ -161,7 +161,7 @@ export function isStorybookInstantiated(configDir = resolve(process.cwd(), '.sto } export async function detectPnp() { - return !!findUp.sync(['.pnp.js', '.pnp.cjs']); + return !!findUpSync(['.pnp.js', '.pnp.cjs']); } export async function detectLanguage(packageManager: JsPackageManager) { diff --git a/code/core/src/cli/dirs.ts b/code/core/src/cli/dirs.ts index 32f31f6ecadb..0580b352a948 100644 --- a/code/core/src/cli/dirs.ts +++ b/code/core/src/cli/dirs.ts @@ -10,10 +10,6 @@ import type { JsPackageManager } from '@storybook/core/common'; import { versions } from '@storybook/core/common'; import type { SupportedFrameworks } from '@storybook/core/types'; -export function getCliDir() { - return dirname(require.resolve('storybook/package.json')); -} - const resolveUsingBranchInstall = async (packageManager: JsPackageManager, request: string) => { const { temporaryDirectory } = await import('tempy'); const tempDirectory = temporaryDirectory(); diff --git a/code/core/src/cli/helpers.test.ts b/code/core/src/cli/helpers.test.ts index 1edbf8a0adb7..4eed1366df1f 100644 --- a/code/core/src/cli/helpers.test.ts +++ b/code/core/src/cli/helpers.test.ts @@ -38,7 +38,6 @@ vi.mock('fs', async (importOriginal) => { vi.mock('./dirs', () => ({ getRendererDir: (_: JsPackageManager, renderer: string) => normalizePath(`@storybook/${renderer}`), - getCliDir: () => normalizePath('storybook'), })); vi.mock('fs-extra', async (importOriginal) => { @@ -123,11 +122,12 @@ describe('Helpers', () => { renderer: 'react', language, packageManager: packageManagerMock, + assetsDir: normalizePath('create-storybook/rendererAssets/common'), }); expect(fse.copy).toHaveBeenNthCalledWith( 1, - normalizePath('storybook/rendererAssets/common'), + normalizePath('create-storybook/rendererAssets/common'), './stories', expect.anything() ); diff --git a/code/core/src/cli/helpers.ts b/code/core/src/cli/helpers.ts index cffea359a871..0dfdf79b255b 100644 --- a/code/core/src/cli/helpers.ts +++ b/code/core/src/cli/helpers.ts @@ -5,9 +5,9 @@ import path, { join } from 'path'; import { coerce, satisfies } from 'semver'; import stripJsonComments from 'strip-json-comments'; -import findUp from 'find-up'; +import { findUpSync } from 'find-up'; import invariant from 'tiny-invariant'; -import { getCliDir, getRendererDir } from './dirs'; +import { getRendererDir } from './dirs'; import { type JsPackageManager, type PackageJson, @@ -15,8 +15,7 @@ import { frameworkToRenderer as CoreFrameworkToRenderer, } from '@storybook/core/common'; import type { SupportedFrameworks, SupportedRenderers } from '@storybook/core/types'; -import { CoreBuilder } from './project_types'; -import { SupportedLanguage } from './project_types'; +import { CoreBuilder, SupportedLanguage } from './project_types'; import { versions as storybookMonorepoPackages } from '@storybook/core/common'; const logger = console; @@ -128,7 +127,7 @@ type CopyTemplateFilesOptions = { packageManager: JsPackageManager; renderer: SupportedFrameworks | SupportedRenderers; language: SupportedLanguage; - includeCommonAssets?: boolean; + assetsDir?: string; destination?: string; }; @@ -164,7 +163,7 @@ export async function copyTemplateFiles({ renderer, language, destination, - includeCommonAssets = true, + assetsDir, }: CopyTemplateFilesOptions) { const languageFolderMapping: Record = { // keeping this for backwards compatibility in case community packages are using it @@ -213,14 +212,14 @@ export async function copyTemplateFiles({ }; const destinationPath = destination ?? (await targetPath()); - if (includeCommonAssets) { - await fse.copy(join(getCliDir(), 'rendererAssets', 'common'), destinationPath, { + if (assetsDir) { + await fse.copy(assetsDir, destinationPath, { overwrite: true, }); } await fse.copy(await templatePath(), destinationPath, { overwrite: true }); - if (includeCommonAssets) { + if (assetsDir) { const rendererType = frameworkToRenderer[renderer] || 'react'; await adjustTemplate(join(destinationPath, 'Configure.mdx'), { renderer: rendererType }); } @@ -258,7 +257,7 @@ export function getStorybookVersionSpecifier(packageJson: PackageJsonWithDepsAnd } export async function isNxProject() { - return findUp.sync('nx.json'); + return findUpSync('nx.json'); } export function coerceSemver(version: string) { diff --git a/code/core/src/cli/index.ts b/code/core/src/cli/index.ts new file mode 100644 index 000000000000..c99751ac2c1b --- /dev/null +++ b/code/core/src/cli/index.ts @@ -0,0 +1,7 @@ +export * from './detect'; +export * from './helpers'; +export * from './angular/helpers'; +export * from './dirs'; +export * from './project_types'; +export * from './NpmOptions'; +export * from './eslintPlugin'; diff --git a/code/core/src/common/versions.ts b/code/core/src/common/versions.ts index 1eb045a2e13a..160d283af0ab 100644 --- a/code/core/src/common/versions.ts +++ b/code/core/src/common/versions.ts @@ -62,11 +62,13 @@ export default { '@storybook/cli': '8.2.0-beta.3', '@storybook/codemod': '8.2.0-beta.3', '@storybook/core-webpack': '8.2.0-beta.3', + 'create-storybook': '8.2.0-beta.3', '@storybook/csf-plugin': '8.2.0-beta.3', '@storybook/instrumenter': '8.2.0-beta.3', '@storybook/react-dom-shim': '8.2.0-beta.3', '@storybook/source-loader': '8.2.0-beta.3', '@storybook/test': '8.2.0-beta.3', + '@storybook/toolbox': '8.2.0-beta.3', '@storybook/preset-create-react-app': '8.2.0-beta.3', '@storybook/preset-html-webpack': '8.2.0-beta.3', '@storybook/preset-preact-webpack': '8.2.0-beta.3', diff --git a/code/core/src/core-server/utils/warnOnIncompatibleAddons.ts b/code/core/src/core-server/utils/warnOnIncompatibleAddons.ts index df43ed0d7738..4f35fe5d1546 100644 --- a/code/core/src/core-server/utils/warnOnIncompatibleAddons.ts +++ b/code/core/src/core-server/utils/warnOnIncompatibleAddons.ts @@ -2,7 +2,7 @@ import { logger } from '@storybook/core/node-logger'; import { getIncompatibleStorybookPackages, getIncompatiblePackagesSummary, -} from '../../../../lib/cli/src/doctor/getIncompatibleStorybookPackages'; +} from '../../../../lib/toolbox/src/doctor/getIncompatibleStorybookPackages'; export const warnOnIncompatibleAddons = async (currentStorybookVersion: string) => { const incompatiblePackagesList = await getIncompatibleStorybookPackages({ diff --git a/code/lib/cli/bin/index.cjs b/code/lib/cli/bin/index.cjs index f7164c48f330..0aecdd1e9b9b 100755 --- a/code/lib/cli/bin/index.cjs +++ b/code/lib/cli/bin/index.cjs @@ -23,4 +23,4 @@ process.once('uncaughtException', (error) => { throw error; }); -require('../dist/generate.cjs'); +require('../dist/proxy.cjs'); diff --git a/code/lib/cli/core/cli/index.cjs b/code/lib/cli/core/cli/index.cjs new file mode 100644 index 000000000000..023342dde38e --- /dev/null +++ b/code/lib/cli/core/cli/index.cjs @@ -0,0 +1 @@ +module.exports = require('@storybook/core/cli'); diff --git a/code/lib/cli/core/cli/index.d.ts b/code/lib/cli/core/cli/index.d.ts new file mode 100644 index 000000000000..2ce4e03dd15f --- /dev/null +++ b/code/lib/cli/core/cli/index.d.ts @@ -0,0 +1,2 @@ +export * from '@storybook/core/cli'; +export type * from '@storybook/core/cli'; diff --git a/code/lib/cli/core/cli/index.js b/code/lib/cli/core/cli/index.js new file mode 100644 index 000000000000..59fef763e102 --- /dev/null +++ b/code/lib/cli/core/cli/index.js @@ -0,0 +1 @@ +export * from '@storybook/core/cli'; diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json index cf2fe65fd8af..0065e0fa9853 100644 --- a/code/lib/cli/package.json +++ b/code/lib/cli/package.json @@ -167,6 +167,11 @@ "types": "./core/preview/globals.d.ts", "import": "./core/preview/globals.js", "require": "./core/preview/globals.cjs" + }, + "./internal/cli": { + "types": "./core/cli/index.d.ts", + "import": "./core/cli/index.js", + "require": "./core/cli/index.cjs" } }, "main": "dist/index.cjs", @@ -183,6 +188,9 @@ "internal/channels": [ "./core/channels/index.d.ts" ], + "internal/cli": [ + "./core/cli/index.d.ts" + ], "internal/client-logger": [ "./core/client-logger/index.d.ts" ], @@ -285,45 +293,9 @@ "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@babel/core": "^7.24.4", - "@babel/types": "^7.24.0", - "@storybook/codemod": "workspace:*", - "@storybook/core": "workspace:*", - "@types/semver": "^7.3.4", - "@yarnpkg/fslib": "2.10.3", - "@yarnpkg/libzip": "2.3.0", - "chalk": "^4.1.0", - "commander": "^6.2.1", - "cross-spawn": "^7.0.3", - "detect-indent": "^6.1.0", - "envinfo": "^7.7.3", - "execa": "^5.0.0", - "fd-package-json": "^1.2.0", - "find-up": "^5.0.0", - "fs-extra": "^11.1.0", - "giget": "^1.0.0", - "globby": "^14.0.1", - "jscodeshift": "^0.15.1", - "leven": "^3.1.0", - "ora": "^5.4.1", - "prettier": "^3.1.1", - "prompts": "^2.4.0", - "semver": "^7.3.7", - "strip-json-comments": "^3.0.1", - "tempy": "^3.1.0", - "tiny-invariant": "^1.3.1", - "ts-dedent": "^2.0.0" + "@storybook/core": "workspace:*" }, "devDependencies": { - "@ndelangen/get-tarball": "^3.0.7", - "@types/cross-spawn": "^6.0.2", - "@types/prompts": "^2.0.9", - "@types/util-deprecate": "^1.0.0", - "boxen": "^7.1.1", - "get-npm-tarball-url": "^2.0.3", - "slash": "^5.0.0", - "strip-ansi": "^7.1.0", - "strip-json-comments": "^3.1.1", "typescript": "^5.3.2" }, "publishConfig": { @@ -332,7 +304,7 @@ "bundler": { "pre": "./scripts/update-core-portal.ts", "entries": [ - "./src/generate.ts", + "./src/proxy.ts", "./src/core-path.ts", "./src/index.ts" ], diff --git a/code/lib/cli/src/index.ts b/code/lib/cli/src/index.ts new file mode 100644 index 000000000000..4dcb8c60afef --- /dev/null +++ b/code/lib/cli/src/index.ts @@ -0,0 +1,5 @@ +import { deprecate } from '@storybook/core/node-logger'; + +deprecate( + 'Exports from @storybook/cli are removed. Please import from @storybook/core-common instead.' +); diff --git a/code/lib/cli/src/proxy.ts b/code/lib/cli/src/proxy.ts new file mode 100644 index 000000000000..523bda2a27c2 --- /dev/null +++ b/code/lib/cli/src/proxy.ts @@ -0,0 +1,23 @@ +import { spawn } from 'child_process'; +import { versions } from '@storybook/core/common'; + +const args = process.argv.slice(2); + +// Forward some commands to @storybook/toolbox +if (['dev', 'build'].includes(args[0])) { + require('@storybook/core/cli/bin'); +} else { + const proxiedArgs = + args[0] === 'init' + ? [`create-storybook@${versions.storybook}`, ...args.slice(1)] + : [`@storybook/toolbox@${versions.storybook}`, ...args]; + const command = ['npx', '--yes', ...proxiedArgs]; + console.log(command.join(' ')); + const child = spawn(command[0], command.slice(1), { stdio: 'inherit' }); + child.on('exit', (code) => { + if (code != null) { + process.exit(code); + } + process.exit(1); + }); +} diff --git a/code/lib/create-storybook/bin/index.cjs b/code/lib/create-storybook/bin/index.cjs index f7164c48f330..ce13973e4eb9 100755 --- a/code/lib/create-storybook/bin/index.cjs +++ b/code/lib/create-storybook/bin/index.cjs @@ -23,4 +23,4 @@ process.once('uncaughtException', (error) => { throw error; }); -require('../dist/generate.cjs'); +require('../dist/bin/index.cjs'); diff --git a/code/lib/create-storybook/package.json b/code/lib/create-storybook/package.json index cf2fe65fd8af..10e43a695e24 100644 --- a/code/lib/create-storybook/package.json +++ b/code/lib/create-storybook/package.json @@ -1,15 +1,8 @@ { - "name": "storybook", + "name": "create-storybook", "version": "8.2.0-beta.3", - "description": "Storybook's CLI - install, dev, build, upgrade, and more", - "keywords": [ - "cli", - "generator", - "dev", - "build", - "upgrade" - ], - "homepage": "https://github.com/storybookjs/storybook/tree/next/code/lib/cli", + "description": "Initialize Storybook into your project", + "homepage": "https://github.com/storybookjs/storybook/tree/next/code/lib/create-storybook", "bugs": { "url": "https://github.com/storybookjs/storybook/issues" }, @@ -36,248 +29,25 @@ "node": "./bin/index.cjs", "require": "./bin/index.cjs" }, - "./core-path": { - "types": "./dist/core-path.d.ts", - "node": "./dist/core-path.cjs", - "import": "./dist/core-path.js", - "require": "./dist/core-path.cjs" - }, - "./package.json": "./package.json", - "./core": { - "types": "./core/index.d.ts", - "import": "./core/index.js", - "require": "./core/index.cjs" - }, - "./internal/node-logger": { - "types": "./core/node-logger/index.d.ts", - "import": "./core/node-logger/index.js", - "require": "./core/node-logger/index.cjs" - }, - "./internal/client-logger": { - "types": "./core/client-logger/index.d.ts", - "import": "./core/client-logger/index.js", - "require": "./core/client-logger/index.cjs" - }, - "./internal/core-server": { - "types": "./core/core-server/index.d.ts", - "import": "./core/core-server/index.js", - "require": "./core/core-server/index.cjs" - }, - "./internal/core-server/presets/common-preset": { - "import": "./core/core-server/presets/common-preset.js", - "require": "./core/core-server/presets/common-preset.cjs" - }, - "./internal/core-server/presets/common-manager": { - "import": "./core/core-server/presets/common-manager.js" - }, - "./internal/core-server/presets/common-override-preset": { - "import": "./core/core-server/presets/common-override-preset.js", - "require": "./core/core-server/presets/common-override-preset.cjs" - }, - "./internal/core-events": { - "types": "./core/core-events/index.d.ts", - "import": "./core/core-events/index.js", - "require": "./core/core-events/index.cjs" - }, - "./internal/manager-errors": { - "types": "./core/manager-errors.d.ts", - "import": "./core/manager-errors.js" - }, - "./internal/preview-errors": { - "types": "./core/preview-errors.d.ts", - "import": "./core/preview-errors.js", - "require": "./core/preview-errors.cjs" - }, - "./internal/server-errors": { - "types": "./core/server-errors.d.ts", - "import": "./core/server-errors.js", - "require": "./core/server-errors.cjs" - }, - "./internal/channels": { - "types": "./core/channels/index.d.ts", - "import": "./core/channels/index.js", - "require": "./core/channels/index.cjs" - }, - "./internal/types": { - "types": "./core/types/index.d.ts", - "import": "./core/types/index.js", - "require": "./core/types/index.cjs" - }, - "./internal/csf-tools": { - "types": "./core/csf-tools/index.d.ts", - "import": "./core/csf-tools/index.js", - "require": "./core/csf-tools/index.cjs" - }, - "./internal/common": { - "types": "./core/common/index.d.ts", - "import": "./core/common/index.js", - "require": "./core/common/index.cjs" - }, - "./internal/builder-manager": { - "types": "./core/builder-manager/index.d.ts", - "import": "./core/builder-manager/index.js", - "require": "./core/builder-manager/index.cjs" - }, - "./internal/telemetry": { - "types": "./core/telemetry/index.d.ts", - "import": "./core/telemetry/index.js", - "require": "./core/telemetry/index.cjs" - }, - "./internal/preview-api": { - "types": "./core/preview-api/index.d.ts", - "import": "./core/preview-api/index.js", - "require": "./core/preview-api/index.cjs" - }, - "./internal/manager-api": { - "types": "./core/manager-api/index.d.ts", - "import": "./core/manager-api/index.js", - "require": "./core/manager-api/index.cjs" - }, - "./internal/router": { - "types": "./core/router/index.d.ts", - "import": "./core/router/index.js", - "require": "./core/router/index.cjs" - }, - "./internal/components": { - "types": "./core/components/index.d.ts", - "import": "./core/components/index.js", - "require": "./core/components/index.cjs" - }, - "./internal/theming": { - "types": "./core/theming/index.d.ts", - "import": "./core/theming/index.js", - "require": "./core/theming/index.cjs" - }, - "./internal/theming/create": { - "types": "./core/theming/create.d.ts", - "import": "./core/theming/create.js", - "require": "./core/theming/create.cjs" - }, - "./internal/docs-tools": { - "types": "./core/docs-tools/index.d.ts", - "import": "./core/docs-tools/index.js", - "require": "./core/docs-tools/index.cjs" - }, - "./internal/manager/globals-module-info": { - "types": "./core/manager/globals-module-info.d.ts", - "import": "./core/manager/globals-module-info.js", - "require": "./core/manager/globals-module-info.cjs" - }, - "./internal/preview/globals": { - "types": "./core/preview/globals.d.ts", - "import": "./core/preview/globals.js", - "require": "./core/preview/globals.cjs" - } + "./package.json": "./package.json" }, "main": "dist/index.cjs", "module": "dist/index.js", "types": "dist/index.d.ts", "typesVersions": { "*": { - "internal/*": [ - "./core/index.d.ts" - ], - "internal/builder-manager": [ - "./core/builder-manager/index.d.ts" - ], - "internal/channels": [ - "./core/channels/index.d.ts" - ], - "internal/client-logger": [ - "./core/client-logger/index.d.ts" - ], - "internal/common": [ - "./core/common/index.d.ts" - ], - "internal/components": [ - "./core/components/index.d.ts" - ], - "internal/core-events": [ - "./core/core-events/index.d.ts" - ], - "internal/core-server": [ - "./core/core-server/index.d.ts" - ], - "internal/core-server/presets/common-manager": [ - "./core/core-server/presets/common-manager.d.ts" - ], - "internal/core-server/presets/common-override-preset": [ - "./core/core-server/presets/common-override-preset.d.ts" - ], - "internal/core-server/presets/common-preset": [ - "./core/core-server/presets/common-preset.d.ts" - ], - "internal/csf-tools": [ - "./core/csf-tools/index.d.ts" - ], - "internal/docs-tools": [ - "./core/docs-tools/index.d.ts" - ], - "internal/manager-api": [ - "./core/manager-api/index.d.ts" - ], - "internal/manager-errors": [ - "./core/manager-errors.d.ts" - ], - "internal/manager/globals-module-info": [ - "./core/manager/globals-module-info.d.ts" - ], - "internal/node-logger": [ - "./core/node-logger/index.d.ts" - ], - "internal/preview-api": [ - "./core/preview-api/index.d.ts" - ], - "internal/preview-errors": [ - "./core/preview-errors.d.ts" - ], - "internal/preview/globals": [ - "./core/preview/globals.d.ts" - ], - "internal/router": [ - "./core/router/index.d.ts" - ], - "internal/server-errors": [ - "./core/server-errors.d.ts" - ], - "internal/telemetry": [ - "./core/telemetry/index.d.ts" - ], - "internal/theming": [ - "./core/theming/index.d.ts" - ], - "internal/theming/create": [ - "./core/theming/create.d.ts" - ], - "internal/types": [ - "./core/types/index.d.ts" - ], "*": [ "./dist/index.d.ts" - ], - "core-path": [ - "./dist/core-path.d.ts" - ], - "core": [ - "./core/index.d.ts" ] } }, - "bin": { - "getstorybook": "./bin/index.cjs", - "sb": "./bin/index.cjs", - "storybook": "./bin/index.cjs" - }, + "bin": "./bin/index.cjs", "files": [ "bin/**/*", - "core/**/*", "dist/**/*", "rendererAssets/**/*", "templates/**/*", "README.md", - "*.cjs", - "*.js", - "*.d.ts", "!src/**/*" ], "scripts": { @@ -285,56 +55,35 @@ "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@babel/core": "^7.24.4", - "@babel/types": "^7.24.0", - "@storybook/codemod": "workspace:*", "@storybook/core": "workspace:*", "@types/semver": "^7.3.4", - "@yarnpkg/fslib": "2.10.3", - "@yarnpkg/libzip": "2.3.0", "chalk": "^4.1.0", "commander": "^6.2.1", - "cross-spawn": "^7.0.3", - "detect-indent": "^6.1.0", - "envinfo": "^7.7.3", "execa": "^5.0.0", "fd-package-json": "^1.2.0", "find-up": "^5.0.0", "fs-extra": "^11.1.0", - "giget": "^1.0.0", - "globby": "^14.0.1", - "jscodeshift": "^0.15.1", - "leven": "^3.1.0", "ora": "^5.4.1", "prettier": "^3.1.1", "prompts": "^2.4.0", "semver": "^7.3.7", - "strip-json-comments": "^3.0.1", - "tempy": "^3.1.0", + "storybook": "workspace:*", "tiny-invariant": "^1.3.1", "ts-dedent": "^2.0.0" }, "devDependencies": { - "@ndelangen/get-tarball": "^3.0.7", - "@types/cross-spawn": "^6.0.2", "@types/prompts": "^2.0.9", "@types/util-deprecate": "^1.0.0", "boxen": "^7.1.1", - "get-npm-tarball-url": "^2.0.3", - "slash": "^5.0.0", - "strip-ansi": "^7.1.0", - "strip-json-comments": "^3.1.1", "typescript": "^5.3.2" }, "publishConfig": { "access": "public" }, "bundler": { - "pre": "./scripts/update-core-portal.ts", "entries": [ - "./src/generate.ts", - "./src/core-path.ts", - "./src/index.ts" + "./src/index.ts", + "./src/bin/index.ts" ], "platform": "node" }, diff --git a/code/lib/create-storybook/project.json b/code/lib/create-storybook/project.json index 82cebd8431b3..66129bbf4250 100644 --- a/code/lib/create-storybook/project.json +++ b/code/lib/create-storybook/project.json @@ -1,5 +1,5 @@ { - "name": "cli", + "name": "create-storybook", "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "library", "targets": { diff --git a/code/lib/create-storybook/src/bin/index.ts b/code/lib/create-storybook/src/bin/index.ts index be3985089b7e..fa1f0ae0fbf7 100644 --- a/code/lib/create-storybook/src/bin/index.ts +++ b/code/lib/create-storybook/src/bin/index.ts @@ -4,8 +4,8 @@ import invariant from 'tiny-invariant'; import { addToGlobalContext } from '@storybook/core/telemetry'; import { versions } from '@storybook/core/common'; -import type { CommandOptions } from './generators/types'; -import { initiate } from './initiate'; +import type { CommandOptions } from '../generators/types'; +import { initiate } from '../initiate'; addToGlobalContext('cliVersion', versions.storybook); diff --git a/code/lib/create-storybook/src/generators/ANGULAR/index.ts b/code/lib/create-storybook/src/generators/ANGULAR/index.ts index 3a18fd192bf4..4faa0e10bf0b 100644 --- a/code/lib/create-storybook/src/generators/ANGULAR/index.ts +++ b/code/lib/create-storybook/src/generators/ANGULAR/index.ts @@ -1,11 +1,10 @@ import { join } from 'path'; import { commandLog } from '@storybook/core/common'; -import { baseGenerator } from '../baseGenerator'; +import { baseGenerator, getCliDir } from '../baseGenerator'; import type { Generator } from '../types'; -import { CoreBuilder } from '../../project_types'; -import { AngularJSON, compoDocPreviewPrefix, promptForCompoDocs } from './helpers'; -import { getCliDir } from '../../dirs'; -import { copyTemplate } from '../../helpers'; +import { CoreBuilder } from '@storybook/core/cli'; +import { AngularJSON, compoDocPreviewPrefix, promptForCompoDocs } from '@storybook/core/cli'; +import { copyTemplate } from '@storybook/core/cli'; const generator: Generator<{ projectName: string }> = async ( packageManager, diff --git a/code/lib/create-storybook/src/generators/EMBER/index.ts b/code/lib/create-storybook/src/generators/EMBER/index.ts index 6b148964773d..b54280e3305f 100644 --- a/code/lib/create-storybook/src/generators/EMBER/index.ts +++ b/code/lib/create-storybook/src/generators/EMBER/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '../../project_types'; +import { CoreBuilder } from '@storybook/core/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/HTML/index.ts b/code/lib/create-storybook/src/generators/HTML/index.ts index 87ee978b0865..bcef35381d93 100755 --- a/code/lib/create-storybook/src/generators/HTML/index.ts +++ b/code/lib/create-storybook/src/generators/HTML/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '../../project_types'; +import { CoreBuilder } from '@storybook/core/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/NEXTJS/index.ts b/code/lib/create-storybook/src/generators/NEXTJS/index.ts index e29cb4f6a751..8f00c8721eff 100644 --- a/code/lib/create-storybook/src/generators/NEXTJS/index.ts +++ b/code/lib/create-storybook/src/generators/NEXTJS/index.ts @@ -1,6 +1,6 @@ import { join } from 'path'; import { existsSync } from 'fs'; -import { CoreBuilder } from '../../project_types'; +import { CoreBuilder } from '@storybook/core/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/PREACT/index.ts b/code/lib/create-storybook/src/generators/PREACT/index.ts index 74549fc5e26b..83d499745b87 100644 --- a/code/lib/create-storybook/src/generators/PREACT/index.ts +++ b/code/lib/create-storybook/src/generators/PREACT/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '../../project_types'; +import { CoreBuilder } from '@storybook/core/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/REACT/index.ts b/code/lib/create-storybook/src/generators/REACT/index.ts index 267f15b8427a..a8135b8f2df1 100644 --- a/code/lib/create-storybook/src/generators/REACT/index.ts +++ b/code/lib/create-storybook/src/generators/REACT/index.ts @@ -1,5 +1,5 @@ -import { detectLanguage } from '../../detect'; -import { CoreBuilder, SupportedLanguage } from '../../project_types'; +import { detectLanguage } from '@storybook/core/cli'; +import { CoreBuilder, SupportedLanguage } from '@storybook/core/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/REACT_NATIVE/index.ts b/code/lib/create-storybook/src/generators/REACT_NATIVE/index.ts index 5d9cd1d82a53..0a16fe6256a9 100644 --- a/code/lib/create-storybook/src/generators/REACT_NATIVE/index.ts +++ b/code/lib/create-storybook/src/generators/REACT_NATIVE/index.ts @@ -1,7 +1,7 @@ -import { copyTemplateFiles, getBabelDependencies } from '../../helpers'; +import { copyTemplateFiles, getBabelDependencies } from '@storybook/core/cli'; import type { JsPackageManager } from '@storybook/core/common'; -import type { NpmOptions } from '../../NpmOptions'; -import { SupportedLanguage } from '../../project_types'; +import type { NpmOptions } from '@storybook/core/cli'; +import { SupportedLanguage } from '@storybook/core/cli'; const generator = async ( packageManager: JsPackageManager, @@ -59,7 +59,6 @@ const generator = async ( renderer: 'react-native', language: SupportedLanguage.TYPESCRIPT_3_8, destination: storybookConfigFolder, - includeCommonAssets: false, }); }; diff --git a/code/lib/create-storybook/src/generators/REACT_SCRIPTS/index.ts b/code/lib/create-storybook/src/generators/REACT_SCRIPTS/index.ts index 4a9282b5e32a..c0c43aa55cf5 100644 --- a/code/lib/create-storybook/src/generators/REACT_SCRIPTS/index.ts +++ b/code/lib/create-storybook/src/generators/REACT_SCRIPTS/index.ts @@ -5,7 +5,7 @@ import { dedent } from 'ts-dedent'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; -import { CoreBuilder } from '../../project_types'; +import { CoreBuilder } from '@storybook/core/cli'; const generator: Generator = async (packageManager, npmOptions, options) => { const monorepoRootPath = path.join(__dirname, '..', '..', '..', '..', '..', '..'); diff --git a/code/lib/create-storybook/src/generators/SERVER/index.ts b/code/lib/create-storybook/src/generators/SERVER/index.ts index 1e7cdb0c6ad2..834aefcfb077 100755 --- a/code/lib/create-storybook/src/generators/SERVER/index.ts +++ b/code/lib/create-storybook/src/generators/SERVER/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '../../project_types'; +import { CoreBuilder } from '@storybook/core/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/SOLID/index.ts b/code/lib/create-storybook/src/generators/SOLID/index.ts index 21347d057682..761000dd12a6 100644 --- a/code/lib/create-storybook/src/generators/SOLID/index.ts +++ b/code/lib/create-storybook/src/generators/SOLID/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '../../project_types'; +import { CoreBuilder } from '@storybook/core/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/SVELTEKIT/index.ts b/code/lib/create-storybook/src/generators/SVELTEKIT/index.ts index 50c440a7922d..5984b09b35e6 100644 --- a/code/lib/create-storybook/src/generators/SVELTEKIT/index.ts +++ b/code/lib/create-storybook/src/generators/SVELTEKIT/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '../../project_types'; +import { CoreBuilder } from '@storybook/core/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/VUE3/index.ts b/code/lib/create-storybook/src/generators/VUE3/index.ts index c919b81cbbce..85070ba91125 100644 --- a/code/lib/create-storybook/src/generators/VUE3/index.ts +++ b/code/lib/create-storybook/src/generators/VUE3/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '../../project_types'; +import { CoreBuilder } from '@storybook/core/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/WEB-COMPONENTS/index.ts b/code/lib/create-storybook/src/generators/WEB-COMPONENTS/index.ts index a4424ecb2757..4bdf3b6e457a 100755 --- a/code/lib/create-storybook/src/generators/WEB-COMPONENTS/index.ts +++ b/code/lib/create-storybook/src/generators/WEB-COMPONENTS/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '../../project_types'; +import { CoreBuilder } from '@storybook/core/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/WEBPACK_REACT/index.ts b/code/lib/create-storybook/src/generators/WEBPACK_REACT/index.ts index 7274e40bf40f..3c26f6e23496 100644 --- a/code/lib/create-storybook/src/generators/WEBPACK_REACT/index.ts +++ b/code/lib/create-storybook/src/generators/WEBPACK_REACT/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '../../project_types'; +import { CoreBuilder } from '@storybook/core/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/baseGenerator.ts b/code/lib/create-storybook/src/generators/baseGenerator.ts index 26af38afdbf4..a21b316a6060 100644 --- a/code/lib/create-storybook/src/generators/baseGenerator.ts +++ b/code/lib/create-storybook/src/generators/baseGenerator.ts @@ -1,4 +1,4 @@ -import path from 'path'; +import path, { dirname } from 'path'; import fse from 'fs-extra'; import { dedent } from 'ts-dedent'; import ora from 'ora'; @@ -6,14 +6,14 @@ import invariant from 'tiny-invariant'; import type { JsPackageManager } from '@storybook/core/common'; import { getPackageDetails, versions as packageVersions } from '@storybook/core/common'; import type { SupportedFrameworks } from '@storybook/core/types'; -import type { NpmOptions } from '../NpmOptions'; -import type { SupportedRenderers, Builder } from '../project_types'; -import { SupportedLanguage, externalFrameworks } from '../project_types'; -import { copyTemplateFiles } from '../helpers'; +import type { NpmOptions } from '@storybook/core/cli'; +import type { SupportedRenderers, Builder } from '@storybook/core/cli'; +import { SupportedLanguage, externalFrameworks } from '@storybook/core/cli'; +import { copyTemplateFiles } from '@storybook/core/cli'; import { configureMain, configurePreview } from './configure'; import type { FrameworkOptions, GeneratorOptions } from './types'; -import { configureEslintPlugin, extractEslintInfo } from '../automigrate/helpers/eslintPlugin'; -import { detectBuilder } from '../detect'; +import { configureEslintPlugin, extractEslintInfo } from '@storybook/core/cli'; +import { detectBuilder } from '@storybook/core/cli'; const logger = console; @@ -394,6 +394,11 @@ export async function baseGenerator( packageManager, language, destination: componentsDestinationPath, + assetsDir: path.join('create-storybook', 'rendererAssets', 'common'), }); } } + +export function getCliDir() { + return dirname(require.resolve('create-storybook/package.json')); +} diff --git a/code/lib/create-storybook/src/generators/configure.test.ts b/code/lib/create-storybook/src/generators/configure.test.ts index d0e593a3c026..2bd92a6790c4 100644 --- a/code/lib/create-storybook/src/generators/configure.test.ts +++ b/code/lib/create-storybook/src/generators/configure.test.ts @@ -1,7 +1,7 @@ import { describe, beforeAll, expect, vi, it } from 'vitest'; import fse from 'fs-extra'; import { dedent } from 'ts-dedent'; -import { SupportedLanguage } from '../project_types'; +import { SupportedLanguage } from '@storybook/core/cli'; import { configureMain, configurePreview } from './configure'; vi.mock('fs-extra'); diff --git a/code/lib/create-storybook/src/generators/configure.ts b/code/lib/create-storybook/src/generators/configure.ts index 73c57dfc8fa3..32fa193125f4 100644 --- a/code/lib/create-storybook/src/generators/configure.ts +++ b/code/lib/create-storybook/src/generators/configure.ts @@ -2,7 +2,7 @@ import fse from 'fs-extra'; import path from 'path'; import { dedent } from 'ts-dedent'; import { logger } from '@storybook/core/node-logger'; -import { externalFrameworks, SupportedLanguage } from '../project_types'; +import { externalFrameworks, SupportedLanguage } from '@storybook/core/cli'; interface ConfigureMainOptions { addons: string[]; diff --git a/code/lib/create-storybook/src/generators/types.ts b/code/lib/create-storybook/src/generators/types.ts index d1478019be0a..c2a6af5615ae 100644 --- a/code/lib/create-storybook/src/generators/types.ts +++ b/code/lib/create-storybook/src/generators/types.ts @@ -1,5 +1,5 @@ -import type { NpmOptions } from '../NpmOptions'; -import type { SupportedLanguage, Builder, ProjectType } from '../project_types'; +import type { NpmOptions } from '@storybook/core/cli'; +import type { SupportedLanguage, Builder, ProjectType } from '@storybook/core/cli'; import type { JsPackageManager, PackageManagerName } from '@storybook/core/common'; import type { FrameworkPreviewParts } from './configure'; diff --git a/code/lib/create-storybook/src/index.ts b/code/lib/create-storybook/src/index.ts new file mode 100644 index 000000000000..605631a36245 --- /dev/null +++ b/code/lib/create-storybook/src/index.ts @@ -0,0 +1 @@ +export { doInitiate as initiate } from './initiate'; diff --git a/code/lib/create-storybook/src/initiate.ts b/code/lib/create-storybook/src/initiate.ts index 747e2c6f6ea7..14fd563c66c1 100644 --- a/code/lib/create-storybook/src/initiate.ts +++ b/code/lib/create-storybook/src/initiate.ts @@ -18,9 +18,9 @@ import type { JsPackageManager } from '@storybook/core/common'; import { dedent } from 'ts-dedent'; import boxen from 'boxen'; import { lt, prerelease } from 'semver'; -import type { Builder } from './project_types'; -import { installableProjectTypes, ProjectType } from './project_types'; -import { detect, isStorybookInstantiated, detectLanguage, detectPnp } from './detect'; +import type { Builder, NpmOptions } from '@storybook/core/cli'; +import { installableProjectTypes, ProjectType } from '@storybook/core/cli'; +import { detect, isStorybookInstantiated, detectLanguage, detectPnp } from '@storybook/core/cli'; import angularGenerator from './generators/ANGULAR'; import emberGenerator from './generators/EMBER'; import reactGenerator from './generators/REACT'; @@ -37,7 +37,6 @@ import qwikGenerator from './generators/QWIK'; import svelteKitGenerator from './generators/SVELTEKIT'; import solidGenerator from './generators/SOLID'; import serverGenerator from './generators/SERVER'; -import type { NpmOptions } from './NpmOptions'; import type { CommandOptions, GeneratorOptions } from './generators/types'; import { currentDirectoryIsEmpty, scaffoldNewProject } from './scaffold-new-project'; diff --git a/code/lib/toolbox/bin/index.cjs b/code/lib/toolbox/bin/index.cjs index f7164c48f330..ce13973e4eb9 100755 --- a/code/lib/toolbox/bin/index.cjs +++ b/code/lib/toolbox/bin/index.cjs @@ -23,4 +23,4 @@ process.once('uncaughtException', (error) => { throw error; }); -require('../dist/generate.cjs'); +require('../dist/bin/index.cjs'); diff --git a/code/lib/toolbox/package.json b/code/lib/toolbox/package.json index cf2fe65fd8af..309066d46a24 100644 --- a/code/lib/toolbox/package.json +++ b/code/lib/toolbox/package.json @@ -1,22 +1,15 @@ { - "name": "storybook", + "name": "@storybook/toolbox", "version": "8.2.0-beta.3", - "description": "Storybook's CLI - install, dev, build, upgrade, and more", - "keywords": [ - "cli", - "generator", - "dev", - "build", - "upgrade" - ], - "homepage": "https://github.com/storybookjs/storybook/tree/next/code/lib/cli", + "description": "Storybook's Toolbox", + "homepage": "https://github.com/storybookjs/storybook/tree/next/code/lib/toolbox", "bugs": { "url": "https://github.com/storybookjs/storybook/issues" }, "repository": { "type": "git", "url": "https://github.com/storybookjs/storybook.git", - "directory": "code/lib/cli" + "directory": "code/lib/toolbox" }, "funding": { "type": "opencollective", @@ -26,258 +19,17 @@ "author": "Storybook Team", "type": "module", "exports": { - ".": { - "types": "./dist/index.d.ts", - "node": "./dist/index.cjs", - "import": "./dist/index.js", - "require": "./dist/index.cjs" - }, "./bin/index.cjs": { "node": "./bin/index.cjs", "require": "./bin/index.cjs" }, - "./core-path": { - "types": "./dist/core-path.d.ts", - "node": "./dist/core-path.cjs", - "import": "./dist/core-path.js", - "require": "./dist/core-path.cjs" - }, - "./package.json": "./package.json", - "./core": { - "types": "./core/index.d.ts", - "import": "./core/index.js", - "require": "./core/index.cjs" - }, - "./internal/node-logger": { - "types": "./core/node-logger/index.d.ts", - "import": "./core/node-logger/index.js", - "require": "./core/node-logger/index.cjs" - }, - "./internal/client-logger": { - "types": "./core/client-logger/index.d.ts", - "import": "./core/client-logger/index.js", - "require": "./core/client-logger/index.cjs" - }, - "./internal/core-server": { - "types": "./core/core-server/index.d.ts", - "import": "./core/core-server/index.js", - "require": "./core/core-server/index.cjs" - }, - "./internal/core-server/presets/common-preset": { - "import": "./core/core-server/presets/common-preset.js", - "require": "./core/core-server/presets/common-preset.cjs" - }, - "./internal/core-server/presets/common-manager": { - "import": "./core/core-server/presets/common-manager.js" - }, - "./internal/core-server/presets/common-override-preset": { - "import": "./core/core-server/presets/common-override-preset.js", - "require": "./core/core-server/presets/common-override-preset.cjs" - }, - "./internal/core-events": { - "types": "./core/core-events/index.d.ts", - "import": "./core/core-events/index.js", - "require": "./core/core-events/index.cjs" - }, - "./internal/manager-errors": { - "types": "./core/manager-errors.d.ts", - "import": "./core/manager-errors.js" - }, - "./internal/preview-errors": { - "types": "./core/preview-errors.d.ts", - "import": "./core/preview-errors.js", - "require": "./core/preview-errors.cjs" - }, - "./internal/server-errors": { - "types": "./core/server-errors.d.ts", - "import": "./core/server-errors.js", - "require": "./core/server-errors.cjs" - }, - "./internal/channels": { - "types": "./core/channels/index.d.ts", - "import": "./core/channels/index.js", - "require": "./core/channels/index.cjs" - }, - "./internal/types": { - "types": "./core/types/index.d.ts", - "import": "./core/types/index.js", - "require": "./core/types/index.cjs" - }, - "./internal/csf-tools": { - "types": "./core/csf-tools/index.d.ts", - "import": "./core/csf-tools/index.js", - "require": "./core/csf-tools/index.cjs" - }, - "./internal/common": { - "types": "./core/common/index.d.ts", - "import": "./core/common/index.js", - "require": "./core/common/index.cjs" - }, - "./internal/builder-manager": { - "types": "./core/builder-manager/index.d.ts", - "import": "./core/builder-manager/index.js", - "require": "./core/builder-manager/index.cjs" - }, - "./internal/telemetry": { - "types": "./core/telemetry/index.d.ts", - "import": "./core/telemetry/index.js", - "require": "./core/telemetry/index.cjs" - }, - "./internal/preview-api": { - "types": "./core/preview-api/index.d.ts", - "import": "./core/preview-api/index.js", - "require": "./core/preview-api/index.cjs" - }, - "./internal/manager-api": { - "types": "./core/manager-api/index.d.ts", - "import": "./core/manager-api/index.js", - "require": "./core/manager-api/index.cjs" - }, - "./internal/router": { - "types": "./core/router/index.d.ts", - "import": "./core/router/index.js", - "require": "./core/router/index.cjs" - }, - "./internal/components": { - "types": "./core/components/index.d.ts", - "import": "./core/components/index.js", - "require": "./core/components/index.cjs" - }, - "./internal/theming": { - "types": "./core/theming/index.d.ts", - "import": "./core/theming/index.js", - "require": "./core/theming/index.cjs" - }, - "./internal/theming/create": { - "types": "./core/theming/create.d.ts", - "import": "./core/theming/create.js", - "require": "./core/theming/create.cjs" - }, - "./internal/docs-tools": { - "types": "./core/docs-tools/index.d.ts", - "import": "./core/docs-tools/index.js", - "require": "./core/docs-tools/index.cjs" - }, - "./internal/manager/globals-module-info": { - "types": "./core/manager/globals-module-info.d.ts", - "import": "./core/manager/globals-module-info.js", - "require": "./core/manager/globals-module-info.cjs" - }, - "./internal/preview/globals": { - "types": "./core/preview/globals.d.ts", - "import": "./core/preview/globals.js", - "require": "./core/preview/globals.cjs" - } - }, - "main": "dist/index.cjs", - "module": "dist/index.js", - "types": "dist/index.d.ts", - "typesVersions": { - "*": { - "internal/*": [ - "./core/index.d.ts" - ], - "internal/builder-manager": [ - "./core/builder-manager/index.d.ts" - ], - "internal/channels": [ - "./core/channels/index.d.ts" - ], - "internal/client-logger": [ - "./core/client-logger/index.d.ts" - ], - "internal/common": [ - "./core/common/index.d.ts" - ], - "internal/components": [ - "./core/components/index.d.ts" - ], - "internal/core-events": [ - "./core/core-events/index.d.ts" - ], - "internal/core-server": [ - "./core/core-server/index.d.ts" - ], - "internal/core-server/presets/common-manager": [ - "./core/core-server/presets/common-manager.d.ts" - ], - "internal/core-server/presets/common-override-preset": [ - "./core/core-server/presets/common-override-preset.d.ts" - ], - "internal/core-server/presets/common-preset": [ - "./core/core-server/presets/common-preset.d.ts" - ], - "internal/csf-tools": [ - "./core/csf-tools/index.d.ts" - ], - "internal/docs-tools": [ - "./core/docs-tools/index.d.ts" - ], - "internal/manager-api": [ - "./core/manager-api/index.d.ts" - ], - "internal/manager-errors": [ - "./core/manager-errors.d.ts" - ], - "internal/manager/globals-module-info": [ - "./core/manager/globals-module-info.d.ts" - ], - "internal/node-logger": [ - "./core/node-logger/index.d.ts" - ], - "internal/preview-api": [ - "./core/preview-api/index.d.ts" - ], - "internal/preview-errors": [ - "./core/preview-errors.d.ts" - ], - "internal/preview/globals": [ - "./core/preview/globals.d.ts" - ], - "internal/router": [ - "./core/router/index.d.ts" - ], - "internal/server-errors": [ - "./core/server-errors.d.ts" - ], - "internal/telemetry": [ - "./core/telemetry/index.d.ts" - ], - "internal/theming": [ - "./core/theming/index.d.ts" - ], - "internal/theming/create": [ - "./core/theming/create.d.ts" - ], - "internal/types": [ - "./core/types/index.d.ts" - ], - "*": [ - "./dist/index.d.ts" - ], - "core-path": [ - "./dist/core-path.d.ts" - ], - "core": [ - "./core/index.d.ts" - ] - } - }, - "bin": { - "getstorybook": "./bin/index.cjs", - "sb": "./bin/index.cjs", - "storybook": "./bin/index.cjs" + "./package.json": "./package.json" }, + "bin": "./bin/index.cjs", "files": [ "bin/**/*", - "core/**/*", "dist/**/*", - "rendererAssets/**/*", - "templates/**/*", "README.md", - "*.cjs", - "*.js", - "*.d.ts", "!src/**/*" ], "scripts": { @@ -290,14 +42,11 @@ "@storybook/codemod": "workspace:*", "@storybook/core": "workspace:*", "@types/semver": "^7.3.4", - "@yarnpkg/fslib": "2.10.3", - "@yarnpkg/libzip": "2.3.0", "chalk": "^4.1.0", "commander": "^6.2.1", + "create-storybook": "workspace:*", "cross-spawn": "^7.0.3", - "detect-indent": "^6.1.0", "envinfo": "^7.7.3", - "execa": "^5.0.0", "fd-package-json": "^1.2.0", "find-up": "^5.0.0", "fs-extra": "^11.1.0", @@ -305,36 +54,28 @@ "globby": "^14.0.1", "jscodeshift": "^0.15.1", "leven": "^3.1.0", - "ora": "^5.4.1", - "prettier": "^3.1.1", "prompts": "^2.4.0", "semver": "^7.3.7", - "strip-json-comments": "^3.0.1", + "storybook": "workspace:*", "tempy": "^3.1.0", "tiny-invariant": "^1.3.1", "ts-dedent": "^2.0.0" }, "devDependencies": { - "@ndelangen/get-tarball": "^3.0.7", "@types/cross-spawn": "^6.0.2", "@types/prompts": "^2.0.9", - "@types/util-deprecate": "^1.0.0", "boxen": "^7.1.1", - "get-npm-tarball-url": "^2.0.3", "slash": "^5.0.0", "strip-ansi": "^7.1.0", - "strip-json-comments": "^3.1.1", "typescript": "^5.3.2" }, "publishConfig": { "access": "public" }, "bundler": { - "pre": "./scripts/update-core-portal.ts", "entries": [ - "./src/generate.ts", - "./src/core-path.ts", - "./src/index.ts" + "./src/index.ts", + "./src/bin/index.ts" ], "platform": "node" }, diff --git a/code/lib/toolbox/project.json b/code/lib/toolbox/project.json index 82cebd8431b3..f40771fc4588 100644 --- a/code/lib/toolbox/project.json +++ b/code/lib/toolbox/project.json @@ -1,5 +1,5 @@ { - "name": "cli", + "name": "toolbox", "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "library", "targets": { diff --git a/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.test.ts b/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.test.ts index 6ecf6a6a12de..5f908d57e831 100644 --- a/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.test.ts @@ -2,8 +2,7 @@ import { describe, beforeEach, afterEach, it, expect, vi } from 'vitest'; import type { StorybookConfig } from '@storybook/core/types'; import type { JsPackageManager } from '@storybook/core/common'; import { angularBuildersMultiproject } from './angular-builders-multiproject'; -import * as helpers from '../../helpers'; -import * as angularHelpers from '../../generators/ANGULAR/helpers'; +import * as helpers from '@storybook/core/cli'; const checkAngularBuilders = async ({ packageManager, @@ -19,13 +18,9 @@ const checkAngularBuilders = async ({ }); }; -vi.mock('../../helpers', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('@storybook/core/cli', async (importOriginal) => ({ + ...(await importOriginal()), isNxProject: vi.fn(), -})); - -vi.mock('../../generators/ANGULAR/helpers', async (importOriginal) => ({ - ...(await importOriginal()), AngularJSON: vi.fn(), })); @@ -100,7 +95,7 @@ describe('is not Nx project', () => { describe('has one Storybook builder defined', () => { beforeEach(() => { // Mock AngularJSON.constructor - vi.mocked(angularHelpers.AngularJSON).mockImplementation( + vi.mocked(helpers.AngularJSON).mockImplementation( () => ({ hasStorybookBuilder: true, @@ -121,7 +116,7 @@ describe('is not Nx project', () => { describe('has one project', () => { beforeEach(() => { // Mock AngularJSON.constructor - vi.mocked(angularHelpers.AngularJSON).mockImplementation( + vi.mocked(helpers.AngularJSON).mockImplementation( () => ({ hasStorybookBuilder: false, @@ -146,7 +141,7 @@ describe('is not Nx project', () => { describe('has multiple projects without root project defined', () => { beforeEach(() => { // Mock AngularJSON.constructor - vi.mocked(angularHelpers.AngularJSON).mockImplementation( + vi.mocked(helpers.AngularJSON).mockImplementation( () => ({ hasStorybookBuilder: false, diff --git a/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.ts b/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.ts index 3f72411be011..ed76c066b526 100644 --- a/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.ts +++ b/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.ts @@ -2,8 +2,7 @@ import { dedent } from 'ts-dedent'; import semver from 'semver'; import chalk from 'chalk'; import type { Fix } from '../types'; -import { isNxProject } from '../../helpers'; -import { AngularJSON } from '../../generators/ANGULAR/helpers'; +import { isNxProject, AngularJSON } from '@storybook/core/cli'; import { getFrameworkPackageName } from '../helpers/mainConfigFile'; interface AngularBuildersMultiprojectRunOptions {} diff --git a/code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts b/code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts index 689e0ea24dff..e2bc46bf1a20 100644 --- a/code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts @@ -1,8 +1,7 @@ import { describe, beforeEach, afterEach, it, expect, vi } from 'vitest'; import type { StorybookConfig } from '@storybook/core/types'; import { angularBuilders } from './angular-builders'; -import * as helpers from '../../helpers'; -import * as angularHelpers from '../../generators/ANGULAR/helpers'; +import * as helpers from '@storybook/core/cli'; import type { JsPackageManager } from '@storybook/core/common'; const checkAngularBuilders = async ({ @@ -21,13 +20,13 @@ const checkAngularBuilders = async ({ }); }; -vi.mock('../../helpers', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('@storybook/core/cli', async (importOriginal) => ({ + ...(await importOriginal()), isNxProject: vi.fn(), })); -vi.mock('../../generators/ANGULAR/helpers', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('@storybook/core/cli', async (importOriginal) => ({ + ...(await importOriginal()), AngularJSON: vi.fn(), })); @@ -85,7 +84,7 @@ describe('is not Nx project', () => { describe('has one Storybook builder defined', () => { beforeEach(() => { // Mock AngularJSON.constructor - vi.mocked(angularHelpers.AngularJSON).mockImplementation( + vi.mocked(helpers.AngularJSON).mockImplementation( () => ({ hasStorybookBuilder: true, @@ -106,7 +105,7 @@ describe('is not Nx project', () => { describe('has multiple projects without root project defined', () => { beforeEach(() => { // Mock AngularJSON.constructor - vi.mocked(angularHelpers.AngularJSON).mockImplementation( + vi.mocked(helpers.AngularJSON).mockImplementation( () => ({ hasStorybookBuilder: false, @@ -132,7 +131,7 @@ describe('is not Nx project', () => { describe('has one project', () => { beforeEach(() => { // Mock AngularJSON.constructor - vi.mocked(angularHelpers.AngularJSON).mockImplementation( + vi.mocked(helpers.AngularJSON).mockImplementation( () => ({ hasStorybookBuilder: false, diff --git a/code/lib/toolbox/src/automigrate/fixes/angular-builders.ts b/code/lib/toolbox/src/automigrate/fixes/angular-builders.ts index e1cc9f5d953a..7266e6513458 100644 --- a/code/lib/toolbox/src/automigrate/fixes/angular-builders.ts +++ b/code/lib/toolbox/src/automigrate/fixes/angular-builders.ts @@ -3,8 +3,7 @@ import type { StorybookConfig } from '@storybook/core/types'; import chalk from 'chalk'; import prompts from 'prompts'; import type { Fix } from '../types'; -import { isNxProject } from '../../helpers'; -import { AngularJSON } from '../../generators/ANGULAR/helpers'; +import { isNxProject, AngularJSON } from '@storybook/core/cli'; import type { JsPackageManager } from '@storybook/core/common'; import { getFrameworkPackageName } from '../helpers/mainConfigFile'; diff --git a/code/lib/toolbox/src/automigrate/fixes/builder-vite.ts b/code/lib/toolbox/src/automigrate/fixes/builder-vite.ts index 5170bb6ff077..25ccb94b1d63 100644 --- a/code/lib/toolbox/src/automigrate/fixes/builder-vite.ts +++ b/code/lib/toolbox/src/automigrate/fixes/builder-vite.ts @@ -6,7 +6,7 @@ import { writeConfig } from '@storybook/core/csf-tools'; import type { Fix } from '../types'; import type { PackageJson } from '@storybook/core/types'; import { updateMainConfig } from '../helpers/mainConfigFile'; -import { getStorybookVersionSpecifier } from '../../helpers'; +import { getStorybookVersionSpecifier } from '@storybook/core/cli'; const logger = console; diff --git a/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.test.ts b/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.test.ts index 7677dccccb47..ef23237dce65 100644 --- a/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.test.ts @@ -5,8 +5,10 @@ import * as fsExtra from 'fs-extra'; import type { PackageJson } from '@storybook/core/common'; import { eslintPlugin } from './eslint-plugin'; import { makePackageManager } from '../helpers/testing-helpers'; +import * as fs from 'node:fs'; vi.mock('fs-extra', async () => import('../../../../../__mocks__/fs-extra')); +vi.mock('fs'); const checkEslint = async ({ packageJson, @@ -39,6 +41,7 @@ const checkEslint = async ({ } `), }); + vi.mocked(fs).existsSync.mockImplementation(() => true); return eslintPlugin.check({ packageManager: makePackageManager(packageJson), mainConfig: {} as any, diff --git a/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.ts b/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.ts index de81e08008d8..596a1b4bd7d1 100644 --- a/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.ts +++ b/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.ts @@ -6,7 +6,7 @@ import { extractEslintInfo, findEslintFile, SUPPORTED_ESLINT_EXTENSIONS, -} from '../helpers/eslintPlugin'; +} from '@storybook/core/cli'; import type { Fix } from '../types'; diff --git a/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.ts b/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.ts index 6ddb801156ff..07e8f90d62a9 100644 --- a/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.ts +++ b/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.ts @@ -4,7 +4,7 @@ import slash from 'slash'; import { commonGlobOptions } from '@storybook/core/common'; import { updateMainConfig } from '../helpers/mainConfigFile'; import type { Fix } from '../types'; -import { getStorybookVersionSpecifier } from '../../helpers'; +import { getStorybookVersionSpecifier } from '@storybook/core/cli'; const logger = console; diff --git a/code/lib/toolbox/src/automigrate/fixes/new-frameworks.ts b/code/lib/toolbox/src/automigrate/fixes/new-frameworks.ts index f8beb1cdd89d..91174a5ef4b7 100644 --- a/code/lib/toolbox/src/automigrate/fixes/new-frameworks.ts +++ b/code/lib/toolbox/src/automigrate/fixes/new-frameworks.ts @@ -6,7 +6,7 @@ import { frameworkPackages, rendererPackages } from '@storybook/core/common'; import type { Preset } from '@storybook/core/types'; import invariant from 'tiny-invariant'; import type { Fix } from '../types'; -import { getStorybookVersionSpecifier } from '../../helpers'; +import { getStorybookVersionSpecifier } from '@storybook/core/cli'; import { getNextjsAddonOptions, detectBuilderInfo, diff --git a/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.ts b/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.ts index ef8c610749d4..0bdc56efe385 100644 --- a/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.ts +++ b/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.ts @@ -1,7 +1,7 @@ import chalk from 'chalk'; import { dedent } from 'ts-dedent'; import type { Fix } from '../types'; -import { getStorybookVersionSpecifier } from '../../helpers'; +import { getStorybookVersionSpecifier } from '@storybook/core/cli'; import { runCodemod } from '@storybook/codemod'; import prompts from 'prompts'; diff --git a/code/lib/toolbox/src/automigrate/fixes/sb-binary.ts b/code/lib/toolbox/src/automigrate/fixes/sb-binary.ts index 09ee16bd5d84..1b8a075cd287 100644 --- a/code/lib/toolbox/src/automigrate/fixes/sb-binary.ts +++ b/code/lib/toolbox/src/automigrate/fixes/sb-binary.ts @@ -1,7 +1,7 @@ import chalk from 'chalk'; import { dedent } from 'ts-dedent'; import type { Fix } from '../types'; -import { getStorybookVersionSpecifier } from '../../helpers'; +import { getStorybookVersionSpecifier } from '@storybook/core/cli'; import type { PackageJsonWithDepsAndDevDeps } from '@storybook/core/common'; interface SbBinaryRunOptions { diff --git a/code/lib/toolbox/src/automigrate/fixes/vite-config-file.ts b/code/lib/toolbox/src/automigrate/fixes/vite-config-file.ts index a842331eb731..ab38f7ccb638 100644 --- a/code/lib/toolbox/src/automigrate/fixes/vite-config-file.ts +++ b/code/lib/toolbox/src/automigrate/fixes/vite-config-file.ts @@ -2,7 +2,7 @@ import { dedent } from 'ts-dedent'; import type { Fix } from '../types'; import findUp from 'find-up'; import { getFrameworkPackageName } from '../helpers/mainConfigFile'; -import { frameworkToRenderer } from '../../helpers'; +import { frameworkToRenderer } from '@storybook/core/cli'; import { frameworkPackages } from '@storybook/core/common'; import path from 'path'; diff --git a/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.test.ts b/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.test.ts index e457ccfcc5ba..1564c382f3bd 100644 --- a/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.test.ts @@ -2,7 +2,7 @@ import { vi, describe, it, expect } from 'vitest'; import type { StorybookConfig } from '@storybook/core/types'; import type { JsPackageManager } from '@storybook/core/common'; import { webpack5CompilerSetup } from './webpack5-compiler-setup'; -import { CoreWebpackCompilers } from '../../project_types'; +import { CoreWebpackCompilers } from '@storybook/core/cli'; const check = async ({ packageManager, diff --git a/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.ts b/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.ts index 3b18ded9fbb3..d269974ab2e0 100644 --- a/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.ts +++ b/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.ts @@ -9,13 +9,13 @@ import { getFrameworkPackageName, updateMainConfig, } from '../helpers/mainConfigFile'; -import { frameworkToDefaultBuilder } from '../../helpers'; +import { frameworkToDefaultBuilder } from '@storybook/core/cli'; import { CoreBuilder, CoreWebpackCompilers, builderNameToCoreBuilder, compilerNameToCoreCompiler, -} from '../../project_types'; +} from '@storybook/core/cli'; import { dedent } from 'ts-dedent'; import chalk from 'chalk'; import { add } from '../../add'; diff --git a/code/lib/toolbox/src/automigrate/fixes/wrap-require.test.ts b/code/lib/toolbox/src/automigrate/fixes/wrap-require.test.ts index d35afeaf0e97..e53b69c73084 100644 --- a/code/lib/toolbox/src/automigrate/fixes/wrap-require.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/wrap-require.test.ts @@ -1,10 +1,10 @@ import type { MockInstance } from 'vitest'; import { describe, it, expect, vi } from 'vitest'; import { wrapRequire } from './wrap-require'; -import * as detect from '../../detect'; +import * as detect from '@storybook/core/cli'; -vi.mock('../../detect', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('@storybook/core/cli', async (importOriginal) => ({ + ...(await importOriginal()), detectPnp: vi.fn(), })); diff --git a/code/lib/toolbox/src/automigrate/fixes/wrap-require.ts b/code/lib/toolbox/src/automigrate/fixes/wrap-require.ts index 829d42ee352f..5191ea63fe75 100644 --- a/code/lib/toolbox/src/automigrate/fixes/wrap-require.ts +++ b/code/lib/toolbox/src/automigrate/fixes/wrap-require.ts @@ -2,7 +2,7 @@ import chalk from 'chalk'; import { dedent } from 'ts-dedent'; import { readConfig } from '@storybook/core/csf-tools'; import type { Fix } from '../types'; -import { detectPnp } from '../../detect'; +import { detectPnp } from '@storybook/core/cli'; import { updateMainConfig } from '../helpers/mainConfigFile'; import { getFieldsForRequireWrapper, diff --git a/code/lib/toolbox/src/automigrate/helpers/mainConfigFile.ts b/code/lib/toolbox/src/automigrate/helpers/mainConfigFile.ts index 05ef4e8aad47..c7377585f6cd 100644 --- a/code/lib/toolbox/src/automigrate/helpers/mainConfigFile.ts +++ b/code/lib/toolbox/src/automigrate/helpers/mainConfigFile.ts @@ -14,7 +14,7 @@ import { dedent } from 'ts-dedent'; import path from 'path'; import type { JsPackageManager } from '@storybook/core/common'; import { getCoercedStorybookVersion } from '@storybook/core/common'; -import { frameworkToRenderer } from '../../helpers'; +import { frameworkToRenderer } from '@storybook/core/cli'; const logger = console; diff --git a/code/lib/toolbox/src/bin/index.ts b/code/lib/toolbox/src/bin/index.ts index 9a842582dcee..79710f4eeada 100644 --- a/code/lib/toolbox/src/bin/index.ts +++ b/code/lib/toolbox/src/bin/index.ts @@ -10,13 +10,13 @@ import { addToGlobalContext, telemetry } from '@storybook/core/telemetry'; import { JsPackageManagerFactory, versions, removeAddon as remove } from '@storybook/core/common'; import { withTelemetry } from '@storybook/core/core-server'; -import { add } from './add'; -import { migrate } from './migrate'; -import { upgrade, type UpgradeOptions } from './upgrade'; -import { sandbox } from './sandbox'; -import { link } from './link'; -import { doAutomigrate } from './automigrate'; -import { doctor } from './doctor'; +import { add } from '../add'; +import { migrate } from '../migrate'; +import { upgrade, type UpgradeOptions } from '../upgrade'; +import { sandbox } from '../sandbox'; +import { link } from '../link'; +import { doAutomigrate } from '../automigrate'; +import { doctor } from '../doctor'; addToGlobalContext('cliVersion', versions.storybook); diff --git a/code/lib/toolbox/src/index.ts b/code/lib/toolbox/src/index.ts index 4dcb8c60afef..e69de29bb2d1 100644 --- a/code/lib/toolbox/src/index.ts +++ b/code/lib/toolbox/src/index.ts @@ -1,5 +0,0 @@ -import { deprecate } from '@storybook/core/node-logger'; - -deprecate( - 'Exports from @storybook/cli are removed. Please import from @storybook/core-common instead.' -); diff --git a/code/lib/toolbox/src/migrate.ts b/code/lib/toolbox/src/migrate.ts index afcb851dd228..7d79cbb6d0b4 100644 --- a/code/lib/toolbox/src/migrate.ts +++ b/code/lib/toolbox/src/migrate.ts @@ -7,7 +7,7 @@ import { import { runFixes } from './automigrate'; import { mdxToCSF } from './automigrate/fixes/mdx-to-csf'; -import { getStorybookVersionSpecifier } from './helpers'; +import { getStorybookVersionSpecifier } from '@storybook/core/cli'; const logger = console; diff --git a/code/lib/toolbox/src/sandbox.ts b/code/lib/toolbox/src/sandbox.ts index 25f712ada798..be42e0b10cdb 100644 --- a/code/lib/toolbox/src/sandbox.ts +++ b/code/lib/toolbox/src/sandbox.ts @@ -13,7 +13,7 @@ import { allTemplates as TEMPLATES } from './sandbox-templates'; import type { PackageManagerName } from '@storybook/core/common'; import { JsPackageManagerFactory } from '@storybook/core/common'; import { versions } from '@storybook/core/common'; -import { doInitiate } from './initiate'; +import { initiate } from 'create-storybook'; const logger = console; @@ -222,7 +222,7 @@ export const sandbox = async ({ const before = process.cwd(); process.chdir(templateDestination); // we run doInitiate, instead of initiate, to avoid sending this init event to telemetry, because it's not a real world project - await doInitiate({ + await initiate({ dev: process.env.CI !== 'true' && process.env.IN_STORYBOOK_SANBOX !== 'true', ...options, }); diff --git a/code/lib/toolbox/src/upgrade.ts b/code/lib/toolbox/src/upgrade.ts index 30866dac64ba..230ed081af24 100644 --- a/code/lib/toolbox/src/upgrade.ts +++ b/code/lib/toolbox/src/upgrade.ts @@ -23,7 +23,7 @@ import { } from '@storybook/core/common'; import { automigrate } from './automigrate/index'; import { autoblock } from './autoblock/index'; -import { hasStorybookDependencies } from './helpers'; +import { hasStorybookDependencies } from '@storybook/core/cli'; type Package = { package: string; diff --git a/code/yarn.lock b/code/yarn.lock index f22ee0dc024f..9a4acaa10748 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5735,6 +5735,7 @@ __metadata: "@emotion/use-insertion-effect-with-fallbacks": "npm:^1.0.1" "@fal-works/esbuild-plugin-global-externals": "npm:^2.1.2" "@ndelangen/fs-extra-unified": "npm:^1.0.3" + "@ndelangen/get-tarball": "npm:^3.0.7" "@popperjs/core": "npm:^2.6.0" "@radix-ui/react-dialog": "npm:^1.0.5" "@radix-ui/react-scroll-area": "npm:^1.0.5" @@ -5760,6 +5761,7 @@ __metadata: "@types/picomatch": "npm:^2.3.0" "@types/prettier": "npm:^3.0.0" "@types/pretty-hrtime": "npm:^1.0.0" + "@types/prompts": "npm:^2.0.9" "@types/qs": "npm:^6" "@types/react-syntax-highlighter": "npm:11.0.5" "@types/react-transition-group": "npm:^4" @@ -5780,6 +5782,7 @@ __metadata: chai: "npm:^4.4.1" chalk: "npm:^5.3.0" cli-table3: "npm:^0.6.1" + commander: "npm:^6.2.1" comment-parser: "npm:^1.4.1" compression: "npm:^1.7.4" copy-to-clipboard: "npm:^3.3.1" @@ -5787,6 +5790,7 @@ __metadata: css: "npm:^3.0.0" deep-object-diff: "npm:^1.1.0" dequal: "npm:^2.0.2" + detect-indent: "npm:^6.1.0" detect-package-manager: "npm:^3.0.2" detect-port: "npm:^1.3.0" diff: "npm:^5.2.0" @@ -5805,12 +5809,14 @@ __metadata: flush-promises: "npm:^1.0.2" fs-extra: "npm:^11.1.0" fuse.js: "npm:^3.6.1" + get-npm-tarball-url: "npm:^2.0.3" glob: "npm:^10.0.0" globby: "npm:^14.0.1" handlebars: "npm:^4.7.7" js-yaml: "npm:^4.1.0" jsdoc-type-pratt-parser: "npm:^4.0.0" lazy-universal-dotenv: "npm:^4.0.0" + leven: "npm:^3.1.0" lodash: "npm:^4.17.21" markdown-to-jsx: "npm:^7.4.5" memoizerific: "npm:^1.11.3" @@ -5841,7 +5847,9 @@ __metadata: semver: "npm:^7.3.7" slash: "npm:^5.0.0" store2: "npm:^2.14.2" + strip-json-comments: "npm:^3.1.1" telejson: "npm:^7.2.0" + tempy: "npm:^3.1.0" tiny-invariant: "npm:^1.3.1" tinyspy: "npm:^2.2.0" ts-dedent: "npm:^2.0.0" @@ -6762,6 +6770,44 @@ __metadata: languageName: unknown linkType: soft +"@storybook/toolbox@workspace:lib/toolbox": + version: 0.0.0-use.local + resolution: "@storybook/toolbox@workspace:lib/toolbox" + dependencies: + "@babel/core": "npm:^7.24.4" + "@babel/types": "npm:^7.24.0" + "@storybook/codemod": "workspace:*" + "@storybook/core": "workspace:*" + "@types/cross-spawn": "npm:^6.0.2" + "@types/prompts": "npm:^2.0.9" + "@types/semver": "npm:^7.3.4" + boxen: "npm:^7.1.1" + chalk: "npm:^4.1.0" + commander: "npm:^6.2.1" + create-storybook: "workspace:*" + cross-spawn: "npm:^7.0.3" + envinfo: "npm:^7.7.3" + fd-package-json: "npm:^1.2.0" + find-up: "npm:^5.0.0" + fs-extra: "npm:^11.1.0" + giget: "npm:^1.0.0" + globby: "npm:^14.0.1" + jscodeshift: "npm:^0.15.1" + leven: "npm:^3.1.0" + prompts: "npm:^2.4.0" + semver: "npm:^7.3.7" + slash: "npm:^5.0.0" + storybook: "workspace:*" + strip-ansi: "npm:^7.1.0" + tempy: "npm:^3.1.0" + tiny-invariant: "npm:^1.3.1" + ts-dedent: "npm:^2.0.0" + typescript: "npm:^5.3.2" + bin: + toolbox: ./bin/index.cjs + languageName: unknown + linkType: soft + "@storybook/types@workspace:*, @storybook/types@workspace:deprecated/types": version: 0.0.0-use.local resolution: "@storybook/types@workspace:deprecated/types" @@ -12104,6 +12150,34 @@ __metadata: languageName: node linkType: hard +"create-storybook@workspace:*, create-storybook@workspace:lib/create-storybook": + version: 0.0.0-use.local + resolution: "create-storybook@workspace:lib/create-storybook" + dependencies: + "@storybook/core": "workspace:*" + "@types/prompts": "npm:^2.0.9" + "@types/semver": "npm:^7.3.4" + "@types/util-deprecate": "npm:^1.0.0" + boxen: "npm:^7.1.1" + chalk: "npm:^4.1.0" + commander: "npm:^6.2.1" + execa: "npm:^5.0.0" + fd-package-json: "npm:^1.2.0" + find-up: "npm:^5.0.0" + fs-extra: "npm:^11.1.0" + ora: "npm:^5.4.1" + prettier: "npm:^3.1.1" + prompts: "npm:^2.4.0" + semver: "npm:^7.3.7" + storybook: "workspace:*" + tiny-invariant: "npm:^1.3.1" + ts-dedent: "npm:^2.0.0" + typescript: "npm:^5.3.2" + bin: + create-storybook: ./bin/index.cjs + languageName: unknown + linkType: soft + "critters@npm:0.0.22": version: 0.0.22 resolution: "critters@npm:0.0.22" @@ -25622,42 +25696,7 @@ __metadata: version: 0.0.0-use.local resolution: "storybook@workspace:lib/cli" dependencies: - "@babel/core": "npm:^7.24.4" - "@babel/types": "npm:^7.24.0" - "@ndelangen/get-tarball": "npm:^3.0.7" - "@storybook/codemod": "workspace:*" "@storybook/core": "workspace:*" - "@types/cross-spawn": "npm:^6.0.2" - "@types/prompts": "npm:^2.0.9" - "@types/semver": "npm:^7.3.4" - "@types/util-deprecate": "npm:^1.0.0" - "@yarnpkg/fslib": "npm:2.10.3" - "@yarnpkg/libzip": "npm:2.3.0" - boxen: "npm:^7.1.1" - chalk: "npm:^4.1.0" - commander: "npm:^6.2.1" - cross-spawn: "npm:^7.0.3" - detect-indent: "npm:^6.1.0" - envinfo: "npm:^7.7.3" - execa: "npm:^5.0.0" - fd-package-json: "npm:^1.2.0" - find-up: "npm:^5.0.0" - fs-extra: "npm:^11.1.0" - get-npm-tarball-url: "npm:^2.0.3" - giget: "npm:^1.0.0" - globby: "npm:^14.0.1" - jscodeshift: "npm:^0.15.1" - leven: "npm:^3.1.0" - ora: "npm:^5.4.1" - prettier: "npm:^3.1.1" - prompts: "npm:^2.4.0" - semver: "npm:^7.3.7" - slash: "npm:^5.0.0" - strip-ansi: "npm:^7.1.0" - strip-json-comments: "npm:^3.1.1" - tempy: "npm:^3.1.0" - tiny-invariant: "npm:^1.3.1" - ts-dedent: "npm:^2.0.0" typescript: "npm:^5.3.2" bin: getstorybook: ./bin/index.cjs From 93d797a4b42a0dbfa2f7ec5902462485002d3d98 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Wed, 10 Jul 2024 15:09:23 +0200 Subject: [PATCH 09/33] Fix scripts --- scripts/create-nx-sandbox-projects.ts | 2 +- scripts/event-log-checker.ts | 2 +- scripts/get-template.ts | 2 +- scripts/sandbox/generate.ts | 6 +++--- scripts/sandbox/utils/template.ts | 2 +- scripts/task.ts | 2 +- scripts/tasks/sandbox-parts.ts | 6 +++--- scripts/utils/cli-step.ts | 10 +++++++++- 8 files changed, 20 insertions(+), 12 deletions(-) diff --git a/scripts/create-nx-sandbox-projects.ts b/scripts/create-nx-sandbox-projects.ts index 52f7894b5078..8c451ca31caa 100644 --- a/scripts/create-nx-sandbox-projects.ts +++ b/scripts/create-nx-sandbox-projects.ts @@ -1,4 +1,4 @@ -import * as templates from '../code/lib/cli/src/sandbox-templates'; +import * as templates from '../code/lib/toolbox/src/sandbox-templates'; import * as fs from 'fs'; import * as path from 'path'; diff --git a/scripts/event-log-checker.ts b/scripts/event-log-checker.ts index bbcc1aeaf12f..1132283d8120 100644 --- a/scripts/event-log-checker.ts +++ b/scripts/event-log-checker.ts @@ -1,7 +1,7 @@ import chalk from 'chalk'; import assert from 'assert'; import { esMain } from './utils/esmain'; -import { allTemplates } from '../code/lib/cli/src/sandbox-templates'; +import { allTemplates } from '../code/lib/toolbox/src/sandbox-templates'; import versions from '../code/core/src/common/versions'; import { oneWayHash } from '../code/core/src/telemetry/one-way-hash'; diff --git a/scripts/get-template.ts b/scripts/get-template.ts index a04924c4c473..0b67cd0abd88 100644 --- a/scripts/get-template.ts +++ b/scripts/get-template.ts @@ -11,7 +11,7 @@ import { type Cadence, type Template as TTemplate, type SkippableTask, -} from '../code/lib/cli/src/sandbox-templates'; +} from '../code/lib/toolbox/src/sandbox-templates'; import { SANDBOX_DIRECTORY } from './utils/constants'; const sandboxDir = process.env.SANDBOX_ROOT || SANDBOX_DIRECTORY; diff --git a/scripts/sandbox/generate.ts b/scripts/sandbox/generate.ts index 22c50716cc81..baa0a628129b 100755 --- a/scripts/sandbox/generate.ts +++ b/scripts/sandbox/generate.ts @@ -9,7 +9,7 @@ import { esMain } from '../utils/esmain'; import type { OptionValues } from '../utils/options'; import { createOptions } from '../utils/options'; -import { allTemplates as sandboxTemplates } from '../../code/lib/cli/src/sandbox-templates'; +import { allTemplates as sandboxTemplates } from '../../code/lib/toolbox/src/sandbox-templates'; import storybookVersions from '../../code/core/src/common/versions'; import { JsPackageManagerFactory } from '../../code/core/src/common/js-package-manager/JsPackageManagerFactory'; @@ -38,11 +38,11 @@ const sbInit = async ( flags?: string[], debug?: boolean ) => { - const sbCliBinaryPath = join(__dirname, `../../code/lib/cli/bin/index.cjs`); + const sbCliBinaryPath = join(__dirname, `../../code/lib/create-storybook/bin/index.cjs`); console.log(`🎁 Installing storybook`); const env = { STORYBOOK_DISABLE_TELEMETRY: 'true', ...envVars }; const fullFlags = ['--yes', ...(flags || [])]; - await runCommand(`${sbCliBinaryPath} init ${fullFlags.join(' ')}`, { cwd, env }, debug); + await runCommand(`${sbCliBinaryPath} ${fullFlags.join(' ')}`, { cwd, env }, debug); }; const withLocalRegistry = async (packageManager: JsPackageManager, action: () => Promise) => { diff --git a/scripts/sandbox/utils/template.ts b/scripts/sandbox/utils/template.ts index 3694259d66cb..24453b9f4f1b 100644 --- a/scripts/sandbox/utils/template.ts +++ b/scripts/sandbox/utils/template.ts @@ -2,7 +2,7 @@ import { render } from 'ejs'; import { readFile } from 'fs-extra'; import prettier from 'prettier'; import type { GeneratorConfig } from './types'; -import { allTemplates as sandboxTemplates } from '../../../code/lib/cli/src/sandbox-templates'; +import { allTemplates as sandboxTemplates } from '../../../code/lib/toolbox/src/sandbox-templates'; export async function renderTemplate(templatePath: string, templateData: Record) { const template = await readFile(templatePath, 'utf8'); diff --git a/scripts/task.ts b/scripts/task.ts index 80fa759036b4..2d62a71a2ee2 100644 --- a/scripts/task.ts +++ b/scripts/task.ts @@ -32,7 +32,7 @@ import { allTemplates as TEMPLATES, type TemplateKey, type Template, -} from '../code/lib/cli/src/sandbox-templates'; +} from '../code/lib/toolbox/src/sandbox-templates'; import { version } from '../code/package.json'; diff --git a/scripts/tasks/sandbox-parts.ts b/scripts/tasks/sandbox-parts.ts index 90cdd9c43e45..cb0fc67b7557 100644 --- a/scripts/tasks/sandbox-parts.ts +++ b/scripts/tasks/sandbox-parts.ts @@ -29,8 +29,8 @@ import type { ConfigFile } from '../../code/core/src/csf-tools'; import { writeConfig } from '../../code/core/src/csf-tools'; import { filterExistsInCodeDir } from '../utils/filterExistsInCodeDir'; import { findFirstPath } from '../utils/paths'; -import { detectLanguage } from '../../code/lib/cli/src/detect'; -import { SupportedLanguage } from '../../code/lib/cli/src/project_types'; +import { detectLanguage } from '../../code/core/src/cli/detect'; +import { SupportedLanguage } from '../../code/core/src/cli/project_types'; import { updatePackageScripts } from '../utils/package-json'; import { addPreviewAnnotations, readMainConfig } from '../utils/main-js'; import { @@ -41,7 +41,7 @@ import { import { workspacePath } from '../utils/workspace'; import { babelParse } from '../../code/core/src/csf-tools/babelParse'; import { CODE_DIRECTORY, REPROS_DIRECTORY } from '../utils/constants'; -import type { TemplateKey } from '../../code/lib/cli/src/sandbox-templates'; +import type { TemplateKey } from '../../code/lib/toolbox/src/sandbox-templates'; import { isFunction } from 'lodash'; const logger = console; diff --git a/scripts/utils/cli-step.ts b/scripts/utils/cli-step.ts index 76e6f4f0498a..2ceb6f867443 100644 --- a/scripts/utils/cli-step.ts +++ b/scripts/utils/cli-step.ts @@ -5,6 +5,8 @@ import { exec } from './exec'; const require = createRequire(import.meta.url); const cliExecutable = require.resolve('../../code/lib/cli/bin/index.cjs'); +const toolboxExecutable = require.resolve('../../code/lib/toolbox/bin/index.cjs'); +const createStorybookExecutable = require.resolve('../../code/lib/create-storybook/bin/index.cjs'); export type CLIStep = { command: string; @@ -83,7 +85,13 @@ export async function executeCLIStep( if (cliStep.hasArgument && !options.argument) throw new Error(`Argument required for ${cliStep.command} command.`); - const prefix = `node ${cliExecutable} ${cliStep.command}`; + const cliCommand = cliStep.command; + + const prefix = ['dev', 'build'].includes(cliCommand) + ? `node ${cliExecutable} ${cliCommand}` + : cliCommand === 'init' + ? `node ${createStorybookExecutable} ${cliCommand}` + : `node ${toolboxExecutable} ${cliCommand}`; const command = getCommand( cliStep.hasArgument ? `${prefix} ${options.argument}` : prefix, cliStep.options, From d9144630807e5dcf13c14235ff7f23ac7b0bb376 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Wed, 10 Jul 2024 15:31:29 +0200 Subject: [PATCH 10/33] Fix semver --- code/core/package.json | 4 ++-- code/core/src/common/versions.ts | 4 ++-- code/yarn.lock | 20 ++++++++++++++++++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/code/core/package.json b/code/core/package.json index 37d17b093b90..02fa7722b5dd 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -262,6 +262,7 @@ "express": "^4.19.2", "process": "^0.11.10", "recast": "^0.23.5", + "semver": "^7.6.2", "tempy": "^3.1.0", "util": "^0.12.4", "ws": "^8.2.3" @@ -310,7 +311,7 @@ "@types/qs": "^6", "@types/react-syntax-highlighter": "11.0.5", "@types/react-transition-group": "^4", - "@types/semver": "^7.3.4", + "@types/semver": "^7.5.8", "@types/ws": "^8", "@vitest/utils": "^1.3.1", "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10", @@ -385,7 +386,6 @@ "react-transition-group": "^4.4.5", "require-from-string": "^2.0.2", "resolve-from": "^5.0.0", - "semver": "^7.3.7", "slash": "^5.0.0", "store2": "^2.14.2", "strip-json-comments": "^3.1.1", diff --git a/code/core/src/common/versions.ts b/code/core/src/common/versions.ts index db0154177c98..6abad919382b 100644 --- a/code/core/src/common/versions.ts +++ b/code/core/src/common/versions.ts @@ -62,13 +62,13 @@ export default { '@storybook/cli': '8.3.0-alpha.0', '@storybook/codemod': '8.3.0-alpha.0', '@storybook/core-webpack': '8.3.0-alpha.0', - 'create-storybook': '8.3.0-alpha.0', + 'create-storybook': '8.2.0-beta.3', '@storybook/csf-plugin': '8.3.0-alpha.0', '@storybook/instrumenter': '8.3.0-alpha.0', '@storybook/react-dom-shim': '8.3.0-alpha.0', '@storybook/source-loader': '8.3.0-alpha.0', '@storybook/test': '8.3.0-alpha.0', - '@storybook/toolbox': '8.3.0-alpha.0', + '@storybook/toolbox': '8.2.0-beta.3', '@storybook/preset-create-react-app': '8.3.0-alpha.0', '@storybook/preset-html-webpack': '8.3.0-alpha.0', '@storybook/preset-preact-webpack': '8.3.0-alpha.0', diff --git a/code/yarn.lock b/code/yarn.lock index 9ae0cd451322..8ddf0dd68172 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5767,7 +5767,7 @@ __metadata: "@types/qs": "npm:^6" "@types/react-syntax-highlighter": "npm:11.0.5" "@types/react-transition-group": "npm:^4" - "@types/semver": "npm:^7.3.4" + "@types/semver": "npm:^7.5.8" "@types/ws": "npm:^8" "@vitest/utils": "npm:^1.3.1" "@yarnpkg/esbuild-plugin-pnp": "npm:^3.0.0-rc.10" @@ -5846,7 +5846,7 @@ __metadata: recast: "npm:^0.23.5" require-from-string: "npm:^2.0.2" resolve-from: "npm:^5.0.0" - semver: "npm:^7.3.7" + semver: "npm:^7.6.2" slash: "npm:^5.0.0" store2: "npm:^2.14.2" strip-json-comments: "npm:^3.1.1" @@ -7998,6 +7998,13 @@ __metadata: languageName: node linkType: hard +"@types/semver@npm:^7.5.8": + version: 7.5.8 + resolution: "@types/semver@npm:7.5.8" + checksum: 10c0/8663ff927234d1c5fcc04b33062cb2b9fcfbe0f5f351ed26c4d1e1581657deebd506b41ff7fdf89e787e3d33ce05854bc01686379b89e9c49b564c4cfa988efa + languageName: node + linkType: hard + "@types/send@npm:*": version: 0.17.2 resolution: "@types/send@npm:0.17.2" @@ -24905,6 +24912,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.6.2": + version: 7.6.2 + resolution: "semver@npm:7.6.2" + bin: + semver: bin/semver.js + checksum: 10c0/97d3441e97ace8be4b1976433d1c32658f6afaff09f143e52c593bae7eef33de19e3e369c88bd985ce1042c6f441c80c6803078d1de2a9988080b66684cbb30c + languageName: node + linkType: hard + "send@npm:0.18.0": version: 0.18.0 resolution: "send@npm:0.18.0" From 864a2e4f6dcc5d7c0449d6c7773dc8f7c9099868 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Wed, 10 Jul 2024 17:57:11 +0200 Subject: [PATCH 11/33] Fix CLI dir --- code/lib/create-storybook/src/generators/baseGenerator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/lib/create-storybook/src/generators/baseGenerator.ts b/code/lib/create-storybook/src/generators/baseGenerator.ts index a21b316a6060..f8069774cdf4 100644 --- a/code/lib/create-storybook/src/generators/baseGenerator.ts +++ b/code/lib/create-storybook/src/generators/baseGenerator.ts @@ -394,7 +394,7 @@ export async function baseGenerator( packageManager, language, destination: componentsDestinationPath, - assetsDir: path.join('create-storybook', 'rendererAssets', 'common'), + assetsDir: path.join(getCliDir(), 'rendererAssets', 'common'), }); } } From 0c603ff66656c141fd2bd750a51c1023bc72f488 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Wed, 10 Jul 2024 17:59:30 +0200 Subject: [PATCH 12/33] Change imports from @storybook/core to storybook/internal --- .../workflows/trigger-circle-ci-workflow.yml | 3 ++- code/lib/create-storybook/src/bin/index.ts | 4 ++-- .../src/generators/ANGULAR/index.ts | 8 ++++---- .../src/generators/EMBER/index.ts | 2 +- .../src/generators/HTML/index.ts | 2 +- .../src/generators/NEXTJS/index.ts | 2 +- .../src/generators/PREACT/index.ts | 2 +- .../src/generators/REACT/index.ts | 4 ++-- .../src/generators/REACT_NATIVE/index.ts | 8 ++++---- .../src/generators/REACT_SCRIPTS/index.ts | 2 +- .../src/generators/SERVER/index.ts | 2 +- .../src/generators/SOLID/index.ts | 2 +- .../src/generators/SVELTEKIT/index.ts | 2 +- .../src/generators/VUE3/index.ts | 2 +- .../src/generators/WEB-COMPONENTS/index.ts | 2 +- .../src/generators/WEBPACK_REACT/index.ts | 2 +- .../src/generators/baseGenerator.ts | 18 +++++++++--------- .../src/generators/configure.test.ts | 2 +- .../src/generators/configure.ts | 4 ++-- .../create-storybook/src/generators/types.ts | 6 +++--- code/lib/create-storybook/src/initiate.ts | 14 +++++++------- .../src/scaffold-new-project.ts | 4 ++-- code/lib/toolbox/src/add.test.ts | 4 ++-- code/lib/toolbox/src/add.ts | 4 ++-- .../src/autoblock/block-storystorev6.ts | 2 +- code/lib/toolbox/src/autoblock/index.test.ts | 6 +++--- code/lib/toolbox/src/autoblock/index.ts | 2 +- code/lib/toolbox/src/autoblock/types.ts | 4 ++-- .../automigrate/fixes/addon-postcss.test.ts | 4 ++-- .../src/automigrate/fixes/addons-api.test.ts | 4 ++-- .../angular-builders-multiproject.test.ts | 10 +++++----- .../fixes/angular-builders-multiproject.ts | 2 +- .../automigrate/fixes/angular-builders.test.ts | 14 +++++++------- .../src/automigrate/fixes/angular-builders.ts | 6 +++--- .../automigrate/fixes/autodocs-tags.test.ts | 2 +- .../src/automigrate/fixes/autodocs-tags.ts | 4 ++-- .../automigrate/fixes/autodocs-true.test.ts | 2 +- .../src/automigrate/fixes/builder-vite.test.ts | 2 +- .../src/automigrate/fixes/builder-vite.ts | 6 +++--- .../toolbox/src/automigrate/fixes/cra5.test.ts | 4 ++-- .../automigrate/fixes/eslint-plugin.test.ts | 2 +- .../src/automigrate/fixes/eslint-plugin.ts | 2 +- .../src/automigrate/fixes/initial-globals.ts | 4 ++-- .../src/automigrate/fixes/mdx-gfm.test.ts | 2 +- .../toolbox/src/automigrate/fixes/mdx-gfm.ts | 4 ++-- .../src/automigrate/fixes/mdx-to-csf.test.ts | 2 +- .../src/automigrate/fixes/mdx-to-csf.ts | 2 +- .../automigrate/fixes/new-frameworks.test.ts | 4 ++-- .../src/automigrate/fixes/new-frameworks.ts | 6 +++--- .../fixes/prompt-remove-react.test.ts | 4 ++-- .../src/automigrate/fixes/react-docgen.test.ts | 2 +- .../automigrate/fixes/remove-argtypes-regex.ts | 2 +- .../fixes/remove-global-client-apis.test.ts | 2 +- .../fixes/remove-jest-testing-library.test.ts | 4 ++-- .../fixes/remove-jest-testing-library.ts | 2 +- .../src/automigrate/fixes/remove-legacymdx1.ts | 2 +- .../src/automigrate/fixes/sb-binary.test.ts | 2 +- .../toolbox/src/automigrate/fixes/sb-binary.ts | 4 ++-- .../src/automigrate/fixes/sb-scripts.test.ts | 2 +- .../src/automigrate/fixes/sb-scripts.ts | 4 ++-- .../fixes/storyshots-migration.test.ts | 4 ++-- ...rade-storybook-related-dependencies.test.ts | 4 ++-- .../upgrade-storybook-related-dependencies.ts | 4 ++-- .../src/automigrate/fixes/vite-config-file.ts | 4 ++-- .../toolbox/src/automigrate/fixes/vta.test.ts | 2 +- .../toolbox/src/automigrate/fixes/vue3.test.ts | 4 ++-- .../fixes/webpack5-compiler-setup.test.ts | 6 +++--- .../fixes/webpack5-compiler-setup.ts | 8 ++++---- .../src/automigrate/fixes/webpack5.test.ts | 4 ++-- .../automigrate/fixes/wrap-require-utils.ts | 2 +- .../src/automigrate/fixes/wrap-require.test.ts | 6 +++--- .../src/automigrate/fixes/wrap-require.ts | 4 ++-- .../helpers/checkWebpack5Builder.test.ts | 2 +- .../helpers/checkWebpack5Builder.ts | 2 +- .../src/automigrate/helpers/detectRenderer.ts | 4 ++-- .../helpers/getMigrationSummary.test.ts | 4 ++-- .../automigrate/helpers/getMigrationSummary.ts | 2 +- .../src/automigrate/helpers/mainConfigFile.ts | 14 +++++++------- .../helpers/new-frameworks-utils.test.ts | 2 +- .../helpers/new-frameworks-utils.ts | 6 +++--- .../src/automigrate/helpers/testing-helpers.ts | 6 +++--- code/lib/toolbox/src/automigrate/index.test.ts | 6 +++--- code/lib/toolbox/src/automigrate/index.ts | 2 +- code/lib/toolbox/src/automigrate/types.ts | 4 ++-- code/lib/toolbox/src/bin/index.ts | 12 ++++++++---- .../src/doctor/getDuplicatedDepsWarnings.ts | 4 ++-- .../getIncompatibleStorybookPackages.test.ts | 4 ++-- .../doctor/getIncompatibleStorybookPackages.ts | 7 +++++-- .../doctor/getMismatchingVersionsWarning.ts | 4 ++-- code/lib/toolbox/src/doctor/index.ts | 4 ++-- code/lib/toolbox/src/link.ts | 2 +- code/lib/toolbox/src/migrate.ts | 4 ++-- code/lib/toolbox/src/sandbox-templates.ts | 4 ++-- code/lib/toolbox/src/sandbox.ts | 6 +++--- code/lib/toolbox/src/upgrade.test.ts | 12 ++++++------ code/lib/toolbox/src/upgrade.ts | 8 ++++---- code/lib/toolbox/src/warn.test.ts | 4 ++-- code/lib/toolbox/src/warn.ts | 2 +- code/lib/toolbox/src/window.d.ts | 2 +- 99 files changed, 215 insertions(+), 207 deletions(-) diff --git a/.github/workflows/trigger-circle-ci-workflow.yml b/.github/workflows/trigger-circle-ci-workflow.yml index 66bcc0f1a7ce..3104658332ac 100644 --- a/.github/workflows/trigger-circle-ci-workflow.yml +++ b/.github/workflows/trigger-circle-ci-workflow.yml @@ -87,7 +87,8 @@ jobs: -d '{ "branch": "'"$BRANCH"'", "parameters": { - "workflow": "merged" + "workflow": "merged", + "pr": "'"$PR_NUMBER"'", } }' env: diff --git a/code/lib/create-storybook/src/bin/index.ts b/code/lib/create-storybook/src/bin/index.ts index fa1f0ae0fbf7..a3e21bfc4d60 100644 --- a/code/lib/create-storybook/src/bin/index.ts +++ b/code/lib/create-storybook/src/bin/index.ts @@ -1,8 +1,8 @@ import program from 'commander'; import { findPackageSync } from 'fd-package-json'; import invariant from 'tiny-invariant'; -import { addToGlobalContext } from '@storybook/core/telemetry'; -import { versions } from '@storybook/core/common'; +import { addToGlobalContext } from 'storybook/internal/telemetry'; +import { versions } from 'storybook/internal/common'; import type { CommandOptions } from '../generators/types'; import { initiate } from '../initiate'; diff --git a/code/lib/create-storybook/src/generators/ANGULAR/index.ts b/code/lib/create-storybook/src/generators/ANGULAR/index.ts index 4faa0e10bf0b..e7a6ec09e42a 100644 --- a/code/lib/create-storybook/src/generators/ANGULAR/index.ts +++ b/code/lib/create-storybook/src/generators/ANGULAR/index.ts @@ -1,10 +1,10 @@ import { join } from 'path'; -import { commandLog } from '@storybook/core/common'; +import { commandLog } from 'storybook/internal/common'; import { baseGenerator, getCliDir } from '../baseGenerator'; import type { Generator } from '../types'; -import { CoreBuilder } from '@storybook/core/cli'; -import { AngularJSON, compoDocPreviewPrefix, promptForCompoDocs } from '@storybook/core/cli'; -import { copyTemplate } from '@storybook/core/cli'; +import { CoreBuilder } from 'storybook/internal/cli'; +import { AngularJSON, compoDocPreviewPrefix, promptForCompoDocs } from 'storybook/internal/cli'; +import { copyTemplate } from 'storybook/internal/cli'; const generator: Generator<{ projectName: string }> = async ( packageManager, diff --git a/code/lib/create-storybook/src/generators/EMBER/index.ts b/code/lib/create-storybook/src/generators/EMBER/index.ts index b54280e3305f..cd12ca61a4d6 100644 --- a/code/lib/create-storybook/src/generators/EMBER/index.ts +++ b/code/lib/create-storybook/src/generators/EMBER/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '@storybook/core/cli'; +import { CoreBuilder } from 'storybook/internal/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/HTML/index.ts b/code/lib/create-storybook/src/generators/HTML/index.ts index bcef35381d93..541525e7b384 100755 --- a/code/lib/create-storybook/src/generators/HTML/index.ts +++ b/code/lib/create-storybook/src/generators/HTML/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '@storybook/core/cli'; +import { CoreBuilder } from 'storybook/internal/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/NEXTJS/index.ts b/code/lib/create-storybook/src/generators/NEXTJS/index.ts index 8f00c8721eff..fbbbe7b58728 100644 --- a/code/lib/create-storybook/src/generators/NEXTJS/index.ts +++ b/code/lib/create-storybook/src/generators/NEXTJS/index.ts @@ -1,6 +1,6 @@ import { join } from 'path'; import { existsSync } from 'fs'; -import { CoreBuilder } from '@storybook/core/cli'; +import { CoreBuilder } from 'storybook/internal/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/PREACT/index.ts b/code/lib/create-storybook/src/generators/PREACT/index.ts index 83d499745b87..b75293bf3c3d 100644 --- a/code/lib/create-storybook/src/generators/PREACT/index.ts +++ b/code/lib/create-storybook/src/generators/PREACT/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '@storybook/core/cli'; +import { CoreBuilder } from 'storybook/internal/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/REACT/index.ts b/code/lib/create-storybook/src/generators/REACT/index.ts index a8135b8f2df1..b4b2bb1d9479 100644 --- a/code/lib/create-storybook/src/generators/REACT/index.ts +++ b/code/lib/create-storybook/src/generators/REACT/index.ts @@ -1,5 +1,5 @@ -import { detectLanguage } from '@storybook/core/cli'; -import { CoreBuilder, SupportedLanguage } from '@storybook/core/cli'; +import { detectLanguage } from 'storybook/internal/cli'; +import { CoreBuilder, SupportedLanguage } from 'storybook/internal/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/REACT_NATIVE/index.ts b/code/lib/create-storybook/src/generators/REACT_NATIVE/index.ts index 0a16fe6256a9..377c87e94db4 100644 --- a/code/lib/create-storybook/src/generators/REACT_NATIVE/index.ts +++ b/code/lib/create-storybook/src/generators/REACT_NATIVE/index.ts @@ -1,7 +1,7 @@ -import { copyTemplateFiles, getBabelDependencies } from '@storybook/core/cli'; -import type { JsPackageManager } from '@storybook/core/common'; -import type { NpmOptions } from '@storybook/core/cli'; -import { SupportedLanguage } from '@storybook/core/cli'; +import { copyTemplateFiles, getBabelDependencies } from 'storybook/internal/cli'; +import type { JsPackageManager } from 'storybook/internal/common'; +import type { NpmOptions } from 'storybook/internal/cli'; +import { SupportedLanguage } from 'storybook/internal/cli'; const generator = async ( packageManager: JsPackageManager, diff --git a/code/lib/create-storybook/src/generators/REACT_SCRIPTS/index.ts b/code/lib/create-storybook/src/generators/REACT_SCRIPTS/index.ts index c0c43aa55cf5..afd1ff670bf5 100644 --- a/code/lib/create-storybook/src/generators/REACT_SCRIPTS/index.ts +++ b/code/lib/create-storybook/src/generators/REACT_SCRIPTS/index.ts @@ -5,7 +5,7 @@ import { dedent } from 'ts-dedent'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; -import { CoreBuilder } from '@storybook/core/cli'; +import { CoreBuilder } from 'storybook/internal/cli'; const generator: Generator = async (packageManager, npmOptions, options) => { const monorepoRootPath = path.join(__dirname, '..', '..', '..', '..', '..', '..'); diff --git a/code/lib/create-storybook/src/generators/SERVER/index.ts b/code/lib/create-storybook/src/generators/SERVER/index.ts index 834aefcfb077..c46ace7b0e65 100755 --- a/code/lib/create-storybook/src/generators/SERVER/index.ts +++ b/code/lib/create-storybook/src/generators/SERVER/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '@storybook/core/cli'; +import { CoreBuilder } from 'storybook/internal/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/SOLID/index.ts b/code/lib/create-storybook/src/generators/SOLID/index.ts index 761000dd12a6..9f02e6256b45 100644 --- a/code/lib/create-storybook/src/generators/SOLID/index.ts +++ b/code/lib/create-storybook/src/generators/SOLID/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '@storybook/core/cli'; +import { CoreBuilder } from 'storybook/internal/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/SVELTEKIT/index.ts b/code/lib/create-storybook/src/generators/SVELTEKIT/index.ts index 5984b09b35e6..2632f7edcdd0 100644 --- a/code/lib/create-storybook/src/generators/SVELTEKIT/index.ts +++ b/code/lib/create-storybook/src/generators/SVELTEKIT/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '@storybook/core/cli'; +import { CoreBuilder } from 'storybook/internal/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/VUE3/index.ts b/code/lib/create-storybook/src/generators/VUE3/index.ts index 85070ba91125..d7315f6cae39 100644 --- a/code/lib/create-storybook/src/generators/VUE3/index.ts +++ b/code/lib/create-storybook/src/generators/VUE3/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '@storybook/core/cli'; +import { CoreBuilder } from 'storybook/internal/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/WEB-COMPONENTS/index.ts b/code/lib/create-storybook/src/generators/WEB-COMPONENTS/index.ts index 4bdf3b6e457a..49135da7f517 100755 --- a/code/lib/create-storybook/src/generators/WEB-COMPONENTS/index.ts +++ b/code/lib/create-storybook/src/generators/WEB-COMPONENTS/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '@storybook/core/cli'; +import { CoreBuilder } from 'storybook/internal/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/WEBPACK_REACT/index.ts b/code/lib/create-storybook/src/generators/WEBPACK_REACT/index.ts index 3c26f6e23496..7ded9e787096 100644 --- a/code/lib/create-storybook/src/generators/WEBPACK_REACT/index.ts +++ b/code/lib/create-storybook/src/generators/WEBPACK_REACT/index.ts @@ -1,4 +1,4 @@ -import { CoreBuilder } from '@storybook/core/cli'; +import { CoreBuilder } from 'storybook/internal/cli'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; diff --git a/code/lib/create-storybook/src/generators/baseGenerator.ts b/code/lib/create-storybook/src/generators/baseGenerator.ts index f8069774cdf4..f27e25870b13 100644 --- a/code/lib/create-storybook/src/generators/baseGenerator.ts +++ b/code/lib/create-storybook/src/generators/baseGenerator.ts @@ -3,17 +3,17 @@ import fse from 'fs-extra'; import { dedent } from 'ts-dedent'; import ora from 'ora'; import invariant from 'tiny-invariant'; -import type { JsPackageManager } from '@storybook/core/common'; -import { getPackageDetails, versions as packageVersions } from '@storybook/core/common'; -import type { SupportedFrameworks } from '@storybook/core/types'; -import type { NpmOptions } from '@storybook/core/cli'; -import type { SupportedRenderers, Builder } from '@storybook/core/cli'; -import { SupportedLanguage, externalFrameworks } from '@storybook/core/cli'; -import { copyTemplateFiles } from '@storybook/core/cli'; +import type { JsPackageManager } from 'storybook/internal/common'; +import { getPackageDetails, versions as packageVersions } from 'storybook/internal/common'; +import type { SupportedFrameworks } from 'storybook/internal/types'; +import type { NpmOptions } from 'storybook/internal/cli'; +import type { SupportedRenderers, Builder } from 'storybook/internal/cli'; +import { SupportedLanguage, externalFrameworks } from 'storybook/internal/cli'; +import { copyTemplateFiles } from 'storybook/internal/cli'; import { configureMain, configurePreview } from './configure'; import type { FrameworkOptions, GeneratorOptions } from './types'; -import { configureEslintPlugin, extractEslintInfo } from '@storybook/core/cli'; -import { detectBuilder } from '@storybook/core/cli'; +import { configureEslintPlugin, extractEslintInfo } from 'storybook/internal/cli'; +import { detectBuilder } from 'storybook/internal/cli'; const logger = console; diff --git a/code/lib/create-storybook/src/generators/configure.test.ts b/code/lib/create-storybook/src/generators/configure.test.ts index 2bd92a6790c4..b9626fdcdfd5 100644 --- a/code/lib/create-storybook/src/generators/configure.test.ts +++ b/code/lib/create-storybook/src/generators/configure.test.ts @@ -1,7 +1,7 @@ import { describe, beforeAll, expect, vi, it } from 'vitest'; import fse from 'fs-extra'; import { dedent } from 'ts-dedent'; -import { SupportedLanguage } from '@storybook/core/cli'; +import { SupportedLanguage } from 'storybook/internal/cli'; import { configureMain, configurePreview } from './configure'; vi.mock('fs-extra'); diff --git a/code/lib/create-storybook/src/generators/configure.ts b/code/lib/create-storybook/src/generators/configure.ts index 32fa193125f4..791caf3887a3 100644 --- a/code/lib/create-storybook/src/generators/configure.ts +++ b/code/lib/create-storybook/src/generators/configure.ts @@ -1,8 +1,8 @@ import fse from 'fs-extra'; import path from 'path'; import { dedent } from 'ts-dedent'; -import { logger } from '@storybook/core/node-logger'; -import { externalFrameworks, SupportedLanguage } from '@storybook/core/cli'; +import { logger } from 'storybook/internal/node-logger'; +import { externalFrameworks, SupportedLanguage } from 'storybook/internal/cli'; interface ConfigureMainOptions { addons: string[]; diff --git a/code/lib/create-storybook/src/generators/types.ts b/code/lib/create-storybook/src/generators/types.ts index c2a6af5615ae..deade843e206 100644 --- a/code/lib/create-storybook/src/generators/types.ts +++ b/code/lib/create-storybook/src/generators/types.ts @@ -1,6 +1,6 @@ -import type { NpmOptions } from '@storybook/core/cli'; -import type { SupportedLanguage, Builder, ProjectType } from '@storybook/core/cli'; -import type { JsPackageManager, PackageManagerName } from '@storybook/core/common'; +import type { NpmOptions } from 'storybook/internal/cli'; +import type { SupportedLanguage, Builder, ProjectType } from 'storybook/internal/cli'; +import type { JsPackageManager, PackageManagerName } from 'storybook/internal/common'; import type { FrameworkPreviewParts } from './configure'; export type GeneratorOptions = { diff --git a/code/lib/create-storybook/src/initiate.ts b/code/lib/create-storybook/src/initiate.ts index 14fd563c66c1..5d0932926d7b 100644 --- a/code/lib/create-storybook/src/initiate.ts +++ b/code/lib/create-storybook/src/initiate.ts @@ -3,8 +3,8 @@ import findUp from 'find-up'; import chalk from 'chalk'; import prompts from 'prompts'; import { telemetry } from 'storybook/internal/telemetry'; -import { withTelemetry } from '@storybook/core/core-server'; -import { NxProjectDetectedError } from '@storybook/core/server-errors'; +import { withTelemetry } from 'storybook/internal/core-server'; +import { NxProjectDetectedError } from 'storybook/internal/server-errors'; import { versions, HandledError, @@ -12,15 +12,15 @@ import { commandLog, paddedLog, getProjectRoot, -} from '@storybook/core/common'; -import type { JsPackageManager } from '@storybook/core/common'; +} from 'storybook/internal/common'; +import type { JsPackageManager } from 'storybook/internal/common'; import { dedent } from 'ts-dedent'; import boxen from 'boxen'; import { lt, prerelease } from 'semver'; -import type { Builder, NpmOptions } from '@storybook/core/cli'; -import { installableProjectTypes, ProjectType } from '@storybook/core/cli'; -import { detect, isStorybookInstantiated, detectLanguage, detectPnp } from '@storybook/core/cli'; +import type { Builder, NpmOptions } from 'storybook/internal/cli'; +import { installableProjectTypes, ProjectType } from 'storybook/internal/cli'; +import { detect, isStorybookInstantiated, detectLanguage, detectPnp } from 'storybook/internal/cli'; import angularGenerator from './generators/ANGULAR'; import emberGenerator from './generators/EMBER'; import reactGenerator from './generators/REACT'; diff --git a/code/lib/create-storybook/src/scaffold-new-project.ts b/code/lib/create-storybook/src/scaffold-new-project.ts index eee3fbbe7939..18310892fbc5 100644 --- a/code/lib/create-storybook/src/scaffold-new-project.ts +++ b/code/lib/create-storybook/src/scaffold-new-project.ts @@ -8,9 +8,9 @@ import { dedent } from 'ts-dedent'; import { telemetry } from 'storybook/internal/telemetry'; import { GenerateNewProjectOnInitError } from 'storybook/internal/server-errors'; -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; -import type { PackageManagerName } from '@storybook/core/common'; +import type { PackageManagerName } from 'storybook/internal/common'; import type { CommandOptions } from './generators/types'; type CoercedPackageManagerName = 'npm' | 'yarn' | 'pnpm'; diff --git a/code/lib/toolbox/src/add.test.ts b/code/lib/toolbox/src/add.test.ts index fc0f0c5105ab..c2436982c521 100644 --- a/code/lib/toolbox/src/add.test.ts +++ b/code/lib/toolbox/src/add.test.ts @@ -25,7 +25,7 @@ const MockedConsole = { error: vi.fn(), } as any as Console; -vi.mock('@storybook/core/csf-tools', () => { +vi.mock('storybook/internal/csf-tools', () => { return { readConfig: vi.fn(() => MockedConfig), writeConfig: vi.fn(), @@ -34,7 +34,7 @@ vi.mock('@storybook/core/csf-tools', () => { vi.mock('./postinstallAddon', () => { return MockedPostInstall; }); -vi.mock('@storybook/core/common', () => { +vi.mock('storybook/internal/common', () => { return { getStorybookInfo: vi.fn(() => ({ mainConfig: {}, configDir: '' })), serverRequire: vi.fn(() => ({})), diff --git a/code/lib/toolbox/src/add.ts b/code/lib/toolbox/src/add.ts index 14994d62afcf..11a14d8e0dfb 100644 --- a/code/lib/toolbox/src/add.ts +++ b/code/lib/toolbox/src/add.ts @@ -5,8 +5,8 @@ import { getCoercedStorybookVersion, type PackageManagerName, versions, -} from '@storybook/core/common'; -import { readConfig, writeConfig } from '@storybook/core/csf-tools'; +} from 'storybook/internal/common'; +import { readConfig, writeConfig } from 'storybook/internal/csf-tools'; import { isAbsolute, join } from 'path'; import SemVer from 'semver'; import { dedent } from 'ts-dedent'; diff --git a/code/lib/toolbox/src/autoblock/block-storystorev6.ts b/code/lib/toolbox/src/autoblock/block-storystorev6.ts index 819d2adb8dcc..261b3dd0e5fd 100644 --- a/code/lib/toolbox/src/autoblock/block-storystorev6.ts +++ b/code/lib/toolbox/src/autoblock/block-storystorev6.ts @@ -1,6 +1,6 @@ import { createBlocker } from './types'; import { dedent } from 'ts-dedent'; -import type { StorybookConfigRaw } from '@storybook/core/types'; +import type { StorybookConfigRaw } from 'storybook/internal/types'; import chalk from 'chalk'; export const blocker = createBlocker({ diff --git a/code/lib/toolbox/src/autoblock/index.test.ts b/code/lib/toolbox/src/autoblock/index.test.ts index a59263b8491d..8a7361f451ce 100644 --- a/code/lib/toolbox/src/autoblock/index.test.ts +++ b/code/lib/toolbox/src/autoblock/index.test.ts @@ -1,8 +1,8 @@ import { expect, test, vi } from 'vitest'; import { autoblock } from './index'; -import { JsPackageManagerFactory } from '@storybook/core/common'; +import { JsPackageManagerFactory } from 'storybook/internal/common'; import { createBlocker } from './types'; -import { logger as loggerRaw } from '@storybook/core/node-logger'; +import { logger as loggerRaw } from 'storybook/internal/node-logger'; import stripAnsi from 'strip-ansi'; vi.mock('node:fs/promises', async (importOriginal) => ({ @@ -12,7 +12,7 @@ vi.mock('node:fs/promises', async (importOriginal) => ({ vi.mock('boxen', () => ({ default: vi.fn((x) => x), })); -vi.mock('@storybook/core/node-logger', () => ({ +vi.mock('storybook/internal/node-logger', () => ({ logger: { info: vi.fn(), line: vi.fn(), diff --git a/code/lib/toolbox/src/autoblock/index.ts b/code/lib/toolbox/src/autoblock/index.ts index 961de58dca25..adb2232932c4 100644 --- a/code/lib/toolbox/src/autoblock/index.ts +++ b/code/lib/toolbox/src/autoblock/index.ts @@ -1,5 +1,5 @@ import type { AutoblockOptions, Blocker } from './types'; -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; import chalk from 'chalk'; import boxen from 'boxen'; diff --git a/code/lib/toolbox/src/autoblock/types.ts b/code/lib/toolbox/src/autoblock/types.ts index a3e7fe12da36..916af12818b8 100644 --- a/code/lib/toolbox/src/autoblock/types.ts +++ b/code/lib/toolbox/src/autoblock/types.ts @@ -1,5 +1,5 @@ -import type { JsPackageManager, PackageJson } from '@storybook/core/common'; -import type { StorybookConfig } from '@storybook/core/types'; +import type { JsPackageManager, PackageJson } from 'storybook/internal/common'; +import type { StorybookConfig } from 'storybook/internal/types'; export interface AutoblockOptions { packageManager: JsPackageManager; diff --git a/code/lib/toolbox/src/automigrate/fixes/addon-postcss.test.ts b/code/lib/toolbox/src/automigrate/fixes/addon-postcss.test.ts index 88ce6039e8b9..ec54fe573286 100644 --- a/code/lib/toolbox/src/automigrate/fixes/addon-postcss.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/addon-postcss.test.ts @@ -1,6 +1,6 @@ import { addonPostCSS } from './addon-postcss'; -import type { StorybookConfig } from '@storybook/core/types'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { StorybookConfig } from 'storybook/internal/types'; +import type { JsPackageManager } from 'storybook/internal/common'; import { expect, describe, it } from 'vitest'; const checkAddonPostCSS = async ({ diff --git a/code/lib/toolbox/src/automigrate/fixes/addons-api.test.ts b/code/lib/toolbox/src/automigrate/fixes/addons-api.test.ts index 0709a27dbfcb..3aebd02efd0f 100644 --- a/code/lib/toolbox/src/automigrate/fixes/addons-api.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/addons-api.test.ts @@ -1,6 +1,6 @@ import { addonsAPI } from './addons-api'; -import type { StorybookConfig } from '@storybook/core/types'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { StorybookConfig } from 'storybook/internal/types'; +import type { JsPackageManager } from 'storybook/internal/common'; import { expect, describe, it } from 'vitest'; const checkAddonsAPI = async ({ diff --git a/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.test.ts b/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.test.ts index 5f908d57e831..f48c01bdd5bd 100644 --- a/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.test.ts @@ -1,8 +1,8 @@ import { describe, beforeEach, afterEach, it, expect, vi } from 'vitest'; -import type { StorybookConfig } from '@storybook/core/types'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { StorybookConfig } from 'storybook/internal/types'; +import type { JsPackageManager } from 'storybook/internal/common'; import { angularBuildersMultiproject } from './angular-builders-multiproject'; -import * as helpers from '@storybook/core/cli'; +import * as helpers from 'storybook/internal/cli'; const checkAngularBuilders = async ({ packageManager, @@ -18,8 +18,8 @@ const checkAngularBuilders = async ({ }); }; -vi.mock('@storybook/core/cli', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('storybook/internal/cli', async (importOriginal) => ({ + ...(await importOriginal()), isNxProject: vi.fn(), AngularJSON: vi.fn(), })); diff --git a/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.ts b/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.ts index ed76c066b526..e9a728d4ac83 100644 --- a/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.ts +++ b/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.ts @@ -2,7 +2,7 @@ import { dedent } from 'ts-dedent'; import semver from 'semver'; import chalk from 'chalk'; import type { Fix } from '../types'; -import { isNxProject, AngularJSON } from '@storybook/core/cli'; +import { isNxProject, AngularJSON } from 'storybook/internal/cli'; import { getFrameworkPackageName } from '../helpers/mainConfigFile'; interface AngularBuildersMultiprojectRunOptions {} diff --git a/code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts b/code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts index e2bc46bf1a20..4b9a308cd678 100644 --- a/code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts @@ -1,8 +1,8 @@ import { describe, beforeEach, afterEach, it, expect, vi } from 'vitest'; -import type { StorybookConfig } from '@storybook/core/types'; +import type { StorybookConfig } from 'storybook/internal/types'; import { angularBuilders } from './angular-builders'; -import * as helpers from '@storybook/core/cli'; -import type { JsPackageManager } from '@storybook/core/common'; +import * as helpers from 'storybook/internal/cli'; +import type { JsPackageManager } from 'storybook/internal/common'; const checkAngularBuilders = async ({ packageManager, @@ -20,13 +20,13 @@ const checkAngularBuilders = async ({ }); }; -vi.mock('@storybook/core/cli', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('storybook/internal/cli', async (importOriginal) => ({ + ...(await importOriginal()), isNxProject: vi.fn(), })); -vi.mock('@storybook/core/cli', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('storybook/internal/cli', async (importOriginal) => ({ + ...(await importOriginal()), AngularJSON: vi.fn(), })); diff --git a/code/lib/toolbox/src/automigrate/fixes/angular-builders.ts b/code/lib/toolbox/src/automigrate/fixes/angular-builders.ts index 7266e6513458..583ce3a20457 100644 --- a/code/lib/toolbox/src/automigrate/fixes/angular-builders.ts +++ b/code/lib/toolbox/src/automigrate/fixes/angular-builders.ts @@ -1,10 +1,10 @@ import { dedent } from 'ts-dedent'; -import type { StorybookConfig } from '@storybook/core/types'; +import type { StorybookConfig } from 'storybook/internal/types'; import chalk from 'chalk'; import prompts from 'prompts'; import type { Fix } from '../types'; -import { isNxProject, AngularJSON } from '@storybook/core/cli'; -import type { JsPackageManager } from '@storybook/core/common'; +import { isNxProject, AngularJSON } from 'storybook/internal/cli'; +import type { JsPackageManager } from 'storybook/internal/common'; import { getFrameworkPackageName } from '../helpers/mainConfigFile'; interface AngularBuildersRunOptions { diff --git a/code/lib/toolbox/src/automigrate/fixes/autodocs-tags.test.ts b/code/lib/toolbox/src/automigrate/fixes/autodocs-tags.test.ts index 799fb14c40f6..144679757e2f 100644 --- a/code/lib/toolbox/src/automigrate/fixes/autodocs-tags.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/autodocs-tags.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest'; -import type { StorybookConfig } from '@storybook/core/types'; +import type { StorybookConfig } from 'storybook/internal/types'; import { autodocsTags } from './autodocs-tags'; const check = async ({ diff --git a/code/lib/toolbox/src/automigrate/fixes/autodocs-tags.ts b/code/lib/toolbox/src/automigrate/fixes/autodocs-tags.ts index b2c83ee23eea..cff6f104ac58 100644 --- a/code/lib/toolbox/src/automigrate/fixes/autodocs-tags.ts +++ b/code/lib/toolbox/src/automigrate/fixes/autodocs-tags.ts @@ -1,7 +1,7 @@ import { dedent } from 'ts-dedent'; import chalk from 'chalk'; -import type { DocsOptions } from '@storybook/core/types'; -import { readConfig, writeConfig } from '@storybook/core/csf-tools'; +import type { DocsOptions } from 'storybook/internal/types'; +import { readConfig, writeConfig } from 'storybook/internal/csf-tools'; import { updateMainConfig } from '../helpers/mainConfigFile'; import type { Fix } from '../types'; diff --git a/code/lib/toolbox/src/automigrate/fixes/autodocs-true.test.ts b/code/lib/toolbox/src/automigrate/fixes/autodocs-true.test.ts index 246cb8e00a50..427a12111fb2 100644 --- a/code/lib/toolbox/src/automigrate/fixes/autodocs-true.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/autodocs-true.test.ts @@ -1,5 +1,5 @@ import { describe, afterEach, it, expect, vi } from 'vitest'; -import type { StorybookConfigRaw, PackageJson } from '@storybook/core/types'; +import type { StorybookConfigRaw, PackageJson } from 'storybook/internal/types'; import { makePackageManager } from '../helpers/testing-helpers'; import { autodocsTrue } from './autodocs-true'; diff --git a/code/lib/toolbox/src/automigrate/fixes/builder-vite.test.ts b/code/lib/toolbox/src/automigrate/fixes/builder-vite.test.ts index 48b48b43de55..4c15622d2212 100644 --- a/code/lib/toolbox/src/automigrate/fixes/builder-vite.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/builder-vite.test.ts @@ -1,5 +1,5 @@ import { describe, afterEach, it, expect, vi } from 'vitest'; -import type { StorybookConfigRaw, PackageJson } from '@storybook/core/types'; +import type { StorybookConfigRaw, PackageJson } from 'storybook/internal/types'; import { makePackageManager } from '../helpers/testing-helpers'; import { builderVite } from './builder-vite'; diff --git a/code/lib/toolbox/src/automigrate/fixes/builder-vite.ts b/code/lib/toolbox/src/automigrate/fixes/builder-vite.ts index 25ccb94b1d63..f6daefed62ec 100644 --- a/code/lib/toolbox/src/automigrate/fixes/builder-vite.ts +++ b/code/lib/toolbox/src/automigrate/fixes/builder-vite.ts @@ -1,12 +1,12 @@ import chalk from 'chalk'; import { dedent } from 'ts-dedent'; -import { writeConfig } from '@storybook/core/csf-tools'; +import { writeConfig } from 'storybook/internal/csf-tools'; import type { Fix } from '../types'; -import type { PackageJson } from '@storybook/core/types'; +import type { PackageJson } from 'storybook/internal/types'; import { updateMainConfig } from '../helpers/mainConfigFile'; -import { getStorybookVersionSpecifier } from '@storybook/core/cli'; +import { getStorybookVersionSpecifier } from 'storybook/internal/cli'; const logger = console; diff --git a/code/lib/toolbox/src/automigrate/fixes/cra5.test.ts b/code/lib/toolbox/src/automigrate/fixes/cra5.test.ts index 5b7ad1efa9dd..5acfb4b59d2b 100644 --- a/code/lib/toolbox/src/automigrate/fixes/cra5.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/cra5.test.ts @@ -1,6 +1,6 @@ import { describe, afterEach, it, expect, vi } from 'vitest'; -import type { StorybookConfigRaw } from '@storybook/core/types'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { StorybookConfigRaw } from 'storybook/internal/types'; +import type { JsPackageManager } from 'storybook/internal/common'; import { cra5 } from './cra5'; const checkCra5 = async ({ diff --git a/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.test.ts b/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.test.ts index ef23237dce65..28dadb9a9cbf 100644 --- a/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.test.ts @@ -2,7 +2,7 @@ import { describe, it, expect, vi } from 'vitest'; import { dedent } from 'ts-dedent'; import * as fsExtra from 'fs-extra'; -import type { PackageJson } from '@storybook/core/common'; +import type { PackageJson } from 'storybook/internal/common'; import { eslintPlugin } from './eslint-plugin'; import { makePackageManager } from '../helpers/testing-helpers'; import * as fs from 'node:fs'; diff --git a/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.ts b/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.ts index 596a1b4bd7d1..4eb2d09cbcc9 100644 --- a/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.ts +++ b/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.ts @@ -6,7 +6,7 @@ import { extractEslintInfo, findEslintFile, SUPPORTED_ESLINT_EXTENSIONS, -} from '@storybook/core/cli'; +} from 'storybook/internal/cli'; import type { Fix } from '../types'; diff --git a/code/lib/toolbox/src/automigrate/fixes/initial-globals.ts b/code/lib/toolbox/src/automigrate/fixes/initial-globals.ts index 0e1e71867350..b629bccaa6b1 100644 --- a/code/lib/toolbox/src/automigrate/fixes/initial-globals.ts +++ b/code/lib/toolbox/src/automigrate/fixes/initial-globals.ts @@ -2,8 +2,8 @@ import { dedent } from 'ts-dedent'; import chalk from 'chalk'; import { readFile, writeFile } from 'fs-extra'; import type { Expression } from '@babel/types'; -import type { ConfigFile } from '@storybook/core/csf-tools'; -import { loadConfig, formatConfig } from '@storybook/core/csf-tools'; +import type { ConfigFile } from 'storybook/internal/csf-tools'; +import { loadConfig, formatConfig } from 'storybook/internal/csf-tools'; import type { Fix } from '../types'; const MIGRATION = diff --git a/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.test.ts b/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.test.ts index 45b504ea01e2..5c00a0ce70d2 100644 --- a/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.test.ts @@ -1,5 +1,5 @@ import { describe, expect, vi, it } from 'vitest'; -import type { StorybookConfig } from '@storybook/core/types'; +import type { StorybookConfig } from 'storybook/internal/types'; import { mdxgfm } from './mdx-gfm'; vi.mock('globby', () => ({ diff --git a/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.ts b/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.ts index 07e8f90d62a9..d65159dede4c 100644 --- a/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.ts +++ b/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.ts @@ -1,10 +1,10 @@ import { dedent } from 'ts-dedent'; import { join } from 'path'; import slash from 'slash'; -import { commonGlobOptions } from '@storybook/core/common'; +import { commonGlobOptions } from 'storybook/internal/common'; import { updateMainConfig } from '../helpers/mainConfigFile'; import type { Fix } from '../types'; -import { getStorybookVersionSpecifier } from '@storybook/core/cli'; +import { getStorybookVersionSpecifier } from 'storybook/internal/cli'; const logger = console; diff --git a/code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.test.ts b/code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.test.ts index 2bf27c5eba2e..03cfa2f941b5 100644 --- a/code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.test.ts @@ -1,6 +1,6 @@ import { describe, afterEach, it, expect, vi } from 'vitest'; -import type { StorybookConfigRaw, PackageJson } from '@storybook/core/types'; +import type { StorybookConfigRaw, PackageJson } from 'storybook/internal/types'; import { ansiRegex } from '../helpers/cleanLog'; import { makePackageManager } from '../helpers/testing-helpers'; import type { BareMdxStoriesGlobRunOptions } from './mdx-to-csf'; diff --git a/code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.ts b/code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.ts index 230167d6d32c..dfffb66f21ef 100644 --- a/code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.ts +++ b/code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.ts @@ -1,6 +1,6 @@ import chalk from 'chalk'; import { dedent } from 'ts-dedent'; -import type { StoriesEntry } from '@storybook/core/types'; +import type { StoriesEntry } from 'storybook/internal/types'; import { updateMainConfig } from '../helpers/mainConfigFile'; import type { Fix } from '../types'; import { runCodemod } from '@storybook/codemod'; diff --git a/code/lib/toolbox/src/automigrate/fixes/new-frameworks.test.ts b/code/lib/toolbox/src/automigrate/fixes/new-frameworks.test.ts index f1f260230306..50e67cc402e6 100644 --- a/code/lib/toolbox/src/automigrate/fixes/new-frameworks.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/new-frameworks.test.ts @@ -1,9 +1,9 @@ import { describe, it, expect, vi } from 'vitest'; -import type { StorybookConfig } from '@storybook/core/types'; +import type { StorybookConfig } from 'storybook/internal/types'; import * as findUp from 'find-up'; import * as rendererHelpers from '../helpers/detectRenderer'; import { newFrameworks } from './new-frameworks'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { JsPackageManager } from 'storybook/internal/common'; vi.mock('find-up'); vi.mock('../helpers/detectRenderer', async (importOriginal) => ({ diff --git a/code/lib/toolbox/src/automigrate/fixes/new-frameworks.ts b/code/lib/toolbox/src/automigrate/fixes/new-frameworks.ts index 91174a5ef4b7..f96ff7bd5e10 100644 --- a/code/lib/toolbox/src/automigrate/fixes/new-frameworks.ts +++ b/code/lib/toolbox/src/automigrate/fixes/new-frameworks.ts @@ -1,12 +1,12 @@ import chalk from 'chalk'; import { dedent } from 'ts-dedent'; import semver from 'semver'; -import { frameworkPackages, rendererPackages } from '@storybook/core/common'; +import { frameworkPackages, rendererPackages } from 'storybook/internal/common'; -import type { Preset } from '@storybook/core/types'; +import type { Preset } from 'storybook/internal/types'; import invariant from 'tiny-invariant'; import type { Fix } from '../types'; -import { getStorybookVersionSpecifier } from '@storybook/core/cli'; +import { getStorybookVersionSpecifier } from 'storybook/internal/cli'; import { getNextjsAddonOptions, detectBuilderInfo, diff --git a/code/lib/toolbox/src/automigrate/fixes/prompt-remove-react.test.ts b/code/lib/toolbox/src/automigrate/fixes/prompt-remove-react.test.ts index 363917ff68c0..bbfbbf7ea4c3 100644 --- a/code/lib/toolbox/src/automigrate/fixes/prompt-remove-react.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/prompt-remove-react.test.ts @@ -1,8 +1,8 @@ import { vi, describe, it, expect } from 'vitest'; -import type { StorybookConfig } from '@storybook/core/types'; +import type { StorybookConfig } from 'storybook/internal/types'; import { glob } from 'glob'; import { removeReactDependency } from './prompt-remove-react'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { JsPackageManager } from 'storybook/internal/common'; const check = async ({ packageManagerContent, diff --git a/code/lib/toolbox/src/automigrate/fixes/react-docgen.test.ts b/code/lib/toolbox/src/automigrate/fixes/react-docgen.test.ts index 98f90c0ea3ef..be963b347d98 100644 --- a/code/lib/toolbox/src/automigrate/fixes/react-docgen.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/react-docgen.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect } from 'vitest'; -import type { StorybookConfig } from '@storybook/core/types'; +import type { StorybookConfig } from 'storybook/internal/types'; import { reactDocgen } from './react-docgen'; const check = async ({ diff --git a/code/lib/toolbox/src/automigrate/fixes/remove-argtypes-regex.ts b/code/lib/toolbox/src/automigrate/fixes/remove-argtypes-regex.ts index 5c0fd4447d04..fc2e4087e72e 100644 --- a/code/lib/toolbox/src/automigrate/fixes/remove-argtypes-regex.ts +++ b/code/lib/toolbox/src/automigrate/fixes/remove-argtypes-regex.ts @@ -2,7 +2,7 @@ import type { Fix } from '../types'; import * as fs from 'node:fs/promises'; import * as babel from '@babel/core'; import type { BabelFile, NodePath } from '@babel/core'; -import { babelParse } from '@storybook/core/csf-tools'; +import { babelParse } from 'storybook/internal/csf-tools'; import { dedent } from 'ts-dedent'; import chalk from 'chalk'; diff --git a/code/lib/toolbox/src/automigrate/fixes/remove-global-client-apis.test.ts b/code/lib/toolbox/src/automigrate/fixes/remove-global-client-apis.test.ts index fad5cf017903..20c94de4f2bb 100644 --- a/code/lib/toolbox/src/automigrate/fixes/remove-global-client-apis.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/remove-global-client-apis.test.ts @@ -3,7 +3,7 @@ import { describe, it, expect, vi } from 'vitest'; import path from 'path'; import * as fsExtra from 'fs-extra'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { JsPackageManager } from 'storybook/internal/common'; import { RemovedAPIs, removedGlobalClientAPIs as migration } from './remove-global-client-apis'; vi.mock('fs-extra', async () => import('../../../../../__mocks__/fs-extra')); diff --git a/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.test.ts b/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.test.ts index 5613f5d0e06e..7f95a5f05494 100644 --- a/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.test.ts @@ -1,7 +1,7 @@ import { expect, it } from 'vitest'; -import type { StorybookConfig } from '@storybook/core/types'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { StorybookConfig } from 'storybook/internal/types'; +import type { JsPackageManager } from 'storybook/internal/common'; import { removeJestTestingLibrary } from './remove-jest-testing-library'; import ansiRegex from 'ansi-regex'; diff --git a/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.ts b/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.ts index 0bdc56efe385..15ae8d08f01a 100644 --- a/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.ts +++ b/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.ts @@ -1,7 +1,7 @@ import chalk from 'chalk'; import { dedent } from 'ts-dedent'; import type { Fix } from '../types'; -import { getStorybookVersionSpecifier } from '@storybook/core/cli'; +import { getStorybookVersionSpecifier } from 'storybook/internal/cli'; import { runCodemod } from '@storybook/codemod'; import prompts from 'prompts'; diff --git a/code/lib/toolbox/src/automigrate/fixes/remove-legacymdx1.ts b/code/lib/toolbox/src/automigrate/fixes/remove-legacymdx1.ts index dc26e16e34de..b19147feaec1 100644 --- a/code/lib/toolbox/src/automigrate/fixes/remove-legacymdx1.ts +++ b/code/lib/toolbox/src/automigrate/fixes/remove-legacymdx1.ts @@ -1,6 +1,6 @@ import { dedent } from 'ts-dedent'; -import { writeConfig } from '@storybook/core/csf-tools'; +import { writeConfig } from 'storybook/internal/csf-tools'; import type { Fix } from '../types'; import { updateMainConfig } from '../helpers/mainConfigFile'; diff --git a/code/lib/toolbox/src/automigrate/fixes/sb-binary.test.ts b/code/lib/toolbox/src/automigrate/fixes/sb-binary.test.ts index e51e919eb88a..d5577b7ab2dd 100644 --- a/code/lib/toolbox/src/automigrate/fixes/sb-binary.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/sb-binary.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect } from 'vitest'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { JsPackageManager } from 'storybook/internal/common'; import { sbBinary } from './sb-binary'; const checkStorybookBinary = async ({ diff --git a/code/lib/toolbox/src/automigrate/fixes/sb-binary.ts b/code/lib/toolbox/src/automigrate/fixes/sb-binary.ts index 1b8a075cd287..6cfc6ad3a442 100644 --- a/code/lib/toolbox/src/automigrate/fixes/sb-binary.ts +++ b/code/lib/toolbox/src/automigrate/fixes/sb-binary.ts @@ -1,8 +1,8 @@ import chalk from 'chalk'; import { dedent } from 'ts-dedent'; import type { Fix } from '../types'; -import { getStorybookVersionSpecifier } from '@storybook/core/cli'; -import type { PackageJsonWithDepsAndDevDeps } from '@storybook/core/common'; +import { getStorybookVersionSpecifier } from 'storybook/internal/cli'; +import type { PackageJsonWithDepsAndDevDeps } from 'storybook/internal/common'; interface SbBinaryRunOptions { storybookVersion: string; diff --git a/code/lib/toolbox/src/automigrate/fixes/sb-scripts.test.ts b/code/lib/toolbox/src/automigrate/fixes/sb-scripts.test.ts index 7ac9abae66ae..d9e8f5cfa3d6 100644 --- a/code/lib/toolbox/src/automigrate/fixes/sb-scripts.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/sb-scripts.test.ts @@ -1,5 +1,5 @@ import { describe, afterEach, it, expect, vi } from 'vitest'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { JsPackageManager } from 'storybook/internal/common'; import { getStorybookScripts, sbScripts } from './sb-scripts'; const checkSbScripts = async ({ diff --git a/code/lib/toolbox/src/automigrate/fixes/sb-scripts.ts b/code/lib/toolbox/src/automigrate/fixes/sb-scripts.ts index ec0fcbc158e4..39e5ae577eba 100644 --- a/code/lib/toolbox/src/automigrate/fixes/sb-scripts.ts +++ b/code/lib/toolbox/src/automigrate/fixes/sb-scripts.ts @@ -1,9 +1,9 @@ import chalk from 'chalk'; import { dedent } from 'ts-dedent'; import semver from 'semver'; -import type { PackageJson } from '@storybook/core/types'; +import type { PackageJson } from 'storybook/internal/types'; import type { Fix } from '../types'; -import type { PackageJsonWithDepsAndDevDeps } from '@storybook/core/common'; +import type { PackageJsonWithDepsAndDevDeps } from 'storybook/internal/common'; interface SbScriptsRunOptions { storybookScripts: Record; diff --git a/code/lib/toolbox/src/automigrate/fixes/storyshots-migration.test.ts b/code/lib/toolbox/src/automigrate/fixes/storyshots-migration.test.ts index 2f1b0e84e03a..860687d12eef 100644 --- a/code/lib/toolbox/src/automigrate/fixes/storyshots-migration.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/storyshots-migration.test.ts @@ -1,8 +1,8 @@ import { describe, afterEach, it, expect, vi } from 'vitest'; -import type { StorybookConfig } from '@storybook/core/types'; +import type { StorybookConfig } from 'storybook/internal/types'; import { storyshotsMigration } from './storyshots-migration'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { JsPackageManager } from 'storybook/internal/common'; const check = async ({ packageManager, diff --git a/code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts b/code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts index cc3671f86c6d..1a5d4182d97e 100644 --- a/code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts @@ -1,6 +1,6 @@ import { describe, afterEach, it, expect, vi } from 'vitest'; -import type { StorybookConfig } from '@storybook/core/types'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { StorybookConfig } from 'storybook/internal/types'; +import type { JsPackageManager } from 'storybook/internal/common'; import * as docsUtils from '../../doctor/getIncompatibleStorybookPackages'; import { upgradeStorybookRelatedDependencies } from './upgrade-storybook-related-dependencies'; diff --git a/code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts b/code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts index 5f9daef551b5..bfcba9f4eacc 100644 --- a/code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts +++ b/code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts @@ -1,8 +1,8 @@ import { dedent } from 'ts-dedent'; import { cyan, yellow } from 'chalk'; import { gt } from 'semver'; -import type { JsPackageManager } from '@storybook/core/common'; -import { isCorePackage } from '@storybook/core/common'; +import type { JsPackageManager } from 'storybook/internal/common'; +import { isCorePackage } from 'storybook/internal/common'; import type { Fix } from '../types'; import { getIncompatibleStorybookPackages } from '../../doctor/getIncompatibleStorybookPackages'; diff --git a/code/lib/toolbox/src/automigrate/fixes/vite-config-file.ts b/code/lib/toolbox/src/automigrate/fixes/vite-config-file.ts index ab38f7ccb638..4dfde34c6d0c 100644 --- a/code/lib/toolbox/src/automigrate/fixes/vite-config-file.ts +++ b/code/lib/toolbox/src/automigrate/fixes/vite-config-file.ts @@ -2,8 +2,8 @@ import { dedent } from 'ts-dedent'; import type { Fix } from '../types'; import findUp from 'find-up'; import { getFrameworkPackageName } from '../helpers/mainConfigFile'; -import { frameworkToRenderer } from '@storybook/core/cli'; -import { frameworkPackages } from '@storybook/core/common'; +import { frameworkToRenderer } from 'storybook/internal/cli'; +import { frameworkPackages } from 'storybook/internal/common'; import path from 'path'; interface ViteConfigFileRunOptions { diff --git a/code/lib/toolbox/src/automigrate/fixes/vta.test.ts b/code/lib/toolbox/src/automigrate/fixes/vta.test.ts index ce8a3118b061..4a919db21686 100644 --- a/code/lib/toolbox/src/automigrate/fixes/vta.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/vta.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest'; -import type { StorybookConfig } from '@storybook/core/types'; +import type { StorybookConfig } from 'storybook/internal/types'; import { vta } from './vta'; const check = async ({ diff --git a/code/lib/toolbox/src/automigrate/fixes/vue3.test.ts b/code/lib/toolbox/src/automigrate/fixes/vue3.test.ts index cb8b2819969a..bdd7382beacb 100644 --- a/code/lib/toolbox/src/automigrate/fixes/vue3.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/vue3.test.ts @@ -1,6 +1,6 @@ import { describe, afterEach, it, expect, vi } from 'vitest'; -import type { StorybookConfig } from '@storybook/core/types'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { StorybookConfig } from 'storybook/internal/types'; +import type { JsPackageManager } from 'storybook/internal/common'; import { vue3 } from './vue3'; const checkVue3 = async ({ diff --git a/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.test.ts b/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.test.ts index 1564c382f3bd..bd258e10112b 100644 --- a/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.test.ts @@ -1,8 +1,8 @@ import { vi, describe, it, expect } from 'vitest'; -import type { StorybookConfig } from '@storybook/core/types'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { StorybookConfig } from 'storybook/internal/types'; +import type { JsPackageManager } from 'storybook/internal/common'; import { webpack5CompilerSetup } from './webpack5-compiler-setup'; -import { CoreWebpackCompilers } from '@storybook/core/cli'; +import { CoreWebpackCompilers } from 'storybook/internal/cli'; const check = async ({ packageManager, diff --git a/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.ts b/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.ts index d269974ab2e0..ec466fd5fa62 100644 --- a/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.ts +++ b/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.ts @@ -1,6 +1,6 @@ import prompts from 'prompts'; -import type { SupportedFrameworks } from '@storybook/core/types'; -import { frameworkPackages } from '@storybook/core/common'; +import type { SupportedFrameworks } from 'storybook/internal/types'; +import { frameworkPackages } from 'storybook/internal/common'; import type { Fix } from '../types'; import { getAddonNames, @@ -9,13 +9,13 @@ import { getFrameworkPackageName, updateMainConfig, } from '../helpers/mainConfigFile'; -import { frameworkToDefaultBuilder } from '@storybook/core/cli'; +import { frameworkToDefaultBuilder } from 'storybook/internal/cli'; import { CoreBuilder, CoreWebpackCompilers, builderNameToCoreBuilder, compilerNameToCoreCompiler, -} from '@storybook/core/cli'; +} from 'storybook/internal/cli'; import { dedent } from 'ts-dedent'; import chalk from 'chalk'; import { add } from '../../add'; diff --git a/code/lib/toolbox/src/automigrate/fixes/webpack5.test.ts b/code/lib/toolbox/src/automigrate/fixes/webpack5.test.ts index 0155d9cdf9e7..fe4343aaf6c7 100644 --- a/code/lib/toolbox/src/automigrate/fixes/webpack5.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/webpack5.test.ts @@ -1,6 +1,6 @@ import { describe, afterEach, it, expect, vi } from 'vitest'; -import type { StorybookConfig } from '@storybook/core/types'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { StorybookConfig } from 'storybook/internal/types'; +import type { JsPackageManager } from 'storybook/internal/common'; import { webpack5 } from './webpack5'; const checkWebpack5 = async ({ diff --git a/code/lib/toolbox/src/automigrate/fixes/wrap-require-utils.ts b/code/lib/toolbox/src/automigrate/fixes/wrap-require-utils.ts index d7c50e804da2..5199cc54ce3a 100644 --- a/code/lib/toolbox/src/automigrate/fixes/wrap-require-utils.ts +++ b/code/lib/toolbox/src/automigrate/fixes/wrap-require-utils.ts @@ -1,5 +1,5 @@ import * as t from '@babel/types'; -import type { ConfigFile } from '@storybook/core/csf-tools'; +import type { ConfigFile } from 'storybook/internal/csf-tools'; const defaultRequireWrapperName = 'getAbsolutePath'; diff --git a/code/lib/toolbox/src/automigrate/fixes/wrap-require.test.ts b/code/lib/toolbox/src/automigrate/fixes/wrap-require.test.ts index e53b69c73084..b1be414b4c0f 100644 --- a/code/lib/toolbox/src/automigrate/fixes/wrap-require.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/wrap-require.test.ts @@ -1,10 +1,10 @@ import type { MockInstance } from 'vitest'; import { describe, it, expect, vi } from 'vitest'; import { wrapRequire } from './wrap-require'; -import * as detect from '@storybook/core/cli'; +import * as detect from 'storybook/internal/cli'; -vi.mock('@storybook/core/cli', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('storybook/internal/cli', async (importOriginal) => ({ + ...(await importOriginal()), detectPnp: vi.fn(), })); diff --git a/code/lib/toolbox/src/automigrate/fixes/wrap-require.ts b/code/lib/toolbox/src/automigrate/fixes/wrap-require.ts index 5191ea63fe75..d0e532505d01 100644 --- a/code/lib/toolbox/src/automigrate/fixes/wrap-require.ts +++ b/code/lib/toolbox/src/automigrate/fixes/wrap-require.ts @@ -1,8 +1,8 @@ import chalk from 'chalk'; import { dedent } from 'ts-dedent'; -import { readConfig } from '@storybook/core/csf-tools'; +import { readConfig } from 'storybook/internal/csf-tools'; import type { Fix } from '../types'; -import { detectPnp } from '@storybook/core/cli'; +import { detectPnp } from 'storybook/internal/cli'; import { updateMainConfig } from '../helpers/mainConfigFile'; import { getFieldsForRequireWrapper, diff --git a/code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.test.ts b/code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.test.ts index 240e6c4d6386..ad0bbad0a8f9 100644 --- a/code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.test.ts +++ b/code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.test.ts @@ -1,6 +1,6 @@ import type { MockInstance } from 'vitest'; import { describe, beforeEach, afterEach, it, expect, vi } from 'vitest'; -import type { StorybookConfigRaw } from '@storybook/core/types'; +import type { StorybookConfigRaw } from 'storybook/internal/types'; import { checkWebpack5Builder } from './checkWebpack5Builder'; import { getBuilderPackageName } from './mainConfigFile'; diff --git a/code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.ts b/code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.ts index fccb7df3dd4b..ad906629e73d 100644 --- a/code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.ts +++ b/code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.ts @@ -1,7 +1,7 @@ import chalk from 'chalk'; import semver from 'semver'; import { dedent } from 'ts-dedent'; -import type { StorybookConfigRaw } from '@storybook/core/types'; +import type { StorybookConfigRaw } from 'storybook/internal/types'; import { getBuilderPackageName } from './mainConfigFile'; const logger = console; diff --git a/code/lib/toolbox/src/automigrate/helpers/detectRenderer.ts b/code/lib/toolbox/src/automigrate/helpers/detectRenderer.ts index 72b6e9b1bdc8..a1f4e7349bd9 100644 --- a/code/lib/toolbox/src/automigrate/helpers/detectRenderer.ts +++ b/code/lib/toolbox/src/automigrate/helpers/detectRenderer.ts @@ -1,5 +1,5 @@ -import type { PackageJson } from '@storybook/core/types'; -import { rendererPackages } from '@storybook/core/common'; +import type { PackageJson } from 'storybook/internal/types'; +import { rendererPackages } from 'storybook/internal/common'; import prompts from 'prompts'; export const detectRenderer = async (packageJson: PackageJson) => { diff --git a/code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.test.ts b/code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.test.ts index 437c38086fc6..99e225011329 100644 --- a/code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.test.ts +++ b/code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.test.ts @@ -1,7 +1,7 @@ import { describe, expect, vi, it } from 'vitest'; import { getMigrationSummary } from './getMigrationSummary'; import { FixStatus } from '../types'; -import type { InstallationMetadata } from '@storybook/core/common'; +import type { InstallationMetadata } from 'storybook/internal/common'; vi.mock('boxen', () => ({ default: vi.fn((str, { title = '' }) => `${title}\n\n${str.replace(/\x1b\[[0-9;]*[mG]/g, '')}`), @@ -26,7 +26,7 @@ describe('getMigrationSummary', () => { const installationMetadata: InstallationMetadata = { duplicatedDependencies: { '@storybook/instrumenter': ['6.0.0', '7.1.0'], - '@storybook/core/common': ['6.0.0', '7.1.0'], + 'storybook/internal/common': ['6.0.0', '7.1.0'], '@storybook/addon-essentials': ['7.0.0', '7.1.0'], }, dependencies: {}, diff --git a/code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.ts b/code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.ts index 84a8e431cc83..1e5f119901e1 100644 --- a/code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.ts +++ b/code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.ts @@ -1,7 +1,7 @@ import chalk from 'chalk'; import boxen from 'boxen'; import { dedent } from 'ts-dedent'; -import { type InstallationMetadata } from '@storybook/core/common'; +import { type InstallationMetadata } from 'storybook/internal/common'; import type { FixSummary } from '../types'; import { FixStatus } from '../types'; diff --git a/code/lib/toolbox/src/automigrate/helpers/mainConfigFile.ts b/code/lib/toolbox/src/automigrate/helpers/mainConfigFile.ts index c7377585f6cd..cc58c742a2f3 100644 --- a/code/lib/toolbox/src/automigrate/helpers/mainConfigFile.ts +++ b/code/lib/toolbox/src/automigrate/helpers/mainConfigFile.ts @@ -5,16 +5,16 @@ import { frameworkPackages, builderPackages, extractProperFrameworkName, -} from '@storybook/core/common'; -import type { StorybookConfigRaw, StorybookConfig } from '@storybook/core/types'; -import type { ConfigFile } from '@storybook/core/csf-tools'; -import { readConfig, writeConfig as writeConfigFile } from '@storybook/core/csf-tools'; +} from 'storybook/internal/common'; +import type { StorybookConfigRaw, StorybookConfig } from 'storybook/internal/types'; +import type { ConfigFile } from 'storybook/internal/csf-tools'; +import { readConfig, writeConfig as writeConfigFile } from 'storybook/internal/csf-tools'; import chalk from 'chalk'; import { dedent } from 'ts-dedent'; import path from 'path'; -import type { JsPackageManager } from '@storybook/core/common'; -import { getCoercedStorybookVersion } from '@storybook/core/common'; -import { frameworkToRenderer } from '@storybook/core/cli'; +import type { JsPackageManager } from 'storybook/internal/common'; +import { getCoercedStorybookVersion } from 'storybook/internal/common'; +import { frameworkToRenderer } from 'storybook/internal/cli'; const logger = console; diff --git a/code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.test.ts b/code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.test.ts index 090f4da1a8d2..421797768ea9 100644 --- a/code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.test.ts +++ b/code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.test.ts @@ -4,7 +4,7 @@ import { detectBuilderInfo as _getBuilderInfo, getNextjsAddonOptions, } from './new-frameworks-utils'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { JsPackageManager } from 'storybook/internal/common'; vi.mock('find-up'); diff --git a/code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.ts b/code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.ts index d4d6c832eb66..379fe508b3a0 100644 --- a/code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.ts +++ b/code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.ts @@ -1,7 +1,7 @@ -import { frameworkPackages } from '@storybook/core/common'; -import type { Preset, StorybookConfigRaw } from '@storybook/core/types'; +import { frameworkPackages } from 'storybook/internal/common'; +import type { Preset, StorybookConfigRaw } from 'storybook/internal/types'; import findUp from 'find-up'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { JsPackageManager } from 'storybook/internal/common'; import { getBuilderPackageName, getFrameworkPackageName } from './mainConfigFile'; const logger = console; diff --git a/code/lib/toolbox/src/automigrate/helpers/testing-helpers.ts b/code/lib/toolbox/src/automigrate/helpers/testing-helpers.ts index fd9745555de9..557a8ec721d9 100644 --- a/code/lib/toolbox/src/automigrate/helpers/testing-helpers.ts +++ b/code/lib/toolbox/src/automigrate/helpers/testing-helpers.ts @@ -1,13 +1,13 @@ import { vi } from 'vitest'; -import type { JsPackageManager, PackageJson } from '@storybook/core/common'; +import type { JsPackageManager, PackageJson } from 'storybook/internal/common'; vi.mock('./mainConfigFile', async (importOriginal) => ({ ...(await importOriginal()), getStorybookData: vi.fn(), })); -vi.mock('@storybook/core/common', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('storybook/internal/common', async (importOriginal) => ({ + ...(await importOriginal()), loadMainConfig: vi.fn(), })); diff --git a/code/lib/toolbox/src/automigrate/index.test.ts b/code/lib/toolbox/src/automigrate/index.test.ts index b7fc079655cd..7fc524a50e86 100644 --- a/code/lib/toolbox/src/automigrate/index.test.ts +++ b/code/lib/toolbox/src/automigrate/index.test.ts @@ -1,7 +1,7 @@ import { vi, it, expect, describe, beforeEach } from 'vitest'; import { runFixes } from './index'; import type { Fix } from './types'; -import type { JsPackageManager, PackageJsonWithDepsAndDevDeps } from '@storybook/core/common'; +import type { JsPackageManager, PackageJsonWithDepsAndDevDeps } from 'storybook/internal/common'; import { afterEach } from 'node:test'; const check1 = vi.fn(); @@ -38,8 +38,8 @@ const coreCommonMock = vi.hoisted(() => { }; }); -vi.mock('@storybook/core/common', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('storybook/internal/common', async (importOriginal) => ({ + ...(await importOriginal()), loadMainConfig: coreCommonMock.loadMainConfig, })); diff --git a/code/lib/toolbox/src/automigrate/index.ts b/code/lib/toolbox/src/automigrate/index.ts index 809b14995350..0442a246141b 100644 --- a/code/lib/toolbox/src/automigrate/index.ts +++ b/code/lib/toolbox/src/automigrate/index.ts @@ -11,7 +11,7 @@ import { type JsPackageManager, getCoercedStorybookVersion, getStorybookInfo, -} from '@storybook/core/common'; +} from 'storybook/internal/common'; import type { Fix, diff --git a/code/lib/toolbox/src/automigrate/types.ts b/code/lib/toolbox/src/automigrate/types.ts index 8d08dd656b58..bf71f316a105 100644 --- a/code/lib/toolbox/src/automigrate/types.ts +++ b/code/lib/toolbox/src/automigrate/types.ts @@ -1,5 +1,5 @@ -import type { JsPackageManager, PackageManagerName } from '@storybook/core/common'; -import type { StorybookConfigRaw } from '@storybook/core/types'; +import type { JsPackageManager, PackageManagerName } from 'storybook/internal/common'; +import type { StorybookConfigRaw } from 'storybook/internal/types'; export interface CheckOptions { packageManager: JsPackageManager; diff --git a/code/lib/toolbox/src/bin/index.ts b/code/lib/toolbox/src/bin/index.ts index 79710f4eeada..ab7a7f2adc22 100644 --- a/code/lib/toolbox/src/bin/index.ts +++ b/code/lib/toolbox/src/bin/index.ts @@ -5,10 +5,14 @@ import leven from 'leven'; import { findPackageSync } from 'fd-package-json'; import invariant from 'tiny-invariant'; -import { logger } from '@storybook/core/node-logger'; -import { addToGlobalContext, telemetry } from '@storybook/core/telemetry'; -import { JsPackageManagerFactory, versions, removeAddon as remove } from '@storybook/core/common'; -import { withTelemetry } from '@storybook/core/core-server'; +import { logger } from 'storybook/internal/node-logger'; +import { addToGlobalContext, telemetry } from 'storybook/internal/telemetry'; +import { + JsPackageManagerFactory, + versions, + removeAddon as remove, +} from 'storybook/internal/common'; +import { withTelemetry } from 'storybook/internal/core-server'; import { add } from '../add'; import { migrate } from '../migrate'; diff --git a/code/lib/toolbox/src/doctor/getDuplicatedDepsWarnings.ts b/code/lib/toolbox/src/doctor/getDuplicatedDepsWarnings.ts index ecdf7e3f725a..82ac60d04217 100644 --- a/code/lib/toolbox/src/doctor/getDuplicatedDepsWarnings.ts +++ b/code/lib/toolbox/src/doctor/getDuplicatedDepsWarnings.ts @@ -1,6 +1,6 @@ import chalk from 'chalk'; -import { frameworkPackages, rendererPackages } from '@storybook/core/common'; -import type { InstallationMetadata } from '@storybook/core/common'; +import { frameworkPackages, rendererPackages } from 'storybook/internal/common'; +import type { InstallationMetadata } from 'storybook/internal/common'; import { hasMultipleVersions } from './hasMultipleVersions'; export const messageDivider = '\n\n'; diff --git a/code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.test.ts b/code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.test.ts index d6e0ffa4592b..a75041d3d747 100644 --- a/code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.test.ts +++ b/code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.test.ts @@ -5,7 +5,7 @@ import { getIncompatiblePackagesSummary, checkPackageCompatibility, } from './getIncompatibleStorybookPackages'; -import type { JsPackageManager } from '@storybook/core/common'; +import type { JsPackageManager } from 'storybook/internal/common'; vi.mock('chalk', () => { return { @@ -61,7 +61,7 @@ describe('checkPackageCompatibility', () => { name: packageName, version: '1.0.0', dependencies: { - '@storybook/core/common': '8.0.0', + 'storybook/internal/common': '8.0.0', }, }); const result = await checkPackageCompatibility(packageName, { diff --git a/code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.ts b/code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.ts index 5d6e91cf3167..bafd5e6895e0 100644 --- a/code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.ts +++ b/code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.ts @@ -1,8 +1,11 @@ /* eslint-disable local-rules/no-uncategorized-errors */ import chalk from 'chalk'; import semver from 'semver'; -import type { JsPackageManager } from '@storybook/core/common'; -import { JsPackageManagerFactory, versions as storybookCorePackages } from '@storybook/core/common'; +import type { JsPackageManager } from 'storybook/internal/common'; +import { + JsPackageManagerFactory, + versions as storybookCorePackages, +} from 'storybook/internal/common'; export type AnalysedPackage = { packageName: string; diff --git a/code/lib/toolbox/src/doctor/getMismatchingVersionsWarning.ts b/code/lib/toolbox/src/doctor/getMismatchingVersionsWarning.ts index c74267a5e646..4477bb517e55 100644 --- a/code/lib/toolbox/src/doctor/getMismatchingVersionsWarning.ts +++ b/code/lib/toolbox/src/doctor/getMismatchingVersionsWarning.ts @@ -1,7 +1,7 @@ import chalk from 'chalk'; import semver from 'semver'; -import { frameworkPackages, versions as storybookCorePackages } from '@storybook/core/common'; -import type { InstallationMetadata } from '@storybook/core/common'; +import { frameworkPackages, versions as storybookCorePackages } from 'storybook/internal/common'; +import type { InstallationMetadata } from 'storybook/internal/common'; function getPrimaryVersion(name: string | undefined, installationMetadata?: InstallationMetadata) { if (!name) { diff --git a/code/lib/toolbox/src/doctor/index.ts b/code/lib/toolbox/src/doctor/index.ts index 6aab5507b21a..ac395ff9d8b4 100644 --- a/code/lib/toolbox/src/doctor/index.ts +++ b/code/lib/toolbox/src/doctor/index.ts @@ -4,8 +4,8 @@ import { createWriteStream, move, remove } from 'fs-extra'; import { dedent } from 'ts-dedent'; import { join } from 'path'; -import { JsPackageManagerFactory } from '@storybook/core/common'; -import type { PackageManagerName } from '@storybook/core/common'; +import { JsPackageManagerFactory } from 'storybook/internal/common'; +import type { PackageManagerName } from 'storybook/internal/common'; import { getStorybookData } from '../automigrate/helpers/mainConfigFile'; import { cleanLog } from '../automigrate/helpers/cleanLog'; import { getMismatchingVersionsWarnings } from './getMismatchingVersionsWarning'; diff --git a/code/lib/toolbox/src/link.ts b/code/lib/toolbox/src/link.ts index e691aed49c30..d9e112957300 100644 --- a/code/lib/toolbox/src/link.ts +++ b/code/lib/toolbox/src/link.ts @@ -1,7 +1,7 @@ import fse from 'fs-extra'; import path from 'path'; import { sync as spawnSync, spawn as spawnAsync } from 'cross-spawn'; -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; import chalk from 'chalk'; type ExecOptions = Parameters[2]; diff --git a/code/lib/toolbox/src/migrate.ts b/code/lib/toolbox/src/migrate.ts index 7d79cbb6d0b4..36b72ed86b90 100644 --- a/code/lib/toolbox/src/migrate.ts +++ b/code/lib/toolbox/src/migrate.ts @@ -3,11 +3,11 @@ import { JsPackageManagerFactory, getCoercedStorybookVersion, getStorybookInfo, -} from '@storybook/core/common'; +} from 'storybook/internal/common'; import { runFixes } from './automigrate'; import { mdxToCSF } from './automigrate/fixes/mdx-to-csf'; -import { getStorybookVersionSpecifier } from '@storybook/core/cli'; +import { getStorybookVersionSpecifier } from 'storybook/internal/cli'; const logger = console; diff --git a/code/lib/toolbox/src/sandbox-templates.ts b/code/lib/toolbox/src/sandbox-templates.ts index 30773df41ea6..a95c4ef1daf9 100644 --- a/code/lib/toolbox/src/sandbox-templates.ts +++ b/code/lib/toolbox/src/sandbox-templates.ts @@ -1,5 +1,5 @@ -import type { StoriesEntry, StorybookConfigRaw } from '@storybook/core/types'; -import type { ConfigFile } from '@storybook/core/csf-tools'; +import type { StoriesEntry, StorybookConfigRaw } from 'storybook/internal/types'; +import type { ConfigFile } from 'storybook/internal/csf-tools'; export type SkippableTask = | 'smoke-test' diff --git a/code/lib/toolbox/src/sandbox.ts b/code/lib/toolbox/src/sandbox.ts index be42e0b10cdb..72a6f9edf333 100644 --- a/code/lib/toolbox/src/sandbox.ts +++ b/code/lib/toolbox/src/sandbox.ts @@ -10,9 +10,9 @@ import invariant from 'tiny-invariant'; import { lt, prerelease } from 'semver'; import type { Template, TemplateKey } from './sandbox-templates'; import { allTemplates as TEMPLATES } from './sandbox-templates'; -import type { PackageManagerName } from '@storybook/core/common'; -import { JsPackageManagerFactory } from '@storybook/core/common'; -import { versions } from '@storybook/core/common'; +import type { PackageManagerName } from 'storybook/internal/common'; +import { JsPackageManagerFactory } from 'storybook/internal/common'; +import { versions } from 'storybook/internal/common'; import { initiate } from 'create-storybook'; const logger = console; diff --git a/code/lib/toolbox/src/upgrade.test.ts b/code/lib/toolbox/src/upgrade.test.ts index 7c64dc748393..9e8adc42724c 100644 --- a/code/lib/toolbox/src/upgrade.test.ts +++ b/code/lib/toolbox/src/upgrade.test.ts @@ -1,13 +1,13 @@ import { describe, expect, it, vi } from 'vitest'; -import * as sbcc from '@storybook/core/common'; +import * as sbcc from 'storybook/internal/common'; import { UpgradeStorybookToLowerVersionError } from 'storybook/internal/server-errors'; import { doUpgrade, getStorybookVersion } from './upgrade'; -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; const findInstallationsMock = vi.fn>(); -vi.mock('@storybook/core/telemetry'); -vi.mock('@storybook/core/common', async (importOriginal) => { +vi.mock('storybook/internal/telemetry'); +vi.mock('storybook/internal/common', async (importOriginal) => { const originalModule = (await importOriginal()) as typeof sbcc; return { ...originalModule, @@ -32,8 +32,8 @@ vi.mock('@storybook/core/common', async (importOriginal) => { describe.each([ ['│ │ │ ├── @babel/code-frame@7.10.3 deduped', null], [ - '│ ├── "@storybook/core/theming@6.0.0-beta.37 extraneous', - { package: '@storybook/core/theming', version: '6.0.0-beta.37' }, + '│ ├── "storybook/internal/theming@6.0.0-beta.37 extraneous', + { package: 'storybook/internal/theming', version: '6.0.0-beta.37' }, ], [ '├─┬ @storybook/preset-create-react-app@3.1.2', diff --git a/code/lib/toolbox/src/upgrade.ts b/code/lib/toolbox/src/upgrade.ts index 230ed081af24..af8d6fb5f8b5 100644 --- a/code/lib/toolbox/src/upgrade.ts +++ b/code/lib/toolbox/src/upgrade.ts @@ -1,7 +1,7 @@ import { sync as spawnSync } from 'cross-spawn'; import { telemetry } from 'storybook/internal/telemetry'; import semver, { eq, lt, prerelease } from 'semver'; -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; import { withTelemetry } from 'storybook/internal/core-server'; import { UpgradeStorybookInWrongWorkingDirectory, @@ -13,17 +13,17 @@ import { import chalk from 'chalk'; import { dedent } from 'ts-dedent'; import boxen from 'boxen'; -import type { JsPackageManager, PackageManagerName } from '@storybook/core/common'; +import type { JsPackageManager, PackageManagerName } from 'storybook/internal/common'; import { isCorePackage, versions, getStorybookInfo, loadMainConfig, JsPackageManagerFactory, -} from '@storybook/core/common'; +} from 'storybook/internal/common'; import { automigrate } from './automigrate/index'; import { autoblock } from './autoblock/index'; -import { hasStorybookDependencies } from '@storybook/core/cli'; +import { hasStorybookDependencies } from 'storybook/internal/cli'; type Package = { package: string; diff --git a/code/lib/toolbox/src/warn.test.ts b/code/lib/toolbox/src/warn.test.ts index 365847b73d42..ceda21a10089 100644 --- a/code/lib/toolbox/src/warn.test.ts +++ b/code/lib/toolbox/src/warn.test.ts @@ -1,8 +1,8 @@ import { describe, beforeEach, it, expect, vi } from 'vitest'; -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; import { warn } from './warn'; -vi.mock('@storybook/core/node-logger'); +vi.mock('storybook/internal/node-logger'); const mocks = vi.hoisted(() => { return { diff --git a/code/lib/toolbox/src/warn.ts b/code/lib/toolbox/src/warn.ts index 4b75a924814c..ef995d87ef76 100644 --- a/code/lib/toolbox/src/warn.ts +++ b/code/lib/toolbox/src/warn.ts @@ -1,4 +1,4 @@ -import { logger } from '@storybook/core/node-logger'; +import { logger } from 'storybook/internal/node-logger'; interface Options { hasTSDependency: boolean; diff --git a/code/lib/toolbox/src/window.d.ts b/code/lib/toolbox/src/window.d.ts index 35dfceecddb1..91fe506c5490 100644 --- a/code/lib/toolbox/src/window.d.ts +++ b/code/lib/toolbox/src/window.d.ts @@ -1,4 +1,4 @@ -import type { Renderer } from '@storybook/core/types'; +import type { Renderer } from 'storybook/internal/types'; import type { StoryStore } from 'storybook/internal/preview-api'; declare global { From 3006caa9634648eaf2a6f9fdff41d415b47f3be5 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Wed, 10 Jul 2024 18:05:25 +0200 Subject: [PATCH 13/33] Fix lint --- code/core/src/cli/angular/helpers.ts | 2 +- code/core/src/cli/helpers.test.ts | 2 +- code/core/src/cli/helpers.ts | 10 +++++----- .../create-storybook/src/generators/baseGenerator.ts | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/core/src/cli/angular/helpers.ts b/code/core/src/cli/angular/helpers.ts index d4ab56b67a62..9d651fa60cae 100644 --- a/code/core/src/cli/angular/helpers.ts +++ b/code/core/src/cli/angular/helpers.ts @@ -2,7 +2,7 @@ import fs from 'fs'; import { join } from 'path'; import prompts from 'prompts'; import { dedent } from 'ts-dedent'; -import { MissingAngularJsonError } from 'storybook/internal/server-errors'; +import { MissingAngularJsonError } from '@storybook/core/server-errors'; import boxen from 'boxen'; import { logger } from '@storybook/core/node-logger'; diff --git a/code/core/src/cli/helpers.test.ts b/code/core/src/cli/helpers.test.ts index 4eed1366df1f..9464c8551a9f 100644 --- a/code/core/src/cli/helpers.test.ts +++ b/code/core/src/cli/helpers.test.ts @@ -122,7 +122,7 @@ describe('Helpers', () => { renderer: 'react', language, packageManager: packageManagerMock, - assetsDir: normalizePath('create-storybook/rendererAssets/common'), + commonAssetsDir: normalizePath('create-storybook/rendererAssets/common'), }); expect(fse.copy).toHaveBeenNthCalledWith( diff --git a/code/core/src/cli/helpers.ts b/code/core/src/cli/helpers.ts index 0dfdf79b255b..db54fe4e5ead 100644 --- a/code/core/src/cli/helpers.ts +++ b/code/core/src/cli/helpers.ts @@ -127,7 +127,7 @@ type CopyTemplateFilesOptions = { packageManager: JsPackageManager; renderer: SupportedFrameworks | SupportedRenderers; language: SupportedLanguage; - assetsDir?: string; + commonAssetsDir?: string; destination?: string; }; @@ -163,7 +163,7 @@ export async function copyTemplateFiles({ renderer, language, destination, - assetsDir, + commonAssetsDir, }: CopyTemplateFilesOptions) { const languageFolderMapping: Record = { // keeping this for backwards compatibility in case community packages are using it @@ -212,14 +212,14 @@ export async function copyTemplateFiles({ }; const destinationPath = destination ?? (await targetPath()); - if (assetsDir) { - await fse.copy(assetsDir, destinationPath, { + if (commonAssetsDir) { + await fse.copy(commonAssetsDir, destinationPath, { overwrite: true, }); } await fse.copy(await templatePath(), destinationPath, { overwrite: true }); - if (assetsDir) { + if (commonAssetsDir) { const rendererType = frameworkToRenderer[renderer] || 'react'; await adjustTemplate(join(destinationPath, 'Configure.mdx'), { renderer: rendererType }); } diff --git a/code/lib/create-storybook/src/generators/baseGenerator.ts b/code/lib/create-storybook/src/generators/baseGenerator.ts index f27e25870b13..57631d3f7245 100644 --- a/code/lib/create-storybook/src/generators/baseGenerator.ts +++ b/code/lib/create-storybook/src/generators/baseGenerator.ts @@ -394,7 +394,7 @@ export async function baseGenerator( packageManager, language, destination: componentsDestinationPath, - assetsDir: path.join(getCliDir(), 'rendererAssets', 'common'), + commonAssetsDir: path.join(getCliDir(), 'rendererAssets', 'common'), }); } } From c31b2497b6589686f10c376217a12610de60cd1e Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Wed, 10 Jul 2024 18:12:14 +0200 Subject: [PATCH 14/33] Remove util as it is a leftover from the @storybook/test move --- code/core/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/code/core/package.json b/code/core/package.json index 02fa7722b5dd..874b48c6a49b 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -264,7 +264,6 @@ "recast": "^0.23.5", "semver": "^7.6.2", "tempy": "^3.1.0", - "util": "^0.12.4", "ws": "^8.2.3" }, "devDependencies": { From 1ae40243b3049352766cd5f8b704e0e5596d325b Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Wed, 10 Jul 2024 18:40:39 +0200 Subject: [PATCH 15/33] Remove @storybook/core dep --- code/lib/create-storybook/package.json | 1 - code/lib/toolbox/package.json | 1 - code/yarn.lock | 2 -- 3 files changed, 4 deletions(-) diff --git a/code/lib/create-storybook/package.json b/code/lib/create-storybook/package.json index 10e43a695e24..1be87452f0c6 100644 --- a/code/lib/create-storybook/package.json +++ b/code/lib/create-storybook/package.json @@ -55,7 +55,6 @@ "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core": "workspace:*", "@types/semver": "^7.3.4", "chalk": "^4.1.0", "commander": "^6.2.1", diff --git a/code/lib/toolbox/package.json b/code/lib/toolbox/package.json index 309066d46a24..072f1af804c7 100644 --- a/code/lib/toolbox/package.json +++ b/code/lib/toolbox/package.json @@ -40,7 +40,6 @@ "@babel/core": "^7.24.4", "@babel/types": "^7.24.0", "@storybook/codemod": "workspace:*", - "@storybook/core": "workspace:*", "@types/semver": "^7.3.4", "chalk": "^4.1.0", "commander": "^6.2.1", diff --git a/code/yarn.lock b/code/yarn.lock index 8ddf0dd68172..ab27b111b098 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6778,7 +6778,6 @@ __metadata: "@babel/core": "npm:^7.24.4" "@babel/types": "npm:^7.24.0" "@storybook/codemod": "workspace:*" - "@storybook/core": "workspace:*" "@types/cross-spawn": "npm:^6.0.2" "@types/prompts": "npm:^2.0.9" "@types/semver": "npm:^7.3.4" @@ -12162,7 +12161,6 @@ __metadata: version: 0.0.0-use.local resolution: "create-storybook@workspace:lib/create-storybook" dependencies: - "@storybook/core": "workspace:*" "@types/prompts": "npm:^2.0.9" "@types/semver": "npm:^7.3.4" "@types/util-deprecate": "npm:^1.0.0" From 55a2fd4183a709e3e4dc89012e693bfcddd0037e Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Wed, 10 Jul 2024 18:46:49 +0200 Subject: [PATCH 16/33] fix unit tests --- code/core/src/cli/eslintPlugin.ts | 5 +++-- code/core/src/common/versions.ts | 4 ++-- code/lib/create-storybook/package.json | 2 +- code/lib/toolbox/package.json | 2 +- .../toolbox/src/automigrate/fixes/angular-builders.test.ts | 4 ---- code/lib/toolbox/src/upgrade.test.ts | 4 ++-- code/lib/toolbox/src/upgrade.ts | 4 ++-- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/code/core/src/cli/eslintPlugin.ts b/code/core/src/cli/eslintPlugin.ts index 8544b64be5b0..75fcaa96bb4c 100644 --- a/code/core/src/cli/eslintPlugin.ts +++ b/code/core/src/cli/eslintPlugin.ts @@ -7,6 +7,7 @@ import chalk from 'chalk'; import { readConfig, writeConfig } from '@storybook/core/csf-tools'; import type { JsPackageManager } from '@storybook/core/common'; import { paddedLog } from '@storybook/core/common'; +import fs from 'node:fs'; export const SUPPORTED_ESLINT_EXTENSIONS = ['js', 'cjs', 'json']; const UNSUPPORTED_ESLINT_EXTENSIONS = ['yaml', 'yml']; @@ -14,7 +15,7 @@ const UNSUPPORTED_ESLINT_EXTENSIONS = ['yaml', 'yml']; export const findEslintFile = () => { const filePrefix = '.eslintrc'; const unsupportedExtension = UNSUPPORTED_ESLINT_EXTENSIONS.find((ext: string) => - fse.existsSync(`${filePrefix}.${ext}`) + fs.existsSync(`${filePrefix}.${ext}`) ); if (unsupportedExtension) { @@ -22,7 +23,7 @@ export const findEslintFile = () => { } const extension = SUPPORTED_ESLINT_EXTENSIONS.find((ext: string) => - fse.existsSync(`${filePrefix}.${ext}`) + fs.existsSync(`${filePrefix}.${ext}`) ); return extension ? `${filePrefix}.${extension}` : null; }; diff --git a/code/core/src/common/versions.ts b/code/core/src/common/versions.ts index 6abad919382b..db0154177c98 100644 --- a/code/core/src/common/versions.ts +++ b/code/core/src/common/versions.ts @@ -62,13 +62,13 @@ export default { '@storybook/cli': '8.3.0-alpha.0', '@storybook/codemod': '8.3.0-alpha.0', '@storybook/core-webpack': '8.3.0-alpha.0', - 'create-storybook': '8.2.0-beta.3', + 'create-storybook': '8.3.0-alpha.0', '@storybook/csf-plugin': '8.3.0-alpha.0', '@storybook/instrumenter': '8.3.0-alpha.0', '@storybook/react-dom-shim': '8.3.0-alpha.0', '@storybook/source-loader': '8.3.0-alpha.0', '@storybook/test': '8.3.0-alpha.0', - '@storybook/toolbox': '8.2.0-beta.3', + '@storybook/toolbox': '8.3.0-alpha.0', '@storybook/preset-create-react-app': '8.3.0-alpha.0', '@storybook/preset-html-webpack': '8.3.0-alpha.0', '@storybook/preset-preact-webpack': '8.3.0-alpha.0', diff --git a/code/lib/create-storybook/package.json b/code/lib/create-storybook/package.json index 1be87452f0c6..7d9cdee582ca 100644 --- a/code/lib/create-storybook/package.json +++ b/code/lib/create-storybook/package.json @@ -1,6 +1,6 @@ { "name": "create-storybook", - "version": "8.2.0-beta.3", + "version": "8.3.0-alpha.0", "description": "Initialize Storybook into your project", "homepage": "https://github.com/storybookjs/storybook/tree/next/code/lib/create-storybook", "bugs": { diff --git a/code/lib/toolbox/package.json b/code/lib/toolbox/package.json index 072f1af804c7..82d0568ca059 100644 --- a/code/lib/toolbox/package.json +++ b/code/lib/toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/toolbox", - "version": "8.2.0-beta.3", + "version": "8.3.0-alpha.0", "description": "Storybook's Toolbox", "homepage": "https://github.com/storybookjs/storybook/tree/next/code/lib/toolbox", "bugs": { diff --git a/code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts b/code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts index 4b9a308cd678..a1dc26f8cb3b 100644 --- a/code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts +++ b/code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts @@ -23,10 +23,6 @@ const checkAngularBuilders = async ({ vi.mock('storybook/internal/cli', async (importOriginal) => ({ ...(await importOriginal()), isNxProject: vi.fn(), -})); - -vi.mock('storybook/internal/cli', async (importOriginal) => ({ - ...(await importOriginal()), AngularJSON: vi.fn(), })); diff --git a/code/lib/toolbox/src/upgrade.test.ts b/code/lib/toolbox/src/upgrade.test.ts index 9e8adc42724c..7bf478d184fd 100644 --- a/code/lib/toolbox/src/upgrade.test.ts +++ b/code/lib/toolbox/src/upgrade.test.ts @@ -32,8 +32,8 @@ vi.mock('storybook/internal/common', async (importOriginal) => { describe.each([ ['│ │ │ ├── @babel/code-frame@7.10.3 deduped', null], [ - '│ ├── "storybook/internal/theming@6.0.0-beta.37 extraneous', - { package: 'storybook/internal/theming', version: '6.0.0-beta.37' }, + '│ ├── "@storybook/core/theming@6.0.0-beta.37 extraneous', + { package: '@storybook/core/theming', version: '6.0.0-beta.37' }, ], [ '├─┬ @storybook/preset-create-react-app@3.1.2', diff --git a/code/lib/toolbox/src/upgrade.ts b/code/lib/toolbox/src/upgrade.ts index af8d6fb5f8b5..8b1bc007add2 100644 --- a/code/lib/toolbox/src/upgrade.ts +++ b/code/lib/toolbox/src/upgrade.ts @@ -1,6 +1,6 @@ import { sync as spawnSync } from 'cross-spawn'; import { telemetry } from 'storybook/internal/telemetry'; -import semver, { eq, lt, prerelease } from 'semver'; +import semver, { eq, lt, prerelease, clean } from 'semver'; import { logger } from 'storybook/internal/node-logger'; import { withTelemetry } from 'storybook/internal/core-server'; import { @@ -34,7 +34,7 @@ const versionRegex = /(@storybook\/[^@]+)@(\S+)/; export const getStorybookVersion = (line: string) => { if (line.startsWith('npm ')) return null; const match = versionRegex.exec(line); - if (!match || !semver.clean(match[2])) return null; + if (!match || !clean(match[2])) return null; return { package: match[1], version: match[2], From e41f3a02a5ee72c84a6c304da82ca841495130f1 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Wed, 10 Jul 2024 19:19:29 +0200 Subject: [PATCH 17/33] Fix entries --- code/core/package.json | 8 ++++++++ code/core/scripts/entries.ts | 1 + 2 files changed, 9 insertions(+) diff --git a/code/core/package.json b/code/core/package.json index 874b48c6a49b..fd4fde2bbb1c 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -152,6 +152,11 @@ "import": "./dist/cli/index.js", "require": "./dist/cli/index.cjs" }, + "./cli/bin": { + "types": "./dist/cli/bin/index.d.ts", + "import": "./dist/cli/bin/index.js", + "require": "./dist/cli/bin/index.cjs" + }, "./package.json": "./package.json" }, "main": "dist/index.cjs", @@ -239,6 +244,9 @@ ], "cli": [ "./dist/cli/index.d.ts" + ], + "cli/bin": [ + "./dist/cli/bin/index.d.ts" ] } }, diff --git a/code/core/scripts/entries.ts b/code/core/scripts/entries.ts index 84f64a62b447..41d0173b573e 100644 --- a/code/core/scripts/entries.ts +++ b/code/core/scripts/entries.ts @@ -41,6 +41,7 @@ export const getEntries = (cwd: string) => { define('src/manager/globals-module-info.ts', ['node'], true), define('src/preview/globals.ts', ['node'], true), define('src/cli/index.ts', ['node'], true), + define('src/cli/bin/index.ts', ['node'], true), ]; }; From bcd8b77c250280b40b31239921280384fb151b4a Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Wed, 10 Jul 2024 19:34:41 +0200 Subject: [PATCH 18/33] fix sub paths --- code/lib/cli/core/cli/bin/index.cjs | 1 + code/lib/cli/core/cli/bin/index.d.ts | 2 ++ code/lib/cli/core/cli/bin/index.js | 1 + code/lib/cli/package.json | 8 ++++++++ 4 files changed, 12 insertions(+) create mode 100644 code/lib/cli/core/cli/bin/index.cjs create mode 100644 code/lib/cli/core/cli/bin/index.d.ts create mode 100644 code/lib/cli/core/cli/bin/index.js diff --git a/code/lib/cli/core/cli/bin/index.cjs b/code/lib/cli/core/cli/bin/index.cjs new file mode 100644 index 000000000000..28b8be5e01cc --- /dev/null +++ b/code/lib/cli/core/cli/bin/index.cjs @@ -0,0 +1 @@ +module.exports = require('@storybook/core/cli/bin'); diff --git a/code/lib/cli/core/cli/bin/index.d.ts b/code/lib/cli/core/cli/bin/index.d.ts new file mode 100644 index 000000000000..c846fa780147 --- /dev/null +++ b/code/lib/cli/core/cli/bin/index.d.ts @@ -0,0 +1,2 @@ +export * from '@storybook/core/cli/bin'; +export type * from '@storybook/core/cli/bin'; diff --git a/code/lib/cli/core/cli/bin/index.js b/code/lib/cli/core/cli/bin/index.js new file mode 100644 index 000000000000..32a19f877c90 --- /dev/null +++ b/code/lib/cli/core/cli/bin/index.js @@ -0,0 +1 @@ +export * from '@storybook/core/cli/bin'; diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json index 2e3a8ff20aae..6df899af6d06 100644 --- a/code/lib/cli/package.json +++ b/code/lib/cli/package.json @@ -172,6 +172,11 @@ "types": "./core/cli/index.d.ts", "import": "./core/cli/index.js", "require": "./core/cli/index.cjs" + }, + "./internal/cli/bin": { + "types": "./core/cli/bin/index.d.ts", + "import": "./core/cli/bin/index.js", + "require": "./core/cli/bin/index.cjs" } }, "main": "dist/index.cjs", @@ -191,6 +196,9 @@ "internal/cli": [ "./core/cli/index.d.ts" ], + "internal/cli/bin": [ + "./core/cli/bin/index.d.ts" + ], "internal/client-logger": [ "./core/client-logger/index.d.ts" ], From e415c53d389bc4e06b0ca9a3af6f8c3d2ad7907f Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Thu, 11 Jul 2024 00:15:38 +0200 Subject: [PATCH 19/33] fix import --- code/core/src/common/js-package-manager/NPMProxy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/core/src/common/js-package-manager/NPMProxy.ts b/code/core/src/common/js-package-manager/NPMProxy.ts index 09379285d276..9e3f7d5bf00a 100644 --- a/code/core/src/common/js-package-manager/NPMProxy.ts +++ b/code/core/src/common/js-package-manager/NPMProxy.ts @@ -1,4 +1,4 @@ -import sort from 'semver/functions/sort'; +import sort from 'semver/functions/sort.js'; import { platform } from 'os'; import dedent from 'ts-dedent'; import { findUpSync } from 'find-up'; From d5a3913feb5a47e23ee8e4fd2711e1f5ed76e2d4 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Thu, 11 Jul 2024 01:54:32 +0200 Subject: [PATCH 20/33] remove readme --- code/lib/create-storybook/README.md | 50 +---------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/code/lib/create-storybook/README.md b/code/lib/create-storybook/README.md index ac92f2c8e096..a84cddc67be2 100644 --- a/code/lib/create-storybook/README.md +++ b/code/lib/create-storybook/README.md @@ -1,49 +1 @@ -# Storybook - -## CLI - -Storybook CLI (_Command Line Interface_) is the easiest way to add [Storybook](https://github.com/storybookjs/storybook) to your project. - -![Screenshot](docs/getstorybook.png) - -Go to your project and run: - -```sh -cd my-app -npx sb@latest init -``` - -In addition to `init`, the CLI also has other commands: - -- `add` - add an addon and register it -- `info` - print out system information for bug reports -- `upgrade` - upgrade to the latest version of Storybook (or a specific version) -- `migrate` - run codemods to migrate your code - -See the command-line help with `-h` (including other useful commands) for details. - -## Core APIs - -This package has multiple sub-exports to can be used to gain access to storybook's APIs. - -### `storybook/components` - -This export contains a list of components very useful for building out addons. -We recommend addon-authors to use these components to ensure a consistent look and feel, and to reduce the amount of code they need to write. - -### `storybook/theming` - -This export exposes a few utility functions to help writing components that automatically adapt to the current theme. -Useful for addon authors who want to make their addons theme-aware. - -### `storybook/preview-api` - -This export contains the API that is available in the preview iframe. - -### `storybook/manager-api` - -This export contains the API that is available in the manager iframe. - -### `storybook/types` - -This export exposes a lot of TypeScript interfaces used throughout storybook, including for storybook configuration, addons etc. +## Initialize Storybook into your project From 435dfc148613203325709a9f8e97a0df34a9a1c2 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Thu, 11 Jul 2024 01:59:46 +0200 Subject: [PATCH 21/33] Move unit test --- code/lib/{cli => toolbox}/test/default/cli.test.cjs | 0 code/lib/{cli => toolbox}/test/helpers.cjs | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename code/lib/{cli => toolbox}/test/default/cli.test.cjs (100%) rename code/lib/{cli => toolbox}/test/helpers.cjs (100%) diff --git a/code/lib/cli/test/default/cli.test.cjs b/code/lib/toolbox/test/default/cli.test.cjs similarity index 100% rename from code/lib/cli/test/default/cli.test.cjs rename to code/lib/toolbox/test/default/cli.test.cjs diff --git a/code/lib/cli/test/helpers.cjs b/code/lib/toolbox/test/helpers.cjs similarity index 100% rename from code/lib/cli/test/helpers.cjs rename to code/lib/toolbox/test/helpers.cjs From 553d603207dbef2270fb8cc28681091e13c56161 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Thu, 11 Jul 2024 03:24:11 +0200 Subject: [PATCH 22/33] Remove --- .github/workflows/trigger-circle-ci-workflow.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/trigger-circle-ci-workflow.yml b/.github/workflows/trigger-circle-ci-workflow.yml index 3104658332ac..66bcc0f1a7ce 100644 --- a/.github/workflows/trigger-circle-ci-workflow.yml +++ b/.github/workflows/trigger-circle-ci-workflow.yml @@ -87,8 +87,7 @@ jobs: -d '{ "branch": "'"$BRANCH"'", "parameters": { - "workflow": "merged", - "pr": "'"$PR_NUMBER"'", + "workflow": "merged" } }' env: From dc715316bf4645787f7198016d00fdc94b612d9a Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Thu, 11 Jul 2024 11:45:22 +0200 Subject: [PATCH 23/33] Rename @storybook/toolbox -> @storybook/cli --- code/core/src/common/versions.ts | 1 - .../utils/warnOnIncompatibleAddons.ts | 2 +- .../{toolbox => cli-storybook}/.eslintrc.cjs | 0 code/lib/cli-storybook/README.md | 50 ++++++++++- .../{toolbox => cli-storybook}/bin/index.cjs | 0 code/lib/cli-storybook/index.js | 3 - code/lib/cli-storybook/package.json | 60 +++++++++++++- code/lib/cli-storybook/project.json | 4 +- .../src/add.test.ts | 0 .../lib/{toolbox => cli-storybook}/src/add.ts | 0 .../autoblock/block-dependencies-versions.ts | 0 .../src/autoblock/block-node-version.ts | 0 .../src/autoblock/block-storystorev6.ts | 0 .../src/autoblock/index.test.ts | 0 .../src/autoblock/index.ts | 0 .../src/autoblock/types.ts | 0 .../__test__/main-config-with-wrappers.js | 0 .../__test__/main-config-without-wrappers.js | 0 .../automigrate/fixes/addon-postcss.test.ts | 0 .../src/automigrate/fixes/addon-postcss.ts | 0 .../src/automigrate/fixes/addons-api.test.ts | 0 .../src/automigrate/fixes/addons-api.ts | 0 .../angular-builders-multiproject.test.ts | 0 .../fixes/angular-builders-multiproject.ts | 0 .../fixes/angular-builders.test.ts | 0 .../src/automigrate/fixes/angular-builders.ts | 0 .../automigrate/fixes/autodocs-tags.test.ts | 0 .../src/automigrate/fixes/autodocs-tags.ts | 0 .../automigrate/fixes/autodocs-true.test.ts | 0 .../src/automigrate/fixes/autodocs-true.ts | 0 .../automigrate/fixes/builder-vite.test.ts | 0 .../src/automigrate/fixes/builder-vite.ts | 0 .../src/automigrate/fixes/cra5.test.ts | 0 .../src/automigrate/fixes/cra5.ts | 0 .../automigrate/fixes/eslint-plugin.test.ts | 0 .../src/automigrate/fixes/eslint-plugin.ts | 0 .../src/automigrate/fixes/index.ts | 0 .../automigrate/fixes/initial-globals.test.ts | 0 .../src/automigrate/fixes/initial-globals.ts | 0 .../src/automigrate/fixes/mdx-1-to-3.test.ts | 0 .../src/automigrate/fixes/mdx-1-to-3.ts | 0 .../src/automigrate/fixes/mdx-gfm.test.ts | 0 .../src/automigrate/fixes/mdx-gfm.ts | 0 .../src/automigrate/fixes/mdx-to-csf.test.ts | 0 .../src/automigrate/fixes/mdx-to-csf.ts | 0 .../automigrate/fixes/new-frameworks.test.ts | 0 .../src/automigrate/fixes/new-frameworks.ts | 0 .../fixes/prompt-remove-react.test.ts | 0 .../automigrate/fixes/prompt-remove-react.ts | 0 .../automigrate/fixes/react-docgen.test.ts | 0 .../src/automigrate/fixes/react-docgen.ts | 0 .../fixes/remove-argtypes-regex.ts | 0 .../fixes/remove-global-client-apis.test.ts | 0 .../fixes/remove-global-client-apis.ts | 0 .../fixes/remove-jest-testing-library.test.ts | 0 .../fixes/remove-jest-testing-library.ts | 0 .../automigrate/fixes/remove-legacymdx1.ts | 0 .../src/automigrate/fixes/sb-binary.test.ts | 0 .../src/automigrate/fixes/sb-binary.ts | 0 .../src/automigrate/fixes/sb-scripts.test.ts | 0 .../src/automigrate/fixes/sb-scripts.ts | 0 .../fixes/storyshots-migration.test.ts | 0 .../automigrate/fixes/storyshots-migration.ts | 0 ...ade-storybook-related-dependencies.test.ts | 0 .../upgrade-storybook-related-dependencies.ts | 0 .../src/automigrate/fixes/vite-config-file.ts | 0 .../src/automigrate/fixes/vta.test.ts | 0 .../src/automigrate/fixes/vta.ts | 0 .../src/automigrate/fixes/vue3.test.ts | 0 .../src/automigrate/fixes/vue3.ts | 0 .../fixes/webpack5-compiler-setup.test.ts | 0 .../fixes/webpack5-compiler-setup.ts | 0 .../src/automigrate/fixes/webpack5.test.ts | 0 .../src/automigrate/fixes/webpack5.ts | 0 .../automigrate/fixes/wrap-require-utils.ts | 0 .../automigrate/fixes/wrap-require.test.ts | 0 .../src/automigrate/fixes/wrap-require.ts | 0 .../helpers/checkWebpack5Builder.test.ts | 0 .../helpers/checkWebpack5Builder.ts | 0 .../src/automigrate/helpers/cleanLog.ts | 0 .../src/automigrate/helpers/detectRenderer.ts | 0 .../helpers/getMigrationSummary.test.ts | 0 .../helpers/getMigrationSummary.ts | 0 .../helpers/mainConfigFile.test.ts | 0 .../src/automigrate/helpers/mainConfigFile.ts | 0 .../helpers/new-frameworks-utils.test.ts | 0 .../helpers/new-frameworks-utils.ts | 0 .../automigrate/helpers/testing-helpers.ts | 0 .../src/automigrate/index.test.ts | 0 .../src/automigrate/index.ts | 0 .../src/automigrate/types.ts | 0 .../src/bin/index.ts | 0 .../src/doctor/getDuplicatedDepsWarnings.ts | 0 .../getIncompatibleStorybookPackages.test.ts | 0 .../getIncompatibleStorybookPackages.ts | 0 .../doctor/getMismatchingVersionsWarning.ts | 0 .../src/doctor/hasMultipleVersions.ts | 0 .../src/doctor/index.ts | 0 .../src/doctor/utils.ts | 0 .../{toolbox => cli-storybook}/src/index.ts | 0 .../{toolbox => cli-storybook}/src/link.ts | 0 .../{toolbox => cli-storybook}/src/migrate.ts | 0 .../src/postinstallAddon.ts | 0 .../src/sandbox-templates.ts | 0 .../{toolbox => cli-storybook}/src/sandbox.ts | 0 .../src/typings.d.ts | 0 .../src/upgrade.test.ts | 0 .../{toolbox => cli-storybook}/src/upgrade.ts | 0 .../src/warn.test.ts | 0 .../{toolbox => cli-storybook}/src/warn.ts | 0 .../src/window.d.ts | 0 .../test/default/cli.test.cjs | 0 .../test/helpers.cjs | 0 .../{toolbox => cli-storybook}/tsconfig.json | 0 code/lib/cli/src/proxy.ts | 3 +- code/lib/toolbox/README.md | 49 ----------- code/lib/toolbox/package.json | 82 ------------------- code/lib/toolbox/project.json | 8 -- code/lib/toolbox/vitest.config.ts | 9 -- code/yarn.lock | 67 +++++++-------- scripts/create-nx-sandbox-projects.ts | 2 +- scripts/event-log-checker.ts | 2 +- scripts/get-template.ts | 2 +- scripts/sandbox/generate.ts | 2 +- scripts/sandbox/utils/template.ts | 2 +- scripts/task.ts | 2 +- scripts/tasks/sandbox-parts.ts | 2 +- scripts/utils/cli-step.ts | 2 +- 128 files changed, 145 insertions(+), 209 deletions(-) rename code/lib/{toolbox => cli-storybook}/.eslintrc.cjs (100%) rename code/lib/{toolbox => cli-storybook}/bin/index.cjs (100%) delete mode 100755 code/lib/cli-storybook/index.js rename code/lib/{toolbox => cli-storybook}/src/add.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/add.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/autoblock/block-dependencies-versions.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/autoblock/block-node-version.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/autoblock/block-storystorev6.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/autoblock/index.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/autoblock/index.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/autoblock/types.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/__test__/main-config-with-wrappers.js (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/__test__/main-config-without-wrappers.js (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/addon-postcss.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/addon-postcss.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/addons-api.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/addons-api.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/angular-builders-multiproject.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/angular-builders-multiproject.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/angular-builders.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/angular-builders.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/autodocs-tags.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/autodocs-tags.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/autodocs-true.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/autodocs-true.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/builder-vite.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/builder-vite.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/cra5.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/cra5.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/eslint-plugin.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/eslint-plugin.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/index.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/initial-globals.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/initial-globals.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/mdx-1-to-3.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/mdx-1-to-3.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/mdx-gfm.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/mdx-gfm.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/mdx-to-csf.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/mdx-to-csf.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/new-frameworks.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/new-frameworks.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/prompt-remove-react.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/prompt-remove-react.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/react-docgen.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/react-docgen.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/remove-argtypes-regex.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/remove-global-client-apis.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/remove-global-client-apis.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/remove-jest-testing-library.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/remove-jest-testing-library.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/remove-legacymdx1.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/sb-binary.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/sb-binary.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/sb-scripts.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/sb-scripts.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/storyshots-migration.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/storyshots-migration.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/vite-config-file.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/vta.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/vta.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/vue3.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/vue3.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/webpack5-compiler-setup.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/webpack5-compiler-setup.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/webpack5.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/webpack5.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/wrap-require-utils.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/wrap-require.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/fixes/wrap-require.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/helpers/checkWebpack5Builder.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/helpers/checkWebpack5Builder.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/helpers/cleanLog.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/helpers/detectRenderer.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/helpers/getMigrationSummary.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/helpers/getMigrationSummary.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/helpers/mainConfigFile.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/helpers/mainConfigFile.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/helpers/new-frameworks-utils.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/helpers/new-frameworks-utils.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/helpers/testing-helpers.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/index.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/index.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/automigrate/types.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/bin/index.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/doctor/getDuplicatedDepsWarnings.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/doctor/getIncompatibleStorybookPackages.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/doctor/getIncompatibleStorybookPackages.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/doctor/getMismatchingVersionsWarning.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/doctor/hasMultipleVersions.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/doctor/index.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/doctor/utils.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/index.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/link.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/migrate.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/postinstallAddon.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/sandbox-templates.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/sandbox.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/typings.d.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/upgrade.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/upgrade.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/warn.test.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/warn.ts (100%) rename code/lib/{toolbox => cli-storybook}/src/window.d.ts (100%) rename code/lib/{toolbox => cli-storybook}/test/default/cli.test.cjs (100%) rename code/lib/{toolbox => cli-storybook}/test/helpers.cjs (100%) rename code/lib/{toolbox => cli-storybook}/tsconfig.json (100%) delete mode 100644 code/lib/toolbox/README.md delete mode 100644 code/lib/toolbox/package.json delete mode 100644 code/lib/toolbox/project.json delete mode 100644 code/lib/toolbox/vitest.config.ts diff --git a/code/core/src/common/versions.ts b/code/core/src/common/versions.ts index db0154177c98..2d85a45e05a2 100644 --- a/code/core/src/common/versions.ts +++ b/code/core/src/common/versions.ts @@ -68,7 +68,6 @@ export default { '@storybook/react-dom-shim': '8.3.0-alpha.0', '@storybook/source-loader': '8.3.0-alpha.0', '@storybook/test': '8.3.0-alpha.0', - '@storybook/toolbox': '8.3.0-alpha.0', '@storybook/preset-create-react-app': '8.3.0-alpha.0', '@storybook/preset-html-webpack': '8.3.0-alpha.0', '@storybook/preset-preact-webpack': '8.3.0-alpha.0', diff --git a/code/core/src/core-server/utils/warnOnIncompatibleAddons.ts b/code/core/src/core-server/utils/warnOnIncompatibleAddons.ts index 4f35fe5d1546..a921f4ba3645 100644 --- a/code/core/src/core-server/utils/warnOnIncompatibleAddons.ts +++ b/code/core/src/core-server/utils/warnOnIncompatibleAddons.ts @@ -2,7 +2,7 @@ import { logger } from '@storybook/core/node-logger'; import { getIncompatibleStorybookPackages, getIncompatiblePackagesSummary, -} from '../../../../lib/toolbox/src/doctor/getIncompatibleStorybookPackages'; +} from '../../../../lib/cli-storybook/src/doctor/getIncompatibleStorybookPackages'; export const warnOnIncompatibleAddons = async (currentStorybookVersion: string) => { const incompatiblePackagesList = await getIncompatibleStorybookPackages({ diff --git a/code/lib/toolbox/.eslintrc.cjs b/code/lib/cli-storybook/.eslintrc.cjs similarity index 100% rename from code/lib/toolbox/.eslintrc.cjs rename to code/lib/cli-storybook/.eslintrc.cjs diff --git a/code/lib/cli-storybook/README.md b/code/lib/cli-storybook/README.md index f31715566811..6e3183109f1a 100644 --- a/code/lib/cli-storybook/README.md +++ b/code/lib/cli-storybook/README.md @@ -1,3 +1,49 @@ -# Storybook CLI +# Storybook -This is a wrapper for +## CLI + +Storybook CLI (_Command Line Interface_) is the easiest way to add [Storybook](https://github.com/storybookjs/storybook) to your project. + +![Screenshot](docs/getstorybook.png) + +Go to your project and run: + +```sh +cd my-app +npx storybook@latest init +``` + +In addition to `init`, the CLI also has other commands: + +- `add` - add an addon and register it +- `info` - print out system information for bug reports +- `upgrade` - upgrade to the latest version of Storybook (or a specific version) +- `migrate` - run codemods to migrate your code + +See the command-line help with `-h` (including other useful commands) for details. + +## Core APIs + +This package has multiple sub-exports to can be used to gain access to storybook's APIs. + +### `storybook/components` + +This export contains a list of components very useful for building out addons. +We recommend addon-authors to use these components to ensure a consistent look and feel, and to reduce the amount of code they need to write. + +### `storybook/theming` + +This export exposes a few utility functions to help writing components that automatically adapt to the current theme. +Useful for addon authors who want to make their addons theme-aware. + +### `storybook/preview-api` + +This export contains the API that is available in the preview iframe. + +### `storybook/manager-api` + +This export contains the API that is available in the manager iframe. + +### `storybook/types` + +This export exposes a lot of TypeScript interfaces used throughout storybook, including for storybook configuration, addons etc. diff --git a/code/lib/toolbox/bin/index.cjs b/code/lib/cli-storybook/bin/index.cjs similarity index 100% rename from code/lib/toolbox/bin/index.cjs rename to code/lib/cli-storybook/bin/index.cjs diff --git a/code/lib/cli-storybook/index.js b/code/lib/cli-storybook/index.js deleted file mode 100755 index 7cb4855dc32f..000000000000 --- a/code/lib/cli-storybook/index.js +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env node - -require('storybook/bin/index.cjs'); diff --git a/code/lib/cli-storybook/package.json b/code/lib/cli-storybook/package.json index 4f28285772e4..5ab6a4e85c23 100644 --- a/code/lib/cli-storybook/package.json +++ b/code/lib/cli-storybook/package.json @@ -19,15 +19,67 @@ "url": "https://opencollective.com/storybook" }, "license": "MIT", - "bin": { - "sb": "./index.js", - "storybook": "./index.js" + "author": "Storybook Team", + "type": "module", + "exports": { + "./bin/index.cjs": { + "node": "./bin/index.cjs", + "require": "./bin/index.cjs" + }, + "./package.json": "./package.json" + }, + "bin": "./bin/index.cjs", + "files": [ + "bin/**/*", + "dist/**/*", + "README.md", + "!src/**/*" + ], + "scripts": { + "check": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/check.ts", + "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts" }, "dependencies": { - "storybook": "workspace:*" + "@babel/core": "^7.24.4", + "@babel/types": "^7.24.0", + "@storybook/codemod": "workspace:*", + "@types/semver": "^7.3.4", + "chalk": "^4.1.0", + "commander": "^6.2.1", + "create-storybook": "workspace:*", + "cross-spawn": "^7.0.3", + "envinfo": "^7.7.3", + "fd-package-json": "^1.2.0", + "find-up": "^5.0.0", + "fs-extra": "^11.1.0", + "giget": "^1.0.0", + "globby": "^14.0.1", + "jscodeshift": "^0.15.1", + "leven": "^3.1.0", + "prompts": "^2.4.0", + "semver": "^7.3.7", + "storybook": "workspace:*", + "tempy": "^3.1.0", + "tiny-invariant": "^1.3.1", + "ts-dedent": "^2.0.0" + }, + "devDependencies": { + "@types/cross-spawn": "^6.0.2", + "@types/prompts": "^2.0.9", + "boxen": "^7.1.1", + "slash": "^5.0.0", + "strip-ansi": "^7.1.0", + "typescript": "^5.3.2" }, "publishConfig": { "access": "public" }, + "bundler": { + "entries": [ + "./src/index.ts", + "./src/bin/index.ts" + ], + "platform": "node" + }, "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" } diff --git a/code/lib/cli-storybook/project.json b/code/lib/cli-storybook/project.json index 1327b61e5ba4..229b547bb854 100644 --- a/code/lib/cli-storybook/project.json +++ b/code/lib/cli-storybook/project.json @@ -2,5 +2,7 @@ "name": "cli-storybook", "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "library", - "targets": {} + "targets": { + "build": {} + } } diff --git a/code/lib/toolbox/src/add.test.ts b/code/lib/cli-storybook/src/add.test.ts similarity index 100% rename from code/lib/toolbox/src/add.test.ts rename to code/lib/cli-storybook/src/add.test.ts diff --git a/code/lib/toolbox/src/add.ts b/code/lib/cli-storybook/src/add.ts similarity index 100% rename from code/lib/toolbox/src/add.ts rename to code/lib/cli-storybook/src/add.ts diff --git a/code/lib/toolbox/src/autoblock/block-dependencies-versions.ts b/code/lib/cli-storybook/src/autoblock/block-dependencies-versions.ts similarity index 100% rename from code/lib/toolbox/src/autoblock/block-dependencies-versions.ts rename to code/lib/cli-storybook/src/autoblock/block-dependencies-versions.ts diff --git a/code/lib/toolbox/src/autoblock/block-node-version.ts b/code/lib/cli-storybook/src/autoblock/block-node-version.ts similarity index 100% rename from code/lib/toolbox/src/autoblock/block-node-version.ts rename to code/lib/cli-storybook/src/autoblock/block-node-version.ts diff --git a/code/lib/toolbox/src/autoblock/block-storystorev6.ts b/code/lib/cli-storybook/src/autoblock/block-storystorev6.ts similarity index 100% rename from code/lib/toolbox/src/autoblock/block-storystorev6.ts rename to code/lib/cli-storybook/src/autoblock/block-storystorev6.ts diff --git a/code/lib/toolbox/src/autoblock/index.test.ts b/code/lib/cli-storybook/src/autoblock/index.test.ts similarity index 100% rename from code/lib/toolbox/src/autoblock/index.test.ts rename to code/lib/cli-storybook/src/autoblock/index.test.ts diff --git a/code/lib/toolbox/src/autoblock/index.ts b/code/lib/cli-storybook/src/autoblock/index.ts similarity index 100% rename from code/lib/toolbox/src/autoblock/index.ts rename to code/lib/cli-storybook/src/autoblock/index.ts diff --git a/code/lib/toolbox/src/autoblock/types.ts b/code/lib/cli-storybook/src/autoblock/types.ts similarity index 100% rename from code/lib/toolbox/src/autoblock/types.ts rename to code/lib/cli-storybook/src/autoblock/types.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/__test__/main-config-with-wrappers.js b/code/lib/cli-storybook/src/automigrate/fixes/__test__/main-config-with-wrappers.js similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/__test__/main-config-with-wrappers.js rename to code/lib/cli-storybook/src/automigrate/fixes/__test__/main-config-with-wrappers.js diff --git a/code/lib/toolbox/src/automigrate/fixes/__test__/main-config-without-wrappers.js b/code/lib/cli-storybook/src/automigrate/fixes/__test__/main-config-without-wrappers.js similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/__test__/main-config-without-wrappers.js rename to code/lib/cli-storybook/src/automigrate/fixes/__test__/main-config-without-wrappers.js diff --git a/code/lib/toolbox/src/automigrate/fixes/addon-postcss.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/addon-postcss.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/addon-postcss.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/addon-postcss.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/addon-postcss.ts b/code/lib/cli-storybook/src/automigrate/fixes/addon-postcss.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/addon-postcss.ts rename to code/lib/cli-storybook/src/automigrate/fixes/addon-postcss.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/addons-api.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/addons-api.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/addons-api.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/addons-api.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/addons-api.ts b/code/lib/cli-storybook/src/automigrate/fixes/addons-api.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/addons-api.ts rename to code/lib/cli-storybook/src/automigrate/fixes/addons-api.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/angular-builders-multiproject.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/angular-builders-multiproject.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.ts b/code/lib/cli-storybook/src/automigrate/fixes/angular-builders-multiproject.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/angular-builders-multiproject.ts rename to code/lib/cli-storybook/src/automigrate/fixes/angular-builders-multiproject.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/angular-builders.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/angular-builders.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/angular-builders.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/angular-builders.ts b/code/lib/cli-storybook/src/automigrate/fixes/angular-builders.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/angular-builders.ts rename to code/lib/cli-storybook/src/automigrate/fixes/angular-builders.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/autodocs-tags.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/autodocs-tags.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/autodocs-tags.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/autodocs-tags.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/autodocs-tags.ts b/code/lib/cli-storybook/src/automigrate/fixes/autodocs-tags.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/autodocs-tags.ts rename to code/lib/cli-storybook/src/automigrate/fixes/autodocs-tags.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/autodocs-true.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/autodocs-true.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/autodocs-true.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/autodocs-true.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/autodocs-true.ts b/code/lib/cli-storybook/src/automigrate/fixes/autodocs-true.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/autodocs-true.ts rename to code/lib/cli-storybook/src/automigrate/fixes/autodocs-true.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/builder-vite.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/builder-vite.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/builder-vite.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/builder-vite.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/builder-vite.ts b/code/lib/cli-storybook/src/automigrate/fixes/builder-vite.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/builder-vite.ts rename to code/lib/cli-storybook/src/automigrate/fixes/builder-vite.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/cra5.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/cra5.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/cra5.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/cra5.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/cra5.ts b/code/lib/cli-storybook/src/automigrate/fixes/cra5.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/cra5.ts rename to code/lib/cli-storybook/src/automigrate/fixes/cra5.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/eslint-plugin.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/eslint-plugin.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/eslint-plugin.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/eslint-plugin.ts b/code/lib/cli-storybook/src/automigrate/fixes/eslint-plugin.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/eslint-plugin.ts rename to code/lib/cli-storybook/src/automigrate/fixes/eslint-plugin.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/index.ts b/code/lib/cli-storybook/src/automigrate/fixes/index.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/index.ts rename to code/lib/cli-storybook/src/automigrate/fixes/index.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/initial-globals.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/initial-globals.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/initial-globals.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/initial-globals.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/initial-globals.ts b/code/lib/cli-storybook/src/automigrate/fixes/initial-globals.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/initial-globals.ts rename to code/lib/cli-storybook/src/automigrate/fixes/initial-globals.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/mdx-1-to-3.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/mdx-1-to-3.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/mdx-1-to-3.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/mdx-1-to-3.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/mdx-1-to-3.ts b/code/lib/cli-storybook/src/automigrate/fixes/mdx-1-to-3.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/mdx-1-to-3.ts rename to code/lib/cli-storybook/src/automigrate/fixes/mdx-1-to-3.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/mdx-gfm.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/mdx-gfm.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/mdx-gfm.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/mdx-gfm.ts b/code/lib/cli-storybook/src/automigrate/fixes/mdx-gfm.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/mdx-gfm.ts rename to code/lib/cli-storybook/src/automigrate/fixes/mdx-gfm.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/mdx-to-csf.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/mdx-to-csf.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.ts b/code/lib/cli-storybook/src/automigrate/fixes/mdx-to-csf.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/mdx-to-csf.ts rename to code/lib/cli-storybook/src/automigrate/fixes/mdx-to-csf.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/new-frameworks.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/new-frameworks.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/new-frameworks.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/new-frameworks.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/new-frameworks.ts b/code/lib/cli-storybook/src/automigrate/fixes/new-frameworks.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/new-frameworks.ts rename to code/lib/cli-storybook/src/automigrate/fixes/new-frameworks.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/prompt-remove-react.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/prompt-remove-react.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/prompt-remove-react.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/prompt-remove-react.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/prompt-remove-react.ts b/code/lib/cli-storybook/src/automigrate/fixes/prompt-remove-react.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/prompt-remove-react.ts rename to code/lib/cli-storybook/src/automigrate/fixes/prompt-remove-react.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/react-docgen.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/react-docgen.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/react-docgen.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/react-docgen.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/react-docgen.ts b/code/lib/cli-storybook/src/automigrate/fixes/react-docgen.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/react-docgen.ts rename to code/lib/cli-storybook/src/automigrate/fixes/react-docgen.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/remove-argtypes-regex.ts b/code/lib/cli-storybook/src/automigrate/fixes/remove-argtypes-regex.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/remove-argtypes-regex.ts rename to code/lib/cli-storybook/src/automigrate/fixes/remove-argtypes-regex.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/remove-global-client-apis.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/remove-global-client-apis.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/remove-global-client-apis.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/remove-global-client-apis.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/remove-global-client-apis.ts b/code/lib/cli-storybook/src/automigrate/fixes/remove-global-client-apis.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/remove-global-client-apis.ts rename to code/lib/cli-storybook/src/automigrate/fixes/remove-global-client-apis.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/remove-jest-testing-library.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/remove-jest-testing-library.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.ts b/code/lib/cli-storybook/src/automigrate/fixes/remove-jest-testing-library.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/remove-jest-testing-library.ts rename to code/lib/cli-storybook/src/automigrate/fixes/remove-jest-testing-library.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/remove-legacymdx1.ts b/code/lib/cli-storybook/src/automigrate/fixes/remove-legacymdx1.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/remove-legacymdx1.ts rename to code/lib/cli-storybook/src/automigrate/fixes/remove-legacymdx1.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/sb-binary.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/sb-binary.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/sb-binary.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/sb-binary.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/sb-binary.ts b/code/lib/cli-storybook/src/automigrate/fixes/sb-binary.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/sb-binary.ts rename to code/lib/cli-storybook/src/automigrate/fixes/sb-binary.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/sb-scripts.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/sb-scripts.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/sb-scripts.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/sb-scripts.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/sb-scripts.ts b/code/lib/cli-storybook/src/automigrate/fixes/sb-scripts.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/sb-scripts.ts rename to code/lib/cli-storybook/src/automigrate/fixes/sb-scripts.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/storyshots-migration.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/storyshots-migration.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/storyshots-migration.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/storyshots-migration.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/storyshots-migration.ts b/code/lib/cli-storybook/src/automigrate/fixes/storyshots-migration.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/storyshots-migration.ts rename to code/lib/cli-storybook/src/automigrate/fixes/storyshots-migration.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts b/code/lib/cli-storybook/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts rename to code/lib/cli-storybook/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/vite-config-file.ts b/code/lib/cli-storybook/src/automigrate/fixes/vite-config-file.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/vite-config-file.ts rename to code/lib/cli-storybook/src/automigrate/fixes/vite-config-file.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/vta.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/vta.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/vta.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/vta.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/vta.ts b/code/lib/cli-storybook/src/automigrate/fixes/vta.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/vta.ts rename to code/lib/cli-storybook/src/automigrate/fixes/vta.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/vue3.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/vue3.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/vue3.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/vue3.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/vue3.ts b/code/lib/cli-storybook/src/automigrate/fixes/vue3.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/vue3.ts rename to code/lib/cli-storybook/src/automigrate/fixes/vue3.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/webpack5-compiler-setup.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/webpack5-compiler-setup.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.ts b/code/lib/cli-storybook/src/automigrate/fixes/webpack5-compiler-setup.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/webpack5-compiler-setup.ts rename to code/lib/cli-storybook/src/automigrate/fixes/webpack5-compiler-setup.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/webpack5.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/webpack5.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/webpack5.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/webpack5.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/webpack5.ts b/code/lib/cli-storybook/src/automigrate/fixes/webpack5.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/webpack5.ts rename to code/lib/cli-storybook/src/automigrate/fixes/webpack5.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/wrap-require-utils.ts b/code/lib/cli-storybook/src/automigrate/fixes/wrap-require-utils.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/wrap-require-utils.ts rename to code/lib/cli-storybook/src/automigrate/fixes/wrap-require-utils.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/wrap-require.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/wrap-require.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/wrap-require.test.ts rename to code/lib/cli-storybook/src/automigrate/fixes/wrap-require.test.ts diff --git a/code/lib/toolbox/src/automigrate/fixes/wrap-require.ts b/code/lib/cli-storybook/src/automigrate/fixes/wrap-require.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/fixes/wrap-require.ts rename to code/lib/cli-storybook/src/automigrate/fixes/wrap-require.ts diff --git a/code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.test.ts b/code/lib/cli-storybook/src/automigrate/helpers/checkWebpack5Builder.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.test.ts rename to code/lib/cli-storybook/src/automigrate/helpers/checkWebpack5Builder.test.ts diff --git a/code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.ts b/code/lib/cli-storybook/src/automigrate/helpers/checkWebpack5Builder.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/helpers/checkWebpack5Builder.ts rename to code/lib/cli-storybook/src/automigrate/helpers/checkWebpack5Builder.ts diff --git a/code/lib/toolbox/src/automigrate/helpers/cleanLog.ts b/code/lib/cli-storybook/src/automigrate/helpers/cleanLog.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/helpers/cleanLog.ts rename to code/lib/cli-storybook/src/automigrate/helpers/cleanLog.ts diff --git a/code/lib/toolbox/src/automigrate/helpers/detectRenderer.ts b/code/lib/cli-storybook/src/automigrate/helpers/detectRenderer.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/helpers/detectRenderer.ts rename to code/lib/cli-storybook/src/automigrate/helpers/detectRenderer.ts diff --git a/code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.test.ts b/code/lib/cli-storybook/src/automigrate/helpers/getMigrationSummary.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.test.ts rename to code/lib/cli-storybook/src/automigrate/helpers/getMigrationSummary.test.ts diff --git a/code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.ts b/code/lib/cli-storybook/src/automigrate/helpers/getMigrationSummary.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/helpers/getMigrationSummary.ts rename to code/lib/cli-storybook/src/automigrate/helpers/getMigrationSummary.ts diff --git a/code/lib/toolbox/src/automigrate/helpers/mainConfigFile.test.ts b/code/lib/cli-storybook/src/automigrate/helpers/mainConfigFile.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/helpers/mainConfigFile.test.ts rename to code/lib/cli-storybook/src/automigrate/helpers/mainConfigFile.test.ts diff --git a/code/lib/toolbox/src/automigrate/helpers/mainConfigFile.ts b/code/lib/cli-storybook/src/automigrate/helpers/mainConfigFile.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/helpers/mainConfigFile.ts rename to code/lib/cli-storybook/src/automigrate/helpers/mainConfigFile.ts diff --git a/code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.test.ts b/code/lib/cli-storybook/src/automigrate/helpers/new-frameworks-utils.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.test.ts rename to code/lib/cli-storybook/src/automigrate/helpers/new-frameworks-utils.test.ts diff --git a/code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.ts b/code/lib/cli-storybook/src/automigrate/helpers/new-frameworks-utils.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/helpers/new-frameworks-utils.ts rename to code/lib/cli-storybook/src/automigrate/helpers/new-frameworks-utils.ts diff --git a/code/lib/toolbox/src/automigrate/helpers/testing-helpers.ts b/code/lib/cli-storybook/src/automigrate/helpers/testing-helpers.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/helpers/testing-helpers.ts rename to code/lib/cli-storybook/src/automigrate/helpers/testing-helpers.ts diff --git a/code/lib/toolbox/src/automigrate/index.test.ts b/code/lib/cli-storybook/src/automigrate/index.test.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/index.test.ts rename to code/lib/cli-storybook/src/automigrate/index.test.ts diff --git a/code/lib/toolbox/src/automigrate/index.ts b/code/lib/cli-storybook/src/automigrate/index.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/index.ts rename to code/lib/cli-storybook/src/automigrate/index.ts diff --git a/code/lib/toolbox/src/automigrate/types.ts b/code/lib/cli-storybook/src/automigrate/types.ts similarity index 100% rename from code/lib/toolbox/src/automigrate/types.ts rename to code/lib/cli-storybook/src/automigrate/types.ts diff --git a/code/lib/toolbox/src/bin/index.ts b/code/lib/cli-storybook/src/bin/index.ts similarity index 100% rename from code/lib/toolbox/src/bin/index.ts rename to code/lib/cli-storybook/src/bin/index.ts diff --git a/code/lib/toolbox/src/doctor/getDuplicatedDepsWarnings.ts b/code/lib/cli-storybook/src/doctor/getDuplicatedDepsWarnings.ts similarity index 100% rename from code/lib/toolbox/src/doctor/getDuplicatedDepsWarnings.ts rename to code/lib/cli-storybook/src/doctor/getDuplicatedDepsWarnings.ts diff --git a/code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.test.ts b/code/lib/cli-storybook/src/doctor/getIncompatibleStorybookPackages.test.ts similarity index 100% rename from code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.test.ts rename to code/lib/cli-storybook/src/doctor/getIncompatibleStorybookPackages.test.ts diff --git a/code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.ts b/code/lib/cli-storybook/src/doctor/getIncompatibleStorybookPackages.ts similarity index 100% rename from code/lib/toolbox/src/doctor/getIncompatibleStorybookPackages.ts rename to code/lib/cli-storybook/src/doctor/getIncompatibleStorybookPackages.ts diff --git a/code/lib/toolbox/src/doctor/getMismatchingVersionsWarning.ts b/code/lib/cli-storybook/src/doctor/getMismatchingVersionsWarning.ts similarity index 100% rename from code/lib/toolbox/src/doctor/getMismatchingVersionsWarning.ts rename to code/lib/cli-storybook/src/doctor/getMismatchingVersionsWarning.ts diff --git a/code/lib/toolbox/src/doctor/hasMultipleVersions.ts b/code/lib/cli-storybook/src/doctor/hasMultipleVersions.ts similarity index 100% rename from code/lib/toolbox/src/doctor/hasMultipleVersions.ts rename to code/lib/cli-storybook/src/doctor/hasMultipleVersions.ts diff --git a/code/lib/toolbox/src/doctor/index.ts b/code/lib/cli-storybook/src/doctor/index.ts similarity index 100% rename from code/lib/toolbox/src/doctor/index.ts rename to code/lib/cli-storybook/src/doctor/index.ts diff --git a/code/lib/toolbox/src/doctor/utils.ts b/code/lib/cli-storybook/src/doctor/utils.ts similarity index 100% rename from code/lib/toolbox/src/doctor/utils.ts rename to code/lib/cli-storybook/src/doctor/utils.ts diff --git a/code/lib/toolbox/src/index.ts b/code/lib/cli-storybook/src/index.ts similarity index 100% rename from code/lib/toolbox/src/index.ts rename to code/lib/cli-storybook/src/index.ts diff --git a/code/lib/toolbox/src/link.ts b/code/lib/cli-storybook/src/link.ts similarity index 100% rename from code/lib/toolbox/src/link.ts rename to code/lib/cli-storybook/src/link.ts diff --git a/code/lib/toolbox/src/migrate.ts b/code/lib/cli-storybook/src/migrate.ts similarity index 100% rename from code/lib/toolbox/src/migrate.ts rename to code/lib/cli-storybook/src/migrate.ts diff --git a/code/lib/toolbox/src/postinstallAddon.ts b/code/lib/cli-storybook/src/postinstallAddon.ts similarity index 100% rename from code/lib/toolbox/src/postinstallAddon.ts rename to code/lib/cli-storybook/src/postinstallAddon.ts diff --git a/code/lib/toolbox/src/sandbox-templates.ts b/code/lib/cli-storybook/src/sandbox-templates.ts similarity index 100% rename from code/lib/toolbox/src/sandbox-templates.ts rename to code/lib/cli-storybook/src/sandbox-templates.ts diff --git a/code/lib/toolbox/src/sandbox.ts b/code/lib/cli-storybook/src/sandbox.ts similarity index 100% rename from code/lib/toolbox/src/sandbox.ts rename to code/lib/cli-storybook/src/sandbox.ts diff --git a/code/lib/toolbox/src/typings.d.ts b/code/lib/cli-storybook/src/typings.d.ts similarity index 100% rename from code/lib/toolbox/src/typings.d.ts rename to code/lib/cli-storybook/src/typings.d.ts diff --git a/code/lib/toolbox/src/upgrade.test.ts b/code/lib/cli-storybook/src/upgrade.test.ts similarity index 100% rename from code/lib/toolbox/src/upgrade.test.ts rename to code/lib/cli-storybook/src/upgrade.test.ts diff --git a/code/lib/toolbox/src/upgrade.ts b/code/lib/cli-storybook/src/upgrade.ts similarity index 100% rename from code/lib/toolbox/src/upgrade.ts rename to code/lib/cli-storybook/src/upgrade.ts diff --git a/code/lib/toolbox/src/warn.test.ts b/code/lib/cli-storybook/src/warn.test.ts similarity index 100% rename from code/lib/toolbox/src/warn.test.ts rename to code/lib/cli-storybook/src/warn.test.ts diff --git a/code/lib/toolbox/src/warn.ts b/code/lib/cli-storybook/src/warn.ts similarity index 100% rename from code/lib/toolbox/src/warn.ts rename to code/lib/cli-storybook/src/warn.ts diff --git a/code/lib/toolbox/src/window.d.ts b/code/lib/cli-storybook/src/window.d.ts similarity index 100% rename from code/lib/toolbox/src/window.d.ts rename to code/lib/cli-storybook/src/window.d.ts diff --git a/code/lib/toolbox/test/default/cli.test.cjs b/code/lib/cli-storybook/test/default/cli.test.cjs similarity index 100% rename from code/lib/toolbox/test/default/cli.test.cjs rename to code/lib/cli-storybook/test/default/cli.test.cjs diff --git a/code/lib/toolbox/test/helpers.cjs b/code/lib/cli-storybook/test/helpers.cjs similarity index 100% rename from code/lib/toolbox/test/helpers.cjs rename to code/lib/cli-storybook/test/helpers.cjs diff --git a/code/lib/toolbox/tsconfig.json b/code/lib/cli-storybook/tsconfig.json similarity index 100% rename from code/lib/toolbox/tsconfig.json rename to code/lib/cli-storybook/tsconfig.json diff --git a/code/lib/cli/src/proxy.ts b/code/lib/cli/src/proxy.ts index 523bda2a27c2..537038238c99 100644 --- a/code/lib/cli/src/proxy.ts +++ b/code/lib/cli/src/proxy.ts @@ -3,14 +3,13 @@ import { versions } from '@storybook/core/common'; const args = process.argv.slice(2); -// Forward some commands to @storybook/toolbox if (['dev', 'build'].includes(args[0])) { require('@storybook/core/cli/bin'); } else { const proxiedArgs = args[0] === 'init' ? [`create-storybook@${versions.storybook}`, ...args.slice(1)] - : [`@storybook/toolbox@${versions.storybook}`, ...args]; + : [`@storybook/cli@${versions.storybook}`, ...args]; const command = ['npx', '--yes', ...proxiedArgs]; console.log(command.join(' ')); const child = spawn(command[0], command.slice(1), { stdio: 'inherit' }); diff --git a/code/lib/toolbox/README.md b/code/lib/toolbox/README.md deleted file mode 100644 index ac92f2c8e096..000000000000 --- a/code/lib/toolbox/README.md +++ /dev/null @@ -1,49 +0,0 @@ -# Storybook - -## CLI - -Storybook CLI (_Command Line Interface_) is the easiest way to add [Storybook](https://github.com/storybookjs/storybook) to your project. - -![Screenshot](docs/getstorybook.png) - -Go to your project and run: - -```sh -cd my-app -npx sb@latest init -``` - -In addition to `init`, the CLI also has other commands: - -- `add` - add an addon and register it -- `info` - print out system information for bug reports -- `upgrade` - upgrade to the latest version of Storybook (or a specific version) -- `migrate` - run codemods to migrate your code - -See the command-line help with `-h` (including other useful commands) for details. - -## Core APIs - -This package has multiple sub-exports to can be used to gain access to storybook's APIs. - -### `storybook/components` - -This export contains a list of components very useful for building out addons. -We recommend addon-authors to use these components to ensure a consistent look and feel, and to reduce the amount of code they need to write. - -### `storybook/theming` - -This export exposes a few utility functions to help writing components that automatically adapt to the current theme. -Useful for addon authors who want to make their addons theme-aware. - -### `storybook/preview-api` - -This export contains the API that is available in the preview iframe. - -### `storybook/manager-api` - -This export contains the API that is available in the manager iframe. - -### `storybook/types` - -This export exposes a lot of TypeScript interfaces used throughout storybook, including for storybook configuration, addons etc. diff --git a/code/lib/toolbox/package.json b/code/lib/toolbox/package.json deleted file mode 100644 index 82d0568ca059..000000000000 --- a/code/lib/toolbox/package.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "name": "@storybook/toolbox", - "version": "8.3.0-alpha.0", - "description": "Storybook's Toolbox", - "homepage": "https://github.com/storybookjs/storybook/tree/next/code/lib/toolbox", - "bugs": { - "url": "https://github.com/storybookjs/storybook/issues" - }, - "repository": { - "type": "git", - "url": "https://github.com/storybookjs/storybook.git", - "directory": "code/lib/toolbox" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/storybook" - }, - "license": "MIT", - "author": "Storybook Team", - "type": "module", - "exports": { - "./bin/index.cjs": { - "node": "./bin/index.cjs", - "require": "./bin/index.cjs" - }, - "./package.json": "./package.json" - }, - "bin": "./bin/index.cjs", - "files": [ - "bin/**/*", - "dist/**/*", - "README.md", - "!src/**/*" - ], - "scripts": { - "check": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/check.ts", - "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts" - }, - "dependencies": { - "@babel/core": "^7.24.4", - "@babel/types": "^7.24.0", - "@storybook/codemod": "workspace:*", - "@types/semver": "^7.3.4", - "chalk": "^4.1.0", - "commander": "^6.2.1", - "create-storybook": "workspace:*", - "cross-spawn": "^7.0.3", - "envinfo": "^7.7.3", - "fd-package-json": "^1.2.0", - "find-up": "^5.0.0", - "fs-extra": "^11.1.0", - "giget": "^1.0.0", - "globby": "^14.0.1", - "jscodeshift": "^0.15.1", - "leven": "^3.1.0", - "prompts": "^2.4.0", - "semver": "^7.3.7", - "storybook": "workspace:*", - "tempy": "^3.1.0", - "tiny-invariant": "^1.3.1", - "ts-dedent": "^2.0.0" - }, - "devDependencies": { - "@types/cross-spawn": "^6.0.2", - "@types/prompts": "^2.0.9", - "boxen": "^7.1.1", - "slash": "^5.0.0", - "strip-ansi": "^7.1.0", - "typescript": "^5.3.2" - }, - "publishConfig": { - "access": "public" - }, - "bundler": { - "entries": [ - "./src/index.ts", - "./src/bin/index.ts" - ], - "platform": "node" - }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" -} diff --git a/code/lib/toolbox/project.json b/code/lib/toolbox/project.json deleted file mode 100644 index f40771fc4588..000000000000 --- a/code/lib/toolbox/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "toolbox", - "$schema": "../../node_modules/nx/schemas/project-schema.json", - "projectType": "library", - "targets": { - "build": {} - } -} diff --git a/code/lib/toolbox/vitest.config.ts b/code/lib/toolbox/vitest.config.ts deleted file mode 100644 index 03172200442f..000000000000 --- a/code/lib/toolbox/vitest.config.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; - -export default mergeConfig( - vitestCommonConfig, - defineConfig({ - // Add custom config here - }) -); diff --git a/code/yarn.lock b/code/yarn.lock index 93431cf7e12b..a81d304deca9 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5640,10 +5640,36 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/cli@workspace:lib/cli-storybook" dependencies: + "@babel/core": "npm:^7.24.4" + "@babel/types": "npm:^7.24.0" + "@storybook/codemod": "workspace:*" + "@types/cross-spawn": "npm:^6.0.2" + "@types/prompts": "npm:^2.0.9" + "@types/semver": "npm:^7.3.4" + boxen: "npm:^7.1.1" + chalk: "npm:^4.1.0" + commander: "npm:^6.2.1" + create-storybook: "workspace:*" + cross-spawn: "npm:^7.0.3" + envinfo: "npm:^7.7.3" + fd-package-json: "npm:^1.2.0" + find-up: "npm:^5.0.0" + fs-extra: "npm:^11.1.0" + giget: "npm:^1.0.0" + globby: "npm:^14.0.1" + jscodeshift: "npm:^0.15.1" + leven: "npm:^3.1.0" + prompts: "npm:^2.4.0" + semver: "npm:^7.3.7" + slash: "npm:^5.0.0" storybook: "workspace:*" + strip-ansi: "npm:^7.1.0" + tempy: "npm:^3.1.0" + tiny-invariant: "npm:^1.3.1" + ts-dedent: "npm:^2.0.0" + typescript: "npm:^5.3.2" bin: - sb: ./index.js - storybook: ./index.js + cli: ./bin/index.cjs languageName: unknown linkType: soft @@ -6787,43 +6813,6 @@ __metadata: languageName: unknown linkType: soft -"@storybook/toolbox@workspace:lib/toolbox": - version: 0.0.0-use.local - resolution: "@storybook/toolbox@workspace:lib/toolbox" - dependencies: - "@babel/core": "npm:^7.24.4" - "@babel/types": "npm:^7.24.0" - "@storybook/codemod": "workspace:*" - "@types/cross-spawn": "npm:^6.0.2" - "@types/prompts": "npm:^2.0.9" - "@types/semver": "npm:^7.3.4" - boxen: "npm:^7.1.1" - chalk: "npm:^4.1.0" - commander: "npm:^6.2.1" - create-storybook: "workspace:*" - cross-spawn: "npm:^7.0.3" - envinfo: "npm:^7.7.3" - fd-package-json: "npm:^1.2.0" - find-up: "npm:^5.0.0" - fs-extra: "npm:^11.1.0" - giget: "npm:^1.0.0" - globby: "npm:^14.0.1" - jscodeshift: "npm:^0.15.1" - leven: "npm:^3.1.0" - prompts: "npm:^2.4.0" - semver: "npm:^7.3.7" - slash: "npm:^5.0.0" - storybook: "workspace:*" - strip-ansi: "npm:^7.1.0" - tempy: "npm:^3.1.0" - tiny-invariant: "npm:^1.3.1" - ts-dedent: "npm:^2.0.0" - typescript: "npm:^5.3.2" - bin: - toolbox: ./bin/index.cjs - languageName: unknown - linkType: soft - "@storybook/types@workspace:*, @storybook/types@workspace:deprecated/types": version: 0.0.0-use.local resolution: "@storybook/types@workspace:deprecated/types" diff --git a/scripts/create-nx-sandbox-projects.ts b/scripts/create-nx-sandbox-projects.ts index 8c451ca31caa..6e9b8a6029d4 100644 --- a/scripts/create-nx-sandbox-projects.ts +++ b/scripts/create-nx-sandbox-projects.ts @@ -1,4 +1,4 @@ -import * as templates from '../code/lib/toolbox/src/sandbox-templates'; +import * as templates from '../code/lib/cli-storybook/src/sandbox-templates'; import * as fs from 'fs'; import * as path from 'path'; diff --git a/scripts/event-log-checker.ts b/scripts/event-log-checker.ts index 1132283d8120..164431aa342c 100644 --- a/scripts/event-log-checker.ts +++ b/scripts/event-log-checker.ts @@ -1,7 +1,7 @@ import chalk from 'chalk'; import assert from 'assert'; import { esMain } from './utils/esmain'; -import { allTemplates } from '../code/lib/toolbox/src/sandbox-templates'; +import { allTemplates } from '../code/lib/cli-storybook/src/sandbox-templates'; import versions from '../code/core/src/common/versions'; import { oneWayHash } from '../code/core/src/telemetry/one-way-hash'; diff --git a/scripts/get-template.ts b/scripts/get-template.ts index 0b67cd0abd88..166f191fc6de 100644 --- a/scripts/get-template.ts +++ b/scripts/get-template.ts @@ -11,7 +11,7 @@ import { type Cadence, type Template as TTemplate, type SkippableTask, -} from '../code/lib/toolbox/src/sandbox-templates'; +} from '../code/lib/cli-storybook/src/sandbox-templates'; import { SANDBOX_DIRECTORY } from './utils/constants'; const sandboxDir = process.env.SANDBOX_ROOT || SANDBOX_DIRECTORY; diff --git a/scripts/sandbox/generate.ts b/scripts/sandbox/generate.ts index baa0a628129b..7ab6406cc0ce 100755 --- a/scripts/sandbox/generate.ts +++ b/scripts/sandbox/generate.ts @@ -9,7 +9,7 @@ import { esMain } from '../utils/esmain'; import type { OptionValues } from '../utils/options'; import { createOptions } from '../utils/options'; -import { allTemplates as sandboxTemplates } from '../../code/lib/toolbox/src/sandbox-templates'; +import { allTemplates as sandboxTemplates } from '../../code/lib/cli-storybook/src/sandbox-templates'; import storybookVersions from '../../code/core/src/common/versions'; import { JsPackageManagerFactory } from '../../code/core/src/common/js-package-manager/JsPackageManagerFactory'; diff --git a/scripts/sandbox/utils/template.ts b/scripts/sandbox/utils/template.ts index 24453b9f4f1b..5f5228a46dc5 100644 --- a/scripts/sandbox/utils/template.ts +++ b/scripts/sandbox/utils/template.ts @@ -2,7 +2,7 @@ import { render } from 'ejs'; import { readFile } from 'fs-extra'; import prettier from 'prettier'; import type { GeneratorConfig } from './types'; -import { allTemplates as sandboxTemplates } from '../../../code/lib/toolbox/src/sandbox-templates'; +import { allTemplates as sandboxTemplates } from '../../../code/lib/cli-storybook/src/sandbox-templates'; export async function renderTemplate(templatePath: string, templateData: Record) { const template = await readFile(templatePath, 'utf8'); diff --git a/scripts/task.ts b/scripts/task.ts index 2d62a71a2ee2..857a87c75bbc 100644 --- a/scripts/task.ts +++ b/scripts/task.ts @@ -32,7 +32,7 @@ import { allTemplates as TEMPLATES, type TemplateKey, type Template, -} from '../code/lib/toolbox/src/sandbox-templates'; +} from '../code/lib/cli-storybook/src/sandbox-templates'; import { version } from '../code/package.json'; diff --git a/scripts/tasks/sandbox-parts.ts b/scripts/tasks/sandbox-parts.ts index cb0fc67b7557..bcde26616339 100644 --- a/scripts/tasks/sandbox-parts.ts +++ b/scripts/tasks/sandbox-parts.ts @@ -41,7 +41,7 @@ import { import { workspacePath } from '../utils/workspace'; import { babelParse } from '../../code/core/src/csf-tools/babelParse'; import { CODE_DIRECTORY, REPROS_DIRECTORY } from '../utils/constants'; -import type { TemplateKey } from '../../code/lib/toolbox/src/sandbox-templates'; +import type { TemplateKey } from '../../code/lib/cli-storybook/src/sandbox-templates'; import { isFunction } from 'lodash'; const logger = console; diff --git a/scripts/utils/cli-step.ts b/scripts/utils/cli-step.ts index 2ceb6f867443..c05e03041891 100644 --- a/scripts/utils/cli-step.ts +++ b/scripts/utils/cli-step.ts @@ -5,7 +5,7 @@ import { exec } from './exec'; const require = createRequire(import.meta.url); const cliExecutable = require.resolve('../../code/lib/cli/bin/index.cjs'); -const toolboxExecutable = require.resolve('../../code/lib/toolbox/bin/index.cjs'); +const toolboxExecutable = require.resolve('../../code/lib/cli-storybook/bin/index.cjs'); const createStorybookExecutable = require.resolve('../../code/lib/create-storybook/bin/index.cjs'); export type CLIStep = { From d0855031986772cc3ceb8f51f2253349bac76b92 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Thu, 11 Jul 2024 12:50:29 +0200 Subject: [PATCH 24/33] Remove console.log --- code/lib/cli/src/proxy.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/code/lib/cli/src/proxy.ts b/code/lib/cli/src/proxy.ts index 537038238c99..eee009524c59 100644 --- a/code/lib/cli/src/proxy.ts +++ b/code/lib/cli/src/proxy.ts @@ -11,7 +11,6 @@ if (['dev', 'build'].includes(args[0])) { ? [`create-storybook@${versions.storybook}`, ...args.slice(1)] : [`@storybook/cli@${versions.storybook}`, ...args]; const command = ['npx', '--yes', ...proxiedArgs]; - console.log(command.join(' ')); const child = spawn(command[0], command.slice(1), { stdio: 'inherit' }); child.on('exit', (code) => { if (code != null) { From fdea28d7c5fe33dafa4555e8fd487f22fb88cfc8 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 11 Jul 2024 18:34:47 +0200 Subject: [PATCH 25/33] dedupe dependencies --- code/yarn.lock | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/code/yarn.lock b/code/yarn.lock index a81d304deca9..85d7270c9060 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -7949,14 +7949,7 @@ __metadata: languageName: node linkType: hard -"@types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4, @types/semver@npm:^7.5.0, @types/semver@npm:^7.5.6": - version: 7.5.7 - resolution: "@types/semver@npm:7.5.7" - checksum: 10c0/fb72d8b86a7779650f14ae89542f1da2ab624adb8188d98754b1d29a2fe3d41f0348bf9435b60ad145df1812fd2a09b3256779aa23b532c199f3dee59619a1eb - languageName: node - linkType: hard - -"@types/semver@npm:^7.5.8": +"@types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4, @types/semver@npm:^7.5.0, @types/semver@npm:^7.5.6, @types/semver@npm:^7.5.8": version: 7.5.8 resolution: "@types/semver@npm:7.5.8" checksum: 10c0/8663ff927234d1c5fcc04b33062cb2b9fcfbe0f5f351ed26c4d1e1581657deebd506b41ff7fdf89e787e3d33ce05854bc01686379b89e9c49b564c4cfa988efa @@ -24764,7 +24757,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.6.0, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.2.1, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0": +"semver@npm:7.6.0": version: 7.6.0 resolution: "semver@npm:7.6.0" dependencies: @@ -24793,7 +24786,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.6.2": +"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.2.1, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.2": version: 7.6.2 resolution: "semver@npm:7.6.2" bin: From d2b2c5195eb97fa982864ef28cc40cc24fbbf448 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 11 Jul 2024 18:36:51 +0200 Subject: [PATCH 26/33] remove tempy --- code/core/package.json | 1 - code/core/src/cli/dirs.ts | 5 ++--- code/yarn.lock | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/core/package.json b/code/core/package.json index 53096c8f7738..a335f4a8734d 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -271,7 +271,6 @@ "process": "^0.11.10", "recast": "^0.23.5", "semver": "^7.6.2", - "tempy": "^3.1.0", "ws": "^8.2.3" }, "devDependencies": { diff --git a/code/core/src/cli/dirs.ts b/code/core/src/cli/dirs.ts index 0580b352a948..88515e6b6683 100644 --- a/code/core/src/cli/dirs.ts +++ b/code/core/src/cli/dirs.ts @@ -7,12 +7,11 @@ import invariant from 'tiny-invariant'; import { externalFrameworks } from './project_types'; import type { SupportedRenderers } from './project_types'; import type { JsPackageManager } from '@storybook/core/common'; -import { versions } from '@storybook/core/common'; +import { temporaryDirectory, versions } from '@storybook/core/common'; import type { SupportedFrameworks } from '@storybook/core/types'; const resolveUsingBranchInstall = async (packageManager: JsPackageManager, request: string) => { - const { temporaryDirectory } = await import('tempy'); - const tempDirectory = temporaryDirectory(); + const tempDirectory = await temporaryDirectory(); const name = request as keyof typeof versions; // FIXME: this might not be the right version for community packages diff --git a/code/yarn.lock b/code/yarn.lock index 85d7270c9060..65eb00283db0 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5893,7 +5893,6 @@ __metadata: store2: "npm:^2.14.2" strip-json-comments: "npm:^3.1.1" telejson: "npm:^7.2.0" - tempy: "npm:^3.1.0" tiny-invariant: "npm:^1.3.1" tinyspy: "npm:^2.2.0" ts-dedent: "npm:^2.0.0" From d620b38e5e6ee8a27c9b4e760e0e4e7a55d3ddf3 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 11 Jul 2024 19:03:41 +0200 Subject: [PATCH 27/33] remove tempy completely --- code/lib/cli-storybook/package.json | 1 - .../cli-storybook/src/automigrate/index.ts | 4 ++-- code/lib/cli-storybook/src/doctor/index.ts | 5 ++--- code/yarn.lock | 20 ------------------- 4 files changed, 4 insertions(+), 26 deletions(-) diff --git a/code/lib/cli-storybook/package.json b/code/lib/cli-storybook/package.json index 5ab6a4e85c23..8694884ead6f 100644 --- a/code/lib/cli-storybook/package.json +++ b/code/lib/cli-storybook/package.json @@ -59,7 +59,6 @@ "prompts": "^2.4.0", "semver": "^7.3.7", "storybook": "workspace:*", - "tempy": "^3.1.0", "tiny-invariant": "^1.3.1", "ts-dedent": "^2.0.0" }, diff --git a/code/lib/cli-storybook/src/automigrate/index.ts b/code/lib/cli-storybook/src/automigrate/index.ts index 0442a246141b..29af9a9142d1 100644 --- a/code/lib/cli-storybook/src/automigrate/index.ts +++ b/code/lib/cli-storybook/src/automigrate/index.ts @@ -11,6 +11,7 @@ import { type JsPackageManager, getCoercedStorybookVersion, getStorybookInfo, + temporaryFile, } from 'storybook/internal/common'; import type { @@ -40,8 +41,7 @@ const originalStdOutWrite = process.stdout.write.bind(process.stdout); const originalStdErrWrite = process.stderr.write.bind(process.stdout); const augmentLogsToFile = async () => { - const { temporaryFile } = await import('tempy'); - TEMP_LOG_FILE_PATH = temporaryFile({ name: LOG_FILE_NAME }); + TEMP_LOG_FILE_PATH = await temporaryFile({ name: LOG_FILE_NAME }); const logStream = createWriteStream(TEMP_LOG_FILE_PATH); process.stdout.write = (d: string) => { diff --git a/code/lib/cli-storybook/src/doctor/index.ts b/code/lib/cli-storybook/src/doctor/index.ts index ac395ff9d8b4..7ae65c92aac5 100644 --- a/code/lib/cli-storybook/src/doctor/index.ts +++ b/code/lib/cli-storybook/src/doctor/index.ts @@ -4,7 +4,7 @@ import { createWriteStream, move, remove } from 'fs-extra'; import { dedent } from 'ts-dedent'; import { join } from 'path'; -import { JsPackageManagerFactory } from 'storybook/internal/common'; +import { JsPackageManagerFactory, temporaryFile } from 'storybook/internal/common'; import type { PackageManagerName } from 'storybook/internal/common'; import { getStorybookData } from '../automigrate/helpers/mainConfigFile'; import { cleanLog } from '../automigrate/helpers/cleanLog'; @@ -24,8 +24,7 @@ const originalStdOutWrite = process.stdout.write.bind(process.stdout); const originalStdErrWrite = process.stderr.write.bind(process.stdout); const augmentLogsToFile = async () => { - const { temporaryFile } = await import('tempy'); - TEMP_LOG_FILE_PATH = temporaryFile({ name: LOG_FILE_NAME }); + TEMP_LOG_FILE_PATH = await temporaryFile({ name: LOG_FILE_NAME }); const logStream = createWriteStream(TEMP_LOG_FILE_PATH); process.stdout.write = (d: string) => { diff --git a/code/yarn.lock b/code/yarn.lock index 65eb00283db0..6b42ea677355 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5664,7 +5664,6 @@ __metadata: slash: "npm:^5.0.0" storybook: "workspace:*" strip-ansi: "npm:^7.1.0" - tempy: "npm:^3.1.0" tiny-invariant: "npm:^1.3.1" ts-dedent: "npm:^2.0.0" typescript: "npm:^5.3.2" @@ -26233,13 +26232,6 @@ __metadata: languageName: node linkType: hard -"temp-dir@npm:^3.0.0": - version: 3.0.0 - resolution: "temp-dir@npm:3.0.0" - checksum: 10c0/a86978a400984cd5f315b77ebf3fe53bb58c61f192278cafcb1f3fb32d584a21dc8e08b93171d7874b7cc972234d3455c467306cc1bfc4524b622e5ad3bfd671 - languageName: node - linkType: hard - "temp@npm:^0.8.4": version: 0.8.4 resolution: "temp@npm:0.8.4" @@ -26249,18 +26241,6 @@ __metadata: languageName: node linkType: hard -"tempy@npm:^3.1.0": - version: 3.1.0 - resolution: "tempy@npm:3.1.0" - dependencies: - is-stream: "npm:^3.0.0" - temp-dir: "npm:^3.0.0" - type-fest: "npm:^2.12.2" - unique-string: "npm:^3.0.0" - checksum: 10c0/b88e70baa8d935ba8f0e0372b59ad1a961121f098da5fb4a6e05bec98ec32a49026b553532fb75c1c102ec782fd4c6a6bde0d46cbe87013fa324451ce476fb76 - languageName: node - linkType: hard - "terser-webpack-plugin@npm:*, terser-webpack-plugin@npm:^5.3.1, terser-webpack-plugin@npm:^5.3.10": version: 5.3.10 resolution: "terser-webpack-plugin@npm:5.3.10" From 307601b604880a7117d40d3b2a21ab61857d2653 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 11 Jul 2024 19:27:57 +0200 Subject: [PATCH 28/33] upgrade newly added dependencies in core --- code/core/package.json | 6 +++--- code/yarn.lock | 27 ++++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/code/core/package.json b/code/core/package.json index a335f4a8734d..44737dba2172 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -341,7 +341,7 @@ "css": "^3.0.0", "deep-object-diff": "^1.1.0", "dequal": "^2.0.2", - "detect-indent": "^6.1.0", + "detect-indent": "^7.0.1", "detect-package-manager": "^3.0.2", "detect-port": "^1.3.0", "diff": "^5.2.0", @@ -366,7 +366,7 @@ "js-yaml": "^4.1.0", "jsdoc-type-pratt-parser": "^4.0.0", "lazy-universal-dotenv": "^4.0.0", - "leven": "^3.1.0", + "leven": "^4.0.0", "lodash": "^4.17.21", "markdown-to-jsx": "^7.4.5", "memoizerific": "^1.11.3", @@ -394,7 +394,7 @@ "resolve-from": "^5.0.0", "slash": "^5.0.0", "store2": "^2.14.2", - "strip-json-comments": "^3.1.1", + "strip-json-comments": "^5.0.1", "telejson": "^7.2.0", "tiny-invariant": "^1.3.1", "tinyspy": "^2.2.0", diff --git a/code/yarn.lock b/code/yarn.lock index 6b42ea677355..baf0a3fda6ca 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5833,7 +5833,7 @@ __metadata: css: "npm:^3.0.0" deep-object-diff: "npm:^1.1.0" dequal: "npm:^2.0.2" - detect-indent: "npm:^6.1.0" + detect-indent: "npm:^7.0.1" detect-package-manager: "npm:^3.0.2" detect-port: "npm:^1.3.0" diff: "npm:^5.2.0" @@ -5859,7 +5859,7 @@ __metadata: js-yaml: "npm:^4.1.0" jsdoc-type-pratt-parser: "npm:^4.0.0" lazy-universal-dotenv: "npm:^4.0.0" - leven: "npm:^3.1.0" + leven: "npm:^4.0.0" lodash: "npm:^4.17.21" markdown-to-jsx: "npm:^7.4.5" memoizerific: "npm:^1.11.3" @@ -5890,7 +5890,7 @@ __metadata: semver: "npm:^7.6.2" slash: "npm:^5.0.0" store2: "npm:^2.14.2" - strip-json-comments: "npm:^3.1.1" + strip-json-comments: "npm:^5.0.1" telejson: "npm:^7.2.0" tiny-invariant: "npm:^1.3.1" tinyspy: "npm:^2.2.0" @@ -12716,6 +12716,13 @@ __metadata: languageName: node linkType: hard +"detect-indent@npm:^7.0.1": + version: 7.0.1 + resolution: "detect-indent@npm:7.0.1" + checksum: 10c0/47b6e3e3dda603c386e73b129f3e84844ae59bc2615f5072becf3cc02eab400bed5a4e6379c49d0b18cf630e80c2b07e87e0038b777addbc6ef793ad77dd05bc + languageName: node + linkType: hard + "detect-libc@npm:^2.0.3": version: 2.0.3 resolution: "detect-libc@npm:2.0.3" @@ -18379,6 +18386,13 @@ __metadata: languageName: node linkType: hard +"leven@npm:^4.0.0": + version: 4.0.0 + resolution: "leven@npm:4.0.0" + checksum: 10c0/393bd949d93103d9ef487be96321bdb02c2e7695e372193f650642e1ad653c61b03da16bf55e45d442db59c7b6407eb947a7748b5777e48ddf0ada25f8b2a815 + languageName: node + linkType: hard + "levn@npm:^0.4.1": version: 0.4.1 resolution: "levn@npm:0.4.1" @@ -25840,6 +25854,13 @@ __metadata: languageName: node linkType: hard +"strip-json-comments@npm:^5.0.1": + version: 5.0.1 + resolution: "strip-json-comments@npm:5.0.1" + checksum: 10c0/c9d9d55a0167c57aa688df3aa20628cf6f46f0344038f189eaa9d159978e80b2bfa6da541a40d83f7bde8a3554596259bf6b70578b2172356536a0e3fa5a0982 + languageName: node + linkType: hard + "strip-literal@npm:^1.3.0": version: 1.3.0 resolution: "strip-literal@npm:1.3.0" From b5eca07bcb9af34ea9e4d5546a4c77ea51eb402f Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 11 Jul 2024 19:33:04 +0200 Subject: [PATCH 29/33] remove unneeded tsconfig --- code/lib/cli-storybook/tsconfig.json | 8 +------- code/lib/create-storybook/tsconfig.json | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/code/lib/cli-storybook/tsconfig.json b/code/lib/cli-storybook/tsconfig.json index 9c5db279ca2d..73a65ef2ef6e 100644 --- a/code/lib/cli-storybook/tsconfig.json +++ b/code/lib/cli-storybook/tsconfig.json @@ -1,11 +1,5 @@ { "extends": "../../tsconfig.json", - "compilerOptions": { - "types": ["node"], - "strict": true, - "skipLibCheck": true, - "resolveJsonModule": true, - "noEmit": true - }, + "compilerOptions": {}, "include": ["src/**/*"] } diff --git a/code/lib/create-storybook/tsconfig.json b/code/lib/create-storybook/tsconfig.json index 9c5db279ca2d..73a65ef2ef6e 100644 --- a/code/lib/create-storybook/tsconfig.json +++ b/code/lib/create-storybook/tsconfig.json @@ -1,11 +1,5 @@ { "extends": "../../tsconfig.json", - "compilerOptions": { - "types": ["node"], - "strict": true, - "skipLibCheck": true, - "resolveJsonModule": true, - "noEmit": true - }, + "compilerOptions": {}, "include": ["src/**/*"] } From bb99ab9c91d1a714c32a334d28b44457e490daa1 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 11 Jul 2024 21:04:43 +0200 Subject: [PATCH 30/33] remove unused dependency --- code/core/package.json | 1 - code/yarn.lock | 14 -------------- 2 files changed, 15 deletions(-) diff --git a/code/core/package.json b/code/core/package.json index 44737dba2172..cf938efb2c0f 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -288,7 +288,6 @@ "@emotion/styled": "^11.11.0", "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1", "@fal-works/esbuild-plugin-global-externals": "^2.1.2", - "@ndelangen/fs-extra-unified": "^1.0.3", "@ndelangen/get-tarball": "^3.0.7", "@popperjs/core": "^2.6.0", "@radix-ui/react-dialog": "^1.0.5", diff --git a/code/yarn.lock b/code/yarn.lock index baf0a3fda6ca..f62753a52925 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -3757,19 +3757,6 @@ __metadata: languageName: node linkType: hard -"@ndelangen/fs-extra-unified@npm:^1.0.3": - version: 1.0.3 - resolution: "@ndelangen/fs-extra-unified@npm:1.0.3" - peerDependencies: - "@types/fs-extra": ^11.0.0 - fs-extra: ^11.0.0 - peerDependenciesMeta: - "@types/fs-extra": - optional: true - checksum: 10c0/397e94eb34a644e33bb7e0cf263da2758efb44924dd6b4bd90e82184868cf4dca5f116b628a9dd0837e3c5c9a36735069bec4312f5d6be2b9997cb0fd3712aaa - languageName: node - linkType: hard - "@ndelangen/get-tarball@npm:^3.0.7": version: 3.0.9 resolution: "@ndelangen/get-tarball@npm:3.0.9" @@ -5777,7 +5764,6 @@ __metadata: "@emotion/styled": "npm:^11.11.0" "@emotion/use-insertion-effect-with-fallbacks": "npm:^1.0.1" "@fal-works/esbuild-plugin-global-externals": "npm:^2.1.2" - "@ndelangen/fs-extra-unified": "npm:^1.0.3" "@ndelangen/get-tarball": "npm:^3.0.7" "@popperjs/core": "npm:^2.6.0" "@radix-ui/react-dialog": "npm:^1.0.5" From 11c8d3d6c187f308a40905bba221915cf218806b Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 1 Aug 2024 17:49:39 +0200 Subject: [PATCH 31/33] fix test --- .../fixes/missing-storybook-dependencies.test.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/lib/cli-storybook/src/automigrate/fixes/missing-storybook-dependencies.test.ts b/code/lib/cli-storybook/src/automigrate/fixes/missing-storybook-dependencies.test.ts index 52f0e42d8ff0..14b07e905dee 100644 --- a/code/lib/cli-storybook/src/automigrate/fixes/missing-storybook-dependencies.test.ts +++ b/code/lib/cli-storybook/src/automigrate/fixes/missing-storybook-dependencies.test.ts @@ -9,9 +9,11 @@ vi.mock('globby', () => ({ globby: vi.fn().mockResolvedValue(['.storybook/manager.ts', 'path/to/file.stories.tsx']), })); -vi.mock('node:fs/promises', () => ({ - __esModule: true, - readFile: vi.fn().mockResolvedValue(` +vi.mock('node:fs/promises', async (importOriginal) => { + const original = (await importOriginal()) as typeof import('node:fs/promises'); + return { + ...original, + readFile: vi.fn().mockResolvedValue(` // these are NOT installed, will be reported import { someFunction } from '@storybook/preview-api'; import { anotherFunction } from '@storybook/manager-api'; @@ -19,7 +21,8 @@ vi.mock('node:fs/promises', () => ({ // this IS installed, will not be reported import { yetAnotherFunction } from '@storybook/theming'; `), -})); + }; +}); vi.mock('../../helpers', () => ({ getStorybookVersionSpecifier: vi.fn().mockReturnValue('^8.1.10'), @@ -111,12 +114,12 @@ describe('missingStorybookDependencies', () => { expect(mockPackageManager.addDependencies).toHaveBeenNthCalledWith( 1, { installAsDevDependencies: true }, - ['@storybook/preview-api@8.1.10', '@storybook/manager-api@8.1.10'] + ['@storybook/preview-api@8.1.0', '@storybook/manager-api@8.1.0'] ); expect(mockPackageManager.addDependencies).toHaveBeenNthCalledWith( 2, { installAsDevDependencies: true, skipInstall: true, packageJson: expect.anything() }, - ['@storybook/preview-api@^8.1.10', '@storybook/manager-api@^8.1.10'] + ['@storybook/preview-api@8.1.0', '@storybook/manager-api@8.1.0'] ); }); }); From 59a00690a63127f86df234aa9e151086784a1aa1 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 1 Aug 2024 17:58:03 +0200 Subject: [PATCH 32/33] add proxy --- scripts/verdaccio.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/verdaccio.yaml b/scripts/verdaccio.yaml index 6bb220a09948..9ac5a6ef6932 100644 --- a/scripts/verdaccio.yaml +++ b/scripts/verdaccio.yaml @@ -125,6 +125,10 @@ packages: access: $all publish: $all + 'create-storybook': + access: $all + publish: $all + 'storybook': access: $all publish: $all From 4d7a006cb6423619f2b6da365ef74f3a96c6818d Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 2 Aug 2024 09:34:48 +0200 Subject: [PATCH 33/33] fix --- code/core/src/common/versions.ts | 2 +- code/lib/create-storybook/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/core/src/common/versions.ts b/code/core/src/common/versions.ts index 3e8729aa819a..9f3f0bae9b18 100644 --- a/code/core/src/common/versions.ts +++ b/code/core/src/common/versions.ts @@ -62,7 +62,7 @@ export default { '@storybook/cli': '8.3.0-alpha.3', '@storybook/codemod': '8.3.0-alpha.3', '@storybook/core-webpack': '8.3.0-alpha.3', - 'create-storybook': '8.3.0-alpha.0', + 'create-storybook': '8.3.0-alpha.3', '@storybook/csf-plugin': '8.3.0-alpha.3', '@storybook/instrumenter': '8.3.0-alpha.3', '@storybook/react-dom-shim': '8.3.0-alpha.3', diff --git a/code/lib/create-storybook/package.json b/code/lib/create-storybook/package.json index 7d9cdee582ca..fc7b4dfec97b 100644 --- a/code/lib/create-storybook/package.json +++ b/code/lib/create-storybook/package.json @@ -1,6 +1,6 @@ { "name": "create-storybook", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.3", "description": "Initialize Storybook into your project", "homepage": "https://github.com/storybookjs/storybook/tree/next/code/lib/create-storybook", "bugs": {