feat: reduce dependents size & upgrade core version & optimzie entry … (

#29)
farm-fe · Jun 21, 2024 · 5806b18 · 5806b18
1 parent 789e22b
commit 5806b18
Show file tree

Hide file tree

Showing 31 changed files with 201 additions and 234 deletions.
diff --git a/.changeset/afraid-weeks-jam.md b/.changeset/afraid-weeks-jam.md
@@ -0,0 +1,5 @@
+---
+'farmup': patch
+---
+
+reduce dependents size & upgrade core version & optimzie entry find
diff --git a/biome.json b/biome.json
@@ -15,7 +15,10 @@
       "style": {
         "noNonNullAssertion": "off"
       }
-    }
+    },
+    "ignore": [
+      "dist"
+    ]
   },
   "javascript": {
     "formatter": {

diff --git a/package.json b/package.json
@@ -1,65 +1,26 @@
 {
   "name": "farmup",
-  "version": "0.0.11",
+  "version": "0.0.0",
+  "description": "",
+  "private": true,
   "type": "module",
-  "repository": {
-    "url": "https://github.com/farm-fe/farmup"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
   "scripts": {
-    "dev": "farm watch",
-    "build": "farm build",
-    "preview": "farm preview",
-    "clean": "farm clean",
-    "release": "pnpm run build && changeset publish",
-    "farmup": "node ./bin/farmup.js --no-exec -w",
-    "ready": "node ./bin/farmup.js ./scripts/ready.ts -o ./dist/ready --no-config"
-  },
-  "bin": {
-    "farmup": "./bin/farmup.js"
-  },
-  "devDependencies": {
-    "@biomejs/biome": "^1.7.3",
-    "@farmfe/cli": "^1.0.2",
-    "@types/fs-extra": "^11.0.4",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.12.7",
-    "@types/tmp": "^0.2.6",
-    "chokidar": "^3.6.0",
-    "execa": "^8.0.1",
-    "typescript": "^5.4.5"
-  },
-  "exports": {
-    ".": {
-      "import": "./dist/index.js",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
-    },
-    "./plugin": {
-      "import": "./dist/plugin.js",
-      "types": "./dist/plugin.d.ts"
-    }
+    "release": "pnpm --filter './packages/*' run build && changeset publish",
+    "ready": "farmup ./scripts/ready.ts -o ./dist/ready --no-config"
   },
   "author": {
     "name": "shulandmimi",
     "email": "[email protected]"
   },
+  "keywords": [],
+  "license": "MIT",
   "dependencies": {
-    "@changesets/cli": "^2.27.3",
-    "@farmfe/core": "^1.1.12",
-    "cac": "^6.7.14",
-    "cspell": "^8.8.3",
-    "fs-extra": "^11.2.0",
-    "glob": "^10.3.15",
-    "lodash-es": "^4.17.21",
-    "open": "^10.1.0",
-    "tmp": "^0.2.3"
+    "farmup": "workspace:*"
   },
-  "files": [
-    "dist",
-    "README.md",
-    "bin"
-  ]
+  "devDependencies": {
+    "@biomejs/biome": "^1.7.3",
+    "cspell": "^8.8.3",
+    "execa": "^8.0.1",
+    "@changesets/cli": "^2.27.3"
+  }
 }
diff --git a/bin/farmup.js → packages/core/bin/farmup.js b/bin/farmup.js → packages/core/bin/farmup.js
diff --git a/farm.config.ts → packages/core/farm.config.ts b/farm.config.ts → packages/core/farm.config.ts
@@ -9,10 +9,11 @@ export default defineConfig({
         },
         output: {
             targetEnv: 'node',
-            format: 'esm'
+            format: 'esm',
         },
         persistentCache: false,
         external: ['^@farmfe/core$'],
         minify: false,
+        treeShaking: true,
     },
 });
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -0,0 +1,58 @@
+{
+  "name": "farmup",
+  "version": "0.0.11",
+  "type": "module",
+  "repository": {
+    "url": "https://github.com/farm-fe/farmup"
+  },
+  "scripts": {
+    "dev": "farm watch",
+    "build": "farm build",
+    "preview": "farm preview",
+    "clean": "farm clean",
+    "farmup": "node ./bin/farmup.js --no-exec -w"
+  },
+  "bin": "./bin/farmup.js",
+  "devDependencies": {
+    "@farmfe/cli": "^1.0.2",
+    "@types/fs-extra": "^11.0.4",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^20.12.7",
+    "typescript": "^5.4.5",
+    "cac": "^6.7.14",
+    "execa": "^8.0.1",
+    "fs-extra": "^11.2.0",
+    "glob": "^10.3.15",
+    "lodash-es": "^4.17.21"
+  },
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./plugin": {
+      "import": "./dist/plugin.js",
+      "types": "./dist/plugin.d.ts"
+    }
+  },
+  "keywords": [
+    "farm",
+    "cli",
+    "execute",
+    "exec",
+    "typescript",
+    "html",
+    "javascript",
+    "ts",
+    "js",
+    "builder"
+  ],
+  "author": {
+    "name": "shulandmimi",
+    "email": "[email protected]"
+  },
+  "dependencies": {
+    "@farmfe/core": "^1.2.0"
+  }
+}
diff --git a/src/config/constant.ts → packages/core/src/config/constant.ts b/src/config/constant.ts → packages/core/src/config/constant.ts
diff --git a/src/config/normalize/find-entry.ts → ...s/core/src/config/normalize/find-entry.ts b/src/config/normalize/find-entry.ts → ...s/core/src/config/normalize/find-entry.ts
@@ -151,18 +151,19 @@ export function pinOutputEntryFilename(options: ResolvedCommonOptions) {
 
     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(options.target?.startsWith('browser')) {
+        return;
     }
 
-    if (executeMode === ExecuteMode.Custom || executeMode === ExecuteMode.Node) {
+    if ((executeMode === ExecuteMode.Custom || executeMode === ExecuteMode.Node) && !options.noExecute) {
+        options.entry = Object.entries(options.entry).reduce((res, [key, val]) => {
+            res[`${key}.${formatMapExt[options.format ?? 'cjs']}`] = val;
+            return res;
+        }, {} as Record<string, string>);
+
         options.outputEntry = {
-            matchEntryName,
-            name: `[entryName].${formatMapExt[options.format ?? 'cjs']}`,
+            name: '[entryName]'
         };
     }
 }
diff --git a/src/config/normalize/index.ts → packages/core/src/config/normalize/index.ts b/src/config/normalize/index.ts → packages/core/src/config/normalize/index.ts
diff --git a/src/core/executer.ts → packages/core/src/core/executer.ts b/src/core/executer.ts → packages/core/src/core/executer.ts
diff --git a/src/core/proxyCompiler/index.ts → ...ages/core/src/core/proxyCompiler/index.ts b/src/core/proxyCompiler/index.ts → ...ages/core/src/core/proxyCompiler/index.ts
@@ -8,7 +8,6 @@ export class ProxyCompiler {
 
     private event: EventEmitter = new EventEmitter();
 
-    private lastResources: string[] = [];
     private _preProxyFnList: (keyof Compiler)[] = [];
     private alreadyProxyFnList: Set<keyof Compiler> = new Set();
 
@@ -31,14 +30,6 @@ export class ProxyCompiler {
                 this.proxyCompiler(fnName);
             }
         }
-
-        this.on('resources', (r) => {
-            this.lastResources = Object.keys(r.result);
-        });
-    }
-
-    get resource_names() {
-        return this.lastResources;
     }
 
     private proxyCompiler<K extends keyof Compiler>(fnName: K) {
@@ -64,7 +55,7 @@ export class ProxyCompiler {
         OFT extends Record<keyof T, (...args: any) => any> = {
             // biome-ignore lint/suspicious/noExplicitAny: <explanation>
             [KK in keyof T]: T[KK] extends (...args: any[]) => any ? T[KK] : never;
-        }
+        },
     >(fnName: K, fn: (context: FnContext<Parameters<OFT[K]>, ReturnType<OFT[K]>>) => void) {
         this.proxyCompiler(fnName as keyof Compiler);
         this.event.on(fnName.toString(), fn);

diff --git a/src/core/proxyCompiler/interface.ts → .../core/src/core/proxyCompiler/interface.ts b/src/core/proxyCompiler/interface.ts → .../core/src/core/proxyCompiler/interface.ts
diff --git a/src/core/proxyCompiler/util.ts → packages/core/src/core/proxyCompiler/util.ts b/src/core/proxyCompiler/util.ts → packages/core/src/core/proxyCompiler/util.ts
diff --git a/src/index.ts → packages/core/src/index.ts b/src/index.ts → packages/core/src/index.ts
@@ -46,6 +46,7 @@ function createInlineConfig(options: CommonOptions): InlineConfig {
 async function autoStart(options: CommonOptions) {
     const preNormalizeOption = await NormalizeOption.fromCommonOption(options, new NoopLogger());
     const inlineConfig = createInlineConfig(options);
+    // console.log(preNormalizeOption.options);
     switch (preNormalizeOption.options.execute.type) {
         case ExecuteMode.Browser:
             return farmStart(inlineConfig);

diff --git a/src/plugin-entry.ts → packages/core/src/plugin-entry.ts b/src/plugin-entry.ts → packages/core/src/plugin-entry.ts
diff --git a/src/plugins/auto-execute.ts → packages/core/src/plugins/auto-execute.ts b/src/plugins/auto-execute.ts → packages/core/src/plugins/auto-execute.ts
@@ -31,17 +31,13 @@ export default function autoExecute(options: CommonOptions = {}, logger = defaul
             return;
         }
 
-        const resourceOutputEntryFormatter = normalizeOption.options.outputEntry;
-        const resourceOutputEntry = proxyCompiler.resource_names.find((item) =>
-            resourceOutputEntryFormatter.matchEntryName(item, normalizeOption.options.entry),
-        );
+        const resourceOutputEntry = Object.keys(normalizeOption.options.entry)[0];
 
         if (!resourceOutputEntry) {
             logger.error('output entry is not found');
             return;
         }
 
-        // TODO: multiple entry
         const executePath = path.join(outputDir, resourceOutputEntry);
 
         if (!executer) {

diff --git a/src/plugins/auto-external.ts → packages/core/src/plugins/auto-external.ts b/src/plugins/auto-external.ts → packages/core/src/plugins/auto-external.ts
diff --git a/src/types/options.ts → packages/core/src/types/options.ts b/src/types/options.ts → packages/core/src/types/options.ts
@@ -90,7 +90,6 @@ export interface ResolvedCommonOptions {
     noWatch?: boolean;
 
     outputEntry?: {
-        matchEntryName: (name: string, inputs: Record<string, string>) => string | undefined;
         name: string;
     };
 

diff --git a/src/util/async.ts → packages/core/src/util/async.ts b/src/util/async.ts → packages/core/src/util/async.ts
diff --git a/src/util/file.ts → packages/core/src/util/file.ts b/src/util/file.ts → packages/core/src/util/file.ts
diff --git a/src/util/log.ts → packages/core/src/util/log.ts b/src/util/log.ts → packages/core/src/util/log.ts
diff --git a/src/util/options.ts → packages/core/src/util/options.ts b/src/util/options.ts → packages/core/src/util/options.ts
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "src"
+  ]
+}
diff --git a/packages/core/tsconfig.node.json b/packages/core/tsconfig.node.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.node.json",
+  "include": [
+    "./farm.config.ts"
+  ]
+}