refactor: output scp to templates

umijs · Jan 26, 2024 · aba626e · aba626e
1 parent 1eba01f
commit aba626e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/packages/preset-umi/.fatherrc.ts b/packages/preset-umi/.fatherrc.ts
@@ -5,15 +5,11 @@ export default defineConfig({
   cjs: {
     ignores: ['src/client/*'],
   },
-  esm: {
-    ignores: ['!src/client/prefetchRouteFiles.ts'],
-    output: 'dist',
-  },
   umd: {
     entry: 'src/client/prefetchRouteFilesScp.ts',
-    output: 'compiled/prefetchRouteFilesScp',
+    output: 'templates/routePrefetch',
     chainWebpack(memo) {
-      memo.output.filename('index.js');
+      memo.output.filename('prefetchRouteFilesScp.js');
       memo.output.delete('libraryTarget');
       memo.output.iife(true);
 

diff --git a/packages/preset-umi/src/client/prefetchRouteFilesScp.ts b/packages/preset-umi/src/client/prefetchRouteFilesScp.ts
@@ -2,7 +2,7 @@
  * NOTE: DO NOT USE ADVANCED SYNTAX IN THIS FILE, TO AVOID INSERT HELPERS TO REDUCE SCRIPT SIZE.
  */
 
-import prefetchRouteFiles from './prefetchRouteFiles';
+import prefetchRouteFiles from '../features/routePrefetch/prefetchRouteFiles';
 
 const basename = '{{basename}}';
 const publicPath = '{{publicPath}}';

diff --git a/packages/preset-umi/src/constants.ts b/packages/preset-umi/src/constants.ts
@@ -4,4 +4,3 @@ export const DEFAULT_PORT = '8000';
 export const DEFAULT_HOST = '0.0.0.0';
 export const CACHE_DIR_NAME = '.cache';
 export const TEMPLATES_DIR = join(__dirname, '../templates');
-export const PREFETCH_ROUTE_MAP_SCP_TYPE = 'umi-route-chunk-files-map';
diff --git a/...eset-umi/src/client/prefetchRouteFiles.ts → ...tures/routePrefetch/prefetchRouteFiles.ts b/...eset-umi/src/client/prefetchRouteFiles.ts → ...tures/routePrefetch/prefetchRouteFiles.ts
@@ -2,7 +2,9 @@
  * NOTE: DO NOT USE ADVANCED SYNTAX IN THIS FILE, TO AVOID INSERT HELPERS TO REDUCE SCRIPT SIZE.
  */
 
-import type { IRouteChunkFilesMap } from '../features/routePrefetch/routePrefetch';
+import type { IRouteChunkFilesMap } from './routePrefetch';
+
+export const PREFETCH_ROUTE_MAP_SCP_TYPE = 'umi-route-chunk-files-map';
 
 function prefetchRouteFiles(
   path: string,

diff --git a/packages/preset-umi/src/features/routePrefetch/routePrefetch.ts b/packages/preset-umi/src/features/routePrefetch/routePrefetch.ts
@@ -2,9 +2,10 @@ import { lodash, logger, winPath } from '@umijs/utils';
 import assert from 'assert';
 import { readFileSync, writeFileSync } from 'fs';
 import { dirname, isAbsolute, join, relative } from 'path';
-import { PREFETCH_ROUTE_MAP_SCP_TYPE } from '../../constants';
+import { TEMPLATES_DIR } from '../../constants';
 import { createResolver } from '../../libs/scan';
 import type { IApi, IRoute } from '../../types';
+import { PREFETCH_ROUTE_MAP_SCP_TYPE } from './prefetchRouteFiles';
 
 export interface IRouteChunkFilesMap {
   /**
@@ -102,7 +103,7 @@ export default (api: IApi) => {
         [
           {
             content: readFileSync(
-              require.resolve('../../../compiled/prefetchRouteFilesScp'),
+              join(TEMPLATES_DIR, 'routePrefetch/prefetchRouteFilesScp.js'),
               'utf-8',
             )
               .replace(

diff --git a/...i/compiled/prefetchRouteFilesScp/index.js → ...es/routePrefetch/prefetchRouteFilesScp.js b/...i/compiled/prefetchRouteFilesScp/index.js → ...es/routePrefetch/prefetchRouteFilesScp.js