fix: finish conflict

.github/workflows/ci.yml

@@ -40,7 +40,7 @@ jobs:
           registry-url: 'https://registry.npmjs.org/'
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2.2.4
+        uses: pnpm/action-setup@v4
         with:
           run_install: false
 
@@ -60,6 +60,9 @@ jobs:
       - name: Install dependencies
         run: pnpm i
 
+      - name: Build father projext
+        run: pnpm run build
+
       - name: Type check
         run: pnpm tsc --noEmit
 

docs/config.md

@@ -136,6 +136,13 @@ export default {
 
 配置转换过程中需要忽略的文件，支持 glob 表达式，被匹配的文件将不会输出到产物目录。另外，father 会默认忽略源码目录中所有的 Markdown 文件和测试文件。
 
+#### parallel
+
+- 类型：`boolean`
+- 默认值：`false`
+
+指定是否开启并发编译，默认关闭。
+
 ### umd
 
 - 类型：`object`

docs/guide/dev.md

@@ -9,6 +9,8 @@
 ```bash
 # 执行 dev 命令，开启实时编译
 $ father dev
+# 跳过初次全量构建，只监听文件变化执行增量构建
+$ father dev --incremental
 ```
 
 一旦源码或配置文件发生变化，产物将会实时增量编译到输出目录。

package.json

@@ -24,13 +24,9 @@
     "dev": "pnpm build --watch",
     "format": "prettier --write .",
     "prepare": "husky install",
-    "release": "esno scripts/release.ts",
-    "test": "jest --runInBand --forceExit",
-    "test:build": "jest tests/build.test.ts",
-    "test:cov": "jest --collectCoverage --runInBand --forceExit",
-    "test:dev": "jest tests/dev.test.ts",
-    "test:mako-build": "jest tests/mako.build.test.ts",
-    "test:mako-dev": "jest tests/mako.dev.test.ts"
+    "release": "tsx scripts/release.ts",
+    "test": "jest",
+    "test:cov": "jest --collectCoverage"
   },
   "commitlint": {
     "extends": [
@@ -47,13 +43,12 @@
   },
   "dependencies": {
     "@microsoft/api-extractor": "7.39.1",
-    "@umijs/babel-preset-umi": "^4.2.11",
-    "@umijs/bundler-mako": "0.8.7",
-    "@umijs/bundler-utils": "^4.2.11",
-    "@umijs/bundler-webpack": "^4.2.11",
+    "@umijs/babel-preset-umi": "^4.3.12",
+    "@umijs/bundler-utils": "^4.3.12",
+    "@umijs/bundler-webpack": "^4.3.12",
     "@umijs/case-sensitive-paths-webpack-plugin": "^1.0.1",
-    "@umijs/core": "^4.2.11",
-    "@umijs/utils": "^4.2.11",
+    "@umijs/core": "^4.3.12",
+    "@umijs/utils": "^4.3.12",
     "@vercel/ncc": "0.33.3",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "babel-plugin-module-resolver": "4.1.0",
@@ -65,6 +60,7 @@
     "file-system-cache": "2.0.0",
     "loader-runner": "4.2.0",
     "minimatch": "3.1.2",
+    "piscina": "^4.6.1",
     "tsconfig-paths": "4.0.0",
     "typescript": "~5.3.3",
     "typescript-transform-paths": "3.4.6",
@@ -77,9 +73,8 @@
     "@types/jest": "^27.5.2",
     "@types/loader-runner": "2.2.4",
     "@types/minimatch": "3.0.5",
-    "@types/node": "^18.19.34",
-    "@umijs/test": "^4.2.9",
-    "esno": "^0.16.3",
+    "@types/node": "^18.15.13",
+    "@umijs/test": "^4.0.68",
     "git-repo-info": "^2.1.1",
     "husky": "^8.0.3",
     "jest": "^27.5.1",
@@ -89,7 +84,8 @@
     "prettier-plugin-organize-imports": "^3.2.4",
     "prettier-plugin-packagejson": "^2.5.0",
     "rimraf": "^3.0.2",
-    "ts-node": "^10.9.2",
+    "ts-node": "^10.9.1",
+    "tsx": "^4.16.3",
     "zx": "^4.3.0"
   },
   "packageManager": "[email protected]",