From 8f3cacfdd6d72be4f15e44b4712d86e99f0af432 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 24 May 2026 01:55:30 +0000 Subject: [PATCH 1/2] chore: update create-farm template dependencies Agent-Logs-Url: https://github.com/farm-fe/farm/sessions/c2118048-a463-412f-b328-abda3620749d Co-authored-by: wre232114 <8372439+wre232114@users.noreply.github.com> --- .../templates/electron/preact/package.json | 26 +++++----- .../templates/electron/react/package.json | 28 +++++------ .../templates/electron/solid/package.json | 28 +++++------ .../templates/electron/svelte/package.json | 30 +++++------ .../templates/electron/vanilla/package.json | 22 ++++---- .../templates/electron/vue/package.json | 26 +++++----- .../create-farm-rs/templates/lit/package.json | 4 +- .../templates/nestjs/package.json | 50 +++++++++---------- .../templates/preact/package.json | 6 +-- .../templates/react/package.json | 12 ++--- .../templates/solid/package.json | 6 +-- .../templates/svelte/package.json | 14 +++--- .../templates/tauri/preact/package.json | 10 ++-- .../templates/tauri/react/package.json | 18 +++---- .../templates/tauri/solid/package.json | 12 ++--- .../templates/tauri/svelte/package.json | 20 ++++---- .../templates/tauri/vanilla/package.json | 6 +-- .../templates/tauri/vue/package.json | 14 +++--- .../templates/tauri2/preact/package.json | 12 ++--- .../templates/tauri2/react/package.json | 20 ++++---- .../templates/tauri2/solid/package.json | 12 ++--- .../templates/tauri2/svelte/package.json | 18 +++---- .../templates/tauri2/vanilla/package.json | 8 +-- .../templates/tauri2/vue/package.json | 14 +++--- .../templates/vanilla/package.json | 2 +- .../templates/vue2/package.json | 4 +- .../templates/vue3/package.json | 8 +-- 27 files changed, 215 insertions(+), 215 deletions(-) diff --git a/crates/create-farm-rs/templates/electron/preact/package.json b/crates/create-farm-rs/templates/electron/preact/package.json index e4a7fc4eb0..39878a52d7 100644 --- a/crates/create-farm-rs/templates/electron/preact/package.json +++ b/crates/create-farm-rs/templates/electron/preact/package.json @@ -10,23 +10,23 @@ "farm": "farm" }, "dependencies": { - "preact": "^10.20.1" + "preact": "^10.29.2" }, "devDependencies": { - "@electron-forge/cli": "^7.4.0", - "@electron-forge/maker-deb": "^7.4.0", - "@electron-forge/maker-rpm": "^7.4.0", - "@electron-forge/maker-squirrel": "^7.4.0", - "@electron-forge/maker-zip": "^7.4.0", - "@electron-forge/shared-types": "^7.4.0", + "@electron-forge/cli": "^7.11.2", + "@electron-forge/maker-deb": "^7.11.2", + "@electron-forge/maker-rpm": "^7.11.2", + "@electron-forge/maker-squirrel": "^7.11.2", + "@electron-forge/maker-zip": "^7.11.2", + "@electron-forge/shared-types": "^7.11.2", "@farmfe/cli": "beta", "@farmfe/core": "beta", "@farmfe/js-plugin-electron": "beta", - "core-js": "^3.36.1", - "electron": "^30.0.9", - "fs-extra": "^11.2.0", - "typescript": "^5.0.2", - "tslib": "^2.6.2", - "@preact/preset-vite": "^2.8.1" + "core-js": "^3.49.0", + "electron": "^42.2.0", + "fs-extra": "^11.3.5", + "typescript": "^6.0.3", + "tslib": "^2.8.1", + "@preact/preset-vite": "^2.10.5" } } diff --git a/crates/create-farm-rs/templates/electron/react/package.json b/crates/create-farm-rs/templates/electron/react/package.json index 0b11541334..d8dc33a1ae 100644 --- a/crates/create-farm-rs/templates/electron/react/package.json +++ b/crates/create-farm-rs/templates/electron/react/package.json @@ -10,25 +10,25 @@ "farm": "farm" }, "dependencies": { - "react": "18", - "react-dom": "18" + "react": "^19.2.6", + "react-dom": "^19.2.6" }, "devDependencies": { - "@electron-forge/cli": "^7.4.0", - "@electron-forge/maker-deb": "^7.4.0", - "@electron-forge/maker-rpm": "^7.4.0", - "@electron-forge/maker-squirrel": "^7.4.0", - "@electron-forge/maker-zip": "^7.4.0", - "@electron-forge/shared-types": "^7.4.0", + "@electron-forge/cli": "^7.11.2", + "@electron-forge/maker-deb": "^7.11.2", + "@electron-forge/maker-rpm": "^7.11.2", + "@electron-forge/maker-squirrel": "^7.11.2", + "@electron-forge/maker-zip": "^7.11.2", + "@electron-forge/shared-types": "^7.11.2", "@farmfe/core": "beta", "@farmfe/cli": "beta", "@farmfe/js-plugin-electron": "beta", "@farmfe/plugin-react": "beta", - "@types/react": "18", - "@types/react-dom": "18", - "core-js": "^3.36.1", - "electron": "^30.0.9", - "fs-extra": "^11.2.0", - "react-refresh": "^0.14.0" + "@types/react": "^19.2.15", + "@types/react-dom": "^19.2.3", + "core-js": "^3.49.0", + "electron": "^42.2.0", + "fs-extra": "^11.3.5", + "react-refresh": "^0.18.0" } } diff --git a/crates/create-farm-rs/templates/electron/solid/package.json b/crates/create-farm-rs/templates/electron/solid/package.json index a0846cf95f..b64ffd62c9 100644 --- a/crates/create-farm-rs/templates/electron/solid/package.json +++ b/crates/create-farm-rs/templates/electron/solid/package.json @@ -10,24 +10,24 @@ "farm": "farm" }, "dependencies": { - "solid-js": "^1.8.16" + "solid-js": "^1.9.13" }, "devDependencies": { - "@electron-forge/cli": "^7.4.0", - "@electron-forge/maker-deb": "^7.4.0", - "@electron-forge/maker-rpm": "^7.4.0", - "@electron-forge/maker-squirrel": "^7.4.0", - "@electron-forge/maker-zip": "^7.4.0", - "@electron-forge/shared-types": "^7.4.0", + "@electron-forge/cli": "^7.11.2", + "@electron-forge/maker-deb": "^7.11.2", + "@electron-forge/maker-rpm": "^7.11.2", + "@electron-forge/maker-squirrel": "^7.11.2", + "@electron-forge/maker-zip": "^7.11.2", + "@electron-forge/shared-types": "^7.11.2", "@farmfe/core": "beta", "@farmfe/cli": "beta", "@farmfe/js-plugin-electron": "beta", - "core-js": "^3.36.1", - "electron": "^30.0.9", - "fs-extra": "^11.2.0", - "typescript": "^5.0.2", - "tslib": "^2.6.2", - "solid-refresh": "^0.7.5", - "vite-plugin-solid": "^2.10.2" + "core-js": "^3.49.0", + "electron": "^42.2.0", + "fs-extra": "^11.3.5", + "typescript": "^6.0.3", + "tslib": "^2.8.1", + "solid-refresh": "^0.7.8", + "vite-plugin-solid": "^2.11.12" } } diff --git a/crates/create-farm-rs/templates/electron/svelte/package.json b/crates/create-farm-rs/templates/electron/svelte/package.json index a5cbb9ec5f..ce9f3fe296 100644 --- a/crates/create-farm-rs/templates/electron/svelte/package.json +++ b/crates/create-farm-rs/templates/electron/svelte/package.json @@ -10,23 +10,23 @@ "farm": "farm" }, "devDependencies": { - "@electron-forge/cli": "^7.4.0", - "@electron-forge/maker-deb": "^7.4.0", - "@electron-forge/maker-rpm": "^7.4.0", - "@electron-forge/maker-squirrel": "^7.4.0", - "@electron-forge/maker-zip": "^7.4.0", - "@electron-forge/shared-types": "^7.4.0", + "@electron-forge/cli": "^7.11.2", + "@electron-forge/maker-deb": "^7.11.2", + "@electron-forge/maker-rpm": "^7.11.2", + "@electron-forge/maker-squirrel": "^7.11.2", + "@electron-forge/maker-zip": "^7.11.2", + "@electron-forge/shared-types": "^7.11.2", "@farmfe/core": "beta", "@farmfe/cli": "beta", "@farmfe/js-plugin-electron": "beta", - "core-js": "^3.36.1", - "electron": "^30.0.9", - "fs-extra": "^11.2.0", - "typescript": "^5.0.2", - "@sveltejs/vite-plugin-svelte": "^3.0.2", - "@tsconfig/svelte": "^5.0.4", - "svelte": "^4.2.12", - "svelte-check": "^3.6.8", - "tslib": "^2.6.2" + "core-js": "^3.49.0", + "electron": "^42.2.0", + "fs-extra": "^11.3.5", + "typescript": "^6.0.3", + "@sveltejs/vite-plugin-svelte": "^7.1.2", + "@tsconfig/svelte": "^5.0.8", + "svelte": "^5.55.9", + "svelte-check": "^4.4.8", + "tslib": "^2.8.1" } } diff --git a/crates/create-farm-rs/templates/electron/vanilla/package.json b/crates/create-farm-rs/templates/electron/vanilla/package.json index 76cd4c84f0..c86a8cc233 100644 --- a/crates/create-farm-rs/templates/electron/vanilla/package.json +++ b/crates/create-farm-rs/templates/electron/vanilla/package.json @@ -10,19 +10,19 @@ "farm": "farm" }, "devDependencies": { - "@electron-forge/cli": "^7.4.0", - "@electron-forge/maker-deb": "^7.4.0", - "@electron-forge/maker-rpm": "^7.4.0", - "@electron-forge/maker-squirrel": "^7.4.0", - "@electron-forge/maker-zip": "^7.4.0", - "@electron-forge/shared-types": "^7.4.0", + "@electron-forge/cli": "^7.11.2", + "@electron-forge/maker-deb": "^7.11.2", + "@electron-forge/maker-rpm": "^7.11.2", + "@electron-forge/maker-squirrel": "^7.11.2", + "@electron-forge/maker-zip": "^7.11.2", + "@electron-forge/shared-types": "^7.11.2", "@farmfe/core": "beta", "@farmfe/cli": "beta", "@farmfe/js-plugin-electron": "beta", - "core-js": "^3.36.1", - "electron": "^30.0.9", - "fs-extra": "^11.2.0", - "typescript": "^5.0.2", - "tslib": "^2.6.2" + "core-js": "^3.49.0", + "electron": "^42.2.0", + "fs-extra": "^11.3.5", + "typescript": "^6.0.3", + "tslib": "^2.8.1" } } diff --git a/crates/create-farm-rs/templates/electron/vue/package.json b/crates/create-farm-rs/templates/electron/vue/package.json index e50a689f35..7d5ec6bcfa 100644 --- a/crates/create-farm-rs/templates/electron/vue/package.json +++ b/crates/create-farm-rs/templates/electron/vue/package.json @@ -10,23 +10,23 @@ "farm": "farm" }, "dependencies": { - "vue": "^3.3.4" + "vue": "^3.5.34" }, "devDependencies": { - "@electron-forge/cli": "^7.4.0", - "@electron-forge/maker-deb": "^7.4.0", - "@electron-forge/maker-rpm": "^7.4.0", - "@electron-forge/maker-squirrel": "^7.4.0", - "@electron-forge/maker-zip": "^7.4.0", - "@electron-forge/shared-types": "^7.4.0", + "@electron-forge/cli": "^7.11.2", + "@electron-forge/maker-deb": "^7.11.2", + "@electron-forge/maker-rpm": "^7.11.2", + "@electron-forge/maker-squirrel": "^7.11.2", + "@electron-forge/maker-zip": "^7.11.2", + "@electron-forge/shared-types": "^7.11.2", "@farmfe/core": "beta", "@farmfe/cli": "beta", "@farmfe/js-plugin-electron": "beta", - "core-js": "^3.36.1", - "electron": "^30.0.9", - "fs-extra": "^11.2.0", - "@vitejs/plugin-vue": "6.0.1", - "typescript": "^5.0.2", - "vue-tsc": "^1.8.5" + "core-js": "^3.49.0", + "electron": "^42.2.0", + "fs-extra": "^11.3.5", + "@vitejs/plugin-vue": "^6.0.7", + "typescript": "^6.0.3", + "vue-tsc": "^3.3.1" } } diff --git a/crates/create-farm-rs/templates/lit/package.json b/crates/create-farm-rs/templates/lit/package.json index 549e80ac84..2f64e16700 100644 --- a/crates/create-farm-rs/templates/lit/package.json +++ b/crates/create-farm-rs/templates/lit/package.json @@ -10,11 +10,11 @@ "clean": "farm clean" }, "dependencies": { - "lit": "^3.1.2" + "lit": "^3.3.3" }, "devDependencies": { "@farmfe/cli": "beta", "@farmfe/core": "beta", - "typescript": "^5.4.3" + "typescript": "^6.0.3" } } diff --git a/crates/create-farm-rs/templates/nestjs/package.json b/crates/create-farm-rs/templates/nestjs/package.json index bfb57d03cb..0b1adf8227 100644 --- a/crates/create-farm-rs/templates/nestjs/package.json +++ b/crates/create-farm-rs/templates/nestjs/package.json @@ -21,37 +21,37 @@ "test:e2e": "jest --config ./test/jest-e2e.json" }, "dependencies": { - "@nestjs/common": "^10.0.0", - "@nestjs/core": "^10.0.0", - "@nestjs/platform-express": "^10.0.0", - "reflect-metadata": "^0.2.0", - "rxjs": "^7.8.1" + "@nestjs/common": "^11.1.23", + "@nestjs/core": "^11.1.23", + "@nestjs/platform-express": "^11.1.23", + "reflect-metadata": "^0.2.2", + "rxjs": "^7.8.2" }, "devDependencies": { "@farmfe/core": "beta", "@farmfe/cli": "beta", - "@nestjs/cli": "^10.0.0", - "@nestjs/schematics": "^10.0.0", - "@nestjs/testing": "^10.0.0", - "@types/express": "^4.17.17", - "@types/jest": "^29.5.2", - "@types/node": "^18.19.67", - "@types/supertest": "^6.0.0", - "@typescript-eslint/eslint-plugin": "^6.0.0", - "@typescript-eslint/parser": "^6.0.0", - "eslint": "^8.42.0", - "eslint-config-prettier": "^9.0.0", - "eslint-plugin-prettier": "^5.0.0", - "farmup": "^0.0.12", - "jest": "^29.5.0", - "prettier": "^3.0.0", + "@nestjs/cli": "^11.0.21", + "@nestjs/schematics": "^11.1.0", + "@nestjs/testing": "^11.1.23", + "@types/express": "^5.0.6", + "@types/jest": "^30.0.0", + "@types/node": "^25.9.1", + "@types/supertest": "^7.2.0", + "@typescript-eslint/eslint-plugin": "^8.59.4", + "@typescript-eslint/parser": "^8.59.4", + "eslint": "^10.4.0", + "eslint-config-prettier": "^10.1.8", + "eslint-plugin-prettier": "^5.5.5", + "farmup": "^0.1.6", + "jest": "^30.4.2", + "prettier": "^3.8.3", "source-map-support": "^0.5.21", - "supertest": "^6.3.3", - "ts-jest": "^29.1.0", - "ts-loader": "^9.4.3", - "ts-node": "^10.9.1", + "supertest": "^7.2.2", + "ts-jest": "^29.4.11", + "ts-loader": "^9.5.7", + "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", - "typescript": "^5.1.3" + "typescript": "^6.0.3" }, "jest": { "moduleFileExtensions": [ diff --git a/crates/create-farm-rs/templates/preact/package.json b/crates/create-farm-rs/templates/preact/package.json index c1a717a791..9e2d27addc 100644 --- a/crates/create-farm-rs/templates/preact/package.json +++ b/crates/create-farm-rs/templates/preact/package.json @@ -11,12 +11,12 @@ "clean": "farm clean" }, "dependencies": { - "preact": "^10.20.1" + "preact": "^10.29.2" }, "devDependencies": { "@farmfe/core": "beta", "@farmfe/cli": "beta", - "@preact/preset-vite": "^2.8.1", - "typescript": "^5.4.3" + "@preact/preset-vite": "^2.10.5", + "typescript": "^6.0.3" } } diff --git a/crates/create-farm-rs/templates/react/package.json b/crates/create-farm-rs/templates/react/package.json index de56c23600..c152a54de2 100644 --- a/crates/create-farm-rs/templates/react/package.json +++ b/crates/create-farm-rs/templates/react/package.json @@ -9,16 +9,16 @@ "clean": "farm clean" }, "dependencies": { - "react": "18", - "react-dom": "18" + "react": "^19.2.6", + "react-dom": "^19.2.6" }, "devDependencies": { "@farmfe/cli": "beta", "@farmfe/core": "beta", "@farmfe/plugin-react": "beta", - "@types/react": "18", - "core-js": "^3.36.1", - "@types/react-dom": "18", - "react-refresh": "^0.14.0" + "@types/react": "^19.2.15", + "core-js": "^3.49.0", + "@types/react-dom": "^19.2.3", + "react-refresh": "^0.18.0" } } diff --git a/crates/create-farm-rs/templates/solid/package.json b/crates/create-farm-rs/templates/solid/package.json index 8b9a2ed920..0272df6ab3 100644 --- a/crates/create-farm-rs/templates/solid/package.json +++ b/crates/create-farm-rs/templates/solid/package.json @@ -9,12 +9,12 @@ "clean": "farm clean" }, "dependencies": { - "solid-js": "^1.8.16" + "solid-js": "^1.9.13" }, "devDependencies": { "@farmfe/cli": "beta", "@farmfe/core": "beta", - "solid-refresh": "^0.7.5", - "vite-plugin-solid": "^2.10.2" + "solid-refresh": "^0.7.8", + "vite-plugin-solid": "^2.11.12" } } diff --git a/crates/create-farm-rs/templates/svelte/package.json b/crates/create-farm-rs/templates/svelte/package.json index 77b060877a..ed15aba9fc 100644 --- a/crates/create-farm-rs/templates/svelte/package.json +++ b/crates/create-farm-rs/templates/svelte/package.json @@ -13,12 +13,12 @@ "devDependencies": { "@farmfe/cli": "beta", "@farmfe/core": "beta", - "@sveltejs/vite-plugin-svelte": "^3.0.2", - "@tsconfig/svelte": "^5.0.4", - "core-js": "^3.36.1", - "svelte": "^4.2.12", - "svelte-check": "^3.6.8", - "tslib": "^2.6.2", - "typescript": "^5.4.3" + "@sveltejs/vite-plugin-svelte": "^7.1.2", + "@tsconfig/svelte": "^5.0.8", + "core-js": "^3.49.0", + "svelte": "^5.55.9", + "svelte-check": "^4.4.8", + "tslib": "^2.8.1", + "typescript": "^6.0.3" } } diff --git a/crates/create-farm-rs/templates/tauri/preact/package.json b/crates/create-farm-rs/templates/tauri/preact/package.json index bf5ce9f1a2..8e73f55f5c 100644 --- a/crates/create-farm-rs/templates/tauri/preact/package.json +++ b/crates/create-farm-rs/templates/tauri/preact/package.json @@ -10,14 +10,14 @@ "tauri": "tauri" }, "dependencies": { - "preact": "^10.16.0", - "@tauri-apps/api": "^1" + "preact": "^10.29.2", + "@tauri-apps/api": "^1.6.0" }, "devDependencies": { - "@preact/preset-vite": "^2.5.0", - "typescript": "^5.0.2", + "@preact/preset-vite": "^2.10.5", + "typescript": "^6.0.3", "@farmfe/cli": "beta", "@farmfe/core": "beta", - "@tauri-apps/cli": "^1" + "@tauri-apps/cli": "^1.6.3" } } diff --git a/crates/create-farm-rs/templates/tauri/react/package.json b/crates/create-farm-rs/templates/tauri/react/package.json index 888cb5e3cd..c847a45aaf 100644 --- a/crates/create-farm-rs/templates/tauri/react/package.json +++ b/crates/create-farm-rs/templates/tauri/react/package.json @@ -9,19 +9,19 @@ "tauri": "tauri" }, "dependencies": { - "react": "^18.2.0", - "react-dom": "^18.2.0", - "@tauri-apps/api": "^1" + "react": "^19.2.6", + "react-dom": "^19.2.6", + "@tauri-apps/api": "^1.6.0" }, "devDependencies": { - "@types/react": "^18.2.15", - "@types/react-dom": "^18.2.7", + "@types/react": "^19.2.15", + "@types/react-dom": "^19.2.3", "@farmfe/cli": "beta", "@farmfe/core": "beta", "@farmfe/plugin-react": "beta", - "typescript": "^5.0.2", - "core-js": "^3.36.1", - "react-refresh": "^0.14.0", - "@tauri-apps/cli": "^1" + "typescript": "^6.0.3", + "core-js": "^3.49.0", + "react-refresh": "^0.18.0", + "@tauri-apps/cli": "^1.6.3" } } diff --git a/crates/create-farm-rs/templates/tauri/solid/package.json b/crates/create-farm-rs/templates/tauri/solid/package.json index e66c291257..38924520fa 100644 --- a/crates/create-farm-rs/templates/tauri/solid/package.json +++ b/crates/create-farm-rs/templates/tauri/solid/package.json @@ -11,15 +11,15 @@ }, "license": "MIT", "dependencies": { - "solid-js": "^1.7.8", - "@tauri-apps/api": "^1" + "solid-js": "^1.9.13", + "@tauri-apps/api": "^1.6.0" }, "devDependencies": { - "typescript": "^5.0.2", + "typescript": "^6.0.3", "@farmfe/cli": "beta", "@farmfe/core": "beta", - "solid-refresh": "^0.7.5", - "vite-plugin-solid": "^2.8.0", - "@tauri-apps/cli": "^1" + "solid-refresh": "^0.7.8", + "vite-plugin-solid": "^2.11.12", + "@tauri-apps/cli": "^1.6.3" } } diff --git a/crates/create-farm-rs/templates/tauri/svelte/package.json b/crates/create-farm-rs/templates/tauri/svelte/package.json index 2a42fd3896..7010bd9fe5 100644 --- a/crates/create-farm-rs/templates/tauri/svelte/package.json +++ b/crates/create-farm-rs/templates/tauri/svelte/package.json @@ -11,19 +11,19 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "^1" + "@tauri-apps/api": "^1.6.0" }, "devDependencies": { - "typescript": "^5.0.2", - "vite": "^5.0.0", - "@tauri-apps/cli": "^1", + "typescript": "^6.0.3", + "vite": "^8.0.14", + "@tauri-apps/cli": "^1.6.3", "@farmfe/cli": "beta", "@farmfe/core": "beta", - "@sveltejs/vite-plugin-svelte": "^3.0.2", - "@tsconfig/svelte": "^5.0.4", - "core-js": "^3.36.1", - "svelte": "^4.2.12", - "svelte-check": "^3.6.8", - "tslib": "^2.6.2" + "@sveltejs/vite-plugin-svelte": "^7.1.2", + "@tsconfig/svelte": "^5.0.8", + "core-js": "^3.49.0", + "svelte": "^5.55.9", + "svelte-check": "^4.4.8", + "tslib": "^2.8.1" } } diff --git a/crates/create-farm-rs/templates/tauri/vanilla/package.json b/crates/create-farm-rs/templates/tauri/vanilla/package.json index c47aa25a09..5652e07545 100644 --- a/crates/create-farm-rs/templates/tauri/vanilla/package.json +++ b/crates/create-farm-rs/templates/tauri/vanilla/package.json @@ -10,12 +10,12 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "^1" + "@tauri-apps/api": "^1.6.0" }, "devDependencies": { - "@tauri-apps/cli": "^1", + "@tauri-apps/cli": "^1.6.3", "@farmfe/cli": "beta", "@farmfe/core": "beta", - "typescript": "^5.0.2" + "typescript": "^6.0.3" } } diff --git a/crates/create-farm-rs/templates/tauri/vue/package.json b/crates/create-farm-rs/templates/tauri/vue/package.json index 6bacacc1f8..d66f1b3e13 100644 --- a/crates/create-farm-rs/templates/tauri/vue/package.json +++ b/crates/create-farm-rs/templates/tauri/vue/package.json @@ -10,16 +10,16 @@ "tauri": "tauri" }, "dependencies": { - "vue": "^3.3.4", - "@tauri-apps/api": "^1" + "vue": "^3.5.34", + "@tauri-apps/api": "^1.6.0" }, "devDependencies": { - "@vitejs/plugin-vue": "6.0.1", - "typescript": "^5.0.2", - "vue-tsc": "^1.8.5", - "@tauri-apps/cli": "^1", + "@vitejs/plugin-vue": "^6.0.7", + "typescript": "^6.0.3", + "vue-tsc": "^3.3.1", + "@tauri-apps/cli": "^1.6.3", "@farmfe/cli": "beta", "@farmfe/core": "beta", - "core-js": "^3.30.1" + "core-js": "^3.49.0" } } diff --git a/crates/create-farm-rs/templates/tauri2/preact/package.json b/crates/create-farm-rs/templates/tauri2/preact/package.json index 318611551d..048dcd4e65 100644 --- a/crates/create-farm-rs/templates/tauri2/preact/package.json +++ b/crates/create-farm-rs/templates/tauri2/preact/package.json @@ -10,16 +10,16 @@ "tauri": "tauri" }, "dependencies": { - "preact": "^10.25.1", - "@tauri-apps/api": "^2", + "preact": "^10.29.2", + "@tauri-apps/api": "^2.11.0", "@tauri-apps/plugin-opener": "^2" }, "devDependencies": { "@farmfe/cli": "beta", "@farmfe/core": "beta", - "@preact/preset-vite": "^2.9.3", - "core-js": "^3.39.0", - "typescript": "^5.6.2", - "@tauri-apps/cli": "^2" + "@preact/preset-vite": "^2.10.5", + "core-js": "^3.49.0", + "typescript": "^6.0.3", + "@tauri-apps/cli": "^2.11.2" } } diff --git a/crates/create-farm-rs/templates/tauri2/react/package.json b/crates/create-farm-rs/templates/tauri2/react/package.json index afe15ca821..5e1eee6a00 100644 --- a/crates/create-farm-rs/templates/tauri2/react/package.json +++ b/crates/create-farm-rs/templates/tauri2/react/package.json @@ -10,20 +10,20 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "^2.1.1", + "@tauri-apps/api": "^2.11.0", "@tauri-apps/plugin-shell": "^2.2.0", - "react": "^18.3.1", - "react-dom": "^18.3.1" + "react": "^19.2.6", + "react-dom": "^19.2.6" }, "devDependencies": { "@farmfe/cli": "beta", "@farmfe/core": "beta", - "@farmfe/plugin-react": "^1.2.6", - "@tauri-apps/cli": "^2.1.0", - "@types/react": "^18.3.18", - "@types/react-dom": "^18.3.5", - "core-js": "^3.39.0", - "react-refresh": "^0.16.0", - "typescript": "^5.7.2" + "@farmfe/plugin-react": "beta", + "@tauri-apps/cli": "^2.11.2", + "@types/react": "^19.2.15", + "@types/react-dom": "^19.2.3", + "core-js": "^3.49.0", + "react-refresh": "^0.18.0", + "typescript": "^6.0.3" } } diff --git a/crates/create-farm-rs/templates/tauri2/solid/package.json b/crates/create-farm-rs/templates/tauri2/solid/package.json index 65089b816d..5fd8ae4f61 100644 --- a/crates/create-farm-rs/templates/tauri2/solid/package.json +++ b/crates/create-farm-rs/templates/tauri2/solid/package.json @@ -12,16 +12,16 @@ }, "license": "MIT", "dependencies": { - "solid-js": "^1.9.3", - "@tauri-apps/api": "^2", + "solid-js": "^1.9.13", + "@tauri-apps/api": "^2.11.0", "@tauri-apps/plugin-opener": "^2" }, "devDependencies": { "@farmfe/cli": "beta", "@farmfe/core": "beta", - "core-js": "^3.39.0", - "typescript": "~5.6.2", - "vite-plugin-solid": "^2.11.0", - "@tauri-apps/cli": "^2" + "core-js": "^3.49.0", + "typescript": "^6.0.3", + "vite-plugin-solid": "^2.11.12", + "@tauri-apps/cli": "^2.11.2" } } diff --git a/crates/create-farm-rs/templates/tauri2/svelte/package.json b/crates/create-farm-rs/templates/tauri2/svelte/package.json index 6443fc743a..7eb03111fc 100644 --- a/crates/create-farm-rs/templates/tauri2/svelte/package.json +++ b/crates/create-farm-rs/templates/tauri2/svelte/package.json @@ -13,19 +13,19 @@ }, "license": "MIT", "dependencies": { - "@tauri-apps/api": "^2", + "@tauri-apps/api": "^2.11.0", "@tauri-apps/plugin-opener": "^2" }, "devDependencies": { "@farmfe/cli": "beta", "@farmfe/core": "beta", - "@sveltejs/adapter-static": "^3.0.6", - "@sveltejs/kit": "^2.9.0", - "@sveltejs/vite-plugin-svelte": "^5.0.0", - "svelte": "^5.0.0", - "svelte-check": "^4.0.0", - "core-js": "^3.39.0", - "typescript": "~5.6.2", - "@tauri-apps/cli": "^2" + "@sveltejs/adapter-static": "^3.0.10", + "@sveltejs/kit": "^2.61.1", + "@sveltejs/vite-plugin-svelte": "^7.1.2", + "svelte": "^5.55.9", + "svelte-check": "^4.4.8", + "core-js": "^3.49.0", + "typescript": "^6.0.3", + "@tauri-apps/cli": "^2.11.2" } } diff --git a/crates/create-farm-rs/templates/tauri2/vanilla/package.json b/crates/create-farm-rs/templates/tauri2/vanilla/package.json index ebca19e1bc..9469e9d910 100644 --- a/crates/create-farm-rs/templates/tauri2/vanilla/package.json +++ b/crates/create-farm-rs/templates/tauri2/vanilla/package.json @@ -10,14 +10,14 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "^2", + "@tauri-apps/api": "^2.11.0", "@tauri-apps/plugin-opener": "^2" }, "devDependencies": { "@farmfe/cli": "beta", "@farmfe/core": "beta", - "@tauri-apps/cli": "^2", - "core-js": "^3.40.0", - "typescript": "^5.7.2" + "@tauri-apps/cli": "^2.11.2", + "core-js": "^3.49.0", + "typescript": "^6.0.3" } } diff --git a/crates/create-farm-rs/templates/tauri2/vue/package.json b/crates/create-farm-rs/templates/tauri2/vue/package.json index 059855e61b..4ab89d43c1 100644 --- a/crates/create-farm-rs/templates/tauri2/vue/package.json +++ b/crates/create-farm-rs/templates/tauri2/vue/package.json @@ -10,17 +10,17 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "^2.1.1", + "@tauri-apps/api": "^2.11.0", "@tauri-apps/plugin-shell": "^2.2.0", - "vue": "^3.5.13" + "vue": "^3.5.34" }, "devDependencies": { "@farmfe/cli": "beta", "@farmfe/core": "beta", - "@tauri-apps/cli": "^2.1.0", - "@vitejs/plugin-vue": "6.0.1", - "core-js": "^3.39.0", - "typescript": "^5.7.2", - "vue-tsc": "^2.2.0" + "@tauri-apps/cli": "^2.11.2", + "@vitejs/plugin-vue": "^6.0.7", + "core-js": "^3.49.0", + "typescript": "^6.0.3", + "vue-tsc": "^3.3.1" } } diff --git a/crates/create-farm-rs/templates/vanilla/package.json b/crates/create-farm-rs/templates/vanilla/package.json index 0cc08a9028..b64eba8a50 100644 --- a/crates/create-farm-rs/templates/vanilla/package.json +++ b/crates/create-farm-rs/templates/vanilla/package.json @@ -12,6 +12,6 @@ "devDependencies": { "@farmfe/cli": "beta", "@farmfe/core": "beta", - "typescript": "^5.4.3" + "typescript": "^6.0.3" } } diff --git a/crates/create-farm-rs/templates/vue2/package.json b/crates/create-farm-rs/templates/vue2/package.json index a413088ba6..665b64baa5 100644 --- a/crates/create-farm-rs/templates/vue2/package.json +++ b/crates/create-farm-rs/templates/vue2/package.json @@ -14,8 +14,8 @@ "devDependencies": { "@farmfe/cli": "beta", "@farmfe/core": "beta", - "@vitejs/plugin-vue2": "^2.3.1", - "core-js": "^3.30.1", + "@vitejs/plugin-vue2": "^2.3.4", + "core-js": "^3.49.0", "vue-template-compiler": "~2.7.16" } } diff --git a/crates/create-farm-rs/templates/vue3/package.json b/crates/create-farm-rs/templates/vue3/package.json index 43fe76f145..823e9a6982 100644 --- a/crates/create-farm-rs/templates/vue3/package.json +++ b/crates/create-farm-rs/templates/vue3/package.json @@ -9,13 +9,13 @@ "clean": "farm clean" }, "dependencies": { - "vue": "^3.4.0" + "vue": "^3.5.34" }, "devDependencies": { "@farmfe/cli": "beta", "@farmfe/core": "beta", - "@vitejs/plugin-vue": "^6.0.1", - "@vue/tsconfig": "^0.7.0", - "core-js": "^3.30.1" + "@vitejs/plugin-vue": "^6.0.7", + "@vue/tsconfig": "^0.9.1", + "core-js": "^3.49.0" } } From 6bdaa756ce12246e99e68b2e4ef61691f3478cf3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 24 May 2026 02:05:00 +0000 Subject: [PATCH 2/2] fix: keep latest templates compatible with Farm v2 Agent-Logs-Url: https://github.com/farm-fe/farm/sessions/c2118048-a463-412f-b328-abda3620749d Co-authored-by: wre232114 <8372439+wre232114@users.noreply.github.com> --- .../templates/electron/svelte/package.json | 5 ++-- .../electron/svelte/src/vite-env.d.ts | 3 +++ .../templates/nestjs/tsconfig.json | 1 + .../templates/svelte/package.json | 5 ++-- .../templates/svelte/src/vite-env.d.ts | 3 +++ .../templates/tauri/preact/src/vite-env.d.ts | 3 +++ .../templates/tauri/react/src/vite-env.d.ts | 3 +++ .../templates/tauri/svelte/package.json | 4 ++-- .../templates/tauri/vue/src/vite-env.d.ts | 3 +++ .../templates/tauri2/preact/farm.config.ts | 4 ++-- .../templates/tauri2/preact/src/env.d.ts | 4 ++++ .../templates/tauri2/react/src/env.d.ts | 3 +++ .../templates/tauri2/svelte/README.md | 4 ++-- .../templates/tauri2/svelte/farm.config.ts | 6 ++--- .../templates/tauri2/svelte/gitignore | 1 - .../templates/tauri2/svelte/index.html | 13 +++++++++++ .../templates/tauri2/svelte/package.json | 15 ++++++------ .../src/{routes/+page.svelte => App.svelte} | 8 +++---- .../templates/tauri2/svelte/src/app.html | 13 ----------- .../templates/tauri2/svelte/src/env.d.ts | 5 ++++ .../templates/tauri2/svelte/src/main.ts | 7 ++++++ .../tauri2/svelte/src/routes/+layout.ts | 5 ---- .../templates/tauri2/svelte/svelte.config.js | 9 +------- .../templates/tauri2/svelte/tsconfig.json | 23 ++++++++----------- .../templates/tauri2/vue/src/env.d.ts | 3 +++ 25 files changed, 88 insertions(+), 65 deletions(-) create mode 100644 crates/create-farm-rs/templates/tauri2/preact/src/env.d.ts create mode 100644 crates/create-farm-rs/templates/tauri2/svelte/index.html rename crates/create-farm-rs/templates/tauri2/svelte/src/{routes/+page.svelte => App.svelte} (92%) delete mode 100644 crates/create-farm-rs/templates/tauri2/svelte/src/app.html create mode 100644 crates/create-farm-rs/templates/tauri2/svelte/src/env.d.ts create mode 100644 crates/create-farm-rs/templates/tauri2/svelte/src/main.ts delete mode 100644 crates/create-farm-rs/templates/tauri2/svelte/src/routes/+layout.ts diff --git a/crates/create-farm-rs/templates/electron/svelte/package.json b/crates/create-farm-rs/templates/electron/svelte/package.json index ce9f3fe296..96121d6c3b 100644 --- a/crates/create-farm-rs/templates/electron/svelte/package.json +++ b/crates/create-farm-rs/templates/electron/svelte/package.json @@ -23,10 +23,11 @@ "electron": "^42.2.0", "fs-extra": "^11.3.5", "typescript": "^6.0.3", - "@sveltejs/vite-plugin-svelte": "^7.1.2", + "@sveltejs/vite-plugin-svelte": "^4.0.4", "@tsconfig/svelte": "^5.0.8", "svelte": "^5.55.9", "svelte-check": "^4.4.8", - "tslib": "^2.8.1" + "tslib": "^2.8.1", + "vite": "^5.4.21" } } diff --git a/crates/create-farm-rs/templates/electron/svelte/src/vite-env.d.ts b/crates/create-farm-rs/templates/electron/svelte/src/vite-env.d.ts index 4078e7476a..806d5ed49c 100644 --- a/crates/create-farm-rs/templates/electron/svelte/src/vite-env.d.ts +++ b/crates/create-farm-rs/templates/electron/svelte/src/vite-env.d.ts @@ -1,2 +1,5 @@ /// /// +declare module '*.css'; +declare module '*.svg'; +declare module '*.png'; diff --git a/crates/create-farm-rs/templates/nestjs/tsconfig.json b/crates/create-farm-rs/templates/nestjs/tsconfig.json index adb614cab7..591bf81fe8 100644 --- a/crates/create-farm-rs/templates/nestjs/tsconfig.json +++ b/crates/create-farm-rs/templates/nestjs/tsconfig.json @@ -10,6 +10,7 @@ "sourceMap": true, "outDir": "./dist", "baseUrl": "./", + "ignoreDeprecations": "6.0", "incremental": true, "skipLibCheck": true, "strictNullChecks": false, diff --git a/crates/create-farm-rs/templates/svelte/package.json b/crates/create-farm-rs/templates/svelte/package.json index ed15aba9fc..21387a8064 100644 --- a/crates/create-farm-rs/templates/svelte/package.json +++ b/crates/create-farm-rs/templates/svelte/package.json @@ -13,12 +13,13 @@ "devDependencies": { "@farmfe/cli": "beta", "@farmfe/core": "beta", - "@sveltejs/vite-plugin-svelte": "^7.1.2", + "@sveltejs/vite-plugin-svelte": "^4.0.4", "@tsconfig/svelte": "^5.0.8", "core-js": "^3.49.0", "svelte": "^5.55.9", "svelte-check": "^4.4.8", "tslib": "^2.8.1", - "typescript": "^6.0.3" + "typescript": "^6.0.3", + "vite": "^5.4.21" } } diff --git a/crates/create-farm-rs/templates/svelte/src/vite-env.d.ts b/crates/create-farm-rs/templates/svelte/src/vite-env.d.ts index 4078e7476a..806d5ed49c 100644 --- a/crates/create-farm-rs/templates/svelte/src/vite-env.d.ts +++ b/crates/create-farm-rs/templates/svelte/src/vite-env.d.ts @@ -1,2 +1,5 @@ /// /// +declare module '*.css'; +declare module '*.svg'; +declare module '*.png'; diff --git a/crates/create-farm-rs/templates/tauri/preact/src/vite-env.d.ts b/crates/create-farm-rs/templates/tauri/preact/src/vite-env.d.ts index 11f02fe2a0..10145a370b 100644 --- a/crates/create-farm-rs/templates/tauri/preact/src/vite-env.d.ts +++ b/crates/create-farm-rs/templates/tauri/preact/src/vite-env.d.ts @@ -1 +1,4 @@ /// +declare module '*.css'; +declare module '*.svg'; +declare module '*.png'; diff --git a/crates/create-farm-rs/templates/tauri/react/src/vite-env.d.ts b/crates/create-farm-rs/templates/tauri/react/src/vite-env.d.ts index 11f02fe2a0..10145a370b 100644 --- a/crates/create-farm-rs/templates/tauri/react/src/vite-env.d.ts +++ b/crates/create-farm-rs/templates/tauri/react/src/vite-env.d.ts @@ -1 +1,4 @@ /// +declare module '*.css'; +declare module '*.svg'; +declare module '*.png'; diff --git a/crates/create-farm-rs/templates/tauri/svelte/package.json b/crates/create-farm-rs/templates/tauri/svelte/package.json index 7010bd9fe5..c6cdb58809 100644 --- a/crates/create-farm-rs/templates/tauri/svelte/package.json +++ b/crates/create-farm-rs/templates/tauri/svelte/package.json @@ -15,11 +15,11 @@ }, "devDependencies": { "typescript": "^6.0.3", - "vite": "^8.0.14", + "vite": "^5.4.21", "@tauri-apps/cli": "^1.6.3", "@farmfe/cli": "beta", "@farmfe/core": "beta", - "@sveltejs/vite-plugin-svelte": "^7.1.2", + "@sveltejs/vite-plugin-svelte": "^4.0.4", "@tsconfig/svelte": "^5.0.8", "core-js": "^3.49.0", "svelte": "^5.55.9", diff --git a/crates/create-farm-rs/templates/tauri/vue/src/vite-env.d.ts b/crates/create-farm-rs/templates/tauri/vue/src/vite-env.d.ts index fc812394b5..ad0b6f2ac4 100644 --- a/crates/create-farm-rs/templates/tauri/vue/src/vite-env.d.ts +++ b/crates/create-farm-rs/templates/tauri/vue/src/vite-env.d.ts @@ -5,3 +5,6 @@ declare module "*.vue" { const component: DefineComponent<{}, {}, any>; export default component; } +declare module '*.css'; +declare module '*.svg'; +declare module '*.png'; diff --git a/crates/create-farm-rs/templates/tauri2/preact/farm.config.ts b/crates/create-farm-rs/templates/tauri2/preact/farm.config.ts index 49101096d8..7281287ad4 100644 --- a/crates/create-farm-rs/templates/tauri2/preact/farm.config.ts +++ b/crates/create-farm-rs/templates/tauri2/preact/farm.config.ts @@ -6,7 +6,7 @@ const host = process.env.TAURI_DEV_HOST; // https://www.farmfe.org/docs/config/configuring-farm export default defineConfig({ - plugins: [preact()], + vitePlugins: [preact()], clearScreen: false, server: { @@ -20,7 +20,7 @@ export default defineConfig({ port: 1421, watchOptions: { ignored: ["**/node_modules/**"], - } + }, } : undefined, }, diff --git a/crates/create-farm-rs/templates/tauri2/preact/src/env.d.ts b/crates/create-farm-rs/templates/tauri2/preact/src/env.d.ts new file mode 100644 index 0000000000..10145a370b --- /dev/null +++ b/crates/create-farm-rs/templates/tauri2/preact/src/env.d.ts @@ -0,0 +1,4 @@ +/// +declare module '*.css'; +declare module '*.svg'; +declare module '*.png'; diff --git a/crates/create-farm-rs/templates/tauri2/react/src/env.d.ts b/crates/create-farm-rs/templates/tauri2/react/src/env.d.ts index 11f02fe2a0..10145a370b 100644 --- a/crates/create-farm-rs/templates/tauri2/react/src/env.d.ts +++ b/crates/create-farm-rs/templates/tauri2/react/src/env.d.ts @@ -1 +1,4 @@ /// +declare module '*.css'; +declare module '*.svg'; +declare module '*.png'; diff --git a/crates/create-farm-rs/templates/tauri2/svelte/README.md b/crates/create-farm-rs/templates/tauri2/svelte/README.md index 858d17956c..a4dee3f887 100644 --- a/crates/create-farm-rs/templates/tauri2/svelte/README.md +++ b/crates/create-farm-rs/templates/tauri2/svelte/README.md @@ -1,6 +1,6 @@ -# Tauri + SvelteKit + TypeScript +# Tauri + Svelte + TypeScript -This template should help get you started developing with Tauri, SvelteKit and TypeScript in Vite. +This template should help get you started developing with Tauri, Svelte and TypeScript in Farm. ## Recommended IDE Setup diff --git a/crates/create-farm-rs/templates/tauri2/svelte/farm.config.ts b/crates/create-farm-rs/templates/tauri2/svelte/farm.config.ts index c0d8c66cec..953aba3479 100644 --- a/crates/create-farm-rs/templates/tauri2/svelte/farm.config.ts +++ b/crates/create-farm-rs/templates/tauri2/svelte/farm.config.ts @@ -1,12 +1,12 @@ import { defineConfig } from "@farmfe/core"; -import { sveltekit } from "@sveltejs/kit/vite"; +import { svelte } from "@sveltejs/vite-plugin-svelte"; // @ts-ignore process is a nodejs global const host = process.env.TAURI_DEV_HOST; // https://www.farmfe.org/docs/config/configuring-farm export default defineConfig({ - vitePlugins: [sveltekit()], + vitePlugins: [svelte()], clearScreen: false, server: { @@ -20,7 +20,7 @@ export default defineConfig({ port: 1421, watchOptions: { ignored: ["**/node_modules/**"], - } + }, } : undefined, }, diff --git a/crates/create-farm-rs/templates/tauri2/svelte/gitignore b/crates/create-farm-rs/templates/tauri2/svelte/gitignore index 6635cf5542..944fa0c894 100644 --- a/crates/create-farm-rs/templates/tauri2/svelte/gitignore +++ b/crates/create-farm-rs/templates/tauri2/svelte/gitignore @@ -1,7 +1,6 @@ .DS_Store node_modules /build -/.svelte-kit /package .env .env.* diff --git a/crates/create-farm-rs/templates/tauri2/svelte/index.html b/crates/create-farm-rs/templates/tauri2/svelte/index.html new file mode 100644 index 0000000000..44e3d3638b --- /dev/null +++ b/crates/create-farm-rs/templates/tauri2/svelte/index.html @@ -0,0 +1,13 @@ + + + + + + + Tauri + Svelte + Typescript App + + +
+ + + diff --git a/crates/create-farm-rs/templates/tauri2/svelte/package.json b/crates/create-farm-rs/templates/tauri2/svelte/package.json index 7eb03111fc..993433328b 100644 --- a/crates/create-farm-rs/templates/tauri2/svelte/package.json +++ b/crates/create-farm-rs/templates/tauri2/svelte/package.json @@ -7,8 +7,8 @@ "dev": "farm", "build": "farm build", "preview": "farm preview", - "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", - "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch", + "check": "svelte-check --tsconfig ./tsconfig.json", + "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch", "tauri": "tauri" }, "license": "MIT", @@ -19,13 +19,14 @@ "devDependencies": { "@farmfe/cli": "beta", "@farmfe/core": "beta", - "@sveltejs/adapter-static": "^3.0.10", - "@sveltejs/kit": "^2.61.1", - "@sveltejs/vite-plugin-svelte": "^7.1.2", + "@sveltejs/vite-plugin-svelte": "^4.0.4", + "@tauri-apps/cli": "^2.11.2", + "@tsconfig/svelte": "^5.0.8", + "core-js": "^3.49.0", "svelte": "^5.55.9", "svelte-check": "^4.4.8", - "core-js": "^3.49.0", + "tslib": "^2.8.1", "typescript": "^6.0.3", - "@tauri-apps/cli": "^2.11.2" + "vite": "^5.4.21" } } diff --git a/crates/create-farm-rs/templates/tauri2/svelte/src/routes/+page.svelte b/crates/create-farm-rs/templates/tauri2/svelte/src/App.svelte similarity index 92% rename from crates/create-farm-rs/templates/tauri2/svelte/src/routes/+page.svelte rename to crates/create-farm-rs/templates/tauri2/svelte/src/App.svelte index d538b29bfa..39b468aa51 100644 --- a/crates/create-farm-rs/templates/tauri2/svelte/src/routes/+page.svelte +++ b/crates/create-farm-rs/templates/tauri2/svelte/src/App.svelte @@ -21,11 +21,11 @@ - - + + -

Click on the Tauri, Vite, and SvelteKit logos to learn more.

+

Click on the Tauri, Farm, and Svelte logos to learn more.

@@ -39,7 +39,7 @@ filter: drop-shadow(0 0 2em #ff7474); } -.logo.svelte-kit:hover { +.logo.svelte:hover { filter: drop-shadow(0 0 2em #ff3e00); } diff --git a/crates/create-farm-rs/templates/tauri2/svelte/src/app.html b/crates/create-farm-rs/templates/tauri2/svelte/src/app.html deleted file mode 100644 index 92e7e3338d..0000000000 --- a/crates/create-farm-rs/templates/tauri2/svelte/src/app.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - Tauri + SvelteKit + Typescript App - %sveltekit.head% - - -
%sveltekit.body%
- - diff --git a/crates/create-farm-rs/templates/tauri2/svelte/src/env.d.ts b/crates/create-farm-rs/templates/tauri2/svelte/src/env.d.ts new file mode 100644 index 0000000000..806d5ed49c --- /dev/null +++ b/crates/create-farm-rs/templates/tauri2/svelte/src/env.d.ts @@ -0,0 +1,5 @@ +/// +/// +declare module '*.css'; +declare module '*.svg'; +declare module '*.png'; diff --git a/crates/create-farm-rs/templates/tauri2/svelte/src/main.ts b/crates/create-farm-rs/templates/tauri2/svelte/src/main.ts new file mode 100644 index 0000000000..5332616b94 --- /dev/null +++ b/crates/create-farm-rs/templates/tauri2/svelte/src/main.ts @@ -0,0 +1,7 @@ +import App from "./App.svelte"; + +const app = new App({ + target: document.getElementById("app"), +}); + +export default app; diff --git a/crates/create-farm-rs/templates/tauri2/svelte/src/routes/+layout.ts b/crates/create-farm-rs/templates/tauri2/svelte/src/routes/+layout.ts deleted file mode 100644 index f4fb6898e5..0000000000 --- a/crates/create-farm-rs/templates/tauri2/svelte/src/routes/+layout.ts +++ /dev/null @@ -1,5 +0,0 @@ -// Tauri doesn't have a Node.js server to do proper SSR -// so we will use adapter-static to prerender the app (SSG) -// See: https://v2.tauri.app/start/frontend/sveltekit/ for more info -export const prerender = true; -export const ssr = false; diff --git a/crates/create-farm-rs/templates/tauri2/svelte/svelte.config.js b/crates/create-farm-rs/templates/tauri2/svelte/svelte.config.js index 2d45f91c5f..1d07739f41 100644 --- a/crates/create-farm-rs/templates/tauri2/svelte/svelte.config.js +++ b/crates/create-farm-rs/templates/tauri2/svelte/svelte.config.js @@ -1,15 +1,8 @@ -// Tauri doesn't have a Node.js server to do proper SSR -// so we will use adapter-static to prerender the app (SSG) -// See: https://v2.tauri.app/start/frontend/sveltekit/ for more info -import adapter from "@sveltejs/adapter-static"; import { vitePreprocess } from "@sveltejs/vite-plugin-svelte"; -/** @type {import('@sveltejs/kit').Config} */ +/** @type {import('@sveltejs/vite-plugin-svelte').SvelteConfig} */ const config = { preprocess: vitePreprocess(), - kit: { - adapter: adapter(), - }, }; export default config; diff --git a/crates/create-farm-rs/templates/tauri2/svelte/tsconfig.json b/crates/create-farm-rs/templates/tauri2/svelte/tsconfig.json index 593dc1963a..288aba78cf 100644 --- a/crates/create-farm-rs/templates/tauri2/svelte/tsconfig.json +++ b/crates/create-farm-rs/templates/tauri2/svelte/tsconfig.json @@ -1,19 +1,14 @@ { - "extends": "./.svelte-kit/tsconfig.json", + "extends": "@tsconfig/svelte/tsconfig.json", "compilerOptions": { + "target": "ESNext", + "useDefineForClassFields": true, + "module": "ESNext", + "resolveJsonModule": true, "allowJs": true, "checkJs": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "sourceMap": true, - "strict": true, - "moduleResolution": "bundler" - } - // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias - // except $lib which is handled by https://kit.svelte.dev/docs/configuration#files - // - // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes - // from the referenced tsconfig.json - TypeScript does not merge them in + "isolatedModules": true + }, + "include": ["src/**/*.d.ts", "src/**/*.ts", "src/**/*.js", "src/**/*.svelte"], + "references": [{ "path": "./tsconfig.node.json" }] } diff --git a/crates/create-farm-rs/templates/tauri2/vue/src/env.d.ts b/crates/create-farm-rs/templates/tauri2/vue/src/env.d.ts index fc812394b5..ad0b6f2ac4 100644 --- a/crates/create-farm-rs/templates/tauri2/vue/src/env.d.ts +++ b/crates/create-farm-rs/templates/tauri2/vue/src/env.d.ts @@ -5,3 +5,6 @@ declare module "*.vue" { const component: DefineComponent<{}, {}, any>; export default component; } +declare module '*.css'; +declare module '*.svg'; +declare module '*.png';