Merge branch 'main' into chore/readme_2025-1-15

farm-fe · Jan 15, 2025 · bb56d20 · bb56d20
2 parents 7cd3a52 + c80a338
commit bb56d20
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 12 deletions.
diff --git a/.changeset/tiny-berries-think.md b/.changeset/tiny-berries-think.md
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -4,6 +4,10 @@ on:
     branches:
       - main
 
+concurrency:
+  group: e2e-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   call-rust-build:
     uses: ./.github/workflows/rust-build.yaml

diff --git a/.github/workflows/rust-build.yaml b/.github/workflows/rust-build.yaml
@@ -1,6 +1,10 @@
 name: Building Rust Binding And Upload Artifacts
 on: workflow_call
 
+concurrency:
+  group: build-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build and Upload Artifacts - ${{ matrix.settings.abi }}

diff --git a/.github/workflows/rust-test.yaml b/.github/workflows/rust-test.yaml
@@ -4,6 +4,10 @@ on:
     branches:
       - main
 
+concurrency:
+  group: test-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   cargo-check:
     name: Check

diff --git a/bench/CHANGELOG.md b/bench/CHANGELOG.md
@@ -1,5 +1,12 @@
 # bench
 
+## 1.0.38
+
+### Patch Changes
+
+- Updated dependencies [2423ee65]
+  - @farmfe/core@1.6.5
+
 ## 1.0.37
 
 ### Patch Changes

diff --git a/bench/package.json b/bench/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bench",
-  "version": "1.0.37",
+  "version": "1.0.38",
   "private": true,
   "description": "",
   "scripts": {},

diff --git a/examples/tailwind-next/CHANGELOG.md b/examples/tailwind-next/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @farmfe-examples/tailwind-next
 
+## 0.0.7
+
+### Patch Changes
+
+- @farmfe/js-plugin-tailwindcss@0.0.6
+
 ## 0.0.6
 
 ### Patch Changes

diff --git a/examples/tailwind-next/package.json b/examples/tailwind-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@farmfe-examples/tailwind-next",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "private": true,
   "dependencies": {
     "@farmfe/js-plugin-tailwindcss": "workspace:^",

diff --git a/js-plugins/postcss/package.json b/js-plugins/postcss/package.json
@@ -51,7 +51,7 @@
     "postcss-url": "^10.1.3"
   },
   "peerDependencies": {
-    "@farmfe/core": "workspace:^1.6.4",
+    "@farmfe/core": "workspace:^1.6.5",
     "postcss": ">=8.0.0"
   }
 }
diff --git a/js-plugins/solid/package.json b/js-plugins/solid/package.json
@@ -41,7 +41,7 @@
     "solid-js": "^1.7.8"
   },
   "peerDependencies": {
-    "@farmfe/core": "workspace:^1.6.4"
+    "@farmfe/core": "workspace:^1.6.5"
   },
   "files": [
     "build"

diff --git a/js-plugins/tailwindcss/CHANGELOG.md b/js-plugins/tailwindcss/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @farmfe/js-plugin-tailwindcss
 
+## 0.0.6
+
+### Patch Changes
+
+- Updated dependencies [2423ee65]
+  - @farmfe/core@1.6.5
+
 ## 0.0.5
 
 ### Patch Changes

diff --git a/js-plugins/tailwindcss/package.json b/js-plugins/tailwindcss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@farmfe/js-plugin-tailwindcss",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "support tailwindcss for farm.",
   "type": "module",
   "main": "./dist/index.js",

diff --git a/js-plugins/vue/package.json b/js-plugins/vue/package.json
@@ -52,7 +52,7 @@
     "source-map": "^0.7.4"
   },
   "peerDependencies": {
-    "@farmfe/core": "workspace:^1.6.4",
+    "@farmfe/core": "workspace:^1.6.5",
     "less": "*",
     "sass": "*",
     "stylus": "*"

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @farmfe/core
 
+## 1.6.5
+
+### Patch Changes
+
+- 2423ee65: Fix query strings in external imports are duplicated
+
 ## 1.6.4
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@farmfe/core",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",