Merge branch 'main' into feature/plugin

farm-fe · Jun 14, 2024 · 3cffbe2 · 3cffbe2
2 parents e3bb2c1 + 2b81771
commit 3cffbe2
Show file tree

Hide file tree

Showing 718 changed files with 14,906 additions and 13,128 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -54,7 +54,7 @@ jobs:
         id: download-create-farm-rust
         with:
           name: ${{ github.sha }}-${{ matrix.settings.abi }}
-          path: ./packages/create-farm-node
+          path: ./packages/create-farm
 
       - name: Build Examples - ${{ matrix.settings.abi }}
         run: node scripts/test-examples.mjs
@@ -66,21 +66,21 @@ jobs:
       - name: Build Create Farm
         run: cd packages/create-farm && npm run build
       - name: Test Create Farm React - ${{ matrix.settings.abi }}
-        run: cd .. && node farm/packages/create-farm/dist/index.js my-test-app-react --template react --skip-install && cd my-test-app-react && pnpm i && pnpm build
+        run: cd .. && node farm/packages/create-farm/create-farm.js my-test-app-react --template react && cd my-test-app-react && pnpm i && pnpm build
       - name: Test Create Farm Vue - ${{ matrix.settings.abi }}
-        run: cd .. && node farm/packages/create-farm/dist/index.js my-test-app-vue --template vue --skip-install && cd my-test-app-vue && pnpm i && pnpm build
+        run: cd .. && node farm/packages/create-farm/create-farm.js my-test-app-vue --template vue3 && cd my-test-app-vue && pnpm i && pnpm build
       - name: Test Create Farm Solid - ${{ matrix.settings.abi }}
-        run: cd .. && node farm/packages/create-farm/dist/index.js my-test-app-solid --template solid --skip-install && cd my-test-app-solid && pnpm i && pnpm build
+        run: cd .. && node farm/packages/create-farm/create-farm.js my-test-app-solid --template solid && cd my-test-app-solid && pnpm i && pnpm build
       - name: Test Create Farm Svelte - ${{ matrix.settings.abi }}
-        run: cd .. && node farm/packages/create-farm/dist/index.js my-test-app-svelte --template svelte --skip-install && cd my-test-app-svelte && pnpm i && pnpm build
+        run: cd .. && node farm/packages/create-farm/create-farm.js my-test-app-svelte --template svelte && cd my-test-app-svelte && pnpm i && pnpm build
       - name: Test Create Farm Lit - ${{ matrix.settings.abi }}
-        run: cd .. && node farm/packages/create-farm/dist/index.js my-test-app-lit --template lit --skip-install && cd my-test-app-lit && pnpm i && pnpm build
+        run: cd .. && node farm/packages/create-farm/create-farm.js my-test-app-lit --template lit && cd my-test-app-lit && pnpm i && pnpm build
       - name: Test Create Farm Vanilla - ${{ matrix.settings.abi }}
-        run: cd .. && node farm/packages/create-farm/dist/index.js my-test-app-vanilla --template vanilla --skip-install && cd my-test-app-vanilla && pnpm i && pnpm build
+        run: cd .. && node farm/packages/create-farm/create-farm.js my-test-app-vanilla --template vanilla && cd my-test-app-vanilla && pnpm i && pnpm build
       - name: Test Create Farm Preact - ${{ matrix.settings.abi }}
-        run: cd .. && node farm/packages/create-farm/dist/index.js my-test-app-preact --template preact --skip-install && cd my-test-app-preact && pnpm i && pnpm build
+        run: cd .. && node farm/packages/create-farm/create-farm.js my-test-app-preact --template preact && cd my-test-app-preact && pnpm i && pnpm build
       - name: Test Create Farm Vue2 - ${{ matrix.settings.abi }}
-        run: cd .. && node farm/packages/create-farm/dist/index.js my-test-app-vue2 --template vue2 --skip-install && cd my-test-app-vue2 && pnpm i && pnpm build
+        run: cd .. && node farm/packages/create-farm/create-farm.js my-test-app-vue2 --template vue2 && cd my-test-app-vue2 && pnpm i && pnpm build
 
   type-check:
     name: Type Check

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -36,10 +36,10 @@ jobs:
             mv /tmp/artifacts/${{ github.sha }}-${abi}/* ./packages/core/npm/${abi}
             mv /tmp/artifacts/${{ github.sha }}-${abi}-plugin-react/* ./rust-plugins/react/npm/${abi}
             mv /tmp/artifacts/${{ github.sha }}-${abi}-plugin-sass/* ./rust-plugins/sass/npm/${abi}
-            mv /tmp/artifacts/${{ github.sha }}-${abi}-create-farm/* ./packages/create-farm-node/npm/${abi}
+            mv /tmp/artifacts/${{ github.sha }}-${abi}-create-farm/* ./packages/create-farm/npm/${abi}
 
             test -f ./packages/core/npm/${abi}/farm.${abi}.node
-            test -f ./packages/create-farm-node/npm/${abi}/create-farm.${abi}.node
+            test -f ./packages/create-farm/npm/${abi}/create-farm.${abi}.node
             test -f ./rust-plugins/react/npm/${abi}/index.farm
             test -f ./rust-plugins/sass/npm/${abi}/index.farm
           done
@@ -62,7 +62,7 @@ jobs:
       - name: Test Create Farm React
         run: cd .. && pnpm create farm my-test-app-react --template react && cd my-test-app-react && pnpm i && pnpm build
       - name: Test Create Farm Vue
-        run: cd .. && pnpm create farm my-test-app-vue --template vue && cd my-test-app-vue && pnpm i && pnpm build
+        run: cd .. && pnpm create farm my-test-app-vue --template vue3 && cd my-test-app-vue && pnpm i && pnpm build
       - name: Test Create Farm Solid
         run: cd .. && pnpm create farm my-test-app-solid --template solid && cd my-test-app-solid && pnpm i && pnpm build
 

diff --git a/.github/workflows/rust-build.yaml b/.github/workflows/rust-build.yaml
@@ -18,7 +18,7 @@ jobs:
               unset CC &&
               cd packages/core &&
               npm run build:rs:publish -- --target x86_64-unknown-linux-gnu &&
-              cd ../create-farm-node &&
+              cd ../create-farm &&
               npm run build -- --target x86_64-unknown-linux-gnu &&
               cd ../../rust-plugins/react && npm run build -- --target x86_64-unknown-linux-gnu --abi linux-x64-gnu &&
               apt install -y protobuf-compiler &&
@@ -33,7 +33,7 @@ jobs:
               unset CC &&
               cd packages/core &&
               npm run build:rs:publish -- --target x86_64-unknown-linux-musl &&
-              cd ../create-farm-node &&
+              cd ../create-farm &&
               npm run build -- --target x86_64-unknown-linux-musl &&
               cd ../../rust-plugins/react && npm run build -- --target x86_64-unknown-linux-musl --abi linux-x64-musl &&
               apk add protobuf &&
@@ -55,7 +55,7 @@ jobs:
               export CARGO_PROFILE_RELEASE_LTO=false
               cargo install cargo-xwin
               cd packages/core && npm run build:rs -- --target i686-pc-windows-msvc --cargo-flags="--no-default-features"
-              cd ../create-farm-node && npm run build -- --target i686-pc-windows-msvc
+              cd ../create-farm && npm run build -- --target i686-pc-windows-msvc
               cd ../../rust-plugins/react && npm run build -- --target i686-pc-windows-msvc --abi win32-ia32-msvc
               cd ../sass && npm run build -- --target i686-pc-windows-msvc --abi win32-ia32-msvc
           - os: windows-latest
@@ -66,7 +66,7 @@ jobs:
               export CARGO_PROFILE_RELEASE_LTO=false
               cargo install cargo-xwin
               cd packages/core && npm run build:rs -- --target aarch64-pc-windows-msvc --cargo-flags="--no-default-features"
-              cd ../create-farm-node && npm run build -- --target aarch64-pc-windows-msvc
+              cd ../create-farm && npm run build -- --target aarch64-pc-windows-msvc
               cd ../../rust-plugins/react && npm run build -- --target aarch64-pc-windows-msvc --abi win32-arm64-msvc
               cd ../sass && npm run build -- --target aarch64-pc-windows-msvc --abi win32-arm64-msvc
           # linux
@@ -125,7 +125,7 @@ jobs:
         if: ${{ !matrix.settings.docker && !matrix.settings.build }}
         run: >-
           cd packages/core && npm run build:rs:publish -- ${{ matrix.settings.target && format('--target {0}', matrix.settings.target) || '' }} ${{ matrix.settings.zig && '--zig' || '' }} &&
-          cd ../create-farm-node && npm run build -- ${{ matrix.settings.target && format('--target {0}', matrix.settings.target) || '' }} ${{ matrix.settings.zig && '--zig' || '' }} &&
+          cd ../create-farm && npm run build -- ${{ matrix.settings.target && format('--target {0}', matrix.settings.target) || '' }} ${{ matrix.settings.zig && '--zig' || '' }} &&
           cd ../../rust-plugins/react && npm run build -- ${{ matrix.settings.target && format('--target {0}', matrix.settings.target) || '' }} ${{ matrix.settings.zig && '--zig' || '' }} --abi ${{ matrix.settings.abi }} &&
           cd ../sass && npm run build -- ${{ matrix.settings.target && format('--target {0}', matrix.settings.target) || '' }} ${{ matrix.settings.zig && '--zig' || '' }} --abi ${{ matrix.settings.abi }}
         shell: bash
@@ -142,7 +142,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: ${{ github.sha }}-${{ matrix.settings.abi }}-create-farm
-          path: ./packages/create-farm-node/create-farm.${{ matrix.settings.abi }}.node
+          path: ./packages/create-farm/create-farm.${{ matrix.settings.abi }}.node
       - name: Upload Plugin React
         uses: actions/upload-artifact@v3
         with:

diff --git a/.npmrc b/.npmrc
@@ -1,2 +1,4 @@
 registry = "https://registry.npmjs.org/"
-auto-install-peers = false
+auto-install-peers = false
+electron-mirror="https://npmmirror.com/mirrors/electron/"
+```
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,15 +4,15 @@
   "biome.enabled": true,
   "editor.defaultFormatter": "biomejs.biome",
   "[typescript]": {
-    "editor.defaultFormatter": "biomejs.biome",
+    "editor.defaultFormatter": "biomejs.biome"
   },
   "[javascript]": {
-    "editor.defaultFormatter": "biomejs.biome",
+    "editor.defaultFormatter": "biomejs.biome"
   },
   "[rust]": {
     "editor.defaultFormatter": "rust-lang.rust-analyzer"
   },
   "[toml]": {
     "editor.defaultFormatter": "tamasfe.even-better-toml"
-  },
+  }
 }
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 members = [
   "crates/*",
- "packages/create-farm-node",
+ "packages/create-farm",
   "rust-plugins/*",
 ]
 resolver = "2"
diff --git a/README.md b/README.md
@@ -108,7 +108,7 @@ See [Contributing Guide](https://github.com/farm-fe/farm/blob/main/CONTRIBUTING.
 
 - Wechat group
 
-<br><img src="https://github.com/ErKeLost/react/assets/66500121/f81839ab-a6e8-4298-830c-cae2213fe0b4" width="30%" />
+<br><img src="https://github.com/ErKeLost/farm-nestjs/assets/66500121/f353581b-cdd1-45ee-9e17-efa202d672cf" width="30%" />
 
 - QQ group
 

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -106,7 +106,7 @@ Farm 远快于业界常用的 JS 构建工具，在 benchmark 测试中，Farm
 
 - 微信交流群
 
-<br><img src="https://github.com/ErKeLost/react/assets/66500121/f81839ab-a6e8-4298-830c-cae2213fe0b4" width="30%" />
+<br><img src="https://github.com/ErKeLost/farm-nestjs/assets/66500121/f353581b-cdd1-45ee-9e17-efa202d672cf" width="30%" />
 
 - QQ 群
 

diff --git a/crates/compiler/CHANGELOG.md b/crates/compiler/CHANGELOG.md
@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.9](https://github.com/farm-fe/farm/compare/farmfe_compiler-v0.0.8...farmfe_compiler-v0.0.9) - 2024-05-28
+
+### Added
+- support obj external & dts support resolvedPaths ([#1282](https://github.com/farm-fe/farm/pull/1282))
+
+### Fixed
+- cache issues ([#1301](https://github.com/farm-fe/farm/pull/1301))
+
 ## [0.0.8](https://github.com/farm-fe/farm/compare/farmfe_compiler-v0.0.7...farmfe_compiler-v0.0.8) - 2024-05-09
 
 ### Added