Merge pull request #15 from farm-fe/feat/optimizePerformance

feat: optimize performance
farm-fe · May 24, 2024 · dd682dc · dd682dc
2 parents 05fe8ab + 31f57fb
commit dd682dc
Show file tree

Hide file tree

Showing 13 changed files with 264 additions and 182 deletions.
diff --git a/farm.config.ts b/farm.config.ts
@@ -1,5 +1,4 @@
 import { defineConfig } from '@farmfe/core';
-import dts from '@farmfe/js-plugin-dts';
 
 export default defineConfig({
     compilation: {
@@ -10,10 +9,10 @@ export default defineConfig({
         },
         output: {
             targetEnv: 'node',
+            format: 'esm'
         },
         persistentCache: false,
         external: ['^@farmfe/core$'],
         minify: false,
     },
-    // plugins: [dts()],
 });
diff --git a/package.json b/package.json
@@ -20,7 +20,6 @@
   },
   "devDependencies": {
     "@farmfe/cli": "^1.0.2",
-    "@farmfe/js-plugin-dts": "^0.5.1",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.12.7",

diff --git a/playground/index.html b/playground/index.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<h1>hello farmup</h1>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/config/normalize/find-entry.ts b/src/config/normalize/find-entry.ts
@@ -1,8 +1,7 @@
-import { Logger, UserConfig } from '@farmfe/core';
+import type { Logger, UserConfig } from '@farmfe/core';
 import { readFile, stat } from 'fs-extra';
 import path from 'node:path';
-import { CommonOptions, Format, ResolvedCommonOptions } from '../../types/options';
-import { merge } from 'lodash-es';
+import { ExecuteMode, type CommonOptions, type Format, type ResolvedCommonOptions } from '../../types/options';
 import { isExists } from '../../util/file';
 
 const findEntryKeyFromObject = (input: Record<string, string>) => {
@@ -48,7 +47,7 @@ function normalizeCommonEntry(entries: CommonOptions['entry']): ResolvedCommonOp
 
         const [key, ...value] = result;
 
-        let file = value.join(':');
+        const file = value.join(':');
 
         if (!key) {
             throw new Error(`"${entry}" key is empty`);
@@ -62,8 +61,8 @@ function normalizeCommonEntry(entries: CommonOptions['entry']): ResolvedCommonOp
 
     const normalizedEntries: Record<string, string> = {};
 
-    let map: Record<string, number> = {};
-    let sameMap = new Set();
+    const map: Record<string, number> = {};
+    const sameMap = new Set();
     for (const entry of entries ?? []) {
         const result = parseSingleEntry(entry);
 
@@ -72,26 +71,22 @@ function normalizeCommonEntry(entries: CommonOptions['entry']): ResolvedCommonOp
 
         if (sameMap.has(value)) {
             continue;
-        } else {
-            sameMap.add(value);
         }
 
-        const find_uniq_key = (key?: string, suffix = '') => {
-            if (!key) {
-                key = 'index';
-            }
+        sameMap.add(value);
 
-            let newKey = key + suffix;
+        const find_uniq_key = (key?: string, suffix = '') => {
+            const newKey = (key ?? 'index') + suffix;
             if (map[newKey]) {
                 map[newKey]++;
                 return find_uniq_key(key, map[newKey].toString());
-            } else {
-                map[newKey] = 1;
-                return newKey;
             }
+
+            map[newKey] = 1;
+            return newKey;
         };
 
-        let uniq_key = find_uniq_key(key);
+        const uniq_key = find_uniq_key(key);
 
         normalizedEntries[uniq_key] = value;
     }
@@ -100,26 +95,30 @@ function normalizeCommonEntry(entries: CommonOptions['entry']): ResolvedCommonOp
 }
 
 export async function tryFindEntryFromUserConfig(logger: Logger, config: UserConfig, options: CommonOptions) {
-    const entries_from_option = normalizeCommonEntry(options.entry);
+    const entriesFromOption = normalizeCommonEntry(options.entry);
+
+    // cli option > config
+    if (entriesFromOption) {
+        return entriesFromOption;
+    }
 
     let findEntryKey = findEntryKeyFromObject(config.compilation?.input ?? {});
+
+    if (findEntryKey) return config.compilation?.input!;
+
     let findEntry: string | null = null;
 
-    if (!entries_from_option && !findEntryKey) {
-        findEntry = await findDefaultExistsEntry();
-        findEntryKey = 'index';
-        if (!findEntry) {
-            logger.error('entry is not found, please check your entry file', { exit: true });
-            process.exit(1);
-        } else {
-            logger.info(`find and use this entry: "${findEntry}"`);
-        }
-        return {
-            [findEntryKey]: findEntry,
-        };
+    findEntry = await findDefaultExistsEntry();
+    findEntryKey = 'index';
+    if (!findEntry) {
+        logger.error('entry is not found, please check your entry file correct', { exit: true });
+        process.exit(1);
     } else {
-        return merge(entries_from_option, config.compilation?.input ?? {});
+        logger.info(`automatic find and use this entry: "${findEntry}"`);
     }
+    return {
+        [findEntryKey]: findEntry,
+    };
 }
 
 const packageModuleValueMapFormat: Record<string, Format> = {
@@ -141,3 +140,29 @@ export async function tryFindFormatFromPackage(root: string): Promise<Format | u
 
     return undefined;
 }
+
+const formatMapExt: Record<Exclude<Format, undefined>, string> = {
+    cjs: 'js',
+    esm: 'mjs',
+};
+
+export function pinOutputEntryFilename(options: ResolvedCommonOptions) {
+    if (options.noExecute) return;
+
+    const executeMode = options.execute.type;
+
+    function matchEntryName(name: string, inputs: Record<string, string>) {
+        const inputNameKey = name.split('.').slice(0, -1).join('.');
+
+        if (Object.hasOwn(inputs, inputNameKey)) {
+            return name;
+        }
+    }
+
+    if (executeMode === ExecuteMode.Custom || executeMode === ExecuteMode.Node) {
+        options.outputEntry = {
+            matchEntryName,
+            name: `[entryName].${formatMapExt[options.format ?? 'cjs']}`,
+        };
+    }
+}