Skip to content

Commit

Permalink
Update Tauri 2.0.1
Browse files Browse the repository at this point in the history
 - Format front-end packages
 - Update front-end packages dependencies
 - Remove rollup and broken tests
 - Remove Solid and vscode packages
  • Loading branch information
HeavenVolkoff committed Oct 5, 2024
1 parent 55baa52 commit 9438c13
Show file tree
Hide file tree
Showing 54 changed files with 1,742 additions and 8,149 deletions.
2 changes: 0 additions & 2 deletions .cargo/config.toml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github: [oscartbeaumont]
custom: ["https://paypal.me/oscartbeaumont"]
custom: ['https://paypal.me/oscartbeaumont']
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: "weekly"
interval: 'weekly'
71 changes: 0 additions & 71 deletions .github/scripts/setPackageVersions.js

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on:
push:
branches: [main]
paths-ignore:
- "docs/**"
- 'docs/**'
pull_request:
branches: [main]
paths-ignore:
- "docs/**"
- 'docs/**'
workflow_dispatch:

jobs:
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v3
with:
node-version: "16"
node-version: '16'

- name: Install pnpm
uses: pnpm/[email protected]
Expand Down Expand Up @@ -84,8 +84,8 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "16"
cache: "pnpm"
node-version: '16'
cache: 'pnpm'

- name: Setup npmrc
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
Expand Down
151 changes: 147 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Created by https://www.toptal.com/developers/gitignore/api/windows,linux,macos,visualstudiocode,rust,jetbrains+all
# Edit at https://www.toptal.com/developers/gitignore?templates=windows,linux,macos,visualstudiocode,rust,jetbrains+all
# Created by https://www.toptal.com/developers/gitignore/api/windows,linux,macos,rust,rust-analyzer,jetbrains+all,visualstudiocode,node
# Edit at https://www.toptal.com/developers/gitignore?templates=windows,linux,macos,rust,rust-analyzer,jetbrains+all,visualstudiocode,node

### JetBrains+all ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
Expand Down Expand Up @@ -113,7 +113,6 @@ fabric.properties
# Icon must end with two \r
Icon


# Thumbnails
._*

Expand All @@ -137,6 +136,146 @@ Temporary Items
# iCloud generated files
*.icloud

### Node ###
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
.pnpm-debug.log*

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
*.lcov

# nyc test coverage
.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Snowpack dependency directory (https://snowpack.dev/)
web_modules/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional stylelint cache
.stylelintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variable files
.env
.env.development.local
.env.test.local
.env.production.local
.env.local

# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache

# Next.js build output
.next
out

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public

# vuepress build output
.vuepress/dist

# vuepress v2.x temp and cache directory
.temp

# Docusaurus cache and generated files
.docusaurus

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/

# TernJS port file
.tern-port

# Stores VSCode versions used for testing VSCode extensions
.vscode-test

# yarn v2
.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*

### Node Patch ###
# Serverless Webpack directories
.webpack/

# Optional stylelint cache

# SvelteKit build / generate output
.svelte-kit

### Rust ###
# Generated by Cargo
# will have compiled files and executables
Expand All @@ -153,6 +292,10 @@ Cargo.lock
# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb

### rust-analyzer ###
# Can be generated by other build systems other than cargo (ex: bazelbuild/rust_rules)
rust-project.json

### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
Expand Down Expand Up @@ -198,4 +341,4 @@ $RECYCLE.BIN/
# Windows shortcuts
*.lnk

# End of https://www.toptal.com/developers/gitignore/api/windows,linux,macos,visualstudiocode,rust,jetbrains+all
# End of https://www.toptal.com/developers/gitignore/api/windows,linux,macos,rust,rust-analyzer,jetbrains+all,visualstudiocode,node
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ tokio = { version = "1.40", features = ["macros", "rt", "sync"] }
tracing = { version = "0.1.37" }

anyhow = { version = "1.0", optional = true }
tauri = { version = "2.0", optional = true }
tauri = { version = "2.0.1", optional = true }

[dev-dependencies]
# Tests
Expand Down
7 changes: 4 additions & 3 deletions httpz/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,18 @@ HttpServer::new({
```

Check out the rest of the [examples](/examples)!

## Features

- Write your HTTP handler once and support [Axum](https://github.com/tokio-rs/axum), [Actix Web](https://actix.rs/), [Poem](https://github.com/poem-web/poem), [Rocket](https://rocket.rs), [Warp](https://github.com/seanmonstar/warp) and more.
- Support for websockets on compatible webservers.
- Write your HTTP handler once and support [Axum](https://github.com/tokio-rs/axum), [Actix Web](https://actix.rs/), [Poem](https://github.com/poem-web/poem), [Rocket](https://rocket.rs), [Warp](https://github.com/seanmonstar/warp) and more.
- Support for websockets on compatible webservers.

## Projects using httpz

httpz is primarily designed to make life easier for library authors. It allows a library author to write and test a HTTP endpoint once and know it will work for all major Rust HTTP servers.

Libraries using httpz:

- [rspc](https://github.com/oscartbeaumont/rspc)
- [rspc](https://github.com/oscartbeaumont/rspc)

If you are interested in using httpz and have questions jump in [the Discord](https://discord.gg/4V9M5sksw8)!
22 changes: 6 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,16 @@
"license": "MIT",
"private": true,
"scripts": {
"dev": "pnpm -r --parallel --filter=!@oscartbeaumont-sd/rspc-docs --filter=!@oscartbeaumont-sd/rspc-examples-* --filter=!rspc-vscode exec pnpm dev",
"build": "pnpm -r --parallel --filter=!@oscartbeaumont-sd/rspc-docs --filter=!@oscartbeaumont-sd/rspc-examples-* --filter=!rspc-vscode exec pnpm build",
"postinstall": "pnpm run config build && pnpm build",
"format": "prettier --write .",
"test": "pnpm -r --parallel --filter=!@oscartbeaumont-sd/rspc-docs --filter=!@oscartbeaumont-sd/rspc-config --filter=!@oscartbeaumont-sd/rspc-examples-* --filter=!rspc-vscode exec pnpm test",
"typecheck": "pnpm -r --filter=!rspc-vscode exec tsc --noEmit",
"docs": "pnpm --filter @oscartbeaumont-sd/rspc-docs -- ",
"client": "pnpm --filter @oscartbeaumont-sd/rspc-client -- ",
"config": "pnpm --filter @oscartbeaumont-sd/rspc-config -- ",
"examples": "pnpm --filter @oscartbeaumont-sd/rspc-examples-* -- ",
"playground": "pnpm --filter @oscartbeaumont-sd/rspc-playground -- ",
"react": "pnpm --filter @oscartbeaumont-sd/rspc-react -- ",
"solid": "pnpm --filter @oscartbeaumont-sd/rspc-solid -- ",
"tauri": "pnpm --filter @oscartbeaumont-sd/rspc-tauri -- ",
"set-package-versions": "node .github/scripts/setPackageVersions.js"
"tauri": "pnpm --filter @oscartbeaumont-sd/rspc-tauri -- "
},
"engines": {
"pnpm": ">=7.0.0",
"npm": "pnpm",
"yarn": "pnpm",
"node": ">=16.0.0"
"devDependencies": {
"typescript": "^5.6.2",
"@ianvs/prettier-plugin-sort-imports": "^4.3.1"
},
"packageManager": "pnpm@9.7.0"
"packageManager": "pnpm@9.11.0"
}
Loading

0 comments on commit 9438c13

Please sign in to comment.