Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: farm-fe/farm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: @farmfe/cli@1.0.1
Choose a base ref
...
head repository: farm-fe/farm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: @farmfe/cli@1.0.2
Choose a head ref

Commits on Apr 22, 2024

  1. Update README.md (#1229)

    wre232114 authored Apr 22, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    63555d0 View commit details

Commits on Apr 24, 2024

  1. fix: vite migrations bugs (#1236)

    * fix: vite migrations bugs
    
    * chore: update tests
    
    * chore: update e2e tests
    
    * fix: watcher should not watch files that do not exist
    
    ---------
    
    Co-authored-by: brightwwu <brightwwu@tencent.com>
    wre232114 and brightwwu authored Apr 24, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    6771607 View commit details
  2. Version Packages (#1238)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Apr 24, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    e28d6ec View commit details
  3. chore: arduino/setup-protoc@v3 from v1 (#1239)

    * chore: arduino/setup-protoc@v3 from v1
    
    * chore: update all protoc
    
    * chore: update macos latest build
    
    ---------
    
    Co-authored-by: brightwwu <brightwwu@tencent.com>
    wre232114 and brightwwu authored Apr 24, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    6dd3e7a View commit details
  4. chore(deps): update farmfe-packages (#1216)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Apr 24, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    7357031 View commit details
  5. feat: create-farm add tauri template (#1237)

    * chore: update tauri template
    
    * feat: add tauri template
    
    * feat: add tauri template
    
    * feat: add tauri template
    
    * feat: add tauri template
    ErKeLost authored Apr 24, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    db61cb4 View commit details
  6. Version Packages (#1241)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Apr 24, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    9c4611a View commit details

Commits on Apr 25, 2024

  1. chore: update renovate.json5 (#1240)

    Update renovate.json5
    
    Co-authored-by: brightwu <1521488775@qq.com>
    callqh and wre232114 authored Apr 25, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    288c3a8 View commit details
  2. fix: format watch string error (#1233)

    * fix: format watch error
    
    * chore: format error message with watch mode
    
    * chore: format error message with watch mode
    ErKeLost authored Apr 25, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    8a79de4 View commit details

Commits on Apr 26, 2024

  1. feat: support isolate runtime resource (#1200)

    * feat: support isolate runtime resource
    
    * chore: remove useless code
    
    * chore: changeset
    
    * fix: change src attr
    
    * fix: rename runtime file
    
    * fix: update inject resource
    
    * feat: extract inline code into separate files.
    
    * feat: finish
    callqh authored Apr 26, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    5b75ec2 View commit details
  2. Fix/lazy compilation (#1253)

    * fix: lazy compilation concurrency issue
    
    * fix: lazy compilation concurrency issue
    
    ---------
    
    Co-authored-by: brightwwu <brightwwu@tencent.com>
    wre232114 and brightwwu authored Apr 26, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    492353f View commit details
  3. Version Packages (#1248)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Apr 26, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    7d93c71 View commit details

Commits on Apr 27, 2024

  1. feat(plugin-react): assign runtime default value is automatic (#1249

    )
    
    * feat(plugin-react): assign `runtime` default value is `automatic`
    
    * chore(plugin-react): fix lint
    
    * chore(changeset): update
    
    * chore(changeset): update
    
    ---------
    
    Co-authored-by: brightwu <1521488775@qq.com>
    yejimeiming and wre232114 authored Apr 27, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    a9b5db7 View commit details

Commits on Apr 28, 2024

  1. chore(rust-plugins): fix ts warning (#1250)

    * chore(rust-plugins): fix ts warning
    
    * chore: update changeset
    
    ---------
    
    Co-authored-by: brightwu <1521488775@qq.com>
    yejimeiming and wre232114 authored Apr 28, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    6a9b13c View commit details
  2. fix: minify module filter use absolute path (#1259)

    shulandmimi authored Apr 28, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    6129421 View commit details

Commits on Apr 29, 2024

  1. feat: update create-farm-plugin template (#1260)

    * chore: update create-plugin template
    
    * chore: update create-plugin template
    
    * chore: use script with add dependencies
    ErKeLost authored Apr 29, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    01a4503 View commit details
  2. chore: update readme (#1257)

    * chore: update readme
    
    * chore: update deps
    ErKeLost authored Apr 29, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    0ecfeef View commit details

Commits on Apr 30, 2024

  1. feat: merge configuration policies (#1264)

    * feat: merge configuration policies
    
    * feat: merge more fields from params
    
    * chore: update types
    
    * chore: remove unless code
    
    * chore: add api example
    
    * chore: update config resolve
    
    * chore: remove example
    
    ---------
    
    Co-authored-by: ADNY <66500121+ErKeLost@users.noreply.github.com>
    Co-authored-by: erkelost <1256029807@qq.com>
    3 people authored Apr 30, 2024

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    9754d37 View commit details
  2. chore: update issues_templates (#1273)

    ErKeLost authored Apr 30, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    807911e View commit details

Commits on May 3, 2024

  1. fix(vite plugin): some vite plugins do not provide alias configuratio…

    …n errors (#1278)
    
    * fix(plugin): some vite's plugins do not provide `alias` configuration, resulting in errors
    
    * intercept at the location where getAliasEntries are obtained
    
    * changeset `@farmfe/core` patch
    RSS1102 authored May 3, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    28e1a37 View commit details

Commits on May 5, 2024

  1. feat: add biome (#1281)

    * feat: biome
    
    * chore: test biome
    
    * chore: update code
    
    * chore: update code
    
    * chore: update changeset
    
    * chore: update biome rules
    
    * chore: enable biome lint
    
    * chore: remove eslint and prettier
    
    * chore: remove eslint and prettier
    
    * chore: test lint-staged
    
    * chore: test lint-staged
    
    * chore: test lint-staged
    
    * chore: test lint-staged
    
    * chore: test lint-staged
    
    * chore: test lint-staged
    
    * chore: test lint-staged
    
    * chore: update test lint-staged
    
    * chore: update test lint-staged
    
    * chore: update test lint-staged
    
    * chore: update test lint-staged
    
    * chore: update husky
    
    * chore: update husky
    
    * chore: update husky
    
    * chore: update husky
    
    * chore: update husky
    
    * chore: update husky
    ErKeLost authored May 5, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    e5868af View commit details

Commits on May 6, 2024

  1. fix(examples): examples/arco-pro useEffect does not clear side effe…

    …cts (#1283)
    
    * fix: `examples/arco-pro` useEffect does not clear side effects
    
    * changeset ` @farmfe-examples/arco-design-pro` patch
    
    ---------
    
    Co-authored-by: ADNY <66500121+ErKeLost@users.noreply.github.com>
    RSS1102 and ErKeLost authored May 6, 2024

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    673e844 View commit details
  2. Version Packages (#1256)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored May 6, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    5283e28 View commit details
Showing 537 changed files with 9,256 additions and 3,328 deletions.
6 changes: 0 additions & 6 deletions .eslintignore

This file was deleted.

20 changes: 0 additions & 20 deletions .eslintrc.base.json

This file was deleted.

36 changes: 22 additions & 14 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
name: "\U0001F41E Bug report"
description: Create a report to help us improve
name: "🐞 Bug Report"
description: Report a Bug to Farm and help us improve
title: "[Bug Report]: "
labels: ["🐞 bug"]
body:
- type: markdown
attributes:
@@ -20,19 +22,25 @@ body:
label: Steps to reproduce
description: |
What do we need to do after opening your repro in order to make the bug happen? Clear and concise reproduction instructions are important for us to be able to triage your issue in a timely manner. Note that you can use [Markdown](https://guides.github.com/features/mastering-markdown/) to format lists and code.
placeholder: Steps to reproduce
placeholder: |
for example:
1. cd example/react
1. execute `pnpm dev`
2. find the error message in the console
validations:
required: true
- type: textarea
id: expected
- type: input
id: repro
attributes:
label: What is expected?
validations:
required: true
label: Reproduce link
description: "Please provide a simplest reproduction of the problem, provide the URL of the project:"
placeholder: paste link here
- type: textarea
id: actually-happening
attributes:
label: What is actually happening?
placeholder: |
Describe in detail what happened.
validations:
required: true
- type: textarea
@@ -41,11 +49,11 @@ body:
label: System Info
description: Output of `npx envinfo --system --npmPackages @farmfe/core --binaries --browsers`
render: Shell
placeholder: System, Binaries, Browsers
placeholder: |
System:
Binaries:
Browsers:
npmPackages:
validations:
required: true
- type: textarea
id: additional-comments
attributes:
label: Any additional comments?
description: e.g. some background/context of how you ran into this bug.

5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: "\U0001F680 New feature"
name: "💭 Feature Request"
description: Suggest an idea for Farm
labels: [":sparkles: feature request"]
title: "[Feature Request]: "
labels: ["enhancement: pending triage"]
body:
- type: markdown
attributes:
9 changes: 7 additions & 2 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -7,9 +7,14 @@
"rangeStrategy": "bump",
"packageRules": [
{
"packagePatterns": ["^@farmfe/*"],
"matchPackagePatterns": ["*"],
"enabled": false,
},
{
"matchPackagePatterns": ["^@farmfe/*"],
"groupName": "farmfe-packages",
"schedule": ["after 6pm every day",]
"schedule": ["after 6pm every day"],
"enabled": true,
},
{
"depTypeList": ["peerDependencies"],
6 changes: 5 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -19,6 +19,8 @@ jobs:
- os: ubuntu-latest
abi: linux-x64-gnu
- os: macos-latest
abi: darwin-arm64
- os: macos-13
abi: darwin-x64
- os: windows-latest
abi: win32-x64-msvc
@@ -103,8 +105,10 @@ jobs:
abi: linux-x64-gnu
- os: ubuntu-20.04
abi: linux-x64-gnu
- os: macos-latest
- os: macos-13
abi: darwin-x64
- os: macos-latest
abi: darwin-arm64
- os: windows-latest
abi: win32-x64-msvc
steps:
8 changes: 4 additions & 4 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -14,15 +14,15 @@ jobs:
with:
shared-key: cargo-clippy

- uses: arduino/setup-protoc@v1
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Run cargo fmt
run: cargo fmt
- name: Run cargo clippy
run: cargo clippy
eslint:
lint:
name: TS Code Lint
runs-on: ubuntu-latest
steps:
@@ -32,5 +32,5 @@ jobs:
node-version: 18
- name: Install Dependencies
run: npm install -g pnpm@8.15.1 && pnpm i --frozen-lockfile
- name: Run eslint
run: npx eslint packages
- name: Run lint
run: npx biome check --no-errors-on-unmatched --files-ignore-unknown=true
11 changes: 4 additions & 7 deletions .github/workflows/rust-build.yaml
Original file line number Diff line number Diff line change
@@ -35,8 +35,10 @@ jobs:
cd ../sass && npm run build -- --target x86_64-unknown-linux-musl --abi linux-x64-musl
- os: windows-latest
abi: win32-x64-msvc
- os: macos-latest
- os: macos-13
abi: darwin-x64
- os: macos-latest
abi: darwin-arm64

# cross compile
# windows. Note swc plugins is not supported on ia32 and arm64
@@ -68,11 +70,6 @@ jobs:
abi: linux-arm64-gnu
target: aarch64-unknown-linux-gnu
zig: true
# macos
- os: macos-latest
abi: darwin-arm64
target: aarch64-apple-darwin
zig: false
# - os: ubuntu-latest
# abi: darwin-x64
# target: x86_64-apple-darwin
@@ -98,7 +95,7 @@ jobs:
run: pnpm --filter @farmfe/plugin-tools run build
- run: rustup target add ${{ matrix.settings.target }}
if: ${{ matrix.settings.target }}
- uses: arduino/setup-protoc@v1
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
# Use the v1 of this action
4 changes: 2 additions & 2 deletions .github/workflows/rust-test.yaml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ jobs:
with:
shared-key: cargo-check

- uses: arduino/setup-protoc@v1
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

@@ -50,7 +50,7 @@ jobs:
- name: Install Dependencies
run: npm install -g pnpm@8.15.1 && pnpm i --frozen-lockfile

- uses: arduino/setup-protoc@v1
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npx lint-staged
12 changes: 7 additions & 5 deletions .pnpmfile.cjs
Original file line number Diff line number Diff line change
@@ -4,15 +4,17 @@ function readPackage(pkg, context) {
// Replace bar@x.x.x with bar@2.0.0
pkg.peerDependencies = {
vue: pkg.version
}
context.log(`${pkg.name}@${pkg.version} => vue@${pkg.version} in peerDependencies`)
};
context.log(
`${pkg.name}@${pkg.version} => vue@${pkg.version} in peerDependencies`
);
}
return pkg

return pkg;
}

module.exports = {
hooks: {
readPackage
}
}
};
5 changes: 0 additions & 5 deletions .prettierrc

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -102,13 +102,13 @@ See [Contributing Guide](https://github.com/farm-fe/farm/blob/main/CONTRIBUTING.

## Chat With Us

- [Author Twitter](https://twitter.com/brightwwu46799), [Official Twitter](https://twitter.com/fe_farm)
- [Author Twitter](https://twitter.com/brightwwu46799), [Official Twitter](https://twitter.com/FarmFe71928)

- With [Discord](https://discord.gg/mDErq9aFnF)

- Wechat group

<br><img src="https://github.com/farm-fe/farm/assets/66500121/0025b8b6-9519-4870-b724-0a1f3cee3797" width="30%" />
<br><img src="https://github.com/ErKeLost/react/assets/66500121/4e56602d-dbe6-4dd1-a91c-cb5a881b3418" width="30%" />



4 changes: 2 additions & 2 deletions README.zh-CN.md
Original file line number Diff line number Diff line change
@@ -104,9 +104,9 @@ Farm 远快于业界常用的 JS 构建工具,在 benchmark 测试中,Farm

- 加入 [Discord](https://discord.gg/mDErq9aFnF)

- 微信群
- 微信交流群

<br><img src="https://github.com/farm-fe/farm/assets/66500121/98227b2b-91d0-4ad0-b46d-96e231a425fe" width="30%" />
<br><img src="https://github.com/ErKeLost/react/assets/66500121/4e56602d-dbe6-4dd1-a91c-cb5a881b3418" width="30%" />

## 感谢贡献者们做出的努力

Loading