Skip to content

Commit

Permalink
chore: Update SvelteKit and Vite (#271)
Browse files Browse the repository at this point in the history 
- `@sveltejs/kit`: 1.x → 2.x
- `vite`: 4.x → 5.x
  • Loading branch information
@ciscorn
ciscorn authored Feb 13, 2024
1 parent 3d9c299 commit 3f3b89b
Show file tree
Hide file tree
Showing 15 changed files with 1,152 additions and 1,120 deletions.
2,148 changes: 1,091 additions & 1,057 deletions app/package-lock.json
View file

Large diffs are not rendered by default.

41 changes: 20 additions & 21 deletions app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,28 @@
},
"devDependencies": {
"@iconify/svelte": "^3.1.6",
"@sveltejs/adapter-auto": "^2.0.0",
"@sveltejs/adapter-static": "^2.0.3",
"@sveltejs/kit": "^1.20.4",
"@tauri-apps/cli": "^1.5.6",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"autoprefixer": "^10.4.16",
"eslint": "^8.28.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-svelte": "^2.30.0",
"postcss": "^8.4.31",
"prettier": "^2.8.0",
"prettier-plugin-svelte": "^2.10.1",
"svelte": "^4.0.5",
"svelte-check": "^3.4.3",
"tailwindcss": "^3.3.5",
"tslib": "^2.4.1",
"typescript": "^5.0.0",
"vite": "^4.5.1",
"vitest": "^0.34.0"
"@sveltejs/adapter-static": "^3.0.1",
"@sveltejs/kit": "^2.5.0",
"@tauri-apps/cli": "^1.5.9",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"autoprefixer": "^10.4.17",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-svelte": "^2.35.1",
"postcss": "^8.4.35",
"prettier": "^3.2.5",
"prettier-plugin-svelte": "^3.1.2",
"svelte": "^4.2.10",
"svelte-check": "^3.6.4",
"tailwindcss": "^3.4.1",
"tslib": "^2.6.2",
"typescript": "^5.3.3",
"vite": "^5.1.1",
"vitest": "^1.2.2"
},
"type": "module",
"dependencies": {
"@tauri-apps/api": "^1.5.1"
"@tauri-apps/api": "^1.5.3"
}
}
6 changes: 2 additions & 4 deletions app/src-tauri/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,17 @@ rust-version = "1.60"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[build-dependencies]
tauri-build = { version = "1.5.0", features = [] }
tauri-build = { version = "1.5.1", features = [] }

[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
tauri = { version = "1.5.2", features = [ "fs-read-dir", "dialog-all"] }
tauri = { version = "1.5.4", features = [ "fs-read-dir", "dialog-all"] }
nusamai = { path = "../../nusamai" }
nusamai-geometry = { path = "../../nusamai-geometry" }
nusamai-geojson = { path = "../../nusamai-geojson" }
nusamai-plateau = { path = "../../nusamai-plateau" }
nusamai-citygml = {path = "../../nusamai-citygml" }
quick-xml = "0.31.0"
geojson = "0.24.1"
log = "0.4.20"
pretty_env_logger = "0.5.0"

Expand Down
2 changes: 1 addition & 1 deletion app/svelte.config.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import adapter from '@sveltejs/adapter-static';
import { vitePreprocess } from '@sveltejs/kit/vite';
import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';

/** @type {import('@sveltejs/kit').Config} */
const config = {
Expand Down
6 changes: 3 additions & 3 deletions nusamai-3dtiles/nusamai-3dtiles-json/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
serde = { version = "1.0.192", features = ["derive"] }
serde_json = { version = "1.0.108", features = ["indexmap", "float_roundtrip"] }
serde_repr = "0.1.17"
serde = { version = "1.0.196", features = ["derive"] }
serde_json = { version = "1.0.113", features = ["indexmap", "float_roundtrip"] }
serde_repr = "0.1.18"
nusamai-gltf-json = { path = "../../nusamai-gltf/nusamai-gltf-json" }

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions nusamai-citygml/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ serde = ["dep:serde", "serde_json", "nusamai-geometry/serde"]
[dependencies]
ahash = "0.8.8"
chrono = { version = "0.4.34", features = ["serde"], default-features = false }
indexmap = { version = "2.1", features = ["serde"] }
indexmap = { version = "2.2", features = ["serde"] }
log = "0.4.20"
macros = { path = "./macros" }
nusamai-geometry = { path = "../nusamai-geometry", features = ["serde"]}
nusamai-projection = { path = "../nusamai-projection"}
quick-xml = "0.31"
serde = { version = "1.0", features = ["derive"], optional = true }
serde_json = { version = "1.0.108", features = ["indexmap"], optional = true }
serde_json = { version = "1.0.113", features = ["indexmap"], optional = true }
thiserror = "1.0"
url = "2.5.0"
4 changes: 2 additions & 2 deletions nusamai-czml/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2021"

[dependencies]
chrono = { version = "0.4.34", features = ["serde"] }
serde = { version = "1.0.195", features = ["derive"] }
serde_json = { version = "1.0.111", features = ["float_roundtrip"] }
serde = { version = "1.0.196", features = ["derive"] }
serde_json = { version = "1.0.113", features = ["float_roundtrip"] }
nusamai-geometry = { path = "../nusamai-geometry" }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion nusamai-geojson/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ edition = "2021"
[dependencies]
geojson = "0.24.1"
nusamai-geometry = { path = "../nusamai-geometry" }
serde_json = { version = "1.0.108", features = ["indexmap"] }
serde_json = { version = "1.0.113", features = ["indexmap"] }
12 changes: 6 additions & 6 deletions nusamai-geometry/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ edition = "2021"

[dependencies]
num-traits = "0.2.18"
serde = { version = "1.0.193", features = ["derive"], optional = true }
serde = { version = "1.0.196", features = ["derive"], optional = true }

[dev-dependencies]
byteorder = "1.5.0"
geo-types = "0.7.11"
geo-types = "0.7.12"
geojson = "0.24.1"
indexmap = "2.2.3"
quick-xml = "0.31.0"
thiserror = "1.0.50"
thiserror = "1.0.57"
earcut-rs = { git = "https://github.com/MIERUNE/earcut-rs.git" }
clap = { version = "4.4.8", features = ["derive"] }
serde = { version = "1.0.193", features = ["derive"] }
serde_json = "1.0.108"
clap = { version = "4.5.0", features = ["derive"] }
serde = { version = "1.0.196", features = ["derive"] }
serde_json = "1.0.113"
6 changes: 3 additions & 3 deletions nusamai-gltf/nusamai-gltf-json/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
serde = { version = "1.0.192", features = ["derive"] }
serde_json = { version = "1.0.108", features = ["indexmap", "float_roundtrip"] }
serde_repr = "0.1.17"
serde = { version = "1.0.196", features = ["derive"] }
serde_json = { version = "1.0.113", features = ["indexmap", "float_roundtrip"] }
serde_repr = "0.1.18"

[dev-dependencies]
glob = "0.3.1"
4 changes: 2 additions & 2 deletions nusamai-gpkg/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ edition = "2021"
[dependencies]
sqlx = { version = "0.7.3", features = ["sqlite", "runtime-tokio"] }
nusamai-geometry = { path = "../nusamai-geometry" }
thiserror = "1.0.51"
thiserror = "1.0.57"
url = "2.5.0"
indexmap = "2.2.2"
indexmap = "2.2.3"

[dev-dependencies]
tokio = { version = "1.36", features = ["full"] }
1 change: 0 additions & 1 deletion nusamai-kml/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ edition = "2021"

[dependencies]
kml = "0.8.5"
shapefile = "0.5.0"
nusamai-geometry = { version = "0.1.0", path = "../nusamai-geometry" }
16 changes: 8 additions & 8 deletions nusamai-plateau/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ default = ["serde"]

[dependencies]
quick-xml = "0.31.0"
serde = { version = "1.0.193", features = ["derive"], optional = true }
serde = { version = "1.0.196", features = ["derive"], optional = true }
nusamai-citygml = { path = "../nusamai-citygml", features = ["serde"]}
nusamai-geometry = { path = "../nusamai-geometry" }
chrono = { version = "0.4.34", features = ["serde"], default-features = false }
url = "2.5.0"
stretto = { git = "https://github.com/ciscorn/stretto.git" , branch = "update-wg" }
stretto = "0.8.3"
hashbrown = "0.14.3"
indexmap = "2.2.2"
indexmap = "2.2.3"
log = "0.4.20"

[dev-dependencies]
zstd = { version = "0.13.0", features = ["zdict_builder"] }
bincode = { version = "2.0.0-rc", default-features = false, features = ["std", "serde"] }
clap = { version = "4.4", features = ["derive"] }
serde = { version = "1.0.193", features = ["derive"] }
lz4_flex = "0.11.1"
serde_json = "1.0.111"
bincode = { version = "2.0.0-rc.3", default-features = false, features = ["std", "serde"] }
clap = { version = "4.5", features = ["derive"] }
serde = { version = "1.0.196", features = ["derive"] }
lz4_flex = "0.11.2"
serde_json = "1.0.113"
2 changes: 1 addition & 1 deletion nusamai-projection/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ edition = "2021"

[dependencies]
japan-geoid = { git = "https://github.com/MIERUNE/japan-geoid" }
thiserror = "1.0.50"
thiserror = "1.0.57"
18 changes: 10 additions & 8 deletions nusamai/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,26 @@ edition = "2021"

[dependencies]
indexmap = { version = "2.2.3", features = ["serde"] }
rayon = "1.8.0"
serde = { version = "1.0.193", features = ["derive"] }
rayon = "1.8.1"
serde = { version = "1.0.196", features = ["derive"] }
nusamai-plateau = { path = "../nusamai-plateau" }
nusamai-citygml = { path = "../nusamai-citygml" }
quick-xml = "0.31.0"
clap = { version = "4.4.11", features = ["derive"] }
thiserror = "1.0.51"
ctrlc = "3.4.1"
clap = { version = "4.5.0", features = ["derive"] }
thiserror = "1.0.57"
ctrlc = "3.4.2"
bincode = "1.3.3"
lz4_flex = "0.11.1"
lz4_flex = "0.11.2"
nusamai-geojson = { path = "../nusamai-geojson" }
nusamai-gltf-json = { path = "../nusamai-gltf/nusamai-gltf-json" }
nusamai-gltf = { path = "../nusamai-gltf" }
nusamai-3dtiles-json = { path = "../nusamai-3dtiles/nusamai-3dtiles-json" }
nusamai-geometry = { path = "../nusamai-geometry" }
nusamai-czml = { path = "../nusamai-czml" }
nusamai-projection = { path = "../nusamai-projection" }
nusamai-mvt = { path = "../nusamai-mvt" }
geojson = "0.24.1"
serde_json = { version = "1.0.108", features = ["indexmap"] }
serde_json = { version = "1.0.113", features = ["indexmap"] }
url = "2.5.0"
nusamai-gpkg = { path = "../nusamai-gpkg" }
tokio = { version = "1.36", features = ["full"] }
Expand All @@ -34,7 +35,7 @@ deepsize = "0.2.0"
serde_bytes = "0.11.14"
log = { version = "0.4.20" }
pretty_env_logger = "0.5.0"
itertools = "0.12.0"
itertools = "0.12.1"
prost = "0.12.3"
bytesize = "1.3.0"
ahash = "0.8.8"
Expand All @@ -51,3 +52,4 @@ rand = "0.8.5"
tokio = { version = "1.36", features = ["full"] }
nusamai-geometry = { path = "../nusamai-geometry" }
byteorder = "1.5.0"
glob = "0.3.1"

0 comments on commit 3f3b89b

Please sign in to comment.