feat: support register provider with mpa (#283)

ice-lab · Apr 27, 2020 · f094c7d · f094c7d
1 parent 78b2798
commit f094c7d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 12 deletions.
diff --git a/examples/basic-mpa/src/pages/Dashboard/app.ts b/examples/basic-mpa/src/pages/Dashboard/app.ts
@@ -1,9 +1,9 @@
 import { createApp, IAppConfig } from 'ice';
-import Dashboard from './index';
+import routes from './routes';
 
 const appConfig: IAppConfig = {
   router: {
-    routes: [{ path: '/', component: Dashboard }],
+    routes
   },
 };
 

diff --git a/examples/basic-mpa/src/pages/Dashboard/routes.ts b/examples/basic-mpa/src/pages/Dashboard/routes.ts
@@ -0,0 +1,3 @@
+import Index from './index';
+
+export default [{ path: '/', component: Index }];
diff --git a/packages/plugin-core/src/index.ts b/packages/plugin-core/src/index.ts
@@ -14,7 +14,7 @@ export default (api) => {
 
   const iceTempPath = path.join(rootDir, '.ice');
   setValue('ICE_TEMP', iceTempPath);
-  const tsEntryFiles = globby.sync(['src/app.@(ts?(x))'], { cwd: rootDir });
+  const tsEntryFiles = globby.sync(['src/app.@(ts?(x))', 'src/pages/*/app.@(ts?(x))'], { cwd: rootDir });
   const projectType = tsEntryFiles.length ? 'ts' : 'js';
   setValue('PROJECT_TYPE', projectType);
 

diff --git a/packages/plugin-store/src/babelPluginReplacePath.ts b/packages/plugin-store/src/babelPluginReplacePath.ts
@@ -1,14 +1,14 @@
 import * as path from 'path';
 
 // match:
-// eg: src/pages/home | src/pages/home/index(.tsx|.jsx) | src/pages/index(.tsx|jsx)
-const pathRegExp = /src\/pages\/\w+((.tsx|.jsx?)$|(\/index(.tsx|.jsx?))?$)/;
+// eg: src/pages/home | src/pages/home/index | src/pages/home/index(.tsx|.jsx) | src/pages/index(.tsx|jsx)
+const pathRegExp = /src\/pages\/\w+((.tsx|.jsx?)$|(\/index(.tsx|.jsx?)?)?$)/;
 
 module.exports = ({ types: t }, { routesPath, alias, applyMethod }) => {
   return {
     visitor: {
       ImportDeclaration(nodePath, state) {
-        const isRoutesFile = (routesPath === state.filename);
+        const isRoutesFile = routesPath.includes(state.filename);
         if (isRoutesFile) {
           const { source, specifiers } = nodePath.node;
           // issue: https://github.com/ice-lab/icejs/issues/271
@@ -22,7 +22,7 @@ module.exports = ({ types: t }, { routesPath, alias, applyMethod }) => {
               // default alias: import Home from '@/pages/Home';
               // custom alias: import Home from '$pages/Home';
               // relative path: import Home from '../pages/Home'
-              const newValue = formatPagePath({ routesPath, value, alias, applyMethod });
+              const newValue = formatPagePath({ routesPath: state.filename, value, alias, applyMethod });
               // replace to: import Home from 'ice/pages/Home'
               if (newValue) {
                 replaceWith(t, nodePath, newValue);
@@ -33,7 +33,7 @@ module.exports = ({ types: t }, { routesPath, alias, applyMethod }) => {
       },
 
       CallExpression(nodePath, state) {
-        const isRoutesFile = (routesPath === state.filename);
+        const isRoutesFile = routesPath.includes(state.filename);
         if (isRoutesFile) {
           if (t.isImport(nodePath.node.callee)) {
             const args = nodePath.node.arguments;
@@ -46,7 +46,7 @@ module.exports = ({ types: t }, { routesPath, alias, applyMethod }) => {
                 // default alias: const Home = lazy(() => import('@/pages/Home'));
                 // custom alias: const Home = lazy(() => import('$pages/home));
                 // relative path: const Home = lazy(() => import('../pages/Home'));
-                const newValue = formatPagePath({ routesPath, value, alias, applyMethod });
+                const newValue = formatPagePath({ routesPath: state.filename, value, alias, applyMethod });
                 // replace to: const Home =lazy (() => import('ice/Home/Home'));
                 if (newValue) {
                   args[i].value = newValue;
@@ -120,7 +120,6 @@ function formatPagePath({ routesPath, value, alias, applyMethod }: IGetConfigRou
       const [, , pageName] = matchedPagePath.split('/');
       newValue = pageName ? `ice/${pageName}/${pageName}` : '';
     }
-
     return newValue;
   }
 }

diff --git a/packages/plugin-store/src/index.ts b/packages/plugin-store/src/index.ts
@@ -29,19 +29,33 @@ export default async (api) => {
   // add babel plugins for ice lazy
   const { configPath } = userConfig.router || {};
   const { mpa: isMpa } = userConfig;
-  const { routesPath } = applyMethod('getRoutes', {
+  let { routesPath } = applyMethod('getRoutes', {
     rootDir,
     tempDir: targetPath,
     configPath,
     projectType,
     isMpa
   });
+
+  if (isMpa) {
+    const routesFile = `routes.${projectType}`;
+    const pagesPath = path.join(rootDir, 'src', 'pages');
+    const pages = applyMethod('getPages', rootDir);
+    const pagesRoutePath = pages.map(pageName => {
+      return path.join(pagesPath, pageName, routesFile);
+    });
+    routesPath = pagesRoutePath;
+  }
   modifyUserConfig('babelPlugins',
     [
       ...(userConfig.babelPlugins as [] || []),
       [
         require.resolve('./babelPluginReplacePath'),
-        { routesPath, alias: userConfig.alias, applyMethod }
+        {
+          routesPath,
+          alias: userConfig.alias,
+          applyMethod
+        }
       ]
     ]
   );
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import Index from './index';

		export default [{ path: '/', component: Index }];