fix: storybook v7 generator dependencies error

web-infra-dev · Oct 27, 2023 · a9d74c6 · a9d74c6
1 parent b90da8d
commit a9d74c6
Show file tree

Hide file tree

Showing 19 changed files with 64 additions and 87 deletions.
diff --git a/.changeset/slow-beans-bathe.md b/.changeset/slow-beans-bathe.md
@@ -0,0 +1,8 @@
+---
+'@modern-js/storybook-next-generator': patch
+'@modern-js/generator-common': patch
+---
+
+fix: storybook v7 generator dependencies error
+
+fix: storybook v7 生成器依赖安装错误
diff --git a/packages/generator/generator-common/src/newAction/module/index.ts b/packages/generator/generator-common/src/newAction/module/index.ts
@@ -13,6 +13,7 @@ export const ModuleActionFunctions = [
   ActionFunction.Test,
   ActionFunction.TailwindCSS,
   ActionFunction.Storybook,
+  ActionFunction.StorybookV7,
   ActionFunction.RuntimeApi,
 ];
 
@@ -66,6 +67,7 @@ export const ModuleActionFunctionsDevDependencies: Partial<
   Record<ActionFunction, string>
 > = {
   [ActionFunction.Storybook]: '@modern-js/plugin-storybook',
+  [ActionFunction.StorybookV7]: '@modern-js/storybook',
   [ActionFunction.Test]: '@modern-js/plugin-testing',
   [ActionFunction.RuntimeApi]: '@modern-js/runtime',
   [ActionFunction.TailwindCSS]: 'tailwindcss',
@@ -102,7 +104,6 @@ export const ModuleNewActionPluginName: Partial<
   [ActionType.Function]: {
     [ActionFunction.TailwindCSS]: 'tailwindcssPlugin',
     [ActionFunction.Storybook]: 'storybookPlugin',
-    [ActionFunction.StorybookV7]: 'storybookFramework',
     [ActionFunction.Test]: 'testPlugin',
   },
 };
@@ -114,6 +115,5 @@ export const ModuleNewActionPluginDependence: Partial<
     [ActionFunction.Test]: '@modern-js/plugin-testing',
     [ActionFunction.TailwindCSS]: '@modern-js/plugin-tailwindcss',
     [ActionFunction.Storybook]: '@modern-js/plugin-storybook',
-    [ActionFunction.StorybookV7]: '@modern-js/storybook',
   },
 };
diff --git a/packages/generator/generator-common/src/newAction/mwa/index.ts b/packages/generator/generator-common/src/newAction/mwa/index.ts
@@ -230,7 +230,6 @@ export const MWANewActionPluginDependence: Record<
     [ActionFunction.MicroFrontend]: '@modern-js/plugin-garfish',
     [ActionFunction.Test]: '@modern-js/plugin-testing',
     [ActionFunction.Storybook]: '@modern-js/plugin-storybook',
-    [ActionFunction.StorybookV7]: '@modern-js/storybook',
     [ActionFunction.SSG]: '@modern-js/plugin-ssg',
     [ActionFunction.Polyfill]: '@modern-js/plugin-polyfill',
     [ActionFunction.Proxy]: '@modern-js/plugin-proxy',

diff --git a/...ors/storybook-generator-next/.eslintrc.js → ...ors/storybook-next-generator/.eslintrc.js b/...ors/storybook-generator-next/.eslintrc.js → ...ors/storybook-next-generator/.eslintrc.js
diff --git a/...nerators/storybook-generator-next/LICENSE → ...nerators/storybook-next-generator/LICENSE b/...nerators/storybook-generator-next/LICENSE → ...nerators/storybook-next-generator/LICENSE
diff --git a/...rators/storybook-generator-next/README.md → ...rators/storybook-next-generator/README.md b/...rators/storybook-generator-next/README.md → ...rators/storybook-next-generator/README.md
diff --git a/...s/storybook-generator-next/jest.config.js → ...s/storybook-next-generator/jest.config.js b/...s/storybook-generator-next/jest.config.js → ...s/storybook-next-generator/jest.config.js
diff --git a/...storybook-generator-next/modern.config.js → ...storybook-next-generator/modern.config.js b/...storybook-generator-next/modern.config.js → ...storybook-next-generator/modern.config.js
diff --git a/...ors/storybook-generator-next/package.json → ...ors/storybook-next-generator/package.json b/...ors/storybook-generator-next/package.json → ...ors/storybook-next-generator/package.json
diff --git a/...ors/storybook-generator-next/src/index.ts → ...ors/storybook-next-generator/src/index.ts b/...ors/storybook-generator-next/src/index.ts → ...ors/storybook-next-generator/src/index.ts
@@ -8,17 +8,17 @@ import {
   fs,
   isReact18,
   getPackageVersion,
+  getPackageManagerText,
 } from '@modern-js/generator-utils';
 import {
   DependenceGenerator,
   i18n as commonI18n,
   Language,
 } from '@modern-js/generator-common';
-import { i18n } from './locale';
+import { i18n, localeKeys } from './locale';
 import { getMajorVersion } from './utils';
 
 const ADDON_ESSENTIAL = '@storybook/addon-essentials';
-const MODERN_STORYBOOK = '@modern-js/storybook';
 
 const getGeneratorPath = (generator: string, distTag: string) => {
   if (process.env.CODESMITH_ENV === 'development') {
@@ -75,14 +75,9 @@ const handleTemplateFile = async (
         react: isReact18(context.materials.default.basePath) ? '^18' : '^17',
       };
 
-  const { modernVersion } = context.config;
-
   const exitAddonsVersion =
     pkg.devDependencies?.[ADDON_ESSENTIAL] ||
     pkg.dependencies?.[ADDON_ESSENTIAL];
-  const isExitStorybook =
-    pkg.devDependencies?.[MODERN_STORYBOOK] ||
-    pkg.dependencies?.[MODERN_STORYBOOK];
 
   const latestVersion = await getPackageVersion(ADDON_ESSENTIAL);
   let availableVersion = latestVersion;
@@ -108,11 +103,6 @@ const handleTemplateFile = async (
 
   const addStorybookDependence = {
     [ADDON_ESSENTIAL]: availableVersion,
-    ...(!isExitStorybook
-      ? {
-          [MODERN_STORYBOOK]: modernVersion,
-        }
-      : {}),
   };
 
   const jsonAPI = new JsonAPI(generator);
@@ -164,7 +154,19 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => {
   generator.logger.debug(`context=${JSON.stringify(context)}`);
   generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
 
-  await handleTemplateFile(context, appApi, generator);
+  const { packageManager } = await handleTemplateFile(
+    context,
+    appApi,
+    generator,
+  );
+
+  if (context.config.isSubGenerator) {
+    appApi.showSuccessInfo(
+      i18n.t(localeKeys.success, {
+        packageManager: getPackageManagerText(packageManager),
+      }),
+    );
+  }
 
   generator.logger.debug(`forge @modern-js/storybook-next-generator succeed `);
 };
diff --git a/...storybook-generator-next/src/locale/en.ts → ...storybook-next-generator/src/locale/en.ts b/...storybook-generator-next/src/locale/en.ts → ...storybook-next-generator/src/locale/en.ts
diff --git a/...rybook-generator-next/src/locale/index.ts → ...rybook-next-generator/src/locale/index.ts b/...rybook-generator-next/src/locale/index.ts → ...rybook-next-generator/src/locale/index.ts
diff --git a/...storybook-generator-next/src/locale/zh.ts → ...storybook-next-generator/src/locale/zh.ts b/...storybook-generator-next/src/locale/zh.ts → ...storybook-next-generator/src/locale/zh.ts
diff --git a/...ors/storybook-generator-next/src/utils.ts → ...ors/storybook-next-generator/src/utils.ts b/...ors/storybook-generator-next/src/utils.ts → ...ors/storybook-next-generator/src/utils.ts
diff --git a/...emplates/stories/index.stories.handlebars → ...emplates/stories/index.stories.handlebars b/...emplates/stories/index.stories.handlebars → ...emplates/stories/index.stories.handlebars
diff --git a/...xt/templates/storybook-js/main.handlebars → ...or/templates/storybook-js/main.handlebars b/...xt/templates/storybook-js/main.handlebars → ...or/templates/storybook-js/main.handlebars
diff --git a/...xt/templates/storybook-ts/main.handlebars → ...or/templates/storybook-ts/main.handlebars b/...xt/templates/storybook-ts/main.handlebars → ...or/templates/storybook-ts/main.handlebars
diff --git a/...rs/storybook-generator-next/tsconfig.json → ...rs/storybook-next-generator/tsconfig.json b/...rs/storybook-generator-next/tsconfig.json → ...rs/storybook-next-generator/tsconfig.json