Merge branch 'master' into dependabot/npm_and_yarn/types/node-22.13.5

This commit is contained in:
Damien 2025-02-22 02:30:22 -05:00 committed by GitHub
commit 7849fce61c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 17 additions and 16 deletions

2
.github/FUNDING.yml vendored
View File

@ -1,3 +1,3 @@
# These are supported funding model platforms
github: [leon3s]
github: [d4m13n-d3v]

View File

@ -6,18 +6,18 @@
<p>
[![Stars](https://img.shields.io/github/stars/leon3s/nextauri?style=social)](https://github.com/leon3s/nextauri)
[![Rust](https://img.shields.io/badge/built_with-Rust-dca282.svg)](https://github.com/leon3s/nextauri)
[![Typescript](https://img.shields.io/badge/built_with-Typescript-3178C6.svg)](https://github.com/leon3s/nextauri)
[![Discord](https://img.shields.io/discord/1011267493114949693?label=chat&logo=discord)](https://discord.gg/WV4Aac8uZg)
[![Stars](https://img.shields.io/github/stars/d4m13n-d3v/file_tree_rust?style=social)](https://github.com/d4m13n-d3v/file_tree_rust)
[![Rust](https://img.shields.io/badge/built_with-Rust-dca282.svg)](https://github.com/d4m13n-d3v/file_tree_rust)
[![Typescript](https://img.shields.io/badge/built_with-Typescript-3178C6.svg)](https://github.com/d4m13n-d3v/file_tree_rust)
[![Discord](https://img.shields.io/discord/1195961063183765575?label=chat&logo=discord)](https://discord.gg/8dHnaarghJ)
</p>
<p>
[![Eslint & Clippy](https://github.com/leon3s/nextauri/actions/workflows/eslint_clippy.yml/badge.svg)](https://github.com/leon3s/nextauri/actions/workflows/eslint_clippy.yml)
[![Build](https://github.com/leon3s/nextauri/actions/workflows/build.yml/badge.svg)](https://github.com/leon3s/nextauri/actions/workflows/build.yml)
[![Eslint & Clippy](https://github.com/d4m13n-d3v/file_tree_rust/actions/workflows/eslint_clippy.yml/badge.svg)](https://github.com/d4m13n-d3v/file_tree_rust/actions/workflows/eslint_clippy.yml)
[![Build](https://github.com/d4m13n-d3v/file_tree_rust/actions/workflows/build.yml/badge.svg)](https://github.com/d4m13n-d3v/file_tree_rust/actions/workflows/build.yml)
<p>
@ -79,7 +79,7 @@ Be sure you have [NodeJS](https://nodejs.org/en/) and [Rust](https://www.rust-la
2. Clone or fork this repository
```sh
git clone https://github.com/leon3s/nextauri
git clone https://github.com/d4m13n-d3v/file_tree_rust
cd nextauri
```
3. Install node dependencies
@ -116,7 +116,7 @@ You can modify the `port` by updating `src-tauri/tauri.conf.json`. <br />
To test your application we recommand you to use [Cypress](https://www.cypress.io) using Tauri [mocking technique](https://tauri.app/v1/guides/testing/mocking).
If you want me to add `Cypress` as part of the template react to this [discussion](https://github.com/leon3s/nextauri/discussions/19).
If you want me to add `Cypress` as part of the template react to this [discussion](https://github.com/d4m13n-d3v/file_tree_rust/discussions/19).
You may also want to take a look to pre-alpha [WebDriver Testing](https://tauri.app/v1/guides/testing/webdriver/introduction) from Tauri.

9
package-lock.json generated
View File

@ -23,7 +23,7 @@
"devDependencies": {
"@tauri-apps/cli": "^2.2.7",
"@types/node": "^22.13.5",
"@types/react": "^19.0.9",
"@types/react": "^19.0.10",
"@types/react-dom": "^19.0.3",
"eslint": "^9.20.1",
"eslint-config-next": "^15.1.7",
@ -1065,10 +1065,11 @@
}
},
"node_modules/@types/react": {
"version": "19.0.9",
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.9.tgz",
"integrity": "sha512-FedNTYgmMwSZmD1Sru/W1gJKuiYCN/3SuBkmZkcxX+FpO5zL76B22A9YNfAKg4HQO3Neh/30AiynP6BELdU0qQ==",
"version": "19.0.10",
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.10.tgz",
"integrity": "sha512-JuRQ9KXLEjaUNjTWpzuR231Z2WpIwczOkBEIvbHNCzQefFIT0L8IqE6NV6ULLyC1SI/i234JnDoMkfg+RjQj2g==",
"dev": true,
"license": "MIT",
"dependencies": {
"csstype": "^3.0.2"
}

View File

@ -26,7 +26,7 @@
"devDependencies": {
"@tauri-apps/cli": "^2.2.7",
"@types/node": "^22.13.5",
"@types/react": "^19.0.9",
"@types/react": "^19.0.10",
"@types/react-dom": "^19.0.3",
"eslint": "^9.20.1",
"eslint-config-next": "^15.1.7",

4
src-tauri/Cargo.lock generated
View File

@ -3736,9 +3736,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.138"
version = "1.0.139"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
dependencies = [
"itoa 1.0.14",
"memchr",