fix(preset): umi default alias cannot working with integrated mode

umijs · Dec 8, 2020 · ff46f60 · ff46f60
1 parent 0466067
commit ff46f60
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/packages/preset-dumi/src/plugins/features/init.ts b/packages/preset-dumi/src/plugins/features/init.ts
@@ -33,4 +33,14 @@ export default (api: IApi) => {
 
     return memo;
   });
+
+  // re-enable @ & @@ umi default alias for integrated mode
+  if (isIntegrateUmi) {
+    api.modifyDefaultConfig((memo) => {
+      memo.alias['@'] = api.paths.absSrcPath;
+      memo.alias['@@'] = api.paths.absTmpPath;
+
+      return memo;
+    });
+  }
 };
diff --git a/packages/preset-dumi/src/routes/getRouteConfig.ts b/packages/preset-dumi/src/routes/getRouteConfig.ts
@@ -20,11 +20,11 @@ export default async (api: IApi, opts: IDumiOpts): Promise<IRoute[]> => {
   const exampleRoutePrefix = opts.mode === 'site' ? '/_' : '/_examples/';
   const theme = await getTheme();
   const userRoutes = opts.isIntegrate
-    ? await api.applyPlugins({
+    ? (await api.applyPlugins({
         key: 'dumi.getRootRoute',
         type: api.ApplyPluginsType.modify,
         initialValue: api.userConfig.routes,
-      })
+      }))?.routes
     : api.userConfig.routes;
 
   if (userRoutes) {