fix: use applyOptionsChain

web-infra-dev · Oct 19, 2023 · 6722e3e · 6722e3e
1 parent 2f6179f
commit 6722e3e
Show file tree

Hide file tree

Showing 9 changed files with 2,287 additions and 107 deletions.
diff --git a/packages/generator/generator-cases/tests/index.test.ts b/packages/generator/generator-cases/tests/index.test.ts
@@ -22,7 +22,7 @@ describe('test generator cases', () => {
   });
   test('test getMWANewCases', async () => {
     const mwaNewCases = getMWANewCases();
-    expect(mwaNewCases.length).toBe(13);
+    expect(mwaNewCases.length).toBe(14);
   });
   test('test getModuleNewCases', async () => {
     const moduleNewCases = getModuleNewCases();

diff --git a/packages/generator/generator-common/tests/newAction.test.ts b/packages/generator/generator-common/tests/newAction.test.ts
@@ -8,6 +8,6 @@ describe('new action test', () => {
     expect(ActionFunctionText[ActionFunction.Proxy]()).toBe('启用「全局代理」');
   });
   it('mwa', () => {
-    expect(MWAActionFunctions.length).toBe(10);
+    expect(MWAActionFunctions.length).toBe(11);
   });
 });
diff --git a/packages/storybook/builder/package.json b/packages/storybook/builder/package.json
@@ -76,18 +76,6 @@
     "@types/webpack-hot-middleware": "^2.25.6",
     "typescript": "^5.2.2"
   },
-  "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "workspace:^2.34.0",
-    "@modern-js/builder-webpack-provider": "workspace:^2.34.0"
-  },
-  "peerDependenciesMeta": {
-    "@modern-js/builder-rspack-provider": {
-      "optional": true
-    },
-    "@modern-js/builder-webpack-provider": {
-      "optional": true
-    }
-  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public",

diff --git a/packages/storybook/builder/src/addons/components/modern.tsx b/packages/storybook/builder/src/addons/components/modern.tsx
@@ -37,7 +37,6 @@ export const resolvePlugins = (runtime: IConfig['modernConfigRuntime']) => {
           plugins.push(state(runtime.state));
         }
       } else if (api === allowedRuntimeAPI.router) {
-        // TODO: React Router v6 is not supported yet
         plugins.push(
           router({
             ...{ serverBase: ['/'] },

diff --git a/packages/storybook/builder/src/plugin-storybook.ts b/packages/storybook/builder/src/plugin-storybook.ts
@@ -1,6 +1,6 @@
 /* eslint-disable max-lines */
 import { isAbsolute, join, resolve } from 'path';
-import { slash, watch, globby } from '@modern-js/utils';
+import { slash, watch, globby, applyOptionsChain } from '@modern-js/utils';
 import {
   BuilderPlugin,
   SharedBuilderConfig,
@@ -186,11 +186,13 @@ async function prepareStorybookModules(
   const [mappingsAlias, write] = await virtualModule(tempDir, cwd, mappings);
 
   builderConfig.source ??= {};
-  builderConfig.source.alias = {
-    ...builderConfig.source.alias,
-    ...storybookPaths,
-    ...mappingsAlias,
-  };
+  builderConfig.source.alias = applyOptionsChain(
+    {
+      ...storybookPaths,
+      ...mappingsAlias,
+    },
+    builderConfig.source.alias,
+  );
 
   if (isDev()) {
     const watcher = await watchStories(storyPatterns, cwd, write);
@@ -424,10 +426,12 @@ async function applyReact(config: AllBuilderConfig, options: Options) {
   const useReact17 = legacyRootApi ?? !isReact18;
   if (!useReact17) {
     config.source ??= {};
-    config.source.alias ??= {};
-    // @ts-expect-error
-    config.source.alias['@storybook/react-dom-shim'] =
-      '@storybook/react-dom-shim/dist/react-18';
+    config.source.alias = applyOptionsChain(
+      {
+        '@storybook/react-dom-shim': '@storybook/react-dom-shim/dist/react-18',
+      },
+      config.source.alias,
+    );
   }
 }
 

diff --git a/packages/storybook/framework/package.json b/packages/storybook/framework/package.json
@@ -47,6 +47,7 @@
   "dependencies": {
     "@modern-js/storybook-builder": "workspace:*",
     "@storybook/react": "^7.4.6",
+    "@modern-js/utils": "workspace:*",
     "storybook": "^7.4.6"
   },
   "devDependencies": {

diff --git a/packages/storybook/framework/src/preset.ts b/packages/storybook/framework/src/preset.ts
@@ -1,6 +1,7 @@
 import path from 'path';
 import type { Options } from '@storybook/types';
 import type { BuilderConfig } from '@modern-js/storybook-builder/types';
+import { applyOptionsChain } from '@modern-js/utils';
 
 export const frameworkOptions = async (_: never, options: Options) => {
   const config = await options.presets.apply('framework');
@@ -35,10 +36,12 @@ export const modern = (
     ...config,
     source: {
       ...config.source,
-      alias: {
-        ...config.source?.alias,
-        '@storybook/react': absPath('@storybook/react'),
-      },
+      alias: applyOptionsChain(
+        {
+          '@storybook/react': absPath('@storybook/react'),
+        },
+        config.source?.alias,
+      ),
     },
   };
 };

diff --git a/packages/storybook/framework/src/upgrade.ts b/packages/storybook/framework/src/upgrade.ts