chore: Eliminacion de codigo obsoleto

BarraR3port · Mar 23, 2024 · 8ad7241 · 8ad7241
1 parent 8980499
commit 8ad7241
Show file tree

Hide file tree

Showing 17 changed files with 296 additions and 426 deletions.
diff --git a/biome.json b/biome.json
@@ -44,12 +44,6 @@
 		}
 	},
 	"files": {
-		"ignore": [
-			"node_modules/**",
-			"build/**",
-			"out/**",
-			".next/**",
-			"coverage/**"
-		]
+		"ignore": ["node_modules/**", "build/**", "out/**", ".next/**", "coverage/**"]
 	}
-}
+}
diff --git a/package.json b/package.json
@@ -73,14 +73,15 @@
 		"tailwind-scrollbar": "^3.0.4",
 		"tailwindcss-animate": "^1.0.6",
 		"tauri-controls": "^0.1.0",
+		"yup": "^1.4.0",
 		"zod": "^3.21.4",
 		"zustand": "^4.5.2"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "^1.6.2",
 		"@ianvs/prettier-plugin-sort-imports": "^4.1.0",
 		"@tauri-apps/cli": "2.0.0-beta.11",
-		"@types/node": "^20.4.6",
+		"@types/node": "20.4.6",
 		"@types/react": "^18.2.18",
 		"@types/react-dom": "^18.2.7",
 		"autoprefixer": "^10.4.14",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -10,10 +10,10 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-beta.10", features = [] }
+tauri-build = { version = "2.0.0-beta", features = [] }
 
 [dependencies]
-tauri = { version = "2.0.0-beta.13", features = [] }
+tauri = { version = "2.0.0-beta", features = [] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tauri-plugin-app = "2.0.0-alpha.2"

diff --git a/src-tauri/capabilities/migrated.json b/src-tauri/capabilities/migrated.json
@@ -0,0 +1,15 @@
+{
+	"identifier": "migrated",
+	"description": "permissions that were migrated from v1",
+	"local": true,
+	"windows": ["main"],
+	"permissions": [
+		"path:default",
+		"event:default",
+		"window:default",
+		"app:default",
+		"resources:default",
+		"menu:default",
+		"tray:default"
+	]
+}
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -2,68 +2,53 @@
 	"build": {
 		"beforeDevCommand": "pnpm dev",
 		"beforeBuildCommand": "pnpm build",
-		"devPath": "http://localhost:1420",
-		"distDir": "../dist",
-		"withGlobalTauri": false
+		"frontendDist": "../dist",
+		"devUrl": "http://localhost:1420"
 	},
-	"package": {
-		"productName": "botillery"
-	},
-	"tauri": {
-		"bundle": {
-			"active": true,
-			"category": "DeveloperTool",
-			"copyright": "",
+	"productName": "botillery",
+	"identifier": "cl.botilatia.app",
+	"bundle": {
+		"active": true,
+		"category": "DeveloperTool",
+		"copyright": "",
+		"targets": "all",
+		"externalBin": [],
+		"icon": [
+			"icons/32x32.png",
+			"icons/128x128.png",
+			"icons/[email protected]",
+			"icons/icon.icns",
+			"icons/icon.ico"
+		],
+		"windows": {
+			"certificateThumbprint": null,
+			"digestAlgorithm": "sha256",
+			"timestampUrl": "",
+			"nsis": {
+				"installerIcon": "./icons/icon.ico"
+			}
+		},
+		"longDescription": "",
+		"macOS": {
+			"entitlements": null,
+			"exceptionDomain": "",
+			"frameworks": [],
+			"providerShortName": null,
+			"signingIdentity": null
+		},
+		"resources": [],
+		"shortDescription": "",
+		"linux": {
 			"deb": {
 				"depends": []
-			},
-			"externalBin": [],
-			"icon": [
-				"icons/32x32.png",
-				"icons/128x128.png",
-				"icons/[email protected]",
-				"icons/icon.icns",
-				"icons/icon.ico"
-			],
-			"identifier": "cl.botilatia.app",
-			"longDescription": "",
-			"macOS": {
-				"entitlements": null,
-				"exceptionDomain": "",
-				"frameworks": [],
-				"providerShortName": null,
-				"signingIdentity": null
-			},
-			"resources": [],
-			"shortDescription": "",
-			"targets": "all",
-			"windows": {
-				"certificateThumbprint": null,
-				"digestAlgorithm": "sha256",
-				"timestampUrl": "",
-				"nsis": {
-					"installerIcon": "./icons/icon.ico"
-				}
 			}
-		},
+		}
+	},
+	"plugins": {},
+	"app": {
+		"withGlobalTauri": false,
 		"security": {
-			"csp": null,
-			"dangerousRemoteDomainIpcAccess": [
-				{
-					"scheme": "https",
-					"domain": "tauri.localhost",
-					"windows": [
-						"main"
-					],
-					"plugins": [
-						"app",
-						"shell",
-						"os",
-						"event",
-						"window"
-					]
-				}
-			]
+			"csp": null
 		},
 		"windows": [
 			{

diff --git a/src/components/greeting.tsx b/src/components/greeting.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { invoke } from "@tauri-apps/api/tauri";
+import { invoke } from "@tauri-apps/api/core";
 import { useEffect, useState } from "react";
 
 export function Greeting() {

diff --git a/src/lib/Objects/Project.ts b/src/lib/Objects/Project.ts
@@ -28,7 +28,7 @@ export interface Art {
 export enum CreationType {
 	NEW = "new",
 	IMPORT = "import",
-	MIGRATION = "migration",
+	MIGRATION = "migration"
 }
 
 export type IconArtSize = "64x64" | "128x128" | "256x256" | "512x512";
@@ -57,7 +57,7 @@ export enum PackType {
 	WORLD_SKIN = "world_skin",
 	TEXTURE_SKIN = "texture_skin",
 	MASHUP = "mashup",
-	NONE = "none",
+	NONE = "none"
 }
 
 export type SkinResolution = "64x64" | "128x128" | "256x256" | "512x512" | "1024x1024" | null;

diff --git a/src/lib/Objects/Session.ts b/src/lib/Objects/Session.ts
@@ -27,31 +27,31 @@ export const DEFAULT_SKIN_PACK: SkinPack = {
 		header: {
 			name: "pack.name",
 			uuid: "",
-			version: [1, 0, 0],
+			version: [1, 0, 0]
 		},
 		modules: [
 			{
 				type: "skin_pack",
 				uuid: "",
-				version: [1, 0, 0],
-			},
-		],
+				version: [1, 0, 0]
+			}
+		]
 	},
 	skinList: [],
 	skinsJSON: {
 		skins: [],
 		serialize_name: "",
-		localization_name: "",
+		localization_name: ""
 	},
 	skinResolution: null,
 	texts: [
 		{
 			packTextLanguage: "en_US.lang",
 			packName: "",
 			packDescription: "",
-			translations: [],
-		},
-	],
+			translations: []
+		}
+	]
 };
 
 export const DEFAULT_WORLD_PACK: WorldPack = {
@@ -63,8 +63,8 @@ export const DEFAULT_WORLD_PACK: WorldPack = {
 				packTextLanguage: "en_US.lang",
 				packName: "",
 				packDescription: "",
-				translations: [],
-			},
+				translations: []
+			}
 		],
 		manifest: {
 			format_version: 2,
@@ -74,20 +74,20 @@ export const DEFAULT_WORLD_PACK: WorldPack = {
 				version: [1, 0, 0],
 				uuid: "",
 				lock_template_options: true,
-				base_game_version: [],
+				base_game_version: []
 			},
 			modules: [
 				{
 					type: "world_template",
 					uuid: "",
-					version: [1, 0, 0],
-				},
+					version: [1, 0, 0]
+				}
 			],
 			metadata: {
-				authors: ["Packager by Waypoint"],
-			},
-		},
-	},
+				authors: ["Packager by Waypoint"]
+			}
+		}
+	}
 };
 
 export const DEFAULT_TEXTURE_PACK: PackSpecificProps = {
@@ -98,8 +98,8 @@ export const DEFAULT_TEXTURE_PACK: PackSpecificProps = {
 			packTextLanguage: "en_US.lang",
 			packName: "",
 			packDescription: "",
-			translations: [],
-		},
+			translations: []
+		}
 	],
 	manifest: {
 		format_version: 2,
@@ -108,17 +108,17 @@ export const DEFAULT_TEXTURE_PACK: PackSpecificProps = {
 			name: "pack.name",
 			uuid: "",
 			version: [1, 0, 0],
-			min_engine_version: [],
+			min_engine_version: []
 		},
 		modules: [
 			{
 				type: "resources",
 				uuid: "",
-				version: [1, 0, 0],
-			},
+				version: [1, 0, 0]
+			}
 		],
-		dependencies: [],
-	},
+		dependencies: []
+	}
 };
 
 Object.freeze(DEFAULT_SKIN_PACK);