From f46f97400ffa6982061d6dd66857e399a1a11b8a Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Tue, 14 Mar 2023 18:54:59 -0400 Subject: [PATCH 001/108] used custom twMerge config --- src/utils/util.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/util.ts b/src/utils/util.ts index 28022af0..8babfedf 100644 --- a/src/utils/util.ts +++ b/src/utils/util.ts @@ -455,7 +455,7 @@ export function isLocalCore(core: CoreConnectionInfo) { } export function cn(...inputs: ClassValue[]) { - return twMerge(clsx(...inputs)); + return myTwMerge(clsx(...inputs)); } // detect if we are in a browser that supports negative lookbehind From 608a2255b1185ab8dd217e7fd22aaafe05a195f3 Mon Sep 17 00:00:00 2001 From: Hanmin Kim Date: Tue, 14 Mar 2023 19:05:50 -0400 Subject: [PATCH 002/108] create Table component --- src/components/Table.stories.tsx | 49 +++++++++++++++++++++++++ src/components/Table.tsx | 61 ++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 src/components/Table.stories.tsx create mode 100644 src/components/Table.tsx diff --git a/src/components/Table.stories.tsx b/src/components/Table.stories.tsx new file mode 100644 index 00000000..30cbd850 --- /dev/null +++ b/src/components/Table.stories.tsx @@ -0,0 +1,49 @@ +import React from 'react'; + +import { ComponentStory, ComponentMeta } from '@storybook/react'; +import {Table, TableColumn, TableRow} from "./Table"; + +const mockTableColumns: TableColumn[] = [ + { field: "name", headerName: "TASK NAME", width: 200, className: "font-mono text-white" }, + { field: "start", headerName: "CREATED", width: 200 }, + { field: "finish", headerName: "FINISHED", width: 200 }, + { field: "pId", headerName: "PROCESS ID", width: 200 }, +] + +const mockTableRows: TableRow[] = [ + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, +] + +export default { + title: 'Table', + component: Table, +} as ComponentMeta; + +const Template: ComponentStory = (args) => + ( + + ) + +export const Primary = Template.bind({}); + + +Primary.args = { + columns: mockTableColumns, + rows: mockTableRows, + className: "w-96 h-96", +} \ No newline at end of file diff --git a/src/components/Table.tsx b/src/components/Table.tsx new file mode 100644 index 00000000..21403394 --- /dev/null +++ b/src/components/Table.tsx @@ -0,0 +1,61 @@ +import * as React from 'react'; +import {cn} from "../utils/util"; + + +export interface TableColumn { + field: string; + headerName: string; + width: number; + className?: string; +} + +export interface TableRow { + [key: string]: React.ReactNode; +} + +interface CardProps { + rows: TableRow[]; + columns: TableColumn[]; + className?: string; +} + +export function Table({rows, columns, className}: CardProps) { + return ( +
+
+
+ {columns.map((column, cIndex) => { + return ( +
+ {column.headerName} +
+ ) + } + )} +
+ +
+ {rows.map((row, index) => { + + return ( +
+ {columns.map((column, cIndex) => { + return ( +
+ {row[column.field]} +
+ ) + } + )} +
+ ) + })} +
+
+
+ ); +} \ No newline at end of file From d4b514005914be6a63c32b4623066b93e756d776 Mon Sep 17 00:00:00 2001 From: Hanmin Kim Date: Tue, 14 Mar 2023 19:43:54 -0400 Subject: [PATCH 003/108] fix scrollbar issue on Chrome --- src/components/Table.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/Table.tsx b/src/components/Table.tsx index 21403394..9008cd57 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -21,10 +21,9 @@ interface CardProps { export function Table({rows, columns, className}: CardProps) { return ( -
-
-
+
+
+
{columns.map((column, cIndex) => { return (
@@ -35,7 +34,7 @@ export function Table({rows, columns, className}: CardProps) { )}
-
+
{rows.map((row, index) => { return ( From a63bb0b68f430beda3345be424ad96b43f615f0a Mon Sep 17 00:00:00 2001 From: Hanmin Kim Date: Tue, 14 Mar 2023 20:39:26 -0400 Subject: [PATCH 004/108] make table header sticky --- src/components/Table.stories.tsx | 6 +++++ src/components/Table.tsx | 38 +++++++++++++++----------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/components/Table.stories.tsx b/src/components/Table.stories.tsx index 30cbd850..2abb1c01 100644 --- a/src/components/Table.stories.tsx +++ b/src/components/Table.stories.tsx @@ -40,9 +40,15 @@ const Template: ComponentStory = (args) => ) export const Primary = Template.bind({}); +export const Clip = Template.bind({}); Primary.args = { + columns: mockTableColumns, + rows: mockTableRows.slice(0, 5), + className: "w-full", +} +Clip.args = { columns: mockTableColumns, rows: mockTableRows, className: "w-96 h-96", diff --git a/src/components/Table.tsx b/src/components/Table.tsx index 9008cd57..8985592e 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -21,39 +21,37 @@ interface CardProps { export function Table({rows, columns, className}: CardProps) { return ( -
+
-
+
{columns.map((column, cIndex) => { return (
- {column.headerName} + {column.headerName}
) } )}
-
- {rows.map((row, index) => { + {rows.map((row, index) => { - return ( -
- {columns.map((column, cIndex) => { - return ( -
+ return ( +
+ {columns.map((column, cIndex) => { + return ( +
{row[column.field]} -
- ) - } - )} -
- ) - })} -
+
+ ) + } + )} +
+ ) + })}
); From 5e682548bc4c3678b0f39609b43711542d7dc155 Mon Sep 17 00:00:00 2001 From: Hanmin Kim Date: Tue, 14 Mar 2023 22:00:58 -0400 Subject: [PATCH 005/108] general code cleanup for table --- src/components/Table.tsx | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/components/Table.tsx b/src/components/Table.tsx index 8985592e..ef638d1d 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -1,5 +1,6 @@ import * as React from 'react'; import {cn} from "../utils/util"; +import clsx from "clsx"; export interface TableColumn { @@ -23,14 +24,13 @@ export function Table({rows, columns, className}: CardProps) { return (
-
- {columns.map((column, cIndex) => { - return ( -
- {column.headerName} -
- ) - } +
+ {columns.map((column, cIndex) => ( +
+ {column.headerName} +
+ ) )}
@@ -38,16 +38,14 @@ export function Table({rows, columns, className}: CardProps) { return (
- {columns.map((column, cIndex) => { - return ( -
- {row[column.field]} -
- ) - } + {columns.map((column, cIndex) => ( +
+ {row[column.field]} +
+ ) )}
) From 10b803784186aadbb9dc9c5da77b9486d1945bf4 Mon Sep 17 00:00:00 2001 From: Hanmin Kim Date: Tue, 14 Mar 2023 23:31:16 -0400 Subject: [PATCH 006/108] use html table for Table --- src/components/Table.stories.tsx | 59 ++++++++++++++++++------------ src/components/Table.tsx | 63 +++++++++++++++++--------------- 2 files changed, 69 insertions(+), 53 deletions(-) diff --git a/src/components/Table.stories.tsx b/src/components/Table.stories.tsx index 2abb1c01..85212f82 100644 --- a/src/components/Table.stories.tsx +++ b/src/components/Table.stories.tsx @@ -1,36 +1,37 @@ import React from 'react'; -import { ComponentStory, ComponentMeta } from '@storybook/react'; +import {ComponentStory, ComponentMeta} from '@storybook/react'; import {Table, TableColumn, TableRow} from "./Table"; +import {cn} from "../utils/util"; const mockTableColumns: TableColumn[] = [ - { field: "name", headerName: "TASK NAME", width: 200, className: "font-mono text-white" }, - { field: "start", headerName: "CREATED", width: 200 }, - { field: "finish", headerName: "FINISHED", width: 200 }, - { field: "pId", headerName: "PROCESS ID", width: 200 }, + {field: "name", headerName: "TASK NAME", className: "font-mono text-white"}, + {field: "start", headerName: "CREATED"}, + {field: "finish", headerName: "FINISHED"}, + {field: "pId", headerName: "PROCESS ID"}, ] const mockTableRows: TableRow[] = [ - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, - { name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890 }, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, + {name: "Hello.js", start: "Jan 4 2023, 09:37", finish: "Jan 4 2023, 09:37", pId: 1234567890}, ] export default { - title: 'Table', + title: 'library/Table', component: Table, } as ComponentMeta; @@ -38,12 +39,24 @@ const Template: ComponentStory = (args) => (
) +const TemplateDiv: ComponentStory = (args) => + ( +
+
+ + ) export const Primary = Template.bind({}); -export const Clip = Template.bind({}); +export const Minimal = Template.bind({}); +export const Clip = TemplateDiv.bind({}); Primary.args = { + columns: mockTableColumns, + rows: mockTableRows.slice(0, 5), + className: "w-[600px]", +} +Minimal.args = { columns: mockTableColumns, rows: mockTableRows.slice(0, 5), className: "w-full", diff --git a/src/components/Table.tsx b/src/components/Table.tsx index ef638d1d..a1e72bc7 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -6,7 +6,6 @@ import clsx from "clsx"; export interface TableColumn { field: string; headerName: string; - width: number; className?: string; } @@ -22,35 +21,39 @@ interface CardProps { export function Table({rows, columns, className}: CardProps) { return ( -
-
-
- {columns.map((column, cIndex) => ( -
- {column.headerName} -
- ) - )} -
- - {rows.map((row, index) => { - - return ( -
- {columns.map((column, cIndex) => ( -
- {row[column.field]} -
- ) - )} -
+
+ + + {columns.map((column, cIndex) => ( + ) - })} - - + )} + + + + {rows.map((row, index) => { + + return ( + + {columns.map((column, cIndex) => ( + + ) + )} + + ) + })} + + + + +
+ {column.headerName} +
+ {row[column.field]} +
); } \ No newline at end of file From 70e143874d33e232f8cf91d09c3ab5feb47d7576 Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Tue, 14 Mar 2023 23:54:58 -0400 Subject: [PATCH 007/108] added logic to ensure password length is hidden until user makes it visible --- src/components/Atoms/Config/InputBox.tsx | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/components/Atoms/Config/InputBox.tsx b/src/components/Atoms/Config/InputBox.tsx index f6919e04..39e7fc77 100644 --- a/src/components/Atoms/Config/InputBox.tsx +++ b/src/components/Atoms/Config/InputBox.tsx @@ -168,12 +168,15 @@ export default function InputBox({ let icons = []; - if (touched) { + if (typeModified !== 'password' && touched) { icons.push( formRef.current?.requestSubmit()} + onClick={() => { + formRef.current?.requestSubmit(); + setTypeModified('password'); + }} key="save" /> ); @@ -191,11 +194,12 @@ export default function InputBox({ + onClick={() => { typeModified === 'password' ? setTypeModified('text') - : setTypeModified('password') - } + : setTypeModified('password'); + formRef.current?.reset(); + }} key="reveal password" /> ); @@ -249,7 +253,7 @@ export default function InputBox({ { setValue(value.trim()); }} - disabled={disabled} + disabled={typeModified === 'password' ? true : disabled} type={typeModified} autoComplete={DISABLE_AUTOFILL} /> From e5a84d90a4d6923b90eba4b75d8ec470507d9287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dhiego=20Cassiano=20Foga=C3=A7a=20Barbosa?= Date: Tue, 14 Mar 2023 03:22:34 -0300 Subject: [PATCH 008/108] Use appropriated WS protocol based on instance --- src/data/ConsoleStream.ts | 4 ++-- src/data/EventStream.ts | 2 +- src/data/PerformanceStream.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/data/ConsoleStream.ts b/src/data/ConsoleStream.ts index 528a4792..36c123f1 100644 --- a/src/data/ConsoleStream.ts +++ b/src/data/ConsoleStream.ts @@ -75,7 +75,7 @@ const toConsoleEvent = (event: ClientEvent): ConsoleEvent => { */ export const useConsoleStream = (uuid: string) => { const { core, token } = useContext(LodestoneContext); - const { address, port, apiVersion } = core; + const { address, port, apiVersion, protocol } = core; const [consoleLog, setConsoleLog] = useState([]); const [status, setStatusInner] = useState('loading'); //callbacks should use statusRef.current instead of status const statusRef = useRef('loading'); @@ -118,7 +118,7 @@ export const useConsoleStream = (uuid: string) => { try { const websocket = new WebSocket( - `ws://${address}:${ + `${protocol === 'https' ? 'wss' : 'ws'}://${address}:${ port ?? LODESTONE_PORT }/api/${apiVersion}/instance/${uuid}/console/stream?token=Bearer ${token}` ); diff --git a/src/data/EventStream.ts b/src/data/EventStream.ts index 7703c068..cf59904d 100644 --- a/src/data/EventStream.ts +++ b/src/data/EventStream.ts @@ -394,7 +394,7 @@ export const useEventStream = () => { if (!token) return; const connectWebsocket = () => { - const wsAddress = `ws://${core.address}:${ + const wsAddress = `${core.protocol === 'https' ? 'wss' : 'ws'}://${core.address}:${ core.port ?? LODESTONE_PORT }/api/${core.apiVersion}/events/all/stream?filter=${JSON.stringify( eventQuery diff --git a/src/data/PerformanceStream.ts b/src/data/PerformanceStream.ts index ed4c8250..5875be54 100644 --- a/src/data/PerformanceStream.ts +++ b/src/data/PerformanceStream.ts @@ -27,7 +27,7 @@ export const usePerformanceStream = (uuid: string) => { const [latency_s, setLatency_s] = useState(0); const [counter, setCounter] = useState(-1); const { core } = useContext(LodestoneContext); - const { address, port, apiVersion } = core; + const { address, port, apiVersion, protocol } = core; useInterval(() => { setLatency_s((Date.now() - lastPing) / 1000); @@ -36,7 +36,7 @@ export const usePerformanceStream = (uuid: string) => { useEffect(() => { try { const websocket = new WebSocket( - `ws://${address}:${ + `${protocol === 'https' ? 'wss' : 'ws'}://${address}:${ port ?? LODESTONE_PORT }/api/${apiVersion}/monitor/${uuid}` ); From aacdd97a93a72083522c4f25e342df55d80e1c1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dhiego=20Cassiano=20Foga=C3=A7a=20Barbosa?= Date: Wed, 15 Mar 2023 18:27:28 -0300 Subject: [PATCH 009/108] Fix descriptions for Fabric and Paper --- src/data/GameTypeMappings.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/data/GameTypeMappings.tsx b/src/data/GameTypeMappings.tsx index 7a0f4743..fa7f7011 100644 --- a/src/data/GameTypeMappings.tsx +++ b/src/data/GameTypeMappings.tsx @@ -40,8 +40,8 @@ export const gameTypeInfoFromHandlerType: Record = { game_type: { MinecraftJava: { variant: 'Vanilla' } }, }, MinecraftFabric: { - title: 'Paper (Minecraft)', - description: 'A high performance fork of the Spigot Minecraft Server.', + title: 'Fabric (Minecraft)', + description: 'A lightweight, experimental modding toolchain for Minecraft.', game_type: { MinecraftJava: { variant: 'Fabric' } }, }, MinecraftForge: { @@ -51,8 +51,8 @@ export const gameTypeInfoFromHandlerType: Record = { game_type: { MinecraftJava: { variant: 'Forge' } }, }, MinecraftPaper: { - title: 'Fabric (Minecraft)', - description: 'A lightweight, experimental modding toolchain for Minecraft.', + title: 'Paper (Minecraft)', + description: 'A high performance fork of the Spigot Minecraft Server.', game_type: { MinecraftJava: { variant: 'Paper' } }, }, }; From 52c62cf5edfe06441c7beee9f28475db43423235 Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Sat, 18 Mar 2023 15:45:46 -0400 Subject: [PATCH 010/108] removed the duplicated warning in coreconnect page --- src/pages/login/CoreConnect.tsx | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/pages/login/CoreConnect.tsx b/src/pages/login/CoreConnect.tsx index 446a46f8..86a14090 100644 --- a/src/pages/login/CoreConnect.tsx +++ b/src/pages/login/CoreConnect.tsx @@ -72,19 +72,7 @@ const CoreConnect = () => {

Add a new core

-

- You may need to adjust your network and browser settings.{' '} - - Learn more. - -

- - +

You may need to adjust your network and browser settings.{' '} {

+ + Date: Sat, 18 Mar 2023 16:18:08 -0400 Subject: [PATCH 011/108] fixed userbox 3 button menu --- src/components/UserBox.stories.tsx | 47 ++++++++++++++++++++++++++++++ src/components/UserBox.tsx | 9 +++--- 2 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 src/components/UserBox.stories.tsx diff --git a/src/components/UserBox.stories.tsx b/src/components/UserBox.stories.tsx new file mode 100644 index 00000000..97dce387 --- /dev/null +++ b/src/components/UserBox.stories.tsx @@ -0,0 +1,47 @@ +import React from 'react'; + +import { ComponentStory, ComponentMeta } from '@storybook/react'; +import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; +import UserBox from './UserBox'; + +export default { + title: 'library/UserBox', + component: UserBox, +} as ComponentMeta; + +const Template: ComponentStory = (args) => ( + + + +); + +export const Primary = Template.bind({}); + +Primary.args = { + user: { + uid: '123', + username: 'John Doe', + is_owner: true, + is_admin: true, + permissions: { + can_view_instance: [], + can_start_instance: [], + can_stop_instance: [], + can_access_instance_console: [], + can_access_instance_setting: [], + can_read_instance_resource: [], + can_write_instance_resource: [], + can_access_instance_macro: [], + can_read_instance_file: [], + can_write_instance_file: [], + can_create_instance: false, + can_delete_instance: false, + can_read_global_file: false, + can_write_global_file: false, + can_manage_permission: false, + }, + }, + onClick: () => { + console.log('clicked'); + }, +}; diff --git a/src/components/UserBox.tsx b/src/components/UserBox.tsx index e4236bf9..7a42bcc9 100644 --- a/src/components/UserBox.tsx +++ b/src/components/UserBox.tsx @@ -40,12 +40,10 @@ export default function UserBox({ return (
-

+

{user.username} {/* this text is bigger then the one in inputbox on purpose */}

From 0efc91b2b35961c8b12d19f36c1689dec6aaf74d Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Sat, 18 Mar 2023 17:20:44 -0400 Subject: [PATCH 012/108] added profile page --- pages/index.tsx | 2 + src/pages/profile.tsx | 101 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 src/pages/profile.tsx diff --git a/pages/index.tsx b/pages/index.tsx index cbbc3cca..8a98ff6f 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -43,6 +43,7 @@ import { SettingsLayout } from 'components/DashboardLayout/SettingsLayout'; import { toast } from 'react-toastify'; import RequireSetup from 'utils/router/RequireSetup'; import InstanceTabs from 'pages/InstanceTabs/InstanceTabs'; +import ProfilePage from 'pages/profile'; const queryClient = new QueryClient({ defaultOptions: { @@ -301,6 +302,7 @@ export default function App() { }> } /> + } /> } /> diff --git a/src/pages/profile.tsx b/src/pages/profile.tsx new file mode 100644 index 00000000..782ec51d --- /dev/null +++ b/src/pages/profile.tsx @@ -0,0 +1,101 @@ +import { Tab } from '@headlessui/react'; +import { useContext, useEffect, useState } from 'react'; +import CoreSettings from 'components/Settings/CoreSettings'; +import UserSettings from 'components/Settings/UserSettings'; +import { SettingsContext } from 'data/SettingsContext'; +import { useDocumentTitle } from 'usehooks-ts'; +import { UserState } from 'components/UserMenu'; +import { BrowserLocationContext } from 'data/BrowserLocationContext'; +import { LodestoneContext } from 'data/LodestoneContext'; +import { useUid, useUserInfo } from 'data/UserInfo'; +import { useLocation } from 'react-router-dom'; +import InputBox from 'components/Atoms/Config/InputBox'; + +const ProfilePage = () => { + useDocumentTitle('Profile - Lodestone'); + const { token, setToken, core } = useContext(LodestoneContext); + const { setPathname, setSearchParam } = useContext(BrowserLocationContext); + const location = useLocation(); + const uid = useUid(); + const { isLoading, isError, data: user } = useUserInfo(); + const [userState, setUserState] = useState('logged-out'); + const { address, port } = core; + const socket = `${address}:${port}`; + + useEffect(() => { + if (!token) { + setUserState('logged-out'); + } else if (isLoading) { + setUserState('loading'); + return; + } else if (isError) { + setUserState('logged-out'); + return; + } else { + setUserState('logged-in'); + } + }, [token, isLoading, isError, user]); + + return ( + // used to possibly center the content +
+
+
+

Profile

+
+ { + console.log('hey'); + }} + /> + +
+ Password and Authentication +
+ + {/* { + setTabIndex(i); + if (i !== 1) { + selectUser(undefined); + } + }} + > + + {tabList.map((tab) => ( + + `text-h3 font-bold tracking-medium focus-visible:outline-none ${ + selected + ? 'border-b-2 border-blue-200 text-blue-200' + : 'mb-0.5 text-gray-500' + }` + } + > + {tab.title} + + ))} + + + {tabList.map((tab) => ( + + {tab.content} + + ))} + + */} +
+
+ ); +}; + +export default ProfilePage; From 0506943b198bdb073c6aacd62697af45773fad35 Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Sat, 18 Mar 2023 17:39:17 -0400 Subject: [PATCH 013/108] fixed input box password bug --- src/components/Atoms/Config/InputBox.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Atoms/Config/InputBox.tsx b/src/components/Atoms/Config/InputBox.tsx index 39e7fc77..7e3a2bdd 100644 --- a/src/components/Atoms/Config/InputBox.tsx +++ b/src/components/Atoms/Config/InputBox.tsx @@ -145,6 +145,7 @@ export default function InputBox({ const submitError = await catchAsyncToString(onSubmitProp(trimmed)); setError(submitError); setIsLoading(false); + setTypeModified(type); }; const onReset = (e: React.FormEvent) => { From d013c71bd6a02687eee9f76f72d09d56bcd044ee Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Sat, 18 Mar 2023 18:24:21 -0400 Subject: [PATCH 014/108] BREAKING: updated "game"/"gametype" struct --- src-tauri/Cargo.lock | 96 ++++++---- src-tauri/Cargo.toml | 2 +- src/bindings/Game.ts | 7 + src/bindings/GameType.ts | 3 + src/bindings/HandlerGameType.ts | 2 +- src/bindings/InstanceInfo.ts | 8 +- src/bindings/MinecraftVariant.ts | 9 + src/components/Atoms/GameIcon.stories.tsx | 2 +- src/components/Atoms/GameIcon.tsx | 27 +-- .../DashboardLayout/SelectedInstanceInfo.tsx | 58 +++--- .../Instance/Create/GameTypeSelectForm.tsx | 39 ++-- .../Instance/Create/SelectGameCard.tsx | 4 +- .../Instance/InstanceCreateForm.tsx | 2 +- src/components/Instance/InstanceOverview.tsx | 6 +- src/components/InstanceCard.stories.tsx | 4 +- .../InstanceLoadingCard.stories.tsx | 7 +- src/components/InstanceLoadingCard.tsx | 4 +- src/data/GameTypeMappings.tsx | 181 +++++++----------- src/pages/InstanceTabs/InstanceTabs.tsx | 117 ++++++++--- 19 files changed, 317 insertions(+), 261 deletions(-) create mode 100644 src/bindings/Game.ts create mode 100644 src/bindings/GameType.ts create mode 100644 src/bindings/MinecraftVariant.ts diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index c89944f5..1ca32c25 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -144,9 +144,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" [[package]] name = "arc-swap" @@ -225,13 +225,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.66" +version = "0.1.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" +checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.1", ] [[package]] @@ -576,9 +576,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" dependencies = [ "memchr", "serde", @@ -794,9 +794,9 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" dependencies = [ "bitflags", "block", @@ -1115,9 +1115,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" +checksum = "a9c00419335c41018365ddf7e4d5f1c12ee3659ddcf3e01974650ba1de73d038" dependencies = [ "cc", "cxxbridge-flags", @@ -1127,9 +1127,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" +checksum = "fb8307ad413a98fff033c8545ecf133e3257747b3bae935e7602aab8aa92d4ca" dependencies = [ "cc", "codespan-reporting", @@ -1137,24 +1137,24 @@ dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", "scratch", - "syn 1.0.109", + "syn 2.0.1", ] [[package]] name = "cxxbridge-flags" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" +checksum = "edc52e2eb08915cb12596d29d55f0b5384f00d697a646dbd269b6ecb0fbd9d31" [[package]] name = "cxxbridge-macro" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" +checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.1", ] [[package]] @@ -2769,6 +2769,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -3127,10 +3133,11 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +checksum = "0dd6da19f25979c7270e70fa95ab371ec3b701cd0eefc47667a09785b3c59155" dependencies = [ + "hermit-abi 0.3.1", "libc", "windows-sys 0.45.0", ] @@ -3528,7 +3535,7 @@ dependencies = [ [[package]] name = "lodestone_core" version = "0.4.3" -source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=main#059c19c16665bce421f2410fe474fda55881db57" +source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=releases/0.5.0#22f71cf59085ab34b5132c06f29d9a41fdcc2f27" dependencies = [ "ansi_term", "argon2", @@ -5344,9 +5351,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.9" +version = "0.36.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +checksum = "2fe885c3a125aa45213b68cc1472a49880cb5923dc23f522ad2791b882228778" dependencies = [ "bitflags", "errno", @@ -5554,9 +5561,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.156" +version = "1.0.157" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" +checksum = "707de5fcf5df2b5788fca98dd7eab490bc2fd9b7ef1404defc462833b83f25ca" dependencies = [ "serde_derive", ] @@ -5583,13 +5590,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.156" +version = "1.0.157" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" +checksum = "78997f4555c22a7971214540c4a661291970619afd56de19f77e0de86296e1e5" dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.1", ] [[package]] @@ -6478,6 +6485,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ee2415bee46ba26eac9cd8e52966995c46bf0e842b6304eb8fcf99826548ed" +dependencies = [ + "proc-macro2 1.0.52", + "quote 1.0.26", + "unicode-ident", +] + [[package]] name = "sync_wrapper" version = "0.1.2" @@ -6854,22 +6872,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.1", ] [[package]] @@ -7310,6 +7328,7 @@ version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4added4070a4fdf9df03457206cd2e4b12417c8560a2954d91ffcbe60177a56a" dependencies = [ + "indexmap", "thiserror", "ts-rs-macros", ] @@ -7431,9 +7450,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" +checksum = "7d502c968c6a838ead8e69b2ee18ec708802f99db92a0d156705ec9ef801993b" [[package]] name = "unicode-id" @@ -7637,12 +7656,11 @@ checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index f6839559..5dbec2fe 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -20,7 +20,7 @@ serde = { version = "1.0", features = ["derive"] } tauri = { version = "1.1.1", features = ["api-all", "devtools"] } tauri-plugin-localhost = "0.1.0" portpicker = "0.1" -lodestone_core = {git = "https://github.com/Lodestone-Team/lodestone_core", branch = "main"} +lodestone_core = {git = "https://github.com/Lodestone-Team/lodestone_core", branch = "releases/0.5.0"} tokio = { version = "1.21.1", features = ["macros", "rt"] } [features] diff --git a/src/bindings/Game.ts b/src/bindings/Game.ts new file mode 100644 index 00000000..834facdb --- /dev/null +++ b/src/bindings/Game.ts @@ -0,0 +1,7 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { GameType } from './GameType'; +import type { MinecraftVariant } from './MinecraftVariant'; + +export type Game = + | { type: 'MinecraftJava'; variant: MinecraftVariant } + | { type: 'Generic'; game_name: GameType; game_display_name: string }; diff --git a/src/bindings/GameType.ts b/src/bindings/GameType.ts new file mode 100644 index 00000000..4b72de51 --- /dev/null +++ b/src/bindings/GameType.ts @@ -0,0 +1,3 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type GameType = 'MinecraftJava' | 'Generic'; diff --git a/src/bindings/HandlerGameType.ts b/src/bindings/HandlerGameType.ts index 36beb9e7..2907d7b0 100644 --- a/src/bindings/HandlerGameType.ts +++ b/src/bindings/HandlerGameType.ts @@ -1,3 +1,3 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -export type HandlerGameType = "MinecraftJavaVanilla" | "MinecraftFabric" | "MinecraftForge" | "MinecraftPaper"; \ No newline at end of file +export type HandlerGameType = "MinecraftJavaVanilla" | "MinecraftFabric" | "MinecraftForge" | "MinecraftPaper"; diff --git a/src/bindings/InstanceInfo.ts b/src/bindings/InstanceInfo.ts index bbb2b3d7..9c4dc19e 100644 --- a/src/bindings/InstanceInfo.ts +++ b/src/bindings/InstanceInfo.ts @@ -1,17 +1,15 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { Game } from './Game'; import type { InstanceState } from './InstanceState'; import type { InstanceUuid } from './InstanceUuid'; import type { Player } from './Player'; -export type GameType = Record -export type Games = "MinecraftJava"; -export type GameVariants = "Vanilla" | "Forge" | "Fabric" | "Paper"; - export interface InstanceInfo { uuid: InstanceUuid; name: string; - game_type: GameType; + game_type: Game; description: string; + version: string; port: number; creation_time: bigint; path: string; diff --git a/src/bindings/MinecraftVariant.ts b/src/bindings/MinecraftVariant.ts new file mode 100644 index 00000000..e0e8a9fd --- /dev/null +++ b/src/bindings/MinecraftVariant.ts @@ -0,0 +1,9 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type MinecraftVariant = + | { type: 'Vanilla' } + | { type: 'Forge' } + | { type: 'Fabric' } + | { type: 'Paper' } + | { type: 'Spigot' } + | { type: 'Other'; name: string }; diff --git a/src/components/Atoms/GameIcon.stories.tsx b/src/components/Atoms/GameIcon.stories.tsx index ed8309f7..1a233934 100644 --- a/src/components/Atoms/GameIcon.stories.tsx +++ b/src/components/Atoms/GameIcon.stories.tsx @@ -11,5 +11,5 @@ const Template: ComponentStory = (args) => ( ); export const MinecraftVanilla = Template.bind({}); MinecraftVanilla.args = { - game_type: { MinecraftJava: { variant: 'Vanilla' } }, + game_type: { type: 'MinecraftJava', variant: { type: 'Vanilla' } }, }; diff --git a/src/components/Atoms/GameIcon.tsx b/src/components/Atoms/GameIcon.tsx index 7a49c743..8c2fcc9b 100644 --- a/src/components/Atoms/GameIcon.tsx +++ b/src/components/Atoms/GameIcon.tsx @@ -1,36 +1,29 @@ -import { GameType, Games, GameVariants } from 'bindings/InstanceInfo'; import Tooltip from 'rc-tooltip'; -import { gameIcons, spanMap } from 'data/GameTypeMappings'; -const unknown_icon = '/assets/minecraft-missing-texture.svg'; +import { Game } from 'bindings/Game'; +import { + game_to_game_icon, + game_to_game_title, +} from 'data/GameTypeMappings'; export default function GameIcon({ game_type, className = 'h-8 w-8 rounded-sm', }: { - game_type: GameType; + game_type: Game; className?: string; }) { - let icon = unknown_icon; - let span = ''; - const game = Object.keys(game_type)[0] as Games; - const variant = game_type[game]['variant'] as GameVariants; - - if (game in gameIcons) { - if (variant in gameIcons[game]) { - icon = gameIcons[game][variant]; - span = spanMap[game][variant]; - } - } + const game_title = game_to_game_title(game_type); + const icon = game_to_game_icon(game_type); return ( {span}} + overlay={{game_title}} placement="bottom" trigger={['hover']} mouseEnterDelay={0.2} > - {variant} + {game_title} ); } diff --git a/src/components/DashboardLayout/SelectedInstanceInfo.tsx b/src/components/DashboardLayout/SelectedInstanceInfo.tsx index 1194b792..4cfe8722 100644 --- a/src/components/DashboardLayout/SelectedInstanceInfo.tsx +++ b/src/components/DashboardLayout/SelectedInstanceInfo.tsx @@ -6,9 +6,9 @@ import useAnalyticsEventTracker from 'utils/hooks'; import clsx from 'clsx'; import { BrowserLocationContext } from 'data/BrowserLocationContext'; import InstanceCard from 'components/InstanceCard'; -import { InstanceTabListMap } from '../../data/GameTypeMappings'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faExpand } from '@fortawesome/free-solid-svg-icons'; +import { tabs } from 'pages/InstanceTabs/InstanceTabs'; export const SelectedInstanceInfo = ({ className = '', @@ -74,40 +74,38 @@ export const SelectedInstanceInfo = ({ {selectedInstance && - InstanceTabListMap[Object.keys(selectedInstance.game_type)[0]].map( - (tab) => ( - ( + + - - ) - )} + {tab.icon} +
+
{tab.title}
+ + + ))} {children} ); diff --git a/src/components/Instance/Create/GameTypeSelectForm.tsx b/src/components/Instance/Create/GameTypeSelectForm.tsx index c9f7e130..d8fa49eb 100644 --- a/src/components/Instance/Create/GameTypeSelectForm.tsx +++ b/src/components/Instance/Create/GameTypeSelectForm.tsx @@ -3,13 +3,17 @@ import clsx from 'clsx'; import Spinner from 'components/DashboardLayout/Spinner'; import { InstanceGameTypes } from 'data/InstanceGameTypes'; import SelectGameCard from './SelectGameCard'; -import { gameTypeInfoFromHandlerType } from 'data/GameTypeMappings'; +import { + game_to_description, + game_to_game_title, + HandlerGameType_to_Game, +} from 'data/GameTypeMappings'; export default function GameTypeSelectForm({ - gameType, + selectedGameType, setGameType, className, }: { - gameType: HandlerGameType; + selectedGameType: HandlerGameType; setGameType: (gameType: HandlerGameType) => void; className?: string; }) { @@ -27,23 +31,20 @@ export default function GameTypeSelectForm({ What will your instance be used for?

- {game_types.map((game) => { - const { title, description, game_type } = - gameTypeInfoFromHandlerType[game]; + {game_types.map((game_type) => { + const game = HandlerGameType_to_Game[game_type]; return ( - <> - setGameType(game)} - /> - + setGameType(game_type)} + /> ); })}
diff --git a/src/components/Instance/Create/SelectGameCard.tsx b/src/components/Instance/Create/SelectGameCard.tsx index 6c7cedfd..5da593da 100644 --- a/src/components/Instance/Create/SelectGameCard.tsx +++ b/src/components/Instance/Create/SelectGameCard.tsx @@ -1,7 +1,7 @@ import GameIcon from 'components/Atoms/GameIcon'; import React from 'react'; import clsx from 'clsx'; -import { GameType } from 'bindings/InstanceInfo'; +import { Game } from 'bindings/Game'; const SelectGameCard = ({ title, description, @@ -11,7 +11,7 @@ const SelectGameCard = ({ }: { title: string; description: string; - game_type: GameType; + game_type: Game; className?: string; onClick?: (event: React.MouseEvent) => void; }) => { diff --git a/src/components/Instance/InstanceCreateForm.tsx b/src/components/Instance/InstanceCreateForm.tsx index 177638fd..b4b02244 100644 --- a/src/components/Instance/InstanceCreateForm.tsx +++ b/src/components/Instance/InstanceCreateForm.tsx @@ -36,7 +36,7 @@ function _renderStepContent( return ( <> {step == 0 ? ( - + ) : ( forms[step - 1] )} diff --git a/src/components/Instance/InstanceOverview.tsx b/src/components/Instance/InstanceOverview.tsx index cd7447d2..3f379886 100644 --- a/src/components/Instance/InstanceOverview.tsx +++ b/src/components/Instance/InstanceOverview.tsx @@ -1,15 +1,12 @@ -import { Tab } from '@headlessui/react'; import ClipboardTextfield from 'components/ClipboardTextfield'; -import DashboardCard from 'components/DashboardCard'; import Label from 'components/Atoms/Label'; import { updateInstance } from 'data/InstanceList'; import { LodestoneContext } from 'data/LodestoneContext'; -import { useContext, useEffect, useState } from 'react'; +import { useContext, useState } from 'react'; import { axiosPutSingleValue, stateToLabelColor } from 'utils/util'; import EditableTextfield from 'components/EditableTextfield'; import { useQueryClient } from '@tanstack/react-query'; import InstancePerformanceCard from 'components/Instance/InstancePerformanceCard'; -import FileViewer from 'components/FileViewer/FileViewer'; import { InstanceContext } from 'data/InstanceContext'; import GameIcon from 'components/Atoms/GameIcon'; import { useGlobalSettings } from 'data/GlobalSettings'; @@ -26,7 +23,6 @@ const InstanceOverview = () => { const domain = (globalSettings?.domain ?? address) || 'localhost'; const queryClient = useQueryClient(); const uuid = instance?.uuid; - const [selectedTabIndex, setSelectedTabIndex] = useState(0); if (!instance || !uuid) { return ( diff --git a/src/components/InstanceCard.stories.tsx b/src/components/InstanceCard.stories.tsx index 46fe822a..3e7e7b60 100644 --- a/src/components/InstanceCard.stories.tsx +++ b/src/components/InstanceCard.stories.tsx @@ -64,7 +64,7 @@ export const Default = Template.bind({}); Default.args = { uuid: '1', name: 'Test Instance', - game_type: { MinecraftJava: { variant: 'Vanilla' } }, + game_type: { type: 'MinecraftJava', variant: { type: 'Vanilla' } }, state: 'Running', player_count: 1, max_player_count: 12, @@ -76,7 +76,7 @@ export const InvestigatingCrash = Template.bind({}); InvestigatingCrash.args = { uuid: '2', name: 'Crashed Instance', - game_type: { MinecraftJava: { variant: 'Vanilla' } }, + game_type: { type: 'MinecraftJava', variant: { type: 'Vanilla' } }, state: 'Error', player_count: 0, max_player_count: 12, diff --git a/src/components/InstanceLoadingCard.stories.tsx b/src/components/InstanceLoadingCard.stories.tsx index 74abd4c7..77fac69e 100644 --- a/src/components/InstanceLoadingCard.stories.tsx +++ b/src/components/InstanceLoadingCard.stories.tsx @@ -17,7 +17,12 @@ Default.args = { uuid: 'bruh moment', name: 'My Minecraft Server', port: 25565, - game_type: { MinecraftJava: { variant: 'Vanilla' } }, + game_type: { + type: 'MinecraftJava', + variant: { + type: 'Vanilla', + }, + }, focus: false, progress_percent: 0.5, progress_title: 'Setting up...', diff --git a/src/components/InstanceLoadingCard.tsx b/src/components/InstanceLoadingCard.tsx index 4d8ca403..150fe527 100644 --- a/src/components/InstanceLoadingCard.tsx +++ b/src/components/InstanceLoadingCard.tsx @@ -5,7 +5,7 @@ import LoadingStatusIcon from './Atoms/LoadingStatusIcon'; import { EventLevel } from 'bindings/EventLevel'; import { OngoingState } from 'data/NotificationContext'; import ProgressBar from './Atoms/ProgressBar'; -import { GameType } from 'bindings/InstanceInfo'; +import { Game } from 'bindings/Game'; const NotificationLevelToBgColorClass = ( level: EventLevel, @@ -45,7 +45,7 @@ export default function InstanceLoadingCard({ uuid: string; name: string; port: number; - game_type: GameType; + game_type: Game; focus?: boolean; progress_percent?: number; progress_title: string; diff --git a/src/data/GameTypeMappings.tsx b/src/data/GameTypeMappings.tsx index 10cd29b0..75240459 100644 --- a/src/data/GameTypeMappings.tsx +++ b/src/data/GameTypeMappings.tsx @@ -4,6 +4,9 @@ import FileViewer from 'components/FileViewer'; import DashboardCard from 'components/DashboardCard'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import InstanceOverview from 'components/Instance/InstanceOverview'; +import { match, otherwise } from 'variant'; + +const unknown_icon = '/assets/minecraft-missing-texture.svg'; import { faChartLine, @@ -14,6 +17,7 @@ import { faServer, } from '@fortawesome/free-solid-svg-icons'; import { HandlerGameType } from 'bindings/HandlerGameType'; +import { Game } from 'bindings/Game'; type InstanceTab = { title: string; @@ -24,125 +28,78 @@ type InstanceTab = { content: JSX.Element; }; -export const gameIcons: { [key: string]: { [key: string]: string } } = { - MinecraftJava: { - Vanilla: '/assets/minecraft-vanilla.png', - Fabric: '/assets/minecraft-fabric.png', - Forge: '/assets/minecraft-forge.png', - Paper: '/assets/minecraft-paper.png', - }, -}; +export const game_to_game_icon = (game: Game) => + match(game, { + MinecraftJava: ({ variant }) => + match( + variant, + otherwise( + { + Vanilla: () => '/assets/minecraft-vanilla.png', + Fabric: () => '/assets/minecraft-fabric.png', + Forge: () => '/assets/minecraft-forge.png', + Paper: () => '/assets/minecraft-paper.png', + }, + () => unknown_icon + ) + ), + Generic: () => unknown_icon, + }); + +export const game_to_game_title = (game: Game) => + match(game, { + MinecraftJava: ({ variant }) => + match(variant, { + Vanilla: () => 'Minecraft', + Forge: () => 'Forge (Minecraft)', + Fabric: () => 'Fabric (Minecraft)', + Paper: () => 'Paper (Minecraft)', + Spigot: () => 'Spigot (Minecraft)', + Other: ({ name }) => `${name} (Minecraft)`, + }), + Generic: ({ game_name }) => `${game_name} (Generic)`, + }); + +export const game_to_description = (game: Game) => + match(game, { + MinecraftJava: ({ variant }) => + match(variant, { + Vanilla: () => 'Standard vanilla Minecraft server from Mojang.', + Forge: () => + 'Modding framework that allows you to install mods and customize your Minecraft experience.', + Fabric: () => 'Lightweight modding toolchain for Minecraft.', + Paper: () => + 'High-performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.', + Spigot: () => + 'Modified Minecraft server software that supports plugins, offering enhanced performance and customization options.', + Other: ({ name }) => `Unknown Minecraft variant: ${name}`, + }), + Generic: ({ game_name }) => `Unknown game: ${game_name}`, + }); -export const gameTypeInfoFromHandlerType: Record = { +export const HandlerGameType_to_Game: Record = { MinecraftJavaVanilla: { - title: 'Minecraft', - description: 'Standard vanilla Minecraft server from Mojang.', - game_type: { MinecraftJava: { variant: 'Vanilla' } }, + type: 'MinecraftJava', + variant: { + type: 'Vanilla', + }, }, MinecraftFabric: { - title: 'Fabric (Minecraft)', - description: 'Lightweight modding toolchain for Minecraft.', - game_type: { MinecraftJava: { variant: 'Fabric' } }, + type: 'MinecraftJava', + variant: { + type: 'Fabric', + }, }, MinecraftForge: { - title: 'Forge (Minecraft)', - description: - 'Modding framework that allows you to install mods and customize your Minecraft experience.', - game_type: { MinecraftJava: { variant: 'Forge' } }, + type: 'MinecraftJava', + variant: { + type: 'Forge', + }, }, MinecraftPaper: { - title: 'Paper (Minecraft)', - description: 'High-performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.', - game_type: { MinecraftJava: { variant: 'Paper' } }, - }, -}; - -export const spanMap: { [key: string]: { [key: string]: string } } = { - MinecraftJava: { - Vanilla: 'Minecraft Vanilla', - Fabric: 'Minecraft Fabric', - Forge: 'Minecraft Forge', - Paper: 'Minecraft Paper', - }, -}; - -export const InstanceTabListMap: Record = { - MinecraftJava: [ - { - title: 'Overview', - displayTitle: null, - path: 'overview', - width: 'max-w-4xl', - icon: , - content: , - }, - { - title: 'Settings', - displayTitle: 'Settings', - path: 'settings', - width: 'max-w-2xl', - icon: , - content: ( -
- -
- ), - }, - { - title: 'Console', - displayTitle: 'Console', - path: 'console', - width: 'max-w-6xl', - icon: , - content: , + type: 'MinecraftJava', + variant: { + type: 'Paper', }, - { - title: 'Files', - displayTitle: 'Files', - path: 'files', - width: 'max-w-6xl', - icon: , - content: , - }, - { - title: 'Tasks', - displayTitle: 'Tasks', - path: 'tasks', - width: 'max-w-4xl', - icon: , - content: ( - - placeholder -

- Coming soon to a dashboard near you! -

- - ), - }, - { - title: 'Event Logs', - displayTitle: 'Event Logs', - path: 'logs', - width: 'max-w-4xl', - icon: , - content: ( - - placeholder -

- Coming soon to a dashboard near you! -

- - ), - }, - ], + }, }; diff --git a/src/pages/InstanceTabs/InstanceTabs.tsx b/src/pages/InstanceTabs/InstanceTabs.tsx index a6502b8d..dbb1fbb8 100644 --- a/src/pages/InstanceTabs/InstanceTabs.tsx +++ b/src/pages/InstanceTabs/InstanceTabs.tsx @@ -2,12 +2,103 @@ import { useContext, useEffect, useState } from 'react'; import { InstanceContext } from 'data/InstanceContext'; import { useDocumentTitle } from 'usehooks-ts'; import { useLocation } from 'react-router-dom'; -import { InstanceTabListMap, spanMap } from '../../data/GameTypeMappings'; import Label from 'components/Atoms/Label'; import { cn, stateToLabelColor } from 'utils/util'; import Spinner from 'components/DashboardLayout/Spinner'; import { CommandHistoryContextProvider } from 'data/CommandHistoryContext'; -import { Games } from 'bindings/InstanceInfo'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import InstanceOverview from 'components/Instance/InstanceOverview'; +import { + faChartLine, + faCodeCompare, + faCog, + faFolder, + faInbox, + faServer, +} from '@fortawesome/free-solid-svg-icons'; +import GameConsole from 'components/GameConsole'; +import FileViewer from 'components/FileViewer'; +import DashboardCard from 'components/DashboardCard'; +import { InstanceSettingCard } from 'components/Instance'; + +export const tabs = [ + { + title: 'Overview', + displayTitle: null, + path: 'overview', + width: 'max-w-4xl', + icon: , + content: , + }, + { + title: 'Settings', + displayTitle: 'Settings', + path: 'settings', + width: 'max-w-2xl', + icon: , + content: ( +
+ +
+ ), + }, + { + title: 'Console', + displayTitle: 'Console', + path: 'console', + width: 'max-w-6xl', + icon: , + content: , + }, + { + title: 'Files', + displayTitle: 'Files', + path: 'files', + width: 'max-w-6xl', + icon: , + content: , + }, + { + title: 'Tasks', + displayTitle: 'Tasks', + path: 'tasks', + width: 'max-w-4xl', + icon: , + content: ( + + placeholder +

+ Coming soon to a dashboard near you! +

+ + ), + }, + { + title: 'Event Logs', + displayTitle: 'Event Logs', + path: 'logs', + width: 'max-w-4xl', + icon: , + content: ( + + placeholder +

+ Coming soon to a dashboard near you! +

+ + ), + }, +]; const InstanceTabs = () => { useDocumentTitle('Dashboard - Lodestone'); @@ -47,26 +138,6 @@ const InstanceTabs = () => { ); } } - const game = Object.keys(instance.game_type)[0] as Games; - const variant = instance.game_type[game]['variant']; - const tabs = InstanceTabListMap[game]; - - if (!tabs) { - return ( -
-
-
-

- Unknown game type {spanMap[game][variant]} -

-
-
-
- ); - } const tab = tabs.find((tab) => tab.path === path); if (!tab) { @@ -78,7 +149,7 @@ const InstanceTabs = () => {

- Unknown tab {path} + {path} not found

From 70d1a9a762edd4a7e5f977f181cbc7a3dc55f2e9 Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Sat, 18 Mar 2023 18:26:00 -0400 Subject: [PATCH 015/108] bumped version to 0.5.0 --- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index c4e9ddba..5262236d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lodestone", - "version": "0.4.3", + "version": "0.5.0", "private": true, "scripts": { "dev": "next dev -p 3001", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 1ca32c25..f8cbd7b7 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -3520,7 +3520,7 @@ dependencies = [ [[package]] name = "lodestone-client" -version = "0.4.3" +version = "0.5.0" dependencies = [ "lodestone_core", "portpicker", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 5dbec2fe..0c385ccf 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lodestone-client" -version = "0.4.3" +version = "0.5.0" description = "Lodestone's Desktop Client" authors = ["Lodestone-Team"] license = "" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 86b3603b..49deae92 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -9,7 +9,7 @@ }, "package": { "productName": "Lodestone", - "version": "0.4.3" + "version": "0.5.0" }, "tauri": { "allowlist": { From fe2c2c34819447c208211f352b6c1e2e5e3240a5 Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Sat, 18 Mar 2023 18:55:18 -0400 Subject: [PATCH 016/108] Added minecraft version display in dashboard --- src/components/Instance/InstanceOverview.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/Instance/InstanceOverview.tsx b/src/components/Instance/InstanceOverview.tsx index 3f379886..6434269b 100644 --- a/src/components/Instance/InstanceOverview.tsx +++ b/src/components/Instance/InstanceOverview.tsx @@ -86,6 +86,9 @@ const InstanceOverview = () => { + From 40ce37f4cb49e5d24e4d35af3595e5a383c51ea6 Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Sat, 18 Mar 2023 19:05:18 -0400 Subject: [PATCH 017/108] made setup key private --- src/pages/login/CoreSetupNew.tsx | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/pages/login/CoreSetupNew.tsx b/src/pages/login/CoreSetupNew.tsx index 82c83170..d21d7288 100644 --- a/src/pages/login/CoreSetupNew.tsx +++ b/src/pages/login/CoreSetupNew.tsx @@ -46,6 +46,7 @@ const CoreSetupNew = () => { const { core_name } = coreInfo ?? {}; const tauri = useTauri(); const socket = `${address}:${port}`; + const keyPrefilled = !!(tauri && setupKey); useEffectOnce(() => { if (!tauri) return; @@ -111,11 +112,12 @@ const CoreSetupNew = () => {

{core_name} ({socket})

-

- {tauri && setupKey - ? "Setup key is automatically filled in because you're using the desktop app" - : 'Check the console output of the core to find the "First time setup key"'} -

+ {keyPrefilled ? null : ( +

+ Check the console output of the core to find the "First time + setup key" +

+ )}
{
Date: Sat, 18 Mar 2023 19:13:36 -0400 Subject: [PATCH 018/108] added port check to start button --- src/components/InstanceCard.tsx | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/components/InstanceCard.tsx b/src/components/InstanceCard.tsx index c90b87e5..973dac51 100644 --- a/src/components/InstanceCard.tsx +++ b/src/components/InstanceCard.tsx @@ -1,4 +1,5 @@ import { + axiosWrapper, capitalizeFirstLetter, errorToString, stateToLabelColor, @@ -27,6 +28,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { Menu, Transition } from '@headlessui/react'; import Avatar from 'boring-avatars'; import Button from './Atoms/Button'; +import { PortStatus } from 'bindings/PortStatus'; // // for the css style of the double border when focused // const stateToBorderMap: { [key in InstanceState]: string[] } = { @@ -101,14 +103,16 @@ export default function InstanceCard({ const stateToMenuInfo = () => { switch (state) { case 'Starting': - return [{ label: 'Kill', icon: faPlug, onClick: buttonOnClick }]; + return [{ label: 'Kill', icon: faPlug, onClick: powerButtonOnClick }]; case 'Stopping': - return [{ label: 'Kill', icon: faPlug, onClick: buttonOnClick }]; + return [{ label: 'Kill', icon: faPlug, onClick: powerButtonOnClick }]; case 'Stopped': - return [{ label: 'Start', icon: faPowerOff, onClick: buttonOnClick }]; + return [ + { label: 'Start', icon: faPowerOff, onClick: powerButtonOnClick }, + ]; case 'Running': return [ - { label: 'Stop', icon: faPowerOff, onClick: buttonOnClick }, + { label: 'Stop', icon: faPowerOff, onClick: powerButtonOnClick }, { label: 'Restart', icon: faArrowRotateBackward, @@ -150,7 +154,7 @@ export default function InstanceCard({ }); }; - const buttonOnClick = (e: React.MouseEvent) => { + const powerButtonOnClick = async (e: React.MouseEvent) => { e.stopPropagation(); if (loading) return; @@ -160,6 +164,20 @@ export default function InstanceCard({ gaEventTracker('Change Instance State', stateToActionMessageMap[state]); + if (stateToApiEndpointMap[state] === '/start') { + const result = await axiosWrapper({ + method: 'get', + url: `/check/port/${port}`, + }); + if (result.is_in_use) { + toast.error( + `Port ${port} is not available, please change the port in the instance settings` + ); + setLoading(false); + return; + } + } + axios .put(`/instance/${uuid}${stateToApiEndpointMap[state]}`) .then((response) => { From d9e5bdf7bee1625fc5aac53c8318bf85d562f626 Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Sat, 18 Mar 2023 19:55:45 -0400 Subject: [PATCH 019/108] added view password to inputfield and changed styling of self password form --- src-tauri/Cargo.lock | 96 ++++++++----- src-tauri/Cargo.toml | 2 +- src/components/Atoms/Form/InputField.tsx | 24 +++- .../Settings/ChangeSelfPasswordForm.tsx | 53 +++---- src/pages/profile.tsx | 136 ++++++++++-------- 5 files changed, 189 insertions(+), 122 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index c89944f5..1ca32c25 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -144,9 +144,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" [[package]] name = "arc-swap" @@ -225,13 +225,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.66" +version = "0.1.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" +checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.1", ] [[package]] @@ -576,9 +576,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" dependencies = [ "memchr", "serde", @@ -794,9 +794,9 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" dependencies = [ "bitflags", "block", @@ -1115,9 +1115,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" +checksum = "a9c00419335c41018365ddf7e4d5f1c12ee3659ddcf3e01974650ba1de73d038" dependencies = [ "cc", "cxxbridge-flags", @@ -1127,9 +1127,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" +checksum = "fb8307ad413a98fff033c8545ecf133e3257747b3bae935e7602aab8aa92d4ca" dependencies = [ "cc", "codespan-reporting", @@ -1137,24 +1137,24 @@ dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", "scratch", - "syn 1.0.109", + "syn 2.0.1", ] [[package]] name = "cxxbridge-flags" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" +checksum = "edc52e2eb08915cb12596d29d55f0b5384f00d697a646dbd269b6ecb0fbd9d31" [[package]] name = "cxxbridge-macro" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" +checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.1", ] [[package]] @@ -2769,6 +2769,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -3127,10 +3133,11 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +checksum = "0dd6da19f25979c7270e70fa95ab371ec3b701cd0eefc47667a09785b3c59155" dependencies = [ + "hermit-abi 0.3.1", "libc", "windows-sys 0.45.0", ] @@ -3528,7 +3535,7 @@ dependencies = [ [[package]] name = "lodestone_core" version = "0.4.3" -source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=main#059c19c16665bce421f2410fe474fda55881db57" +source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=releases/0.5.0#22f71cf59085ab34b5132c06f29d9a41fdcc2f27" dependencies = [ "ansi_term", "argon2", @@ -5344,9 +5351,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.9" +version = "0.36.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +checksum = "2fe885c3a125aa45213b68cc1472a49880cb5923dc23f522ad2791b882228778" dependencies = [ "bitflags", "errno", @@ -5554,9 +5561,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.156" +version = "1.0.157" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" +checksum = "707de5fcf5df2b5788fca98dd7eab490bc2fd9b7ef1404defc462833b83f25ca" dependencies = [ "serde_derive", ] @@ -5583,13 +5590,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.156" +version = "1.0.157" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" +checksum = "78997f4555c22a7971214540c4a661291970619afd56de19f77e0de86296e1e5" dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.1", ] [[package]] @@ -6478,6 +6485,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ee2415bee46ba26eac9cd8e52966995c46bf0e842b6304eb8fcf99826548ed" +dependencies = [ + "proc-macro2 1.0.52", + "quote 1.0.26", + "unicode-ident", +] + [[package]] name = "sync_wrapper" version = "0.1.2" @@ -6854,22 +6872,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.1", ] [[package]] @@ -7310,6 +7328,7 @@ version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4added4070a4fdf9df03457206cd2e4b12417c8560a2954d91ffcbe60177a56a" dependencies = [ + "indexmap", "thiserror", "ts-rs-macros", ] @@ -7431,9 +7450,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" +checksum = "7d502c968c6a838ead8e69b2ee18ec708802f99db92a0d156705ec9ef801993b" [[package]] name = "unicode-id" @@ -7637,12 +7656,11 @@ checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index f6839559..5dbec2fe 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -20,7 +20,7 @@ serde = { version = "1.0", features = ["derive"] } tauri = { version = "1.1.1", features = ["api-all", "devtools"] } tauri-plugin-localhost = "0.1.0" portpicker = "0.1" -lodestone_core = {git = "https://github.com/Lodestone-Team/lodestone_core", branch = "main"} +lodestone_core = {git = "https://github.com/Lodestone-Team/lodestone_core", branch = "releases/0.5.0"} tokio = { version = "1.21.1", features = ["macros", "rt"] } [features] diff --git a/src/components/Atoms/Form/InputField.tsx b/src/components/Atoms/Form/InputField.tsx index 16ae1bcf..fa34cfbf 100644 --- a/src/components/Atoms/Form/InputField.tsx +++ b/src/components/Atoms/Form/InputField.tsx @@ -1,6 +1,8 @@ import React from 'react'; import { FieldHookConfig, useField } from 'formik'; import { DISABLE_AUTOFILL } from 'utils/util'; +import { faEye, faEyeSlash } from '@fortawesome/free-solid-svg-icons'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; export type InputFieldProps = FieldHookConfig & { label?: string; @@ -15,6 +17,8 @@ export default function InputField(props: InputFieldProps) { const [field, meta] = useField(props); const isError = meta.touched && meta.error && true; const errorText = isError ? meta.error : ''; + + const [typeModified, setTypeModified] = React.useState(type || 'text'); return (
)} + {type === 'password' && ( +
+
+ { + typeModified === 'password' + ? setTypeModified('text') + : setTypeModified('password'); + }} + key="reveal password" + /> +
+
+ )}
- {status && ( - -

{status.error}

- - )} - - - -
-
)} diff --git a/src/pages/profile.tsx b/src/pages/profile.tsx index 782ec51d..bc07534c 100644 --- a/src/pages/profile.tsx +++ b/src/pages/profile.tsx @@ -1,8 +1,5 @@ -import { Tab } from '@headlessui/react'; -import { useContext, useEffect, useState } from 'react'; -import CoreSettings from 'components/Settings/CoreSettings'; -import UserSettings from 'components/Settings/UserSettings'; -import { SettingsContext } from 'data/SettingsContext'; +import { Dialog, Transition } from '@headlessui/react'; +import { Fragment, useContext, useEffect, useState } from 'react'; import { useDocumentTitle } from 'usehooks-ts'; import { UserState } from 'components/UserMenu'; import { BrowserLocationContext } from 'data/BrowserLocationContext'; @@ -10,17 +7,21 @@ import { LodestoneContext } from 'data/LodestoneContext'; import { useUid, useUserInfo } from 'data/UserInfo'; import { useLocation } from 'react-router-dom'; import InputBox from 'components/Atoms/Config/InputBox'; +import Spinner from 'components/DashboardLayout/Spinner'; +import { axiosPutSingleValue } from 'utils/util'; +import Button from 'components/Atoms/Button'; +import ChangeSelfPasswordForm from 'components/Settings/ChangeSelfPasswordForm'; +import { toast } from 'react-toastify'; const ProfilePage = () => { useDocumentTitle('Profile - Lodestone'); - const { token, setToken, core } = useContext(LodestoneContext); - const { setPathname, setSearchParam } = useContext(BrowserLocationContext); - const location = useLocation(); + const { token } = useContext(LodestoneContext); const uid = useUid(); const { isLoading, isError, data: user } = useUserInfo(); const [userState, setUserState] = useState('logged-out'); - const { address, port } = core; - const socket = `${address}:${port}`; + + const [showChangePassword, setShowChangePassword] = useState(false); + const [stopLoading, setStopLoading] = useState(false); useEffect(() => { if (!token) { @@ -36,63 +37,84 @@ const ProfilePage = () => { } }, [token, isLoading, isError, user]); + useEffect(() => { + //give time for user to load + setTimeout(() => { + setStopLoading(true); + }, 1000); + }, []); + + if (stopLoading && userState !== 'logged-in') + toast.warn("You're not logged in! Please log in to access this page."); + + if (isLoading && !stopLoading) { + return ; + } + return ( // used to possibly center the content

Profile

+

+
+ + setShowChangePassword(false)} + className="relative z-10" + > +
+
+
+ +
+ Change Password +
+ setShowChangePassword(false)} + onCancel={() => setShowChangePassword(false)} + /> + +
+
+
+ +
+ { + await axiosPutSingleValue(`/user/${uid}/rename`, value); + }} + disabled={userState !== 'logged-in' || !user} + />
- { - console.log('hey'); - }} - /> -
+
Password and Authentication
- - {/* { - setTabIndex(i); - if (i !== 1) { - selectUser(undefined); - } - }} - > - - {tabList.map((tab) => ( - - `text-h3 font-bold tracking-medium focus-visible:outline-none ${ - selected - ? 'border-b-2 border-blue-200 text-blue-200' - : 'mb-0.5 text-gray-500' - }` - } - > - {tab.title} - - ))} - - - {tabList.map((tab) => ( - - {tab.content} - - ))} - - */} +
+
); From 87e3f76081003faf4a6d168f21cd5742974b8acc Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Sat, 18 Mar 2023 22:06:35 -0400 Subject: [PATCH 020/108] minor styling touches --- src-tauri/Cargo.lock | 14 ++-- src/components/Atoms/Config/InputBox.tsx | 1 + .../Settings/ChangeSelfPasswordForm.tsx | 14 ++-- src/pages/profile.tsx | 84 ++++++++++--------- 4 files changed, 60 insertions(+), 53 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index f8cbd7b7..5ae3a156 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -231,7 +231,7 @@ checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", - "syn 2.0.1", + "syn 2.0.2", ] [[package]] @@ -1137,7 +1137,7 @@ dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", "scratch", - "syn 2.0.1", + "syn 2.0.2", ] [[package]] @@ -1154,7 +1154,7 @@ checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", - "syn 2.0.1", + "syn 2.0.2", ] [[package]] @@ -5596,7 +5596,7 @@ checksum = "78997f4555c22a7971214540c4a661291970619afd56de19f77e0de86296e1e5" dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", - "syn 2.0.1", + "syn 2.0.2", ] [[package]] @@ -6487,9 +6487,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ee2415bee46ba26eac9cd8e52966995c46bf0e842b6304eb8fcf99826548ed" +checksum = "59d3276aee1fa0c33612917969b5172b5be2db051232a6e4826f1a1a9191b045" dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", @@ -6887,7 +6887,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", - "syn 2.0.1", + "syn 2.0.2", ] [[package]] diff --git a/src/components/Atoms/Config/InputBox.tsx b/src/components/Atoms/Config/InputBox.tsx index 7e3a2bdd..a25bd46e 100644 --- a/src/components/Atoms/Config/InputBox.tsx +++ b/src/components/Atoms/Config/InputBox.tsx @@ -146,6 +146,7 @@ export default function InputBox({ setError(submitError); setIsLoading(false); setTypeModified(type); + setTouched(false); }; const onReset = (e: React.FormEvent) => { diff --git a/src/components/Settings/ChangeSelfPasswordForm.tsx b/src/components/Settings/ChangeSelfPasswordForm.tsx index dc5c8ac6..9824c0f3 100644 --- a/src/components/Settings/ChangeSelfPasswordForm.tsx +++ b/src/components/Settings/ChangeSelfPasswordForm.tsx @@ -67,14 +67,14 @@ export const ChangeSelfPasswordForm = ({
-
- {status && ( - -

{status.error}

- - )} + {status && ( + +

{status.error}

+ + )} +
{ const { isLoading, isError, data: user } = useUserInfo(); const [userState, setUserState] = useState('logged-out'); + const [username, setUsername] = useState( + userState === 'logged-in' && user ? `${user.username}` : 'Guest' + ); const [showChangePassword, setShowChangePassword] = useState(false); const [stopLoading, setStopLoading] = useState(false); @@ -34,6 +37,7 @@ const ProfilePage = () => { return; } else { setUserState('logged-in'); + setUsername(user.username); } }, [token, isLoading, isError, user]); @@ -54,61 +58,63 @@ const ProfilePage = () => { return ( // used to possibly center the content
+ + setShowChangePassword(false)} + className="relative z-10" + > +
+
+
+ +
+ Change Password +
+ setShowChangePassword(false)} + onCancel={() => setShowChangePassword(false)} + /> + +
+
+
+
-
+

Profile

-

+

+ Profile preferences for {username} +

- - setShowChangePassword(false)} - className="relative z-10" - > -
-
-
- -
- Change Password -
- setShowChangePassword(false)} - onCancel={() => setShowChangePassword(false)} - /> - -
-
-
- -
+ +
{ await axiosPutSingleValue(`/user/${uid}/rename`, value); + setUsername(value); }} disabled={userState !== 'logged-in' || !user} />
-
+
Password and Authentication
-
+
- ) + ); } diff --git a/src/components/Instance/InstanceOverview.tsx b/src/components/Instance/InstanceOverview.tsx index 6434269b..d0c449aa 100644 --- a/src/components/Instance/InstanceOverview.tsx +++ b/src/components/Instance/InstanceOverview.tsx @@ -14,6 +14,18 @@ import { useGlobalSettings } from 'data/GlobalSettings'; import { useDocumentTitle } from 'usehooks-ts'; import InstancePlayerList from './InstancePlayerList'; +import { Table } from 'components/Table'; + +export interface TableColumn { + field: string; + headerName: string; + className?: string; +} + +export interface TableRow { + [key: string]: React.ReactNode; +} + const InstanceOverview = () => { useDocumentTitle('Dashboard - Lodestone'); const { core } = useContext(LodestoneContext); @@ -64,6 +76,18 @@ const InstanceOverview = () => { })); }; + const columns: TableColumn[] = [ + { field: 'name', headerName: 'Name' }, + { field: 'age', headerName: 'Age' }, + { field: 'city', headerName: 'City', className: 'column-city' }, + ]; + + const rows: TableRow[] = [ + { id: 1, name: 'John', age: 30, city: 'New York' }, + { id: 2, name: 'Jane', age: 25, city: 'Los Angeles' }, + { id: 3, name: 'Bob', age: 45, city: 'Chicago' }, + ]; + return ( <>
{
+ ); diff --git a/src/components/Table.tsx b/src/components/Table.tsx index a1e72bc7..c7b005ec 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -2,58 +2,61 @@ import * as React from 'react'; import {cn} from "../utils/util"; import clsx from "clsx"; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import { faEllipsisVertical } from '@fortawesome/free-solid-svg-icons'; export interface TableColumn { - field: string; - headerName: string; - className?: string; + field: string; + headerName: string; + className?: string; } export interface TableRow { - [key: string]: React.ReactNode; + [key: string]: React.ReactNode; } interface CardProps { - rows: TableRow[]; - columns: TableColumn[]; - className?: string; + rows: TableRow[]; + columns: TableColumn[]; + className?: string; } export function Table({rows, columns, className}: CardProps) { - return ( -
- - - {columns.map((column, cIndex) => ( - - ) - )} - - - - {rows.map((row, index) => { - - return ( - - {columns.map((column, cIndex) => ( - - ) - )} - - ) - })} - - - - -
- {column.headerName} -
- {row[column.field]} -
- ); + return ( + + + + {columns.map((column, cIndex) => ( + + ) + )} + + + + {rows.map((row, index) => { + return ( + + {columns.map((column, cIndex) => ( + + ))} + + + ) + })} + +
+ {column.headerName} +
+ {row[column.field]} + + +
+ ); } \ No newline at end of file From 2077eb89669936ef63409b8aca19fc1d8f032955 Mon Sep 17 00:00:00 2001 From: Dan S Date: Sat, 25 Mar 2023 11:29:23 -0600 Subject: [PATCH 024/108] add task/macro apis --- src-tauri/Cargo.lock | 1111 +++++++++---------- src/bindings/ConfigurableManifest.ts | 4 + src/bindings/ConfigurableValue.ts | 3 + src/bindings/ConfigurableValueType.ts | 3 + src/bindings/ErrorIR.ts | 4 + src/bindings/ExitStatus.ts | 3 + src/bindings/GenericPlayer.ts | 3 + src/bindings/GenericSetupConfig.ts | 4 + src/bindings/GenericSetupConfigPrimitive.ts | 3 + src/bindings/HistoryEntry.ts | 5 + src/bindings/MacroEntry.ts | 3 + src/bindings/MacroPID.ts | 3 + src/bindings/ManifestValue.ts | 4 + src/bindings/ProcedureCall.ts | 4 + src/bindings/ProcedureCallInner.ts | 5 + src/bindings/ProcedureCallKind.ts | 3 + src/bindings/ProcedureCallResultIR.ts | 6 + src/bindings/ProcedureCallResultInner.ts | 6 + src/bindings/SectionManifest.ts | 4 + src/bindings/SectionManifestValue.ts | 4 + src/bindings/SettingManifest.ts | 5 + src/bindings/SettingManifestValue.ts | 4 + src/bindings/TaskEntry.ts | 4 + src/utils/apis.ts | 61 + 24 files changed, 677 insertions(+), 582 deletions(-) create mode 100644 src/bindings/ConfigurableManifest.ts create mode 100644 src/bindings/ConfigurableValue.ts create mode 100644 src/bindings/ConfigurableValueType.ts create mode 100644 src/bindings/ErrorIR.ts create mode 100644 src/bindings/ExitStatus.ts create mode 100644 src/bindings/GenericPlayer.ts create mode 100644 src/bindings/GenericSetupConfig.ts create mode 100644 src/bindings/GenericSetupConfigPrimitive.ts create mode 100644 src/bindings/HistoryEntry.ts create mode 100644 src/bindings/MacroEntry.ts create mode 100644 src/bindings/MacroPID.ts create mode 100644 src/bindings/ManifestValue.ts create mode 100644 src/bindings/ProcedureCall.ts create mode 100644 src/bindings/ProcedureCallInner.ts create mode 100644 src/bindings/ProcedureCallKind.ts create mode 100644 src/bindings/ProcedureCallResultIR.ts create mode 100644 src/bindings/ProcedureCallResultInner.ts create mode 100644 src/bindings/SectionManifest.ts create mode 100644 src/bindings/SectionManifestValue.ts create mode 100644 src/bindings/SettingManifest.ts create mode 100644 src/bindings/SettingManifestValue.ts create mode 100644 src/bindings/TaskEntry.ts diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 5ae3a156..bd69bd3a 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -27,12 +27,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - [[package]] name = "aead" version = "0.5.1" @@ -176,9 +170,6 @@ name = "arrayvec" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" -dependencies = [ - "serde", -] [[package]] name = "ascii" @@ -186,24 +177,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" -[[package]] -name = "ash" -version = "0.37.2+1.3.238" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03" -dependencies = [ - "libloading", -] - [[package]] name = "ast_node" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf94863c5fdfee166d0907c44e5fee970123b2b7307046d35d1e671aa93afbba" +checksum = "70151a5226578411132d798aa248df45b30aa34aea2e580628870b4d87be717b" dependencies = [ "darling", "pmutil", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "swc_macros_common", "syn 1.0.109", @@ -225,13 +207,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.67" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -255,7 +237,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.3", + "system-deps 6.0.4", ] [[package]] @@ -323,9 +305,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.7" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fb79c228270dcf2426e74864cabc94babb5dbab01a4314e702d2f16540e1591" +checksum = "349f8ccfd9221ee7d1f3d4b33e1f8319b3a81ed8f61f2ea40b37b859794b4491" dependencies = [ "async-trait", "axum-core", @@ -354,7 +336,6 @@ dependencies = [ "tokio", "tokio-tungstenite 0.18.0", "tower", - "tower-http", "tower-layer", "tower-service", ] @@ -390,21 +371,21 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39bcef27b56d5cad8912d735d5ed1286f073f7bcb88cc31b38a15b514fcf8600" +checksum = "2bb524613be645939e280b7279f7b017f98cf7f5ef084ec374df373530e73277" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.10", ] [[package]] name = "axum-server" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e4a990e1593e286b1b96e6df76da9dbcb84945a810287ca8101f1a4f000f61" +checksum = "bace45b270e36e3c27a190c65883de6dfc9f1d18c829907c127464815dc67b24" dependencies = [ "arc-swap", "bytes", @@ -604,9 +585,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bzip2" @@ -656,7 +637,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 6.0.3", + "system-deps 6.0.4", ] [[package]] @@ -666,7 +647,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497049e9477329f8f6a559972ee42e117487d01d1e8c2cc9f836ea6fa23a9e1a" dependencies = [ "serde", - "toml", + "toml 0.5.11", ] [[package]] @@ -714,9 +695,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6" dependencies = [ "smallvec", ] @@ -873,6 +854,16 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "console_static_text" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953d2c3cf53213a4eccdbe8f2e0b49b5d0f77e87a2a9060117bbf9346f92b64e" +dependencies = [ + "unicode-width", + "vte", +] + [[package]] name = "const-oid" version = "0.9.2" @@ -934,9 +925,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" dependencies = [ "libc", ] @@ -1052,7 +1043,7 @@ dependencies = [ "itoa 0.4.8", "matches", "phf 0.8.0", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "smallvec", "syn 1.0.109", @@ -1134,10 +1125,10 @@ dependencies = [ "cc", "codespan-reporting", "once_cell", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "scratch", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -1152,20 +1143,9 @@ version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", - "syn 2.0.2", -] - -[[package]] -name = "d3d12" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" -dependencies = [ - "bitflags", - "libloading", - "winapi", + "syn 2.0.10", ] [[package]] @@ -1186,7 +1166,7 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "strsim", "syn 1.0.109", @@ -1239,21 +1219,11 @@ dependencies = [ "winapi", ] -[[package]] -name = "deflate" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" -dependencies = [ - "adler32", - "byteorder", -] - [[package]] name = "deno_ast" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e007f9f03be5484596ea6bed86ffdc6357ba9660cb8da20845baf2ce079722" +checksum = "b08341e0ed5b816e24b6582054b37707c8686de5598fa3004dc555131c993308" dependencies = [ "anyhow", "base64 0.13.1", @@ -1281,21 +1251,21 @@ dependencies = [ [[package]] name = "deno_broadcast_channel" -version = "0.83.0" +version = "0.89.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eaddf316a5c63eabe962d8304fbd5f9fa6d360cc6972e72ee541b34b5cd2f88" +checksum = "4afc4064413f46b725027b18a4639c480c2469e44c0359ffced6f752e67ffd17" dependencies = [ "async-trait", "deno_core", "tokio", - "uuid 1.1.2", + "uuid 1.3.0", ] [[package]] name = "deno_cache" -version = "0.21.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8d1a44cb8c8d18eda0b95b1078f274a29089eb6dd21766a9ecf4ad6cbac685" +checksum = "258809850d7b3c365d3db8516a063cd0d8d1e85127e5ab3f46645d54c6416665" dependencies = [ "async-trait", "deno_core", @@ -1307,18 +1277,18 @@ dependencies = [ [[package]] name = "deno_console" -version = "0.89.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cda6cf4635c2261951074023288f23756ac6852e7e63a6bd416a88f0e98c52e" +checksum = "b7aaa2e1f9f3ea7a9f7fe3abddf2d4edc7a602f7505c3bec2074b097bc9393fb" dependencies = [ "deno_core", ] [[package]] name = "deno_core" -version = "0.171.0" +version = "0.177.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc41944f05dfeacfc2610e91f40ddcf246f3aeeac8ae4c26df46bfbf01a3902" +checksum = "1563a04f319904eb5c4c981b0a5475a4258aa72d4576296f097a4f23b20f8428" dependencies = [ "anyhow", "bytes", @@ -1341,9 +1311,9 @@ dependencies = [ [[package]] name = "deno_crypto" -version = "0.103.0" +version = "0.109.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e2a590be03f643d1147e12e8bc2fb04671b9bd68da9c8857d7d0b11a0255c" +checksum = "091fb3bcc63884525eb2d2487aa7f93031fba7d16314713cbaf5bd461d568f5b" dependencies = [ "aes 0.8.2", "aes-gcm", @@ -1372,15 +1342,15 @@ dependencies = [ "signature", "spki", "tokio", - "uuid 1.1.2", + "uuid 1.3.0", "x25519-dalek", ] [[package]] name = "deno_fetch" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c2ec54d6332b454cad9391e8b9c33edce79837ece8ffaca0f08ab957f78590" +checksum = "888bc588fc1b4dd93e7d9d6684e81d4ca9a863eb50f949d4ecafeb9c4c52128d" dependencies = [ "bytes", "data-url", @@ -1397,24 +1367,26 @@ dependencies = [ [[package]] name = "deno_ffi" -version = "0.76.0" +version = "0.82.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11cbb59638f05f3d4ffcb107a91491f70ddc86b93759be1f3858ffd4efd45f6" +checksum = "3750b1db8f718aba8d7e5e7290b9cb41cd72859ca6042a588177cc69336d7c19" dependencies = [ "deno_core", "dlopen", "dynasmrt", "libffi", "serde", + "serde-value", + "serde_json", "tokio", "winapi", ] [[package]] name = "deno_flash" -version = "0.25.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e6067e14bc4d904b53bd7a4f665eaa119ce31bc1bdb3913d41331de84f0a69" +checksum = "81b20cafba99811c75f840b606939736dc32aa24cff9f73d9dd02d83665b3bb1" dependencies = [ "deno_core", "deno_tls", @@ -1431,11 +1403,30 @@ dependencies = [ "tokio", ] +[[package]] +name = "deno_fs" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5592eb5a73752f59eeb6933a5a07dd1b7e8ac36f2e06dd6a96d204cea46419a" +dependencies = [ + "deno_core", + "deno_crypto", + "deno_io", + "filetime", + "fs3", + "libc", + "log", + "nix", + "serde", + "tokio", + "winapi", +] + [[package]] name = "deno_http" -version = "0.84.0" +version = "0.90.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "868bce9321850c1f2689846e8f031144efa5a7ae197d2839013c576c9b849167" +checksum = "fa890f079e9aaf0a07020f97a805537ef526fb45636df713e97f062b5727a4a7" dependencies = [ "async-compression", "base64 0.13.1", @@ -1457,11 +1448,40 @@ dependencies = [ "tokio-util", ] +[[package]] +name = "deno_io" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90d2b638bff5266c98c65d4588276cefe465cb0f8d6e7bf9da6948e5596b4348" +dependencies = [ + "deno_core", + "nix", + "once_cell", + "tokio", + "winapi", +] + +[[package]] +name = "deno_kv" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86c11b45e36981b9f98f176b42dc1cf9ced8780290700d04a1e60c95d6259f73" +dependencies = [ + "anyhow", + "async-trait", + "base64 0.13.1", + "deno_core", + "hex", + "num-bigint 0.4.3", + "rusqlite", + "serde", +] + [[package]] name = "deno_napi" -version = "0.19.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42ac68f4f95a5b786d76aacabfb0e0eb1817841159132b6ac72d6a6dba95429" +checksum = "2d346f413caa5c4525246de2def4579a1898db0d5da0c6c324a09181615b8774" dependencies = [ "deno_core", "libloading", @@ -1469,9 +1489,9 @@ dependencies = [ [[package]] name = "deno_net" -version = "0.81.0" +version = "0.87.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ed32765651e169918c9bb7f92d03b4b618401e8744d6a6ce6cc0d89ac4bda01" +checksum = "a97840f48130f242e5d1893e363b3f126730a4ab8389d69796b7ca813025c12b" dependencies = [ "deno_core", "deno_tls", @@ -1485,27 +1505,42 @@ dependencies = [ [[package]] name = "deno_node" -version = "0.26.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31411684ae279034f4fdd1fb9d0f2207eeaa7a717fdf490c26b00a22775f08d7" +checksum = "21a88f748dc0fe1b329035d28ec409a3a1e9f3dbe4aaca42130d161f7943d21e" dependencies = [ + "aes 0.8.2", + "cbc", "deno_core", + "digest 0.10.6", + "hex", + "idna 0.3.0", + "indexmap", + "md-5", + "md4", "once_cell", "path-clean", + "rand 0.8.5", "regex", + "ripemd", + "rsa", "serde", + "sha-1 0.10.0", + "sha2", + "sha3", + "typenum", ] [[package]] name = "deno_ops" -version = "0.49.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4740bc5738ad07dc1f523a232a4079a995fa2ad11efd71e09e8e32bf28f21ee1" +checksum = "769968c69c652009e43cb9e63f610a1cc3d0316c3fc59d7327f51089f65a70f4" dependencies = [ "once_cell", "pmutil", "proc-macro-crate", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "regex", "syn 1.0.109", @@ -1513,11 +1548,13 @@ dependencies = [ [[package]] name = "deno_runtime" -version = "0.97.0" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29105932da08341683a01a5460ff683c7bcdf23efbaaf6057e75ecd710fb064b" +checksum = "f16c6b3bb27ab224aa57a8b9124b7aebdd8881c1bcd70ea85fb2651b77e95eb4" dependencies = [ "atty", + "console_static_text", + "deno_ast", "deno_broadcast_channel", "deno_cache", "deno_console", @@ -1526,14 +1563,16 @@ dependencies = [ "deno_fetch", "deno_ffi", "deno_flash", + "deno_fs", "deno_http", + "deno_io", + "deno_kv", "deno_napi", "deno_net", "deno_node", "deno_tls", "deno_url", "deno_web", - "deno_webgpu", "deno_webidl", "deno_websocket", "deno_webstorage", @@ -1546,7 +1585,6 @@ dependencies = [ "hyper", "libc", "log", - "lzzzz", "netif", "nix", "notify", @@ -1558,16 +1596,16 @@ dependencies = [ "signal-hook-registry", "termcolor", "tokio", - "uuid 1.1.2", + "uuid 1.3.0", "winapi", "winres", ] [[package]] name = "deno_tls" -version = "0.76.0" +version = "0.82.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b82b9b18941a42be4108f79f14e8b5a29067e27619293d710324e0dd77d5d8" +checksum = "490206ee0eb9f3a5aabd7826f24bea32b0456b9cdc5a564e7526cad79b102c3e" dependencies = [ "deno_core", "once_cell", @@ -1581,9 +1619,9 @@ dependencies = [ [[package]] name = "deno_url" -version = "0.89.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1fe82b011d8b2af63c4587551536d951f47ffc3ba2a710e455b383d4f4b06ba" +checksum = "bde7d4fb67b7df82512edef40c3e085357a4263dee3502e0387df021820e3bf8" dependencies = [ "deno_core", "serde", @@ -1593,9 +1631,9 @@ dependencies = [ [[package]] name = "deno_web" -version = "0.120.0" +version = "0.126.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7379502a7a333f573949558803e8bfe2e8fba3ef180cdbb4a882951803c87d20" +checksum = "65493427e1449a3dbdd0c947d91a738bb2d0b1d7fa1158ae13462c65a2a8e05a" dependencies = [ "async-trait", "base64-simd", @@ -1604,36 +1642,23 @@ dependencies = [ "flate2", "serde", "tokio", - "uuid 1.1.2", -] - -[[package]] -name = "deno_webgpu" -version = "0.90.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b430c70badca6edaf058d08dc622d931355726badc180134db49913270bcf2f" -dependencies = [ - "deno_core", - "serde", - "tokio", - "wgpu-core", - "wgpu-types", + "uuid 1.3.0", ] [[package]] name = "deno_webidl" -version = "0.89.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d046c6ac75f22be851219f44824c42927345f51e0ae5fb825e8bf8ea658d8ee8" +checksum = "33a2115515eba003e0780575f8fcc0b2ff95fd8b8db2fc7b4eb63b54756858cd" dependencies = [ "deno_core", ] [[package]] name = "deno_websocket" -version = "0.94.0" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe8ce87cc7da7b4b0575d5686cafbdb306cb33bf04f33ff6e99325c88f44933" +checksum = "665d8d3e3c6799ebf1945a6c248bb21e33ea1030cfb380bc78a394e315141b4f" dependencies = [ "deno_core", "deno_tls", @@ -1647,9 +1672,9 @@ dependencies = [ [[package]] name = "deno_webstorage" -version = "0.84.0" +version = "0.90.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b25958fe8143a02c86971890b7fa08a888e6a8a201e4918ea49220c092c361" +checksum = "ec16b3fb2fc256cb3012f1c719b185749cee2b7b5b25a630ba11aa84b94a8af2" dependencies = [ "deno_core", "deno_web", @@ -1675,7 +1700,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "rustc_version 0.4.0", "syn 1.0.109", @@ -1763,15 +1788,15 @@ dependencies = [ [[package]] name = "dotenvy" -version = "0.15.6" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d8c417d7a8cb362e0c37e5d815f5eb7c37f79ff93707329d5a194e42e54ca0" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "dprint-swc-ext" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e2dc99247101e0132a17680c5afbba9a7334477b47738dd3431c13f5e2c9a84" +checksum = "008b6061551bcf644454469e6506c32bb23b765df93d608bf7a8e2494f82fcb3" dependencies = [ "bumpalo", "num-bigint 0.4.3", @@ -1798,6 +1823,12 @@ dependencies = [ "dtoa", ] +[[package]] +name = "dunce" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" + [[package]] name = "dyn-clone" version = "1.0.11" @@ -1814,7 +1845,7 @@ dependencies = [ "byteorder", "lazy_static", "proc-macro-error", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -1898,7 +1929,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -1909,7 +1940,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e40a16955681d469ab3da85aaa6b42ff656b3c67b52e1d8d3dd36afe97fd462" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -1921,19 +1952,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" dependencies = [ "once_cell", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] [[package]] name = "enum_kind" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b940da354ae81ef0926c5eaa428207b8f4f091d3956c891dfbd124162bed99" +checksum = "9895954c6ec59d897ed28a64815f2ceb57653fcaaebd317f2edc78b74f5495b6" dependencies = [ "pmutil", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "swc_macros_common", "syn 1.0.109", ] @@ -1954,7 +1985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "rustversion", "syn 1.0.109", @@ -2126,12 +2157,12 @@ dependencies = [ [[package]] name = "from_variant" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0981e470d2ab9f643df3921d54f1952ea100c39fdb6a3fdc820e20d2291df6c" +checksum = "1d449976075322384507443937df2f1d5577afbf4282f12a5a66ef29fa3e6307" dependencies = [ "pmutil", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "swc_macros_common", "syn 1.0.109", ] @@ -2253,7 +2284,7 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -2346,7 +2377,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.3", + "system-deps 6.0.4", ] [[package]] @@ -2363,7 +2394,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.0.3", + "system-deps 6.0.4", ] [[package]] @@ -2375,7 +2406,7 @@ dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.0.3", + "system-deps 6.0.4", "x11", ] @@ -2475,7 +2506,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.3", + "system-deps 6.0.4", "winapi", ] @@ -2509,7 +2540,7 @@ dependencies = [ "heck 0.4.1", "proc-macro-crate", "proc-macro-error", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -2521,7 +2552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.0.3", + "system-deps 6.0.4", ] [[package]] @@ -2543,18 +2574,6 @@ dependencies = [ "regex", ] -[[package]] -name = "glow" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e007a07a24de5ecae94160f141029e9a347282cfe25d1d58d85d845cf3130f1" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gobject-sys" version = "0.15.10" @@ -2563,46 +2582,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps 6.0.3", -] - -[[package]] -name = "gpu-alloc" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d" -dependencies = [ - "bitflags", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" -dependencies = [ - "bitflags", -] - -[[package]] -name = "gpu-descriptor" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" -dependencies = [ - "bitflags", - "gpu-descriptor-types", - "hashbrown", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" -dependencies = [ - "bitflags", + "system-deps 6.0.4", ] [[package]] @@ -2654,7 +2634,7 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.0.3", + "system-deps 6.0.4", ] [[package]] @@ -2666,7 +2646,7 @@ dependencies = [ "anyhow", "proc-macro-crate", "proc-macro-error", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -2781,12 +2761,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - [[package]] name = "hkdf" version = "0.12.3" @@ -2834,16 +2808,16 @@ dependencies = [ "log", "mac", "markup5ever", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -2937,16 +2911,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows 0.46.0", ] [[package]] @@ -2961,12 +2935,12 @@ dependencies = [ [[package]] name = "ico" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4b3331534254a9b64095ae60d3dc2a8225a7a70229cd5888be127cdc1f6804" +checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd" dependencies = [ "byteorder", - "png 0.11.0", + "png", ] [[package]] @@ -3017,10 +2991,11 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.20" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" dependencies = [ + "crossbeam-utils", "globset", "lazy_static", "log", @@ -3034,9 +3009,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.5" +version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" dependencies = [ "bytemuck", "byteorder", @@ -3053,9 +3028,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg 1.1.0", "hashbrown", @@ -3083,15 +3058,6 @@ dependencies = [ "cfb", ] -[[package]] -name = "inflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f9f47468e9a76a6452271efadc88fe865a82be91fe75e6c0c57b87ccea59d4" -dependencies = [ - "adler32", -] - [[package]] name = "inotify" version = "0.9.6" @@ -3133,9 +3099,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd6da19f25979c7270e70fa95ab371ec3b701cd0eefc47667a09785b3c59155" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" dependencies = [ "hermit-abi 0.3.1", "libc", @@ -3168,7 +3134,7 @@ checksum = "8a7d079e129b77477a49c5c4f1cfe9ce6c2c909ef52520693e8e811a714c7b20" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -3219,9 +3185,9 @@ dependencies = [ [[package]] name = "jni" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" dependencies = [ "cesu8", "combine", @@ -3281,14 +3247,12 @@ dependencies = [ ] [[package]] -name = "khronos-egl" -version = "4.1.0" +name = "keccak" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" dependencies = [ - "libc", - "libloading", - "pkg-config", + "cpufeatures", ] [[package]] @@ -3535,7 +3499,7 @@ dependencies = [ [[package]] name = "lodestone_core" version = "0.4.3" -source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=releases/0.5.0#22f71cf59085ab34b5132c06f29d9a41fdcc2f27" +source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=releases/0.5.0#fb79e0863df60859639d6ac8d2e23b74c94ee3cf" dependencies = [ "ansi_term", "argon2", @@ -3595,7 +3559,8 @@ dependencies = [ "tracing-subscriber", "ts-rs", "unrar", - "uuid 1.1.2", + "url", + "uuid 1.3.0", "walkdir", "whoami", "zip", @@ -3634,15 +3599,6 @@ dependencies = [ "linked-hash-map", ] -[[package]] -name = "lzzzz" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8014d1362004776e6a91e4c15a3aa7830d1b6650a075b51a9969ebb6d6af13bc" -dependencies = [ - "cc", -] - [[package]] name = "mac" version = "0.1.1" @@ -3712,6 +3668,24 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest 0.10.6", +] + +[[package]] +name = "md4" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da5ac363534dce5fabf69949225e174fbf111a498bf0ff794c8ea1fba9f3dda" +dependencies = [ + "digest 0.10.6", +] + [[package]] name = "memchr" version = "2.5.0" @@ -3745,25 +3719,11 @@ dependencies = [ "autocfg 1.1.0", ] -[[package]] -name = "metal" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" -dependencies = [ - "bitflags", - "block", - "core-graphics-types", - "foreign-types", - "log", - "objc", -] - [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" @@ -3829,27 +3789,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "naga" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5" -dependencies = [ - "bit-set", - "bitflags", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "num-traits 0.2.15", - "rustc-hash", - "serde", - "spirv", - "termcolor", - "thiserror", - "unicode-xid 0.2.4", -] - [[package]] name = "native-tls" version = "0.2.11" @@ -4153,7 +4092,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -4223,9 +4162,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -4235,18 +4174,19 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "open" -version = "3.4.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ecf2487e799604735754d2c5896106785987b441b5aee58f242e4d4963179a" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" dependencies = [ "pathdiff", + "windows-sys 0.42.0", ] [[package]] name = "openssl" -version = "0.10.46" +version = "0.10.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd2523381e46256e40930512c7fd25562b9eae4812cb52078f155e87217c9d1e" +checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" dependencies = [ "bitflags", "cfg-if", @@ -4263,7 +4203,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -4276,9 +4216,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.81" +version = "0.9.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176be2629957c157240f68f61f2d0053ad3a4ecfdd9ebf1e6521d18d9635cf67" +checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" dependencies = [ "autocfg 1.1.0", "cc", @@ -4287,11 +4227,20 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "ordered-float" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +dependencies = [ + "num-traits 0.2.15", +] + [[package]] name = "os_info" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c424bc68d15e0778838ac013b5b3449544d8133633d8016319e7e05a820b8c0" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" dependencies = [ "log", "serde", @@ -4370,7 +4319,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.3", + "system-deps 6.0.4", ] [[package]] @@ -4547,7 +4496,7 @@ dependencies = [ "phf_generator 0.8.0", "phf_shared 0.8.0", "proc-macro-hack", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -4561,7 +4510,7 @@ dependencies = [ "phf_generator 0.10.0", "phf_shared 0.10.0", "proc-macro-hack", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -4599,7 +4548,7 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -4646,14 +4595,14 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "plist" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffac6a51110e97610dd3ac73e34a65b27e56a1e305df41bad1f616d8e1cb22f4" +checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" dependencies = [ "base64 0.21.0", "indexmap", "line-wrap", - "quick-xml 0.27.1", + "quick-xml 0.28.1", "serde", "time 0.3.20", ] @@ -4664,23 +4613,11 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] -[[package]] -name = "png" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b0cabbbd20c2d7f06dbf015e06aad59b6ca3d9ed14848783e98af9aaf19925" -dependencies = [ - "bitflags", - "deflate", - "inflate", - "num-iter", -] - [[package]] name = "png" version = "0.17.7" @@ -4749,7 +4686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", "version_check", @@ -4761,7 +4698,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "version_check", ] @@ -4783,18 +4720,21 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" dependencies = [ "unicode-ident", ] [[package]] -name = "profiling" -version = "1.0.7" +name = "psm" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74605f360ce573babfe43964cbe520294dcb081afbf8c108fc6e23036b4da2df" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] [[package]] name = "quick-error" @@ -4813,9 +4753,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.27.1" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41" +checksum = "e5c1a97b1bc42b1d550bfb48d4262153fe400a12bab1511821736f7eac76d7e2" dependencies = [ "memchr", ] @@ -4835,7 +4775,7 @@ version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", ] [[package]] @@ -5038,12 +4978,6 @@ dependencies = [ "rand_core 0.3.1", ] -[[package]] -name = "range-alloc" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" - [[package]] name = "raw-window-handle" version = "0.5.1" @@ -5113,9 +5047,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -5133,9 +5067,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "remove_dir_all" @@ -5148,9 +5082,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949" dependencies = [ "async-compression", "base64 0.21.0", @@ -5262,14 +5196,12 @@ dependencies = [ ] [[package]] -name = "ron" -version = "0.8.0" +name = "ripemd" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" dependencies = [ - "base64 0.13.1", - "bitflags", - "serde", + "digest 0.10.6", ] [[package]] @@ -5315,9 +5247,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" [[package]] name = "rustc-hash" @@ -5351,9 +5283,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.10" +version = "0.36.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe885c3a125aa45213b68cc1472a49880cb5923dc23f522ad2791b882228778" +checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" dependencies = [ "bitflags", "errno", @@ -5561,9 +5493,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.157" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707de5fcf5df2b5788fca98dd7eab490bc2fd9b7ef1404defc462833b83f25ca" +checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" dependencies = [ "serde_derive", ] @@ -5579,6 +5511,16 @@ dependencies = [ "serde_json", ] +[[package]] +name = "serde-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float", + "serde", +] + [[package]] name = "serde_bytes" version = "0.11.9" @@ -5590,13 +5532,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.157" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78997f4555c22a7971214540c4a661291970619afd56de19f77e0de86296e1e5" +checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -5613,9 +5555,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db0969fff533976baadd92e08b1d102c5a3d8a8049eadfd69d4d1e3c5b2ed189" +checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" dependencies = [ "serde", ] @@ -5626,11 +5568,20 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -5645,12 +5596,13 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.82.0" +version = "0.88.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c060fd38f18c420e82ab21592ec1f088b39bccb6897b1dda394d63628e22158d" +checksum = "b163edac8a2f2536ae7b52f839a33aba7892c04d0cf21e1bf8213ecfc905ebcc" dependencies = [ "bytes", "derive_more", + "num-bigint 0.4.3", "serde", "serde_bytes", "smallvec", @@ -5674,7 +5626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -5696,7 +5648,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -5757,6 +5709,16 @@ dependencies = [ "digest 0.10.6", ] +[[package]] +name = "sha3" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +dependencies = [ + "digest 0.10.6", + "keccak", +] + [[package]] name = "sharded-slab" version = "0.1.4" @@ -5822,21 +5784,23 @@ dependencies = [ "autocfg 1.1.0", ] -[[package]] -name = "slotmap" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" -dependencies = [ - "version_check", -] - [[package]] name = "smallvec" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg 1.1.0", + "static_assertions", + "version_check", +] + [[package]] name = "socket2" version = "0.4.9" @@ -5905,16 +5869,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spirv" -version = "0.2.0+1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" -dependencies = [ - "bitflags", - "num-traits 0.2.15", -] - [[package]] name = "spki" version = "0.6.0" @@ -6001,7 +5955,7 @@ dependencies = [ "either", "heck 0.4.1", "once_cell", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "serde_json", "sha2", @@ -6027,6 +5981,19 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + [[package]] name = "state" version = "0.5.3" @@ -6064,18 +6031,18 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ "phf_generator 0.10.0", "phf_shared 0.10.0", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", ] [[package]] name = "string_enum" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41491e23e7db79343236a6ced96325ff132eb09e29ac4c5b8132b9c55aaaae89" +checksum = "91f42363e5ca94ea6f3faee9e3b5e1a4047535ae323f5c0579385fb2ae95874e" dependencies = [ "pmutil", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "swc_macros_common", "syn 1.0.109", @@ -6113,7 +6080,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" dependencies = [ "heck 0.3.3", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -6126,9 +6093,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "swc_atoms" -version = "0.4.34" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731cf66bd8e11030f056f91f9d8af77f83ec4377ff04d1670778a57d1607402a" +checksum = "2ebef84c2948cd0d1ba25acbf1b4bd9d80ab6f057efdbe35d8449b8d54699401" dependencies = [ "once_cell", "rustc-hash", @@ -6140,9 +6107,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.29.29" +version = "0.29.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97e491d31418cd33fea58e9f893316fc04b30e2b5d0e750c066e2ba4907ae54" +checksum = "5005cd73617e18592faa31298225b26f1c407b84a681d67efb735c3d3458e101" dependencies = [ "ahash", "ast_node", @@ -6168,9 +6135,9 @@ dependencies = [ [[package]] name = "swc_config" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4de36224eb9498fccd4e68971f0b83326ccf8592c2d424f257f3a1c76b2b211" +checksum = "89c8fc2c12bb1634c7c32fc3c9b6b963ad8f034cc62c4ecddcf215dc4f6f959d" dependencies = [ "indexmap", "serde", @@ -6180,12 +6147,12 @@ dependencies = [ [[package]] name = "swc_config_macro" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb64bc03d90fd5c90d6ab917bb2b1d7fbd31957df39e31ea24a3f554b4372251" +checksum = "7dadb9998d4f5fc36ef558ed5a092579441579ee8c6fcce84a5228cca9df4004" dependencies = [ "pmutil", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "swc_macros_common", "syn 1.0.109", @@ -6193,9 +6160,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.96.3" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a887102d5595b557261aa4bde35f3d71906fba674d4b79cd5c59b4155b12ee2d" +checksum = "7dbfdbe05dde274473a6030dcf5e52e579516aea761d25d7a8d128f2ab597f09" dependencies = [ "bitflags", "is-macro", @@ -6210,9 +6177,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.129.8" +version = "0.135.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f8f20522626a737753381bdf64ee53d568730f9f7e720d35960de97e5ff965" +checksum = "78d196e6979af0cbb91084361ca006db292a6374f75ec04cbb55306051cc4f50" dependencies = [ "memchr", "num-bigint 0.4.3", @@ -6234,7 +6201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0159c99f81f52e48fe692ef7af1b0990b45d3006b14c6629be0b1ffee1b23aea" dependencies = [ "pmutil", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "swc_macros_common", "syn 1.0.109", @@ -6242,9 +6209,9 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.41.31" +version = "0.41.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c996baa947150d496c79fbd153d3df834e38d05c779abc4af987aded90e168a2" +checksum = "681c1fbb762c82700a5bd23dc39bad892a287ea9fb2121cf56e77f1ddc89afeb" dependencies = [ "ahash", "anyhow", @@ -6256,9 +6223,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.124.5" +version = "0.130.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e75888eabf1ad8a8968e3befc7cd20c10e4721254d3344285bd5c3a42f58dc1" +checksum = "042435aaeb71c4416cde440323ac9fa2c24121c2ec150f0cb79999c2e6ceffaa" dependencies = [ "either", "enum_kind", @@ -6266,6 +6233,8 @@ dependencies = [ "num-bigint 0.4.3", "serde", "smallvec", + "smartstring", + "stacker", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -6275,9 +6244,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.116.5" +version = "0.122.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5a212abba41897332f9ab3af8fe5d1a59f83d69e25eea119c27d9b53876688" +checksum = "fd4141092b17cd85eefc224b035b717e03c910b9fd58e4e637ffd05236d7e13b" dependencies = [ "better_scoped_tls", "bitflags", @@ -6297,9 +6266,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.105.5" +version = "0.111.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2fd5a8eff1a7f16ec1b3ae50186debf3d3983effed6ed05d4e6db0ed7aadcac" +checksum = "b5022c592f0ae17f4dc42031e1c4c60b7e6d2d8d1c2428b986759a92ea853801" dependencies = [ "swc_atoms", "swc_common", @@ -6316,7 +6285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebf907935ec5492256b523ae7935a824d9fdc0368dcadc41375bad0dca91cd8b" dependencies = [ "pmutil", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "swc_macros_common", "syn 1.0.109", @@ -6324,9 +6293,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.149.8" +version = "0.156.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6fe11a20c7ced3c6b6149da330b8b4d8912fe02af6923aaac4d4479aa3dd3b6" +checksum = "f4015c3ab090f27eee0834d45bdcf9666dc6329ed06845d1882cdfe6f4826fca" dependencies = [ "either", "serde", @@ -6343,9 +6312,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.160.9" +version = "0.167.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b94e3884668e2e12684e4adf812dbd22d34b17da2d7637b1c9cffe393acad6c2" +checksum = "db1c7801b1d7741ab335441dd301ddcc4183fb250d5e6efaab33b03def268c06" dependencies = [ "ahash", "base64 0.13.1", @@ -6369,9 +6338,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.164.10" +version = "0.171.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a885199b43798b46d8b26b4a986f899436f9f2cb37477eb12a183388a5c213f" +checksum = "142e8fb5ebe870bc51b3a95c0214af9112d3475b7cd5be4f13b87f3be664841a" dependencies = [ "serde", "swc_atoms", @@ -6385,9 +6354,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.107.5" +version = "0.113.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d773cf626c8d3be468a883879cda3727a2f1ea6169ccd0b5b8eb2d7afb5f367b" +checksum = "4c44885603c09926118708f4352e04242c2482bc16eb51ad7beb8ad4cf5f7bb6" dependencies = [ "indexmap", "num_cpus", @@ -6403,9 +6372,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.82.3" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b2ee0f4b61d6c426189d0d9da1333705ff3bc4513fb63633ca254595a700f75" +checksum = "147cf9137da6fe2704a5defd29a1cde849961978f8c92911e6790d50df475fef" dependencies = [ "num-bigint 0.4.3", "swc_atoms", @@ -6422,28 +6391,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c20468634668c2bbab581947bb8c75c97158d5a6959f4ba33df20983b20b4f6" dependencies = [ "pmutil", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] [[package]] name = "swc_macros_common" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4be988307882648d9bc7c71a6a73322b7520ef0211e920489a98f8391d8caa2" +checksum = "3e582c3e3c2269238524923781df5be49e011dbe29cf7683a2215d600a562ea6" dependencies = [ "pmutil", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] [[package]] name = "swc_visit" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "470a1963cf182fdcbbac46e3a7fd2caf7329da0e568d3668202da9501c880e16" +checksum = "d1d5999f23421c8e21a0f2bc53a0b9e8244f3b421de89471561af2fbe40b9cca" dependencies = [ "either", "swc_visit_macros", @@ -6451,13 +6420,13 @@ dependencies = [ [[package]] name = "swc_visit_macros" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6098b717cfd4c85f5cddec734af191dbce461c39975ed567c32ac6d0c6d61a6d" +checksum = "ebeed7eb0f545f48ad30f5aab314e5208b735bcea1d1464f26e20f06db904989" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "swc_macros_common", "syn 1.0.109", @@ -6480,18 +6449,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.2" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d3276aee1fa0c33612917969b5172b5be2db051232a6e4826f1a1a9191b045" +checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "unicode-ident", ] @@ -6508,7 +6477,7 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", "unicode-xid 0.2.4", @@ -6538,28 +6507,28 @@ dependencies = [ "cfg-expr 0.9.1", "heck 0.3.3", "pkg-config", - "toml", + "toml 0.5.11", "version-compare 0.0.11", ] [[package]] name = "system-deps" -version = "6.0.3" +version = "6.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f" dependencies = [ - "cfg-expr 0.11.0", + "cfg-expr 0.14.0", "heck 0.4.1", "pkg-config", - "toml", + "toml 0.7.3", "version-compare 0.1.1", ] [[package]] name = "tao" -version = "0.14.0" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43336f5d1793543ba96e2a1e75f3a5c7dcd592743be06a0ab3a190f4fcb4b934" +checksum = "ac8e6399427c8494f9849b58694754d7cc741293348a6836b6c8d2c5aa82d8e6" dependencies = [ "bitflags", "cairo-rs", @@ -6590,12 +6559,12 @@ dependencies = [ "once_cell", "parking_lot 0.12.1", "paste", - "png 0.17.7", + "png", "raw-window-handle", "scopeguard", "serde", "unicode-segmentation", - "uuid 1.1.2", + "uuid 1.3.0", "windows 0.39.0", "windows-implement", "x11-dl", @@ -6614,9 +6583,9 @@ dependencies = [ [[package]] name = "tauri" -version = "1.1.3" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2643e2769a6bf922c274a0e6828a7dd20f9fa6d0fe4e04775d0a7eae81f82d37" +checksum = "fe7e0f1d535e7cbbbab43c82be4fc992b84f9156c16c160955617e0260ebc449" dependencies = [ "anyhow", "attohttpc 0.22.0", @@ -6659,7 +6628,7 @@ dependencies = [ "thiserror", "tokio", "url", - "uuid 1.1.2", + "uuid 1.3.0", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -6683,17 +6652,17 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb77cf7bfe3d8f886e73a7fa6157587d015c599671180b76595c1aef175ba8" +checksum = "14388d484b6b1b5dc0f6a7d6cc6433b3b230bec85eaa576adcdf3f9fafa49251" dependencies = [ "base64 0.13.1", "brotli", "ico", "json-patch", "plist", - "png 0.17.7", - "proc-macro2 1.0.52", + "png", + "proc-macro2 1.0.53", "quote 1.0.26", "regex", "semver 1.0.17", @@ -6703,18 +6672,18 @@ dependencies = [ "tauri-utils", "thiserror", "time 0.3.20", - "uuid 1.1.2", + "uuid 1.3.0", "walkdir", ] [[package]] name = "tauri-macros" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24f481b0b2acfc288ac78755f00ebea53992c7365a165af64cb5ae00806edea" +checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", "tauri-codegen", @@ -6734,30 +6703,29 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d49439a5ea47f474572b854972f42eda2e02a470be5ca9609cc83bb66945abe2" +checksum = "c507d954d08ac8705d235bc70ec6975b9054fb95ff7823af72dbb04186596f3b" dependencies = [ "gtk", "http", "http-range", - "infer", "rand 0.8.5", "raw-window-handle", "serde", "serde_json", "tauri-utils", "thiserror", - "uuid 1.1.2", + "uuid 1.3.0", "webview2-com", "windows 0.39.0", ] [[package]] name = "tauri-runtime-wry" -version = "0.11.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dce920995fd49907aa9bea7249ed1771454f11f7611924c920a1f75fb614d4" +checksum = "36b1c5764a41a13176a4599b5b7bd0881bea7d94dfe45e1e755f789b98317e30" dependencies = [ "cocoa", "gtk", @@ -6766,7 +6734,7 @@ dependencies = [ "raw-window-handle", "tauri-runtime", "tauri-utils", - "uuid 1.1.2", + "uuid 1.3.0", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -6789,7 +6757,7 @@ dependencies = [ "kuchiki", "memchr", "phf 0.10.1", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "semver 1.0.17", "serde", @@ -6885,9 +6853,9 @@ version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -6970,9 +6938,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.24.2" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg 1.1.0", "bytes", @@ -6994,7 +6962,7 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -7073,9 +7041,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -7094,19 +7062,36 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + [[package]] name = "toml_datetime" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" -version = "0.19.7" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ "indexmap", + "serde", + "serde_spanned", "toml_datetime", "winnow", ] @@ -7147,7 +7132,6 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", - "tower", "tower-layer", "tower-service", "tracing", @@ -7195,7 +7179,7 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -7340,7 +7324,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f807fdb3151fee75df7485b901a89624358cd07a67a8fb1a5831bf5a07681ff" dependencies = [ "Inflector", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", "termcolor", @@ -7450,9 +7434,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d502c968c6a838ead8e69b2ee18ec708802f99db92a0d156705ec9ef801993b" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-id" @@ -7577,6 +7561,12 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "0.8.2" @@ -7585,9 +7575,9 @@ checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" [[package]] name = "uuid" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" dependencies = [ "getrandom 0.2.8", "rand 0.8.5", @@ -7601,16 +7591,16 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b300a878652a387d2a0de915bdae8f1a548f0c6d45e072fe2688794b656cc9" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] [[package]] name = "v8" -version = "0.60.1" +version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fd5b3ed559897ff02c0f62bc0a5f300bfe79bb4c77a50031b8df771701c628" +checksum = "6c8ab8597b885c17b3761f6ffc29b7a62758612c409285a9271c6dacd17bb745" dependencies = [ "bitflags", "fslock", @@ -7654,6 +7644,27 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" +[[package]] +name = "vte" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aae21c12ad2ec2d168c236f369c38ff332bc1134f7246350dca641437365045" +dependencies = [ + "arrayvec", + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +dependencies = [ + "proc-macro2 1.0.53", + "quote 1.0.26", +] + [[package]] name = "walkdir" version = "2.3.3" @@ -7711,7 +7722,7 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", "wasm-bindgen-shared", @@ -7745,7 +7756,7 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", "wasm-bindgen-backend", @@ -7825,7 +7836,7 @@ dependencies = [ "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.0.3", + "system-deps 6.0.4", ] [[package]] @@ -7865,7 +7876,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", ] @@ -7885,81 +7896,6 @@ dependencies = [ "windows-metadata", ] -[[package]] -name = "wgpu-core" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags", - "codespan-reporting", - "fxhash", - "log", - "naga", - "parking_lot 0.12.1", - "profiling", - "ron", - "serde", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7762ae7fcc06943c1b5d4987ab0194e82aaba7767fbfb75d3458844c5b82cc45" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags", - "block", - "core-graphics-types", - "d3d12", - "foreign-types", - "fxhash", - "glow", - "gpu-alloc", - "gpu-descriptor", - "js-sys", - "khronos-egl", - "libc", - "libloading", - "log", - "metal", - "naga", - "objc", - "parking_lot 0.12.1", - "profiling", - "range-alloc", - "raw-window-handle", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-types" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" -dependencies = [ - "bitflags", - "js-sys", - "serde", - "web-sys", -] - [[package]] name = "which" version = "4.4.0" @@ -8060,6 +7996,15 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-bindgen" version = "0.39.0" @@ -8235,9 +8180,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "winnow" -version = "0.3.6" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" dependencies = [ "memchr", ] @@ -8257,20 +8202,21 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" dependencies = [ - "toml", + "toml 0.5.11", ] [[package]] name = "wry" -version = "0.21.1" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff5c1352b4266fdf92c63479d2f58ab4cd29dc4e78fbc1b62011ed1227926945" +checksum = "4c1ad8e2424f554cc5bdebe8aa374ef5b433feff817aebabca0389961fc7ef98" dependencies = [ "base64 0.13.1", "block", "cocoa", "core-graphics", "crossbeam-channel", + "dunce", "gdk", "gio", "glib", @@ -8286,6 +8232,7 @@ dependencies = [ "serde", "serde_json", "sha2", + "soup2", "tao", "thiserror", "url", @@ -8308,12 +8255,12 @@ dependencies = [ [[package]] name = "x11-dl" -version = "2.20.1" +version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" dependencies = [ - "lazy_static", "libc", + "once_cell", "pkg-config", ] @@ -8367,7 +8314,7 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.53", "quote 1.0.26", "syn 1.0.109", "synstructure", diff --git a/src/bindings/ConfigurableManifest.ts b/src/bindings/ConfigurableManifest.ts new file mode 100644 index 00000000..521721a0 --- /dev/null +++ b/src/bindings/ConfigurableManifest.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { SectionManifest } from "./SectionManifest"; + +export interface ConfigurableManifest { auto_start: boolean, restart_on_crash: boolean, start_on_connection: boolean, setting_sections: Record, } \ No newline at end of file diff --git a/src/bindings/ConfigurableValue.ts b/src/bindings/ConfigurableValue.ts new file mode 100644 index 00000000..eae90338 --- /dev/null +++ b/src/bindings/ConfigurableValue.ts @@ -0,0 +1,3 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type ConfigurableValue = { type: "String", value: string } | { type: "Integer", value: number } | { type: "UnsignedInteger", value: number } | { type: "Float", value: number } | { type: "Boolean", value: boolean } | { type: "Enum", value: string }; \ No newline at end of file diff --git a/src/bindings/ConfigurableValueType.ts b/src/bindings/ConfigurableValueType.ts new file mode 100644 index 00000000..fa2e5b05 --- /dev/null +++ b/src/bindings/ConfigurableValueType.ts @@ -0,0 +1,3 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type ConfigurableValueType = { type: "String", regex: string | null, } | { type: "Integer", min: number | null, max: number | null, } | { type: "UnsignedInteger", min: number | null, max: number | null, } | { type: "Float", min: number | null, max: number | null, } | { type: "Boolean" } | { type: "Enum", options: Array, }; \ No newline at end of file diff --git a/src/bindings/ErrorIR.ts b/src/bindings/ErrorIR.ts new file mode 100644 index 00000000..1b65cca5 --- /dev/null +++ b/src/bindings/ErrorIR.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { ErrorKind } from "./ErrorKind"; + +export interface ErrorIR { kind: ErrorKind, source: string, } \ No newline at end of file diff --git a/src/bindings/ExitStatus.ts b/src/bindings/ExitStatus.ts new file mode 100644 index 00000000..94c9d8f4 --- /dev/null +++ b/src/bindings/ExitStatus.ts @@ -0,0 +1,3 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type ExitStatus = { type: "Success", time: bigint, } | { type: "Killed", time: bigint, } | { type: "Error", time: bigint, error_msg: string, }; \ No newline at end of file diff --git a/src/bindings/GenericPlayer.ts b/src/bindings/GenericPlayer.ts new file mode 100644 index 00000000..1a5cb7a4 --- /dev/null +++ b/src/bindings/GenericPlayer.ts @@ -0,0 +1,3 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export interface GenericPlayer { id: string, name: string, } \ No newline at end of file diff --git a/src/bindings/GenericSetupConfig.ts b/src/bindings/GenericSetupConfig.ts new file mode 100644 index 00000000..4e8d37eb --- /dev/null +++ b/src/bindings/GenericSetupConfig.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { InstanceUuid } from "./InstanceUuid"; + +export interface GenericSetupConfig { game_type: string, uuid: InstanceUuid, name: string, description: string, port: number, auto_start: boolean, restart_on_crash: boolean, started_count: number, } \ No newline at end of file diff --git a/src/bindings/GenericSetupConfigPrimitive.ts b/src/bindings/GenericSetupConfigPrimitive.ts new file mode 100644 index 00000000..06b9a5f2 --- /dev/null +++ b/src/bindings/GenericSetupConfigPrimitive.ts @@ -0,0 +1,3 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export interface GenericSetupConfigPrimitive { name: string, description: string | null, port: number, auto_start: boolean | null, restart_on_crash: boolean | null, timeout_last_left: number | null, timeout_no_activity: number | null, start_on_connection: boolean | null, } \ No newline at end of file diff --git a/src/bindings/HistoryEntry.ts b/src/bindings/HistoryEntry.ts new file mode 100644 index 00000000..26a60170 --- /dev/null +++ b/src/bindings/HistoryEntry.ts @@ -0,0 +1,5 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { ExitStatus } from "./ExitStatus"; +import type { TaskEntry } from "./TaskEntry"; + +export interface HistoryEntry { task: TaskEntry, exit_status: ExitStatus, } \ No newline at end of file diff --git a/src/bindings/MacroEntry.ts b/src/bindings/MacroEntry.ts new file mode 100644 index 00000000..29f010ca --- /dev/null +++ b/src/bindings/MacroEntry.ts @@ -0,0 +1,3 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export interface MacroEntry { name: string, last_run: bigint | null, path: string, } \ No newline at end of file diff --git a/src/bindings/MacroPID.ts b/src/bindings/MacroPID.ts new file mode 100644 index 00000000..2affa0af --- /dev/null +++ b/src/bindings/MacroPID.ts @@ -0,0 +1,3 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type MacroPID = number; \ No newline at end of file diff --git a/src/bindings/ManifestValue.ts b/src/bindings/ManifestValue.ts new file mode 100644 index 00000000..79a596c5 --- /dev/null +++ b/src/bindings/ManifestValue.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { SectionManifestValue } from "./SectionManifestValue"; + +export interface ManifestValue { auto_start: boolean, restart_on_crash: boolean, start_on_connection: boolean, setting_sections: Record, } \ No newline at end of file diff --git a/src/bindings/ProcedureCall.ts b/src/bindings/ProcedureCall.ts new file mode 100644 index 00000000..f6eae990 --- /dev/null +++ b/src/bindings/ProcedureCall.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { ProcedureCallInner } from "./ProcedureCallInner"; + +export interface ProcedureCall { id: bigint, inner: ProcedureCallInner, } \ No newline at end of file diff --git a/src/bindings/ProcedureCallInner.ts b/src/bindings/ProcedureCallInner.ts new file mode 100644 index 00000000..e55b8581 --- /dev/null +++ b/src/bindings/ProcedureCallInner.ts @@ -0,0 +1,5 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { CausedBy } from "./CausedBy"; +import type { GenericSetupConfig } from "./GenericSetupConfig"; + +export type ProcedureCallInner = { type: "SetupInstance", config: GenericSetupConfig, path: string, } | { type: "StartInstance", caused_by: CausedBy, } | { type: "StopInstance", caused_by: CausedBy, } | { type: "RestartInstance", caused_by: CausedBy, } | { type: "KillInstance", caused_by: CausedBy, } | { type: "GetState" } | { type: "SendCommand", command: string, caused_by: CausedBy, } | { type: "Monitor" } | { type: "GetPlayerCount" } | { type: "GetPlayerList" }; \ No newline at end of file diff --git a/src/bindings/ProcedureCallKind.ts b/src/bindings/ProcedureCallKind.ts new file mode 100644 index 00000000..af8745a7 --- /dev/null +++ b/src/bindings/ProcedureCallKind.ts @@ -0,0 +1,3 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type ProcedureCallKind = "SetupInstance" | "StartInstance" | "StopInstance" | "RestartInstance" | "KillInstance" | "GetState" | "SendCommand" | "Monitor" | "GetPlayerCount" | "GetPlayerList"; \ No newline at end of file diff --git a/src/bindings/ProcedureCallResultIR.ts b/src/bindings/ProcedureCallResultIR.ts new file mode 100644 index 00000000..50ab4b43 --- /dev/null +++ b/src/bindings/ProcedureCallResultIR.ts @@ -0,0 +1,6 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { ErrorIR } from "./ErrorIR"; +import type { ProcedureCallKind } from "./ProcedureCallKind"; +import type { ProcedureCallResultInner } from "./ProcedureCallResultInner"; + +export interface ProcedureCallResultIR { id: bigint, success: boolean, procedure_call_kind: ProcedureCallKind, inner: ProcedureCallResultInner | null, error: ErrorIR | null, } \ No newline at end of file diff --git a/src/bindings/ProcedureCallResultInner.ts b/src/bindings/ProcedureCallResultInner.ts new file mode 100644 index 00000000..e883cbb4 --- /dev/null +++ b/src/bindings/ProcedureCallResultInner.ts @@ -0,0 +1,6 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { GenericPlayer } from "./GenericPlayer"; +import type { InstanceState } from "./InstanceState"; +import type { PerformanceReport } from "./PerformanceReport"; + +export type ProcedureCallResultInner = { String: string } | { Monitor: PerformanceReport } | { State: InstanceState } | { Num: number } | { Player: Array } | "Void"; \ No newline at end of file diff --git a/src/bindings/SectionManifest.ts b/src/bindings/SectionManifest.ts new file mode 100644 index 00000000..d6626fa2 --- /dev/null +++ b/src/bindings/SectionManifest.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { SettingManifest } from "./SettingManifest"; + +export interface SectionManifest { section_id: string, name: string, description: string, settings: Record, } \ No newline at end of file diff --git a/src/bindings/SectionManifestValue.ts b/src/bindings/SectionManifestValue.ts new file mode 100644 index 00000000..787bad76 --- /dev/null +++ b/src/bindings/SectionManifestValue.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { SettingManifestValue } from "./SettingManifestValue"; + +export interface SectionManifestValue { settings: Record, } \ No newline at end of file diff --git a/src/bindings/SettingManifest.ts b/src/bindings/SettingManifest.ts new file mode 100644 index 00000000..81eddc03 --- /dev/null +++ b/src/bindings/SettingManifest.ts @@ -0,0 +1,5 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { ConfigurableValue } from "./ConfigurableValue"; +import type { ConfigurableValueType } from "./ConfigurableValueType"; + +export interface SettingManifest { setting_id: string, name: string, description: string, value: ConfigurableValue | null, value_type: ConfigurableValueType, default_value: ConfigurableValue | null, is_secret: boolean, is_required: boolean, is_mutable: boolean, } \ No newline at end of file diff --git a/src/bindings/SettingManifestValue.ts b/src/bindings/SettingManifestValue.ts new file mode 100644 index 00000000..13b8de37 --- /dev/null +++ b/src/bindings/SettingManifestValue.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { ConfigurableValue } from "./ConfigurableValue"; + +export interface SettingManifestValue { value: ConfigurableValue | null, } \ No newline at end of file diff --git a/src/bindings/TaskEntry.ts b/src/bindings/TaskEntry.ts new file mode 100644 index 00000000..26c911f4 --- /dev/null +++ b/src/bindings/TaskEntry.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { MacroPID } from "./MacroPID"; + +export interface TaskEntry { name: string, creation_time: bigint, pid: MacroPID, } \ No newline at end of file diff --git a/src/utils/apis.ts b/src/utils/apis.ts index a778dffa..59fe4b1b 100644 --- a/src/utils/apis.ts +++ b/src/utils/apis.ts @@ -2,6 +2,7 @@ import { QueryClient } from '@tanstack/react-query'; import axios from 'axios'; import { ClientError } from 'bindings/ClientError'; import { ClientFile } from 'bindings/ClientFile'; +import { MacroEntry } from 'bindings/MacroEntry'; import { LoginReply } from 'bindings/LoginReply'; import { UserPermission } from 'bindings/UserPermission'; import { Base64 } from 'js-base64'; @@ -15,6 +16,8 @@ import { isAxiosError, parentPath, } from './util'; +import { TaskEntry } from 'bindings/TaskEntry'; +import { HistoryEntry } from 'bindings/HistoryEntry'; /*********************** * Start Files API @@ -370,3 +373,61 @@ export const openPort = async (port: number) => { }) ); }; + +/*********************** + * Start Tasks/Macro API + ***********************/ + +export const getTasks = async ( + queryClient: QueryClient, + uuid: string, + ) => { + const taskList = axiosWrapper({ + method: 'get', + url: `/instance/${uuid}/task/list`, + }); + queryClient.setQueryData(['instance', uuid, 'taskList'], taskList); +}; + +export const getMacros = async ( + queryClient: QueryClient, + uuid: string, + ) => { + const macroList = await axiosWrapper({ + method: 'get', + url: `/instance/${uuid}/macro/list`, + }); + queryClient.setQueryData(['instance', uuid, 'macroList'], macroList); +}; + +export const getInstanceHistory = async ( + queryClient: QueryClient, + uuid: string, + ) => { + const historyList = await axiosWrapper({ + method: 'get', + url: `/instance/${uuid}/history/list`, + }); + queryClient.setQueryData(['instance', uuid, 'instanceHistory'], historyList); +}; + +export const createTask = async ( + queryClient: QueryClient, + uuid: string, + macro_name: string, + args: string[], + ) => { + queryClient.invalidateQueries(['instance', uuid, 'taskList']); + return await catchAsyncToString( + axiosWrapper({ + method: 'put', + url: `/instance/${uuid}/macro/run/${macro_name}`, + data: args, + }) + ); +}; + + +/*********************** + * End Tasks/Macro API + ***********************/ \ No newline at end of file From d836a8c758cae02b7d363856b047d0fedb1cb2a9 Mon Sep 17 00:00:00 2001 From: Dan S Date: Sat, 25 Mar 2023 21:53:22 -0600 Subject: [PATCH 025/108] remove unused bindings, update apis --- src/bindings/ConfigurableManifest.ts | 4 ---- src/bindings/ConfigurableValue.ts | 3 --- src/bindings/ConfigurableValueType.ts | 3 --- src/bindings/ErrorIR.ts | 4 ---- src/bindings/GenericPlayer.ts | 3 --- src/bindings/GenericSetupConfig.ts | 4 ---- src/bindings/GenericSetupConfigPrimitive.ts | 3 --- src/bindings/ManifestValue.ts | 4 ---- src/bindings/ProcedureCall.ts | 4 ---- src/bindings/ProcedureCallInner.ts | 5 ----- src/bindings/ProcedureCallKind.ts | 3 --- src/bindings/ProcedureCallResultIR.ts | 6 ----- src/bindings/ProcedureCallResultInner.ts | 6 ----- src/bindings/SectionManifest.ts | 4 ---- src/bindings/SectionManifestValue.ts | 4 ---- src/bindings/SettingManifest.ts | 5 ----- src/bindings/SettingManifestValue.ts | 4 ---- src/utils/apis.ts | 25 ++++++++------------- 18 files changed, 9 insertions(+), 85 deletions(-) delete mode 100644 src/bindings/ConfigurableManifest.ts delete mode 100644 src/bindings/ConfigurableValue.ts delete mode 100644 src/bindings/ConfigurableValueType.ts delete mode 100644 src/bindings/ErrorIR.ts delete mode 100644 src/bindings/GenericPlayer.ts delete mode 100644 src/bindings/GenericSetupConfig.ts delete mode 100644 src/bindings/GenericSetupConfigPrimitive.ts delete mode 100644 src/bindings/ManifestValue.ts delete mode 100644 src/bindings/ProcedureCall.ts delete mode 100644 src/bindings/ProcedureCallInner.ts delete mode 100644 src/bindings/ProcedureCallKind.ts delete mode 100644 src/bindings/ProcedureCallResultIR.ts delete mode 100644 src/bindings/ProcedureCallResultInner.ts delete mode 100644 src/bindings/SectionManifest.ts delete mode 100644 src/bindings/SectionManifestValue.ts delete mode 100644 src/bindings/SettingManifest.ts delete mode 100644 src/bindings/SettingManifestValue.ts diff --git a/src/bindings/ConfigurableManifest.ts b/src/bindings/ConfigurableManifest.ts deleted file mode 100644 index 521721a0..00000000 --- a/src/bindings/ConfigurableManifest.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { SectionManifest } from "./SectionManifest"; - -export interface ConfigurableManifest { auto_start: boolean, restart_on_crash: boolean, start_on_connection: boolean, setting_sections: Record, } \ No newline at end of file diff --git a/src/bindings/ConfigurableValue.ts b/src/bindings/ConfigurableValue.ts deleted file mode 100644 index eae90338..00000000 --- a/src/bindings/ConfigurableValue.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type ConfigurableValue = { type: "String", value: string } | { type: "Integer", value: number } | { type: "UnsignedInteger", value: number } | { type: "Float", value: number } | { type: "Boolean", value: boolean } | { type: "Enum", value: string }; \ No newline at end of file diff --git a/src/bindings/ConfigurableValueType.ts b/src/bindings/ConfigurableValueType.ts deleted file mode 100644 index fa2e5b05..00000000 --- a/src/bindings/ConfigurableValueType.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type ConfigurableValueType = { type: "String", regex: string | null, } | { type: "Integer", min: number | null, max: number | null, } | { type: "UnsignedInteger", min: number | null, max: number | null, } | { type: "Float", min: number | null, max: number | null, } | { type: "Boolean" } | { type: "Enum", options: Array, }; \ No newline at end of file diff --git a/src/bindings/ErrorIR.ts b/src/bindings/ErrorIR.ts deleted file mode 100644 index 1b65cca5..00000000 --- a/src/bindings/ErrorIR.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { ErrorKind } from "./ErrorKind"; - -export interface ErrorIR { kind: ErrorKind, source: string, } \ No newline at end of file diff --git a/src/bindings/GenericPlayer.ts b/src/bindings/GenericPlayer.ts deleted file mode 100644 index 1a5cb7a4..00000000 --- a/src/bindings/GenericPlayer.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export interface GenericPlayer { id: string, name: string, } \ No newline at end of file diff --git a/src/bindings/GenericSetupConfig.ts b/src/bindings/GenericSetupConfig.ts deleted file mode 100644 index 4e8d37eb..00000000 --- a/src/bindings/GenericSetupConfig.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { InstanceUuid } from "./InstanceUuid"; - -export interface GenericSetupConfig { game_type: string, uuid: InstanceUuid, name: string, description: string, port: number, auto_start: boolean, restart_on_crash: boolean, started_count: number, } \ No newline at end of file diff --git a/src/bindings/GenericSetupConfigPrimitive.ts b/src/bindings/GenericSetupConfigPrimitive.ts deleted file mode 100644 index 06b9a5f2..00000000 --- a/src/bindings/GenericSetupConfigPrimitive.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export interface GenericSetupConfigPrimitive { name: string, description: string | null, port: number, auto_start: boolean | null, restart_on_crash: boolean | null, timeout_last_left: number | null, timeout_no_activity: number | null, start_on_connection: boolean | null, } \ No newline at end of file diff --git a/src/bindings/ManifestValue.ts b/src/bindings/ManifestValue.ts deleted file mode 100644 index 79a596c5..00000000 --- a/src/bindings/ManifestValue.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { SectionManifestValue } from "./SectionManifestValue"; - -export interface ManifestValue { auto_start: boolean, restart_on_crash: boolean, start_on_connection: boolean, setting_sections: Record, } \ No newline at end of file diff --git a/src/bindings/ProcedureCall.ts b/src/bindings/ProcedureCall.ts deleted file mode 100644 index f6eae990..00000000 --- a/src/bindings/ProcedureCall.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { ProcedureCallInner } from "./ProcedureCallInner"; - -export interface ProcedureCall { id: bigint, inner: ProcedureCallInner, } \ No newline at end of file diff --git a/src/bindings/ProcedureCallInner.ts b/src/bindings/ProcedureCallInner.ts deleted file mode 100644 index e55b8581..00000000 --- a/src/bindings/ProcedureCallInner.ts +++ /dev/null @@ -1,5 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { CausedBy } from "./CausedBy"; -import type { GenericSetupConfig } from "./GenericSetupConfig"; - -export type ProcedureCallInner = { type: "SetupInstance", config: GenericSetupConfig, path: string, } | { type: "StartInstance", caused_by: CausedBy, } | { type: "StopInstance", caused_by: CausedBy, } | { type: "RestartInstance", caused_by: CausedBy, } | { type: "KillInstance", caused_by: CausedBy, } | { type: "GetState" } | { type: "SendCommand", command: string, caused_by: CausedBy, } | { type: "Monitor" } | { type: "GetPlayerCount" } | { type: "GetPlayerList" }; \ No newline at end of file diff --git a/src/bindings/ProcedureCallKind.ts b/src/bindings/ProcedureCallKind.ts deleted file mode 100644 index af8745a7..00000000 --- a/src/bindings/ProcedureCallKind.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type ProcedureCallKind = "SetupInstance" | "StartInstance" | "StopInstance" | "RestartInstance" | "KillInstance" | "GetState" | "SendCommand" | "Monitor" | "GetPlayerCount" | "GetPlayerList"; \ No newline at end of file diff --git a/src/bindings/ProcedureCallResultIR.ts b/src/bindings/ProcedureCallResultIR.ts deleted file mode 100644 index 50ab4b43..00000000 --- a/src/bindings/ProcedureCallResultIR.ts +++ /dev/null @@ -1,6 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { ErrorIR } from "./ErrorIR"; -import type { ProcedureCallKind } from "./ProcedureCallKind"; -import type { ProcedureCallResultInner } from "./ProcedureCallResultInner"; - -export interface ProcedureCallResultIR { id: bigint, success: boolean, procedure_call_kind: ProcedureCallKind, inner: ProcedureCallResultInner | null, error: ErrorIR | null, } \ No newline at end of file diff --git a/src/bindings/ProcedureCallResultInner.ts b/src/bindings/ProcedureCallResultInner.ts deleted file mode 100644 index e883cbb4..00000000 --- a/src/bindings/ProcedureCallResultInner.ts +++ /dev/null @@ -1,6 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { GenericPlayer } from "./GenericPlayer"; -import type { InstanceState } from "./InstanceState"; -import type { PerformanceReport } from "./PerformanceReport"; - -export type ProcedureCallResultInner = { String: string } | { Monitor: PerformanceReport } | { State: InstanceState } | { Num: number } | { Player: Array } | "Void"; \ No newline at end of file diff --git a/src/bindings/SectionManifest.ts b/src/bindings/SectionManifest.ts deleted file mode 100644 index d6626fa2..00000000 --- a/src/bindings/SectionManifest.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { SettingManifest } from "./SettingManifest"; - -export interface SectionManifest { section_id: string, name: string, description: string, settings: Record, } \ No newline at end of file diff --git a/src/bindings/SectionManifestValue.ts b/src/bindings/SectionManifestValue.ts deleted file mode 100644 index 787bad76..00000000 --- a/src/bindings/SectionManifestValue.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { SettingManifestValue } from "./SettingManifestValue"; - -export interface SectionManifestValue { settings: Record, } \ No newline at end of file diff --git a/src/bindings/SettingManifest.ts b/src/bindings/SettingManifest.ts deleted file mode 100644 index 81eddc03..00000000 --- a/src/bindings/SettingManifest.ts +++ /dev/null @@ -1,5 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { ConfigurableValue } from "./ConfigurableValue"; -import type { ConfigurableValueType } from "./ConfigurableValueType"; - -export interface SettingManifest { setting_id: string, name: string, description: string, value: ConfigurableValue | null, value_type: ConfigurableValueType, default_value: ConfigurableValue | null, is_secret: boolean, is_required: boolean, is_mutable: boolean, } \ No newline at end of file diff --git a/src/bindings/SettingManifestValue.ts b/src/bindings/SettingManifestValue.ts deleted file mode 100644 index 13b8de37..00000000 --- a/src/bindings/SettingManifestValue.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { ConfigurableValue } from "./ConfigurableValue"; - -export interface SettingManifestValue { value: ConfigurableValue | null, } \ No newline at end of file diff --git a/src/utils/apis.ts b/src/utils/apis.ts index 59fe4b1b..1a0beb02 100644 --- a/src/utils/apis.ts +++ b/src/utils/apis.ts @@ -378,37 +378,31 @@ export const openPort = async (port: number) => { * Start Tasks/Macro API ***********************/ -export const getTasks = async ( - queryClient: QueryClient, - uuid: string, - ) => { +export const getTasks = async (uuid: string,) => { const taskList = axiosWrapper({ method: 'get', url: `/instance/${uuid}/task/list`, }); - queryClient.setQueryData(['instance', uuid, 'taskList'], taskList); + + return taskList; }; -export const getMacros = async ( - queryClient: QueryClient, - uuid: string, - ) => { +export const getMacros = async (uuid: string,) => { const macroList = await axiosWrapper({ method: 'get', url: `/instance/${uuid}/macro/list`, }); - queryClient.setQueryData(['instance', uuid, 'macroList'], macroList); + + return macroList; }; -export const getInstanceHistory = async ( - queryClient: QueryClient, - uuid: string, - ) => { +export const getInstanceHistory = async (uuid: string,) => { const historyList = await axiosWrapper({ method: 'get', url: `/instance/${uuid}/history/list`, }); - queryClient.setQueryData(['instance', uuid, 'instanceHistory'], historyList); + + return historyList; }; export const createTask = async ( @@ -427,7 +421,6 @@ export const createTask = async ( ); }; - /*********************** * End Tasks/Macro API ***********************/ \ No newline at end of file From 7140d81c9eb0615199f7f2227251075f4eb2095b Mon Sep 17 00:00:00 2001 From: kevinzhangTT Date: Sun, 26 Mar 2023 00:46:14 -0400 Subject: [PATCH 026/108] menu button is customizable prop --- src/components/ButtonMenu.tsx | 51 ++++++++++++++++ src/components/Instance/InstanceOverview.tsx | 64 +++++++++++++++++++- src/components/Table.tsx | 57 +++++++++-------- 3 files changed, 145 insertions(+), 27 deletions(-) create mode 100644 src/components/ButtonMenu.tsx diff --git a/src/components/ButtonMenu.tsx b/src/components/ButtonMenu.tsx new file mode 100644 index 00000000..2f4825a5 --- /dev/null +++ b/src/components/ButtonMenu.tsx @@ -0,0 +1,51 @@ +import { Menu } from '@headlessui/react'; +import Button from './Atoms/Button'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import { IconDefinition } from '@fortawesome/free-solid-svg-icons'; + +import { faEllipsisVertical } from '@fortawesome/free-solid-svg-icons'; + +interface MenuItemProperty { + className?: string; + label: string; + icon: IconDefinition; + variant?: 'contained' | 'text'; + intention?: 'none' | 'info' | 'danger' | 'primary'; + disabled: boolean; + onClick: (event: React.MouseEvent) => void; +} + +export interface MenuItemProps { + menuItems: MenuItemProperty[]; +} + +export default function ButtonMenu({ menuItems }: MenuItemProps) { + + return ( + + + +
+ {menuItems.map((menuItem, index) => ( + +
+ + + ) +} diff --git a/src/components/Instance/InstanceOverview.tsx b/src/components/Instance/InstanceOverview.tsx index d0c449aa..962e1e94 100644 --- a/src/components/Instance/InstanceOverview.tsx +++ b/src/components/Instance/InstanceOverview.tsx @@ -16,6 +16,9 @@ import InstancePlayerList from './InstancePlayerList'; import { Table } from 'components/Table'; +import { faEllipsisVertical } from '@fortawesome/free-solid-svg-icons'; +import { MenuItemProps } from 'components/ButtonMenu'; + export interface TableColumn { field: string; headerName: string; @@ -26,6 +29,17 @@ export interface TableRow { [key: string]: React.ReactNode; } +interface FilmCameraRow { + id: number; + make: string; + model: string; + lens: string; + aperture: string; + shutterSpeed: string; + format: string; + year: number; +} + const InstanceOverview = () => { useDocumentTitle('Dashboard - Lodestone'); const { core } = useContext(LodestoneContext); @@ -88,6 +102,54 @@ const InstanceOverview = () => { { id: 3, name: 'Bob', age: 45, city: 'Chicago' }, ]; + const columnsAnalog: TableColumn[] = [ + { field: 'make', headerName: 'Make' }, + { field: 'model', headerName: 'Model' }, + { field: 'lens', headerName: 'Lens' }, + { field: 'format', headerName: 'Format' }, + { field: 'year', headerName: 'Year' }, + ]; + + const rowsAnalog1: TableRow[] = [ + { id: 1, make: 'Nikon', model: 'FM2', lens: '50mm f/1.8', format: '35mm', year: 1982 }, + { id: 2, make: 'Canon', model: 'AE-1', lens: '50mm f/1.4', format: '35mm', year: 1976 }, + { id: 3, make: 'Pentax', model: 'K1000', lens: '50mm f/2.0', format: '35mm', year: 1976 }, + { id: 1, make: 'Nikon', model: 'FM2', lens: '50mm f/1.8', format: '35mm', year: 1982 }, + { id: 2, make: 'Canon', model: 'AE-1', lens: '50mm f/1.4', format: '35mm', year: 1976 }, + ]; + + const rowsAnalog2: TableRow[] = [ + { id: 1, make: 'Nikon', model: 'FM2', lens: '50mm f/1.8', format: '35mm', year: 1982 }, + { id: 2, make: 'Canon', model: 'AE-1', lens: '50mm f/1.4', format: '35mm', year: 1976 }, + { id: 3, make: 'Pentax', model: 'K1000', lens: '50mm f/2.0', format: '35mm', year: 1976 }, + { id: 4, make: 'Mamiya', model: 'RB67', lens: '127mm f/3.8', format: '120', year: 1970 }, + { id: 5, make: 'Hasselblad', model: '500CM', lens: '80mm f/2.8', format: '120', year: 1957 }, + { id: 6, make: 'Leica', model: 'M6', lens: '35mm f/2.0', format: '35mm', year: 1984 }, + { id: 7, make: 'Fuji', model: 'GW690III', lens: '90mm f/3.5', format: '120', year: 1980 }, + { id: 8, make: 'Minolta', model: 'X-700', lens: '50mm f/1.7', format: '35mm', year: 1981 }, + ]; + + const menuItems1: MenuItemProps = { + menuItems: [ + { + label: 'Edit in file viewer', + icon: faEllipsisVertical, + variant: 'text', + intention: 'info', + disabled: false, + onClick: () => console.log('Button 1 clicked'), + }, + { + label: 'Delete', + icon: faEllipsisVertical, + variant: 'text', + intention: 'danger', + disabled: false, + onClick: () => console.log('Button 2 clicked'), + }, + ] + }; + return ( <>
{
- +
); diff --git a/src/components/Table.tsx b/src/components/Table.tsx index c7b005ec..87142e22 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -1,9 +1,8 @@ import * as React from 'react'; -import {cn} from "../utils/util"; import clsx from "clsx"; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { faEllipsisVertical } from '@fortawesome/free-solid-svg-icons'; +import Menu from './ButtonMenu'; +import { MenuItemProps } from './ButtonMenu'; export interface TableColumn { field: string; @@ -15,15 +14,18 @@ export interface TableRow { [key: string]: React.ReactNode; } -interface CardProps { +interface TableProps { rows: TableRow[]; columns: TableColumn[]; + menuOptions?: MenuItemProps; className?: string; } -export function Table({rows, columns, className}: CardProps) { +export function Table({rows, columns, menuOptions, className}: TableProps) { + + return ( -
+
{columns.map((column, cIndex) => ( @@ -36,27 +38,30 @@ export function Table({rows, columns, className}: CardProps) { - {rows.map((row, index) => { - return ( - - {columns.map((column, cIndex) => ( - - ))} - + {columns.map((column, cIndex) => ( + + ))} + - - ) - })} + + ) + })} +
- {row[column.field]} - - + {rows.map((row, index) => { + return ( +
+ {row[column.field]} + + {menuOptions ? ( + + ) : null}
); -} \ No newline at end of file +} From f1478c042d801dac19e58970af21bba7fe616f88 Mon Sep 17 00:00:00 2001 From: kevinzhangTT Date: Sun, 26 Mar 2023 03:12:22 -0400 Subject: [PATCH 027/108] just changed icons for dummy menu items --- src/components/ButtonMenu.tsx | 1 - src/components/Instance/InstanceOverview.tsx | 21 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/components/ButtonMenu.tsx b/src/components/ButtonMenu.tsx index 2f4825a5..0e5a9917 100644 --- a/src/components/ButtonMenu.tsx +++ b/src/components/ButtonMenu.tsx @@ -20,7 +20,6 @@ export interface MenuItemProps { } export default function ButtonMenu({ menuItems }: MenuItemProps) { - return ( { { id: 1, make: 'Nikon', model: 'FM2', lens: '50mm f/1.8', format: '35mm', year: 1982 }, { id: 2, make: 'Canon', model: 'AE-1', lens: '50mm f/1.4', format: '35mm', year: 1976 }, { id: 3, make: 'Pentax', model: 'K1000', lens: '50mm f/2.0', format: '35mm', year: 1976 }, - { id: 1, make: 'Nikon', model: 'FM2', lens: '50mm f/1.8', format: '35mm', year: 1982 }, - { id: 2, make: 'Canon', model: 'AE-1', lens: '50mm f/1.4', format: '35mm', year: 1976 }, + { id: 4, make: 'Mamiya', model: 'RB67', lens: '127mm f/3.8', format: '120', year: 1970 }, + { id: 5, make: 'Hasselblad', model: '500CM', lens: '80mm f/2.8', format: '120', year: 1957 }, + { id: 6, make: 'Leica', model: 'M6', lens: '35mm f/2.0', format: '35mm', year: 1984 }, ]; const rowsAnalog2: TableRow[] = [ @@ -133,15 +134,23 @@ const InstanceOverview = () => { menuItems: [ { label: 'Edit in file viewer', - icon: faEllipsisVertical, + icon: faEdit, + variant: 'text', + intention: 'info', + disabled: false, + onClick: () => console.log('Button 1 clicked'), + }, + { + label: 'why the fuck is this justified start', + icon: faSkull, variant: 'text', intention: 'info', disabled: false, onClick: () => console.log('Button 1 clicked'), }, { - label: 'Delete', - icon: faEllipsisVertical, + label: 'Obliterate', + icon: faTrashCan, variant: 'text', intention: 'danger', disabled: false, From b2d2726d7a473d8eaaab0d1eb0bb943037202a54 Mon Sep 17 00:00:00 2001 From: Dan S Date: Mon, 27 Mar 2023 22:50:13 -0600 Subject: [PATCH 028/108] add missing await --- src/utils/apis.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/apis.ts b/src/utils/apis.ts index 1a0beb02..358aead0 100644 --- a/src/utils/apis.ts +++ b/src/utils/apis.ts @@ -379,7 +379,7 @@ export const openPort = async (port: number) => { ***********************/ export const getTasks = async (uuid: string,) => { - const taskList = axiosWrapper({ + const taskList = await axiosWrapper({ method: 'get', url: `/instance/${uuid}/task/list`, }); From 669e5a1a91be3bcf3ffdc0b41e90201b324af49b Mon Sep 17 00:00:00 2001 From: kevinzhangTT Date: Tue, 28 Mar 2023 05:53:55 -0400 Subject: [PATCH 029/108] menu button is added in last column if menu prop is truthy --- src/components/ButtonMenu.tsx | 7 +++- src/components/Instance/InstanceOverview.tsx | 13 +------ src/components/Table.tsx | 41 +++++++++++--------- 3 files changed, 28 insertions(+), 33 deletions(-) diff --git a/src/components/ButtonMenu.tsx b/src/components/ButtonMenu.tsx index 0e5a9917..2217f220 100644 --- a/src/components/ButtonMenu.tsx +++ b/src/components/ButtonMenu.tsx @@ -27,7 +27,10 @@ export default function ButtonMenu({ menuItems }: MenuItemProps) { icon={faEllipsisVertical} className="h-4 w-4 select-none text-h2 text-white/50 hover:cursor-pointer hover:text-white/75" /> - +
{menuItems.map((menuItem, index) => ( @@ -46,5 +49,5 @@ export default function ButtonMenu({ menuItems }: MenuItemProps) {
- ) + ); } diff --git a/src/components/Instance/InstanceOverview.tsx b/src/components/Instance/InstanceOverview.tsx index 9506d641..d1e2c59b 100644 --- a/src/components/Instance/InstanceOverview.tsx +++ b/src/components/Instance/InstanceOverview.tsx @@ -14,21 +14,10 @@ import { useGlobalSettings } from 'data/GlobalSettings'; import { useDocumentTitle } from 'usehooks-ts'; import InstancePlayerList from './InstancePlayerList'; -import { Table } from 'components/Table'; - +import { Table, TableColumn, TableRow } from 'components/Table'; import { faTrashCan, faEdit, faSkull } from '@fortawesome/free-solid-svg-icons'; import { MenuItemProps } from 'components/ButtonMenu'; -export interface TableColumn { - field: string; - headerName: string; - className?: string; -} - -export interface TableRow { - [key: string]: React.ReactNode; -} - interface FilmCameraRow { id: number; make: string; diff --git a/src/components/Table.tsx b/src/components/Table.tsx index 87142e22..670c471b 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -7,6 +7,7 @@ import { MenuItemProps } from './ButtonMenu'; export interface TableColumn { field: string; headerName: string; + element?: (row: TableRow) => React.ReactElement; className?: string; } @@ -22,15 +23,23 @@ interface TableProps { } export function Table({rows, columns, menuOptions, className}: TableProps) { + // If menuOptions is truthy, add an extra column for the menu buttons + const modifiedColumns = menuOptions ? [...columns, { + field: 'menu', + headerName: '', + element: () => , + className: 'text-end', + }] : columns; - return ( - {columns.map((column, cIndex) => ( - ) @@ -38,29 +47,23 @@ export function Table({rows, columns, menuOptions, className}: TableProps) { - {rows.map((row, index) => { + {rows.map((row, indexRow) => { return ( - {columns.map((column, cIndex) => ( - ))} - ) })} -
+ {modifiedColumns.map((column, cIndex) => ( + {column.headerName}
- {row[column.field]} + {modifiedColumns.map((column, indexColumn) => ( + + {column.element ? column.element(row) : row[column.field]} - {menuOptions ? ( - - ) : null} -
); From 3654b05e4b706974db7dc567d259becb56316197 Mon Sep 17 00:00:00 2001 From: kevinzhangTT Date: Tue, 28 Mar 2023 06:13:39 -0400 Subject: [PATCH 030/108] changed position of popup menu to be left of button, rather than below --- src/components/ButtonMenu.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/ButtonMenu.tsx b/src/components/ButtonMenu.tsx index 2217f220..ba0e1f45 100644 --- a/src/components/ButtonMenu.tsx +++ b/src/components/ButtonMenu.tsx @@ -2,7 +2,6 @@ import { Menu } from '@headlessui/react'; import Button from './Atoms/Button'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { IconDefinition } from '@fortawesome/free-solid-svg-icons'; - import { faEllipsisVertical } from '@fortawesome/free-solid-svg-icons'; interface MenuItemProperty { @@ -28,7 +27,7 @@ export default function ButtonMenu({ menuItems }: MenuItemProps) { className="h-4 w-4 select-none text-h2 text-white/50 hover:cursor-pointer hover:text-white/75" />
From a590d144f37ee6904f572588d8200d1076e8c4e5 Mon Sep 17 00:00:00 2001 From: kevinzhangTT Date: Tue, 28 Mar 2023 06:35:56 -0400 Subject: [PATCH 031/108] added ability to use whatever fontawesome icon for the menu button --- src/components/ButtonMenu.tsx | 7 ++++--- src/components/Table.tsx | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/ButtonMenu.tsx b/src/components/ButtonMenu.tsx index ba0e1f45..21fc08e2 100644 --- a/src/components/ButtonMenu.tsx +++ b/src/components/ButtonMenu.tsx @@ -16,14 +16,15 @@ interface MenuItemProperty { export interface MenuItemProps { menuItems: MenuItemProperty[]; + buttonIcon?: IconDefinition; } -export default function ButtonMenu({ menuItems }: MenuItemProps) { +export default function ButtonMenu({ menuItems, buttonIcon = faEllipsisVertical }: MenuItemProps) { return ( diff --git a/src/components/Table.tsx b/src/components/Table.tsx index 670c471b..8fd72247 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import clsx from "clsx"; -import Menu from './ButtonMenu'; +import ButtonMenu from './ButtonMenu'; import { MenuItemProps } from './ButtonMenu'; export interface TableColumn { @@ -27,7 +27,7 @@ export function Table({rows, columns, menuOptions, className}: TableProps) { const modifiedColumns = menuOptions ? [...columns, { field: 'menu', headerName: '', - element: () => , + element: () => , className: 'text-end', }] : columns; From 4c4928b2391bad3dda8cc73dc5278af3aed0dd5e Mon Sep 17 00:00:00 2001 From: kevinzhangTT Date: Wed, 29 Mar 2023 20:27:28 -0400 Subject: [PATCH 032/108] change name of props types and clean up code a lil --- src/components/ButtonMenu.tsx | 4 +- src/components/Instance/InstanceOverview.tsx | 15 +------- src/components/Table.tsx | 40 ++++++++++---------- 3 files changed, 23 insertions(+), 36 deletions(-) diff --git a/src/components/ButtonMenu.tsx b/src/components/ButtonMenu.tsx index 21fc08e2..14663884 100644 --- a/src/components/ButtonMenu.tsx +++ b/src/components/ButtonMenu.tsx @@ -14,12 +14,12 @@ interface MenuItemProperty { onClick: (event: React.MouseEvent) => void; } -export interface MenuItemProps { +export interface ButtonMenuProps { menuItems: MenuItemProperty[]; buttonIcon?: IconDefinition; } -export default function ButtonMenu({ menuItems, buttonIcon = faEllipsisVertical }: MenuItemProps) { +export default function ButtonMenu({ menuItems, buttonIcon = faEllipsisVertical }: ButtonMenuProps) { return ( { useDocumentTitle('Dashboard - Lodestone'); @@ -119,7 +108,7 @@ const InstanceOverview = () => { { id: 8, make: 'Minolta', model: 'X-700', lens: '50mm f/1.7', format: '35mm', year: 1981 }, ]; - const menuItems1: MenuItemProps = { + const menuItems1: ButtonMenuProps = { menuItems: [ { label: 'Edit in file viewer', diff --git a/src/components/Table.tsx b/src/components/Table.tsx index 8fd72247..5d6a5fab 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import clsx from "clsx"; import ButtonMenu from './ButtonMenu'; -import { MenuItemProps } from './ButtonMenu'; +import { ButtonMenuProps } from './ButtonMenu'; export interface TableColumn { field: string; @@ -18,7 +18,7 @@ export interface TableRow { interface TableProps { rows: TableRow[]; columns: TableColumn[]; - menuOptions?: MenuItemProps; + menuOptions?: ButtonMenuProps; className?: string; } @@ -30,9 +30,9 @@ export function Table({rows, columns, menuOptions, className}: TableProps) { element: () => , className: 'text-end', }] : columns; - + return ( - +
{modifiedColumns.map((column, cIndex) => ( @@ -47,23 +47,21 @@ export function Table({rows, columns, menuOptions, className}: TableProps) { - {rows.map((row, indexRow) => { - return ( - - {modifiedColumns.map((column, indexColumn) => ( - - ))} - - ) - })} + {rows.map((row, indexRow) => ( + + {modifiedColumns.map((column, indexColumn) => ( + + ))} + + ))}
- {column.element ? column.element(row) : row[column.field]} -
+ {column.element ? column.element(row) : row[column.field]} +
); From 8f9c22291ed121a1dda7d5a775a1ddaea3e06b27 Mon Sep 17 00:00:00 2001 From: kevinzhangTT Date: Wed, 29 Mar 2023 23:44:25 -0400 Subject: [PATCH 033/108] fixed spacings and button justification --- src/components/Atoms/Button.tsx | 11 +++--- src/components/Instance/InstanceOverview.tsx | 37 ++++++++------------ src/components/Table.tsx | 21 +++++------ 3 files changed, 30 insertions(+), 39 deletions(-) diff --git a/src/components/Atoms/Button.tsx b/src/components/Atoms/Button.tsx index 701ae411..c4eb0dfe 100644 --- a/src/components/Atoms/Button.tsx +++ b/src/components/Atoms/Button.tsx @@ -1,6 +1,6 @@ import { IconDefinition } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { DOMAttributes, forwardRef } from 'react'; +import { forwardRef } from 'react'; import clsx from 'clsx'; import { BeatLoader } from 'react-spinners'; import { cva, VariantProps } from 'class-variance-authority'; @@ -70,7 +70,7 @@ export interface ButtonProps extends VariantProps { onClick?: (event: React.MouseEvent) => void; type?: 'button' | 'submit' | 'reset'; iconComponent?: React.ReactNode; - icon?: IconDefinition; + iconLeft?: IconDefinition; iconRight?: IconDefinition; labelGrow?: boolean; form?: string; @@ -90,7 +90,7 @@ const Button = forwardRef( variant, className, iconComponent, - icon, + iconLeft, iconRight, labelGrow = false, type = 'button', @@ -110,7 +110,7 @@ const Button = forwardRef( {...props} > {iconComponent} - {icon && } + {iconLeft && }
{label}
- {iconRight && ( - + )} ); diff --git a/src/components/Instance/InstanceOverview.tsx b/src/components/Instance/InstanceOverview.tsx index 178396ce..7bc21b3d 100644 --- a/src/components/Instance/InstanceOverview.tsx +++ b/src/components/Instance/InstanceOverview.tsx @@ -68,41 +68,32 @@ const InstanceOverview = () => { })); }; - const columns: TableColumn[] = [ - { field: 'name', headerName: 'Name' }, - { field: 'age', headerName: 'Age' }, - { field: 'city', headerName: 'City', className: 'column-city' }, + const columnsBasic: TableColumn[] = [ + { field: 'name', headerName: 'NAME' }, + { field: 'age', headerName: 'AGE' }, + { field: 'city', headerName: 'CITY' }, ]; - const rows: TableRow[] = [ + const rowsBasic: TableRow[] = [ { id: 1, name: 'John', age: 30, city: 'New York' }, { id: 2, name: 'Jane', age: 25, city: 'Los Angeles' }, { id: 3, name: 'Bob', age: 45, city: 'Chicago' }, ]; const columnsAnalog: TableColumn[] = [ - { field: 'make', headerName: 'Make' }, - { field: 'model', headerName: 'Model' }, - { field: 'lens', headerName: 'Lens' }, - { field: 'format', headerName: 'Format' }, - { field: 'year', headerName: 'Year' }, + { field: 'make', headerName: 'MAKE' }, + { field: 'model', headerName: 'MODEL' }, + { field: 'lens', headerName: 'LENS' }, + { field: 'format', headerName: 'FORMAT' }, + { field: 'year', headerName: 'YEAR' }, ]; - const rowsAnalog1: TableRow[] = [ + const rowsAnalog: TableRow[] = [ { id: 1, make: 'Nikon', model: 'FM2', lens: '50mm f/1.8', format: '35mm', year: 1982 }, { id: 2, make: 'Canon', model: 'AE-1', lens: '50mm f/1.4', format: '35mm', year: 1976 }, { id: 3, make: 'Pentax', model: 'K1000', lens: '50mm f/2.0', format: '35mm', year: 1976 }, { id: 4, make: 'Mamiya', model: 'RB67', lens: '127mm f/3.8', format: '120', year: 1970 }, - { id: 5, make: 'Hasselblad', model: '500CM', lens: '80mm f/2.8', format: '120', year: 1957 }, - { id: 6, make: 'Leica', model: 'M6', lens: '35mm f/2.0', format: '35mm', year: 1984 }, - ]; - - const rowsAnalog2: TableRow[] = [ - { id: 1, make: 'Nikon', model: 'FM2', lens: '50mm f/1.8', format: '35mm', year: 1982 }, - { id: 2, make: 'Canon', model: 'AE-1', lens: '50mm f/1.4', format: '35mm', year: 1976 }, - { id: 3, make: 'Pentax', model: 'K1000', lens: '50mm f/2.0', format: '35mm', year: 1976 }, - { id: 4, make: 'Mamiya', model: 'RB67', lens: '127mm f/3.8', format: '120', year: 1970 }, - { id: 5, make: 'Hasselblad', model: '500CM', lens: '80mm f/2.8', format: '120', year: 1957 }, + { id: 5, make: 'Hasselblad Hasselblad Hasselblad', model: '500CM', lens: '80mm f/2.8', format: '120', year: 1957 }, { id: 6, make: 'Leica', model: 'M6', lens: '35mm f/2.0', format: '35mm', year: 1984 }, { id: 7, make: 'Fuji', model: 'GW690III', lens: '90mm f/3.5', format: '120', year: 1980 }, { id: 8, make: 'Minolta', model: 'X-700', lens: '50mm f/1.7', format: '35mm', year: 1981 }, @@ -119,7 +110,7 @@ const InstanceOverview = () => { onClick: () => console.log('Button 1 clicked'), }, { - label: 'why the fuck is this justified start', + label: 'another one', icon: faSkull, variant: 'text', intention: 'info', @@ -185,7 +176,7 @@ const InstanceOverview = () => {
- +
); diff --git a/src/components/Table.tsx b/src/components/Table.tsx index 5d6a5fab..dc945e57 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -18,11 +18,13 @@ export interface TableRow { interface TableProps { rows: TableRow[]; columns: TableColumn[]; + alignment?: 'auto' | 'left' | 'right'; menuOptions?: ButtonMenuProps; className?: string; } -export function Table({rows, columns, menuOptions, className}: TableProps) { +export function Table({rows, columns, alignment = 'auto', menuOptions, className}: TableProps) { + // If menuOptions is truthy, add an extra column for the menu buttons const modifiedColumns = menuOptions ? [...columns, { field: 'menu', @@ -32,30 +34,29 @@ export function Table({rows, columns, menuOptions, className}: TableProps) { }] : columns; return ( -
+
- - {modifiedColumns.map((column, cIndex) => ( + + {modifiedColumns.map((column, cIndex) => ( - ) - )} - + ))} + {rows.map((row, indexRow) => ( {modifiedColumns.map((column, indexColumn) => ( From 1ec6d39e0f646ce8ba5c49cc15f24cd02cd37af4 Mon Sep 17 00:00:00 2001 From: kevinzhangTT Date: Wed, 29 Mar 2023 23:59:01 -0400 Subject: [PATCH 034/108] fixed typo and minor grammar change --- src/components/Settings/CoreSettings.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Settings/CoreSettings.tsx b/src/components/Settings/CoreSettings.tsx index ef594735..4b26c191 100644 --- a/src/components/Settings/CoreSettings.tsx +++ b/src/components/Settings/CoreSettings.tsx @@ -212,9 +212,9 @@ export const CoreSettings = () => { closeButtonText="Cancel" type={'info'} > - Are you sure you want to turn off safe mode? This will allow all you to + Are you sure you want to turn off safe mode? This will allow you to give users other than yourself the ability to run potentially dangerous - commands. Make sure you trust all users you give these permissions to + commands. Make sure you trust all the users you give these permissions to. {openPortModal}
From 919c86cbb14cf80810102795daa600d4179136f1 Mon Sep 17 00:00:00 2001 From: ViridianCitrus Date: Tue, 21 Mar 2023 22:13:15 -0400 Subject: [PATCH 035/108] Move tablist to leftnav --- .../DashboardLayout/SettingsLeftNav.tsx | 92 +++++++++++++++---- 1 file changed, 76 insertions(+), 16 deletions(-) diff --git a/src/components/DashboardLayout/SettingsLeftNav.tsx b/src/components/DashboardLayout/SettingsLeftNav.tsx index a6c2ee2b..8d45cb2f 100644 --- a/src/components/DashboardLayout/SettingsLeftNav.tsx +++ b/src/components/DashboardLayout/SettingsLeftNav.tsx @@ -1,12 +1,31 @@ -import { useContext } from 'react'; +import { useContext, useState } from 'react'; import Button from 'components/Atoms/Button'; -import { faXmark } from '@fortawesome/free-solid-svg-icons'; +import { faXmark, faServer, faRightToBracket } from '@fortawesome/free-solid-svg-icons'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { BrowserLocationContext } from 'data/BrowserLocationContext'; import { RadioGroup } from '@headlessui/react'; import { SettingsContext } from 'data/SettingsContext'; import Avatar from 'components/Atoms/Avatar'; import clsx from 'clsx'; import { useUid } from 'data/UserInfo'; +import CoreSettings from 'components/Settings/CoreSettings'; +import UserSettings from 'components/Settings/UserSettings'; + + +export const tabList = [ + { + title: 'General', + path: 'general', + content: , + }, + { + title: 'Users', + path: 'users', + content: , + }, +]; + +// const [setActive, setActiveTab] = useState(location.pathname.split('/')[2]); export default function SettingsLeftNav({ className }: { className?: string }) { const { setPathname, setSearchParam } = useContext(BrowserLocationContext); @@ -16,7 +35,59 @@ export default function SettingsLeftNav({ className }: { className?: string }) { return (
- {selectedUser ? ( + + + + + + CORE + + {tabList.map((setting) => ( + + + + )) } + + {(
); From c7f9a767350c0a86fabfadf0c50ff3c5d13021b9 Mon Sep 17 00:00:00 2001 From: ViridianCitrus Date: Wed, 22 Mar 2023 22:47:01 -0400 Subject: [PATCH 036/108] Add routing and pill selection highlight --- pages/index.tsx | 9 +++++ .../DashboardLayout/SettingsLayout.tsx | 12 +++---- .../DashboardLayout/SettingsLeftNav.tsx | 33 +++++++++---------- src/components/Settings/CoreSettings.tsx | 9 +++-- src/components/Settings/UserSettings.tsx | 7 ++++ src/components/UserMenu.tsx | 2 +- src/data/SettingsContext.ts | 4 +-- src/pages/settings.tsx | 2 +- 8 files changed, 48 insertions(+), 30 deletions(-) diff --git a/pages/index.tsx b/pages/index.tsx index 8a98ff6f..0cfd879b 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -44,6 +44,7 @@ import { toast } from 'react-toastify'; import RequireSetup from 'utils/router/RequireSetup'; import InstanceTabs from 'pages/InstanceTabs/InstanceTabs'; import ProfilePage from 'pages/profile'; +import { tabList } from 'components/DashboardLayout/SettingsLeftNav'; const queryClient = new QueryClient({ defaultOptions: { @@ -303,6 +304,14 @@ export default function App() { }> } /> } /> + {/* } /> */} + {tabList.map((tab, i) => ( + + ))} } /> diff --git a/src/components/DashboardLayout/SettingsLayout.tsx b/src/components/DashboardLayout/SettingsLayout.tsx index e3541115..30a0d66f 100644 --- a/src/components/DashboardLayout/SettingsLayout.tsx +++ b/src/components/DashboardLayout/SettingsLayout.tsx @@ -18,21 +18,21 @@ export const SettingsLayout = () => { const [leftNavSize, setLeftNavSize] = useLocalStorage('leftNavSize', 220); /* Start userList */ const [queryUid, setQueryUid] = useQueryParam('user', ''); - const [selectedUser, setSelectedUser] = useState( - undefined + const [selectedUser, setSelectedUser] = useState( + null ); const userList = canManageUsers ? dataUserList : undefined; useEffect(() => { if (queryUid && userList && queryUid in userList) setSelectedUser(userList[queryUid]); - else setSelectedUser(undefined); + else setSelectedUser(null); }, [userList, queryUid]); - function selectUser(user?: PublicUser) { + function selectUser(user: PublicUser | null) { console.log('selectUser', user); - if (user === undefined) { - setSelectedUser(undefined); + if (user === null) { + setSelectedUser(null); setQueryUid(''); } else { setSelectedUser(user); diff --git a/src/components/DashboardLayout/SettingsLeftNav.tsx b/src/components/DashboardLayout/SettingsLeftNav.tsx index 8d45cb2f..a0665373 100644 --- a/src/components/DashboardLayout/SettingsLeftNav.tsx +++ b/src/components/DashboardLayout/SettingsLeftNav.tsx @@ -1,4 +1,4 @@ -import { useContext, useState } from 'react'; +import { useContext, useState, useEffect } from 'react'; import Button from 'components/Atoms/Button'; import { faXmark, faServer, faRightToBracket } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; @@ -25,13 +25,17 @@ export const tabList = [ }, ]; -// const [setActive, setActiveTab] = useState(location.pathname.split('/')[2]); - export default function SettingsLeftNav({ className }: { className?: string }) { + const [setActive, setActiveTab] = useState(location.pathname.split('/')[2]); const { setPathname, setSearchParam } = useContext(BrowserLocationContext); - const { userList, selectedUser, selectUser, tabIndex } = - useContext(SettingsContext); + const { userList, selectedUser, selectUser} = + useContext(SettingsContext); const uid = useUid(); + + useEffect(() => { + setActiveTab(location.pathname.split('/')[2]); + }, [location.pathname]); + return (
@@ -55,9 +59,7 @@ export default function SettingsLeftNav({ className }: { className?: string }) { @@ -66,7 +68,7 @@ export default function SettingsLeftNav({ className }: { className?: string }) { {tabList.map((setting) => ( @@ -92,7 +94,7 @@ export default function SettingsLeftNav({ className }: { className?: string }) { label="Unselect User" icon={faXmark} onClick={() => { - selectUser(undefined); + selectUser(null); }} className="ml-2" /> @@ -103,9 +105,6 @@ export default function SettingsLeftNav({ className }: { className?: string }) { onChange={selectUser} className="-mx-1.5 flex min-h-0 w-full flex-col items-stretch gap-1 overflow-y-auto px-3 py-1" > - - Select a user - {Object.values(userList) .sort((a, b) => a.uid === uid diff --git a/src/components/Settings/CoreSettings.tsx b/src/components/Settings/CoreSettings.tsx index 4b26c191..b5adfff0 100644 --- a/src/components/Settings/CoreSettings.tsx +++ b/src/components/Settings/CoreSettings.tsx @@ -217,9 +217,12 @@ export const CoreSettings = () => { commands. Make sure you trust all the users you give these permissions to. {openPortModal} -
-
-

Core Settings

+ +
+
+
+

Core Settings

+

These settings are for the core itself. They are not specific to any user diff --git a/src/components/Settings/UserSettings.tsx b/src/components/Settings/UserSettings.tsx index b177ee81..ffba1386 100644 --- a/src/components/Settings/UserSettings.tsx +++ b/src/components/Settings/UserSettings.tsx @@ -327,6 +327,11 @@ export const UserSettings = () => {

+
+
+
+

Core Settings

+
{UserBoxes} {UserPermissions(NormalPermissions, false)} {selectedUser && ( @@ -349,6 +354,8 @@ export const UserSettings = () => {
)} +
+
{/* TODO: your own section */} ); diff --git a/src/components/UserMenu.tsx b/src/components/UserMenu.tsx index 5148c325..1bb39526 100644 --- a/src/components/UserMenu.tsx +++ b/src/components/UserMenu.tsx @@ -120,7 +120,7 @@ const UserMenu = () => { icon={faCog} onClick={() => { localStorage.setItem('lastVisitedRoute', location.pathname); - setPathname('/settings'); + setPathname('/settings/general'); }} />
diff --git a/src/data/SettingsContext.ts b/src/data/SettingsContext.ts index 1ad9df36..fbf2d7a5 100644 --- a/src/data/SettingsContext.ts +++ b/src/data/SettingsContext.ts @@ -3,8 +3,8 @@ import { PublicUser } from '../bindings/PublicUser'; interface SettingsContextType { userList: { [uuid: string]: PublicUser }; - selectedUser?: PublicUser; - selectUser: (user?: PublicUser) => void; + selectedUser?: PublicUser | null; + selectUser: (user: PublicUser|null) => void; tabIndex: number; setTabIndex: (index: number) => void; } diff --git a/src/pages/settings.tsx b/src/pages/settings.tsx index b0b463ad..72618914 100644 --- a/src/pages/settings.tsx +++ b/src/pages/settings.tsx @@ -5,7 +5,7 @@ import CoreSettings from 'components/Settings/CoreSettings'; import UserSettings from 'components/Settings/UserSettings'; import { SettingsContext } from 'data/SettingsContext'; import { useDocumentTitle } from 'usehooks-ts'; - +//------------------------------!!!!!! NO LONGER IN USE !!!!!!!------------------------------------- const SettingsPage = () => { useDocumentTitle('Core Settings - Lodestone'); const { tabIndex, setTabIndex, selectUser } = useContext(SettingsContext); From c06ba4e90fa5aebdd954027556f595f84fa1cd63 Mon Sep 17 00:00:00 2001 From: ViridianCitrus Date: Thu, 23 Mar 2023 19:33:19 -0400 Subject: [PATCH 037/108] fix error --- src/pages/settings.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings.tsx b/src/pages/settings.tsx index 72618914..2b3bd76b 100644 --- a/src/pages/settings.tsx +++ b/src/pages/settings.tsx @@ -33,7 +33,7 @@ const SettingsPage = () => { onChange={(i) => { setTabIndex(i); if (i !== 1) { - selectUser(undefined); + selectUser(null); } }} > From 97a8703e8eb17d97cd154e1c96eb484ef2409415 Mon Sep 17 00:00:00 2001 From: ViridianCitrus Date: Sat, 25 Mar 2023 12:53:55 -0400 Subject: [PATCH 038/108] update settings size --- src/components/DashboardLayout/SettingsLeftNav.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/DashboardLayout/SettingsLeftNav.tsx b/src/components/DashboardLayout/SettingsLeftNav.tsx index a0665373..16210e32 100644 --- a/src/components/DashboardLayout/SettingsLeftNav.tsx +++ b/src/components/DashboardLayout/SettingsLeftNav.tsx @@ -52,10 +52,10 @@ export default function SettingsLeftNav({ className }: { className?: string }) { setPathname(returnRoute || '/'); }} > -
+
-

Settings

+

Settings

Date: Wed, 29 Mar 2023 22:07:37 -0400 Subject: [PATCH 039/108] Fix width issue --- src/components/Settings/CoreSettings.tsx | 2 +- src/components/Settings/UserSettings.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Settings/CoreSettings.tsx b/src/components/Settings/CoreSettings.tsx index b5adfff0..d97810df 100644 --- a/src/components/Settings/CoreSettings.tsx +++ b/src/components/Settings/CoreSettings.tsx @@ -218,7 +218,7 @@ export const CoreSettings = () => { {openPortModal} -
+

Core Settings

diff --git a/src/components/Settings/UserSettings.tsx b/src/components/Settings/UserSettings.tsx index ffba1386..877fc342 100644 --- a/src/components/Settings/UserSettings.tsx +++ b/src/components/Settings/UserSettings.tsx @@ -327,7 +327,7 @@ export const UserSettings = () => {
-
+

Core Settings

From 04c8b4cbd62864766ba89afc36d5964bce30bd6f Mon Sep 17 00:00:00 2001 From: ViridianCitrus Date: Thu, 30 Mar 2023 00:05:20 -0400 Subject: [PATCH 040/108] Move tabList export --- pages/index.tsx | 17 ++++++++++++++++- .../DashboardLayout/SettingsLeftNav.tsx | 16 ++-------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/pages/index.tsx b/pages/index.tsx index 0cfd879b..0aed8202 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -44,7 +44,9 @@ import { toast } from 'react-toastify'; import RequireSetup from 'utils/router/RequireSetup'; import InstanceTabs from 'pages/InstanceTabs/InstanceTabs'; import ProfilePage from 'pages/profile'; -import { tabList } from 'components/DashboardLayout/SettingsLeftNav'; +import CoreSettings from 'components/Settings/CoreSettings'; +import UserSettings from 'components/Settings/UserSettings'; + const queryClient = new QueryClient({ defaultOptions: { @@ -64,6 +66,19 @@ const InstanceTabList = [ 'logs', ]; +export const tabList = [ + { + title: 'General', + path: 'general', + content: , + }, + { + title: 'Users', + path: 'users', + content: , + }, +]; + export default function App() { const { location, setSearchParam } = useContext(BrowserLocationContext); diff --git a/src/components/DashboardLayout/SettingsLeftNav.tsx b/src/components/DashboardLayout/SettingsLeftNav.tsx index 16210e32..1c956455 100644 --- a/src/components/DashboardLayout/SettingsLeftNav.tsx +++ b/src/components/DashboardLayout/SettingsLeftNav.tsx @@ -8,22 +8,10 @@ import { SettingsContext } from 'data/SettingsContext'; import Avatar from 'components/Atoms/Avatar'; import clsx from 'clsx'; import { useUid } from 'data/UserInfo'; -import CoreSettings from 'components/Settings/CoreSettings'; -import UserSettings from 'components/Settings/UserSettings'; +import { tabList } from '../../../pages'; + -export const tabList = [ - { - title: 'General', - path: 'general', - content: , - }, - { - title: 'Users', - path: 'users', - content: , - }, -]; export default function SettingsLeftNav({ className }: { className?: string }) { const [setActive, setActiveTab] = useState(location.pathname.split('/')[2]); From a37de289fc547a60ee7a9dea61c97b9ae554248b Mon Sep 17 00:00:00 2001 From: ViridianCitrus Date: Thu, 30 Mar 2023 20:03:01 -0400 Subject: [PATCH 041/108] Update settings options --- pages/index.tsx | 4 ++-- src/components/DashboardLayout/SettingsLeftNav.tsx | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pages/index.tsx b/pages/index.tsx index 0aed8202..45cc561f 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -66,7 +66,7 @@ const InstanceTabList = [ 'logs', ]; -export const tabList = [ +export const CoreSettingsTabList = [ { title: 'General', path: 'general', @@ -320,7 +320,7 @@ export default function App() { } /> } /> {/* } /> */} - {tabList.map((tab, i) => ( + {CoreSettingsTabList.map((tab, i) => ( CORE - {tabList.map((setting) => ( + {CoreSettingsTabList.map((setting) => ( {setting.title}
- )) } + ))} + + + ACCOUNT + {( + + ))} + {(
-
{column.headerName}
{column.element ? column.element(row) : row[column.field]}
+
+
); diff --git a/src/components/Table.tsx b/src/components/Table.tsx index dc945e57..5769da5c 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -18,29 +18,31 @@ export interface TableRow { interface TableProps { rows: TableRow[]; columns: TableColumn[]; - alignment?: 'auto' | 'left' | 'right'; + alignment?: 'even' | 'left'; menuOptions?: ButtonMenuProps; className?: string; } -export function Table({rows, columns, alignment = 'auto', menuOptions, className}: TableProps) { +export function Table({rows, columns, alignment = 'even', menuOptions, className}: TableProps) { // If menuOptions is truthy, add an extra column for the menu buttons + // If alignment === 'left', add 'w-full' to className const modifiedColumns = menuOptions ? [...columns, { field: 'menu', headerName: '', element: () => , - className: 'text-end', + className: `text-end ${alignment === 'left' ? 'w-full' : ''}`, }] : columns; + // Code currently uses arbitrary values for min and max width when alignment is set to left return ( -
+
{modifiedColumns.map((column, cIndex) => ( From 1207f781792e2be52526cab9cdc15f0f7c162d3c Mon Sep 17 00:00:00 2001 From: kevinzhangTT Date: Sun, 2 Apr 2023 00:15:21 -0400 Subject: [PATCH 048/108] removed test data for pr --- src/components/Instance/InstanceOverview.tsx | 88 -------------------- 1 file changed, 88 deletions(-) diff --git a/src/components/Instance/InstanceOverview.tsx b/src/components/Instance/InstanceOverview.tsx index d28418aa..6434269b 100644 --- a/src/components/Instance/InstanceOverview.tsx +++ b/src/components/Instance/InstanceOverview.tsx @@ -14,10 +14,6 @@ import { useGlobalSettings } from 'data/GlobalSettings'; import { useDocumentTitle } from 'usehooks-ts'; import InstancePlayerList from './InstancePlayerList'; -import { Table, TableColumn, TableRow } from 'components/Table'; -import { faTrashCan, faEdit, faSkull } from '@fortawesome/free-solid-svg-icons'; -import { ButtonMenuProps } from 'components/ButtonMenu'; - const InstanceOverview = () => { useDocumentTitle('Dashboard - Lodestone'); const { core } = useContext(LodestoneContext); @@ -68,88 +64,6 @@ const InstanceOverview = () => { })); }; - const columnsBasic: TableColumn[] = [ - { field: 'name', headerName: 'NAME' }, - { field: 'age', headerName: 'AGE' }, - { field: 'city', headerName: 'CITY' }, - ]; - - const rowsBasic: TableRow[] = [ - { id: 1, name: 'John', age: 30, city: 'New York' }, - { id: 2, name: 'Jane', age: 25, city: 'Los Angeles' }, - { id: 3, name: 'Bob', age: 45, city: 'Chicago' }, - ]; - - const columnsAnalog: TableColumn[] = [ - { field: 'make', headerName: 'MAKE' }, - { field: 'model', headerName: 'MODEL' }, - { field: 'lens', headerName: 'LENS' }, - { field: 'format', headerName: 'FORMAT' }, - { field: 'year', headerName: 'YEAR' }, - ]; - - const rowsAnalog: TableRow[] = [ - { id: 1, make: 'Nikon', model: 'FM2', lens: '50mm f/1.8', format: '35mm', year: 1982 }, - { id: 2, make: 'Canon', model: 'AE-1', lens: '50mm f/1.4', format: '35mm', year: 1976 }, - { id: 3, make: 'Pentax', model: 'K1000', lens: '50mm f/2.0', format: '35mm', year: 1976 }, - { id: 4, make: 'Mamiya', model: 'RB67', lens: '127mm f/3.8', format: '120', year: 1970 }, - { id: 5, make: 'Hasselblad', model: '500CM', lens: '80mm f/2.8', format: '120', year: 1957 }, - { id: 6, make: 'Leica', model: 'M6', lens: '35mm f/2.0', format: '35mm', year: 1984 }, - { id: 7, make: 'Fuji', model: 'GW690III', lens: '90mm f/3.5', format: '120', year: 1980 }, - { id: 8, make: 'Minolta', model: 'X-700', lens: '50mm f/1.7', format: '35mm', year: 1981 }, - { id: 9, make: 'Rollei', model: '35T', lens: '40mm f/3.5', format: '35mm', year: 1960 }, - { id: 10, make: 'Kodak', model: 'Retina IIc', lens: '50mm f/2.8', format: '35mm', year: 1954 }, - { id: 11, make: 'Yashica', model: 'Mat-124G', lens: '80mm f/3.5', format: '120', year: 1970 }, - { id: 12, make: 'Voigtlander', model: 'Bessa R3A', lens: '40mm f/1.4', format: '35mm', year: 2004 }, - { id: 13, make: 'Zenza Bronica', model: 'SQ-Ai', lens: '80mm f/2.8', format: '120', year: 1982 }, - { id: 14, make: 'Konica', model: 'Hexar AF', lens: '35mm f/2.0', format: '35mm', year: 1993 }, - { id: 15, make: 'Zeiss Ikon Zeiss Ikon Zeiss Ikon Zeiss Ikon', model: 'Contessa S310', lens: '45mm f/2.8', format: '35mm', year: 1957 }, - { id: 16, make: 'what the fuck am i doing like, the hell i am looooong words', model: 'Instax Mini 9', lens: '60mm f/12.7', format: 'Instant', year: 2017 }, - // { id: 17, make: 'Polaroid', model: 'SX-70', lens: '116mm f/8', format: 'Polaroid', year: 1972 }, - // { id: 18, make: 'Fujifilm', model: 'Instax Mini 90', lens: '60mm f/12.7', format: 'Instant', year: 2013 }, - // { id: 19, make: 'Yashica', model: 'Mat-124G', lens: '80mm f/3.5', format: '120', year: 1970 }, - // { id: 20, make: 'Holga', model: '120N', lens: '60mm f/8', format: '120', year: 1982 }, - // { id: 21, make: 'Kodak', model: 'Brownie Hawkeye', lens: '75mm f/14.5', format: '620', year: 1949 }, - // { id: 22, make: 'Rollei', model: '35', lens: '40mm f/3.5', format: '35mm', year: 1966 }, - // { id: 23, make: 'Agfa', model: 'Clack', lens: '95mm f/11', format: '120', year: 1954 }, - // { id: 24, make: 'Lomography', model: 'Diana F+', lens: '75mm f/8', format: '120', year: 2007 }, - // { id: 25, make: 'Pentax', model: '645', lens: '75mm f/2.8', format: '120', year: 1984 }, - // { id: 26, make: 'Nimslo', model: 'Nimslo 3D', lens: '30mm f/5.6', format: '35mm', year: 1980 }, - // { id: 27, make: 'Voigtlander', model: 'Bessa R2A', lens: '50mm f/1.5', format: '35mm', year: 2004 }, - // { id: 28, make: 'Fujifilm', model: 'GFX 50S', lens: '63mm f/2.8', format: 'Medium Format', year: 2017 }, - // { id: 29, make: 'Bronica', model: 'SQ-A', lens: '80mm f/2.8', format: 'Medium Format', year: 1980 }, - // { id: 30, make: 'Minox', model: '35 EL', lens: '35mm f/2.8', format: '35mm', year: 1974 }, - ]; - - const menuItems1: ButtonMenuProps = { - menuItems: [ - { - label: 'Edit in file viewer', - icon: faEdit, - variant: 'text', - intention: 'info', - disabled: false, - onClick: () => console.log('Button 1 clicked'), - }, - { - label: 'another one', - icon: faSkull, - variant: 'text', - intention: 'info', - disabled: false, - onClick: () => console.log('Button 1 clicked'), - }, - { - label: 'Obliterate', - icon: faTrashCan, - variant: 'text', - intention: 'danger', - disabled: false, - onClick: () => console.log('Button 2 clicked'), - }, - ] - }; - return ( <>
{
-
{column.headerName}
-
); From 0c0744b23bd7e7cc1b2f2d641ad4a0e7c5c94d21 Mon Sep 17 00:00:00 2001 From: kevinzhangTT Date: Sun, 2 Apr 2023 00:40:56 -0400 Subject: [PATCH 049/108] fixed storybook file --- src/components/Atoms/Button.stories.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Atoms/Button.stories.tsx b/src/components/Atoms/Button.stories.tsx index 2e322c1f..ab6dae26 100644 --- a/src/components/Atoms/Button.stories.tsx +++ b/src/components/Atoms/Button.stories.tsx @@ -32,5 +32,5 @@ StartServer.args = { onClick: () => { console.log('Start Server'); }, - icon: faServer, + iconRight: faServer, }; From 989ee2db28cf0499f3832aca38ff0339f91eb59e Mon Sep 17 00:00:00 2001 From: kevinzhangTT Date: Sun, 2 Apr 2023 00:46:58 -0400 Subject: [PATCH 050/108] changed icon name prop back to original to satisfy previous files that already used it --- src/components/Atoms/Button.stories.tsx | 2 +- src/components/Atoms/Button.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Atoms/Button.stories.tsx b/src/components/Atoms/Button.stories.tsx index ab6dae26..2e322c1f 100644 --- a/src/components/Atoms/Button.stories.tsx +++ b/src/components/Atoms/Button.stories.tsx @@ -32,5 +32,5 @@ StartServer.args = { onClick: () => { console.log('Start Server'); }, - iconRight: faServer, + icon: faServer, }; diff --git a/src/components/Atoms/Button.tsx b/src/components/Atoms/Button.tsx index a65705c7..ad05475c 100644 --- a/src/components/Atoms/Button.tsx +++ b/src/components/Atoms/Button.tsx @@ -70,7 +70,7 @@ export interface ButtonProps extends VariantProps { onClick?: (event: React.MouseEvent) => void; type?: 'button' | 'submit' | 'reset'; iconComponent?: React.ReactNode; - iconLeft?: IconDefinition; + icon?: IconDefinition; iconRight?: IconDefinition; labelGrow?: boolean; form?: string; @@ -90,7 +90,7 @@ const Button = forwardRef( variant, className, iconComponent, - iconLeft, + icon, iconRight, labelGrow = false, type = 'button', @@ -110,7 +110,7 @@ const Button = forwardRef( {...props} > {iconComponent} - {iconLeft && } + {icon && }
Date: Sun, 2 Apr 2023 01:04:51 -0400 Subject: [PATCH 051/108] fixed button width issue, reverted Button comp back to original --- src/components/Atoms/Button.tsx | 8 +- src/components/ButtonMenu.tsx | 3 +- src/components/Instance/InstanceOverview.tsx | 88 ++++++++++++++++++++ 3 files changed, 94 insertions(+), 5 deletions(-) diff --git a/src/components/Atoms/Button.tsx b/src/components/Atoms/Button.tsx index ad05475c..10196f62 100644 --- a/src/components/Atoms/Button.tsx +++ b/src/components/Atoms/Button.tsx @@ -1,6 +1,6 @@ import { IconDefinition } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { forwardRef } from 'react'; +import { DOMAttributes, forwardRef } from 'react'; import clsx from 'clsx'; import { BeatLoader } from 'react-spinners'; import { cva, VariantProps } from 'class-variance-authority'; @@ -102,7 +102,7 @@ const Button = forwardRef( ); diff --git a/src/components/ButtonMenu.tsx b/src/components/ButtonMenu.tsx index 14663884..31d7901c 100644 --- a/src/components/ButtonMenu.tsx +++ b/src/components/ButtonMenu.tsx @@ -3,6 +3,7 @@ import Button from './Atoms/Button'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { IconDefinition } from '@fortawesome/free-solid-svg-icons'; import { faEllipsisVertical } from '@fortawesome/free-solid-svg-icons'; +import clsx from 'clsx'; interface MenuItemProperty { className?: string; @@ -35,7 +36,7 @@ export default function ButtonMenu({ menuItems, buttonIcon = faEllipsisVertical {menuItems.map((menuItem, index) => (
+
+
); From 521457bfe83c7ed9668e8d36df5e1f65c6f5a349 Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Sun, 2 Apr 2023 02:42:20 -0400 Subject: [PATCH 052/108] created generic instance card + handled generic instance url error --- public/assets/GenericIcon.svg | 3 + src-tauri/Cargo.lock | 375 ++++++++++-------- .../Instance/Create/FormCreation.tsx | 1 + .../Instance/Create/GameTypeSelectForm.tsx | 37 +- .../Instance/Create/SelectGameCard.tsx | 4 +- .../Instance/Create/SelectGenericGameCard.tsx | 84 ++++ src/components/Instance/Create/form.ts | 11 +- .../Instance/InstanceCreateForm.tsx | 174 ++++---- src/data/GameTypeMappings.tsx | 2 +- 9 files changed, 442 insertions(+), 249 deletions(-) create mode 100644 public/assets/GenericIcon.svg create mode 100644 src/components/Instance/Create/SelectGenericGameCard.tsx diff --git a/public/assets/GenericIcon.svg b/public/assets/GenericIcon.svg new file mode 100644 index 00000000..f881f350 --- /dev/null +++ b/public/assets/GenericIcon.svg @@ -0,0 +1,3 @@ + + + diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index bd69bd3a..b686e718 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -34,7 +34,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8" dependencies = [ "crypto-common", - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -185,7 +185,7 @@ checksum = "70151a5226578411132d798aa248df45b30aa34aea2e580628870b4d87be717b" dependencies = [ "darling", "pmutil", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "swc_macros_common", "syn 1.0.109", @@ -211,9 +211,9 @@ version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", - "syn 2.0.10", + "syn 2.0.12", ] [[package]] @@ -376,9 +376,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bb524613be645939e280b7279f7b017f98cf7f5ef084ec374df373530e73277" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", - "syn 2.0.10", + "syn 2.0.12", ] [[package]] @@ -507,7 +507,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -516,7 +516,7 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -531,7 +531,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a90ec2df9600c28a01c56c4784c9207a96d2451833aeceb8cc97e4c9548bb78" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -735,7 +735,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -1015,7 +1015,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", "subtle", "zeroize", @@ -1027,7 +1027,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", "typenum", ] @@ -1043,7 +1043,7 @@ dependencies = [ "itoa 0.4.8", "matches", "phf 0.8.0", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "smallvec", "syn 1.0.109", @@ -1093,22 +1093,23 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.2.0" +version = "4.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "03d928d978dbec61a1167414f5ec534f24bea0d7a0d24dd9b6233d3d8223e585" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cfg-if", + "fiat-crypto", + "packed_simd_2", + "platforms", "subtle", "zeroize", ] [[package]] name = "cxx" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c00419335c41018365ddf7e4d5f1c12ee3659ddcf3e01974650ba1de73d038" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" dependencies = [ "cc", "cxxbridge-flags", @@ -1118,34 +1119,34 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8307ad413a98fff033c8545ecf133e3257747b3bae935e7602aab8aa92d4ca" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" dependencies = [ "cc", "codespan-reporting", "once_cell", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "scratch", - "syn 2.0.10", + "syn 2.0.12", ] [[package]] name = "cxxbridge-flags" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc52e2eb08915cb12596d29d55f0b5384f00d697a646dbd269b6ecb0fbd9d31" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" [[package]] name = "cxxbridge-macro" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", - "syn 2.0.10", + "syn 2.0.12", ] [[package]] @@ -1166,7 +1167,7 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "strsim", "syn 1.0.109", @@ -1540,7 +1541,7 @@ dependencies = [ "once_cell", "pmutil", "proc-macro-crate", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "regex", "syn 1.0.109", @@ -1700,7 +1701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "rustc_version 0.4.0", "syn 1.0.109", @@ -1721,7 +1722,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -1845,7 +1846,7 @@ dependencies = [ "byteorder", "lazy_static", "proc-macro-error", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -1890,7 +1891,7 @@ dependencies = [ "der", "digest 0.10.6", "ff", - "generic-array 0.14.6", + "generic-array 0.14.7", "group", "hkdf", "pem-rfc7468", @@ -1929,7 +1930,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -1940,7 +1941,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e40a16955681d469ab3da85aaa6b42ff656b3c67b52e1d8d3dd36afe97fd462" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -1952,7 +1953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" dependencies = [ "once_cell", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -1964,7 +1965,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9895954c6ec59d897ed28a64815f2ceb57653fcaaebd317f2edc78b74f5495b6" dependencies = [ "pmutil", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "swc_macros_common", "syn 1.0.109", ] @@ -1985,7 +1986,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "rustversion", "syn 1.0.109", @@ -1994,13 +1995,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.45.0", ] [[package]] @@ -2070,6 +2071,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93ace6ec7cc19c8ed33a32eaa9ea692d7faea05006b5356b9e2b668ec4bc3955" + [[package]] name = "field-offset" version = "0.3.5" @@ -2088,7 +2095,7 @@ checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "windows-sys 0.45.0", ] @@ -2111,7 +2118,7 @@ dependencies = [ "futures-core", "futures-sink", "pin-project", - "spin 0.9.6", + "spin 0.9.7", ] [[package]] @@ -2162,7 +2169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d449976075322384507443937df2f1d5577afbf4282f12a5a66ef29fa3e6307" dependencies = [ "pmutil", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "swc_macros_common", "syn 1.0.109", ] @@ -2221,9 +2228,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -2236,9 +2243,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -2246,15 +2253,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -2274,38 +2281,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.12", ] [[package]] name = "futures-sink" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -2434,9 +2441,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -2532,15 +2539,15 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.15.11" +version = "0.15.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" dependencies = [ "anyhow", "heck 0.4.1", "proc-macro-crate", "proc-macro-error", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -2639,14 +2646,14 @@ dependencies = [ [[package]] name = "gtk3-macros" -version = "0.15.4" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9" +checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" dependencies = [ "anyhow", "proc-macro-crate", "proc-macro-error", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -2808,7 +2815,7 @@ dependencies = [ "log", "mac", "markup5ever", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -3085,7 +3092,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ "block-padding", - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -3122,9 +3129,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "is-macro" @@ -3134,7 +3141,7 @@ checksum = "8a7d079e129b77477a49c5c4f1cfe9ce6c2c909ef52520693e8e811a714c7b20" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -3386,9 +3393,9 @@ dependencies = [ [[package]] name = "libffi" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb06d5b4c428f3cd682943741c39ed4157ae989fffe1094a08eaf7c4014cf60" +checksum = "ce826c243048e3d5cec441799724de52e2d42f820468431fc3fceee2341871e2" dependencies = [ "libc", "libffi-sys", @@ -3396,9 +3403,9 @@ dependencies = [ [[package]] name = "libffi-sys" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c6f11e063a27ffe040a9d15f0b661bf41edc2383b7ae0e0ad5a7e7d53d9da3" +checksum = "f7d15fb67f8bae22af6c2e4060aaa0e7482aea37ddb5bdaccf9984150d748774" dependencies = [ "cc", ] @@ -3413,6 +3420,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "libm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" + [[package]] name = "libm" version = "0.2.6" @@ -3456,9 +3469,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "local-ip-address" @@ -3499,7 +3512,7 @@ dependencies = [ [[package]] name = "lodestone_core" version = "0.4.3" -source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=releases/0.5.0#fb79e0863df60859639d6ac8d2e23b74c94ee3cf" +source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=releases/0.5.0#0db285fd3520df7e3e3a04ff478c489a2becd2df" dependencies = [ "ansi_term", "argon2", @@ -3547,6 +3560,7 @@ dependencies = [ "sysinfo", "tar", "tempdir", + "tempfile", "thiserror", "time 0.3.20", "tokio", @@ -3773,9 +3787,9 @@ dependencies = [ [[package]] name = "multer" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed4198ce7a4cbd2a57af78d28c6fbb57d81ac5f1d6ad79ac6c5587419cbdf22" +checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" dependencies = [ "bytes", "encoding_rs", @@ -3785,7 +3799,7 @@ dependencies = [ "log", "memchr", "mime", - "spin 0.9.6", + "spin 0.9.7", "version_check", ] @@ -3984,7 +3998,7 @@ checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905" dependencies = [ "byteorder", "lazy_static", - "libm", + "libm 0.2.6", "num-integer", "num-iter", "num-traits 0.2.15", @@ -4063,7 +4077,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg 1.1.0", - "libm", + "libm 0.2.6", ] [[package]] @@ -4092,7 +4106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -4203,7 +4217,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -4297,6 +4311,16 @@ dependencies = [ "sha2", ] +[[package]] +name = "packed_simd_2" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +dependencies = [ + "cfg-if", + "libm 0.1.4", +] + [[package]] name = "pango" version = "0.15.10" @@ -4352,7 +4376,7 @@ dependencies = [ "cfg-if", "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "winapi", ] @@ -4365,7 +4389,7 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "windows-sys 0.45.0", ] @@ -4496,7 +4520,7 @@ dependencies = [ "phf_generator 0.8.0", "phf_shared 0.8.0", "proc-macro-hack", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -4510,7 +4534,7 @@ dependencies = [ "phf_generator 0.10.0", "phf_shared 0.10.0", "proc-macro-hack", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -4548,7 +4572,7 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -4593,6 +4617,12 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +[[package]] +name = "platforms" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" + [[package]] name = "plist" version = "1.4.3" @@ -4613,7 +4643,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -4686,7 +4716,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", "version_check", @@ -4698,7 +4728,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "version_check", ] @@ -4720,9 +4750,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.53" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" +checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" dependencies = [ "unicode-ident", ] @@ -4775,7 +4805,7 @@ version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", ] [[package]] @@ -4980,9 +5010,9 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f851a03551ceefd30132e447f07f96cb7011d6b658374f3aed847333adb5559" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rayon" @@ -5034,6 +5064,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -5041,7 +5080,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom 0.2.8", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] @@ -5082,9 +5121,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.15" +version = "0.11.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949" +checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" dependencies = [ "async-compression", "base64 0.21.0", @@ -5283,9 +5322,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.11" +version = "0.37.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" dependencies = [ "bitflags", "errno", @@ -5418,7 +5457,7 @@ checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ "base16ct", "der", - "generic-array 0.14.6", + "generic-array 0.14.7", "pkcs8", "subtle", "zeroize", @@ -5493,9 +5532,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.158" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" dependencies = [ "serde_derive", ] @@ -5532,20 +5571,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.158" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", - "syn 2.0.10", + "syn 2.0.12", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ "indexmap", "itoa 1.0.6", @@ -5568,7 +5607,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -5626,7 +5665,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -5648,7 +5687,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -5862,9 +5901,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34" +checksum = "c0959fd6f767df20b231736396e4f602171e00d95205676286e79d4a4eb67bef" dependencies = [ "lock_api", ] @@ -5955,7 +5994,7 @@ dependencies = [ "either", "heck 0.4.1", "once_cell", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "serde_json", "sha2", @@ -6031,7 +6070,7 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ "phf_generator 0.10.0", "phf_shared 0.10.0", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", ] @@ -6042,7 +6081,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91f42363e5ca94ea6f3faee9e3b5e1a4047535ae323f5c0579385fb2ae95874e" dependencies = [ "pmutil", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "swc_macros_common", "syn 1.0.109", @@ -6080,7 +6119,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" dependencies = [ "heck 0.3.3", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -6152,7 +6191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dadb9998d4f5fc36ef558ed5a092579441579ee8c6fcce84a5228cca9df4004" dependencies = [ "pmutil", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "swc_macros_common", "syn 1.0.109", @@ -6201,7 +6240,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0159c99f81f52e48fe692ef7af1b0990b45d3006b14c6629be0b1ffee1b23aea" dependencies = [ "pmutil", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "swc_macros_common", "syn 1.0.109", @@ -6285,7 +6324,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebf907935ec5492256b523ae7935a824d9fdc0368dcadc41375bad0dca91cd8b" dependencies = [ "pmutil", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "swc_macros_common", "syn 1.0.109", @@ -6391,7 +6430,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c20468634668c2bbab581947bb8c75c97158d5a6959f4ba33df20983b20b4f6" dependencies = [ "pmutil", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -6403,7 +6442,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e582c3e3c2269238524923781df5be49e011dbe29cf7683a2215d600a562ea6" dependencies = [ "pmutil", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -6426,7 +6465,7 @@ checksum = "ebeed7eb0f545f48ad30f5aab314e5208b735bcea1d1464f26e20f06db904989" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "swc_macros_common", "syn 1.0.109", @@ -6449,18 +6488,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.10" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" +checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "unicode-ident", ] @@ -6477,7 +6516,7 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", "unicode-xid 0.2.4", @@ -6662,7 +6701,7 @@ dependencies = [ "json-patch", "plist", "png", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "regex", "semver 1.0.17", @@ -6683,7 +6722,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", "tauri-codegen", @@ -6757,7 +6796,7 @@ dependencies = [ "kuchiki", "memchr", "phf 0.10.1", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "semver 1.0.17", "serde", @@ -6792,15 +6831,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", + "redox_syscall 0.3.5", "rustix", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -6853,9 +6892,9 @@ version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", - "syn 2.0.10", + "syn 2.0.12", ] [[package]] @@ -6962,7 +7001,7 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -7179,7 +7218,7 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -7324,7 +7363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f807fdb3151fee75df7485b901a89624358cd07a67a8fb1a5831bf5a07681ff" dependencies = [ "Inflector", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", "termcolor", @@ -7591,7 +7630,7 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b300a878652a387d2a0de915bdae8f1a548f0c6d45e072fe2688794b656cc9" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -7661,7 +7700,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", ] @@ -7722,7 +7761,7 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", "wasm-bindgen-shared", @@ -7756,7 +7795,7 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", "wasm-bindgen-backend", @@ -7876,7 +7915,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", "syn 1.0.109", ] @@ -8266,12 +8305,13 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0-pre.1" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +checksum = "fabd6e16dd08033932fc3265ad4510cc2eab24656058a6dcb107ffe274abcc95" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek 4.0.0-rc.2", "rand_core 0.6.4", + "serde", "zeroize", ] @@ -8301,23 +8341,22 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.53", + "proc-macro2 1.0.54", "quote 1.0.26", - "syn 1.0.109", - "synstructure", + "syn 2.0.12", ] [[package]] diff --git a/src/components/Instance/Create/FormCreation.tsx b/src/components/Instance/Create/FormCreation.tsx index 8674a202..f69d84ac 100644 --- a/src/components/Instance/Create/FormCreation.tsx +++ b/src/components/Instance/Create/FormCreation.tsx @@ -4,6 +4,7 @@ import FormComboField from './SetupFormFields/FormComboField'; import { SectionManifest, SettingManifest } from './form'; import { toast } from 'react-toastify'; export const createForm = (section: SectionManifest) => { + console.log(section); const createField = (setting: SettingManifest, index: number) => { switch (setting.value_type.type) { case 'String': diff --git a/src/components/Instance/Create/GameTypeSelectForm.tsx b/src/components/Instance/Create/GameTypeSelectForm.tsx index d8fa49eb..63fda520 100644 --- a/src/components/Instance/Create/GameTypeSelectForm.tsx +++ b/src/components/Instance/Create/GameTypeSelectForm.tsx @@ -1,4 +1,3 @@ -import { HandlerGameType } from 'bindings/HandlerGameType'; import clsx from 'clsx'; import Spinner from 'components/DashboardLayout/Spinner'; import { InstanceGameTypes } from 'data/InstanceGameTypes'; @@ -8,22 +7,31 @@ import { game_to_game_title, HandlerGameType_to_Game, } from 'data/GameTypeMappings'; +import { GenericHandlerGameType } from '../InstanceCreateForm'; +import SelectGenericGameCard from './SelectGenericGameCard'; +import { Dispatch, SetStateAction } from 'react'; + export default function GameTypeSelectForm({ selectedGameType, setGameType, + urlValid, + setUrlValid, + setUrl, className, }: { - selectedGameType: HandlerGameType; - setGameType: (gameType: HandlerGameType) => void; + selectedGameType: GenericHandlerGameType; + setGameType: (gameType: GenericHandlerGameType) => void; + urlValid: boolean; + setUrlValid: Dispatch>; + setUrl: (url: string) => void; className?: string; }) { const { data: game_types, isLoading, error } = InstanceGameTypes(); if (!game_types || isLoading) { return ; } - return ( -
+

Select a game

@@ -31,6 +39,25 @@ export default function GameTypeSelectForm({ What will your instance be used for?

+ setGameType('Generic')} + setUrlValid={setUrlValid} + setUrl={setUrl} + selected={'Generic' === selectedGameType} + errorText={!urlValid ? 'Invalid URL' : ''} + /> {game_types.map((game_type) => { const game = HandlerGameType_to_Game[game_type]; return ( diff --git a/src/components/Instance/Create/SelectGameCard.tsx b/src/components/Instance/Create/SelectGameCard.tsx index 5da593da..1355f9c9 100644 --- a/src/components/Instance/Create/SelectGameCard.tsx +++ b/src/components/Instance/Create/SelectGameCard.tsx @@ -19,13 +19,13 @@ const SelectGameCard = ({ + ); +}; + +export default SelectGameCard; diff --git a/src/components/Instance/Create/form.ts b/src/components/Instance/Create/form.ts index bdf0278f..1449299e 100644 --- a/src/components/Instance/Create/form.ts +++ b/src/components/Instance/Create/form.ts @@ -2,10 +2,10 @@ import * as yup from 'yup'; export const formId = 'minecraftCreateNewInstanceForm'; -export const instanceSettingPageObject: SectionManifest = { - section_id: 'instance_settings', - name: 'Instance Settings', - description: 'Instance configurations for your server.', +export const autoSettingPageObject: SectionManifest = { + section_id: 'auto_settings', + name: 'Auto Settings', + description: 'Auto settings for your server.', settings: { auto_start: { setting_id: 'auto_start', @@ -52,7 +52,8 @@ export const instanceSettingPageObject: SectionManifest = { export const generateValidationSchema = (instanceManifest: SetupManifest) => { const validationSchema: any[] = []; const setting_sections = instanceManifest['setting_sections']; - setting_sections['auto_settings'] = instanceSettingPageObject; + setting_sections['auto_settings'] = autoSettingPageObject; + validationSchema.push(yup.object().shape({})); //for select game type const generateYupObject = (setting: SettingManifest) => { const settingType = setting.value_type.type; diff --git a/src/components/Instance/InstanceCreateForm.tsx b/src/components/Instance/InstanceCreateForm.tsx index ed7dca0b..6fe7dbcb 100644 --- a/src/components/Instance/InstanceCreateForm.tsx +++ b/src/components/Instance/InstanceCreateForm.tsx @@ -1,6 +1,13 @@ import Button from 'components/Atoms/Button'; import { Form, Formik, FormikHelpers, FormikProps } from 'formik'; -import { useRef, useState, useEffect, useMemo } from 'react'; +import { + useRef, + useState, + useEffect, + useMemo, + Dispatch, + SetStateAction, +} from 'react'; import { useEffectOnce } from 'usehooks-ts'; import useAnalyticsEventTracker from 'utils/hooks'; import { axiosWrapper } from 'utils/util'; @@ -12,6 +19,7 @@ import { SectionManifestValue, SetupManifest, SetupValue, + autoSettingPageObject, } from './Create/form'; import { generateValidationSchema, generateInitialValues } from './Create/form'; import { createForm } from './Create/FormCreation'; @@ -31,10 +39,14 @@ function _renderStepContent( step: number, gameType: GenericHandlerGameType, setGameType: (gameType: GenericHandlerGameType) => void, + urlValid: boolean, + setUrlValid: Dispatch>, + setUrl: (url: string) => void, setupManifest?: SetupManifest | null ) { const forms = useMemo(() => { if (!setupManifest) return []; + console.log(Object.keys(setupManifest)); return Object.keys(setupManifest['setting_sections']).map((key: string) => { return createForm(setupManifest['setting_sections'][key]); }); @@ -47,6 +59,9 @@ function _renderStepContent( ) : ( forms[step - 1] @@ -64,16 +79,71 @@ export default function CreateGameInstance({ const [gameType, setGameType] = useState( 'MinecraftJavaVanilla' ); - // const ready = activeStep !== 0; - // console.log(ready); + const [urlIsReady, setUrlIsReady] = useState(false); + const [urlValid, setUrlValid] = useState(true); + const [url, setUrl] = useState(''); const { data: setup_manifest, isLoading, error, } = gameType === 'Generic' - ? SetupGenericInstanceManifest(gameType, '', false) + ? SetupGenericInstanceManifest(gameType, url, urlIsReady) : SetupInstanceManifest(gameType as HandlerGameType); + // const queryPromise = () => { + // return new Promise((resolve, reject) => { + // let isUnsubscribeRunning = false; + // console.log('Promise started'); + // const unsubscribe = () => { + // if (isUnsubscribeRunning) { + // return; + // } + // isUnsubscribeRunning = true; + // console.log('Checking isLoading:', isLoading); + // if (!isLoading) { + // if (error) { + // console.log('Error occurred:', error); + // reject('There was an error fetching the data.'); + // } else { + // console.log('Data fetched:', setup_manifest); + // resolve(setup_manifest); + // } + // } else { + // console.log('Still loading, checking again in 1000ms...'); + // setTimeout(() => { + // try { + // unsubscribe(); + // } catch (e) { + // console.log(e); + // } + // }, 1000); // check again in 1000ms + // } + // }; + // try { + // setTimeout(unsubscribe, 0); // call unsubscribe asynchronously + // } catch (e) { + // console.log(e); + // } + // }); + // }; + + // async function waitForBoolean(condition: () => boolean): Promise { + // return new Promise((resolve) => { + // let timeoutId: ReturnType; + // const checkCondition = () => { + // console.log('hey'); + // if (condition()) { + // console.log("condition's met!"); + // clearTimeout(timeoutId); + // resolve(); + // } else { + // timeoutId = setTimeout(checkCondition, 100); // check again in 100ms + // } + // }; + // checkCondition(); + // }); + // } + const gaEventTracker = useAnalyticsEventTracker('Create Instance'); const formikRef = useRef>>(null); @@ -83,13 +153,17 @@ export default function CreateGameInstance({ }); useEffect(() => { - console.log(gameType); - console.log(setup_manifest); + setUrlValid(!(gameType === 'Generic' && error)); + if (gameType !== 'Generic') setUrlIsReady(false); if (!isLoading && !error) { setInitialValues( generateInitialValues(setup_manifest['setting_sections']) ); + console.log(setup_manifest); setValidationSchema(generateValidationSchema(setup_manifest)); + console.log(setup_manifest); + // setup_manifest['setting_sections']['auto_settings'] = + // autoSettingPageObject; setSetupManifest(setup_manifest); } }, [gameType, isLoading, setup_manifest, error]); @@ -98,6 +172,8 @@ export default function CreateGameInstance({ null ); + // console.log(setupManifest); + const [initialValues, setInitialValues] = useState< Record >({}); @@ -105,25 +181,14 @@ export default function CreateGameInstance({ yup.object().shape({}), ]); - if (setupManifest === null && activeStep !== 0) return ; - - // console.log(setupManifest); - // const initialValues: Record = setupManifest - // ? generateInitialValues(setupManifest['setting_sections']) - // : {}; - // const validationSchema: any[] = setupManifest - // ? generateValidationSchema(setupManifest) - // : [yup.object().shape({})]; + // if (setupManifest === null && activeStep !== 0) return ; const currentValidationSchema = validationSchema[activeStep]; const steps = [ 'Select Game', 'Basic Settings', 'Instance Settings', 'Auto Settings', - // Object.keys(setupManifest['setting_sections']).map( - // (sectionId) => setupManifest['setting_sections'][sectionId]['name'] - // ), - ].flat(); + ]; const formReady = activeStep === steps.length - 1; const createInstance = async (value: SetupValue) => { await axiosWrapper({ @@ -144,9 +209,10 @@ export default function CreateGameInstance({ sectionValues[structure[1]] = structure[0]; } + console.log(sectionValues); const parsedValues: SetupValue = { - name: values.name?.value as string, - description: values.description?.value as string, + name: 'Minecraft Server', + description: 'Description', auto_start: values.auto_start?.value as boolean, restart_on_crash: values.restart_on_crash?.value as boolean, setting_sections: sectionValues, @@ -163,10 +229,10 @@ export default function CreateGameInstance({ values: Record, step: number ): [SectionManifestValue, string] { - if (!setupManifest || step == 0) return [{ settings: {} }, '']; - const sectionKeys = Object.keys(setupManifest['setting_sections']); + if (!setup_manifest || step == 0) return [{ settings: {} }, '']; + const sectionKeys = Object.keys(setup_manifest['setting_sections']); const settingKeys = Object.keys( - setupManifest['setting_sections'][sectionKeys[step - 1]]['settings'] + setup_manifest['setting_sections'][sectionKeys[step - 1]]['settings'] ); const sectionValidation: SectionManifestValue = { settings: {} }; for (const key of settingKeys) { @@ -175,57 +241,26 @@ export default function CreateGameInstance({ return [sectionValidation, sectionKeys[step - 1]]; } - async function _sectionValidation( - values: Record, - step: number - ) { - const structure = getSectionValidationStructure(values, step); - if (!structure[1]) return; //if string is empty - const sectionValidation = structure[0]; - const sectionKey = structure[1]; - - // const result = await axiosWrapper({ - // method: 'put', - // url: `/setup_manifest/${gameType}/${sectionKey}`, - // headers: { 'Content-Type': 'application/json' }, - // data: JSON.stringify(sectionValidation), - // }); - } - - // function _getSetupManifest( - // values: Record, - // actions: FormikHelpers> - // ) { - // if (!isLoading && !error && setupManifest) { - // console.log(generateInitialValues(setupManifest['setting_sections'])); - // setInitialValues( - // generateInitialValues(setupManifest['setting_sections']) - // ); - // setValidationSchema(generateValidationSchema(setupManifest)); - // setActiveStep(activeStep + 1); - - // actions.setTouched({}); - // actions.setSubmitting(false); - // } - // } - - function _handleSubmit( + async function _handleSubmit( values: Record, actions: FormikHelpers> ) { if (formReady) { _submitForm(values, actions); } else { - console.log(initialValues); - _sectionValidation(values, activeStep); - setActiveStep(activeStep + 1); - actions.setValues(initialValues); + if (activeStep == 0) setUrlIsReady(true); + + if (setup_manifest) { + setActiveStep(activeStep + 1); + actions.setValues(initialValues); + } actions.setTouched({}); actions.setSubmitting(false); } } function _handleBack() { + if (activeStep - 1 == 0) setUrlIsReady(false); setActiveStep(activeStep - 1); } @@ -238,12 +273,12 @@ export default function CreateGameInstance({ validateOnBlur={false} validateOnChange={false} > - {({ isSubmitting, setValues }) => ( + {({ isSubmitting }) => ( -
+
{steps.map((section, i) => (
))}
-
+
{_renderStepContent( activeStep, gameType, setGameType, + urlValid, + setUrlValid, + setUrl, setupManifest )} -
+
{activeStep !== 0 ? (
diff --git a/src/data/GameTypeMappings.tsx b/src/data/GameTypeMappings.tsx index 75240459..24d5bfe5 100644 --- a/src/data/GameTypeMappings.tsx +++ b/src/data/GameTypeMappings.tsx @@ -43,7 +43,7 @@ export const game_to_game_icon = (game: Game) => () => unknown_icon ) ), - Generic: () => unknown_icon, + Generic: () => '/assets/GenericIcon.svg', }); export const game_to_game_title = (game: Game) => From 7eb5d8725fd7be46ab8d46de3ee9e33ba9255eb2 Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Sun, 2 Apr 2023 02:56:05 -0400 Subject: [PATCH 053/108] code cleanup --- .../Instance/Create/SelectGenericGameCard.tsx | 3 +- .../Instance/InstanceCreateForm.tsx | 61 ------------------- 2 files changed, 1 insertion(+), 63 deletions(-) diff --git a/src/components/Instance/Create/SelectGenericGameCard.tsx b/src/components/Instance/Create/SelectGenericGameCard.tsx index 8a6ca12f..c6a6eceb 100644 --- a/src/components/Instance/Create/SelectGenericGameCard.tsx +++ b/src/components/Instance/Create/SelectGenericGameCard.tsx @@ -33,7 +33,6 @@ const SelectGameCard = ({ 'relative col-span-2 flex flex-col items-start text-left align-top font-sans tracking-medium', 'h-36 w-full border-2 border-solid border-transparent p-4 outline outline-1', 'text-gray-faded/30 enabled:hover:text-white/50 disabled:text-gray-900', - '', 'outline-gray-faded/30 enabled:hover:outline-white/50', 'focus-visible:outline-none enabled:focus-visible:ring-4 enabled:focus-visible:ring-blue-faded/50', className @@ -58,7 +57,7 @@ const SelectGameCard = ({ {description}
{ - // return new Promise((resolve, reject) => { - // let isUnsubscribeRunning = false; - // console.log('Promise started'); - // const unsubscribe = () => { - // if (isUnsubscribeRunning) { - // return; - // } - // isUnsubscribeRunning = true; - // console.log('Checking isLoading:', isLoading); - // if (!isLoading) { - // if (error) { - // console.log('Error occurred:', error); - // reject('There was an error fetching the data.'); - // } else { - // console.log('Data fetched:', setup_manifest); - // resolve(setup_manifest); - // } - // } else { - // console.log('Still loading, checking again in 1000ms...'); - // setTimeout(() => { - // try { - // unsubscribe(); - // } catch (e) { - // console.log(e); - // } - // }, 1000); // check again in 1000ms - // } - // }; - // try { - // setTimeout(unsubscribe, 0); // call unsubscribe asynchronously - // } catch (e) { - // console.log(e); - // } - // }); - // }; - - // async function waitForBoolean(condition: () => boolean): Promise { - // return new Promise((resolve) => { - // let timeoutId: ReturnType; - // const checkCondition = () => { - // console.log('hey'); - // if (condition()) { - // console.log("condition's met!"); - // clearTimeout(timeoutId); - // resolve(); - // } else { - // timeoutId = setTimeout(checkCondition, 100); // check again in 100ms - // } - // }; - // checkCondition(); - // }); - // } - const gaEventTracker = useAnalyticsEventTracker('Create Instance'); const formikRef = useRef>>(null); @@ -159,9 +102,7 @@ export default function CreateGameInstance({ setInitialValues( generateInitialValues(setup_manifest['setting_sections']) ); - console.log(setup_manifest); setValidationSchema(generateValidationSchema(setup_manifest)); - console.log(setup_manifest); // setup_manifest['setting_sections']['auto_settings'] = // autoSettingPageObject; setSetupManifest(setup_manifest); @@ -172,8 +113,6 @@ export default function CreateGameInstance({ null ); - // console.log(setupManifest); - const [initialValues, setInitialValues] = useState< Record >({}); From a17d872f765e5422a450b8903e4ad005f54c4b9a Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Sun, 2 Apr 2023 21:24:13 -0400 Subject: [PATCH 054/108] restructured instance settings page --- .../Instance/Create/FormCreation.tsx | 35 +++++-- src/components/Instance/Create/form.ts | 98 +++++++++++++++++-- .../Instance/InstanceCreateForm.tsx | 35 +++++-- 3 files changed, 145 insertions(+), 23 deletions(-) diff --git a/src/components/Instance/Create/FormCreation.tsx b/src/components/Instance/Create/FormCreation.tsx index f69d84ac..64f55ada 100644 --- a/src/components/Instance/Create/FormCreation.tsx +++ b/src/components/Instance/Create/FormCreation.tsx @@ -1,10 +1,12 @@ import FormInputField from './SetupFormFields/FormInputField'; import FormRadioField from './SetupFormFields/FormRadioField'; import FormComboField from './SetupFormFields/FormComboField'; -import { SectionManifest, SettingManifest } from './form'; +import { SectionManifest, SettingManifest, SetupManifest } from './form'; import { toast } from 'react-toastify'; -export const createForm = (section: SectionManifest) => { - console.log(section); +import { FormPage } from '../InstanceCreateForm'; + +export const createForm = (page: FormPage) => { + console.log(page); const createField = (setting: SettingManifest, index: number) => { switch (setting.value_type.type) { case 'String': @@ -68,16 +70,29 @@ export const createForm = (section: SectionManifest) => { return ( <>
- {section.name} + {page.name}
- {section.description} -
-
- {Object.keys(section['settings']).map((field: string, i: number) => - createField(section['settings'][field], i) - )} + {page.description}
+ + {Object.keys(page['page']['setting_sections']).map( + (section: string, i: number) => ( +
+ {Object.keys( + page['page']['setting_sections'][section]['settings'] + ).map((field: string, i: number) => { + return createField( + page['page']['setting_sections'][section]['settings'][field], + i + ); + })} +
+ ) + )} ); }; diff --git a/src/components/Instance/Create/form.ts b/src/components/Instance/Create/form.ts index 1449299e..7444ca16 100644 --- a/src/components/Instance/Create/form.ts +++ b/src/components/Instance/Create/form.ts @@ -2,6 +2,54 @@ import * as yup from 'yup'; export const formId = 'minecraftCreateNewInstanceForm'; +export const basicSettingsPageObject: SectionManifest = { + section_id: 'basic_settings', + name: 'Basic Settings', + description: 'Basic settings for your server.', + settings: { + name: { + setting_id: 'name', + name: 'Name', + description: 'The name of the instance', + value: { + type: 'String', + value: '', + }, + value_type: { + type: 'String', + regex: null, + }, + default_value: { + type: 'String', + value: 'My Server', + }, + is_secret: false, + is_required: true, + is_mutable: true, + }, + description: { + setting_id: 'description', + name: 'Description', + description: 'The description of the instance', + value: { + type: 'String', + value: '', + }, + value_type: { + type: 'String', + regex: null, + }, + default_value: { + type: 'String', + value: '', + }, + is_secret: false, + is_required: false, + is_mutable: true, + }, + }, +}; + export const autoSettingPageObject: SectionManifest = { section_id: 'auto_settings', name: 'Auto Settings', @@ -51,8 +99,10 @@ export const autoSettingPageObject: SectionManifest = { export const generateValidationSchema = (instanceManifest: SetupManifest) => { const validationSchema: any[] = []; + // instanceManifest['setting_sections']['basic_settings'] = + // basicSettingsPageObject; const setting_sections = instanceManifest['setting_sections']; - setting_sections['auto_settings'] = autoSettingPageObject; + // setting_sections['auto_settings'] = autoSettingPageObject; validationSchema.push(yup.object().shape({})); //for select game type const generateYupObject = (setting: SettingManifest) => { @@ -100,17 +150,46 @@ export const generateValidationSchema = (instanceManifest: SetupManifest) => { throw Error('Invalid Setting Type'); } }; + const instanceSettingsValidationSchemaSection: Record = {}; Object.keys(setting_sections).forEach((sectionId: string) => { - const validationSchemaSection: Record = {}; const settings = setting_sections[sectionId]['settings']; Object.keys(settings).forEach((settingId: string) => { const setting = settings[settingId]; - validationSchemaSection[setting.setting_id] = yup + instanceSettingsValidationSchemaSection[setting.setting_id] = yup .object() .shape({ value: generateYupObject(setting) }); }); - validationSchema.push(yup.object().shape(validationSchemaSection)); }); + + const basicSettingsValidationSchemaSection: Record = {}; + Object.keys(basicSettingsPageObject['settings']).forEach( + (settingId: string) => { + const setting = basicSettingsPageObject['settings'][settingId]; + basicSettingsValidationSchemaSection[setting.setting_id] = yup + .object() + .shape({ value: generateYupObject(setting) }); + } + ); + + const autoSettingsValidationSchemaSection: Record = {}; + Object.keys(autoSettingPageObject['settings']).forEach( + (settingId: string) => { + const setting = autoSettingPageObject['settings'][settingId]; + autoSettingsValidationSchemaSection[setting.setting_id] = yup + .object() + .shape({ value: generateYupObject(setting) }); + } + ); + + validationSchema.push( + yup.object().shape(basicSettingsValidationSchemaSection) + ); + validationSchema.push( + yup.object().shape(instanceSettingsValidationSchemaSection) + ); + validationSchema.push( + yup.object().shape(autoSettingsValidationSchemaSection) + ); return validationSchema; }; @@ -118,9 +197,11 @@ export const generateInitialValues = ( settingSections: Record ) => { const initialValues: Record = {}; - - Object.keys(settingSections).forEach((sectionId: string) => { - const setting = settingSections[sectionId]['settings']; + const copySettingSections = { ...settingSections }; //don't modify original + copySettingSections['basic_settings'] = basicSettingsPageObject; + copySettingSections['auto_settings'] = autoSettingPageObject; + const getInitialValue = (sectionId: string) => { + const setting = copySettingSections[sectionId]['settings']; Object.keys(setting).forEach((settingId: string) => { const settingValue = setting[settingId]; initialValues[settingId] = @@ -138,6 +219,9 @@ export const generateInitialValues = ( initialValues[settingId] = { type: 'String', value: '' }; } }); + }; + Object.keys(copySettingSections).forEach((sectionId: string) => { + getInitialValue(sectionId); }); console.log(initialValues); return initialValues; diff --git a/src/components/Instance/InstanceCreateForm.tsx b/src/components/Instance/InstanceCreateForm.tsx index 875045d0..dce458d6 100644 --- a/src/components/Instance/InstanceCreateForm.tsx +++ b/src/components/Instance/InstanceCreateForm.tsx @@ -12,6 +12,8 @@ import { useEffectOnce } from 'usehooks-ts'; import useAnalyticsEventTracker from 'utils/hooks'; import { axiosWrapper } from 'utils/util'; import { + autoSettingPageObject, + basicSettingsPageObject, ConfigurableValue, formId, SectionManifestValue, @@ -31,7 +33,11 @@ import clsx from 'clsx'; import * as yup from 'yup'; export type GenericHandlerGameType = 'Generic' | HandlerGameType; - +export type FormPage = { + name: string; + description: string; + page: SetupManifest; +}; function _renderStepContent( step: number, gameType: GenericHandlerGameType, @@ -43,9 +49,26 @@ function _renderStepContent( ) { const forms = useMemo(() => { if (!setupManifest) return []; - console.log(Object.keys(setupManifest)); - return Object.keys(setupManifest['setting_sections']).map((key: string) => { - return createForm(setupManifest['setting_sections'][key]); + // console.log(Object.keys(setupManifest)); + const pages: FormPage[] = [ + { + name: 'Basic Settings', + description: 'Basic settings for your server.', + page: { setting_sections: { section_1: basicSettingsPageObject } }, + }, + { + name: 'Instance Settings', + description: 'Configure your server.', + page: setupManifest, + }, + { + name: 'Auto Settings', + description: 'Automatically configure your server.', + page: { setting_sections: { section_1: autoSettingPageObject } }, + }, + ]; + return pages.map((page) => { + return createForm(page); }); }, [setupManifest]); @@ -150,8 +173,8 @@ export default function CreateGameInstance({ console.log(sectionValues); const parsedValues: SetupValue = { - name: 'Minecraft Server', - description: 'Description', + name: values.name?.value as string, + description: values.description?.value as string, auto_start: values.auto_start?.value as boolean, restart_on_crash: values.restart_on_crash?.value as boolean, setting_sections: sectionValues, From 23b760fcf9da648260c65bcb76baa902b9368cc1 Mon Sep 17 00:00:00 2001 From: kevinzhangTT Date: Mon, 3 Apr 2023 22:31:22 -0400 Subject: [PATCH 055/108] table now aligns left even if menuOptions is falsy --- src/components/Instance/InstanceOverview.tsx | 2 +- src/components/Table.tsx | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/components/Instance/InstanceOverview.tsx b/src/components/Instance/InstanceOverview.tsx index 6bab3fde..924c8e50 100644 --- a/src/components/Instance/InstanceOverview.tsx +++ b/src/components/Instance/InstanceOverview.tsx @@ -199,7 +199,7 @@ const InstanceOverview = () => {
-
+
); diff --git a/src/components/Table.tsx b/src/components/Table.tsx index 5769da5c..f19fac1e 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -26,13 +26,19 @@ interface TableProps { export function Table({rows, columns, alignment = 'even', menuOptions, className}: TableProps) { // If menuOptions is truthy, add an extra column for the menu buttons - // If alignment === 'left', add 'w-full' to className - const modifiedColumns = menuOptions ? [...columns, { - field: 'menu', - headerName: '', - element: () => , - className: `text-end ${alignment === 'left' ? 'w-full' : ''}`, - }] : columns; + // If alignment === 'left', add 'w-full' to className of last column + const modifiedColumns = menuOptions + ? [...columns, { + field: 'menu', + headerName: '', + element: () => , + className: `text-end ${alignment === 'left' ? 'w-full' : ''}`, + }] + : alignment == 'left' + ? columns.map((column, index, array) => + index === array.length - 1 ? { ...column, className: 'w-full' } : column + ) + : columns; // Code currently uses arbitrary values for min and max width when alignment is set to left return ( From 933330072f79419f6c7d02d881b613776dfd3ffd Mon Sep 17 00:00:00 2001 From: kevinzhangTT Date: Tue, 4 Apr 2023 01:29:16 -0400 Subject: [PATCH 056/108] added unique indices for each MenuButton to control respective rows --- src/components/ButtonMenu.tsx | 24 +++++++++++++------- src/components/Instance/InstanceOverview.tsx | 20 ++++++++-------- src/components/Table.tsx | 23 +++++++++++-------- 3 files changed, 40 insertions(+), 27 deletions(-) diff --git a/src/components/ButtonMenu.tsx b/src/components/ButtonMenu.tsx index 31d7901c..11f562d6 100644 --- a/src/components/ButtonMenu.tsx +++ b/src/components/ButtonMenu.tsx @@ -1,26 +1,34 @@ -import { Menu } from '@headlessui/react'; import Button from './Atoms/Button'; +import { TableRow } from './Table'; +import { Menu } from '@headlessui/react'; + import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { IconDefinition } from '@fortawesome/free-solid-svg-icons'; import { faEllipsisVertical } from '@fortawesome/free-solid-svg-icons'; + import clsx from 'clsx'; -interface MenuItemProperty { +interface MenuItemProperties { className?: string; label: string; icon: IconDefinition; variant?: 'contained' | 'text'; intention?: 'none' | 'info' | 'danger' | 'primary'; disabled: boolean; - onClick: (event: React.MouseEvent) => void; + onClick: (row: TableRow) => void; } -export interface ButtonMenuProps { - menuItems: MenuItemProperty[]; +export interface ButtonMenuConfig { + tableRows: TableRow[]; + menuItems: MenuItemProperties[]; buttonIcon?: IconDefinition; } -export default function ButtonMenu({ menuItems, buttonIcon = faEllipsisVertical }: ButtonMenuProps) { +interface ButtonMenuProps extends ButtonMenuConfig { + rowIndex: number; +} + +export default function ButtonMenu({ tableRows, rowIndex, menuItems, buttonIcon = faEllipsisVertical }: ButtonMenuProps) { return (
@@ -43,7 +51,7 @@ export default function ButtonMenu({ menuItems, buttonIcon = faEllipsisVertical intention={menuItem.intention} align="between" disabled={menuItem.disabled} - onClick={menuItem.onClick} + onClick={() => menuItem.onClick(tableRows[rowIndex])} /> ))} diff --git a/src/components/Instance/InstanceOverview.tsx b/src/components/Instance/InstanceOverview.tsx index 924c8e50..54e5e9c9 100644 --- a/src/components/Instance/InstanceOverview.tsx +++ b/src/components/Instance/InstanceOverview.tsx @@ -2,7 +2,7 @@ import ClipboardTextfield from 'components/ClipboardTextfield'; import Label from 'components/Atoms/Label'; import { updateInstance } from 'data/InstanceList'; import { LodestoneContext } from 'data/LodestoneContext'; -import { useContext, useState } from 'react'; +import { useContext } from 'react'; import { axiosPutSingleValue, stateToLabelColor } from 'utils/util'; import EditableTextfield from 'components/EditableTextfield'; import { useQueryClient } from '@tanstack/react-query'; @@ -16,7 +16,7 @@ import InstancePlayerList from './InstancePlayerList'; import { Table, TableColumn, TableRow } from 'components/Table'; import { faTrashCan, faEdit, faSkull } from '@fortawesome/free-solid-svg-icons'; -import { ButtonMenuProps } from 'components/ButtonMenu'; +import { ButtonMenuConfig } from 'components/ButtonMenu'; const InstanceOverview = () => { useDocumentTitle('Dashboard - Lodestone'); @@ -121,7 +121,8 @@ const InstanceOverview = () => { { id: 30, make: 'Minox', model: '35 EL', lens: '35mm f/2.8', format: '35mm', year: 1974 }, ]; - const menuItems1: ButtonMenuProps = { + const menuItems1: ButtonMenuConfig = { + tableRows: rowsAnalog, menuItems: [ { label: 'Edit in file viewer', @@ -129,7 +130,7 @@ const InstanceOverview = () => { variant: 'text', intention: 'info', disabled: false, - onClick: () => console.log('Button 1 clicked'), + onClick: (row: TableRow) => console.log(`Edit on ${row.id}: ${row.make} ${row.model}`), }, { label: 'another one', @@ -137,7 +138,7 @@ const InstanceOverview = () => { variant: 'text', intention: 'info', disabled: false, - onClick: () => console.log('Button 1 clicked'), + onClick: (row: TableRow) => console.log(`Another on ${row.id}: ${row.make} ${row.model}`), }, { label: 'Obliterate', @@ -145,10 +146,11 @@ const InstanceOverview = () => { variant: 'text', intention: 'danger', disabled: false, - onClick: () => console.log('Button 2 clicked'), + onClick: (row: TableRow) => console.log(`Obliterate on ${row.id}: ${row.make} ${row.model}`), }, - ] + ], }; + return ( <> @@ -198,8 +200,8 @@ const InstanceOverview = () => {
-
-
+ {/*
*/} +
); diff --git a/src/components/Table.tsx b/src/components/Table.tsx index f19fac1e..dab7d37d 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -1,13 +1,12 @@ -import * as React from 'react'; -import clsx from "clsx"; - import ButtonMenu from './ButtonMenu'; -import { ButtonMenuProps } from './ButtonMenu'; +import { ButtonMenuConfig } from './ButtonMenu'; + +import clsx from "clsx"; export interface TableColumn { field: string; headerName: string; - element?: (row: TableRow) => React.ReactElement; + element?: (rows: TableRow[], rowIndex: number) => React.ReactElement; className?: string; } @@ -19,19 +18,23 @@ interface TableProps { rows: TableRow[]; columns: TableColumn[]; alignment?: 'even' | 'left'; - menuOptions?: ButtonMenuProps; + menuOptions?: ButtonMenuConfig; className?: string; } export function Table({rows, columns, alignment = 'even', menuOptions, className}: TableProps) { // If menuOptions is truthy, add an extra column for the menu buttons + // Add a unique index for each ButtonMenu created to control respective rows // If alignment === 'left', add 'w-full' to className of last column const modifiedColumns = menuOptions + // ? [...columns, { ? [...columns, { field: 'menu', headerName: '', - element: () => , + element: (rows: TableRow[], rowIndex: number) => ( + + ), className: `text-end ${alignment === 'left' ? 'w-full' : ''}`, }] : alignment == 'left' @@ -42,13 +45,13 @@ export function Table({rows, columns, alignment = 'even', menuOptions, className // Code currently uses arbitrary values for min and max width when alignment is set to left return ( -
+
{modifiedColumns.map((column, cIndex) => ( @@ -66,7 +69,7 @@ export function Table({rows, columns, alignment = 'even', menuOptions, className key={indexColumn} className={clsx("p-4 text-left text-white/50", column.className)} > - {column.element ? column.element(row) : row[column.field]} + {column.element ? column.element(rows, indexRow) : row[column.field]} ))} From 95a61c8ab4362ac8dc82b6cb635a15dd510bd1bc Mon Sep 17 00:00:00 2001 From: kevinzhangTT Date: Tue, 4 Apr 2023 01:32:15 -0400 Subject: [PATCH 057/108] removed mistake comment --- src/components/Table.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Table.tsx b/src/components/Table.tsx index dab7d37d..2c0818c0 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -28,7 +28,6 @@ export function Table({rows, columns, alignment = 'even', menuOptions, className // Add a unique index for each ButtonMenu created to control respective rows // If alignment === 'left', add 'w-full' to className of last column const modifiedColumns = menuOptions - // ? [...columns, { ? [...columns, { field: 'menu', headerName: '', From cea188bee025c06261a1bcbbeeeb7be9dcfd1009 Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Wed, 5 Apr 2023 01:31:10 -0400 Subject: [PATCH 058/108] added new style to generic box + moved logic to load generic instance --- .../Instance/Create/GameTypeSelectForm.tsx | 21 ++++- .../Instance/Create/SelectGenericGameCard.tsx | 80 ++++++++++++------- .../Instance/InstanceCreateForm.tsx | 34 +++++--- src/data/InstanceGameTypes.ts | 2 +- src/globals.css | 24 ++++++ 5 files changed, 120 insertions(+), 41 deletions(-) diff --git a/src/components/Instance/Create/GameTypeSelectForm.tsx b/src/components/Instance/Create/GameTypeSelectForm.tsx index 63fda520..098fef4c 100644 --- a/src/components/Instance/Create/GameTypeSelectForm.tsx +++ b/src/components/Instance/Create/GameTypeSelectForm.tsx @@ -17,6 +17,9 @@ export default function GameTypeSelectForm({ urlValid, setUrlValid, setUrl, + genericFetchReady, + setGenericFetchReady, + manifestLoading, className, }: { selectedGameType: GenericHandlerGameType; @@ -24,8 +27,12 @@ export default function GameTypeSelectForm({ urlValid: boolean; setUrlValid: Dispatch>; setUrl: (url: string) => void; + genericFetchReady: boolean; + setGenericFetchReady: Dispatch>; + manifestLoading: boolean; className?: string; }) { + console.log(selectedGameType); const { data: game_types, isLoading, error } = InstanceGameTypes(); if (!game_types || isLoading) { return ; @@ -50,13 +57,21 @@ export default function GameTypeSelectForm({ }} className={clsx( 'Generic' === selectedGameType && - 'enabled:border-gray-faded/50 enabled:bg-gray-700 enabled:outline-white/50' + 'enabled:generic-gametype-selected enabled:hover:generic-gametype-selected enabled:outline-white/50' )} onClick={() => setGameType('Generic')} + selectedGameType={selectedGameType} + urlValid={urlValid} setUrlValid={setUrlValid} setUrl={setUrl} - selected={'Generic' === selectedGameType} - errorText={!urlValid ? 'Invalid URL' : ''} + genericFetchReady={genericFetchReady} + setGenericFetchReady={setGenericFetchReady} + manifestLoading={manifestLoading} + errorText={ + !manifestLoading && genericFetchReady && !urlValid + ? 'Error fetching the instance' + : '' + } /> {game_types.map((game_type) => { const game = HandlerGameType_to_Game[game_type]; diff --git a/src/components/Instance/Create/SelectGenericGameCard.tsx b/src/components/Instance/Create/SelectGenericGameCard.tsx index c6a6eceb..fd708e08 100644 --- a/src/components/Instance/Create/SelectGenericGameCard.tsx +++ b/src/components/Instance/Create/SelectGenericGameCard.tsx @@ -2,15 +2,21 @@ import GameIcon from 'components/Atoms/GameIcon'; import React, { Dispatch, SetStateAction } from 'react'; import clsx from 'clsx'; import { Game } from 'bindings/Game'; +import Button from 'components/Atoms/Button'; +import { GenericHandlerGameType } from '../InstanceCreateForm'; const SelectGameCard = ({ title, description, game_type, className, onClick, + selectedGameType, + urlValid, setUrlValid, setUrl, - selected, + genericFetchReady, + setGenericFetchReady, + manifestLoading, errorText, }: { title: string; @@ -18,33 +24,27 @@ const SelectGameCard = ({ game_type: Game; className?: string; onClick?: (event: React.MouseEvent) => void; + selectedGameType: GenericHandlerGameType; + urlValid: boolean; setUrlValid: Dispatch>; setUrl: (url: string) => void; - selected: boolean; + genericFetchReady: boolean; + setGenericFetchReady: Dispatch>; + manifestLoading: boolean; errorText: string; }) => { - const backgroundImage = selected - ? 'linear-gradient(#303338, #303338), radial-gradient(circle at top left, #2AF588, #334675)' - : 'linear-gradient(#2B2D32, #2B2D32), radial-gradient(circle at top left, #2AF588, #334675)'; + console.log(selectedGameType); return (
{column.headerName}
*/} -
); From aff139d89b8411526590cfd138083694fc88fd14 Mon Sep 17 00:00:00 2001 From: Kevin Zhang <43940223+kevinzhangTT@users.noreply.github.com> Date: Fri, 7 Apr 2023 20:40:56 -0400 Subject: [PATCH 067/108] Update InstanceOverview.tsx --- src/components/Instance/InstanceOverview.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Instance/InstanceOverview.tsx b/src/components/Instance/InstanceOverview.tsx index 1af09996..68d1542f 100644 --- a/src/components/Instance/InstanceOverview.tsx +++ b/src/components/Instance/InstanceOverview.tsx @@ -62,7 +62,7 @@ const InstanceOverview = () => { ...oldData, description, })); - }; + }; return ( <> From 5cdf5619bdad7dba905b50e785cc1503ae38d7f3 Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Fri, 7 Apr 2023 23:17:14 -0400 Subject: [PATCH 068/108] fixed create form object parsing and added bindings --- src/bindings/ConfigurableManifest.ts | 4 ++ src/bindings/ConfigurableValue.ts | 3 + src/bindings/ConfigurableValueType.ts | 3 + src/bindings/ManifestValue.ts | 8 +++ src/bindings/SectionManifest.ts | 4 ++ src/bindings/SectionManifestValue.ts | 4 ++ src/bindings/SettingManifest.ts | 5 ++ src/bindings/SettingManifestValue.ts | 4 ++ src/bindings/SetupManifest.ts | 4 ++ src/bindings/SetupValue.ts | 4 ++ .../Instance/Create/FormCreation.tsx | 3 +- .../Instance/Create/GameTypeSelectForm.tsx | 2 +- src/components/Instance/Create/form.ts | 67 ++----------------- .../Instance/InstanceCreateForm.tsx | 42 ++++++------ .../InstanceSettingsCreate/SettingObject.ts | 45 +++++++------ 15 files changed, 94 insertions(+), 108 deletions(-) create mode 100644 src/bindings/ConfigurableManifest.ts create mode 100644 src/bindings/ConfigurableValue.ts create mode 100644 src/bindings/ConfigurableValueType.ts create mode 100644 src/bindings/ManifestValue.ts create mode 100644 src/bindings/SectionManifest.ts create mode 100644 src/bindings/SectionManifestValue.ts create mode 100644 src/bindings/SettingManifest.ts create mode 100644 src/bindings/SettingManifestValue.ts create mode 100644 src/bindings/SetupManifest.ts create mode 100644 src/bindings/SetupValue.ts diff --git a/src/bindings/ConfigurableManifest.ts b/src/bindings/ConfigurableManifest.ts new file mode 100644 index 00000000..5e733096 --- /dev/null +++ b/src/bindings/ConfigurableManifest.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { SectionManifest } from "./SectionManifest"; + +export interface ConfigurableManifest { instance_name: string, instance_description: string | null, auto_start: boolean, restart_on_crash: boolean, setting_sections: Record, } \ No newline at end of file diff --git a/src/bindings/ConfigurableValue.ts b/src/bindings/ConfigurableValue.ts new file mode 100644 index 00000000..eae90338 --- /dev/null +++ b/src/bindings/ConfigurableValue.ts @@ -0,0 +1,3 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type ConfigurableValue = { type: "String", value: string } | { type: "Integer", value: number } | { type: "UnsignedInteger", value: number } | { type: "Float", value: number } | { type: "Boolean", value: boolean } | { type: "Enum", value: string }; \ No newline at end of file diff --git a/src/bindings/ConfigurableValueType.ts b/src/bindings/ConfigurableValueType.ts new file mode 100644 index 00000000..fa2e5b05 --- /dev/null +++ b/src/bindings/ConfigurableValueType.ts @@ -0,0 +1,3 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type ConfigurableValueType = { type: "String", regex: string | null, } | { type: "Integer", min: number | null, max: number | null, } | { type: "UnsignedInteger", min: number | null, max: number | null, } | { type: "Float", min: number | null, max: number | null, } | { type: "Boolean" } | { type: "Enum", options: Array, }; \ No newline at end of file diff --git a/src/bindings/ManifestValue.ts b/src/bindings/ManifestValue.ts new file mode 100644 index 00000000..f4270574 --- /dev/null +++ b/src/bindings/ManifestValue.ts @@ -0,0 +1,8 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { SectionManifestValue } from "./SectionManifestValue.ts"; + +export interface ManifestValue { + auto_start: boolean; + restart_on_crash: boolean; + setting_sections: Record; +} diff --git a/src/bindings/SectionManifest.ts b/src/bindings/SectionManifest.ts new file mode 100644 index 00000000..d6626fa2 --- /dev/null +++ b/src/bindings/SectionManifest.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { SettingManifest } from "./SettingManifest"; + +export interface SectionManifest { section_id: string, name: string, description: string, settings: Record, } \ No newline at end of file diff --git a/src/bindings/SectionManifestValue.ts b/src/bindings/SectionManifestValue.ts new file mode 100644 index 00000000..787bad76 --- /dev/null +++ b/src/bindings/SectionManifestValue.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { SettingManifestValue } from "./SettingManifestValue"; + +export interface SectionManifestValue { settings: Record, } \ No newline at end of file diff --git a/src/bindings/SettingManifest.ts b/src/bindings/SettingManifest.ts new file mode 100644 index 00000000..81eddc03 --- /dev/null +++ b/src/bindings/SettingManifest.ts @@ -0,0 +1,5 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { ConfigurableValue } from "./ConfigurableValue"; +import type { ConfigurableValueType } from "./ConfigurableValueType"; + +export interface SettingManifest { setting_id: string, name: string, description: string, value: ConfigurableValue | null, value_type: ConfigurableValueType, default_value: ConfigurableValue | null, is_secret: boolean, is_required: boolean, is_mutable: boolean, } \ No newline at end of file diff --git a/src/bindings/SettingManifestValue.ts b/src/bindings/SettingManifestValue.ts new file mode 100644 index 00000000..13b8de37 --- /dev/null +++ b/src/bindings/SettingManifestValue.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { ConfigurableValue } from "./ConfigurableValue"; + +export interface SettingManifestValue { value: ConfigurableValue | null, } \ No newline at end of file diff --git a/src/bindings/SetupManifest.ts b/src/bindings/SetupManifest.ts new file mode 100644 index 00000000..7f801555 --- /dev/null +++ b/src/bindings/SetupManifest.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { SectionManifest } from "./SectionManifest"; + +export interface SetupManifest { setting_sections: Record, } \ No newline at end of file diff --git a/src/bindings/SetupValue.ts b/src/bindings/SetupValue.ts new file mode 100644 index 00000000..f9960e80 --- /dev/null +++ b/src/bindings/SetupValue.ts @@ -0,0 +1,4 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. +import type { SectionManifestValue } from "./SectionManifestValue"; + +export interface SetupValue { name: string, description: string | null, auto_start: boolean, restart_on_crash: boolean, setting_sections: Record, } \ No newline at end of file diff --git a/src/components/Instance/Create/FormCreation.tsx b/src/components/Instance/Create/FormCreation.tsx index 702dfa16..eebe2ac7 100644 --- a/src/components/Instance/Create/FormCreation.tsx +++ b/src/components/Instance/Create/FormCreation.tsx @@ -1,13 +1,12 @@ import FormInputField from './SetupFormFields/FormInputField'; import FormRadioField from './SetupFormFields/FormRadioField'; import FormComboField from './SetupFormFields/FormComboField'; -import { SettingManifest } from './form'; import { toast } from 'react-toastify'; import { FormPage } from '../InstanceCreateForm'; +import { SettingManifest } from 'bindings/SettingManifest'; export const createForm = (page: FormPage) => { const createField = (setting: SettingManifest, index: number) => { - console.log(setting); switch (setting.value_type.type) { case 'String': return ( diff --git a/src/components/Instance/Create/GameTypeSelectForm.tsx b/src/components/Instance/Create/GameTypeSelectForm.tsx index a26b8224..1796801a 100644 --- a/src/components/Instance/Create/GameTypeSelectForm.tsx +++ b/src/components/Instance/Create/GameTypeSelectForm.tsx @@ -28,7 +28,7 @@ export default function GameTypeSelectForm({ return ; } return ( -
+

Select a game

diff --git a/src/components/Instance/Create/form.ts b/src/components/Instance/Create/form.ts index 7444ca16..39004026 100644 --- a/src/components/Instance/Create/form.ts +++ b/src/components/Instance/Create/form.ts @@ -1,3 +1,7 @@ +import { ConfigurableValue } from 'bindings/ConfigurableValue'; +import { SectionManifest } from 'bindings/SectionManifest'; +import { SettingManifest } from 'bindings/SettingManifest'; +import { SetupManifest } from 'bindings/SetupManifest'; import * as yup from 'yup'; export const formId = 'minecraftCreateNewInstanceForm'; @@ -223,68 +227,5 @@ export const generateInitialValues = ( Object.keys(copySettingSections).forEach((sectionId: string) => { getInitialValue(sectionId); }); - console.log(initialValues); return initialValues; }; - -// export interface ConfigurableManifest { auto_start: boolean, restart_on_crash: boolean, start_on_connection: boolean, setting_sections: Record, } -export interface ManifestValue { - auto_start: boolean; - restart_on_crash: boolean; - start_on_connection: boolean; - setting_sections: Record; -} -export interface SectionManifest { - section_id: string; - name: string; - description: string; - settings: Record; -} -export interface SectionManifestValue { - settings: Record; -} -export interface SettingManifest { - setting_id: string; - name: string; - description: string; - value: ConfigurableValue | null; - value_type: ConfigurableValueType; - default_value: ConfigurableValue | null; - is_secret: boolean; - is_required: boolean; - is_mutable: boolean; -} -export interface SettingManifestValue { - value: ConfigurableValue | null; -} -export type ConfigurableValueType = - | { type: 'String'; regex: string | null } - | { type: 'Integer'; min: number | null; max: number | null } - | { type: 'UnsignedInteger'; min: number | null; max: number | null } - | { type: 'Float'; min: number | null; max: number | null } - | { type: 'Boolean' } - | { type: 'Enum'; options: Array }; -export type ConfigurableValue = - | { type: 'String'; value: string } - | { type: 'Integer'; value: number } - | { type: 'UnsignedInteger'; value: number } - | { type: 'Float'; value: number } - | { type: 'Boolean'; value: boolean } - | { type: 'Enum'; value: string }; -export interface SetupManifest { - setting_sections: Record; -} -export interface SetupValue { - name: string; - description: string | null; - auto_start: boolean; - restart_on_crash: boolean; - setting_sections: Record; -} -export interface ConfigurableManifest { - instance_name: string; - instance_description: string | null; - auto_start: boolean; - restart_on_crash: boolean; - setting_sections: Record; -} diff --git a/src/components/Instance/InstanceCreateForm.tsx b/src/components/Instance/InstanceCreateForm.tsx index 89204dd0..4c9ce216 100644 --- a/src/components/Instance/InstanceCreateForm.tsx +++ b/src/components/Instance/InstanceCreateForm.tsx @@ -7,11 +7,7 @@ import { axiosWrapper } from 'utils/util'; import { autoSettingPageObject, basicSettingsPageObject, - ConfigurableValue, formId, - SectionManifestValue, - SetupManifest, - SetupValue, } from './Create/form'; import { generateValidationSchema, generateInitialValues } from './Create/form'; import { createForm } from './Create/FormCreation'; @@ -25,6 +21,10 @@ import Spinner from 'components/DashboardLayout/Spinner'; import clsx from 'clsx'; import * as yup from 'yup'; import { GameInstanceContext } from 'data/GameInstanceContext'; +import { ConfigurableValue } from 'bindings/ConfigurableValue'; +import { SetupManifest } from 'bindings/SetupManifest'; +import { SetupValue } from 'bindings/SetupValue'; +import { SectionManifestValue } from 'bindings/SectionManifestValue'; export type GenericHandlerGameType = 'Generic' | HandlerGameType; export type FormPage = { @@ -158,11 +158,7 @@ export default function CreateGameInstance({ values: Record, actions: FormikHelpers> ) { - const sectionValues: Record = {}; - for (let i = 1; i < steps.length - 1; i++) { - const structure = getSectionValidationStructure(values, i); - sectionValues[structure[1]] = structure[0]; - } + const sectionValues = getSectionValidationStructure(values); const parsedValues: SetupValue = { name: values.name?.value as string, @@ -180,19 +176,25 @@ export default function CreateGameInstance({ } function getSectionValidationStructure( - values: Record, - step: number - ): [SectionManifestValue, string] { - if (!setup_manifest || step == 0) return [{ settings: {} }, '']; + values: Record + ): Record { + if (!setup_manifest) return {}; const sectionKeys = Object.keys(setup_manifest['setting_sections']); - const settingKeys = Object.keys( - setup_manifest['setting_sections'][sectionKeys[step - 1]]['settings'] - ); - const sectionValidation: SectionManifestValue = { settings: {} }; - for (const key of settingKeys) { - sectionValidation['settings'][key] = { value: values[key] }; + + const sectionValues: Record = {}; + + for (const sectionKey of sectionKeys) { + const sectionValidation: SectionManifestValue = { settings: {} }; + const settingKeys = Object.keys( + setup_manifest['setting_sections'][sectionKey]['settings'] + ); + for (const key of settingKeys) { + sectionValidation['settings'][key] = { value: values[key] }; + } + sectionValues[sectionKey] = sectionValidation; } - return [sectionValidation, sectionKeys[step - 1]]; + + return sectionValues; } async function _handleSubmit( diff --git a/src/components/Instance/InstanceSettingsCreate/SettingObject.ts b/src/components/Instance/InstanceSettingsCreate/SettingObject.ts index 1ecb5a29..f48d1967 100644 --- a/src/components/Instance/InstanceSettingsCreate/SettingObject.ts +++ b/src/components/Instance/InstanceSettingsCreate/SettingObject.ts @@ -1,9 +1,7 @@ -import { - ConfigurableValueType, - ConfigurableValue, - SectionManifest, - ConfigurableManifest, -} from '../Create/form'; +import { ConfigurableManifest } from 'bindings/ConfigurableManifest'; +import { ConfigurableValue } from 'bindings/ConfigurableValue'; +import { ConfigurableValueType } from 'bindings/ConfigurableValueType'; +import { SectionManifest } from 'bindings/SectionManifest'; export type SectionFieldObject = { section_id: string; @@ -13,14 +11,14 @@ export type SectionFieldObject = { }; export type SettingFieldObject = { - name: string; - type: 'toggle' | 'number' | 'text' | 'dropdown' | 'password'; - options?: string[]; - description?: string; - value: ConfigurableValue | null; - min?: number | null; - max?: number | null; - is_mutable: boolean; + name: string; + type: 'toggle' | 'number' | 'text' | 'dropdown' | 'password'; + options?: string[]; + description?: string; + value: ConfigurableValue | null; + min?: number | null; + max?: number | null; + is_mutable: boolean; }; export const generateSectionDataObject = (settingSection: SectionManifest) => { @@ -57,7 +55,11 @@ export const generateSectionDataObject = (settingSection: SectionManifest) => { }; if (setting.value_type.type === 'Enum') settingsObject[settingKey].options = setting.value_type.options; - if (setting.value_type.type === 'UnsignedInteger' || setting.value_type.type === 'Integer' || setting.value_type.type === 'Float'){ + if ( + setting.value_type.type === 'UnsignedInteger' || + setting.value_type.type === 'Integer' || + setting.value_type.type === 'Float' + ) { settingsObject[settingKey].min = setting.value_type.min; settingsObject[settingKey].max = setting.value_type.max; } @@ -73,12 +75,11 @@ export const generateSectionDataObject = (settingSection: SectionManifest) => { return sectionDataObject; }; - export const iterateSections = (manifest: ConfigurableManifest) => { - const fieldSections:SectionFieldObject[] = [] - Object.keys(manifest["setting_sections"]).forEach((sectionKey) => { - const section = manifest["setting_sections"][sectionKey]; + const fieldSections: SectionFieldObject[] = []; + Object.keys(manifest['setting_sections']).forEach((sectionKey) => { + const section = manifest['setting_sections'][sectionKey]; fieldSections.push(generateSectionDataObject(section)); - }) - return fieldSections -} \ No newline at end of file + }); + return fieldSections; +}; From 690558c7a1b1877df841a53c1b0e1aef9ff0b5c8 Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Fri, 7 Apr 2023 23:23:29 -0400 Subject: [PATCH 069/108] added toast for instance creation error + removed button flicker --- .../Instance/InstanceCreateForm.tsx | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/components/Instance/InstanceCreateForm.tsx b/src/components/Instance/InstanceCreateForm.tsx index 4c9ce216..f3974a9e 100644 --- a/src/components/Instance/InstanceCreateForm.tsx +++ b/src/components/Instance/InstanceCreateForm.tsx @@ -25,6 +25,7 @@ import { ConfigurableValue } from 'bindings/ConfigurableValue'; import { SetupManifest } from 'bindings/SetupManifest'; import { SetupValue } from 'bindings/SetupValue'; import { SectionManifestValue } from 'bindings/SectionManifestValue'; +import { toast } from 'react-toastify'; export type GenericHandlerGameType = 'Generic' | HandlerGameType; export type FormPage = { @@ -116,12 +117,12 @@ export default function CreateGameInstance({ } if (!isLoading && !error) { + if (gameType === 'Generic' && genericFetchReady) setUrlValid(true); //value fetched with no errors (this is to cover the initial case when nothing has been fetched yet) setInitialValues( generateInitialValues(setup_manifest['setting_sections']) ); setValidationSchema(generateValidationSchema(setup_manifest)); setSetupManifest(setup_manifest); - if (gameType === 'Generic' && genericFetchReady) setUrlValid(true); //value fetched with no errors (this is to cover the initial case when nothing has been fetched yet) } }, [gameType, isLoading, setup_manifest, error, genericFetchReady]); @@ -146,12 +147,16 @@ export default function CreateGameInstance({ ]; const formReady = activeStep === steps.length - 1; const createInstance = async (value: SetupValue) => { - await axiosWrapper({ - method: 'post', - url: `/instance/create/${gameType}`, - headers: { 'Content-Type': 'application/json' }, - data: JSON.stringify(value), - }); + try { + await axiosWrapper({ + method: 'post', + url: `/instance/create/${gameType}`, + headers: { 'Content-Type': 'application/json' }, + data: JSON.stringify(value), + }); + } catch (e) { + toast.error('Error creating instance: ' + e); + } }; async function _submitForm( From 37dbcd5f0f1a2607f8ff23ec3c81c20050ccb687 Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Fri, 7 Apr 2023 23:32:24 -0400 Subject: [PATCH 070/108] fixed import --- src/data/InstanceGameTypes.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/InstanceGameTypes.ts b/src/data/InstanceGameTypes.ts index cdb37855..253096f9 100644 --- a/src/data/InstanceGameTypes.ts +++ b/src/data/InstanceGameTypes.ts @@ -1,7 +1,7 @@ import { HandlerGameType } from 'bindings/HandlerGameType'; import { useQuery } from '@tanstack/react-query'; import axios, { AxiosError } from 'axios'; -import { SetupManifest } from 'components/Instance/Create/form'; +import { SetupManifest } from 'bindings/SetupManifest'; import { GenericHandlerGameType } from 'components/Instance/InstanceCreateForm'; export const InstanceGameTypes = () => useQuery(['games'], async () => { From adf5745b056fe554f45ce05b189c14b3c35f8986 Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Fri, 7 Apr 2023 23:45:41 -0400 Subject: [PATCH 071/108] resolve import errors from new bindings --- src/bindings/ManifestValue.ts | 2 +- src/components/Instance/Create/form.ts | 3 --- src/components/SettingField.tsx | 2 +- src/data/InstanceManifest.ts | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/bindings/ManifestValue.ts b/src/bindings/ManifestValue.ts index f4270574..04a4619c 100644 --- a/src/bindings/ManifestValue.ts +++ b/src/bindings/ManifestValue.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { SectionManifestValue } from "./SectionManifestValue.ts"; +import type { SectionManifestValue } from './SectionManifestValue'; export interface ManifestValue { auto_start: boolean; diff --git a/src/components/Instance/Create/form.ts b/src/components/Instance/Create/form.ts index 39004026..9c52c595 100644 --- a/src/components/Instance/Create/form.ts +++ b/src/components/Instance/Create/form.ts @@ -103,10 +103,7 @@ export const autoSettingPageObject: SectionManifest = { export const generateValidationSchema = (instanceManifest: SetupManifest) => { const validationSchema: any[] = []; - // instanceManifest['setting_sections']['basic_settings'] = - // basicSettingsPageObject; const setting_sections = instanceManifest['setting_sections']; - // setting_sections['auto_settings'] = autoSettingPageObject; validationSchema.push(yup.object().shape({})); //for select game type const generateYupObject = (setting: SettingManifest) => { diff --git a/src/components/SettingField.tsx b/src/components/SettingField.tsx index 7bdf1169..7f801bc1 100644 --- a/src/components/SettingField.tsx +++ b/src/components/SettingField.tsx @@ -7,7 +7,7 @@ import { useState } from 'react'; import { useIsomorphicLayoutEffect } from 'usehooks-ts'; import { useUserAuthorized } from 'data/UserInfo'; import ToggleBox from './Atoms/Config/ToggleBox'; -import { ConfigurableValue } from './Instance/Create/form'; +import { ConfigurableValue } from 'bindings/ConfigurableValue'; import { AxiosError } from 'axios'; import { toast } from 'react-toastify'; import { SettingFieldObject } from './Instance/InstanceSettingsCreate/SettingObject'; diff --git a/src/data/InstanceManifest.ts b/src/data/InstanceManifest.ts index c0d58a80..78c00729 100644 --- a/src/data/InstanceManifest.ts +++ b/src/data/InstanceManifest.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; import axios, { AxiosError } from 'axios'; -import { ConfigurableManifest } from 'components/Instance/Create/form'; +import { ConfigurableManifest } from 'bindings/ConfigurableManifest'; export const useInstanceManifest = (uuid: string) => { return useQuery( From d91051fac0d21f82789b20ccf4e98d3eb6f5bc7a Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Sat, 8 Apr 2023 17:09:41 -0400 Subject: [PATCH 072/108] small refactor and bug fixes --- .../Instance/Create/GameTypeSelectForm.tsx | 11 ++---- .../Instance/Create/SelectGenericGameCard.tsx | 5 ++- .../Instance/InstanceCreateForm.tsx | 38 ++++++++++--------- src/data/GameInstanceContext.tsx | 7 ++++ 4 files changed, 35 insertions(+), 26 deletions(-) diff --git a/src/components/Instance/Create/GameTypeSelectForm.tsx b/src/components/Instance/Create/GameTypeSelectForm.tsx index 1796801a..fca0c4a1 100644 --- a/src/components/Instance/Create/GameTypeSelectForm.tsx +++ b/src/components/Instance/Create/GameTypeSelectForm.tsx @@ -7,22 +7,20 @@ import { game_to_game_title, HandlerGameType_to_Game, } from 'data/GameTypeMappings'; -import { GenericHandlerGameType } from '../InstanceCreateForm'; import SelectGenericGameCard from './SelectGenericGameCard'; - +import { GameInstanceContext } from 'data/GameInstanceContext'; +import { useContext } from 'react'; export default function GameTypeSelectForm({ - selectedGameType, - setGameType, manifestLoading, manifestError, className, }: { - selectedGameType: GenericHandlerGameType; - setGameType: (gameType: GenericHandlerGameType) => void; manifestLoading: boolean; manifestError: boolean; className?: string; }) { + const { gameType: selectedGameType, setGameType } = + useContext(GameInstanceContext); const { data: game_types, isLoading } = InstanceGameTypes(); if (!game_types || isLoading) { return ; @@ -50,7 +48,6 @@ export default function GameTypeSelectForm({ 'enabled:generic-gametype-selected enabled:hover:generic-gametype-selected enabled:outline-white/50' )} onClick={() => setGameType('Generic')} - selectedGameType={selectedGameType} manifestLoading={manifestLoading} errorText={manifestError ? 'Error fetching the instance' : ''} /> diff --git a/src/components/Instance/Create/SelectGenericGameCard.tsx b/src/components/Instance/Create/SelectGenericGameCard.tsx index 806bc008..dc44d7d3 100644 --- a/src/components/Instance/Create/SelectGenericGameCard.tsx +++ b/src/components/Instance/Create/SelectGenericGameCard.tsx @@ -11,7 +11,6 @@ const SelectGenericGameCard = ({ game_type, className, onClick, - selectedGameType, manifestLoading, errorText, }: { @@ -20,11 +19,12 @@ const SelectGenericGameCard = ({ game_type: Game; className?: string; onClick?: (event: React.MouseEvent) => void; - selectedGameType: GenericHandlerGameType; manifestLoading: boolean; errorText: string; }) => { const { + gameType: selectedGameType, + setGameType, setUrl, urlValid, setUrlValid, @@ -67,6 +67,7 @@ const SelectGenericGameCard = ({ errorText ? 'input-border-error' : 'input-border-normal' }`} onChange={(e) => { + if (selectedGameType !== 'Generic') setGameType('Generic'); setUrl(e.target.value); setGenericFetchReady(false); setUrlValid(false); diff --git a/src/components/Instance/InstanceCreateForm.tsx b/src/components/Instance/InstanceCreateForm.tsx index f3974a9e..2e8ab202 100644 --- a/src/components/Instance/InstanceCreateForm.tsx +++ b/src/components/Instance/InstanceCreateForm.tsx @@ -36,8 +36,6 @@ export type FormPage = { function _renderStepContent( step: number, - gameType: GenericHandlerGameType, - setGameType: (gameType: GenericHandlerGameType) => void, isLoading: boolean, error: boolean, setupManifest?: SetupManifest | null @@ -70,12 +68,7 @@ function _renderStepContent( return ( <> {step == 0 ? ( - + ) : ( forms[step - 1] )} @@ -115,7 +108,6 @@ export default function CreateGameInstance({ setGenericFetchReady(false); setUrlValid(false); } - if (!isLoading && !error) { if (gameType === 'Generic' && genericFetchReady) setUrlValid(true); //value fetched with no errors (this is to cover the initial case when nothing has been fetched yet) setInitialValues( @@ -148,12 +140,21 @@ export default function CreateGameInstance({ const formReady = activeStep === steps.length - 1; const createInstance = async (value: SetupValue) => { try { - await axiosWrapper({ - method: 'post', - url: `/instance/create/${gameType}`, - headers: { 'Content-Type': 'application/json' }, - data: JSON.stringify(value), - }); + if (gameType === 'Generic') { + await axiosWrapper({ + method: 'post', + url: `/instance/create_generic`, + headers: { 'Content-Type': 'application/json' }, + data: JSON.stringify({ url: url, setup_value: value }), + }); + } else { + await axiosWrapper({ + method: 'post', + url: `/instance/create/${gameType}`, + headers: { 'Content-Type': 'application/json' }, + data: JSON.stringify(value), + }); + } } catch (e) { toast.error('Error creating instance: ' + e); } @@ -206,6 +207,7 @@ export default function CreateGameInstance({ values: Record, actions: FormikHelpers> ) { + console.log('hey'); if (formReady) { _submitForm(values, actions); } else { @@ -219,12 +221,16 @@ export default function CreateGameInstance({ } function _handleBack() { + setGenericFetchReady(false); + setUrlValid(false); setActiveStep(activeStep - 1); } return ( {_renderStepContent( activeStep, - gameType, - setGameType, isLoading, error ? true : false, setupManifest diff --git a/src/data/GameInstanceContext.tsx b/src/data/GameInstanceContext.tsx index 64de4b5e..e5e2968c 100644 --- a/src/data/GameInstanceContext.tsx +++ b/src/data/GameInstanceContext.tsx @@ -1,6 +1,9 @@ +import { GenericHandlerGameType } from 'components/Instance/InstanceCreateForm'; import { createContext } from 'react'; type GameInstanceContextValue = { + gameType: GenericHandlerGameType; + setGameType: (gameType: GenericHandlerGameType) => void; urlValid: boolean; setUrlValid: (value: boolean) => void; url: string; @@ -10,6 +13,10 @@ type GameInstanceContextValue = { }; export const GameInstanceContext = createContext({ + gameType: 'Generic', + setGameType: () => { + throw new Error('CreateGameInstanceContext not initialized'); + }, urlValid: false, setUrlValid: () => { throw new Error('CreateGameInstanceContext not initialized'); From 26da2bb47b06bfaeef2866fd90455bffe2ab3b1a Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Sat, 8 Apr 2023 18:01:34 -0400 Subject: [PATCH 073/108] enter key detection when url field is focused for generic --- src/components/Instance/Create/SelectGenericGameCard.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/Instance/Create/SelectGenericGameCard.tsx b/src/components/Instance/Create/SelectGenericGameCard.tsx index dc44d7d3..508eef6f 100644 --- a/src/components/Instance/Create/SelectGenericGameCard.tsx +++ b/src/components/Instance/Create/SelectGenericGameCard.tsx @@ -1,5 +1,5 @@ import GameIcon from 'components/Atoms/GameIcon'; -import React, { useContext } from 'react'; +import React, { useContext, useEffect, KeyboardEvent } from 'react'; import clsx from 'clsx'; import { Game } from 'bindings/Game'; import Button from 'components/Atoms/Button'; @@ -32,6 +32,12 @@ const SelectGenericGameCard = ({ setGenericFetchReady, } = useContext(GameInstanceContext); + const handleKeyPress = (event: KeyboardEvent) => { + if (event.key === 'Enter') { + setGenericFetchReady(true); + } + }; + const buttonStatus = genericFetchReady ? manifestLoading ? 'Fetching...' @@ -77,6 +83,7 @@ const SelectGenericGameCard = ({ disabled={ buttonStatus === 'Loaded!' || buttonStatus === 'Fetching...' } + onKeyDown={handleKeyPress} />
diff --git a/src/components/Instance/InstanceCreateForm.tsx b/src/components/Instance/InstanceCreateForm.tsx index 2e8ab202..e71b3337 100644 --- a/src/components/Instance/InstanceCreateForm.tsx +++ b/src/components/Instance/InstanceCreateForm.tsx @@ -207,7 +207,6 @@ export default function CreateGameInstance({ values: Record, actions: FormikHelpers> ) { - console.log('hey'); if (formReady) { _submitForm(values, actions); } else { From 41710e187d79356155563741aa44accd2eaef409 Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Tue, 11 Apr 2023 00:22:29 -0400 Subject: [PATCH 075/108] added url sanity check + restructured error text logic --- .../Instance/Create/SelectGenericGameCard.tsx | 70 ++++++++++++++----- 1 file changed, 51 insertions(+), 19 deletions(-) diff --git a/src/components/Instance/Create/SelectGenericGameCard.tsx b/src/components/Instance/Create/SelectGenericGameCard.tsx index 07cffad1..dc1a4e8e 100644 --- a/src/components/Instance/Create/SelectGenericGameCard.tsx +++ b/src/components/Instance/Create/SelectGenericGameCard.tsx @@ -1,5 +1,11 @@ import GameIcon from 'components/Atoms/GameIcon'; -import React, { useContext, useEffect, KeyboardEvent } from 'react'; +import React, { + useContext, + useEffect, + KeyboardEvent, + useState, + useMemo, +} from 'react'; import clsx from 'clsx'; import { Game } from 'bindings/Game'; import Button from 'components/Atoms/Button'; @@ -33,12 +39,6 @@ const SelectGenericGameCard = ({ setGenericFetchReady, } = useContext(GameInstanceContext); - const handleKeyPress = (event: KeyboardEvent) => { - if (event.key === 'Enter') { - setGenericFetchReady(true); - } - }; - const buttonStatus = genericFetchReady ? manifestLoading ? 'Fetching...' @@ -46,6 +46,45 @@ const SelectGenericGameCard = ({ ? 'Loaded!' : 'Load Instance' : 'Load Instance'; + + const handleKeyPress = (event: KeyboardEvent) => { + if (event.key === 'Enter' && !disableLoadButton) { + loadInstanceFunc(); + } + }; + + const isValidUrl = (url: string) => { + try { + new URL(url); + return true; + } catch (_) { + return false; + } + }; + + const [urlErrorText, setUrlErrorText] = useState(''); + const disableLoadButton = useMemo(() => { + return ( + buttonStatus === 'Loaded!' || + buttonStatus === 'Fetching...' || + selectedGameType !== 'Generic' || + url === '' + ); + }, [buttonStatus, selectedGameType, url]); + + useEffect(() => { + setUrlErrorText(errorText); + }, [errorText]); + + const loadInstanceFunc = () => { + if (!isValidUrl(url)) { + setUrlErrorText('Invalid Url'); + return; + } + setUrlErrorText(''); + setGenericFetchReady(true); + }; + return (
- {errorText && ( + {urlErrorText && (
- {errorText || 'Unknown error'} + {urlErrorText || 'Unknown error'}
)} From 219069f88271b1640dc9a830c713b000f021d092 Mon Sep 17 00:00:00 2001 From: NicholasLin718 Date: Tue, 11 Apr 2023 00:26:52 -0400 Subject: [PATCH 076/108] removed error text when generic type is not selected --- .../Instance/Create/SelectGenericGameCard.tsx | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/components/Instance/Create/SelectGenericGameCard.tsx b/src/components/Instance/Create/SelectGenericGameCard.tsx index dc1a4e8e..509f1730 100644 --- a/src/components/Instance/Create/SelectGenericGameCard.tsx +++ b/src/components/Instance/Create/SelectGenericGameCard.tsx @@ -9,7 +9,6 @@ import React, { import clsx from 'clsx'; import { Game } from 'bindings/Game'; import Button from 'components/Atoms/Button'; -import { GenericHandlerGameType } from '../InstanceCreateForm'; import { GameInstanceContext } from 'data/GameInstanceContext'; const SelectGenericGameCard = ({ title, @@ -47,21 +46,6 @@ const SelectGenericGameCard = ({ : 'Load Instance' : 'Load Instance'; - const handleKeyPress = (event: KeyboardEvent) => { - if (event.key === 'Enter' && !disableLoadButton) { - loadInstanceFunc(); - } - }; - - const isValidUrl = (url: string) => { - try { - new URL(url); - return true; - } catch (_) { - return false; - } - }; - const [urlErrorText, setUrlErrorText] = useState(''); const disableLoadButton = useMemo(() => { return ( @@ -85,6 +69,21 @@ const SelectGenericGameCard = ({ setGenericFetchReady(true); }; + const handleKeyPress = (event: KeyboardEvent) => { + if (event.key === 'Enter' && !disableLoadButton) { + loadInstanceFunc(); + } + }; + + const isValidUrl = (url: string) => { + try { + new URL(url); + return true; + } catch (_) { + return false; + } + }; + return ( +
@@ -127,6 +143,7 @@ const SelectGenericGameCard = ({ onKeyDown={handleKeyPress} />
void; onEmptyClick: () => void; + pasteFiles: (path: string) => void; onFileClick: (file: ClientFile) => void; setCreateFileModalOpen: (modalOpen: boolean) => void; setRenameFileModalOpen: (modalOpen: boolean) => void; setCreateFolderModalOpen: (modalOpen: boolean) => void; setModalPath: (modalPath: string) => void; setClipboard: (clipboard: ClientFile[]) => void; + clipboardAction: 'copy' | 'cut'; setClipboardAction: (clipboardAction: 'copy' | 'cut') => void; setTickedFiles: (tickedFiles: ClientFile[]) => void; deleteSingleFile: (file: ClientFile) => void; @@ -74,7 +80,7 @@ export default function FileList({ const [absCoords, setAbsCoords] = useState({x: 0, y: 0}) const [boundingDivDimensions, setBoundingDivDimensions] = useState({ height: 0, width: 0}) - const contextMenuDimensions = { height: 234, width: 176 } + const contextMenuDimensions = { height: 260, width: 176 } useEffect(() => { if (boundingDivRef.current !== null) { @@ -82,6 +88,11 @@ export default function FileList({ } }, [boundingDivRef]); + useEffect(() => { + console.log(clipboard) + console.log(clipboard !== undefined) + }, [clipboard]) + useEffect(() => { if (boundingDivRef.current !== null) { setAbsCoords({ @@ -138,6 +149,7 @@ export default function FileList({ { showContextMenu && @@ -225,7 +239,8 @@ export default function FileList({

onFileClick(file)} > diff --git a/src/components/FileViewer/FileViewer.tsx b/src/components/FileViewer/FileViewer.tsx index c66f8d6f..8601eef9 100644 --- a/src/components/FileViewer/FileViewer.tsx +++ b/src/components/FileViewer/FileViewer.tsx @@ -158,7 +158,7 @@ export default function FileViewer() { setTickedFiles([]); }; - const pasteFiles = async () => { + const pasteFiles = async (currentPath: string) => { if (!clipboard) return; if (clipboardAction === 'copy') throw new Error('copying files is not implemented yet'); @@ -167,12 +167,12 @@ export default function FileViewer() { console.log( 'moving', file.path, - `${path} | ${directorySeparator} | ${file.name}` + `${currentPath} | ${directorySeparator} | ${file.name}` ); await moveInstanceFileOrDirectory( instance.uuid, file.path, - `${path}${directorySeparator}${file.name}`, + `${currentPath}${directorySeparator}${file.name}`, queryClient, directorySeparator ); @@ -470,7 +470,7 @@ export default function FileViewer() { clipboard.length > 1 ? 'files' : 'file' }`} icon={faPaste} - onClick={pasteFiles} + onClick={() => pasteFiles(path)} /> )} {showingMonaco && ( @@ -532,11 +532,13 @@ export default function FileViewer() { path={path} atTopLevel={atTopLevel} fileList={fileList} + clipboard={clipboard} loading={fileListLoading} error={fileListError} tickedFiles={tickedFiles} tickFile={tickFile} unzipFile={unzipFile} + pasteFiles={pasteFiles} openedFile={openedFile} onParentClick={() => setPath(parentPath(path, directorySeparator), false) @@ -557,6 +559,7 @@ export default function FileViewer() { setRenameFileModalOpen={setRenameFileModalOpen} setModalPath={setModalPath} setClipboard={setClipboard} + clipboardAction={clipboardAction} setClipboardAction={setClipboardAction} setTickedFiles={setTickedFiles} deleteSingleFile={deleteSingleFile} From f9d80558570e360b2d4affc02de62d4cae3dad05 Mon Sep 17 00:00:00 2001 From: Dan S Date: Thu, 4 May 2023 18:31:27 -0600 Subject: [PATCH 080/108] fix loss of transparency on dir change, add brackets to conditional statement --- src/components/FileViewer/FileContextMenu.tsx | 2 +- src/components/FileViewer/FileList.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/FileViewer/FileContextMenu.tsx b/src/components/FileViewer/FileContextMenu.tsx index 4f58e124..cd45782d 100644 --- a/src/components/FileViewer/FileContextMenu.tsx +++ b/src/components/FileViewer/FileContextMenu.tsx @@ -105,7 +105,7 @@ const FileContextMenu = forwardRef( label="Paste" // subLabel={ isMac ? "⌘+C" : "CTRL+C"} onClick={() => { - pasteFiles(file === null || (file as ClientFile).file_type !== 'Directory' ? currentPath : (file as ClientFile).path); + pasteFiles((file === null || (file as ClientFile).file_type !== 'Directory') ? currentPath : (file as ClientFile).path); setShowContextMenu(false); }} disabled={clipboard?.length === 0} diff --git a/src/components/FileViewer/FileList.tsx b/src/components/FileViewer/FileList.tsx index c8bd5e46..4906af8d 100644 --- a/src/components/FileViewer/FileList.tsx +++ b/src/components/FileViewer/FileList.tsx @@ -90,8 +90,8 @@ export default function FileList({ useEffect(() => { console.log(clipboard) - console.log(clipboard !== undefined) - }, [clipboard]) + console.log(clipboardAction) + }, []) useEffect(() => { if (boundingDivRef.current !== null) { @@ -240,7 +240,7 @@ export default function FileList({ className={clsx( 'truncate text-gray-300 hover:cursor-pointer hover:text-blue-200 hover:underline', openedFile?.path === file.path && 'italic', - clipboardAction === 'cut' && clipboard?.includes(file) && 'text-opacity-60 ', + clipboardAction === 'cut' && clipboard?.some(f => f.path === file.path) && 'text-opacity-60 ', )} onClick={() => onFileClick(file)} > From efcf64a104dfa2b6fd04f83fbd7d076ab0549bd7 Mon Sep 17 00:00:00 2001 From: Dan S Date: Thu, 4 May 2023 18:32:12 -0600 Subject: [PATCH 081/108] remove debugging console.log calls --- src/components/FileViewer/FileList.tsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/components/FileViewer/FileList.tsx b/src/components/FileViewer/FileList.tsx index 4906af8d..5e37fb86 100644 --- a/src/components/FileViewer/FileList.tsx +++ b/src/components/FileViewer/FileList.tsx @@ -88,11 +88,6 @@ export default function FileList({ } }, [boundingDivRef]); - useEffect(() => { - console.log(clipboard) - console.log(clipboardAction) - }, []) - useEffect(() => { if (boundingDivRef.current !== null) { setAbsCoords({ From 46ba87185d62605ebf968590f01fe631450b1867 Mon Sep 17 00:00:00 2001 From: Dan S Date: Thu, 4 May 2023 18:41:29 -0600 Subject: [PATCH 082/108] make syntax nicer --- src/components/FileViewer/FileContextMenu.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/FileViewer/FileContextMenu.tsx b/src/components/FileViewer/FileContextMenu.tsx index cd45782d..12a80125 100644 --- a/src/components/FileViewer/FileContextMenu.tsx +++ b/src/components/FileViewer/FileContextMenu.tsx @@ -105,7 +105,7 @@ const FileContextMenu = forwardRef( label="Paste" // subLabel={ isMac ? "⌘+C" : "CTRL+C"} onClick={() => { - pasteFiles((file === null || (file as ClientFile).file_type !== 'Directory') ? currentPath : (file as ClientFile).path); + pasteFiles(file?.file_type !== 'Directory' ? currentPath : file?.path); setShowContextMenu(false); }} disabled={clipboard?.length === 0} From 7032e023355463a3f9006e1bb28d4fa6c187e1dc Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Sun, 14 May 2023 00:22:37 -0400 Subject: [PATCH 083/108] fixed some random bug --- .../Instance/Create/SelectGenericGameCard.tsx | 7 +++---- src/components/Instance/InstanceCreateForm.tsx | 13 ++++++------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/components/Instance/Create/SelectGenericGameCard.tsx b/src/components/Instance/Create/SelectGenericGameCard.tsx index 849888ad..03d08956 100644 --- a/src/components/Instance/Create/SelectGenericGameCard.tsx +++ b/src/components/Instance/Create/SelectGenericGameCard.tsx @@ -25,7 +25,7 @@ const SelectGenericGameCard = ({ description: string; game_type: Game; className?: string; - onClick?: (event: React.MouseEvent) => void; + onClick?: () => void; manifestLoading: boolean; errorText: string; }) => { @@ -87,8 +87,7 @@ const SelectGenericGameCard = ({ }; return ( - +

); }; diff --git a/src/components/Instance/InstanceCreateForm.tsx b/src/components/Instance/InstanceCreateForm.tsx index e76abef7..73b34ade 100644 --- a/src/components/Instance/InstanceCreateForm.tsx +++ b/src/components/Instance/InstanceCreateForm.tsx @@ -35,7 +35,7 @@ export type FormPage = { page: SetupManifest; }; -export default function CreateGameInstance({ +export default function InstanceCreateForm({ onComplete, }: { onComplete: () => void; @@ -210,15 +210,14 @@ export default function CreateGameInstance({ } function handleBack() { - setGenericFetchReady(false); - setUrlValid(false); + if(activeStep === 1) { + setGenericFetchReady(false); + setUrlValid(false); + setUrl(''); + } setActiveStep(activeStep - 1); } - if (!setupManifest) return ; - - console.log('setupManifest.setting_sections', setupManifest.setting_sections); - return ( Date: Sun, 14 May 2023 00:34:01 -0400 Subject: [PATCH 084/108] commented out generic game card --- src/components/Instance/Create/GameTypeSelectForm.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Instance/Create/GameTypeSelectForm.tsx b/src/components/Instance/Create/GameTypeSelectForm.tsx index ac3f3a67..96967663 100644 --- a/src/components/Instance/Create/GameTypeSelectForm.tsx +++ b/src/components/Instance/Create/GameTypeSelectForm.tsx @@ -34,7 +34,7 @@ export default function GameTypeSelectForm({ What will your instance be used for?

- setGameType('Generic')} manifestLoading={manifestLoading} errorText={manifestError ? 'Error fetching the instance' : ''} - /> + /> */} {game_types.map((game_type) => { const game = HandlerGameType_to_Game[game_type]; return ( From 5a2ccc4f67f62ed4c163ae4d92c3e839c440c769 Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Sun, 14 May 2023 00:38:33 -0400 Subject: [PATCH 085/108] bumped version down to 0.4.4 --- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 4 ++-- src-tauri/tauri.conf.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 5262236d..2a19286f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lodestone", - "version": "0.5.0", + "version": "0.4.4", "private": true, "scripts": { "dev": "next dev -p 3001", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index bbedaf84..0ce17eb3 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -3582,7 +3582,7 @@ dependencies = [ [[package]] name = "lodestone-client" -version = "0.5.0" +version = "0.4.4" dependencies = [ "lodestone_core", "portpicker", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 346c839b..a17eb627 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lodestone-client" -version = "0.5.0" +version = "0.4.4" description = "Lodestone's Desktop Client" authors = ["Lodestone-Team"] license = "" @@ -20,7 +20,7 @@ serde = { version = "1.0", features = ["derive"] } tauri = { version = "1.1.1", features = ["api-all", "devtools", "updater"] } tauri-plugin-localhost = "0.1.0" portpicker = "0.1" -lodestone_core = {git = "https://github.com/Lodestone-Team/lodestone_core", branch = "releases/0.5.0"} +lodestone_core = {git = "https://github.com/Lodestone-Team/lodestone_core", branch = "main"} tokio = { version = "1.21.1", features = ["macros", "rt"] } [features] diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 80a5d43d..a92c56b9 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -9,7 +9,7 @@ }, "package": { "productName": "Lodestone", - "version": "0.5.0" + "version": "0.4.4" }, "tauri": { "allowlist": { From ef7f20bb8f66bfe08aa52f5f4d26918676423d07 Mon Sep 17 00:00:00 2001 From: Peter Jiang <47200772+CheatCod@users.noreply.github.com> Date: Mon, 15 May 2023 01:07:55 -0400 Subject: [PATCH 086/108] cargo update --- src-tauri/Cargo.lock | 1218 +++++++++++++++++++----------------------- 1 file changed, 558 insertions(+), 660 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 0ce17eb3..5cfe38ad 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -27,6 +27,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + [[package]] name = "aead" version = "0.5.2" @@ -170,6 +176,9 @@ name = "arrayvec" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +dependencies = [ + "serde", +] [[package]] name = "ascii" @@ -177,6 +186,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" +[[package]] +name = "ash" +version = "0.37.2+1.3.238" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03" +dependencies = [ + "libloading", +] + [[package]] name = "ast_node" version = "0.8.8" @@ -186,7 +204,7 @@ dependencies = [ "darling 0.13.4", "pmutil", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "swc_macros_common", "syn 1.0.109", ] @@ -212,8 +230,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -237,7 +255,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -246,7 +264,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" dependencies = [ - "num-traits 0.2.15", + "num-traits", ] [[package]] @@ -305,9 +323,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.12" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f8ccfd9221ee7d1f3d4b33e1f8319b3a81ed8f61f2ea40b37b859794b4491" +checksum = "2fb79c228270dcf2426e74864cabc94babb5dbab01a4314e702d2f16540e1591" dependencies = [ "async-trait", "axum-core", @@ -336,6 +354,7 @@ dependencies = [ "tokio", "tokio-tungstenite 0.18.0", "tower", + "tower-http", "tower-layer", "tower-service", ] @@ -377,8 +396,8 @@ checksum = "2bb524613be645939e280b7279f7b017f98cf7f5ef084ec374df373530e73277" dependencies = [ "heck 0.4.1", "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -567,9 +586,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.1" +version = "3.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" +checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" [[package]] name = "bytemuck" @@ -585,9 +604,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" [[package]] name = "bzip2" @@ -637,7 +656,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -692,7 +711,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" dependencies = [ "byteorder", "fnv", - "uuid 1.3.0", + "uuid 1.1.2", ] [[package]] @@ -729,7 +748,7 @@ dependencies = [ "iana-time-zone", "js-sys", "num-integer", - "num-traits 0.2.15", + "num-traits", "serde", "time 0.1.45", "wasm-bindgen", @@ -854,29 +873,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "console" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.42.0", -] - -[[package]] -name = "console_static_text" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953d2c3cf53213a4eccdbe8f2e0b49b5d0f77e87a2a9060117bbf9346f92b64e" -dependencies = [ - "unicode-width", - "vte", -] - [[package]] name = "const-oid" version = "0.9.2" @@ -1057,7 +1053,7 @@ dependencies = [ "matches", "phf 0.8.0", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "smallvec", "syn 1.0.109", ] @@ -1068,7 +1064,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" dependencies = [ - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -1078,7 +1074,7 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -1119,47 +1115,14 @@ dependencies = [ ] [[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2 1.0.56", - "quote 1.0.26", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" +name = "d3d12" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "bitflags", + "libloading", + "winapi", ] [[package]] @@ -1191,7 +1154,7 @@ dependencies = [ "fnv", "ident_case", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "strsim", "syn 1.0.109", ] @@ -1205,9 +1168,9 @@ dependencies = [ "fnv", "ident_case", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "strsim", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -1217,7 +1180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -1228,8 +1191,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core 0.20.1", - "quote 1.0.26", - "syn 2.0.15", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -1268,11 +1231,21 @@ dependencies = [ "winapi", ] +[[package]] +name = "deflate" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" +dependencies = [ + "adler32", + "byteorder", +] + [[package]] name = "deno_ast" -version = "0.25.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b08341e0ed5b816e24b6582054b37707c8686de5598fa3004dc555131c993308" +checksum = "76e007f9f03be5484596ea6bed86ffdc6357ba9660cb8da20845baf2ce079722" dependencies = [ "anyhow", "base64 0.13.1", @@ -1300,21 +1273,21 @@ dependencies = [ [[package]] name = "deno_broadcast_channel" -version = "0.89.0" +version = "0.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afc4064413f46b725027b18a4639c480c2469e44c0359ffced6f752e67ffd17" +checksum = "1eaddf316a5c63eabe962d8304fbd5f9fa6d360cc6972e72ee541b34b5cd2f88" dependencies = [ "async-trait", "deno_core", "tokio", - "uuid 1.3.0", + "uuid 1.1.2", ] [[package]] name = "deno_cache" -version = "0.27.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258809850d7b3c365d3db8516a063cd0d8d1e85127e5ab3f46645d54c6416665" +checksum = "fb8d1a44cb8c8d18eda0b95b1078f274a29089eb6dd21766a9ecf4ad6cbac685" dependencies = [ "async-trait", "deno_core", @@ -1326,18 +1299,18 @@ dependencies = [ [[package]] name = "deno_console" -version = "0.95.0" +version = "0.89.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7aaa2e1f9f3ea7a9f7fe3abddf2d4edc7a602f7505c3bec2074b097bc9393fb" +checksum = "6cda6cf4635c2261951074023288f23756ac6852e7e63a6bd416a88f0e98c52e" dependencies = [ "deno_core", ] [[package]] name = "deno_core" -version = "0.177.0" +version = "0.171.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1563a04f319904eb5c4c981b0a5475a4258aa72d4576296f097a4f23b20f8428" +checksum = "2dc41944f05dfeacfc2610e91f40ddcf246f3aeeac8ae4c26df46bfbf01a3902" dependencies = [ "anyhow", "bytes", @@ -1360,9 +1333,9 @@ dependencies = [ [[package]] name = "deno_crypto" -version = "0.109.0" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091fb3bcc63884525eb2d2487aa7f93031fba7d16314713cbaf5bd461d568f5b" +checksum = "4f4e2a590be03f643d1147e12e8bc2fb04671b9bd68da9c8857d7d0b11a0255c" dependencies = [ "aes 0.8.2", "aes-gcm", @@ -1376,7 +1349,7 @@ dependencies = [ "deno_core", "deno_web", "elliptic-curve", - "num-traits 0.2.15", + "num-traits", "once_cell", "p256", "p384", @@ -1391,15 +1364,15 @@ dependencies = [ "signature", "spki", "tokio", - "uuid 1.3.0", + "uuid 1.1.2", "x25519-dalek", ] [[package]] name = "deno_fetch" -version = "0.119.0" +version = "0.113.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "888bc588fc1b4dd93e7d9d6684e81d4ca9a863eb50f949d4ecafeb9c4c52128d" +checksum = "64c2ec54d6332b454cad9391e8b9c33edce79837ece8ffaca0f08ab957f78590" dependencies = [ "bytes", "data-url", @@ -1416,26 +1389,24 @@ dependencies = [ [[package]] name = "deno_ffi" -version = "0.82.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3750b1db8f718aba8d7e5e7290b9cb41cd72859ca6042a588177cc69336d7c19" +checksum = "e11cbb59638f05f3d4ffcb107a91491f70ddc86b93759be1f3858ffd4efd45f6" dependencies = [ "deno_core", "dlopen", "dynasmrt", "libffi", "serde", - "serde-value", - "serde_json", "tokio", "winapi", ] [[package]] name = "deno_flash" -version = "0.31.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b20cafba99811c75f840b606939736dc32aa24cff9f73d9dd02d83665b3bb1" +checksum = "e8e6067e14bc4d904b53bd7a4f665eaa119ce31bc1bdb3913d41331de84f0a69" dependencies = [ "deno_core", "deno_tls", @@ -1452,30 +1423,11 @@ dependencies = [ "tokio", ] -[[package]] -name = "deno_fs" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5592eb5a73752f59eeb6933a5a07dd1b7e8ac36f2e06dd6a96d204cea46419a" -dependencies = [ - "deno_core", - "deno_crypto", - "deno_io", - "filetime", - "fs3", - "libc", - "log", - "nix", - "serde", - "tokio", - "winapi", -] - [[package]] name = "deno_http" -version = "0.90.0" +version = "0.84.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa890f079e9aaf0a07020f97a805537ef526fb45636df713e97f062b5727a4a7" +checksum = "868bce9321850c1f2689846e8f031144efa5a7ae197d2839013c576c9b849167" dependencies = [ "async-compression", "base64 0.13.1", @@ -1497,40 +1449,11 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "deno_io" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90d2b638bff5266c98c65d4588276cefe465cb0f8d6e7bf9da6948e5596b4348" -dependencies = [ - "deno_core", - "nix", - "once_cell", - "tokio", - "winapi", -] - -[[package]] -name = "deno_kv" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c11b45e36981b9f98f176b42dc1cf9ced8780290700d04a1e60c95d6259f73" -dependencies = [ - "anyhow", - "async-trait", - "base64 0.13.1", - "deno_core", - "hex", - "num-bigint 0.4.3", - "rusqlite", - "serde", -] - [[package]] name = "deno_napi" -version = "0.25.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d346f413caa5c4525246de2def4579a1898db0d5da0c6c324a09181615b8774" +checksum = "c42ac68f4f95a5b786d76aacabfb0e0eb1817841159132b6ac72d6a6dba95429" dependencies = [ "deno_core", "libloading", @@ -1538,9 +1461,9 @@ dependencies = [ [[package]] name = "deno_net" -version = "0.87.0" +version = "0.81.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97840f48130f242e5d1893e363b3f126730a4ab8389d69796b7ca813025c12b" +checksum = "5ed32765651e169918c9bb7f92d03b4b618401e8744d6a6ce6cc0d89ac4bda01" dependencies = [ "deno_core", "deno_tls", @@ -1554,56 +1477,39 @@ dependencies = [ [[package]] name = "deno_node" -version = "0.32.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a88f748dc0fe1b329035d28ec409a3a1e9f3dbe4aaca42130d161f7943d21e" +checksum = "31411684ae279034f4fdd1fb9d0f2207eeaa7a717fdf490c26b00a22775f08d7" dependencies = [ - "aes 0.8.2", - "cbc", "deno_core", - "digest 0.10.6", - "hex", - "idna 0.3.0", - "indexmap", - "md-5", - "md4", "once_cell", "path-clean", - "rand 0.8.5", "regex", - "ripemd", - "rsa", "serde", - "sha-1 0.10.0", - "sha2", - "sha3", - "typenum", ] [[package]] name = "deno_ops" -version = "0.55.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "769968c69c652009e43cb9e63f610a1cc3d0316c3fc59d7327f51089f65a70f4" +checksum = "4740bc5738ad07dc1f523a232a4079a995fa2ad11efd71e09e8e32bf28f21ee1" dependencies = [ "once_cell", "pmutil", "proc-macro-crate", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "regex", "syn 1.0.109", ] [[package]] name = "deno_runtime" -version = "0.103.0" +version = "0.97.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16c6b3bb27ab224aa57a8b9124b7aebdd8881c1bcd70ea85fb2651b77e95eb4" +checksum = "29105932da08341683a01a5460ff683c7bcdf23efbaaf6057e75ecd710fb064b" dependencies = [ "atty", - "console_static_text", - "deno_ast", "deno_broadcast_channel", "deno_cache", "deno_console", @@ -1612,16 +1518,14 @@ dependencies = [ "deno_fetch", "deno_ffi", "deno_flash", - "deno_fs", "deno_http", - "deno_io", - "deno_kv", "deno_napi", "deno_net", "deno_node", "deno_tls", "deno_url", "deno_web", + "deno_webgpu", "deno_webidl", "deno_websocket", "deno_webstorage", @@ -1634,6 +1538,7 @@ dependencies = [ "hyper", "libc", "log", + "lzzzz", "netif", "nix", "notify", @@ -1645,16 +1550,16 @@ dependencies = [ "signal-hook-registry", "termcolor", "tokio", - "uuid 1.3.0", + "uuid 1.1.2", "winapi", "winres", ] [[package]] name = "deno_tls" -version = "0.82.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490206ee0eb9f3a5aabd7826f24bea32b0456b9cdc5a564e7526cad79b102c3e" +checksum = "94b82b9b18941a42be4108f79f14e8b5a29067e27619293d710324e0dd77d5d8" dependencies = [ "deno_core", "once_cell", @@ -1668,9 +1573,9 @@ dependencies = [ [[package]] name = "deno_url" -version = "0.95.0" +version = "0.89.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde7d4fb67b7df82512edef40c3e085357a4263dee3502e0387df021820e3bf8" +checksum = "d1fe82b011d8b2af63c4587551536d951f47ffc3ba2a710e455b383d4f4b06ba" dependencies = [ "deno_core", "serde", @@ -1680,9 +1585,9 @@ dependencies = [ [[package]] name = "deno_web" -version = "0.126.0" +version = "0.120.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65493427e1449a3dbdd0c947d91a738bb2d0b1d7fa1158ae13462c65a2a8e05a" +checksum = "7379502a7a333f573949558803e8bfe2e8fba3ef180cdbb4a882951803c87d20" dependencies = [ "async-trait", "base64-simd", @@ -1691,23 +1596,36 @@ dependencies = [ "flate2", "serde", "tokio", - "uuid 1.3.0", + "uuid 1.1.2", +] + +[[package]] +name = "deno_webgpu" +version = "0.90.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b430c70badca6edaf058d08dc622d931355726badc180134db49913270bcf2f" +dependencies = [ + "deno_core", + "serde", + "tokio", + "wgpu-core", + "wgpu-types", ] [[package]] name = "deno_webidl" -version = "0.95.0" +version = "0.89.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a2115515eba003e0780575f8fcc0b2ff95fd8b8db2fc7b4eb63b54756858cd" +checksum = "d046c6ac75f22be851219f44824c42927345f51e0ae5fb825e8bf8ea658d8ee8" dependencies = [ "deno_core", ] [[package]] name = "deno_websocket" -version = "0.100.0" +version = "0.94.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "665d8d3e3c6799ebf1945a6c248bb21e33ea1030cfb380bc78a394e315141b4f" +checksum = "afe8ce87cc7da7b4b0575d5686cafbdb306cb33bf04f33ff6e99325c88f44933" dependencies = [ "deno_core", "deno_tls", @@ -1721,9 +1639,9 @@ dependencies = [ [[package]] name = "deno_webstorage" -version = "0.90.0" +version = "0.84.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec16b3fb2fc256cb3012f1c719b185749cee2b7b5b25a630ba11aa84b94a8af2" +checksum = "33b25958fe8143a02c86971890b7fa08a888e6a8a201e4918ea49220c092c361" dependencies = [ "deno_core", "deno_web", @@ -1750,7 +1668,7 @@ checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "rustc_version 0.4.0", "syn 1.0.109", ] @@ -1843,12 +1761,12 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "dprint-swc-ext" -version = "0.8.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "008b6061551bcf644454469e6506c32bb23b765df93d608bf7a8e2494f82fcb3" +checksum = "0e2dc99247101e0132a17680c5afbba9a7334477b47738dd3431c13f5e2c9a84" dependencies = [ "bumpalo", - "num-bigint 0.4.3", + "num-bigint", "rustc-hash", "swc_atoms", "swc_common", @@ -1889,7 +1807,7 @@ dependencies = [ "lazy_static", "proc-macro-error", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -1963,12 +1881,6 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - [[package]] name = "encoding_rs" version = "0.8.31" @@ -1986,7 +1898,7 @@ checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck 0.4.1", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -1997,7 +1909,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e40a16955681d469ab3da85aaa6b42ff656b3c67b52e1d8d3dd36afe97fd462" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -2009,7 +1921,7 @@ checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" dependencies = [ "once_cell", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -2025,15 +1937,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "enum_primitive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" -dependencies = [ - "num-traits 0.1.43", -] - [[package]] name = "err-derive" version = "0.3.1" @@ -2042,7 +1945,7 @@ checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" dependencies = [ "proc-macro-error", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "rustversion", "syn 1.0.109", "synstructure", @@ -2356,8 +2259,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -2448,7 +2351,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -2465,7 +2368,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -2477,7 +2380,7 @@ dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", "x11", ] @@ -2577,7 +2480,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", "winapi", ] @@ -2612,7 +2515,7 @@ dependencies = [ "proc-macro-crate", "proc-macro-error", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -2623,7 +2526,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -2645,6 +2548,18 @@ dependencies = [ "regex", ] +[[package]] +name = "glow" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e007a07a24de5ecae94160f141029e9a347282cfe25d1d58d85d845cf3130f1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gobject-sys" version = "0.15.10" @@ -2653,7 +2568,46 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", +] + +[[package]] +name = "gpu-alloc" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" +dependencies = [ + "bitflags", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +dependencies = [ + "bitflags", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" +dependencies = [ + "bitflags", + "gpu-descriptor-types", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" +dependencies = [ + "bitflags", ] [[package]] @@ -2705,7 +2659,7 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -2718,15 +2672,15 @@ dependencies = [ "proc-macro-crate", "proc-macro-error", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] [[package]] name = "h2" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes", "fnv", @@ -2832,6 +2786,12 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + [[package]] name = "hkdf" version = "0.12.3" @@ -2880,15 +2840,15 @@ dependencies = [ "mac", "markup5ever", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] [[package]] name = "http" -version = "0.2.9" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes", "fnv", @@ -2996,22 +2956,21 @@ dependencies = [ [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] name = "ico" -version = "0.2.0" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd" +checksum = "6a4b3331534254a9b64095ae60d3dc2a8225a7a70229cd5888be127cdc1f6804" dependencies = [ "byteorder", - "png", + "png 0.11.0", ] [[package]] @@ -3062,11 +3021,10 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.18" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" dependencies = [ - "crossbeam-utils", "globset", "lazy_static", "log", @@ -3087,8 +3045,8 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-rational 0.4.1", - "num-traits 0.2.15", + "num-rational", + "num-traits", ] [[package]] @@ -3108,18 +3066,6 @@ dependencies = [ "serde", ] -[[package]] -name = "indicatif" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" -dependencies = [ - "console", - "lazy_static", - "number_prefix", - "regex", -] - [[package]] name = "infer" version = "0.7.0" @@ -3138,6 +3084,15 @@ dependencies = [ "cfb 0.7.3", ] +[[package]] +name = "inflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5f9f47468e9a76a6452271efadc88fe865a82be91fe75e6c0c57b87ccea59d4" +dependencies = [ + "adler32", +] + [[package]] name = "inotify" version = "0.9.6" @@ -3215,7 +3170,7 @@ dependencies = [ "Inflector", "pmutil", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -3294,9 +3249,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" dependencies = [ "wasm-bindgen", ] @@ -3339,12 +3294,14 @@ dependencies = [ ] [[package]] -name = "keccak" -version = "0.1.3" +name = "khronos-egl" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" dependencies = [ - "cpufeatures", + "libc", + "libloading", + "pkg-config", ] [[package]] @@ -3463,9 +3420,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.143" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc207893e85c5d6be840e969b496b53d94cec8be2d501b214f50daa97fa8024" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libdbus-sys" @@ -3537,15 +3494,6 @@ dependencies = [ "safemem", ] -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -3596,8 +3544,8 @@ dependencies = [ [[package]] name = "lodestone_core" -version = "0.4.3" -source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=releases/0.5.0#58f9d9519b8933b770a23f87a36454ef1f0f9b64" +version = "0.4.4" +source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=main#c00518fa6211d19b39abaf8a96da45cd1f425aca" dependencies = [ "ansi_term", "argon2", @@ -3609,7 +3557,6 @@ dependencies = [ "base64 0.20.0", "chrono", "color-eyre", - "dashmap", "deno_ast", "deno_core", "deno_runtime", @@ -3625,7 +3572,6 @@ dependencies = [ "home", "igd", "indexmap", - "indicatif", "jsonwebtoken", "lazy_static", "local-ip-address", @@ -3658,9 +3604,7 @@ dependencies = [ "tracing-error", "tracing-subscriber", "ts-rs", - "unrar", - "url", - "uuid 1.3.0", + "uuid 1.1.2", "walkdir", "whoami", "zip", @@ -3699,6 +3643,15 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "lzzzz" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8014d1362004776e6a91e4c15a3aa7830d1b6650a075b51a9969ebb6d6af13bc" +dependencies = [ + "cc", +] + [[package]] name = "mac" version = "0.1.1" @@ -3768,24 +3721,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" -[[package]] -name = "md-5" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" -dependencies = [ - "digest 0.10.6", -] - -[[package]] -name = "md4" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da5ac363534dce5fabf69949225e174fbf111a498bf0ff794c8ea1fba9f3dda" -dependencies = [ - "digest 0.10.6", -] - [[package]] name = "memchr" version = "2.5.0" @@ -3819,6 +3754,20 @@ dependencies = [ "autocfg 1.1.0", ] +[[package]] +name = "metal" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +dependencies = [ + "bitflags", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", +] + [[package]] name = "mime" version = "0.3.17" @@ -3905,6 +3854,27 @@ dependencies = [ "version_check", ] +[[package]] +name = "naga" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5" +dependencies = [ + "bit-set", + "bitflags", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits", + "rustc-hash", + "serde", + "spirv", + "termcolor", + "thiserror", + "unicode-xid 0.2.4", +] + [[package]] name = "native-tls" version = "0.2.11" @@ -3971,7 +3941,7 @@ checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4" dependencies = [ "either", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "serde", "syn 1.0.109", ] @@ -4069,32 +4039,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -dependencies = [ - "num-bigint 0.1.44", - "num-complex", - "num-integer", - "num-iter", - "num-rational 0.1.42", - "num-traits 0.2.15", -] - -[[package]] -name = "num-bigint" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" -dependencies = [ - "num-integer", - "num-traits 0.2.15", - "rand 0.4.6", - "rustc-serialize", -] - [[package]] name = "num-bigint" version = "0.4.3" @@ -4103,7 +4047,7 @@ checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg 1.1.0", "num-integer", - "num-traits 0.2.15", + "num-traits", "serde", ] @@ -4118,22 +4062,12 @@ dependencies = [ "libm 0.2.6", "num-integer", "num-iter", - "num-traits 0.2.15", + "num-traits", "rand 0.8.5", "smallvec", "zeroize", ] -[[package]] -name = "num-complex" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656" -dependencies = [ - "num-traits 0.2.15", - "rustc-serialize", -] - [[package]] name = "num-integer" version = "0.1.45" @@ -4141,7 +4075,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg 1.1.0", - "num-traits 0.2.15", + "num-traits", ] [[package]] @@ -4152,19 +4086,7 @@ checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg 1.1.0", "num-integer", - "num-traits 0.2.15", -] - -[[package]] -name = "num-rational" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" -dependencies = [ - "num-bigint 0.1.44", - "num-integer", - "num-traits 0.2.15", - "rustc-serialize", + "num-traits", ] [[package]] @@ -4175,16 +4097,7 @@ checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg 1.1.0", "num-integer", - "num-traits 0.2.15", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.15", + "num-traits", ] [[package]] @@ -4224,7 +4137,7 @@ checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -4237,12 +4150,6 @@ dependencies = [ "libc", ] -[[package]] -name = "number_prefix" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" - [[package]] name = "objc" version = "0.2.7" @@ -4293,9 +4200,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "opaque-debug" @@ -4335,8 +4242,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -4357,15 +4264,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "ordered-float" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" -dependencies = [ - "num-traits 0.2.15", -] - [[package]] name = "os_info" version = "3.7.0" @@ -4459,7 +4357,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -4637,7 +4535,7 @@ dependencies = [ "phf_shared 0.8.0", "proc-macro-hack", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -4651,7 +4549,7 @@ dependencies = [ "phf_shared 0.10.0", "proc-macro-hack", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -4675,22 +4573,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 1.0.109", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -4760,10 +4658,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] +[[package]] +name = "png" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0b0cabbbd20c2d7f06dbf015e06aad59b6ca3d9ed14848783e98af9aaf19925" +dependencies = [ + "bitflags", + "deflate", + "inflate", + "num-iter", +] + [[package]] name = "png" version = "0.17.8" @@ -4834,7 +4744,7 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", "version_check", ] @@ -4846,7 +4756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "version_check", ] @@ -4875,13 +4785,10 @@ dependencies = [ ] [[package]] -name = "psm" -version = "0.1.21" +name = "profiling" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" -dependencies = [ - "cc", -] +checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" [[package]] name = "quick-error" @@ -4918,9 +4825,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2 1.0.56", ] @@ -5125,6 +5032,12 @@ dependencies = [ "rand_core 0.3.1", ] +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + [[package]] name = "raw-window-handle" version = "0.5.2" @@ -5203,9 +5116,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ "aho-corasick", "memchr", @@ -5352,12 +5265,14 @@ dependencies = [ ] [[package]] -name = "ripemd" -version = "0.1.3" +name = "ron" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" dependencies = [ - "digest 0.10.6", + "base64 0.13.1", + "bitflags", + "serde", ] [[package]] @@ -5377,7 +5292,7 @@ dependencies = [ "num-bigint-dig", "num-integer", "num-iter", - "num-traits 0.2.15", + "num-traits", "pkcs1", "pkcs8", "rand_core 0.6.4", @@ -5413,12 +5328,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - [[package]] name = "rustc_version" version = "0.2.3" @@ -5550,12 +5459,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - [[package]] name = "sct" version = "0.7.0" @@ -5582,9 +5485,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "ca2855b3715770894e67cbfa3df957790aa0c9edc3bf06efa1a84d77fa0839d1" dependencies = [ "bitflags", "core-foundation", @@ -5595,9 +5498,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -5649,9 +5552,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.162" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] @@ -5667,16 +5570,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - [[package]] name = "serde_bytes" version = "0.11.9" @@ -5688,13 +5581,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.162" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -5725,7 +5618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -5752,13 +5645,12 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.88.0" +version = "0.82.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b163edac8a2f2536ae7b52f839a33aba7892c04d0cf21e1bf8213ecfc905ebcc" +checksum = "c060fd38f18c420e82ab21592ec1f088b39bccb6897b1dda394d63628e22158d" dependencies = [ "bytes", "derive_more", - "num-bigint 0.4.3", "serde", "serde_bytes", "smallvec", @@ -5789,8 +5681,8 @@ checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ "darling 0.20.1", "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -5811,7 +5703,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -5871,16 +5763,6 @@ dependencies = [ "digest 0.10.6", ] -[[package]] -name = "sha3" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" -dependencies = [ - "digest 0.10.6", - "keccak", -] - [[package]] name = "sharded-slab" version = "0.1.4" @@ -5931,8 +5813,8 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ - "num-bigint 0.4.3", - "num-traits 0.2.15", + "num-bigint", + "num-traits", "thiserror", "time 0.3.21", ] @@ -5953,22 +5835,20 @@ dependencies = [ ] [[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "smartstring" -version = "1.0.1" +name = "slotmap" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" dependencies = [ - "autocfg 1.1.0", - "static_assertions", "version_check", ] +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + [[package]] name = "socket2" version = "0.4.9" @@ -6037,6 +5917,16 @@ dependencies = [ "lock_api", ] +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags", + "num-traits", +] + [[package]] name = "spki" version = "0.6.0" @@ -6124,7 +6014,7 @@ dependencies = [ "heck 0.4.1", "once_cell", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "serde_json", "sha2", "sqlx-core", @@ -6149,19 +6039,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "stacker" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "winapi", -] - [[package]] name = "state" version = "0.5.3" @@ -6200,7 +6077,7 @@ dependencies = [ "phf_generator 0.10.0", "phf_shared 0.10.0", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", ] [[package]] @@ -6211,7 +6088,7 @@ checksum = "91f42363e5ca94ea6f3faee9e3b5e1a4047535ae323f5c0579385fb2ae95874e" dependencies = [ "pmutil", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "swc_macros_common", "syn 1.0.109", ] @@ -6249,7 +6126,7 @@ checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" dependencies = [ "heck 0.3.3", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -6261,9 +6138,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "swc_atoms" -version = "0.4.39" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ebef84c2948cd0d1ba25acbf1b4bd9d80ab6f057efdbe35d8449b8d54699401" +checksum = "731cf66bd8e11030f056f91f9d8af77f83ec4377ff04d1670778a57d1607402a" dependencies = [ "once_cell", "rustc-hash", @@ -6275,9 +6152,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.29.37" +version = "0.29.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5005cd73617e18592faa31298225b26f1c407b84a681d67efb735c3d3458e101" +checksum = "a97e491d31418cd33fea58e9f893316fc04b30e2b5d0e750c066e2ba4907ae54" dependencies = [ "ahash", "ast_node", @@ -6286,7 +6163,7 @@ dependencies = [ "either", "from_variant", "new_debug_unreachable", - "num-bigint 0.4.3", + "num-bigint", "once_cell", "rustc-hash", "serde", @@ -6321,20 +6198,20 @@ checksum = "7dadb9998d4f5fc36ef558ed5a092579441579ee8c6fcce84a5228cca9df4004" dependencies = [ "pmutil", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "swc_macros_common", "syn 1.0.109", ] [[package]] name = "swc_ecma_ast" -version = "0.100.1" +version = "0.96.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dbfdbe05dde274473a6030dcf5e52e579516aea761d25d7a8d128f2ab597f09" +checksum = "a887102d5595b557261aa4bde35f3d71906fba674d4b79cd5c59b4155b12ee2d" dependencies = [ "bitflags", "is-macro", - "num-bigint 0.4.3", + "num-bigint", "scoped-tls", "serde", "string_enum", @@ -6345,12 +6222,12 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.135.2" +version = "0.129.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78d196e6979af0cbb91084361ca006db292a6374f75ec04cbb55306051cc4f50" +checksum = "45f8f20522626a737753381bdf64ee53d568730f9f7e720d35960de97e5ff965" dependencies = [ "memchr", - "num-bigint 0.4.3", + "num-bigint", "once_cell", "rustc-hash", "serde", @@ -6370,16 +6247,16 @@ checksum = "0159c99f81f52e48fe692ef7af1b0990b45d3006b14c6629be0b1ffee1b23aea" dependencies = [ "pmutil", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "swc_macros_common", "syn 1.0.109", ] [[package]] name = "swc_ecma_loader" -version = "0.41.39" +version = "0.41.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681c1fbb762c82700a5bd23dc39bad892a287ea9fb2121cf56e77f1ddc89afeb" +checksum = "c996baa947150d496c79fbd153d3df834e38d05c779abc4af987aded90e168a2" dependencies = [ "ahash", "anyhow", @@ -6391,18 +6268,16 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.130.2" +version = "0.124.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "042435aaeb71c4416cde440323ac9fa2c24121c2ec150f0cb79999c2e6ceffaa" +checksum = "9e75888eabf1ad8a8968e3befc7cd20c10e4721254d3344285bd5c3a42f58dc1" dependencies = [ "either", "enum_kind", "lexical", - "num-bigint 0.4.3", + "num-bigint", "serde", "smallvec", - "smartstring", - "stacker", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -6412,9 +6287,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.122.3" +version = "0.116.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4141092b17cd85eefc224b035b717e03c910b9fd58e4e637ffd05236d7e13b" +checksum = "5f5a212abba41897332f9ab3af8fe5d1a59f83d69e25eea119c27d9b53876688" dependencies = [ "better_scoped_tls", "bitflags", @@ -6434,9 +6309,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.111.3" +version = "0.105.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5022c592f0ae17f4dc42031e1c4c60b7e6d2d8d1c2428b986759a92ea853801" +checksum = "a2fd5a8eff1a7f16ec1b3ae50186debf3d3983effed6ed05d4e6db0ed7aadcac" dependencies = [ "swc_atoms", "swc_common", @@ -6454,16 +6329,16 @@ checksum = "ebf907935ec5492256b523ae7935a824d9fdc0368dcadc41375bad0dca91cd8b" dependencies = [ "pmutil", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "swc_macros_common", "syn 1.0.109", ] [[package]] name = "swc_ecma_transforms_proposal" -version = "0.156.4" +version = "0.149.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4015c3ab090f27eee0834d45bdcf9666dc6329ed06845d1882cdfe6f4826fca" +checksum = "a6fe11a20c7ced3c6b6149da330b8b4d8912fe02af6923aaac4d4479aa3dd3b6" dependencies = [ "either", "serde", @@ -6480,9 +6355,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.167.4" +version = "0.160.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db1c7801b1d7741ab335441dd301ddcc4183fb250d5e6efaab33b03def268c06" +checksum = "b94e3884668e2e12684e4adf812dbd22d34b17da2d7637b1c9cffe393acad6c2" dependencies = [ "ahash", "base64 0.13.1", @@ -6506,9 +6381,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.171.4" +version = "0.164.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142e8fb5ebe870bc51b3a95c0214af9112d3475b7cd5be4f13b87f3be664841a" +checksum = "9a885199b43798b46d8b26b4a986f899436f9f2cb37477eb12a183388a5c213f" dependencies = [ "serde", "swc_atoms", @@ -6522,9 +6397,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.113.3" +version = "0.107.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c44885603c09926118708f4352e04242c2482bc16eb51ad7beb8ad4cf5f7bb6" +checksum = "d773cf626c8d3be468a883879cda3727a2f1ea6169ccd0b5b8eb2d7afb5f367b" dependencies = [ "indexmap", "num_cpus", @@ -6540,11 +6415,11 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.86.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147cf9137da6fe2704a5defd29a1cde849961978f8c92911e6790d50df475fef" +checksum = "6b2ee0f4b61d6c426189d0d9da1333705ff3bc4513fb63633ca254595a700f75" dependencies = [ - "num-bigint 0.4.3", + "num-bigint", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -6560,7 +6435,7 @@ checksum = "0c20468634668c2bbab581947bb8c75c97158d5a6959f4ba33df20983b20b4f6" dependencies = [ "pmutil", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -6572,7 +6447,7 @@ checksum = "3e582c3e3c2269238524923781df5be49e011dbe29cf7683a2215d600a562ea6" dependencies = [ "pmutil", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -6595,7 +6470,7 @@ dependencies = [ "Inflector", "pmutil", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "swc_macros_common", "syn 1.0.109", ] @@ -6618,18 +6493,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "unicode-ident", ] @@ -6646,7 +6521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", "unicode-xid 0.2.4", ] @@ -6681,9 +6556,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.0.5" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055" +checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" dependencies = [ "cfg-expr 0.15.1", "heck 0.4.1", @@ -6727,12 +6602,12 @@ dependencies = [ "once_cell", "parking_lot 0.12.1", "paste", - "png", + "png 0.17.8", "raw-window-handle", "scopeguard", "serde", "unicode-segmentation", - "uuid 1.3.0", + "uuid 1.1.2", "windows 0.39.0", "windows-implement", "x11-dl", @@ -6805,7 +6680,7 @@ dependencies = [ "time 0.3.21", "tokio", "url", - "uuid 1.3.0", + "uuid 1.1.2", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -6832,18 +6707,18 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.2.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14388d484b6b1b5dc0f6a7d6cc6433b3b230bec85eaa576adcdf3f9fafa49251" +checksum = "afcb77cf7bfe3d8f886e73a7fa6157587d015c599671180b76595c1aef175ba8" dependencies = [ "base64 0.13.1", "brotli", "ico", "json-patch 0.2.7", "plist", - "png", + "png 0.17.8", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "regex", "semver 1.0.17", "serde", @@ -6852,19 +6727,19 @@ dependencies = [ "tauri-utils", "thiserror", "time 0.3.21", - "uuid 1.3.0", + "uuid 1.1.2", "walkdir", ] [[package]] name = "tauri-macros" -version = "1.2.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075" +checksum = "f24f481b0b2acfc288ac78755f00ebea53992c7365a165af64cb5ae00806edea" dependencies = [ "heck 0.4.1", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", "tauri-codegen", "tauri-utils", @@ -6898,7 +6773,7 @@ dependencies = [ "tauri-utils", "thiserror", "url", - "uuid 1.3.0", + "uuid 1.1.2", "webview2-com", "windows 0.39.0", ] @@ -6917,7 +6792,7 @@ dependencies = [ "tauri-runtime", "tauri-utils", "url", - "uuid 1.3.0", + "uuid 1.1.2", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -6941,7 +6816,7 @@ dependencies = [ "memchr", "phf 0.10.1", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "semver 1.0.17", "serde", "serde_json", @@ -7047,8 +6922,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -7131,9 +7006,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.25.0" +version = "1.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" dependencies = [ "autocfg 1.1.0", "bytes", @@ -7156,7 +7031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -7234,9 +7109,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ "bytes", "futures-core", @@ -7325,6 +7200,7 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", + "tower", "tower-layer", "tower-service", "tracing", @@ -7373,15 +7249,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -7514,7 +7390,6 @@ version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4added4070a4fdf9df03457206cd2e4b12417c8560a2954d91ffcbe60177a56a" dependencies = [ - "indexmap", "thiserror", "ts-rs-macros", ] @@ -7527,7 +7402,7 @@ checksum = "9f807fdb3151fee75df7485b901a89624358cd07a67a8fb1a5831bf5a07681ff" dependencies = [ "Inflector", "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", "termcolor", ] @@ -7701,31 +7576,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "unrar" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cea4f0b7bec88d47becb380887b8786a3cfb1c82e1ef9d32a682ba6801814" -dependencies = [ - "bitflags", - "enum_primitive", - "lazy_static", - "num", - "regex", - "unrar_sys", -] - -[[package]] -name = "unrar_sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0009399408dc0bcc5c8910672544fceceeba18b91f741ff943916e917d982c60" -dependencies = [ - "cc", - "libc", - "winapi", -] - [[package]] name = "untrusted" version = "0.7.1" @@ -7763,12 +7613,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - [[package]] name = "uuid" version = "0.8.2" @@ -7777,9 +7621,9 @@ checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" [[package]] name = "uuid" -version = "1.3.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" dependencies = [ "getrandom 0.2.9", "rand 0.8.5", @@ -7794,15 +7638,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18d884370cccfad1f913e67c7362f9c00357844bc9f3cfce86faa2241cabd166" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] name = "v8" -version = "0.66.0" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8ab8597b885c17b3761f6ffc29b7a62758612c409285a9271c6dacd17bb745" +checksum = "07fd5b3ed559897ff02c0f62bc0a5f300bfe79bb4c77a50031b8df771701c628" dependencies = [ "bitflags", "fslock", @@ -7866,27 +7710,6 @@ dependencies = [ "libc", ] -[[package]] -name = "vte" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aae21c12ad2ec2d168c236f369c38ff332bc1134f7246350dca641437365045" -dependencies = [ - "arrayvec", - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", -] - [[package]] name = "walkdir" version = "2.3.3" @@ -7927,9 +7750,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -7937,24 +7760,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 1.0.109", + "quote 1.0.27", + "syn 2.0.16", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" dependencies = [ "cfg-if", "js-sys", @@ -7964,32 +7787,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" dependencies = [ - "quote 1.0.26", + "quote 1.0.27", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 1.0.109", + "quote 1.0.27", + "syn 2.0.16", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" [[package]] name = "wasm-streams" @@ -8006,9 +7829,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" dependencies = [ "js-sys", "wasm-bindgen", @@ -8058,7 +7881,7 @@ dependencies = [ "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -8099,7 +7922,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -8118,6 +7941,81 @@ dependencies = [ "windows-metadata", ] +[[package]] +name = "wgpu-core" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags", + "codespan-reporting", + "fxhash", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "ron", + "serde", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags", + "block", + "core-graphics-types", + "d3d12", + "foreign-types", + "fxhash", + "glow", + "gpu-alloc", + "gpu-descriptor", + "js-sys", + "khronos-egl", + "libc", + "libloading", + "log", + "metal", + "naga", + "objc", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" +dependencies = [ + "bitflags", + "js-sys", + "serde", + "web-sys", +] + [[package]] name = "which" version = "4.4.0" @@ -8542,12 +8440,12 @@ dependencies = [ [[package]] name = "x11-dl" -version = "2.21.0" +version = "2.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0" dependencies = [ + "lazy_static", "libc", - "once_cell", "pkg-config", ] @@ -8574,9 +8472,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.7" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "699d0104bcdd7e7af6d093d6c6e2d0c479b8a129ee0d1023b31d2e0c71bfdda2" +checksum = "dc95a04ea24f543cd9be5aab44f963fa35589c99e18415c38fb2b17e133bf8d2" [[package]] name = "xmltree" @@ -8603,8 +8501,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] From a0dc92914ca9677e6432a2fce3db9284bf06f82e Mon Sep 17 00:00:00 2001 From: Peter <2892084432j@gmail.com> Date: Mon, 15 May 2023 22:18:47 -0400 Subject: [PATCH 087/108] fix editor resizing --- src/components/Atoms/ResizePanel.tsx | 9 +++++++++ src/components/FileViewer/FileViewer.tsx | 23 +++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/components/Atoms/ResizePanel.tsx b/src/components/Atoms/ResizePanel.tsx index 09e0c4c5..4cc57c8b 100644 --- a/src/components/Atoms/ResizePanel.tsx +++ b/src/components/Atoms/ResizePanel.tsx @@ -114,6 +114,15 @@ const ResizePanel = forwardRef( // initialSize is intentionally left out of the dependency array }, [isHorizontal]); + useEffect(() => { + if (size > maxSize && maxSize > minSizeProps) { + setSize(maxSize); + } + if (size < minSizeProps) { + setSize(minSizeProps); + } + }, [maxSize, minSizeProps, setSize, size]); + const handleDrag = (e: DraggableEvent, ui: DraggableData) => { const factor = direction === 'e' || direction === 's' ? -1 : 1; diff --git a/src/components/FileViewer/FileViewer.tsx b/src/components/FileViewer/FileViewer.tsx index 0e433e64..fc6b3765 100644 --- a/src/components/FileViewer/FileViewer.tsx +++ b/src/components/FileViewer/FileViewer.tsx @@ -38,7 +38,7 @@ import { zipInstanceFiles, } from 'utils/apis'; import Button from 'components/Atoms/Button'; -import { useLocalStorage } from 'usehooks-ts'; +import { useElementSize, useLocalStorage } from 'usehooks-ts'; import ResizePanel from 'components/Atoms/ResizePanel'; import { Dialog, Menu, Transition } from '@headlessui/react'; import { useUserAuthorized } from 'data/UserInfo'; @@ -77,11 +77,10 @@ export default function FileViewer() { const [clipboard, setClipboard] = useState([]); const [clipboardAction, setClipboardAction] = useState<'copy' | 'cut'>('cut'); const [fileContent, setFileContent] = useState(''); - const boundingDivRef = useRef(null); - const [boundingDivDimensions, setBoundingDivDimensions] = useState({ - height: 0, - width: 0, - }); + const [ + boundingDivRef, + { height: boundingDivHeight, width: boundingDivWidth }, + ] = useElementSize(); const tickFile = (file: ClientFile, ticked: boolean) => { if (ticked) { @@ -91,15 +90,6 @@ export default function FileViewer() { } }; - useEffect(() => { - if (boundingDivRef.current !== null) { - setBoundingDivDimensions({ - height: boundingDivRef.current.offsetHeight, - width: boundingDivRef.current.offsetWidth, - }); - } - }, [boundingDivRef]); - const atTopLevel = path === '.'; let directorySeparator = '\\'; // assume only linux paths contain / @@ -359,6 +349,7 @@ export default function FileViewer() {
{ e.preventDefault(); @@ -655,7 +646,7 @@ export default function FileViewer() { > Date: Mon, 15 May 2023 22:18:59 -0400 Subject: [PATCH 088/108] add directory --- src/components/FileViewer/CreateFolderForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/FileViewer/CreateFolderForm.tsx b/src/components/FileViewer/CreateFolderForm.tsx index bf05026a..4482c490 100644 --- a/src/components/FileViewer/CreateFolderForm.tsx +++ b/src/components/FileViewer/CreateFolderForm.tsx @@ -59,7 +59,7 @@ export default function CreateFolderForm({ size : 0, creation_time: Date.now() / 1000, modification_time: Date.now() / 1000, - file_type: 'File' as FileType, + file_type: 'Directory' as FileType, }, ].sort(fileSorter) From b1d2ef1ba8930692240b07cb08f827702349ff8b Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Tue, 16 May 2023 12:20:39 -0400 Subject: [PATCH 089/108] cargo updated --- src-tauri/Cargo.lock | 1061 +++++++++++++++++++----------------------- src-tauri/Cargo.toml | 2 +- 2 files changed, 476 insertions(+), 587 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 5cfe38ad..e2931fd9 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -27,12 +27,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - [[package]] name = "aead" version = "0.5.2" @@ -43,18 +37,6 @@ dependencies = [ "generic-array 0.14.7", ] -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if", - "cipher 0.3.0", - "cpufeatures", - "opaque-debug", -] - [[package]] name = "aes" version = "0.8.2" @@ -62,7 +44,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" dependencies = [ "cfg-if", - "cipher 0.4.4", + "cipher", "cpufeatures", ] @@ -73,8 +55,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" dependencies = [ "aead", - "aes 0.8.2", - "cipher 0.4.4", + "aes", + "cipher", "ctr", "ghash", "subtle", @@ -86,7 +68,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c" dependencies = [ - "aes 0.8.2", + "aes", ] [[package]] @@ -100,6 +82,17 @@ dependencies = [ "version_check", ] +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "0.7.20" @@ -109,6 +102,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "aho-corasick" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +dependencies = [ + "memchr", +] + [[package]] name = "alloc-no-stdlib" version = "2.0.4" @@ -176,9 +178,6 @@ name = "arrayvec" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" -dependencies = [ - "serde", -] [[package]] name = "ascii" @@ -186,15 +185,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" -[[package]] -name = "ash" -version = "0.37.2+1.3.238" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03" -dependencies = [ - "libloading", -] - [[package]] name = "ast_node" version = "0.8.8" @@ -203,7 +193,7 @@ checksum = "70151a5226578411132d798aa248df45b30aa34aea2e580628870b4d87be717b" dependencies = [ "darling 0.13.4", "pmutil", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "swc_macros_common", "syn 1.0.109", @@ -229,7 +219,7 @@ version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 2.0.16", ] @@ -323,9 +313,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.7" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fb79c228270dcf2426e74864cabc94babb5dbab01a4314e702d2f16540e1591" +checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" dependencies = [ "async-trait", "axum-core", @@ -354,7 +344,6 @@ dependencies = [ "tokio", "tokio-tungstenite 0.18.0", "tower", - "tower-http", "tower-layer", "tower-service", ] @@ -395,7 +384,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bb524613be645939e280b7279f7b017f98cf7f5ef084ec374df373530e73277" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 2.0.16", ] @@ -604,9 +593,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bzip2" @@ -675,7 +664,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" dependencies = [ - "cipher 0.4.4", + "cipher", ] [[package]] @@ -693,16 +682,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -[[package]] -name = "cfb" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f89d248799e3f15f91b70917f65381062a01bb8e222700ea0e5a7ff9785f9c" -dependencies = [ - "byteorder", - "uuid 0.8.2", -] - [[package]] name = "cfb" version = "0.7.3" @@ -711,7 +690,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" dependencies = [ "byteorder", "fnv", - "uuid 1.1.2", + "uuid", ] [[package]] @@ -761,15 +740,6 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cca491388666e04d7248af3f60f0c40cfb0991c72205595d7c396e3510207d1a" -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array 0.14.7", -] - [[package]] name = "cipher" version = "0.4.4" @@ -820,16 +790,6 @@ dependencies = [ "objc", ] -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - [[package]] name = "color-eyre" version = "0.6.2" @@ -873,6 +833,16 @@ dependencies = [ "memchr", ] +[[package]] +name = "console_static_text" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953d2c3cf53213a4eccdbe8f2e0b49b5d0f77e87a2a9060117bbf9346f92b64e" +dependencies = [ + "unicode-width", + "vte", +] + [[package]] name = "const-oid" version = "0.9.2" @@ -1052,7 +1022,7 @@ dependencies = [ "itoa 0.4.8", "matches", "phf 0.8.0", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "smallvec", "syn 1.0.109", @@ -1084,7 +1054,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher 0.4.4", + "cipher", ] [[package]] @@ -1114,17 +1084,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "d3d12" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" -dependencies = [ - "bitflags", - "libloading", - "winapi", -] - [[package]] name = "darling" version = "0.13.4" @@ -1153,7 +1112,7 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "strsim", "syn 1.0.109", @@ -1167,7 +1126,7 @@ checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "strsim", "syn 2.0.16", @@ -1202,7 +1161,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.12.3", "lock_api", "once_cell", "parking_lot_core 0.9.7", @@ -1231,21 +1190,11 @@ dependencies = [ "winapi", ] -[[package]] -name = "deflate" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" -dependencies = [ - "adler32", - "byteorder", -] - [[package]] name = "deno_ast" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e007f9f03be5484596ea6bed86ffdc6357ba9660cb8da20845baf2ce079722" +checksum = "b08341e0ed5b816e24b6582054b37707c8686de5598fa3004dc555131c993308" dependencies = [ "anyhow", "base64 0.13.1", @@ -1273,21 +1222,21 @@ dependencies = [ [[package]] name = "deno_broadcast_channel" -version = "0.83.0" +version = "0.89.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eaddf316a5c63eabe962d8304fbd5f9fa6d360cc6972e72ee541b34b5cd2f88" +checksum = "4afc4064413f46b725027b18a4639c480c2469e44c0359ffced6f752e67ffd17" dependencies = [ "async-trait", "deno_core", "tokio", - "uuid 1.1.2", + "uuid", ] [[package]] name = "deno_cache" -version = "0.21.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8d1a44cb8c8d18eda0b95b1078f274a29089eb6dd21766a9ecf4ad6cbac685" +checksum = "258809850d7b3c365d3db8516a063cd0d8d1e85127e5ab3f46645d54c6416665" dependencies = [ "async-trait", "deno_core", @@ -1299,18 +1248,18 @@ dependencies = [ [[package]] name = "deno_console" -version = "0.89.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cda6cf4635c2261951074023288f23756ac6852e7e63a6bd416a88f0e98c52e" +checksum = "b7aaa2e1f9f3ea7a9f7fe3abddf2d4edc7a602f7505c3bec2074b097bc9393fb" dependencies = [ "deno_core", ] [[package]] name = "deno_core" -version = "0.171.0" +version = "0.177.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc41944f05dfeacfc2610e91f40ddcf246f3aeeac8ae4c26df46bfbf01a3902" +checksum = "1563a04f319904eb5c4c981b0a5475a4258aa72d4576296f097a4f23b20f8428" dependencies = [ "anyhow", "bytes", @@ -1333,11 +1282,11 @@ dependencies = [ [[package]] name = "deno_crypto" -version = "0.103.0" +version = "0.109.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e2a590be03f643d1147e12e8bc2fb04671b9bd68da9c8857d7d0b11a0255c" +checksum = "091fb3bcc63884525eb2d2487aa7f93031fba7d16314713cbaf5bd461d568f5b" dependencies = [ - "aes 0.8.2", + "aes", "aes-gcm", "aes-kw", "base64 0.13.1", @@ -1364,15 +1313,15 @@ dependencies = [ "signature", "spki", "tokio", - "uuid 1.1.2", + "uuid", "x25519-dalek", ] [[package]] name = "deno_fetch" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c2ec54d6332b454cad9391e8b9c33edce79837ece8ffaca0f08ab957f78590" +checksum = "888bc588fc1b4dd93e7d9d6684e81d4ca9a863eb50f949d4ecafeb9c4c52128d" dependencies = [ "bytes", "data-url", @@ -1389,24 +1338,26 @@ dependencies = [ [[package]] name = "deno_ffi" -version = "0.76.0" +version = "0.82.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11cbb59638f05f3d4ffcb107a91491f70ddc86b93759be1f3858ffd4efd45f6" +checksum = "3750b1db8f718aba8d7e5e7290b9cb41cd72859ca6042a588177cc69336d7c19" dependencies = [ "deno_core", "dlopen", "dynasmrt", "libffi", "serde", + "serde-value", + "serde_json", "tokio", "winapi", ] [[package]] name = "deno_flash" -version = "0.25.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e6067e14bc4d904b53bd7a4f665eaa119ce31bc1bdb3913d41331de84f0a69" +checksum = "81b20cafba99811c75f840b606939736dc32aa24cff9f73d9dd02d83665b3bb1" dependencies = [ "deno_core", "deno_tls", @@ -1423,11 +1374,30 @@ dependencies = [ "tokio", ] +[[package]] +name = "deno_fs" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5592eb5a73752f59eeb6933a5a07dd1b7e8ac36f2e06dd6a96d204cea46419a" +dependencies = [ + "deno_core", + "deno_crypto", + "deno_io", + "filetime", + "fs3", + "libc", + "log", + "nix", + "serde", + "tokio", + "winapi", +] + [[package]] name = "deno_http" -version = "0.84.0" +version = "0.90.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "868bce9321850c1f2689846e8f031144efa5a7ae197d2839013c576c9b849167" +checksum = "fa890f079e9aaf0a07020f97a805537ef526fb45636df713e97f062b5727a4a7" dependencies = [ "async-compression", "base64 0.13.1", @@ -1449,11 +1419,40 @@ dependencies = [ "tokio-util", ] +[[package]] +name = "deno_io" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90d2b638bff5266c98c65d4588276cefe465cb0f8d6e7bf9da6948e5596b4348" +dependencies = [ + "deno_core", + "nix", + "once_cell", + "tokio", + "winapi", +] + +[[package]] +name = "deno_kv" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86c11b45e36981b9f98f176b42dc1cf9ced8780290700d04a1e60c95d6259f73" +dependencies = [ + "anyhow", + "async-trait", + "base64 0.13.1", + "deno_core", + "hex", + "num-bigint", + "rusqlite", + "serde", +] + [[package]] name = "deno_napi" -version = "0.19.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42ac68f4f95a5b786d76aacabfb0e0eb1817841159132b6ac72d6a6dba95429" +checksum = "2d346f413caa5c4525246de2def4579a1898db0d5da0c6c324a09181615b8774" dependencies = [ "deno_core", "libloading", @@ -1461,9 +1460,9 @@ dependencies = [ [[package]] name = "deno_net" -version = "0.81.0" +version = "0.87.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ed32765651e169918c9bb7f92d03b4b618401e8744d6a6ce6cc0d89ac4bda01" +checksum = "a97840f48130f242e5d1893e363b3f126730a4ab8389d69796b7ca813025c12b" dependencies = [ "deno_core", "deno_tls", @@ -1477,27 +1476,42 @@ dependencies = [ [[package]] name = "deno_node" -version = "0.26.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31411684ae279034f4fdd1fb9d0f2207eeaa7a717fdf490c26b00a22775f08d7" +checksum = "21a88f748dc0fe1b329035d28ec409a3a1e9f3dbe4aaca42130d161f7943d21e" dependencies = [ + "aes", + "cbc", "deno_core", + "digest 0.10.6", + "hex", + "idna 0.3.0", + "indexmap", + "md-5", + "md4", "once_cell", "path-clean", + "rand 0.8.5", "regex", + "ripemd", + "rsa", "serde", + "sha-1 0.10.0", + "sha2", + "sha3", + "typenum", ] [[package]] name = "deno_ops" -version = "0.49.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4740bc5738ad07dc1f523a232a4079a995fa2ad11efd71e09e8e32bf28f21ee1" +checksum = "769968c69c652009e43cb9e63f610a1cc3d0316c3fc59d7327f51089f65a70f4" dependencies = [ "once_cell", "pmutil", "proc-macro-crate", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "regex", "syn 1.0.109", @@ -1505,11 +1519,13 @@ dependencies = [ [[package]] name = "deno_runtime" -version = "0.97.0" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29105932da08341683a01a5460ff683c7bcdf23efbaaf6057e75ecd710fb064b" +checksum = "f16c6b3bb27ab224aa57a8b9124b7aebdd8881c1bcd70ea85fb2651b77e95eb4" dependencies = [ "atty", + "console_static_text", + "deno_ast", "deno_broadcast_channel", "deno_cache", "deno_console", @@ -1518,14 +1534,16 @@ dependencies = [ "deno_fetch", "deno_ffi", "deno_flash", + "deno_fs", "deno_http", + "deno_io", + "deno_kv", "deno_napi", "deno_net", "deno_node", "deno_tls", "deno_url", "deno_web", - "deno_webgpu", "deno_webidl", "deno_websocket", "deno_webstorage", @@ -1538,7 +1556,6 @@ dependencies = [ "hyper", "libc", "log", - "lzzzz", "netif", "nix", "notify", @@ -1550,16 +1567,16 @@ dependencies = [ "signal-hook-registry", "termcolor", "tokio", - "uuid 1.1.2", + "uuid", "winapi", "winres", ] [[package]] name = "deno_tls" -version = "0.76.0" +version = "0.82.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b82b9b18941a42be4108f79f14e8b5a29067e27619293d710324e0dd77d5d8" +checksum = "490206ee0eb9f3a5aabd7826f24bea32b0456b9cdc5a564e7526cad79b102c3e" dependencies = [ "deno_core", "once_cell", @@ -1573,9 +1590,9 @@ dependencies = [ [[package]] name = "deno_url" -version = "0.89.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1fe82b011d8b2af63c4587551536d951f47ffc3ba2a710e455b383d4f4b06ba" +checksum = "bde7d4fb67b7df82512edef40c3e085357a4263dee3502e0387df021820e3bf8" dependencies = [ "deno_core", "serde", @@ -1585,9 +1602,9 @@ dependencies = [ [[package]] name = "deno_web" -version = "0.120.0" +version = "0.126.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7379502a7a333f573949558803e8bfe2e8fba3ef180cdbb4a882951803c87d20" +checksum = "65493427e1449a3dbdd0c947d91a738bb2d0b1d7fa1158ae13462c65a2a8e05a" dependencies = [ "async-trait", "base64-simd", @@ -1596,36 +1613,23 @@ dependencies = [ "flate2", "serde", "tokio", - "uuid 1.1.2", -] - -[[package]] -name = "deno_webgpu" -version = "0.90.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b430c70badca6edaf058d08dc622d931355726badc180134db49913270bcf2f" -dependencies = [ - "deno_core", - "serde", - "tokio", - "wgpu-core", - "wgpu-types", + "uuid", ] [[package]] name = "deno_webidl" -version = "0.89.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d046c6ac75f22be851219f44824c42927345f51e0ae5fb825e8bf8ea658d8ee8" +checksum = "33a2115515eba003e0780575f8fcc0b2ff95fd8b8db2fc7b4eb63b54756858cd" dependencies = [ "deno_core", ] [[package]] name = "deno_websocket" -version = "0.94.0" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe8ce87cc7da7b4b0575d5686cafbdb306cb33bf04f33ff6e99325c88f44933" +checksum = "665d8d3e3c6799ebf1945a6c248bb21e33ea1030cfb380bc78a394e315141b4f" dependencies = [ "deno_core", "deno_tls", @@ -1639,9 +1643,9 @@ dependencies = [ [[package]] name = "deno_webstorage" -version = "0.84.0" +version = "0.90.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b25958fe8143a02c86971890b7fa08a888e6a8a201e4918ea49220c092c361" +checksum = "ec16b3fb2fc256cb3012f1c719b185749cee2b7b5b25a630ba11aa84b94a8af2" dependencies = [ "deno_core", "deno_web", @@ -1667,7 +1671,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "rustc_version 0.4.0", "syn 1.0.109", @@ -1761,9 +1765,9 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "dprint-swc-ext" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e2dc99247101e0132a17680c5afbba9a7334477b47738dd3431c13f5e2c9a84" +checksum = "008b6061551bcf644454469e6506c32bb23b765df93d608bf7a8e2494f82fcb3" dependencies = [ "bumpalo", "num-bigint", @@ -1790,6 +1794,12 @@ dependencies = [ "dtoa", ] +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + [[package]] name = "dyn-clone" version = "1.0.11" @@ -1806,7 +1816,7 @@ dependencies = [ "byteorder", "lazy_static", "proc-macro-error", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -1897,7 +1907,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -1908,7 +1918,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e40a16955681d469ab3da85aaa6b42ff656b3c67b52e1d8d3dd36afe97fd462" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -1920,7 +1930,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" dependencies = [ "once_cell", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -1932,7 +1942,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9895954c6ec59d897ed28a64815f2ceb57653fcaaebd317f2edc78b74f5495b6" dependencies = [ "pmutil", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "swc_macros_common", "syn 1.0.109", ] @@ -1944,7 +1954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "rustversion", "syn 1.0.109", @@ -2136,7 +2146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d449976075322384507443937df2f1d5577afbf4282f12a5a66ef29fa3e6307" dependencies = [ "pmutil", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "swc_macros_common", "syn 1.0.109", ] @@ -2258,7 +2268,7 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 2.0.16", ] @@ -2514,7 +2524,7 @@ dependencies = [ "heck 0.4.1", "proc-macro-crate", "proc-macro-error", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -2541,25 +2551,13 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.20", "bstr", "fnv", "log", "regex", ] -[[package]] -name = "glow" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e007a07a24de5ecae94160f141029e9a347282cfe25d1d58d85d845cf3130f1" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gobject-sys" version = "0.15.10" @@ -2571,45 +2569,6 @@ dependencies = [ "system-deps 6.1.0", ] -[[package]] -name = "gpu-alloc" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" -dependencies = [ - "bitflags", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" -dependencies = [ - "bitflags", -] - -[[package]] -name = "gpu-descriptor" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" -dependencies = [ - "bitflags", - "gpu-descriptor-types", - "hashbrown", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" -dependencies = [ - "bitflags", -] - [[package]] name = "group" version = "0.12.1" @@ -2671,7 +2630,7 @@ dependencies = [ "anyhow", "proc-macro-crate", "proc-macro-error", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -2700,17 +2659,23 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash", + "ahash 0.8.3", ] [[package]] name = "hashlink" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" +checksum = "0761a1b9491c4f2e3d66aa0f62d0fba0af9a0e2852e4d48ea506632a4b56e6aa" dependencies = [ - "hashbrown", + "hashbrown 0.13.2", ] [[package]] @@ -2786,12 +2751,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - [[package]] name = "hkdf" version = "0.12.3" @@ -2839,16 +2798,16 @@ dependencies = [ "log", "mac", "markup5ever", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -2965,12 +2924,12 @@ dependencies = [ [[package]] name = "ico" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4b3331534254a9b64095ae60d3dc2a8225a7a70229cd5888be127cdc1f6804" +checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd" dependencies = [ "byteorder", - "png 0.11.0", + "png", ] [[package]] @@ -3021,10 +2980,11 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.20" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" dependencies = [ + "crossbeam-utils", "globset", "lazy_static", "log", @@ -3062,35 +3022,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg 1.1.0", - "hashbrown", + "hashbrown 0.12.3", "serde", ] -[[package]] -name = "infer" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b2b533137b9cad970793453d4f921c2e91312a6d88b1085c07bc15fc51bb3b" -dependencies = [ - "cfb 0.6.1", -] - [[package]] name = "infer" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" dependencies = [ - "cfb 0.7.3", -] - -[[package]] -name = "inflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f9f47468e9a76a6452271efadc88fe865a82be91fe75e6c0c57b87ccea59d4" -dependencies = [ - "adler32", + "cfb", ] [[package]] @@ -3169,7 +3111,7 @@ checksum = "8a7d079e129b77477a49c5c4f1cfe9ce6c2c909ef52520693e8e811a714c7b20" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -3220,9 +3162,9 @@ dependencies = [ [[package]] name = "jni" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" dependencies = [ "cesu8", "combine", @@ -3249,9 +3191,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.62" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] @@ -3294,14 +3236,12 @@ dependencies = [ ] [[package]] -name = "khronos-egl" -version = "4.1.0" +name = "keccak" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" dependencies = [ - "libc", - "libloading", - "pkg-config", + "cpufeatures", ] [[package]] @@ -3470,9 +3410,9 @@ checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libsqlite3-sys" @@ -3545,7 +3485,7 @@ dependencies = [ [[package]] name = "lodestone_core" version = "0.4.4" -source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=main#c00518fa6211d19b39abaf8a96da45cd1f425aca" +source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=releases/0.5.0#32a29f7cb9850d4d3e4fd2aa0555eb8956b78da8" dependencies = [ "ansi_term", "argon2", @@ -3557,6 +3497,7 @@ dependencies = [ "base64 0.20.0", "chrono", "color-eyre", + "dashmap", "deno_ast", "deno_core", "deno_runtime", @@ -3604,7 +3545,8 @@ dependencies = [ "tracing-error", "tracing-subscriber", "ts-rs", - "uuid 1.1.2", + "url", + "uuid", "walkdir", "whoami", "zip", @@ -3643,15 +3585,6 @@ dependencies = [ "linked-hash-map", ] -[[package]] -name = "lzzzz" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8014d1362004776e6a91e4c15a3aa7830d1b6650a075b51a9969ebb6d6af13bc" -dependencies = [ - "cc", -] - [[package]] name = "mac" version = "0.1.1" @@ -3721,6 +3654,24 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest 0.10.6", +] + +[[package]] +name = "md4" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da5ac363534dce5fabf69949225e174fbf111a498bf0ff794c8ea1fba9f3dda" +dependencies = [ + "digest 0.10.6", +] + [[package]] name = "memchr" version = "2.5.0" @@ -3754,20 +3705,6 @@ dependencies = [ "autocfg 1.1.0", ] -[[package]] -name = "metal" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" -dependencies = [ - "bitflags", - "block", - "core-graphics-types", - "foreign-types", - "log", - "objc", -] - [[package]] name = "mime" version = "0.3.17" @@ -3854,27 +3791,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "naga" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5" -dependencies = [ - "bit-set", - "bitflags", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "num-traits", - "rustc-hash", - "serde", - "spirv", - "termcolor", - "thiserror", - "unicode-xid 0.2.4", -] - [[package]] name = "native-tls" version = "0.2.11" @@ -3940,7 +3856,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4" dependencies = [ "either", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "serde", "syn 1.0.109", @@ -4059,7 +3975,7 @@ checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905" dependencies = [ "byteorder", "lazy_static", - "libm 0.2.6", + "libm 0.2.7", "num-integer", "num-iter", "num-traits", @@ -4107,7 +4023,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg 1.1.0", - "libm 0.2.6", + "libm 0.2.7", ] [[package]] @@ -4136,7 +4052,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -4200,9 +4116,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -4241,7 +4157,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 2.0.16", ] @@ -4264,6 +4180,15 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "ordered-float" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +dependencies = [ + "num-traits", +] + [[package]] name = "os_info" version = "3.7.0" @@ -4534,7 +4459,7 @@ dependencies = [ "phf_generator 0.8.0", "phf_shared 0.8.0", "proc-macro-hack", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -4548,7 +4473,7 @@ dependencies = [ "phf_generator 0.10.0", "phf_shared 0.10.0", "proc-macro-hack", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -4586,7 +4511,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 2.0.16", ] @@ -4657,23 +4582,11 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] -[[package]] -name = "png" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b0cabbbd20c2d7f06dbf015e06aad59b6ca3d9ed14848783e98af9aaf19925" -dependencies = [ - "bitflags", - "deflate", - "inflate", - "num-iter", -] - [[package]] name = "png" version = "0.17.8" @@ -4743,7 +4656,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", "version_check", @@ -4755,7 +4668,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "version_check", ] @@ -4777,18 +4690,21 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16" dependencies = [ "unicode-ident", ] [[package]] -name = "profiling" -version = "1.0.8" +name = "psm" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] [[package]] name = "quick-error" @@ -4829,7 +4745,7 @@ version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", ] [[package]] @@ -5032,12 +4948,6 @@ dependencies = [ "rand_core 0.3.1", ] -[[package]] -name = "range-alloc" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" - [[package]] name = "raw-window-handle" version = "0.5.2" @@ -5116,13 +5026,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.1", "memchr", - "regex-syntax", + "regex-syntax 0.7.1", ] [[package]] @@ -5131,7 +5041,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", ] [[package]] @@ -5140,6 +5050,12 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +[[package]] +name = "regex-syntax" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" + [[package]] name = "remove_dir_all" version = "0.5.3" @@ -5265,14 +5181,12 @@ dependencies = [ ] [[package]] -name = "ron" -version = "0.8.0" +name = "ripemd" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" dependencies = [ - "base64 0.13.1", - "bitflags", - "serde", + "digest 0.10.6", ] [[package]] @@ -5570,6 +5484,16 @@ dependencies = [ "serde_json", ] +[[package]] +name = "serde-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float", + "serde", +] + [[package]] name = "serde_bytes" version = "0.11.9" @@ -5585,7 +5509,7 @@ version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 2.0.16", ] @@ -5617,7 +5541,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -5645,12 +5569,13 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.82.0" +version = "0.88.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c060fd38f18c420e82ab21592ec1f088b39bccb6897b1dda394d63628e22158d" +checksum = "b163edac8a2f2536ae7b52f839a33aba7892c04d0cf21e1bf8213ecfc905ebcc" dependencies = [ "bytes", "derive_more", + "num-bigint", "serde", "serde_bytes", "smallvec", @@ -5680,7 +5605,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ "darling 0.20.1", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 2.0.16", ] @@ -5702,7 +5627,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -5763,6 +5688,16 @@ dependencies = [ "digest 0.10.6", ] +[[package]] +name = "sha3" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +dependencies = [ + "digest 0.10.6", + "keccak", +] + [[package]] name = "sharded-slab" version = "0.1.4" @@ -5834,21 +5769,23 @@ dependencies = [ "autocfg 1.1.0", ] -[[package]] -name = "slotmap" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" -dependencies = [ - "version_check", -] - [[package]] name = "smallvec" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg 1.1.0", + "static_assertions", + "version_check", +] + [[package]] name = "socket2" version = "0.4.9" @@ -5917,16 +5854,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spirv" -version = "0.2.0+1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" -dependencies = [ - "bitflags", - "num-traits", -] - [[package]] name = "spki" version = "0.6.0" @@ -5962,7 +5889,7 @@ name = "sqlx-core" version = "0.6.2" source = "git+https://github.com/Lodestone-Team/sqlx#072d4d6259db1203dfe341811ea838a6b886f7ae" dependencies = [ - "ahash", + "ahash 0.7.6", "atoi", "bitflags", "byteorder", @@ -6013,7 +5940,7 @@ dependencies = [ "either", "heck 0.4.1", "once_cell", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "serde_json", "sha2", @@ -6039,6 +5966,19 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + [[package]] name = "state" version = "0.5.3" @@ -6076,7 +6016,7 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ "phf_generator 0.10.0", "phf_shared 0.10.0", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", ] @@ -6087,7 +6027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91f42363e5ca94ea6f3faee9e3b5e1a4047535ae323f5c0579385fb2ae95874e" dependencies = [ "pmutil", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "swc_macros_common", "syn 1.0.109", @@ -6125,7 +6065,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" dependencies = [ "heck 0.3.3", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -6138,9 +6078,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "swc_atoms" -version = "0.4.34" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731cf66bd8e11030f056f91f9d8af77f83ec4377ff04d1670778a57d1607402a" +checksum = "2ebef84c2948cd0d1ba25acbf1b4bd9d80ab6f057efdbe35d8449b8d54699401" dependencies = [ "once_cell", "rustc-hash", @@ -6152,11 +6092,11 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.29.29" +version = "0.29.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97e491d31418cd33fea58e9f893316fc04b30e2b5d0e750c066e2ba4907ae54" +checksum = "5005cd73617e18592faa31298225b26f1c407b84a681d67efb735c3d3458e101" dependencies = [ - "ahash", + "ahash 0.7.6", "ast_node", "better_scoped_tls", "cfg-if", @@ -6197,7 +6137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dadb9998d4f5fc36ef558ed5a092579441579ee8c6fcce84a5228cca9df4004" dependencies = [ "pmutil", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "swc_macros_common", "syn 1.0.109", @@ -6205,9 +6145,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.96.3" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a887102d5595b557261aa4bde35f3d71906fba674d4b79cd5c59b4155b12ee2d" +checksum = "7dbfdbe05dde274473a6030dcf5e52e579516aea761d25d7a8d128f2ab597f09" dependencies = [ "bitflags", "is-macro", @@ -6222,9 +6162,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.129.8" +version = "0.135.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f8f20522626a737753381bdf64ee53d568730f9f7e720d35960de97e5ff965" +checksum = "78d196e6979af0cbb91084361ca006db292a6374f75ec04cbb55306051cc4f50" dependencies = [ "memchr", "num-bigint", @@ -6246,7 +6186,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0159c99f81f52e48fe692ef7af1b0990b45d3006b14c6629be0b1ffee1b23aea" dependencies = [ "pmutil", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "swc_macros_common", "syn 1.0.109", @@ -6254,11 +6194,11 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.41.31" +version = "0.41.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c996baa947150d496c79fbd153d3df834e38d05c779abc4af987aded90e168a2" +checksum = "681c1fbb762c82700a5bd23dc39bad892a287ea9fb2121cf56e77f1ddc89afeb" dependencies = [ - "ahash", + "ahash 0.7.6", "anyhow", "pathdiff", "serde", @@ -6268,9 +6208,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.124.5" +version = "0.130.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e75888eabf1ad8a8968e3befc7cd20c10e4721254d3344285bd5c3a42f58dc1" +checksum = "042435aaeb71c4416cde440323ac9fa2c24121c2ec150f0cb79999c2e6ceffaa" dependencies = [ "either", "enum_kind", @@ -6278,6 +6218,8 @@ dependencies = [ "num-bigint", "serde", "smallvec", + "smartstring", + "stacker", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -6287,9 +6229,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.116.5" +version = "0.122.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5a212abba41897332f9ab3af8fe5d1a59f83d69e25eea119c27d9b53876688" +checksum = "fd4141092b17cd85eefc224b035b717e03c910b9fd58e4e637ffd05236d7e13b" dependencies = [ "better_scoped_tls", "bitflags", @@ -6309,9 +6251,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.105.5" +version = "0.111.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2fd5a8eff1a7f16ec1b3ae50186debf3d3983effed6ed05d4e6db0ed7aadcac" +checksum = "b5022c592f0ae17f4dc42031e1c4c60b7e6d2d8d1c2428b986759a92ea853801" dependencies = [ "swc_atoms", "swc_common", @@ -6328,7 +6270,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebf907935ec5492256b523ae7935a824d9fdc0368dcadc41375bad0dca91cd8b" dependencies = [ "pmutil", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "swc_macros_common", "syn 1.0.109", @@ -6336,9 +6278,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.149.8" +version = "0.156.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6fe11a20c7ced3c6b6149da330b8b4d8912fe02af6923aaac4d4479aa3dd3b6" +checksum = "f4015c3ab090f27eee0834d45bdcf9666dc6329ed06845d1882cdfe6f4826fca" dependencies = [ "either", "serde", @@ -6355,11 +6297,11 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.160.9" +version = "0.167.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b94e3884668e2e12684e4adf812dbd22d34b17da2d7637b1c9cffe393acad6c2" +checksum = "db1c7801b1d7741ab335441dd301ddcc4183fb250d5e6efaab33b03def268c06" dependencies = [ - "ahash", + "ahash 0.7.6", "base64 0.13.1", "dashmap", "indexmap", @@ -6381,9 +6323,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.164.10" +version = "0.171.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a885199b43798b46d8b26b4a986f899436f9f2cb37477eb12a183388a5c213f" +checksum = "142e8fb5ebe870bc51b3a95c0214af9112d3475b7cd5be4f13b87f3be664841a" dependencies = [ "serde", "swc_atoms", @@ -6397,9 +6339,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.107.5" +version = "0.113.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d773cf626c8d3be468a883879cda3727a2f1ea6169ccd0b5b8eb2d7afb5f367b" +checksum = "4c44885603c09926118708f4352e04242c2482bc16eb51ad7beb8ad4cf5f7bb6" dependencies = [ "indexmap", "num_cpus", @@ -6415,9 +6357,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.82.3" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b2ee0f4b61d6c426189d0d9da1333705ff3bc4513fb63633ca254595a700f75" +checksum = "147cf9137da6fe2704a5defd29a1cde849961978f8c92911e6790d50df475fef" dependencies = [ "num-bigint", "swc_atoms", @@ -6434,7 +6376,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c20468634668c2bbab581947bb8c75c97158d5a6959f4ba33df20983b20b4f6" dependencies = [ "pmutil", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -6446,7 +6388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e582c3e3c2269238524923781df5be49e011dbe29cf7683a2215d600a562ea6" dependencies = [ "pmutil", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -6469,7 +6411,7 @@ checksum = "ebeed7eb0f545f48ad30f5aab314e5208b735bcea1d1464f26e20f06db904989" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "swc_macros_common", "syn 1.0.109", @@ -6492,7 +6434,7 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "unicode-ident", ] @@ -6503,7 +6445,7 @@ version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "unicode-ident", ] @@ -6520,7 +6462,7 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", "unicode-xid 0.2.4", @@ -6569,9 +6511,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.14.0" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43336f5d1793543ba96e2a1e75f3a5c7dcd592743be06a0ab3a190f4fcb4b934" +checksum = "ac8e6399427c8494f9849b58694754d7cc741293348a6836b6c8d2c5aa82d8e6" dependencies = [ "bitflags", "cairo-rs", @@ -6602,12 +6544,12 @@ dependencies = [ "once_cell", "parking_lot 0.12.1", "paste", - "png 0.17.8", + "png", "raw-window-handle", "scopeguard", "serde", "unicode-segmentation", - "uuid 1.1.2", + "uuid", "windows 0.39.0", "windows-implement", "x11-dl", @@ -6632,9 +6574,9 @@ checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" [[package]] name = "tauri" -version = "1.1.4" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad0833f2a2833808091721ac4d99ed873f9ae48187523b518f666841cb31701" +checksum = "e3a1fe72365a6d860fddf3403934649a5157b2bbb6f0b50dd3a8858cd1a22412" dependencies = [ "anyhow", "attohttpc 0.22.0", @@ -6680,7 +6622,7 @@ dependencies = [ "time 0.3.21", "tokio", "url", - "uuid 1.1.2", + "uuid", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -6707,17 +6649,17 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb77cf7bfe3d8f886e73a7fa6157587d015c599671180b76595c1aef175ba8" +checksum = "14388d484b6b1b5dc0f6a7d6cc6433b3b230bec85eaa576adcdf3f9fafa49251" dependencies = [ "base64 0.13.1", "brotli", "ico", "json-patch 0.2.7", "plist", - "png 0.17.8", - "proc-macro2 1.0.56", + "png", + "proc-macro2 1.0.57", "quote 1.0.27", "regex", "semver 1.0.17", @@ -6727,18 +6669,18 @@ dependencies = [ "tauri-utils", "thiserror", "time 0.3.21", - "uuid 1.1.2", + "uuid", "walkdir", ] [[package]] name = "tauri-macros" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24f481b0b2acfc288ac78755f00ebea53992c7365a165af64cb5ae00806edea" +checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", "tauri-codegen", @@ -6758,14 +6700,13 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.11.2" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be6283addfc4ccc2bd10ed0d87dcba582bf3f511998047e6a193c13c75cae3c9" +checksum = "dc36898ad4acb6c381878acf903c320a36cf29b68b74f6e791d6045b6557128c" dependencies = [ "gtk", "http", "http-range", - "infer 0.7.0", "rand 0.8.5", "raw-window-handle", "serde", @@ -6773,16 +6714,16 @@ dependencies = [ "tauri-utils", "thiserror", "url", - "uuid 1.1.2", + "uuid", "webview2-com", "windows 0.39.0", ] [[package]] name = "tauri-runtime-wry" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca3f21cc3502edda0df6d0579870ab4d6dbe82c0da1d67e8c129f8f22eb62ce" +checksum = "e2ebc22bc5566ba33310744fadd86709fa591ed163491b165855474523ac1aab" dependencies = [ "cocoa", "gtk", @@ -6792,7 +6733,7 @@ dependencies = [ "tauri-runtime", "tauri-utils", "url", - "uuid 1.1.2", + "uuid", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -6810,12 +6751,12 @@ dependencies = [ "glob", "heck 0.4.1", "html5ever", - "infer 0.12.0", + "infer", "json-patch 1.0.0", "kuchiki", "memchr", "phf 0.10.1", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "semver 1.0.17", "serde", @@ -6921,7 +6862,7 @@ version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 2.0.16", ] @@ -7006,9 +6947,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.24.2" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg 1.1.0", "bytes", @@ -7030,7 +6971,7 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -7109,9 +7050,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -7200,7 +7141,6 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", - "tower", "tower-layer", "tower-service", "tracing", @@ -7248,7 +7188,7 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 2.0.16", ] @@ -7390,6 +7330,7 @@ version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4added4070a4fdf9df03457206cd2e4b12417c8560a2954d91ffcbe60177a56a" dependencies = [ + "indexmap", "thiserror", "ts-rs-macros", ] @@ -7401,7 +7342,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f807fdb3151fee75df7485b901a89624358cd07a67a8fb1a5831bf5a07681ff" dependencies = [ "Inflector", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", "termcolor", @@ -7614,16 +7555,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] -name = "uuid" -version = "0.8.2" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.1.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ "getrandom 0.2.9", "rand 0.8.5", @@ -7633,20 +7574,20 @@ dependencies = [ [[package]] name = "uuid-macro-internal" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d884370cccfad1f913e67c7362f9c00357844bc9f3cfce86faa2241cabd166" +checksum = "3f67b459f42af2e6e1ee213cb9da4dbd022d3320788c3fb3e1b893093f1e45da" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 2.0.16", ] [[package]] name = "v8" -version = "0.60.1" +version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fd5b3ed559897ff02c0f62bc0a5f300bfe79bb4c77a50031b8df771701c628" +checksum = "6c8ab8597b885c17b3761f6ffc29b7a62758612c409285a9271c6dacd17bb745" dependencies = [ "bitflags", "fslock", @@ -7710,6 +7651,27 @@ dependencies = [ "libc", ] +[[package]] +name = "vte" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aae21c12ad2ec2d168c236f369c38ff332bc1134f7246350dca641437365045" +dependencies = [ + "arrayvec", + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +dependencies = [ + "proc-macro2 1.0.57", + "quote 1.0.27", +] + [[package]] name = "walkdir" version = "2.3.3" @@ -7750,9 +7712,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.85" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -7760,14 +7722,14 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.85" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 2.0.16", "wasm-bindgen-shared", @@ -7775,9 +7737,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.35" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ "cfg-if", "js-sys", @@ -7787,9 +7749,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.85" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote 1.0.27", "wasm-bindgen-macro-support", @@ -7797,11 +7759,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.85" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 2.0.16", "wasm-bindgen-backend", @@ -7810,9 +7772,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.85" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "wasm-streams" @@ -7829,9 +7791,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.62" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ "js-sys", "wasm-bindgen", @@ -7921,7 +7883,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 1.0.109", ] @@ -7941,81 +7903,6 @@ dependencies = [ "windows-metadata", ] -[[package]] -name = "wgpu-core" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags", - "codespan-reporting", - "fxhash", - "log", - "naga", - "parking_lot 0.12.1", - "profiling", - "ron", - "serde", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags", - "block", - "core-graphics-types", - "d3d12", - "foreign-types", - "fxhash", - "glow", - "gpu-alloc", - "gpu-descriptor", - "js-sys", - "khronos-egl", - "libc", - "libloading", - "log", - "metal", - "naga", - "objc", - "parking_lot 0.12.1", - "profiling", - "range-alloc", - "raw-window-handle", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-types" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" -dependencies = [ - "bitflags", - "js-sys", - "serde", - "web-sys", -] - [[package]] name = "which" version = "4.4.0" @@ -8394,15 +8281,16 @@ dependencies = [ [[package]] name = "wry" -version = "0.21.1" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff5c1352b4266fdf92c63479d2f58ab4cd29dc4e78fbc1b62011ed1227926945" +checksum = "4c1ad8e2424f554cc5bdebe8aa374ef5b433feff817aebabca0389961fc7ef98" dependencies = [ "base64 0.13.1", "block", "cocoa", "core-graphics", "crossbeam-channel", + "dunce", "gdk", "gio", "glib", @@ -8418,6 +8306,7 @@ dependencies = [ "serde", "serde_json", "sha2", + "soup2", "tao", "thiserror", "url", @@ -8440,12 +8329,12 @@ dependencies = [ [[package]] name = "x11-dl" -version = "2.20.1" +version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" dependencies = [ - "lazy_static", "libc", + "once_cell", "pkg-config", ] @@ -8472,9 +8361,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc95a04ea24f543cd9be5aab44f963fa35589c99e18415c38fb2b17e133bf8d2" +checksum = "1690519550bfa95525229b9ca2350c63043a4857b3b0013811b2ccf4a2420b01" [[package]] name = "xmltree" @@ -8500,18 +8389,18 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.57", "quote 1.0.27", "syn 2.0.16", ] [[package]] name = "zip" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e92305c174683d78035cbf1b70e18db6329cc0f1b9cae0a52ca90bf5bfe7125" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ - "aes 0.7.5", + "aes", "byteorder", "bzip2", "constant_time_eq", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index a17eb627..eb3e0c77 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -20,7 +20,7 @@ serde = { version = "1.0", features = ["derive"] } tauri = { version = "1.1.1", features = ["api-all", "devtools", "updater"] } tauri-plugin-localhost = "0.1.0" portpicker = "0.1" -lodestone_core = {git = "https://github.com/Lodestone-Team/lodestone_core", branch = "main"} +lodestone_core = {git = "https://github.com/Lodestone-Team/lodestone_core", branch = "releases/0.5.0"} tokio = { version = "1.21.1", features = ["macros", "rt"] } [features] From 425ab15a970b6d3444a58adf9c362f41649d5cf9 Mon Sep 17 00:00:00 2001 From: seliayeu Date: Thu, 18 May 2023 20:40:47 -0600 Subject: [PATCH 090/108] add scrolling to UserSettings --- src/pages/settings/UserSettings.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/settings/UserSettings.tsx b/src/pages/settings/UserSettings.tsx index 8e052d77..cf128748 100644 --- a/src/pages/settings/UserSettings.tsx +++ b/src/pages/settings/UserSettings.tsx @@ -329,7 +329,7 @@ export const UserSettings = () => {
-
+

User Settings

@@ -340,7 +340,7 @@ export const UserSettings = () => {
-
+
Unsafe Settings
From 628db0c03736a2ffc85d239e739ee1b30dd8011a Mon Sep 17 00:00:00 2001 From: Peter <2892084432j@gmail.com> Date: Fri, 19 May 2023 17:36:15 -0400 Subject: [PATCH 091/108] remove rar as a supported file --- src/components/FileViewer/FileList.tsx | 1 - src/utils/util.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/FileViewer/FileList.tsx b/src/components/FileViewer/FileList.tsx index 6c3d9599..cfe63ba3 100644 --- a/src/components/FileViewer/FileList.tsx +++ b/src/components/FileViewer/FileList.tsx @@ -30,7 +30,6 @@ const iconMap: { [key: string]: string } = { json: '/icons/json.svg', mcmeta: '/icons/json.svg', zip: '/icons/zip.svg', - rar: '/icons/zip.svg', gz: '/icons/zip.svg', tar: '/icons/zip.svg', jar: '/icons/jar.svg', diff --git a/src/utils/util.ts b/src/utils/util.ts index f9c5fc7e..62b2b405 100644 --- a/src/utils/util.ts +++ b/src/utils/util.ts @@ -49,7 +49,7 @@ export const myTwMerge = extendTailwindMerge({ }, }); -export const supportedZip = ["rar", "zip", "gz", "tgz"]; +export const supportedZip = ["zip", "gz", "tgz"]; export const capitalizeFirstLetter = (string: string) => { return string.charAt(0).toUpperCase() + string.slice(1); From 0604bdf9c564d76743acec55fd01986d39987dae Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Fri, 19 May 2023 19:20:27 -0400 Subject: [PATCH 092/108] fixed dev ci --- .github/workflows/dev.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index e2c7f8dc..f8cd8e5d 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -9,5 +9,8 @@ jobs: lodestone-desktop: runs-on: ubuntu-latest steps: + - name: "Checkout" + uses: actions/checkout@v3 + - uses: ./.github/workflows/dashboard.yml - uses: ./.github/workflows/check.yml From 4c65483cc30bf2aadb4a1171e66d1ac98196df06 Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Fri, 19 May 2023 19:26:27 -0400 Subject: [PATCH 093/108] tried to fix CI again --- .github/workflows/dev.yml | 16 ++++++++-------- .github/workflows/main.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index f8cd8e5d..7878336f 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -6,11 +6,11 @@ on: - dev jobs: - lodestone-desktop: - runs-on: ubuntu-latest - steps: - - name: "Checkout" - uses: actions/checkout@v3 - - - uses: ./.github/workflows/dashboard.yml - - uses: ./.github/workflows/check.yml + + check_rs: + uses: ./.github/workflows/check.yml + secrets: inherit + + build_dashboard: + uses: ./.github/workflows/dashboard.yml + secrets: inherit diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 50a1e4bf..7521be34 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,7 +6,7 @@ on: - main jobs: - lodestone-desktop: + build_desktop: uses: ./.github/workflows/desktop.yml with: version: rc diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3fef1d77..a9108631 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -5,7 +5,7 @@ on: branches: [main, dev, release/*] jobs: - lodestone-desktop: + build_desktop: uses: ./.github/workflows/desktop.yml with: version: pr diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 96ad2c6e..606441e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ on: tags: [ v\d+\.\d+\.\d+ ] jobs: - lodestone-desktop: + build_desktop: uses: ./.github/workflows/desktop.yml with: version: ${{ github.ref_name }} From d45737a3600527d89c5352100d5d279bad6e9e0e Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Fri, 19 May 2023 19:28:34 -0400 Subject: [PATCH 094/108] renamed some job names in workflow --- .github/workflows/check.yml | 2 +- .github/workflows/dashboard.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index c25957cd..d867dcdc 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -5,7 +5,7 @@ on: workflow_call: jobs: - build: + check: runs-on: ubuntu-latest defaults: diff --git a/.github/workflows/dashboard.yml b/.github/workflows/dashboard.yml index 4450c1dd..cccb73e1 100644 --- a/.github/workflows/dashboard.yml +++ b/.github/workflows/dashboard.yml @@ -5,7 +5,7 @@ on: workflow_call: jobs: - build: + build-nextjs: runs-on: ubuntu-latest defaults: From 8c24ba11fb17f89ecab3ba991421a16211fdad61 Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Fri, 19 May 2023 20:00:59 -0400 Subject: [PATCH 095/108] idk --- src-tauri/Cargo.lock | 1519 +++++++++++++++++++++++++----------------- 1 file changed, 913 insertions(+), 606 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index e2931fd9..e92150ae 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -27,6 +27,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + [[package]] name = "aead" version = "0.5.2" @@ -37,6 +43,18 @@ dependencies = [ "generic-array 0.14.7", ] +[[package]] +name = "aes" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +dependencies = [ + "cfg-if", + "cipher 0.3.0", + "cpufeatures", + "opaque-debug", +] + [[package]] name = "aes" version = "0.8.2" @@ -44,7 +62,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" dependencies = [ "cfg-if", - "cipher", + "cipher 0.4.4", "cpufeatures", ] @@ -55,8 +73,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" dependencies = [ "aead", - "aes", - "cipher", + "aes 0.8.2", + "cipher 0.4.4", "ctr", "ghash", "subtle", @@ -68,7 +86,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c" dependencies = [ - "aes", + "aes 0.8.2", ] [[package]] @@ -82,17 +100,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", -] - [[package]] name = "aho-corasick" version = "0.7.20" @@ -102,15 +109,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "aho-corasick" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" -dependencies = [ - "memchr", -] - [[package]] name = "alloc-no-stdlib" version = "2.0.4" @@ -178,6 +176,9 @@ name = "arrayvec" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +dependencies = [ + "serde", +] [[package]] name = "ascii" @@ -185,6 +186,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" +[[package]] +name = "ash" +version = "0.37.2+1.3.238" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03" +dependencies = [ + "libloading", +] + [[package]] name = "ast_node" version = "0.8.8" @@ -193,8 +203,8 @@ checksum = "70151a5226578411132d798aa248df45b30aa34aea2e580628870b4d87be717b" dependencies = [ "darling 0.13.4", "pmutil", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "swc_macros_common", "syn 1.0.109", ] @@ -219,9 +229,9 @@ version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", - "syn 2.0.16", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] @@ -245,7 +255,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.0", + "system-deps 6.0.5", ] [[package]] @@ -254,7 +264,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" dependencies = [ - "num-traits", + "num-traits 0.2.15", ] [[package]] @@ -313,9 +323,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.18" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" +checksum = "2fb79c228270dcf2426e74864cabc94babb5dbab01a4314e702d2f16540e1591" dependencies = [ "async-trait", "axum-core", @@ -344,6 +354,7 @@ dependencies = [ "tokio", "tokio-tungstenite 0.18.0", "tower", + "tower-http", "tower-layer", "tower-service", ] @@ -384,9 +395,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bb524613be645939e280b7279f7b017f98cf7f5ef084ec374df373530e73277" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.57", - "quote 1.0.27", - "syn 2.0.16", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] @@ -575,9 +586,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.2" +version = "3.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" +checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" [[package]] name = "bytemuck" @@ -593,9 +604,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" [[package]] name = "bzip2" @@ -645,7 +656,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 6.1.0", + "system-deps 6.0.5", ] [[package]] @@ -664,7 +675,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" dependencies = [ - "cipher", + "cipher 0.4.4", ] [[package]] @@ -682,6 +693,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" +[[package]] +name = "cfb" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f89d248799e3f15f91b70917f65381062a01bb8e222700ea0e5a7ff9785f9c" +dependencies = [ + "byteorder", + "uuid 0.8.2", +] + [[package]] name = "cfb" version = "0.7.3" @@ -690,7 +711,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" dependencies = [ "byteorder", "fnv", - "uuid", + "uuid 1.1.2", ] [[package]] @@ -727,7 +748,7 @@ dependencies = [ "iana-time-zone", "js-sys", "num-integer", - "num-traits", + "num-traits 0.2.15", "serde", "time 0.1.45", "wasm-bindgen", @@ -740,6 +761,15 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cca491388666e04d7248af3f60f0c40cfb0991c72205595d7c396e3510207d1a" +[[package]] +name = "cipher" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +dependencies = [ + "generic-array 0.14.7", +] + [[package]] name = "cipher" version = "0.4.4" @@ -790,6 +820,16 @@ dependencies = [ "objc", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "color-eyre" version = "0.6.2" @@ -834,13 +874,16 @@ dependencies = [ ] [[package]] -name = "console_static_text" -version = "0.7.1" +name = "console" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953d2c3cf53213a4eccdbe8f2e0b49b5d0f77e87a2a9060117bbf9346f92b64e" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ + "encode_unicode", + "lazy_static", + "libc", "unicode-width", - "vte", + "windows-sys 0.42.0", ] [[package]] @@ -1022,8 +1065,8 @@ dependencies = [ "itoa 0.4.8", "matches", "phf 0.8.0", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "smallvec", "syn 1.0.109", ] @@ -1034,7 +1077,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" dependencies = [ - "quote 1.0.27", + "quote 1.0.26", "syn 1.0.109", ] @@ -1044,7 +1087,7 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "quote 1.0.27", + "quote 1.0.26", "syn 1.0.109", ] @@ -1054,7 +1097,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher", + "cipher 0.4.4", ] [[package]] @@ -1084,6 +1127,61 @@ dependencies = [ "zeroize", ] +[[package]] +name = "cxx" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2 1.0.56", + "quote 1.0.26", + "scratch", + "syn 2.0.15", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +dependencies = [ + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", +] + +[[package]] +name = "d3d12" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +dependencies = [ + "bitflags", + "libloading", + "winapi", +] + [[package]] name = "darling" version = "0.13.4" @@ -1112,8 +1210,8 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "strsim", "syn 1.0.109", ] @@ -1126,10 +1224,10 @@ checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "strsim", - "syn 2.0.16", + "syn 2.0.15", ] [[package]] @@ -1139,7 +1237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", - "quote 1.0.27", + "quote 1.0.26", "syn 1.0.109", ] @@ -1150,8 +1248,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core 0.20.1", - "quote 1.0.27", - "syn 2.0.16", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] @@ -1161,7 +1259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" dependencies = [ "cfg-if", - "hashbrown 0.12.3", + "hashbrown", "lock_api", "once_cell", "parking_lot_core 0.9.7", @@ -1190,11 +1288,21 @@ dependencies = [ "winapi", ] +[[package]] +name = "deflate" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" +dependencies = [ + "adler32", + "byteorder", +] + [[package]] name = "deno_ast" -version = "0.25.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b08341e0ed5b816e24b6582054b37707c8686de5598fa3004dc555131c993308" +checksum = "76e007f9f03be5484596ea6bed86ffdc6357ba9660cb8da20845baf2ce079722" dependencies = [ "anyhow", "base64 0.13.1", @@ -1222,21 +1330,21 @@ dependencies = [ [[package]] name = "deno_broadcast_channel" -version = "0.89.0" +version = "0.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afc4064413f46b725027b18a4639c480c2469e44c0359ffced6f752e67ffd17" +checksum = "1eaddf316a5c63eabe962d8304fbd5f9fa6d360cc6972e72ee541b34b5cd2f88" dependencies = [ "async-trait", "deno_core", "tokio", - "uuid", + "uuid 1.1.2", ] [[package]] name = "deno_cache" -version = "0.27.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258809850d7b3c365d3db8516a063cd0d8d1e85127e5ab3f46645d54c6416665" +checksum = "fb8d1a44cb8c8d18eda0b95b1078f274a29089eb6dd21766a9ecf4ad6cbac685" dependencies = [ "async-trait", "deno_core", @@ -1248,18 +1356,18 @@ dependencies = [ [[package]] name = "deno_console" -version = "0.95.0" +version = "0.89.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7aaa2e1f9f3ea7a9f7fe3abddf2d4edc7a602f7505c3bec2074b097bc9393fb" +checksum = "6cda6cf4635c2261951074023288f23756ac6852e7e63a6bd416a88f0e98c52e" dependencies = [ "deno_core", ] [[package]] name = "deno_core" -version = "0.177.0" +version = "0.171.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1563a04f319904eb5c4c981b0a5475a4258aa72d4576296f097a4f23b20f8428" +checksum = "2dc41944f05dfeacfc2610e91f40ddcf246f3aeeac8ae4c26df46bfbf01a3902" dependencies = [ "anyhow", "bytes", @@ -1282,11 +1390,11 @@ dependencies = [ [[package]] name = "deno_crypto" -version = "0.109.0" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091fb3bcc63884525eb2d2487aa7f93031fba7d16314713cbaf5bd461d568f5b" +checksum = "4f4e2a590be03f643d1147e12e8bc2fb04671b9bd68da9c8857d7d0b11a0255c" dependencies = [ - "aes", + "aes 0.8.2", "aes-gcm", "aes-kw", "base64 0.13.1", @@ -1298,7 +1406,7 @@ dependencies = [ "deno_core", "deno_web", "elliptic-curve", - "num-traits", + "num-traits 0.2.15", "once_cell", "p256", "p384", @@ -1313,15 +1421,15 @@ dependencies = [ "signature", "spki", "tokio", - "uuid", + "uuid 1.1.2", "x25519-dalek", ] [[package]] name = "deno_fetch" -version = "0.119.0" +version = "0.113.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "888bc588fc1b4dd93e7d9d6684e81d4ca9a863eb50f949d4ecafeb9c4c52128d" +checksum = "64c2ec54d6332b454cad9391e8b9c33edce79837ece8ffaca0f08ab957f78590" dependencies = [ "bytes", "data-url", @@ -1338,26 +1446,24 @@ dependencies = [ [[package]] name = "deno_ffi" -version = "0.82.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3750b1db8f718aba8d7e5e7290b9cb41cd72859ca6042a588177cc69336d7c19" +checksum = "e11cbb59638f05f3d4ffcb107a91491f70ddc86b93759be1f3858ffd4efd45f6" dependencies = [ "deno_core", "dlopen", "dynasmrt", "libffi", "serde", - "serde-value", - "serde_json", "tokio", "winapi", ] [[package]] name = "deno_flash" -version = "0.31.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b20cafba99811c75f840b606939736dc32aa24cff9f73d9dd02d83665b3bb1" +checksum = "e8e6067e14bc4d904b53bd7a4f665eaa119ce31bc1bdb3913d41331de84f0a69" dependencies = [ "deno_core", "deno_tls", @@ -1374,30 +1480,11 @@ dependencies = [ "tokio", ] -[[package]] -name = "deno_fs" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5592eb5a73752f59eeb6933a5a07dd1b7e8ac36f2e06dd6a96d204cea46419a" -dependencies = [ - "deno_core", - "deno_crypto", - "deno_io", - "filetime", - "fs3", - "libc", - "log", - "nix", - "serde", - "tokio", - "winapi", -] - [[package]] name = "deno_http" -version = "0.90.0" +version = "0.84.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa890f079e9aaf0a07020f97a805537ef526fb45636df713e97f062b5727a4a7" +checksum = "868bce9321850c1f2689846e8f031144efa5a7ae197d2839013c576c9b849167" dependencies = [ "async-compression", "base64 0.13.1", @@ -1419,40 +1506,11 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "deno_io" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90d2b638bff5266c98c65d4588276cefe465cb0f8d6e7bf9da6948e5596b4348" -dependencies = [ - "deno_core", - "nix", - "once_cell", - "tokio", - "winapi", -] - -[[package]] -name = "deno_kv" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c11b45e36981b9f98f176b42dc1cf9ced8780290700d04a1e60c95d6259f73" -dependencies = [ - "anyhow", - "async-trait", - "base64 0.13.1", - "deno_core", - "hex", - "num-bigint", - "rusqlite", - "serde", -] - [[package]] name = "deno_napi" -version = "0.25.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d346f413caa5c4525246de2def4579a1898db0d5da0c6c324a09181615b8774" +checksum = "c42ac68f4f95a5b786d76aacabfb0e0eb1817841159132b6ac72d6a6dba95429" dependencies = [ "deno_core", "libloading", @@ -1460,9 +1518,9 @@ dependencies = [ [[package]] name = "deno_net" -version = "0.87.0" +version = "0.81.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97840f48130f242e5d1893e363b3f126730a4ab8389d69796b7ca813025c12b" +checksum = "5ed32765651e169918c9bb7f92d03b4b618401e8744d6a6ce6cc0d89ac4bda01" dependencies = [ "deno_core", "deno_tls", @@ -1476,56 +1534,39 @@ dependencies = [ [[package]] name = "deno_node" -version = "0.32.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a88f748dc0fe1b329035d28ec409a3a1e9f3dbe4aaca42130d161f7943d21e" +checksum = "31411684ae279034f4fdd1fb9d0f2207eeaa7a717fdf490c26b00a22775f08d7" dependencies = [ - "aes", - "cbc", "deno_core", - "digest 0.10.6", - "hex", - "idna 0.3.0", - "indexmap", - "md-5", - "md4", "once_cell", "path-clean", - "rand 0.8.5", "regex", - "ripemd", - "rsa", "serde", - "sha-1 0.10.0", - "sha2", - "sha3", - "typenum", ] [[package]] name = "deno_ops" -version = "0.55.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "769968c69c652009e43cb9e63f610a1cc3d0316c3fc59d7327f51089f65a70f4" +checksum = "4740bc5738ad07dc1f523a232a4079a995fa2ad11efd71e09e8e32bf28f21ee1" dependencies = [ "once_cell", "pmutil", "proc-macro-crate", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "regex", "syn 1.0.109", ] [[package]] name = "deno_runtime" -version = "0.103.0" +version = "0.97.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16c6b3bb27ab224aa57a8b9124b7aebdd8881c1bcd70ea85fb2651b77e95eb4" +checksum = "29105932da08341683a01a5460ff683c7bcdf23efbaaf6057e75ecd710fb064b" dependencies = [ "atty", - "console_static_text", - "deno_ast", "deno_broadcast_channel", "deno_cache", "deno_console", @@ -1534,16 +1575,14 @@ dependencies = [ "deno_fetch", "deno_ffi", "deno_flash", - "deno_fs", "deno_http", - "deno_io", - "deno_kv", "deno_napi", "deno_net", "deno_node", "deno_tls", "deno_url", "deno_web", + "deno_webgpu", "deno_webidl", "deno_websocket", "deno_webstorage", @@ -1556,6 +1595,7 @@ dependencies = [ "hyper", "libc", "log", + "lzzzz", "netif", "nix", "notify", @@ -1567,16 +1607,16 @@ dependencies = [ "signal-hook-registry", "termcolor", "tokio", - "uuid", + "uuid 1.1.2", "winapi", "winres", ] [[package]] name = "deno_tls" -version = "0.82.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490206ee0eb9f3a5aabd7826f24bea32b0456b9cdc5a564e7526cad79b102c3e" +checksum = "94b82b9b18941a42be4108f79f14e8b5a29067e27619293d710324e0dd77d5d8" dependencies = [ "deno_core", "once_cell", @@ -1590,9 +1630,9 @@ dependencies = [ [[package]] name = "deno_url" -version = "0.95.0" +version = "0.89.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde7d4fb67b7df82512edef40c3e085357a4263dee3502e0387df021820e3bf8" +checksum = "d1fe82b011d8b2af63c4587551536d951f47ffc3ba2a710e455b383d4f4b06ba" dependencies = [ "deno_core", "serde", @@ -1602,9 +1642,9 @@ dependencies = [ [[package]] name = "deno_web" -version = "0.126.0" +version = "0.120.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65493427e1449a3dbdd0c947d91a738bb2d0b1d7fa1158ae13462c65a2a8e05a" +checksum = "7379502a7a333f573949558803e8bfe2e8fba3ef180cdbb4a882951803c87d20" dependencies = [ "async-trait", "base64-simd", @@ -1613,23 +1653,36 @@ dependencies = [ "flate2", "serde", "tokio", - "uuid", + "uuid 1.1.2", +] + +[[package]] +name = "deno_webgpu" +version = "0.90.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b430c70badca6edaf058d08dc622d931355726badc180134db49913270bcf2f" +dependencies = [ + "deno_core", + "serde", + "tokio", + "wgpu-core", + "wgpu-types", ] [[package]] name = "deno_webidl" -version = "0.95.0" +version = "0.89.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a2115515eba003e0780575f8fcc0b2ff95fd8b8db2fc7b4eb63b54756858cd" +checksum = "d046c6ac75f22be851219f44824c42927345f51e0ae5fb825e8bf8ea658d8ee8" dependencies = [ "deno_core", ] [[package]] name = "deno_websocket" -version = "0.100.0" +version = "0.94.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "665d8d3e3c6799ebf1945a6c248bb21e33ea1030cfb380bc78a394e315141b4f" +checksum = "afe8ce87cc7da7b4b0575d5686cafbdb306cb33bf04f33ff6e99325c88f44933" dependencies = [ "deno_core", "deno_tls", @@ -1643,9 +1696,9 @@ dependencies = [ [[package]] name = "deno_webstorage" -version = "0.90.0" +version = "0.84.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec16b3fb2fc256cb3012f1c719b185749cee2b7b5b25a630ba11aa84b94a8af2" +checksum = "33b25958fe8143a02c86971890b7fa08a888e6a8a201e4918ea49220c092c361" dependencies = [ "deno_core", "deno_web", @@ -1671,8 +1724,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "rustc_version 0.4.0", "syn 1.0.109", ] @@ -1765,12 +1818,12 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "dprint-swc-ext" -version = "0.8.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "008b6061551bcf644454469e6506c32bb23b765df93d608bf7a8e2494f82fcb3" +checksum = "0e2dc99247101e0132a17680c5afbba9a7334477b47738dd3431c13f5e2c9a84" dependencies = [ "bumpalo", - "num-bigint", + "num-bigint 0.4.3", "rustc-hash", "swc_atoms", "swc_common", @@ -1794,12 +1847,6 @@ dependencies = [ "dtoa", ] -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - [[package]] name = "dyn-clone" version = "1.0.11" @@ -1816,8 +1863,8 @@ dependencies = [ "byteorder", "lazy_static", "proc-macro-error", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -1891,6 +1938,12 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + [[package]] name = "encoding_rs" version = "0.8.31" @@ -1907,8 +1960,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -1918,8 +1971,8 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e40a16955681d469ab3da85aaa6b42ff656b3c67b52e1d8d3dd36afe97fd462" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -1930,8 +1983,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" dependencies = [ "once_cell", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -1942,11 +1995,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9895954c6ec59d897ed28a64815f2ceb57653fcaaebd317f2edc78b74f5495b6" dependencies = [ "pmutil", - "proc-macro2 1.0.57", + "proc-macro2 1.0.56", "swc_macros_common", "syn 1.0.109", ] +[[package]] +name = "enum_primitive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" +dependencies = [ + "num-traits 0.1.43", +] + [[package]] name = "err-derive" version = "0.3.1" @@ -1954,8 +2016,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "rustversion", "syn 1.0.109", "synstructure", @@ -2146,7 +2208,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d449976075322384507443937df2f1d5577afbf4282f12a5a66ef29fa3e6307" dependencies = [ "pmutil", - "proc-macro2 1.0.57", + "proc-macro2 1.0.56", "swc_macros_common", "syn 1.0.109", ] @@ -2268,9 +2330,9 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", - "syn 2.0.16", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] @@ -2361,7 +2423,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.0", + "system-deps 6.0.5", ] [[package]] @@ -2378,7 +2440,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.1.0", + "system-deps 6.0.5", ] [[package]] @@ -2390,7 +2452,7 @@ dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.1.0", + "system-deps 6.0.5", "x11", ] @@ -2490,7 +2552,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.0", + "system-deps 6.0.5", "winapi", ] @@ -2524,8 +2586,8 @@ dependencies = [ "heck 0.4.1", "proc-macro-crate", "proc-macro-error", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -2536,7 +2598,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.1.0", + "system-deps 6.0.5", ] [[package]] @@ -2551,13 +2613,25 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "bstr", "fnv", "log", "regex", ] +[[package]] +name = "glow" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e007a07a24de5ecae94160f141029e9a347282cfe25d1d58d85d845cf3130f1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gobject-sys" version = "0.15.10" @@ -2566,7 +2640,46 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps 6.1.0", + "system-deps 6.0.5", +] + +[[package]] +name = "gpu-alloc" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" +dependencies = [ + "bitflags", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +dependencies = [ + "bitflags", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" +dependencies = [ + "bitflags", + "gpu-descriptor-types", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" +dependencies = [ + "bitflags", ] [[package]] @@ -2618,7 +2731,7 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.1.0", + "system-deps 6.0.5", ] [[package]] @@ -2630,16 +2743,16 @@ dependencies = [ "anyhow", "proc-macro-crate", "proc-macro-error", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] [[package]] name = "h2" -version = "0.3.19" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" dependencies = [ "bytes", "fnv", @@ -2659,23 +2772,17 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash", ] [[package]] name = "hashlink" -version = "0.8.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0761a1b9491c4f2e3d66aa0f62d0fba0af9a0e2852e4d48ea506632a4b56e6aa" +checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" dependencies = [ - "hashbrown 0.13.2", + "hashbrown", ] [[package]] @@ -2751,6 +2858,12 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + [[package]] name = "hkdf" version = "0.12.3" @@ -2798,16 +2911,16 @@ dependencies = [ "log", "mac", "markup5ever", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] [[package]] name = "http" -version = "0.2.9" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes", "fnv", @@ -2915,21 +3028,22 @@ dependencies = [ [[package]] name = "iana-time-zone-haiku" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" dependencies = [ - "cc", + "cxx", + "cxx-build", ] [[package]] name = "ico" -version = "0.2.0" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd" +checksum = "6a4b3331534254a9b64095ae60d3dc2a8225a7a70229cd5888be127cdc1f6804" dependencies = [ "byteorder", - "png", + "png 0.11.0", ] [[package]] @@ -2980,11 +3094,10 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.18" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" dependencies = [ - "crossbeam-utils", "globset", "lazy_static", "log", @@ -3005,8 +3118,8 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-rational", - "num-traits", + "num-rational 0.4.1", + "num-traits 0.2.15", ] [[package]] @@ -3022,17 +3135,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg 1.1.0", - "hashbrown 0.12.3", + "hashbrown", "serde", ] +[[package]] +name = "indicatif" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" +dependencies = [ + "console", + "lazy_static", + "number_prefix", + "regex", +] + +[[package]] +name = "infer" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20b2b533137b9cad970793453d4f921c2e91312a6d88b1085c07bc15fc51bb3b" +dependencies = [ + "cfb 0.6.1", +] + [[package]] name = "infer" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" dependencies = [ - "cfb", + "cfb 0.7.3", +] + +[[package]] +name = "inflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5f9f47468e9a76a6452271efadc88fe865a82be91fe75e6c0c57b87ccea59d4" +dependencies = [ + "adler32", ] [[package]] @@ -3111,8 +3254,8 @@ checksum = "8a7d079e129b77477a49c5c4f1cfe9ce6c2c909ef52520693e8e811a714c7b20" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -3162,9 +3305,9 @@ dependencies = [ [[package]] name = "jni" -version = "0.20.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" dependencies = [ "cesu8", "combine", @@ -3191,9 +3334,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -3236,12 +3379,14 @@ dependencies = [ ] [[package]] -name = "keccak" -version = "0.1.4" +name = "khronos-egl" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" dependencies = [ - "cpufeatures", + "libc", + "libloading", + "pkg-config", ] [[package]] @@ -3360,9 +3505,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.144" +version = "0.2.143" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "edc207893e85c5d6be840e969b496b53d94cec8be2d501b214f50daa97fa8024" [[package]] name = "libdbus-sys" @@ -3410,9 +3555,9 @@ checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libsqlite3-sys" @@ -3434,6 +3579,15 @@ dependencies = [ "safemem", ] +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -3470,7 +3624,7 @@ dependencies = [ [[package]] name = "lodestone-client" -version = "0.4.4" +version = "0.4.3" dependencies = [ "lodestone_core", "portpicker", @@ -3484,8 +3638,8 @@ dependencies = [ [[package]] name = "lodestone_core" -version = "0.4.4" -source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=releases/0.5.0#32a29f7cb9850d4d3e4fd2aa0555eb8956b78da8" +version = "0.4.3" +source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=main#f1e918d87b65f60bd9889a38e3ec00d410684748" dependencies = [ "ansi_term", "argon2", @@ -3497,7 +3651,6 @@ dependencies = [ "base64 0.20.0", "chrono", "color-eyre", - "dashmap", "deno_ast", "deno_core", "deno_runtime", @@ -3513,6 +3666,7 @@ dependencies = [ "home", "igd", "indexmap", + "indicatif", "jsonwebtoken", "lazy_static", "local-ip-address", @@ -3545,8 +3699,8 @@ dependencies = [ "tracing-error", "tracing-subscriber", "ts-rs", - "url", - "uuid", + "unrar", + "uuid 1.1.2", "walkdir", "whoami", "zip", @@ -3585,6 +3739,15 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "lzzzz" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8014d1362004776e6a91e4c15a3aa7830d1b6650a075b51a9969ebb6d6af13bc" +dependencies = [ + "cc", +] + [[package]] name = "mac" version = "0.1.1" @@ -3654,24 +3817,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" -[[package]] -name = "md-5" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" -dependencies = [ - "digest 0.10.6", -] - -[[package]] -name = "md4" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da5ac363534dce5fabf69949225e174fbf111a498bf0ff794c8ea1fba9f3dda" -dependencies = [ - "digest 0.10.6", -] - [[package]] name = "memchr" version = "2.5.0" @@ -3705,6 +3850,20 @@ dependencies = [ "autocfg 1.1.0", ] +[[package]] +name = "metal" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +dependencies = [ + "bitflags", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", +] + [[package]] name = "mime" version = "0.3.17" @@ -3791,6 +3950,27 @@ dependencies = [ "version_check", ] +[[package]] +name = "naga" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5" +dependencies = [ + "bit-set", + "bitflags", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits 0.2.15", + "rustc-hash", + "serde", + "spirv", + "termcolor", + "thiserror", + "unicode-xid 0.2.4", +] + [[package]] name = "native-tls" version = "0.2.11" @@ -3856,8 +4036,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4" dependencies = [ "either", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "serde", "syn 1.0.109", ] @@ -3955,6 +4135,32 @@ dependencies = [ "winapi", ] +[[package]] +name = "num" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" +dependencies = [ + "num-bigint 0.1.44", + "num-complex", + "num-integer", + "num-iter", + "num-rational 0.1.42", + "num-traits 0.2.15", +] + +[[package]] +name = "num-bigint" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" +dependencies = [ + "num-integer", + "num-traits 0.2.15", + "rand 0.4.6", + "rustc-serialize", +] + [[package]] name = "num-bigint" version = "0.4.3" @@ -3963,7 +4169,7 @@ checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg 1.1.0", "num-integer", - "num-traits", + "num-traits 0.2.15", "serde", ] @@ -3975,15 +4181,25 @@ checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905" dependencies = [ "byteorder", "lazy_static", - "libm 0.2.7", + "libm 0.2.6", "num-integer", "num-iter", - "num-traits", + "num-traits 0.2.15", "rand 0.8.5", "smallvec", "zeroize", ] +[[package]] +name = "num-complex" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656" +dependencies = [ + "num-traits 0.2.15", + "rustc-serialize", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -3991,7 +4207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg 1.1.0", - "num-traits", + "num-traits 0.2.15", ] [[package]] @@ -4002,7 +4218,19 @@ checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg 1.1.0", "num-integer", - "num-traits", + "num-traits 0.2.15", +] + +[[package]] +name = "num-rational" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" +dependencies = [ + "num-bigint 0.1.44", + "num-integer", + "num-traits 0.2.15", + "rustc-serialize", ] [[package]] @@ -4013,7 +4241,16 @@ checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg 1.1.0", "num-integer", - "num-traits", + "num-traits 0.2.15", +] + +[[package]] +name = "num-traits" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ + "num-traits 0.2.15", ] [[package]] @@ -4023,7 +4260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg 1.1.0", - "libm 0.2.7", + "libm 0.2.6", ] [[package]] @@ -4052,8 +4289,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -4066,6 +4303,12 @@ dependencies = [ "libc", ] +[[package]] +name = "number_prefix" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" + [[package]] name = "objc" version = "0.2.7" @@ -4116,9 +4359,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "opaque-debug" @@ -4157,9 +4400,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", - "syn 2.0.16", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] @@ -4180,15 +4423,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "ordered-float" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" -dependencies = [ - "num-traits", -] - [[package]] name = "os_info" version = "3.7.0" @@ -4282,7 +4516,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.0", + "system-deps 6.0.5", ] [[package]] @@ -4459,8 +4693,8 @@ dependencies = [ "phf_generator 0.8.0", "phf_shared 0.8.0", "proc-macro-hack", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -4473,8 +4707,8 @@ dependencies = [ "phf_generator 0.10.0", "phf_shared 0.10.0", "proc-macro-hack", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -4498,22 +4732,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.0" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", - "syn 2.0.16", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -4582,11 +4816,23 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] +[[package]] +name = "png" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0b0cabbbd20c2d7f06dbf015e06aad59b6ca3d9ed14848783e98af9aaf19925" +dependencies = [ + "bitflags", + "deflate", + "inflate", + "num-iter", +] + [[package]] name = "png" version = "0.17.8" @@ -4656,8 +4902,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", "version_check", ] @@ -4668,8 +4914,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "version_check", ] @@ -4690,21 +4936,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.57" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] [[package]] -name = "psm" -version = "0.1.21" +name = "profiling" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" -dependencies = [ - "cc", -] +checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" [[package]] name = "quick-error" @@ -4741,11 +4984,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.27" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ - "proc-macro2 1.0.57", + "proc-macro2 1.0.56", ] [[package]] @@ -4948,6 +5191,12 @@ dependencies = [ "rand_core 0.3.1", ] +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + [[package]] name = "raw-window-handle" version = "0.5.2" @@ -5026,13 +5275,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ - "aho-corasick 1.0.1", + "aho-corasick", "memchr", - "regex-syntax 0.7.1", + "regex-syntax", ] [[package]] @@ -5041,7 +5290,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax 0.6.29", + "regex-syntax", ] [[package]] @@ -5050,12 +5299,6 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" -[[package]] -name = "regex-syntax" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" - [[package]] name = "remove_dir_all" version = "0.5.3" @@ -5181,12 +5424,14 @@ dependencies = [ ] [[package]] -name = "ripemd" -version = "0.1.3" +name = "ron" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" dependencies = [ - "digest 0.10.6", + "base64 0.13.1", + "bitflags", + "serde", ] [[package]] @@ -5206,7 +5451,7 @@ dependencies = [ "num-bigint-dig", "num-integer", "num-iter", - "num-traits", + "num-traits 0.2.15", "pkcs1", "pkcs8", "rand_core 0.6.4", @@ -5242,6 +5487,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-serialize" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" + [[package]] name = "rustc_version" version = "0.2.3" @@ -5373,6 +5624,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + [[package]] name = "sct" version = "0.7.0" @@ -5399,9 +5656,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2855b3715770894e67cbfa3df957790aa0c9edc3bf06efa1a84d77fa0839d1" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ "bitflags", "core-foundation", @@ -5412,9 +5669,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -5466,9 +5723,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6" dependencies = [ "serde_derive", ] @@ -5484,16 +5741,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - [[package]] name = "serde_bytes" version = "0.11.9" @@ -5505,13 +5752,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", - "syn 2.0.16", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] @@ -5541,8 +5788,8 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -5569,13 +5816,12 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.88.0" +version = "0.82.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b163edac8a2f2536ae7b52f839a33aba7892c04d0cf21e1bf8213ecfc905ebcc" +checksum = "c060fd38f18c420e82ab21592ec1f088b39bccb6897b1dda394d63628e22158d" dependencies = [ "bytes", "derive_more", - "num-bigint", "serde", "serde_bytes", "smallvec", @@ -5605,9 +5851,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ "darling 0.20.1", - "proc-macro2 1.0.57", - "quote 1.0.27", - "syn 2.0.16", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] @@ -5627,8 +5873,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -5688,16 +5934,6 @@ dependencies = [ "digest 0.10.6", ] -[[package]] -name = "sha3" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" -dependencies = [ - "digest 0.10.6", - "keccak", -] - [[package]] name = "sharded-slab" version = "0.1.4" @@ -5748,8 +5984,8 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ - "num-bigint", - "num-traits", + "num-bigint 0.4.3", + "num-traits 0.2.15", "thiserror", "time 0.3.21", ] @@ -5770,22 +6006,20 @@ dependencies = [ ] [[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "smartstring" -version = "1.0.1" +name = "slotmap" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" dependencies = [ - "autocfg 1.1.0", - "static_assertions", "version_check", ] +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + [[package]] name = "socket2" version = "0.4.9" @@ -5854,6 +6088,16 @@ dependencies = [ "lock_api", ] +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags", + "num-traits 0.2.15", +] + [[package]] name = "spki" version = "0.6.0" @@ -5889,7 +6133,7 @@ name = "sqlx-core" version = "0.6.2" source = "git+https://github.com/Lodestone-Team/sqlx#072d4d6259db1203dfe341811ea838a6b886f7ae" dependencies = [ - "ahash 0.7.6", + "ahash", "atoi", "bitflags", "byteorder", @@ -5940,8 +6184,8 @@ dependencies = [ "either", "heck 0.4.1", "once_cell", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "serde_json", "sha2", "sqlx-core", @@ -5966,19 +6210,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "stacker" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "winapi", -] - [[package]] name = "state" version = "0.5.3" @@ -6016,8 +6247,8 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ "phf_generator 0.10.0", "phf_shared 0.10.0", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", ] [[package]] @@ -6027,8 +6258,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91f42363e5ca94ea6f3faee9e3b5e1a4047535ae323f5c0579385fb2ae95874e" dependencies = [ "pmutil", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "swc_macros_common", "syn 1.0.109", ] @@ -6065,8 +6296,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" dependencies = [ "heck 0.3.3", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -6078,9 +6309,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "swc_atoms" -version = "0.4.39" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ebef84c2948cd0d1ba25acbf1b4bd9d80ab6f057efdbe35d8449b8d54699401" +checksum = "731cf66bd8e11030f056f91f9d8af77f83ec4377ff04d1670778a57d1607402a" dependencies = [ "once_cell", "rustc-hash", @@ -6092,18 +6323,18 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.29.37" +version = "0.29.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5005cd73617e18592faa31298225b26f1c407b84a681d67efb735c3d3458e101" +checksum = "a97e491d31418cd33fea58e9f893316fc04b30e2b5d0e750c066e2ba4907ae54" dependencies = [ - "ahash 0.7.6", + "ahash", "ast_node", "better_scoped_tls", "cfg-if", "either", "from_variant", "new_debug_unreachable", - "num-bigint", + "num-bigint 0.4.3", "once_cell", "rustc-hash", "serde", @@ -6137,21 +6368,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dadb9998d4f5fc36ef558ed5a092579441579ee8c6fcce84a5228cca9df4004" dependencies = [ "pmutil", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "swc_macros_common", "syn 1.0.109", ] [[package]] name = "swc_ecma_ast" -version = "0.100.1" +version = "0.96.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dbfdbe05dde274473a6030dcf5e52e579516aea761d25d7a8d128f2ab597f09" +checksum = "a887102d5595b557261aa4bde35f3d71906fba674d4b79cd5c59b4155b12ee2d" dependencies = [ "bitflags", "is-macro", - "num-bigint", + "num-bigint 0.4.3", "scoped-tls", "serde", "string_enum", @@ -6162,12 +6393,12 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.135.2" +version = "0.129.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78d196e6979af0cbb91084361ca006db292a6374f75ec04cbb55306051cc4f50" +checksum = "45f8f20522626a737753381bdf64ee53d568730f9f7e720d35960de97e5ff965" dependencies = [ "memchr", - "num-bigint", + "num-bigint 0.4.3", "once_cell", "rustc-hash", "serde", @@ -6186,19 +6417,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0159c99f81f52e48fe692ef7af1b0990b45d3006b14c6629be0b1ffee1b23aea" dependencies = [ "pmutil", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "swc_macros_common", "syn 1.0.109", ] [[package]] name = "swc_ecma_loader" -version = "0.41.39" +version = "0.41.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681c1fbb762c82700a5bd23dc39bad892a287ea9fb2121cf56e77f1ddc89afeb" +checksum = "c996baa947150d496c79fbd153d3df834e38d05c779abc4af987aded90e168a2" dependencies = [ - "ahash 0.7.6", + "ahash", "anyhow", "pathdiff", "serde", @@ -6208,18 +6439,16 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.130.2" +version = "0.124.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "042435aaeb71c4416cde440323ac9fa2c24121c2ec150f0cb79999c2e6ceffaa" +checksum = "9e75888eabf1ad8a8968e3befc7cd20c10e4721254d3344285bd5c3a42f58dc1" dependencies = [ "either", "enum_kind", "lexical", - "num-bigint", + "num-bigint 0.4.3", "serde", "smallvec", - "smartstring", - "stacker", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -6229,9 +6458,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.122.3" +version = "0.116.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4141092b17cd85eefc224b035b717e03c910b9fd58e4e637ffd05236d7e13b" +checksum = "5f5a212abba41897332f9ab3af8fe5d1a59f83d69e25eea119c27d9b53876688" dependencies = [ "better_scoped_tls", "bitflags", @@ -6251,9 +6480,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.111.3" +version = "0.105.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5022c592f0ae17f4dc42031e1c4c60b7e6d2d8d1c2428b986759a92ea853801" +checksum = "a2fd5a8eff1a7f16ec1b3ae50186debf3d3983effed6ed05d4e6db0ed7aadcac" dependencies = [ "swc_atoms", "swc_common", @@ -6270,17 +6499,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebf907935ec5492256b523ae7935a824d9fdc0368dcadc41375bad0dca91cd8b" dependencies = [ "pmutil", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "swc_macros_common", "syn 1.0.109", ] [[package]] name = "swc_ecma_transforms_proposal" -version = "0.156.4" +version = "0.149.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4015c3ab090f27eee0834d45bdcf9666dc6329ed06845d1882cdfe6f4826fca" +checksum = "a6fe11a20c7ced3c6b6149da330b8b4d8912fe02af6923aaac4d4479aa3dd3b6" dependencies = [ "either", "serde", @@ -6297,11 +6526,11 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.167.4" +version = "0.160.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db1c7801b1d7741ab335441dd301ddcc4183fb250d5e6efaab33b03def268c06" +checksum = "b94e3884668e2e12684e4adf812dbd22d34b17da2d7637b1c9cffe393acad6c2" dependencies = [ - "ahash 0.7.6", + "ahash", "base64 0.13.1", "dashmap", "indexmap", @@ -6323,9 +6552,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.171.4" +version = "0.164.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142e8fb5ebe870bc51b3a95c0214af9112d3475b7cd5be4f13b87f3be664841a" +checksum = "9a885199b43798b46d8b26b4a986f899436f9f2cb37477eb12a183388a5c213f" dependencies = [ "serde", "swc_atoms", @@ -6339,9 +6568,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.113.3" +version = "0.107.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c44885603c09926118708f4352e04242c2482bc16eb51ad7beb8ad4cf5f7bb6" +checksum = "d773cf626c8d3be468a883879cda3727a2f1ea6169ccd0b5b8eb2d7afb5f367b" dependencies = [ "indexmap", "num_cpus", @@ -6357,11 +6586,11 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.86.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147cf9137da6fe2704a5defd29a1cde849961978f8c92911e6790d50df475fef" +checksum = "6b2ee0f4b61d6c426189d0d9da1333705ff3bc4513fb63633ca254595a700f75" dependencies = [ - "num-bigint", + "num-bigint 0.4.3", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -6376,8 +6605,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c20468634668c2bbab581947bb8c75c97158d5a6959f4ba33df20983b20b4f6" dependencies = [ "pmutil", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -6388,8 +6617,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e582c3e3c2269238524923781df5be49e011dbe29cf7683a2215d600a562ea6" dependencies = [ "pmutil", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -6411,8 +6640,8 @@ checksum = "ebeed7eb0f545f48ad30f5aab314e5208b735bcea1d1464f26e20f06db904989" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "swc_macros_common", "syn 1.0.109", ] @@ -6434,19 +6663,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.16" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "unicode-ident", ] @@ -6462,8 +6691,8 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", "unicode-xid 0.2.4", ] @@ -6498,9 +6727,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.0" +version = "6.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" +checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055" dependencies = [ "cfg-expr 0.15.1", "heck 0.4.1", @@ -6511,9 +6740,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.15.8" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac8e6399427c8494f9849b58694754d7cc741293348a6836b6c8d2c5aa82d8e6" +checksum = "43336f5d1793543ba96e2a1e75f3a5c7dcd592743be06a0ab3a190f4fcb4b934" dependencies = [ "bitflags", "cairo-rs", @@ -6544,12 +6773,12 @@ dependencies = [ "once_cell", "parking_lot 0.12.1", "paste", - "png", + "png 0.17.8", "raw-window-handle", "scopeguard", "serde", "unicode-segmentation", - "uuid", + "uuid 1.1.2", "windows 0.39.0", "windows-implement", "x11-dl", @@ -6574,9 +6803,9 @@ checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" [[package]] name = "tauri" -version = "1.2.5" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a1fe72365a6d860fddf3403934649a5157b2bbb6f0b50dd3a8858cd1a22412" +checksum = "cad0833f2a2833808091721ac4d99ed873f9ae48187523b518f666841cb31701" dependencies = [ "anyhow", "attohttpc 0.22.0", @@ -6622,7 +6851,7 @@ dependencies = [ "time 0.3.21", "tokio", "url", - "uuid", + "uuid 1.1.2", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -6649,18 +6878,18 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.2.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14388d484b6b1b5dc0f6a7d6cc6433b3b230bec85eaa576adcdf3f9fafa49251" +checksum = "afcb77cf7bfe3d8f886e73a7fa6157587d015c599671180b76595c1aef175ba8" dependencies = [ "base64 0.13.1", "brotli", "ico", "json-patch 0.2.7", "plist", - "png", - "proc-macro2 1.0.57", - "quote 1.0.27", + "png 0.17.8", + "proc-macro2 1.0.56", + "quote 1.0.26", "regex", "semver 1.0.17", "serde", @@ -6669,19 +6898,19 @@ dependencies = [ "tauri-utils", "thiserror", "time 0.3.21", - "uuid", + "uuid 1.1.2", "walkdir", ] [[package]] name = "tauri-macros" -version = "1.2.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075" +checksum = "f24f481b0b2acfc288ac78755f00ebea53992c7365a165af64cb5ae00806edea" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", "tauri-codegen", "tauri-utils", @@ -6700,13 +6929,14 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.12.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc36898ad4acb6c381878acf903c320a36cf29b68b74f6e791d6045b6557128c" +checksum = "be6283addfc4ccc2bd10ed0d87dcba582bf3f511998047e6a193c13c75cae3c9" dependencies = [ "gtk", "http", "http-range", + "infer 0.7.0", "rand 0.8.5", "raw-window-handle", "serde", @@ -6714,16 +6944,16 @@ dependencies = [ "tauri-utils", "thiserror", "url", - "uuid", + "uuid 1.1.2", "webview2-com", "windows 0.39.0", ] [[package]] name = "tauri-runtime-wry" -version = "0.12.3" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ebc22bc5566ba33310744fadd86709fa591ed163491b165855474523ac1aab" +checksum = "0ca3f21cc3502edda0df6d0579870ab4d6dbe82c0da1d67e8c129f8f22eb62ce" dependencies = [ "cocoa", "gtk", @@ -6733,7 +6963,7 @@ dependencies = [ "tauri-runtime", "tauri-utils", "url", - "uuid", + "uuid 1.1.2", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -6751,13 +6981,13 @@ dependencies = [ "glob", "heck 0.4.1", "html5ever", - "infer", + "infer 0.12.0", "json-patch 1.0.0", "kuchiki", "memchr", "phf 0.10.1", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "semver 1.0.17", "serde", "serde_json", @@ -6862,9 +7092,9 @@ version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", - "syn 2.0.16", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] @@ -6947,9 +7177,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.25.0" +version = "1.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" dependencies = [ "autocfg 1.1.0", "bytes", @@ -6971,8 +7201,8 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -7050,9 +7280,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ "bytes", "futures-core", @@ -7141,6 +7371,7 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", + "tower", "tower-layer", "tower-service", "tracing", @@ -7188,16 +7419,16 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", - "syn 2.0.16", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", "valuable", @@ -7330,7 +7561,6 @@ version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4added4070a4fdf9df03457206cd2e4b12417c8560a2954d91ffcbe60177a56a" dependencies = [ - "indexmap", "thiserror", "ts-rs-macros", ] @@ -7342,8 +7572,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f807fdb3151fee75df7485b901a89624358cd07a67a8fb1a5831bf5a07681ff" dependencies = [ "Inflector", - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", "termcolor", ] @@ -7517,6 +7747,31 @@ dependencies = [ "subtle", ] +[[package]] +name = "unrar" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433cea4f0b7bec88d47becb380887b8786a3cfb1c82e1ef9d32a682ba6801814" +dependencies = [ + "bitflags", + "enum_primitive", + "lazy_static", + "num", + "regex", + "unrar_sys", +] + +[[package]] +name = "unrar_sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0009399408dc0bcc5c8910672544fceceeba18b91f741ff943916e917d982c60" +dependencies = [ + "cc", + "libc", + "winapi", +] + [[package]] name = "untrusted" version = "0.7.1" @@ -7555,16 +7810,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] -name = "utf8parse" -version = "0.2.1" +name = "uuid" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" [[package]] name = "uuid" -version = "1.3.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" dependencies = [ "getrandom 0.2.9", "rand 0.8.5", @@ -7574,20 +7829,20 @@ dependencies = [ [[package]] name = "uuid-macro-internal" -version = "1.3.3" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f67b459f42af2e6e1ee213cb9da4dbd022d3320788c3fb3e1b893093f1e45da" +checksum = "18d884370cccfad1f913e67c7362f9c00357844bc9f3cfce86faa2241cabd166" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", - "syn 2.0.16", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] name = "v8" -version = "0.66.0" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8ab8597b885c17b3761f6ffc29b7a62758612c409285a9271c6dacd17bb745" +checksum = "07fd5b3ed559897ff02c0f62bc0a5f300bfe79bb4c77a50031b8df771701c628" dependencies = [ "bitflags", "fslock", @@ -7651,27 +7906,6 @@ dependencies = [ "libc", ] -[[package]] -name = "vte" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aae21c12ad2ec2d168c236f369c38ff332bc1134f7246350dca641437365045" -dependencies = [ - "arrayvec", - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", -] - [[package]] name = "walkdir" version = "2.3.3" @@ -7712,9 +7946,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -7722,24 +7956,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.57", - "quote 1.0.27", - "syn 2.0.16", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -7749,32 +7983,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ - "quote 1.0.27", + "quote 1.0.26", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", - "syn 2.0.16", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wasm-streams" @@ -7791,9 +8025,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -7843,7 +8077,7 @@ dependencies = [ "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.1.0", + "system-deps 6.0.5", ] [[package]] @@ -7883,8 +8117,8 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", + "proc-macro2 1.0.56", + "quote 1.0.26", "syn 1.0.109", ] @@ -7903,6 +8137,81 @@ dependencies = [ "windows-metadata", ] +[[package]] +name = "wgpu-core" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags", + "codespan-reporting", + "fxhash", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "ron", + "serde", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags", + "block", + "core-graphics-types", + "d3d12", + "foreign-types", + "fxhash", + "glow", + "gpu-alloc", + "gpu-descriptor", + "js-sys", + "khronos-egl", + "libc", + "libloading", + "log", + "metal", + "naga", + "objc", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" +dependencies = [ + "bitflags", + "js-sys", + "serde", + "web-sys", +] + [[package]] name = "which" version = "4.4.0" @@ -8281,16 +8590,15 @@ dependencies = [ [[package]] name = "wry" -version = "0.23.4" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c1ad8e2424f554cc5bdebe8aa374ef5b433feff817aebabca0389961fc7ef98" +checksum = "ff5c1352b4266fdf92c63479d2f58ab4cd29dc4e78fbc1b62011ed1227926945" dependencies = [ "base64 0.13.1", "block", "cocoa", "core-graphics", "crossbeam-channel", - "dunce", "gdk", "gio", "glib", @@ -8306,7 +8614,6 @@ dependencies = [ "serde", "serde_json", "sha2", - "soup2", "tao", "thiserror", "url", @@ -8329,12 +8636,12 @@ dependencies = [ [[package]] name = "x11-dl" -version = "2.21.0" +version = "2.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0" dependencies = [ + "lazy_static", "libc", - "once_cell", "pkg-config", ] @@ -8361,9 +8668,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.11" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1690519550bfa95525229b9ca2350c63043a4857b3b0013811b2ccf4a2420b01" +checksum = "699d0104bcdd7e7af6d093d6c6e2d0c479b8a129ee0d1023b31d2e0c71bfdda2" [[package]] name = "xmltree" @@ -8389,18 +8696,18 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.57", - "quote 1.0.27", - "syn 2.0.16", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] name = "zip" -version = "0.6.6" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "7e92305c174683d78035cbf1b70e18db6329cc0f1b9cae0a52ca90bf5bfe7125" dependencies = [ - "aes", + "aes 0.7.5", "byteorder", "bzip2", "constant_time_eq", From 0b8749fa32c37e761a837b47040adacff2653375 Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Fri, 19 May 2023 20:14:01 -0400 Subject: [PATCH 096/108] cargo updated --- src-tauri/Cargo.lock | 1651 ++++++++++++++++++------------------------ 1 file changed, 695 insertions(+), 956 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index e92150ae..5d82417c 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -27,12 +27,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - [[package]] name = "aead" version = "0.5.2" @@ -43,18 +37,6 @@ dependencies = [ "generic-array 0.14.7", ] -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if", - "cipher 0.3.0", - "cpufeatures", - "opaque-debug", -] - [[package]] name = "aes" version = "0.8.2" @@ -62,7 +44,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" dependencies = [ "cfg-if", - "cipher 0.4.4", + "cipher", "cpufeatures", ] @@ -73,8 +55,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" dependencies = [ "aead", - "aes 0.8.2", - "cipher 0.4.4", + "aes", + "cipher", "ctr", "ghash", "subtle", @@ -86,7 +68,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c" dependencies = [ - "aes 0.8.2", + "aes", ] [[package]] @@ -100,6 +82,17 @@ dependencies = [ "version_check", ] +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "0.7.20" @@ -109,6 +102,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "aho-corasick" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +dependencies = [ + "memchr", +] + [[package]] name = "alloc-no-stdlib" version = "2.0.4" @@ -176,9 +178,6 @@ name = "arrayvec" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" -dependencies = [ - "serde", -] [[package]] name = "ascii" @@ -186,15 +185,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" -[[package]] -name = "ash" -version = "0.37.2+1.3.238" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03" -dependencies = [ - "libloading", -] - [[package]] name = "ast_node" version = "0.8.8" @@ -203,8 +193,8 @@ checksum = "70151a5226578411132d798aa248df45b30aa34aea2e580628870b4d87be717b" dependencies = [ "darling 0.13.4", "pmutil", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "swc_macros_common", "syn 1.0.109", ] @@ -223,15 +213,29 @@ dependencies = [ "tokio", ] +[[package]] +name = "async-compression" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11" +dependencies = [ + "brotli", + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + [[package]] name = "async-trait" version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -255,7 +259,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -264,7 +268,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" dependencies = [ - "num-traits 0.2.15", + "num-traits", ] [[package]] @@ -323,9 +327,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.7" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fb79c228270dcf2426e74864cabc94babb5dbab01a4314e702d2f16540e1591" +checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" dependencies = [ "async-trait", "axum-core", @@ -354,7 +358,6 @@ dependencies = [ "tokio", "tokio-tungstenite 0.18.0", "tower", - "tower-http", "tower-layer", "tower-service", ] @@ -395,9 +398,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bb524613be645939e280b7279f7b017f98cf7f5ef084ec374df373530e73277" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -413,10 +416,10 @@ dependencies = [ "http-body", "hyper", "pin-project-lite", - "rustls", + "rustls 0.20.8", "rustls-pemfile", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", "tower-service", ] @@ -511,7 +514,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -586,9 +589,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.1" +version = "3.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" +checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" [[package]] name = "bytemuck" @@ -604,9 +607,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bzip2" @@ -656,7 +659,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -675,7 +678,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" dependencies = [ - "cipher 0.4.4", + "cipher", ] [[package]] @@ -693,16 +696,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -[[package]] -name = "cfb" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f89d248799e3f15f91b70917f65381062a01bb8e222700ea0e5a7ff9785f9c" -dependencies = [ - "byteorder", - "uuid 0.8.2", -] - [[package]] name = "cfb" version = "0.7.3" @@ -711,7 +704,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" dependencies = [ "byteorder", "fnv", - "uuid 1.1.2", + "uuid", ] [[package]] @@ -748,7 +741,7 @@ dependencies = [ "iana-time-zone", "js-sys", "num-integer", - "num-traits 0.2.15", + "num-traits", "serde", "time 0.1.45", "wasm-bindgen", @@ -761,15 +754,6 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cca491388666e04d7248af3f60f0c40cfb0991c72205595d7c396e3510207d1a" -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array 0.14.7", -] - [[package]] name = "cipher" version = "0.4.4" @@ -820,16 +804,6 @@ dependencies = [ "objc", ] -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - [[package]] name = "color-eyre" version = "0.6.2" @@ -874,16 +848,13 @@ dependencies = [ ] [[package]] -name = "console" -version = "0.15.5" +name = "console_static_text" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +checksum = "953d2c3cf53213a4eccdbe8f2e0b49b5d0f77e87a2a9060117bbf9346f92b64e" dependencies = [ - "encode_unicode", - "lazy_static", - "libc", "unicode-width", - "windows-sys 0.42.0", + "vte", ] [[package]] @@ -1065,8 +1036,8 @@ dependencies = [ "itoa 0.4.8", "matches", "phf 0.8.0", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "smallvec", "syn 1.0.109", ] @@ -1077,7 +1048,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" dependencies = [ - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -1087,7 +1058,7 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -1097,7 +1068,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher 0.4.4", + "cipher", ] [[package]] @@ -1127,61 +1098,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2 1.0.56", - "quote 1.0.26", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", -] - -[[package]] -name = "d3d12" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" -dependencies = [ - "bitflags", - "libloading", - "winapi", -] - [[package]] name = "darling" version = "0.13.4" @@ -1210,8 +1126,8 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "strsim", "syn 1.0.109", ] @@ -1224,10 +1140,10 @@ checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "strsim", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -1237,7 +1153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", - "quote 1.0.26", + "quote 1.0.27", "syn 1.0.109", ] @@ -1248,8 +1164,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core 0.20.1", - "quote 1.0.26", - "syn 2.0.15", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -1259,7 +1175,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.12.3", "lock_api", "once_cell", "parking_lot_core 0.9.7", @@ -1288,21 +1204,11 @@ dependencies = [ "winapi", ] -[[package]] -name = "deflate" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" -dependencies = [ - "adler32", - "byteorder", -] - [[package]] name = "deno_ast" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e007f9f03be5484596ea6bed86ffdc6357ba9660cb8da20845baf2ce079722" +checksum = "b08341e0ed5b816e24b6582054b37707c8686de5598fa3004dc555131c993308" dependencies = [ "anyhow", "base64 0.13.1", @@ -1330,21 +1236,21 @@ dependencies = [ [[package]] name = "deno_broadcast_channel" -version = "0.83.0" +version = "0.89.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eaddf316a5c63eabe962d8304fbd5f9fa6d360cc6972e72ee541b34b5cd2f88" +checksum = "4afc4064413f46b725027b18a4639c480c2469e44c0359ffced6f752e67ffd17" dependencies = [ "async-trait", "deno_core", "tokio", - "uuid 1.1.2", + "uuid", ] [[package]] name = "deno_cache" -version = "0.21.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8d1a44cb8c8d18eda0b95b1078f274a29089eb6dd21766a9ecf4ad6cbac685" +checksum = "258809850d7b3c365d3db8516a063cd0d8d1e85127e5ab3f46645d54c6416665" dependencies = [ "async-trait", "deno_core", @@ -1356,18 +1262,18 @@ dependencies = [ [[package]] name = "deno_console" -version = "0.89.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cda6cf4635c2261951074023288f23756ac6852e7e63a6bd416a88f0e98c52e" +checksum = "b7aaa2e1f9f3ea7a9f7fe3abddf2d4edc7a602f7505c3bec2074b097bc9393fb" dependencies = [ "deno_core", ] [[package]] name = "deno_core" -version = "0.171.0" +version = "0.177.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc41944f05dfeacfc2610e91f40ddcf246f3aeeac8ae4c26df46bfbf01a3902" +checksum = "1563a04f319904eb5c4c981b0a5475a4258aa72d4576296f097a4f23b20f8428" dependencies = [ "anyhow", "bytes", @@ -1390,11 +1296,11 @@ dependencies = [ [[package]] name = "deno_crypto" -version = "0.103.0" +version = "0.109.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e2a590be03f643d1147e12e8bc2fb04671b9bd68da9c8857d7d0b11a0255c" +checksum = "091fb3bcc63884525eb2d2487aa7f93031fba7d16314713cbaf5bd461d568f5b" dependencies = [ - "aes 0.8.2", + "aes", "aes-gcm", "aes-kw", "base64 0.13.1", @@ -1406,7 +1312,7 @@ dependencies = [ "deno_core", "deno_web", "elliptic-curve", - "num-traits 0.2.15", + "num-traits", "once_cell", "p256", "p384", @@ -1421,15 +1327,15 @@ dependencies = [ "signature", "spki", "tokio", - "uuid 1.1.2", + "uuid", "x25519-dalek", ] [[package]] name = "deno_fetch" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c2ec54d6332b454cad9391e8b9c33edce79837ece8ffaca0f08ab957f78590" +checksum = "888bc588fc1b4dd93e7d9d6684e81d4ca9a863eb50f949d4ecafeb9c4c52128d" dependencies = [ "bytes", "data-url", @@ -1446,24 +1352,26 @@ dependencies = [ [[package]] name = "deno_ffi" -version = "0.76.0" +version = "0.82.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11cbb59638f05f3d4ffcb107a91491f70ddc86b93759be1f3858ffd4efd45f6" +checksum = "3750b1db8f718aba8d7e5e7290b9cb41cd72859ca6042a588177cc69336d7c19" dependencies = [ "deno_core", "dlopen", "dynasmrt", "libffi", "serde", + "serde-value", + "serde_json", "tokio", "winapi", ] [[package]] name = "deno_flash" -version = "0.25.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e6067e14bc4d904b53bd7a4f665eaa119ce31bc1bdb3913d41331de84f0a69" +checksum = "81b20cafba99811c75f840b606939736dc32aa24cff9f73d9dd02d83665b3bb1" dependencies = [ "deno_core", "deno_tls", @@ -1473,20 +1381,39 @@ dependencies = [ "libc", "log", "mio", - "rustls", + "rustls 0.20.8", "rustls-pemfile", "serde", "socket2", "tokio", ] +[[package]] +name = "deno_fs" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5592eb5a73752f59eeb6933a5a07dd1b7e8ac36f2e06dd6a96d204cea46419a" +dependencies = [ + "deno_core", + "deno_crypto", + "deno_io", + "filetime", + "fs3", + "libc", + "log", + "nix", + "serde", + "tokio", + "winapi", +] + [[package]] name = "deno_http" -version = "0.84.0" +version = "0.90.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "868bce9321850c1f2689846e8f031144efa5a7ae197d2839013c576c9b849167" +checksum = "fa890f079e9aaf0a07020f97a805537ef526fb45636df713e97f062b5727a4a7" dependencies = [ - "async-compression", + "async-compression 0.3.15", "base64 0.13.1", "brotli", "bytes", @@ -1506,11 +1433,40 @@ dependencies = [ "tokio-util", ] +[[package]] +name = "deno_io" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90d2b638bff5266c98c65d4588276cefe465cb0f8d6e7bf9da6948e5596b4348" +dependencies = [ + "deno_core", + "nix", + "once_cell", + "tokio", + "winapi", +] + +[[package]] +name = "deno_kv" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86c11b45e36981b9f98f176b42dc1cf9ced8780290700d04a1e60c95d6259f73" +dependencies = [ + "anyhow", + "async-trait", + "base64 0.13.1", + "deno_core", + "hex", + "num-bigint", + "rusqlite", + "serde", +] + [[package]] name = "deno_napi" -version = "0.19.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42ac68f4f95a5b786d76aacabfb0e0eb1817841159132b6ac72d6a6dba95429" +checksum = "2d346f413caa5c4525246de2def4579a1898db0d5da0c6c324a09181615b8774" dependencies = [ "deno_core", "libloading", @@ -1518,9 +1474,9 @@ dependencies = [ [[package]] name = "deno_net" -version = "0.81.0" +version = "0.87.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ed32765651e169918c9bb7f92d03b4b618401e8744d6a6ce6cc0d89ac4bda01" +checksum = "a97840f48130f242e5d1893e363b3f126730a4ab8389d69796b7ca813025c12b" dependencies = [ "deno_core", "deno_tls", @@ -1534,39 +1490,56 @@ dependencies = [ [[package]] name = "deno_node" -version = "0.26.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31411684ae279034f4fdd1fb9d0f2207eeaa7a717fdf490c26b00a22775f08d7" +checksum = "21a88f748dc0fe1b329035d28ec409a3a1e9f3dbe4aaca42130d161f7943d21e" dependencies = [ + "aes", + "cbc", "deno_core", + "digest 0.10.7", + "hex", + "idna 0.3.0", + "indexmap", + "md-5", + "md4", "once_cell", "path-clean", + "rand 0.8.5", "regex", + "ripemd", + "rsa", "serde", + "sha-1 0.10.0", + "sha2", + "sha3", + "typenum", ] [[package]] name = "deno_ops" -version = "0.49.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4740bc5738ad07dc1f523a232a4079a995fa2ad11efd71e09e8e32bf28f21ee1" +checksum = "769968c69c652009e43cb9e63f610a1cc3d0316c3fc59d7327f51089f65a70f4" dependencies = [ "once_cell", "pmutil", "proc-macro-crate", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "regex", "syn 1.0.109", ] [[package]] name = "deno_runtime" -version = "0.97.0" +version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29105932da08341683a01a5460ff683c7bcdf23efbaaf6057e75ecd710fb064b" +checksum = "f16c6b3bb27ab224aa57a8b9124b7aebdd8881c1bcd70ea85fb2651b77e95eb4" dependencies = [ "atty", + "console_static_text", + "deno_ast", "deno_broadcast_channel", "deno_cache", "deno_console", @@ -1575,14 +1548,16 @@ dependencies = [ "deno_fetch", "deno_ffi", "deno_flash", + "deno_fs", "deno_http", + "deno_io", + "deno_kv", "deno_napi", "deno_net", "deno_node", "deno_tls", "deno_url", "deno_web", - "deno_webgpu", "deno_webidl", "deno_websocket", "deno_webstorage", @@ -1595,7 +1570,6 @@ dependencies = [ "hyper", "libc", "log", - "lzzzz", "netif", "nix", "notify", @@ -1607,20 +1581,20 @@ dependencies = [ "signal-hook-registry", "termcolor", "tokio", - "uuid 1.1.2", + "uuid", "winapi", "winres", ] [[package]] name = "deno_tls" -version = "0.76.0" +version = "0.82.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b82b9b18941a42be4108f79f14e8b5a29067e27619293d710324e0dd77d5d8" +checksum = "490206ee0eb9f3a5aabd7826f24bea32b0456b9cdc5a564e7526cad79b102c3e" dependencies = [ "deno_core", "once_cell", - "rustls", + "rustls 0.20.8", "rustls-native-certs", "rustls-pemfile", "serde", @@ -1630,9 +1604,9 @@ dependencies = [ [[package]] name = "deno_url" -version = "0.89.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1fe82b011d8b2af63c4587551536d951f47ffc3ba2a710e455b383d4f4b06ba" +checksum = "bde7d4fb67b7df82512edef40c3e085357a4263dee3502e0387df021820e3bf8" dependencies = [ "deno_core", "serde", @@ -1642,9 +1616,9 @@ dependencies = [ [[package]] name = "deno_web" -version = "0.120.0" +version = "0.126.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7379502a7a333f573949558803e8bfe2e8fba3ef180cdbb4a882951803c87d20" +checksum = "65493427e1449a3dbdd0c947d91a738bb2d0b1d7fa1158ae13462c65a2a8e05a" dependencies = [ "async-trait", "base64-simd", @@ -1653,36 +1627,23 @@ dependencies = [ "flate2", "serde", "tokio", - "uuid 1.1.2", -] - -[[package]] -name = "deno_webgpu" -version = "0.90.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b430c70badca6edaf058d08dc622d931355726badc180134db49913270bcf2f" -dependencies = [ - "deno_core", - "serde", - "tokio", - "wgpu-core", - "wgpu-types", + "uuid", ] [[package]] name = "deno_webidl" -version = "0.89.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d046c6ac75f22be851219f44824c42927345f51e0ae5fb825e8bf8ea658d8ee8" +checksum = "33a2115515eba003e0780575f8fcc0b2ff95fd8b8db2fc7b4eb63b54756858cd" dependencies = [ "deno_core", ] [[package]] name = "deno_websocket" -version = "0.94.0" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe8ce87cc7da7b4b0575d5686cafbdb306cb33bf04f33ff6e99325c88f44933" +checksum = "665d8d3e3c6799ebf1945a6c248bb21e33ea1030cfb380bc78a394e315141b4f" dependencies = [ "deno_core", "deno_tls", @@ -1690,15 +1651,15 @@ dependencies = [ "hyper", "serde", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", "tokio-tungstenite 0.16.1", ] [[package]] name = "deno_webstorage" -version = "0.84.0" +version = "0.90.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b25958fe8143a02c86971890b7fa08a888e6a8a201e4918ea49220c092c361" +checksum = "ec16b3fb2fc256cb3012f1c719b185749cee2b7b5b25a630ba11aa84b94a8af2" dependencies = [ "deno_core", "deno_web", @@ -1724,8 +1685,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "rustc_version 0.4.0", "syn 1.0.109", ] @@ -1750,9 +1711,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", "const-oid", @@ -1818,12 +1779,12 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "dprint-swc-ext" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e2dc99247101e0132a17680c5afbba9a7334477b47738dd3431c13f5e2c9a84" +checksum = "008b6061551bcf644454469e6506c32bb23b765df93d608bf7a8e2494f82fcb3" dependencies = [ "bumpalo", - "num-bigint 0.4.3", + "num-bigint", "rustc-hash", "swc_atoms", "swc_common", @@ -1847,6 +1808,12 @@ dependencies = [ "dtoa", ] +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + [[package]] name = "dyn-clone" version = "1.0.11" @@ -1863,8 +1830,8 @@ dependencies = [ "byteorder", "lazy_static", "proc-macro-error", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] @@ -1906,7 +1873,7 @@ dependencies = [ "base16ct", "crypto-bigint", "der", - "digest 0.10.6", + "digest 0.10.7", "ff", "generic-array 0.14.7", "group", @@ -1938,12 +1905,6 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - [[package]] name = "encoding_rs" version = "0.8.31" @@ -1960,8 +1921,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] @@ -1971,8 +1932,8 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e40a16955681d469ab3da85aaa6b42ff656b3c67b52e1d8d3dd36afe97fd462" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] @@ -1983,8 +1944,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" dependencies = [ "once_cell", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] @@ -1995,20 +1956,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9895954c6ec59d897ed28a64815f2ceb57653fcaaebd317f2edc78b74f5495b6" dependencies = [ "pmutil", - "proc-macro2 1.0.56", + "proc-macro2 1.0.58", "swc_macros_common", "syn 1.0.109", ] -[[package]] -name = "enum_primitive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" -dependencies = [ - "num-traits 0.1.43", -] - [[package]] name = "err-derive" version = "0.3.1" @@ -2016,8 +1968,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "rustversion", "syn 1.0.109", "synstructure", @@ -2208,7 +2160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d449976075322384507443937df2f1d5577afbf4282f12a5a66ef29fa3e6307" dependencies = [ "pmutil", - "proc-macro2 1.0.56", + "proc-macro2 1.0.58", "swc_macros_common", "syn 1.0.109", ] @@ -2330,9 +2282,9 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -2423,7 +2375,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -2440,7 +2392,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -2452,7 +2404,7 @@ dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", "x11", ] @@ -2552,7 +2504,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", "winapi", ] @@ -2586,8 +2538,8 @@ dependencies = [ "heck 0.4.1", "proc-macro-crate", "proc-macro-error", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] @@ -2598,7 +2550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -2613,25 +2565,13 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.20", "bstr", "fnv", "log", "regex", ] -[[package]] -name = "glow" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e007a07a24de5ecae94160f141029e9a347282cfe25d1d58d85d845cf3130f1" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gobject-sys" version = "0.15.10" @@ -2640,46 +2580,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps 6.0.5", -] - -[[package]] -name = "gpu-alloc" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" -dependencies = [ - "bitflags", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" -dependencies = [ - "bitflags", -] - -[[package]] -name = "gpu-descriptor" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" -dependencies = [ - "bitflags", - "gpu-descriptor-types", - "hashbrown", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" -dependencies = [ - "bitflags", + "system-deps 6.1.0", ] [[package]] @@ -2731,7 +2632,7 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -2743,16 +2644,16 @@ dependencies = [ "anyhow", "proc-macro-crate", "proc-macro-error", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] [[package]] name = "h2" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes", "fnv", @@ -2772,17 +2673,23 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash", + "ahash 0.8.3", ] [[package]] name = "hashlink" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" +checksum = "0761a1b9491c4f2e3d66aa0f62d0fba0af9a0e2852e4d48ea506632a4b56e6aa" dependencies = [ - "hashbrown", + "hashbrown 0.13.2", ] [[package]] @@ -2858,12 +2765,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - [[package]] name = "hkdf" version = "0.12.3" @@ -2879,7 +2780,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -2911,16 +2812,16 @@ dependencies = [ "log", "mac", "markup5ever", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -2988,15 +2889,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" dependencies = [ "http", "hyper", - "rustls", + "rustls 0.21.1", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.0", ] [[package]] @@ -3028,22 +2929,21 @@ dependencies = [ [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] name = "ico" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4b3331534254a9b64095ae60d3dc2a8225a7a70229cd5888be127cdc1f6804" +checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd" dependencies = [ "byteorder", - "png 0.11.0", + "png", ] [[package]] @@ -3094,10 +2994,11 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.20" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" dependencies = [ + "crossbeam-utils", "globset", "lazy_static", "log", @@ -3118,8 +3019,8 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-rational 0.4.1", - "num-traits 0.2.15", + "num-rational", + "num-traits", ] [[package]] @@ -3135,47 +3036,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg 1.1.0", - "hashbrown", + "hashbrown 0.12.3", "serde", ] -[[package]] -name = "indicatif" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" -dependencies = [ - "console", - "lazy_static", - "number_prefix", - "regex", -] - -[[package]] -name = "infer" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b2b533137b9cad970793453d4f921c2e91312a6d88b1085c07bc15fc51bb3b" -dependencies = [ - "cfb 0.6.1", -] - [[package]] name = "infer" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" dependencies = [ - "cfb 0.7.3", -] - -[[package]] -name = "inflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f9f47468e9a76a6452271efadc88fe865a82be91fe75e6c0c57b87ccea59d4" -dependencies = [ - "adler32", + "cfb", ] [[package]] @@ -3254,8 +3125,8 @@ checksum = "8a7d079e129b77477a49c5c4f1cfe9ce6c2c909ef52520693e8e811a714c7b20" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] @@ -3305,9 +3176,9 @@ dependencies = [ [[package]] name = "jni" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" dependencies = [ "cesu8", "combine", @@ -3334,9 +3205,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] @@ -3379,14 +3250,12 @@ dependencies = [ ] [[package]] -name = "khronos-egl" -version = "4.1.0" +name = "keccak" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" dependencies = [ - "libc", - "libloading", - "pkg-config", + "cpufeatures", ] [[package]] @@ -3505,9 +3374,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.143" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc207893e85c5d6be840e969b496b53d94cec8be2d501b214f50daa97fa8024" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libdbus-sys" @@ -3555,9 +3424,9 @@ checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libsqlite3-sys" @@ -3579,15 +3448,6 @@ dependencies = [ "safemem", ] -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -3596,9 +3456,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "local-ip-address" @@ -3624,7 +3484,7 @@ dependencies = [ [[package]] name = "lodestone-client" -version = "0.4.3" +version = "0.4.4" dependencies = [ "lodestone_core", "portpicker", @@ -3638,8 +3498,8 @@ dependencies = [ [[package]] name = "lodestone_core" -version = "0.4.3" -source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=main#f1e918d87b65f60bd9889a38e3ec00d410684748" +version = "0.4.4" +source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=releases/0.5.0#a0aabbc3e62a3afeceaa7e12d491f98d4468e631" dependencies = [ "ansi_term", "argon2", @@ -3651,6 +3511,7 @@ dependencies = [ "base64 0.20.0", "chrono", "color-eyre", + "dashmap", "deno_ast", "deno_core", "deno_runtime", @@ -3666,7 +3527,6 @@ dependencies = [ "home", "igd", "indexmap", - "indicatif", "jsonwebtoken", "lazy_static", "local-ip-address", @@ -3699,8 +3559,8 @@ dependencies = [ "tracing-error", "tracing-subscriber", "ts-rs", - "unrar", - "uuid 1.1.2", + "url", + "uuid", "walkdir", "whoami", "zip", @@ -3739,15 +3599,6 @@ dependencies = [ "linked-hash-map", ] -[[package]] -name = "lzzzz" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8014d1362004776e6a91e4c15a3aa7830d1b6650a075b51a9969ebb6d6af13bc" -dependencies = [ - "cc", -] - [[package]] name = "mac" version = "0.1.1" @@ -3817,6 +3668,24 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest 0.10.7", +] + +[[package]] +name = "md4" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da5ac363534dce5fabf69949225e174fbf111a498bf0ff794c8ea1fba9f3dda" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "memchr" version = "2.5.0" @@ -3850,20 +3719,6 @@ dependencies = [ "autocfg 1.1.0", ] -[[package]] -name = "metal" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" -dependencies = [ - "bitflags", - "block", - "core-graphics-types", - "foreign-types", - "log", - "objc", -] - [[package]] name = "mime" version = "0.3.17" @@ -3950,27 +3805,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "naga" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5" -dependencies = [ - "bit-set", - "bitflags", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "num-traits 0.2.15", - "rustc-hash", - "serde", - "spirv", - "termcolor", - "thiserror", - "unicode-xid 0.2.4", -] - [[package]] name = "native-tls" version = "0.2.11" @@ -4036,8 +3870,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4" dependencies = [ "either", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "serde", "syn 1.0.109", ] @@ -4132,33 +3966,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ "overload", - "winapi", -] - -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -dependencies = [ - "num-bigint 0.1.44", - "num-complex", - "num-integer", - "num-iter", - "num-rational 0.1.42", - "num-traits 0.2.15", -] - -[[package]] -name = "num-bigint" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" -dependencies = [ - "num-integer", - "num-traits 0.2.15", - "rand 0.4.6", - "rustc-serialize", + "winapi", ] [[package]] @@ -4169,7 +3977,7 @@ checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg 1.1.0", "num-integer", - "num-traits 0.2.15", + "num-traits", "serde", ] @@ -4181,25 +3989,15 @@ checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905" dependencies = [ "byteorder", "lazy_static", - "libm 0.2.6", + "libm 0.2.7", "num-integer", "num-iter", - "num-traits 0.2.15", + "num-traits", "rand 0.8.5", "smallvec", "zeroize", ] -[[package]] -name = "num-complex" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656" -dependencies = [ - "num-traits 0.2.15", - "rustc-serialize", -] - [[package]] name = "num-integer" version = "0.1.45" @@ -4207,7 +4005,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg 1.1.0", - "num-traits 0.2.15", + "num-traits", ] [[package]] @@ -4218,19 +4016,7 @@ checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg 1.1.0", "num-integer", - "num-traits 0.2.15", -] - -[[package]] -name = "num-rational" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" -dependencies = [ - "num-bigint 0.1.44", - "num-integer", - "num-traits 0.2.15", - "rustc-serialize", + "num-traits", ] [[package]] @@ -4241,16 +4027,7 @@ checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg 1.1.0", "num-integer", - "num-traits 0.2.15", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.15", + "num-traits", ] [[package]] @@ -4260,7 +4037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg 1.1.0", - "libm 0.2.6", + "libm 0.2.7", ] [[package]] @@ -4289,8 +4066,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] @@ -4303,12 +4080,6 @@ dependencies = [ "libc", ] -[[package]] -name = "number_prefix" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" - [[package]] name = "objc" version = "0.2.7" @@ -4359,9 +4130,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -4400,9 +4171,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -4423,6 +4194,15 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "ordered-float" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +dependencies = [ + "num-traits", +] + [[package]] name = "os_info" version = "3.7.0" @@ -4516,7 +4296,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -4602,7 +4382,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "hmac", "password-hash", "sha2", @@ -4693,8 +4473,8 @@ dependencies = [ "phf_generator 0.8.0", "phf_shared 0.8.0", "proc-macro-hack", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] @@ -4707,8 +4487,8 @@ dependencies = [ "phf_generator 0.10.0", "phf_shared 0.10.0", "proc-macro-hack", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] @@ -4732,22 +4512,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 1.0.109", + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -4816,23 +4596,11 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] -[[package]] -name = "png" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b0cabbbd20c2d7f06dbf015e06aad59b6ca3d9ed14848783e98af9aaf19925" -dependencies = [ - "bitflags", - "deflate", - "inflate", - "num-iter", -] - [[package]] name = "png" version = "0.17.8" @@ -4902,8 +4670,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", "version_check", ] @@ -4914,8 +4682,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "version_check", ] @@ -4936,18 +4704,21 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" dependencies = [ "unicode-ident", ] [[package]] -name = "profiling" -version = "1.0.8" +name = "psm" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] [[package]] name = "quick-error" @@ -4984,11 +4755,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.58", ] [[package]] @@ -5191,12 +4962,6 @@ dependencies = [ "rand_core 0.3.1", ] -[[package]] -name = "range-alloc" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" - [[package]] name = "raw-window-handle" version = "0.5.2" @@ -5275,13 +5040,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.1", "memchr", - "regex-syntax", + "regex-syntax 0.7.1", ] [[package]] @@ -5290,7 +5055,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", ] [[package]] @@ -5299,6 +5064,12 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +[[package]] +name = "regex-syntax" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" + [[package]] name = "remove_dir_all" version = "0.5.3" @@ -5310,11 +5081,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.17" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "async-compression", + "async-compression 0.4.0", "base64 0.21.0", "bytes", "encoding_rs", @@ -5334,14 +5105,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.21.1", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.24.0", "tokio-socks", "tokio-util", "tower-service", @@ -5424,14 +5195,12 @@ dependencies = [ ] [[package]] -name = "ron" -version = "0.8.0" +name = "ripemd" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" dependencies = [ - "base64 0.13.1", - "bitflags", - "serde", + "digest 0.10.7", ] [[package]] @@ -5447,11 +5216,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c" dependencies = [ "byteorder", - "digest 0.10.6", + "digest 0.10.7", "num-bigint-dig", "num-integer", "num-iter", - "num-traits 0.2.15", + "num-traits", "pkcs1", "pkcs8", "rand_core 0.6.4", @@ -5487,12 +5256,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - [[package]] name = "rustc_version" version = "0.2.3" @@ -5537,6 +5300,18 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + [[package]] name = "rustls-native-certs" version = "0.6.2" @@ -5558,6 +5333,16 @@ dependencies = [ "base64 0.21.0", ] +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.12" @@ -5624,12 +5409,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - [[package]] name = "sct" version = "0.7.0" @@ -5656,9 +5435,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ "bitflags", "core-foundation", @@ -5669,9 +5448,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -5723,9 +5502,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.162" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] @@ -5741,6 +5520,16 @@ dependencies = [ "serde_json", ] +[[package]] +name = "serde-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float", + "serde", +] + [[package]] name = "serde_bytes" version = "0.11.9" @@ -5752,13 +5541,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.162" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -5788,16 +5577,16 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" dependencies = [ "serde", ] @@ -5816,12 +5605,13 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.82.0" +version = "0.88.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c060fd38f18c420e82ab21592ec1f088b39bccb6897b1dda394d63628e22158d" +checksum = "b163edac8a2f2536ae7b52f839a33aba7892c04d0cf21e1bf8213ecfc905ebcc" dependencies = [ "bytes", "derive_more", + "num-bigint", "serde", "serde_bytes", "smallvec", @@ -5851,9 +5641,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ "darling 0.20.1", - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -5873,8 +5663,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] @@ -5909,7 +5699,7 @@ checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -5920,7 +5710,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -5931,7 +5721,17 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", +] + +[[package]] +name = "sha3" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +dependencies = [ + "digest 0.10.7", + "keccak", ] [[package]] @@ -5968,7 +5768,7 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "rand_core 0.6.4", ] @@ -5984,8 +5784,8 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ - "num-bigint 0.4.3", - "num-traits 0.2.15", + "num-bigint", + "num-traits", "thiserror", "time 0.3.21", ] @@ -6005,21 +5805,23 @@ dependencies = [ "autocfg 1.1.0", ] -[[package]] -name = "slotmap" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" -dependencies = [ - "version_check", -] - [[package]] name = "smallvec" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg 1.1.0", + "static_assertions", + "version_check", +] + [[package]] name = "socket2" version = "0.4.9" @@ -6088,16 +5890,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spirv" -version = "0.2.0+1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" -dependencies = [ - "bitflags", - "num-traits 0.2.15", -] - [[package]] name = "spki" version = "0.6.0" @@ -6133,7 +5925,7 @@ name = "sqlx-core" version = "0.6.2" source = "git+https://github.com/Lodestone-Team/sqlx#072d4d6259db1203dfe341811ea838a6b886f7ae" dependencies = [ - "ahash", + "ahash 0.7.6", "atoi", "bitflags", "byteorder", @@ -6160,7 +5952,7 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rustls", + "rustls 0.20.8", "rustls-pemfile", "serde", "serde_json", @@ -6184,8 +5976,8 @@ dependencies = [ "either", "heck 0.4.1", "once_cell", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "serde_json", "sha2", "sqlx-core", @@ -6201,7 +5993,7 @@ source = "git+https://github.com/Lodestone-Team/sqlx#072d4d6259db1203dfe341811ea dependencies = [ "once_cell", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", ] [[package]] @@ -6210,6 +6002,19 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + [[package]] name = "state" version = "0.5.3" @@ -6247,8 +6052,8 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ "phf_generator 0.10.0", "phf_shared 0.10.0", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", ] [[package]] @@ -6258,8 +6063,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91f42363e5ca94ea6f3faee9e3b5e1a4047535ae323f5c0579385fb2ae95874e" dependencies = [ "pmutil", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "swc_macros_common", "syn 1.0.109", ] @@ -6296,22 +6101,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" dependencies = [ "heck 0.3.3", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "swc_atoms" -version = "0.4.34" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731cf66bd8e11030f056f91f9d8af77f83ec4377ff04d1670778a57d1607402a" +checksum = "2ebef84c2948cd0d1ba25acbf1b4bd9d80ab6f057efdbe35d8449b8d54699401" dependencies = [ "once_cell", "rustc-hash", @@ -6323,18 +6128,18 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.29.29" +version = "0.29.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97e491d31418cd33fea58e9f893316fc04b30e2b5d0e750c066e2ba4907ae54" +checksum = "5005cd73617e18592faa31298225b26f1c407b84a681d67efb735c3d3458e101" dependencies = [ - "ahash", + "ahash 0.7.6", "ast_node", "better_scoped_tls", "cfg-if", "either", "from_variant", "new_debug_unreachable", - "num-bigint 0.4.3", + "num-bigint", "once_cell", "rustc-hash", "serde", @@ -6368,21 +6173,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dadb9998d4f5fc36ef558ed5a092579441579ee8c6fcce84a5228cca9df4004" dependencies = [ "pmutil", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "swc_macros_common", "syn 1.0.109", ] [[package]] name = "swc_ecma_ast" -version = "0.96.3" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a887102d5595b557261aa4bde35f3d71906fba674d4b79cd5c59b4155b12ee2d" +checksum = "7dbfdbe05dde274473a6030dcf5e52e579516aea761d25d7a8d128f2ab597f09" dependencies = [ "bitflags", "is-macro", - "num-bigint 0.4.3", + "num-bigint", "scoped-tls", "serde", "string_enum", @@ -6393,12 +6198,12 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.129.8" +version = "0.135.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f8f20522626a737753381bdf64ee53d568730f9f7e720d35960de97e5ff965" +checksum = "78d196e6979af0cbb91084361ca006db292a6374f75ec04cbb55306051cc4f50" dependencies = [ "memchr", - "num-bigint 0.4.3", + "num-bigint", "once_cell", "rustc-hash", "serde", @@ -6417,19 +6222,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0159c99f81f52e48fe692ef7af1b0990b45d3006b14c6629be0b1ffee1b23aea" dependencies = [ "pmutil", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "swc_macros_common", "syn 1.0.109", ] [[package]] name = "swc_ecma_loader" -version = "0.41.31" +version = "0.41.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c996baa947150d496c79fbd153d3df834e38d05c779abc4af987aded90e168a2" +checksum = "681c1fbb762c82700a5bd23dc39bad892a287ea9fb2121cf56e77f1ddc89afeb" dependencies = [ - "ahash", + "ahash 0.7.6", "anyhow", "pathdiff", "serde", @@ -6439,16 +6244,18 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.124.5" +version = "0.130.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e75888eabf1ad8a8968e3befc7cd20c10e4721254d3344285bd5c3a42f58dc1" +checksum = "042435aaeb71c4416cde440323ac9fa2c24121c2ec150f0cb79999c2e6ceffaa" dependencies = [ "either", "enum_kind", "lexical", - "num-bigint 0.4.3", + "num-bigint", "serde", "smallvec", + "smartstring", + "stacker", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -6458,9 +6265,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.116.5" +version = "0.122.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5a212abba41897332f9ab3af8fe5d1a59f83d69e25eea119c27d9b53876688" +checksum = "fd4141092b17cd85eefc224b035b717e03c910b9fd58e4e637ffd05236d7e13b" dependencies = [ "better_scoped_tls", "bitflags", @@ -6480,9 +6287,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.105.5" +version = "0.111.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2fd5a8eff1a7f16ec1b3ae50186debf3d3983effed6ed05d4e6db0ed7aadcac" +checksum = "b5022c592f0ae17f4dc42031e1c4c60b7e6d2d8d1c2428b986759a92ea853801" dependencies = [ "swc_atoms", "swc_common", @@ -6499,17 +6306,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebf907935ec5492256b523ae7935a824d9fdc0368dcadc41375bad0dca91cd8b" dependencies = [ "pmutil", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "swc_macros_common", "syn 1.0.109", ] [[package]] name = "swc_ecma_transforms_proposal" -version = "0.149.8" +version = "0.156.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6fe11a20c7ced3c6b6149da330b8b4d8912fe02af6923aaac4d4479aa3dd3b6" +checksum = "f4015c3ab090f27eee0834d45bdcf9666dc6329ed06845d1882cdfe6f4826fca" dependencies = [ "either", "serde", @@ -6526,11 +6333,11 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.160.9" +version = "0.167.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b94e3884668e2e12684e4adf812dbd22d34b17da2d7637b1c9cffe393acad6c2" +checksum = "db1c7801b1d7741ab335441dd301ddcc4183fb250d5e6efaab33b03def268c06" dependencies = [ - "ahash", + "ahash 0.7.6", "base64 0.13.1", "dashmap", "indexmap", @@ -6552,9 +6359,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.164.10" +version = "0.171.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a885199b43798b46d8b26b4a986f899436f9f2cb37477eb12a183388a5c213f" +checksum = "142e8fb5ebe870bc51b3a95c0214af9112d3475b7cd5be4f13b87f3be664841a" dependencies = [ "serde", "swc_atoms", @@ -6568,9 +6375,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.107.5" +version = "0.113.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d773cf626c8d3be468a883879cda3727a2f1ea6169ccd0b5b8eb2d7afb5f367b" +checksum = "4c44885603c09926118708f4352e04242c2482bc16eb51ad7beb8ad4cf5f7bb6" dependencies = [ "indexmap", "num_cpus", @@ -6586,11 +6393,11 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.82.3" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b2ee0f4b61d6c426189d0d9da1333705ff3bc4513fb63633ca254595a700f75" +checksum = "147cf9137da6fe2704a5defd29a1cde849961978f8c92911e6790d50df475fef" dependencies = [ - "num-bigint 0.4.3", + "num-bigint", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -6605,8 +6412,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c20468634668c2bbab581947bb8c75c97158d5a6959f4ba33df20983b20b4f6" dependencies = [ "pmutil", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] @@ -6617,8 +6424,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e582c3e3c2269238524923781df5be49e011dbe29cf7683a2215d600a562ea6" dependencies = [ "pmutil", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] @@ -6640,8 +6447,8 @@ checksum = "ebeed7eb0f545f48ad30f5aab314e5208b735bcea1d1464f26e20f06db904989" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "swc_macros_common", "syn 1.0.109", ] @@ -6663,19 +6470,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "unicode-ident", ] @@ -6691,8 +6498,8 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", "unicode-xid 0.2.4", ] @@ -6727,9 +6534,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.0.5" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055" +checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" dependencies = [ "cfg-expr 0.15.1", "heck 0.4.1", @@ -6740,9 +6547,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.14.0" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43336f5d1793543ba96e2a1e75f3a5c7dcd592743be06a0ab3a190f4fcb4b934" +checksum = "ac8e6399427c8494f9849b58694754d7cc741293348a6836b6c8d2c5aa82d8e6" dependencies = [ "bitflags", "cairo-rs", @@ -6773,12 +6580,12 @@ dependencies = [ "once_cell", "parking_lot 0.12.1", "paste", - "png 0.17.8", + "png", "raw-window-handle", "scopeguard", "serde", "unicode-segmentation", - "uuid 1.1.2", + "uuid", "windows 0.39.0", "windows-implement", "x11-dl", @@ -6803,9 +6610,9 @@ checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" [[package]] name = "tauri" -version = "1.1.4" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad0833f2a2833808091721ac4d99ed873f9ae48187523b518f666841cb31701" +checksum = "e3a1fe72365a6d860fddf3403934649a5157b2bbb6f0b50dd3a8858cd1a22412" dependencies = [ "anyhow", "attohttpc 0.22.0", @@ -6851,7 +6658,7 @@ dependencies = [ "time 0.3.21", "tokio", "url", - "uuid 1.1.2", + "uuid", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -6878,18 +6685,18 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb77cf7bfe3d8f886e73a7fa6157587d015c599671180b76595c1aef175ba8" +checksum = "14388d484b6b1b5dc0f6a7d6cc6433b3b230bec85eaa576adcdf3f9fafa49251" dependencies = [ "base64 0.13.1", "brotli", "ico", "json-patch 0.2.7", "plist", - "png 0.17.8", - "proc-macro2 1.0.56", - "quote 1.0.26", + "png", + "proc-macro2 1.0.58", + "quote 1.0.27", "regex", "semver 1.0.17", "serde", @@ -6898,19 +6705,19 @@ dependencies = [ "tauri-utils", "thiserror", "time 0.3.21", - "uuid 1.1.2", + "uuid", "walkdir", ] [[package]] name = "tauri-macros" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24f481b0b2acfc288ac78755f00ebea53992c7365a165af64cb5ae00806edea" +checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", "tauri-codegen", "tauri-utils", @@ -6929,14 +6736,13 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.11.2" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be6283addfc4ccc2bd10ed0d87dcba582bf3f511998047e6a193c13c75cae3c9" +checksum = "dc36898ad4acb6c381878acf903c320a36cf29b68b74f6e791d6045b6557128c" dependencies = [ "gtk", "http", "http-range", - "infer 0.7.0", "rand 0.8.5", "raw-window-handle", "serde", @@ -6944,16 +6750,16 @@ dependencies = [ "tauri-utils", "thiserror", "url", - "uuid 1.1.2", + "uuid", "webview2-com", "windows 0.39.0", ] [[package]] name = "tauri-runtime-wry" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca3f21cc3502edda0df6d0579870ab4d6dbe82c0da1d67e8c129f8f22eb62ce" +checksum = "e2ebc22bc5566ba33310744fadd86709fa591ed163491b165855474523ac1aab" dependencies = [ "cocoa", "gtk", @@ -6963,7 +6769,7 @@ dependencies = [ "tauri-runtime", "tauri-utils", "url", - "uuid 1.1.2", + "uuid", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -6981,13 +6787,13 @@ dependencies = [ "glob", "heck 0.4.1", "html5ever", - "infer 0.12.0", + "infer", "json-patch 1.0.0", "kuchiki", "memchr", "phf 0.10.1", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "semver 1.0.17", "serde", "serde_json", @@ -7092,9 +6898,9 @@ version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] @@ -7177,9 +6983,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.24.2" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg 1.1.0", "bytes", @@ -7201,8 +7007,8 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] @@ -7222,11 +7028,21 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls", + "rustls 0.20.8", "tokio", "webpki", ] +[[package]] +name = "tokio-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +dependencies = [ + "rustls 0.21.1", + "tokio", +] + [[package]] name = "tokio-socks" version = "0.5.1" @@ -7258,9 +7074,9 @@ checksum = "e80b39df6afcc12cdf752398ade96a6b9e99c903dfdc36e53ad10b9c366bca72" dependencies = [ "futures-util", "log", - "rustls", + "rustls 0.20.8", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", "tungstenite 0.16.0", "webpki", "webpki-roots", @@ -7280,9 +7096,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -7315,9 +7131,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" dependencies = [ "serde", ] @@ -7371,7 +7187,6 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", - "tower", "tower-layer", "tower-service", "tracing", @@ -7419,16 +7234,16 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -7561,6 +7376,7 @@ version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4added4070a4fdf9df03457206cd2e4b12417c8560a2954d91ffcbe60177a56a" dependencies = [ + "indexmap", "thiserror", "ts-rs-macros", ] @@ -7572,8 +7388,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f807fdb3151fee75df7485b901a89624358cd07a67a8fb1a5831bf5a07681ff" dependencies = [ "Inflector", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", "termcolor", ] @@ -7591,7 +7407,7 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "rustls", + "rustls 0.20.8", "sha-1 0.9.8", "thiserror", "url", @@ -7739,39 +7555,14 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] name = "universal-hash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ "crypto-common", "subtle", ] -[[package]] -name = "unrar" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cea4f0b7bec88d47becb380887b8786a3cfb1c82e1ef9d32a682ba6801814" -dependencies = [ - "bitflags", - "enum_primitive", - "lazy_static", - "num", - "regex", - "unrar_sys", -] - -[[package]] -name = "unrar_sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0009399408dc0bcc5c8910672544fceceeba18b91f741ff943916e917d982c60" -dependencies = [ - "cc", - "libc", - "winapi", -] - [[package]] name = "untrusted" version = "0.7.1" @@ -7810,16 +7601,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] -name = "uuid" -version = "0.8.2" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.1.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ "getrandom 0.2.9", "rand 0.8.5", @@ -7829,20 +7620,20 @@ dependencies = [ [[package]] name = "uuid-macro-internal" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d884370cccfad1f913e67c7362f9c00357844bc9f3cfce86faa2241cabd166" +checksum = "3f67b459f42af2e6e1ee213cb9da4dbd022d3320788c3fb3e1b893093f1e45da" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] name = "v8" -version = "0.60.1" +version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fd5b3ed559897ff02c0f62bc0a5f300bfe79bb4c77a50031b8df771701c628" +checksum = "6c8ab8597b885c17b3761f6ffc29b7a62758612c409285a9271c6dacd17bb745" dependencies = [ "bitflags", "fslock", @@ -7906,6 +7697,27 @@ dependencies = [ "libc", ] +[[package]] +name = "vte" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aae21c12ad2ec2d168c236f369c38ff332bc1134f7246350dca641437365045" +dependencies = [ + "arrayvec", + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +dependencies = [ + "proc-macro2 1.0.58", + "quote 1.0.27", +] + [[package]] name = "walkdir" version = "2.3.3" @@ -7946,9 +7758,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -7956,24 +7768,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 1.0.109", + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 2.0.16", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ "cfg-if", "js-sys", @@ -7983,32 +7795,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ - "quote 1.0.26", + "quote 1.0.27", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 1.0.109", + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 2.0.16", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "wasm-streams" @@ -8025,9 +7837,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ "js-sys", "wasm-bindgen", @@ -8077,7 +7889,7 @@ dependencies = [ "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.0.5", + "system-deps 6.1.0", ] [[package]] @@ -8117,8 +7929,8 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.58", + "quote 1.0.27", "syn 1.0.109", ] @@ -8137,81 +7949,6 @@ dependencies = [ "windows-metadata", ] -[[package]] -name = "wgpu-core" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags", - "codespan-reporting", - "fxhash", - "log", - "naga", - "parking_lot 0.12.1", - "profiling", - "ron", - "serde", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags", - "block", - "core-graphics-types", - "d3d12", - "foreign-types", - "fxhash", - "glow", - "gpu-alloc", - "gpu-descriptor", - "js-sys", - "khronos-egl", - "libc", - "libloading", - "log", - "metal", - "naga", - "objc", - "parking_lot 0.12.1", - "profiling", - "range-alloc", - "raw-window-handle", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-types" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" -dependencies = [ - "bitflags", - "js-sys", - "serde", - "web-sys", -] - [[package]] name = "which" version = "4.4.0" @@ -8590,15 +8327,16 @@ dependencies = [ [[package]] name = "wry" -version = "0.21.1" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff5c1352b4266fdf92c63479d2f58ab4cd29dc4e78fbc1b62011ed1227926945" +checksum = "4c1ad8e2424f554cc5bdebe8aa374ef5b433feff817aebabca0389961fc7ef98" dependencies = [ "base64 0.13.1", "block", "cocoa", "core-graphics", "crossbeam-channel", + "dunce", "gdk", "gio", "glib", @@ -8614,6 +8352,7 @@ dependencies = [ "serde", "serde_json", "sha2", + "soup2", "tao", "thiserror", "url", @@ -8636,12 +8375,12 @@ dependencies = [ [[package]] name = "x11-dl" -version = "2.20.1" +version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" dependencies = [ - "lazy_static", "libc", + "once_cell", "pkg-config", ] @@ -8668,9 +8407,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "699d0104bcdd7e7af6d093d6c6e2d0c479b8a129ee0d1023b31d2e0c71bfdda2" +checksum = "1690519550bfa95525229b9ca2350c63043a4857b3b0013811b2ccf4a2420b01" [[package]] name = "xmltree" @@ -8696,18 +8435,18 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 2.0.16", ] [[package]] name = "zip" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e92305c174683d78035cbf1b70e18db6329cc0f1b9cae0a52ca90bf5bfe7125" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ - "aes 0.7.5", + "aes", "byteorder", "bzip2", "constant_time_eq", From 4f28d6bed9a530f8ef9a0fcc2c1c378715ccc841 Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Fri, 19 May 2023 20:15:23 -0400 Subject: [PATCH 097/108] pointing to main branch for core --- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 5d82417c..4395bd46 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -3499,7 +3499,7 @@ dependencies = [ [[package]] name = "lodestone_core" version = "0.4.4" -source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=releases/0.5.0#a0aabbc3e62a3afeceaa7e12d491f98d4468e631" +source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=main#8b75ef59f714b4f931a03c6d0bd3e92fd5a3be3a" dependencies = [ "ansi_term", "argon2", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index eb3e0c77..a17eb627 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -20,7 +20,7 @@ serde = { version = "1.0", features = ["derive"] } tauri = { version = "1.1.1", features = ["api-all", "devtools", "updater"] } tauri-plugin-localhost = "0.1.0" portpicker = "0.1" -lodestone_core = {git = "https://github.com/Lodestone-Team/lodestone_core", branch = "releases/0.5.0"} +lodestone_core = {git = "https://github.com/Lodestone-Team/lodestone_core", branch = "main"} tokio = { version = "1.21.1", features = ["macros", "rt"] } [features] From bd9e338a164b273ae312d9511ec0d70c9570d6e7 Mon Sep 17 00:00:00 2001 From: Peter <2892084432j@gmail.com> Date: Fri, 19 May 2023 21:11:11 -0400 Subject: [PATCH 098/108] cargo update --- src-tauri/Cargo.lock | 1135 +++++++++++++++++++++++++++++------------- 1 file changed, 787 insertions(+), 348 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 4395bd46..259a000b 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -164,7 +164,7 @@ checksum = "db4ce4441f99dbd377ca8a8f57b698c44d0d6e712d8329b5040da5a64aa1ce73" dependencies = [ "base64ct", "blake2", - "password-hash", + "password-hash 0.4.2", ] [[package]] @@ -185,13 +185,51 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" +[[package]] +name = "asn1-rs" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.21", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" +dependencies = [ + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 1.0.109", +] + [[package]] name = "ast_node" -version = "0.8.8" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70151a5226578411132d798aa248df45b30aa34aea2e580628870b4d87be717b" +checksum = "c704e2f6ee1a98223f5a7629a6ef0f3decb3b552ed282889dc957edff98ce1e6" dependencies = [ - "darling 0.13.4", "pmutil", "proc-macro2 1.0.58", "quote 1.0.27", @@ -245,7 +283,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" dependencies = [ "atk-sys", - "bitflags", + "bitflags 1.3.2", "glib", "libc", ] @@ -334,13 +372,13 @@ dependencies = [ "async-trait", "axum-core", "base64 0.21.0", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "headers", "http", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.26", "itoa 1.0.6", "matchit", "memchr", @@ -356,7 +394,7 @@ dependencies = [ "sha1", "sync_wrapper", "tokio", - "tokio-tungstenite 0.18.0", + "tokio-tungstenite", "tower", "tower-layer", "tower-service", @@ -384,7 +422,7 @@ dependencies = [ "bytes", "futures-util", "http", - "http-body", + "http-body 0.4.5", "mime", "rustversion", "tower-layer", @@ -413,8 +451,8 @@ dependencies = [ "bytes", "futures-util", "http", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.26", "pin-project-lite", "rustls 0.20.8", "rustls-pemfile", @@ -444,6 +482,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + [[package]] name = "base64" version = "0.13.1" @@ -508,6 +552,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" + [[package]] name = "blake2" version = "0.10.6" @@ -523,15 +573,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array 0.14.7", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -644,7 +685,7 @@ version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-sys-rs", "glib", "libc", @@ -770,7 +811,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -779,7 +820,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", "core-foundation", @@ -795,7 +836,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-foundation", "core-graphics-types", @@ -849,9 +890,9 @@ dependencies = [ [[package]] name = "console_static_text" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953d2c3cf53213a4eccdbe8f2e0b49b5d0f77e87a2a9060117bbf9346f92b64e" +checksum = "f4be93df536dfbcbd39ff7c129635da089901116b88bfc29ec1acb9b56f8ff35" dependencies = [ "unicode-width", "vte", @@ -897,7 +938,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", "foreign-types", @@ -910,7 +951,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "foreign-types", "libc", @@ -1014,6 +1055,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "crypto-bigint" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +dependencies = [ + "generic-array 0.14.7", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -1098,38 +1151,14 @@ dependencies = [ "zeroize", ] -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", -] - [[package]] name = "darling" version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" dependencies = [ - "darling_core 0.20.1", - "darling_macro 0.20.1", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2 1.0.58", - "quote 1.0.27", - "strsim", - "syn 1.0.109", + "darling_core", + "darling_macro", ] [[package]] @@ -1146,24 +1175,13 @@ dependencies = [ "syn 2.0.16", ] -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core 0.13.4", - "quote 1.0.27", - "syn 1.0.109", -] - [[package]] name = "darling_macro" version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ - "darling_core 0.20.1", + "darling_core", "quote 1.0.27", "syn 2.0.16", ] @@ -1206,13 +1224,13 @@ dependencies = [ [[package]] name = "deno_ast" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b08341e0ed5b816e24b6582054b37707c8686de5598fa3004dc555131c993308" +checksum = "84b4db18773938f4613617d384b6579983c46fbe9962da7390a9fc7525ccbe9c" dependencies = [ "anyhow", "base64 0.13.1", - "data-url", + "deno_media_type", "dprint-swc-ext", "serde", "swc_atoms", @@ -1236,9 +1254,9 @@ dependencies = [ [[package]] name = "deno_broadcast_channel" -version = "0.89.0" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afc4064413f46b725027b18a4639c480c2469e44c0359ffced6f752e67ffd17" +checksum = "880af0bb4dc1077a31b0a80fc241e06dc9d4c37c85db0226ee2930b5913a32e8" dependencies = [ "async-trait", "deno_core", @@ -1248,9 +1266,9 @@ dependencies = [ [[package]] name = "deno_cache" -version = "0.27.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258809850d7b3c365d3db8516a063cd0d8d1e85127e5ab3f46645d54c6416665" +checksum = "e88ee20b9c5e25be212fece88f261b77b825e1a04daf925511b5979000a2355d" dependencies = [ "async-trait", "deno_core", @@ -1262,18 +1280,18 @@ dependencies = [ [[package]] name = "deno_console" -version = "0.95.0" +version = "0.105.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7aaa2e1f9f3ea7a9f7fe3abddf2d4edc7a602f7505c3bec2074b097bc9393fb" +checksum = "1ce6d5caccaac26056182333e915d28b3b5b332b199dd12ab3467590cbda0039" dependencies = [ "deno_core", ] [[package]] name = "deno_core" -version = "0.177.0" +version = "0.187.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1563a04f319904eb5c4c981b0a5475a4258aa72d4576296f097a4f23b20f8428" +checksum = "922ed10fa6019414f58095894140e77479662833a62c568b023226e8be103e93" dependencies = [ "anyhow", "bytes", @@ -1290,15 +1308,16 @@ dependencies = [ "serde_v8", "smallvec", "sourcemap", + "tokio", "url", "v8", ] [[package]] name = "deno_crypto" -version = "0.109.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091fb3bcc63884525eb2d2487aa7f93031fba7d16314713cbaf5bd461d568f5b" +checksum = "9603a2705c5cce5995b98b8fecb743c1fa59d4907b50955160d67e3f5ab6c23e" dependencies = [ "aes", "aes-gcm", @@ -1311,21 +1330,21 @@ dependencies = [ "curve25519-dalek 2.1.3", "deno_core", "deno_web", - "elliptic-curve", + "elliptic-curve 0.12.3", "num-traits", "once_cell", - "p256", - "p384", + "p256 0.11.1", + "p384 0.11.2", "rand 0.8.5", "ring", "rsa", - "sec1", + "sec1 0.3.0", "serde", "serde_bytes", "sha1", "sha2", - "signature", - "spki", + "signature 1.6.4", + "spki 0.6.0", "tokio", "uuid", "x25519-dalek", @@ -1333,9 +1352,9 @@ dependencies = [ [[package]] name = "deno_fetch" -version = "0.119.0" +version = "0.129.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "888bc588fc1b4dd93e7d9d6684e81d4ca9a863eb50f949d4ecafeb9c4c52128d" +checksum = "7badcac1f31ec0b764e499b295d5915cef12a7f5807cd36fef8a94bb61642043" dependencies = [ "bytes", "data-url", @@ -1352,9 +1371,9 @@ dependencies = [ [[package]] name = "deno_ffi" -version = "0.82.0" +version = "0.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3750b1db8f718aba8d7e5e7290b9cb41cd72859ca6042a588177cc69336d7c19" +checksum = "ddb84937bb270001b99ffb86e6294a333cac4eb360c830d62d86ae3238a3d0d9" dependencies = [ "deno_core", "dlopen", @@ -1367,41 +1386,21 @@ dependencies = [ "winapi", ] -[[package]] -name = "deno_flash" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b20cafba99811c75f840b606939736dc32aa24cff9f73d9dd02d83665b3bb1" -dependencies = [ - "deno_core", - "deno_tls", - "deno_websocket", - "http", - "httparse", - "libc", - "log", - "mio", - "rustls 0.20.8", - "rustls-pemfile", - "serde", - "socket2", - "tokio", -] - [[package]] name = "deno_fs" -version = "0.5.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5592eb5a73752f59eeb6933a5a07dd1b7e8ac36f2e06dd6a96d204cea46419a" +checksum = "efdbb68302d0bc37d9c065bc4b02d0916291d47b3d8b6bae7baeb7a19e637950" dependencies = [ + "async-trait", "deno_core", - "deno_crypto", "deno_io", "filetime", "fs3", "libc", "log", "nix", + "rand 0.8.5", "serde", "tokio", "winapi", @@ -1409,37 +1408,49 @@ dependencies = [ [[package]] name = "deno_http" -version = "0.90.0" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa890f079e9aaf0a07020f97a805537ef526fb45636df713e97f062b5727a4a7" +checksum = "b12eefdf1bdd1350b422bc035f3780c342d5f1523e1fdd379be6f3581c9d6c8b" dependencies = [ "async-compression 0.3.15", + "async-trait", "base64 0.13.1", "brotli", "bytes", "cache_control", "deno_core", + "deno_net", "deno_websocket", "flate2", "fly-accept-encoding", - "hyper", + "http", + "httparse", + "hyper 0.14.26", + "hyper 1.0.0-rc.3", + "memmem", "mime", + "once_cell", "percent-encoding", "phf 0.10.1", "pin-project", "ring", "serde", + "slab", + "thiserror", "tokio", "tokio-util", ] [[package]] name = "deno_io" -version = "0.5.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90d2b638bff5266c98c65d4588276cefe465cb0f8d6e7bf9da6948e5596b4348" +checksum = "06f69acdc21cc39f852a197a79abbcf2979c06f3ce0c857fd630c8237d491b7e" dependencies = [ + "async-trait", "deno_core", + "filetime", + "fs3", "nix", "once_cell", "tokio", @@ -1448,9 +1459,9 @@ dependencies = [ [[package]] name = "deno_kv" -version = "0.3.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c11b45e36981b9f98f176b42dc1cf9ced8780290700d04a1e60c95d6259f73" +checksum = "9583c3da0534d3b8c733b9d7a44a47d90d49ef0471fa1d4c72cf1cb8a895dfeb" dependencies = [ "anyhow", "async-trait", @@ -1462,11 +1473,22 @@ dependencies = [ "serde", ] +[[package]] +name = "deno_media_type" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63772a60d740a41d97fbffb4788fc3779e6df47289e01892c12be38f4a5beded" +dependencies = [ + "data-url", + "serde", + "url", +] + [[package]] name = "deno_napi" -version = "0.25.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d346f413caa5c4525246de2def4579a1898db0d5da0c6c324a09181615b8774" +checksum = "5dd0864e0f777263334adc6ce7e6f4505d1d85f6126c0aa62413dda278ff9785" dependencies = [ "deno_core", "libloading", @@ -1474,13 +1496,14 @@ dependencies = [ [[package]] name = "deno_net" -version = "0.87.0" +version = "0.97.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97840f48130f242e5d1893e363b3f126730a4ab8389d69796b7ca813025c12b" +checksum = "fd75d728723e39a953089d7673b66c077eef4e5831277b13c5b61b1c9cd350ee" dependencies = [ "deno_core", "deno_tls", "log", + "pin-project", "serde", "socket2", "tokio", @@ -1490,38 +1513,84 @@ dependencies = [ [[package]] name = "deno_node" -version = "0.32.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a88f748dc0fe1b329035d28ec409a3a1e9f3dbe4aaca42130d161f7943d21e" +checksum = "00937b98be3869c782d17163bd62dcbbac3eee4025203329d478dfe7591d050c" dependencies = [ "aes", "cbc", + "data-encoding", "deno_core", + "deno_fetch", + "deno_fs", + "deno_media_type", + "deno_npm", + "deno_semver", "digest 0.10.7", + "dsa", + "ecb", + "elliptic-curve 0.13.5", "hex", + "hkdf", "idna 0.3.0", "indexmap", + "lazy-regex", + "libz-sys", "md-5", "md4", + "num-bigint", + "num-bigint-dig", + "num-integer", + "num-traits", "once_cell", + "p224", + "p256 0.13.2", + "p384 0.13.0", "path-clean", + "pbkdf2 0.12.1", "rand 0.8.5", "regex", + "reqwest", + "ring", "ripemd", "rsa", + "scrypt", + "secp256k1", "serde", - "sha-1 0.10.0", + "sha-1", "sha2", "sha3", + "signature 1.6.4", + "tokio", "typenum", + "x25519-dalek", + "x509-parser", +] + +[[package]] +name = "deno_npm" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "007cdc59079448de7af94510f7e9652bc6f17e9029741b26f3754f86a3cc2dd0" +dependencies = [ + "anyhow", + "async-trait", + "deno_semver", + "futures", + "log", + "monch", + "once_cell", + "serde", + "thiserror", ] [[package]] name = "deno_ops" -version = "0.55.0" +version = "0.65.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "769968c69c652009e43cb9e63f610a1cc3d0316c3fc59d7327f51089f65a70f4" +checksum = "47d3fbb72196f1880ff7a2824e4f3e111f6601b78f38e715ae3d3d412d9e0a42" dependencies = [ + "lazy-regex", "once_cell", "pmutil", "proc-macro-crate", @@ -1533,9 +1602,9 @@ dependencies = [ [[package]] name = "deno_runtime" -version = "0.103.0" +version = "0.113.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16c6b3bb27ab224aa57a8b9124b7aebdd8881c1bcd70ea85fb2651b77e95eb4" +checksum = "de89e5887fdb801870c82827e579babc9c57129b87d8e348c1b4cde2e355eccb" dependencies = [ "atty", "console_static_text", @@ -1547,7 +1616,6 @@ dependencies = [ "deno_crypto", "deno_fetch", "deno_ffi", - "deno_flash", "deno_fs", "deno_http", "deno_io", @@ -1563,11 +1631,12 @@ dependencies = [ "deno_webstorage", "dlopen", "encoding_rs", + "fastwebsockets", "filetime", "fs3", "fwdansi", "http", - "hyper", + "hyper 0.14.26", "libc", "log", "netif", @@ -1586,15 +1655,27 @@ dependencies = [ "winres", ] +[[package]] +name = "deno_semver" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "242c8ad9f4ce614ec0fa2e6b3d834f2662ce024ca78e9ed4c58d812cbfc3e41d" +dependencies = [ + "monch", + "serde", + "thiserror", + "url", +] + [[package]] name = "deno_tls" -version = "0.82.0" +version = "0.92.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490206ee0eb9f3a5aabd7826f24bea32b0456b9cdc5a564e7526cad79b102c3e" +checksum = "9f63c6cb5a5bd9ed2422b2d21c6e675edbc54a2dd20caa65f187040f3a525951" dependencies = [ "deno_core", "once_cell", - "rustls 0.20.8", + "rustls 0.21.1", "rustls-native-certs", "rustls-pemfile", "serde", @@ -1604,9 +1685,9 @@ dependencies = [ [[package]] name = "deno_url" -version = "0.95.0" +version = "0.105.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde7d4fb67b7df82512edef40c3e085357a4263dee3502e0387df021820e3bf8" +checksum = "8e3451bf3b98d028a4f61fae2bba1d58aad1ba790cfe0d14a0b11cd17623f1ee" dependencies = [ "deno_core", "serde", @@ -1616,9 +1697,9 @@ dependencies = [ [[package]] name = "deno_web" -version = "0.126.0" +version = "0.136.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65493427e1449a3dbdd0c947d91a738bb2d0b1d7fa1158ae13462c65a2a8e05a" +checksum = "08198c3ae53f5b722907ebde32d340c6f9223fa347689619cb5d500ee9a176bd" dependencies = [ "async-trait", "base64-simd", @@ -1628,38 +1709,41 @@ dependencies = [ "serde", "tokio", "uuid", + "windows-sys 0.48.0", ] [[package]] name = "deno_webidl" -version = "0.95.0" +version = "0.105.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a2115515eba003e0780575f8fcc0b2ff95fd8b8db2fc7b4eb63b54756858cd" +checksum = "3d2c11261edf0f1459f6b7dab67db6241af2c74b1e764d117c607aa649aea338" dependencies = [ "deno_core", ] [[package]] name = "deno_websocket" -version = "0.100.0" +version = "0.110.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "665d8d3e3c6799ebf1945a6c248bb21e33ea1030cfb380bc78a394e315141b4f" +checksum = "1d6e7a73e3a644b356aa15a86a4b3af756c162d344eeeb6661f81d76ec17f836" dependencies = [ + "bytes", "deno_core", + "deno_net", "deno_tls", + "fastwebsockets", "http", - "hyper", + "hyper 0.14.26", "serde", "tokio", - "tokio-rustls 0.23.4", - "tokio-tungstenite 0.16.1", + "tokio-rustls 0.24.0", ] [[package]] name = "deno_webstorage" -version = "0.90.0" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec16b3fb2fc256cb3012f1c719b185749cee2b7b5b25a630ba11aa84b94a8af2" +checksum = "4e519c28f99b7670f5238e95ff7ad2577df42703f58ffe7dc54c951818560801" dependencies = [ "deno_core", "deno_web", @@ -1674,10 +1758,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", - "pem-rfc7468", + "pem-rfc7468 0.6.0", "zeroize", ] +[[package]] +name = "der" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56acb310e15652100da43d130af8d97b509e95af61aab1c5a7939ef24337ee17" +dependencies = [ + "const-oid", + "pem-rfc7468 0.7.0", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +dependencies = [ + "asn1-rs", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -1700,22 +1809,13 @@ dependencies = [ "generic-array 0.12.4", ] -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array 0.14.7", -] - [[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "const-oid", "crypto-common", "subtle", @@ -1748,6 +1848,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 2.0.16", +] + [[package]] name = "dlopen" version = "0.1.8" @@ -1779,9 +1890,9 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "dprint-swc-ext" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "008b6061551bcf644454469e6506c32bb23b765df93d608bf7a8e2494f82fcb3" +checksum = "3c3359a644cca781aece7d7c16bfa80fb35ac83da4e1014a28600debd1ef2a7e" dependencies = [ "bumpalo", "num-bigint", @@ -1793,6 +1904,22 @@ dependencies = [ "text_lines", ] +[[package]] +name = "dsa" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5638f6d17447bc0ffc46354949ee366847e83450e2a07895862942085cc9761" +dependencies = [ + "digest 0.10.7", + "num-bigint-dig", + "num-traits", + "pkcs8 0.10.2", + "rfc6979 0.4.0", + "sha2", + "signature 2.1.0", + "zeroize", +] + [[package]] name = "dtoa" version = "0.4.8" @@ -1826,7 +1953,7 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "add9a102807b524ec050363f09e06f1504214b0e1c7797f64261c891022dce8b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "lazy_static", "proc-macro-error", @@ -1846,16 +1973,39 @@ dependencies = [ "memmap2", ] +[[package]] +name = "ecb" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17fd84ba81a904351ee27bbccb4aa2461e1cca04176a63ab4f8ca087757681a2" +dependencies = [ + "cipher", +] + [[package]] name = "ecdsa" version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ - "der", - "elliptic-curve", - "rfc6979", - "signature", + "der 0.6.1", + "elliptic-curve 0.12.3", + "rfc6979 0.3.1", + "signature 1.6.4", +] + +[[package]] +name = "ecdsa" +version = "0.16.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" +dependencies = [ + "der 0.7.6", + "digest 0.10.7", + "elliptic-curve 0.13.5", + "rfc6979 0.4.0", + "signature 2.1.0", + "spki 0.7.2", ] [[package]] @@ -1870,18 +2020,39 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ - "base16ct", - "crypto-bigint", - "der", + "base16ct 0.1.1", + "crypto-bigint 0.4.9", + "der 0.6.1", + "digest 0.10.7", + "ff 0.12.1", + "generic-array 0.14.7", + "group 0.12.1", + "hkdf", + "pem-rfc7468 0.6.0", + "pkcs8 0.9.0", + "rand_core 0.6.4", + "sec1 0.3.0", + "subtle", + "zeroize", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +dependencies = [ + "base16ct 0.2.0", + "crypto-bigint 0.5.2", "digest 0.10.7", - "ff", + "ff 0.13.0", "generic-array 0.14.7", - "group", + "group 0.13.0", "hkdf", - "pem-rfc7468", - "pkcs8", + "pem-rfc7468 0.7.0", + "pkcs8 0.10.2", "rand_core 0.6.4", - "sec1", + "sec1 0.7.2", "subtle", "zeroize", ] @@ -1949,18 +2120,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "enum_kind" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9895954c6ec59d897ed28a64815f2ceb57653fcaaebd317f2edc78b74f5495b6" -dependencies = [ - "pmutil", - "proc-macro2 1.0.58", - "swc_macros_common", - "syn 1.0.109", -] - [[package]] name = "err-derive" version = "0.3.1" @@ -2043,6 +2202,23 @@ dependencies = [ "instant", ] +[[package]] +name = "fastwebsockets" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1925eb5ee48fffa504a9edce24b3b4d43e2809d1cc713a1df2b13a46e661b3c6" +dependencies = [ + "base64 0.21.0", + "cc", + "hyper 0.14.26", + "pin-project", + "rand 0.8.5", + "sha1", + "simdutf8", + "tokio", + "utf-8", +] + [[package]] name = "fdeflate" version = "0.3.0" @@ -2062,6 +2238,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "fiat-crypto" version = "0.1.20" @@ -2342,7 +2528,7 @@ version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk-sys", @@ -2358,7 +2544,7 @@ version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", @@ -2438,6 +2624,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -2484,7 +2671,7 @@ version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", @@ -2514,7 +2701,7 @@ version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-executor", @@ -2589,7 +2776,18 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ - "ff", + "ff 0.12.1", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff 0.13.0", "rand_core 0.6.4", "subtle", ] @@ -2601,7 +2799,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" dependencies = [ "atk", - "bitflags", + "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -2699,7 +2897,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "bytes", "headers-core", "http", @@ -2839,6 +3037,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "951dfc2e32ac02d67c90c0d65bd27009a635dc9b381a2cc7d284ab01e3a0150d" +dependencies = [ + "bytes", + "http", +] + [[package]] name = "http-range" version = "0.1.5" @@ -2865,9 +3073,33 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body 0.4.5", + "httparse", + "httpdate", + "itoa 1.0.6", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "1.0.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "7b75264b2003a3913f118d35c586e535293b3e22e41f074930762929d071e092" dependencies = [ "bytes", "futures-channel", @@ -2875,14 +3107,12 @@ dependencies = [ "futures-util", "h2", "http", - "http-body", + "http-body 1.0.0-rc.2", "httparse", "httpdate", "itoa 1.0.6", "pin-project-lite", - "socket2", "tokio", - "tower-service", "tracing", "want", ] @@ -2894,7 +3124,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" dependencies = [ "http", - "hyper", + "hyper 0.14.26", "rustls 0.21.1", "tokio", "tokio-rustls 0.24.0", @@ -2907,7 +3137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.26", "native-tls", "tokio", "tokio-native-tls", @@ -3055,7 +3285,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -3157,7 +3387,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "glib", "javascriptcore-rs-sys", ] @@ -3274,7 +3504,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", ] @@ -3290,6 +3520,29 @@ dependencies = [ "selectors", ] +[[package]] +name = "lazy-regex" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff63c423c68ea6814b7da9e88ce585f793c87ddd9e78f646970891769c8235d4" +dependencies = [ + "lazy-regex-proc_macros", + "once_cell", + "regex", +] + +[[package]] +name = "lazy-regex-proc_macros" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8edfc11b8f56ce85e207e62ea21557cfa09bb24a8f6b04ae181b086ff8611c22" +dependencies = [ + "proc-macro2 1.0.58", + "quote 1.0.27", + "regex", + "syn 1.0.109", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -3439,6 +3692,18 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "libz-sys" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "line-wrap" version = "0.1.1" @@ -3499,7 +3764,7 @@ dependencies = [ [[package]] name = "lodestone_core" version = "0.4.4" -source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=main#8b75ef59f714b4f931a03c6d0bd3e92fd5a3be3a" +source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=main#2beb578af1ef7ed96ad9999e4aece7cc33a56048" dependencies = [ "ansi_term", "argon2", @@ -3701,6 +3966,12 @@ dependencies = [ "libc", ] +[[package]] +name = "memmem" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" + [[package]] name = "memoffset" version = "0.6.5" @@ -3787,6 +4058,12 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "monch" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb73e1dc7d232e1ab47ef27f45fa1d173a0979b370e763a9d0584556011150e0" + [[package]] name = "multer" version = "2.1.0" @@ -3829,7 +4106,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", "ndk-sys", "num_enum", @@ -3898,7 +4175,7 @@ version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.6.5", @@ -3926,7 +4203,7 @@ version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2c66da08abae1c024c01d635253e402341b4060a12e99b31c7594063bf490a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossbeam-channel", "filetime", "fsevent-sys", @@ -3978,6 +4255,7 @@ dependencies = [ "autocfg 1.1.0", "num-integer", "num-traits", + "rand 0.8.5", "serde", ] @@ -3994,6 +4272,7 @@ dependencies = [ "num-iter", "num-traits", "rand 0.8.5", + "serde", "smallvec", "zeroize", ] @@ -4128,6 +4407,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "oid-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +dependencies = [ + "asn1-rs", +] + [[package]] name = "once_cell" version = "1.17.1" @@ -4156,7 +4444,7 @@ version = "0.10.52" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -4242,14 +4530,38 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" +[[package]] +name = "p224" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30c06436d66652bc2f01ade021592c80a2aad401570a18aa18b82e440d2b9aa1" +dependencies = [ + "ecdsa 0.16.7", + "elliptic-curve 0.13.5", + "primeorder", + "sha2", +] + [[package]] name = "p256" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ - "ecdsa", - "elliptic-curve", + "ecdsa 0.14.8", + "elliptic-curve 0.12.3", + "sha2", +] + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa 0.16.7", + "elliptic-curve 0.13.5", + "primeorder", "sha2", ] @@ -4259,8 +4571,20 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ - "ecdsa", - "elliptic-curve", + "ecdsa 0.14.8", + "elliptic-curve 0.12.3", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa 0.16.7", + "elliptic-curve 0.13.5", + "primeorder", "sha2", ] @@ -4280,7 +4604,7 @@ version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "glib", "libc", "once_cell", @@ -4358,6 +4682,17 @@ dependencies = [ "subtle", ] +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "paste" version = "1.0.12" @@ -4384,10 +4719,20 @@ checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ "digest 0.10.7", "hmac", - "password-hash", + "password-hash 0.4.2", "sha2", ] +[[package]] +name = "pbkdf2" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31" +dependencies = [ + "digest 0.10.7", + "hmac", +] + [[package]] name = "pem" version = "1.1.1" @@ -4406,6 +4751,15 @@ dependencies = [ "base64ct", ] +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.2.0" @@ -4548,9 +4902,9 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719" dependencies = [ - "der", - "pkcs8", - "spki", + "der 0.6.1", + "pkcs8 0.9.0", + "spki 0.6.0", "zeroize", ] @@ -4560,8 +4914,18 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ - "der", - "spki", + "der 0.6.1", + "spki 0.6.0", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der 0.7.6", + "spki 0.7.2", ] [[package]] @@ -4607,7 +4971,7 @@ version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", @@ -4653,6 +5017,15 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" +[[package]] +name = "primeorder" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf8d3875361e28f7753baefef104386e7aa47642c93023356d97fdef4003bfb5" +dependencies = [ + "elliptic-curve 0.13.5", +] + [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -5015,7 +5388,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -5024,7 +5397,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -5093,8 +5466,8 @@ dependencies = [ "futures-util", "h2", "http", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.26", "hyper-rustls", "hyper-tls", "ipnet", @@ -5141,11 +5514,21 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ - "crypto-bigint", + "crypto-bigint 0.4.9", "hmac", "zeroize", ] +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + [[package]] name = "rfd" version = "0.10.0" @@ -5222,9 +5605,9 @@ dependencies = [ "num-iter", "num-traits", "pkcs1", - "pkcs8", + "pkcs8 0.9.0", "rand_core 0.6.4", - "signature", + "signature 1.6.4", "smallvec", "subtle", "zeroize", @@ -5236,7 +5619,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -5274,13 +5657,22 @@ dependencies = [ "semver 1.0.17", ] +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + [[package]] name = "rustix" version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -5369,6 +5761,15 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +[[package]] +name = "salsa20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] + [[package]] name = "same-file" version = "1.0.6" @@ -5409,6 +5810,18 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scrypt" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" +dependencies = [ + "password-hash 0.5.0", + "pbkdf2 0.12.1", + "salsa20", + "sha2", +] + [[package]] name = "sct" version = "0.7.0" @@ -5425,21 +5838,54 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ - "base16ct", - "der", + "base16ct 0.1.1", + "der 0.6.1", + "generic-array 0.14.7", + "pkcs8 0.9.0", + "subtle", + "zeroize", +] + +[[package]] +name = "sec1" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" +dependencies = [ + "base16ct 0.2.0", + "der 0.7.6", "generic-array 0.14.7", - "pkcs8", + "pkcs8 0.10.2", "subtle", "zeroize", ] +[[package]] +name = "secp256k1" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" +dependencies = [ + "rand 0.8.5", + "secp256k1-sys", +] + +[[package]] +name = "secp256k1-sys" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e" +dependencies = [ + "cc", +] + [[package]] name = "security-framework" version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -5462,7 +5908,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cssparser", "derive_more", "fxhash", @@ -5605,9 +6051,9 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.88.0" +version = "0.98.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b163edac8a2f2536ae7b52f839a33aba7892c04d0cf21e1bf8213ecfc905ebcc" +checksum = "ac09be069e49932c7c1df9b25c9e76ecb235e2127530462885926431c00d05f3" dependencies = [ "bytes", "derive_more", @@ -5615,6 +6061,7 @@ dependencies = [ "serde", "serde_bytes", "smallvec", + "thiserror", "v8", ] @@ -5640,7 +6087,7 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "darling 0.20.1", + "darling", "proc-macro2 1.0.58", "quote 1.0.27", "syn 2.0.16", @@ -5678,19 +6125,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "sha-1" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha-1" version = "0.10.0" @@ -5772,12 +6206,28 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "signature" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +dependencies = [ + "digest 0.10.7", + "rand_core 0.6.4", +] + [[package]] name = "simd-adler32" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + [[package]] name = "simple_asn1" version = "0.6.2" @@ -5838,7 +6288,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gio", "glib", "libc", @@ -5852,7 +6302,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gio-sys", "glib-sys", "gobject-sys", @@ -5897,7 +6347,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", - "der", + "der 0.6.1", +] + +[[package]] +name = "spki" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der 0.7.6", ] [[package]] @@ -5927,7 +6387,7 @@ source = "git+https://github.com/Lodestone-Team/sqlx#072d4d6259db1203dfe341811ea dependencies = [ "ahash 0.7.6", "atoi", - "bitflags", + "bitflags 1.3.2", "byteorder", "bytes", "crc", @@ -6058,9 +6518,9 @@ dependencies = [ [[package]] name = "string_enum" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91f42363e5ca94ea6f3faee9e3b5e1a4047535ae323f5c0579385fb2ae95874e" +checksum = "0090512bdfee4b56d82480d66c0fd8a6f53f0fe0f97e075e949b252acdd482e0" dependencies = [ "pmutil", "proc-macro2 1.0.58", @@ -6114,9 +6574,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "swc_atoms" -version = "0.4.39" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ebef84c2948cd0d1ba25acbf1b4bd9d80ab6f057efdbe35d8449b8d54699401" +checksum = "593c2f3e4cea60ddc4179ed731cabebe7eacec209d9e76a3bbcff4b2b020e3f5" dependencies = [ "once_cell", "rustc-hash", @@ -6128,9 +6588,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.29.37" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5005cd73617e18592faa31298225b26f1c407b84a681d67efb735c3d3458e101" +checksum = "2b557014d62318e08070c2a3d5eb0278ff73749dd69db53c39a4de4bcd301d6a" dependencies = [ "ahash 0.7.6", "ast_node", @@ -6181,11 +6641,11 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.100.1" +version = "0.103.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dbfdbe05dde274473a6030dcf5e52e579516aea761d25d7a8d128f2ab597f09" +checksum = "5206233430a6763e2759da76cfc596a64250793f70cd94cace1f82fdcc4d702c" dependencies = [ - "bitflags", + "bitflags 2.3.1", "is-macro", "num-bigint", "scoped-tls", @@ -6198,9 +6658,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.135.2" +version = "0.138.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78d196e6979af0cbb91084361ca006db292a6374f75ec04cbb55306051cc4f50" +checksum = "cf45c899625d5132f2993a464a79f2ec7c79854b74fd3c55d1408b76d7d7750c" dependencies = [ "memchr", "num-bigint", @@ -6217,9 +6677,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen_macros" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0159c99f81f52e48fe692ef7af1b0990b45d3006b14c6629be0b1ffee1b23aea" +checksum = "bf4ee0caee1018808d94ecd09490cb7affd3d504b19aa11c49238f5fc4b54901" dependencies = [ "pmutil", "proc-macro2 1.0.58", @@ -6230,9 +6690,9 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.41.39" +version = "0.43.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681c1fbb762c82700a5bd23dc39bad892a287ea9fb2121cf56e77f1ddc89afeb" +checksum = "f1d985c6e7111fef3c0103b0414db0d792cb04b492601c94ccae2d494ffdf764" dependencies = [ "ahash 0.7.6", "anyhow", @@ -6244,12 +6704,11 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.130.2" +version = "0.133.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "042435aaeb71c4416cde440323ac9fa2c24121c2ec150f0cb79999c2e6ceffaa" +checksum = "8ce724a8fdc90548d882dec3b0288c0698059ce12a59bbfdeea0384f3d52f009" dependencies = [ "either", - "enum_kind", "lexical", "num-bigint", "serde", @@ -6265,12 +6724,13 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.122.3" +version = "0.126.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4141092b17cd85eefc224b035b717e03c910b9fd58e4e637ffd05236d7e13b" +checksum = "3c4236f8b9bea9d3d43cacab34b6e3c925c3f12585382b8f661cb994b987b688" dependencies = [ "better_scoped_tls", - "bitflags", + "bitflags 2.3.1", + "indexmap", "once_cell", "phf 0.10.1", "rustc-hash", @@ -6287,9 +6747,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.111.3" +version = "0.115.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5022c592f0ae17f4dc42031e1c4c60b7e6d2d8d1c2428b986759a92ea853801" +checksum = "bd5b13763feba98586887a92801603c413897805c70ed82e49e4acc1f90683c2" dependencies = [ "swc_atoms", "swc_common", @@ -6301,9 +6761,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf907935ec5492256b523ae7935a824d9fdc0368dcadc41375bad0dca91cd8b" +checksum = "984d5ac69b681fc5438f9abf82b0fda34fe04e119bc75f8213b7e01128c7c9a2" dependencies = [ "pmutil", "proc-macro2 1.0.58", @@ -6314,11 +6774,12 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.156.4" +version = "0.160.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4015c3ab090f27eee0834d45bdcf9666dc6329ed06845d1882cdfe6f4826fca" +checksum = "d21de731e3ff1ea451ac8c377a7130ebf6dbf6ffd18e744c15f86e685e0abd9a" dependencies = [ "either", + "rustc-hash", "serde", "smallvec", "swc_atoms", @@ -6333,18 +6794,17 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.167.4" +version = "0.172.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db1c7801b1d7741ab335441dd301ddcc4183fb250d5e6efaab33b03def268c06" +checksum = "a0df18263e6c0804a1a08abd29e87af763dce1bec4b500497a0b62c22df07b2d" dependencies = [ "ahash 0.7.6", "base64 0.13.1", "dashmap", "indexmap", "once_cell", - "regex", "serde", - "sha-1 0.10.0", + "sha-1", "string_enum", "swc_atoms", "swc_common", @@ -6359,9 +6819,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.171.4" +version = "0.176.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142e8fb5ebe870bc51b3a95c0214af9112d3475b7cd5be4f13b87f3be664841a" +checksum = "d1a3f356bc2b902c13fc1e39bb66c10f350c46bfe93bae5c05402863d94bd307" dependencies = [ "serde", "swc_atoms", @@ -6375,9 +6835,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.113.3" +version = "0.116.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c44885603c09926118708f4352e04242c2482bc16eb51ad7beb8ad4cf5f7bb6" +checksum = "b462a1b6fc788ee956479adcbb05c282cb142a66a3b016b571fff0538a381196" dependencies = [ "indexmap", "num_cpus", @@ -6393,9 +6853,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.86.1" +version = "0.89.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147cf9137da6fe2704a5defd29a1cde849961978f8c92911e6790d50df475fef" +checksum = "ecb23a4a1d77997f54e9b3a4e68d1441e5e8a25ad1a476bbb3b5a620d6562a86" dependencies = [ "num-bigint", "swc_atoms", @@ -6551,7 +7011,7 @@ version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac8e6399427c8494f9849b58694754d7cc741293348a6836b6c8d2c5aa82d8e6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "cc", "cocoa", @@ -6983,14 +7443,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.25.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg 1.1.0", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot 0.12.1", @@ -6998,18 +7457,18 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2 1.0.58", "quote 1.0.27", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] @@ -7066,22 +7525,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-tungstenite" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e80b39df6afcc12cdf752398ade96a6b9e99c903dfdc36e53ad10b9c366bca72" -dependencies = [ - "futures-util", - "log", - "rustls 0.20.8", - "tokio", - "tokio-rustls 0.23.4", - "tungstenite 0.16.0", - "webpki", - "webpki-roots", -] - [[package]] name = "tokio-tungstenite" version = "0.18.0" @@ -7091,7 +7534,7 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite 0.18.0", + "tungstenite", ] [[package]] @@ -7173,12 +7616,12 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-util", "http", - "http-body", + "http-body 0.4.5", "http-range-header", "httpdate", "mime", @@ -7394,27 +7837,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "tungstenite" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ad3713a14ae247f22a728a0456a545df14acf3867f905adff84be99e23b3ad1" -dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes", - "http", - "httparse", - "log", - "rand 0.8.5", - "rustls 0.20.8", - "sha-1 0.9.8", - "thiserror", - "url", - "utf-8", - "webpki", -] - [[package]] name = "tungstenite" version = "0.18.0" @@ -7631,13 +8053,13 @@ dependencies = [ [[package]] name = "v8" -version = "0.66.0" +version = "0.71.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8ab8597b885c17b3761f6ffc29b7a62758612c409285a9271c6dacd17bb745" +checksum = "1a4bbfd886a9c2f87170438c0cdb6b1ddbfe80412ab591c83d24c7e48e487313" dependencies = [ - "bitflags", + "bitflags 1.3.2", "fslock", - "lazy_static", + "once_cell", "which", ] @@ -7851,7 +8273,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gdk", "gdk-sys", @@ -7876,7 +8298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" dependencies = [ "atk-sys", - "bitflags", + "bitflags 1.3.2", "cairo-sys-rs", "gdk-pixbuf-sys", "gdk-sys", @@ -8396,6 +8818,23 @@ dependencies = [ "zeroize", ] +[[package]] +name = "x509-parser" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab0c2f54ae1d92f4fcb99c0b7ccf0b1e3451cbd395e5f115ccbdbcb18d4f634" +dependencies = [ + "asn1-rs", + "data-encoding", + "der-parser", + "lazy_static", + "nom", + "oid-registry", + "rusticata-macros", + "thiserror", + "time 0.3.21", +] + [[package]] name = "xattr" version = "0.2.3" @@ -8454,7 +8893,7 @@ dependencies = [ "crossbeam-utils", "flate2", "hmac", - "pbkdf2", + "pbkdf2 0.11.0", "sha1", "time 0.3.21", "zstd", From 4d119b80c476c6c2a7c41fde98df678a8e37511c Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Sat, 20 May 2023 22:31:02 -0400 Subject: [PATCH 099/108] made minor version mismatch show major version mismatch modal too --- src/components/DashboardLayout/DashboardLayout.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/DashboardLayout/DashboardLayout.tsx b/src/components/DashboardLayout/DashboardLayout.tsx index 2289253e..929a9389 100644 --- a/src/components/DashboardLayout/DashboardLayout.tsx +++ b/src/components/DashboardLayout/DashboardLayout.tsx @@ -58,7 +58,7 @@ export default function DashboardLayout() { {dashboardVersion}

- Your dashboard and core have a major version mismatch! Please consider + Your dashboard and core have a version mismatch! Please consider updating to stay up to date with our latest changes. ); @@ -86,10 +86,11 @@ export default function DashboardLayout() { if (major(clientVersion) !== major(dashboardVersion)) setShowMajorVersionModal(true); else if (minor(clientVersion) !== minor(dashboardVersion)) - toast.warn( - `There is a minor version mismatch! Core: ${clientVersion}, Dashboard: ${dashboardVersion}`, - { toastId: 'minorVersionMismatch' } - ); + // toast.warn( + // `There is a minor version mismatch! Core: ${clientVersion}, Dashboard: ${dashboardVersion}`, + // { toastId: 'minorVersionMismatch' } + // ); + setShowMajorVersionModal(true); else if (patch(clientVersion) !== patch(dashboardVersion)) toast.warn( `There is a patch version mismatch! Core: ${clientVersion}, Dashboard: ${dashboardVersion}`, From a82f0010ceaeafabbbb1b9493f8b8dd2ce8d012f Mon Sep 17 00:00:00 2001 From: Peter Jiang <47200772+CheatCod@users.noreply.github.com> Date: Sun, 21 May 2023 00:32:12 -0400 Subject: [PATCH 100/108] change update modal and toast --- .../DashboardLayout/DashboardLayout.tsx | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/src/components/DashboardLayout/DashboardLayout.tsx b/src/components/DashboardLayout/DashboardLayout.tsx index 929a9389..fb2f672c 100644 --- a/src/components/DashboardLayout/DashboardLayout.tsx +++ b/src/components/DashboardLayout/DashboardLayout.tsx @@ -30,7 +30,7 @@ export default function DashboardLayout() { const [showMajorVersionModal, setShowMajorVersionModal] = useState(false); const [showCoreErrorModal, setShowCoreErrorModal] = useState(false); const dashboardVersion = packageinfo.version; - + // open the error modal is coreConnectionStatus is error for more than 3 seconds useEffect(() => { if (coreConnectionStatus === 'error') { @@ -38,17 +38,18 @@ export default function DashboardLayout() { setShowCoreErrorModal(true); }, 3000); return () => clearTimeout(timeout); - }else{ + } else { setShowCoreErrorModal(false); } }, [coreConnectionStatus]); const versionMismatchModal = !coreInfoLoading && ( setShowMajorVersionModal(false)} + closeButtonText={'I understand, continue without updating'} >
Core Version: @@ -58,8 +59,18 @@ export default function DashboardLayout() { {dashboardVersion}

- Your dashboard and core have a version mismatch! Please consider - updating to stay up to date with our latest changes. +

+ Your dashboard and core is incompatible! +

+ This can cause unexpected behavior. Please update your core to the latest + version. Visit{' '} + + the wiki + {' '} + for more information. ); @@ -93,8 +104,12 @@ export default function DashboardLayout() { setShowMajorVersionModal(true); else if (patch(clientVersion) !== patch(dashboardVersion)) toast.warn( - `There is a patch version mismatch! Core: ${clientVersion}, Dashboard: ${dashboardVersion}`, - { toastId: 'patchVersionMismatch' } + `Version mismatch! Is your core out of date? Core: ${clientVersion}, Dashboard: ${dashboardVersion}`, + { + toastId: 'patchVersionMismatch', + autoClose: 10000, + position: 'top-center', + } ); } }, [coreInfo?.version]); From 3734d943fd6aa01b27e496c78ed5bdf27e64ea0e Mon Sep 17 00:00:00 2001 From: Peter Jiang <47200772+CheatCod@users.noreply.github.com> Date: Sun, 21 May 2023 01:11:44 -0400 Subject: [PATCH 101/108] update readme --- README.md | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 98b1b1a1..b8c03662 100644 --- a/README.md +++ b/README.md @@ -21,17 +21,41 @@ A free, open source server hosting tool for Minecraft and other multiplayers - [ ] Automated macros and tasks 🚧 - [ ] Connecting without port forward 🚧 -![Lodestone Spring 2023 Roadmap](/public/assets/springRoadmap.png) -## [Download](https://github.com/Lodestone-Team/dashboard/releases/latest) +## Installation -You can download the Lodestone client from our [release page](https://github.com/Lodestone-Team/dashboard/releases/latest). +### Windows +You can download Lodestone Desktop from the [releases page](https://github.com/Lodestone-Team/lodestone/releases) -We also have a [webapp](https://www.lodestone.cc/) in early access for remote management. +### Linux +Download and run [Lodestone CLI](https://github.com/Lodestone-Team/lodestone_cli). -For any troubleshooting, see our [wiki](https://github.com/Lodestone-Team/lodestone/wiki/Known-Issues). +If you would like to use the dashboard: +1. Use a chromium based browser (Chrome, Edge, Brave, etc.) and go to [https://www.lodestone.cc/](https://www.lodestone.cc/) +2. Follow this [guide](https://experienceleague.adobe.com/docs/target/using/experiences/vec/troubleshoot-composer/mixed-content.html?lang=en) to enable mixed content for the site. +3. If you have browser extensions such as HTTPS Everywhere, disable them for the site. + +To see why step 2 and 3 are necessary and some possible solutions, see [here](https://github.com/Lodestone-Team/lodestone/wiki/FAQ#why-do-i-need-to-enable-mixedinsecure-content-and-disable-https-is-this-safe) + +> **Note** +> Lodestone Desktop for Linux is highly experimental and untested. We won't be able to provide support if you decide to use it. + +### MacOS (Intel) +Download and run [Lodestone CLI](https://github.com/Lodestone-Team/lodestone_cli). + +If you would like to use the dashboard: +1. Use a chromium based browser (Chrome, Edge, Brave, etc.) and go to [https://www.lodestone.cc/](https://www.lodestone.cc/) +2. Follow this [guide](https://experienceleague.adobe.com/docs/target/using/experiences/vec/troubleshoot-composer/mixed-content.html?lang=en) to enable mixed content for the site. +3. If you have browser extensions such as HTTPS Everywhere, disable them for the site. + +To see why step 2 and 3 are necessary and some possible solutions, see [here](https://github.com/Lodestone-Team/lodestone/wiki/FAQ#why-do-i-need-to-enable-mixedinsecure-content-and-disable-https-is-this-safe) + +> **Note** +> ARM Macs are not supported yet. See [this issue](https://github.com/Lodestone-Team/lodestone_core/issues/160) for more info. + +> **Note** +> Lodestone Desktop for MacOs is highly experimental and untested. We won't be able to provide support if you decide to use it. -For installing Lodestone Core, check out [here](https://github.com/Lodestone-Team/lodestone_core). ## Safety & Security From 0b53f87cdc153ffe75d6927b3d1c8b52d68c4eb6 Mon Sep 17 00:00:00 2001 From: Peter Jiang <47200772+CheatCod@users.noreply.github.com> Date: Sun, 21 May 2023 01:22:27 -0400 Subject: [PATCH 102/108] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b8c03662..c896a4f4 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ A free, open source server hosting tool for Minecraft and other multiplayers ## Installation ### Windows -You can download Lodestone Desktop from the [releases page](https://github.com/Lodestone-Team/lodestone/releases) +You can download Lodestone Desktop for Windows from the [releases page](https://github.com/Lodestone-Team/lodestone/releases) ### Linux Download and run [Lodestone CLI](https://github.com/Lodestone-Team/lodestone_cli). From 79bbc60a2f248b67feed63185de7d78e9f2868b1 Mon Sep 17 00:00:00 2001 From: Ynng <44907675+Ynng@users.noreply.github.com> Date: Sun, 21 May 2023 13:55:21 -0400 Subject: [PATCH 103/108] hard coded version mismatch modal to show up if client version less than 0.4.4 --- .../DashboardLayout/DashboardLayout.tsx | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/components/DashboardLayout/DashboardLayout.tsx b/src/components/DashboardLayout/DashboardLayout.tsx index fb2f672c..18f754ac 100644 --- a/src/components/DashboardLayout/DashboardLayout.tsx +++ b/src/components/DashboardLayout/DashboardLayout.tsx @@ -27,7 +27,8 @@ export default function DashboardLayout() { const [showLocalSetupPrompt, setShowLocalSetupPrompt] = useState(false); const { data: coreInfo, isLoading: coreInfoLoading } = useCoreInfo(); const { data: localCoreInfo } = useLocalCoreInfo(); - const [showMajorVersionModal, setShowMajorVersionModal] = useState(false); + const [showVersionMismatchModal, setShowVersionMismatchModal] = + useState(false); const [showCoreErrorModal, setShowCoreErrorModal] = useState(false); const dashboardVersion = packageinfo.version; @@ -47,8 +48,8 @@ export default function DashboardLayout() { setShowMajorVersionModal(false)} + isOpen={showVersionMismatchModal} + onClose={() => setShowVersionMismatchModal(false)} closeButtonText={'I understand, continue without updating'} >
@@ -59,9 +60,7 @@ export default function DashboardLayout() { {dashboardVersion}

-

- Your dashboard and core is incompatible! -

+

Your dashboard and core is incompatible!

This can cause unexpected behavior. Please update your core to the latest version. Visit{' '} Date: Sun, 21 May 2023 15:39:27 -0400 Subject: [PATCH 104/108] fix zip text --- src/utils/apis.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/apis.ts b/src/utils/apis.ts index 6d8c86d2..eb6037c5 100644 --- a/src/utils/apis.ts +++ b/src/utils/apis.ts @@ -277,7 +277,7 @@ export const zipInstanceFiles = async ( return; } else { - toast.info(`Zipping ${zipRequest.target_relative_paths.length} files...`); + toast.info(`Zipping ${zipRequest.target_relative_paths.length} item${zipRequest.target_relative_paths.length > 1 ? 's' : ''}...`); } } @@ -461,7 +461,7 @@ export const createTask = async ( uuid: string, macro_name: string, args: string[], - ) => { +) => { queryClient.invalidateQueries(['instance', uuid, 'taskList']); return await catchAsyncToString( axiosWrapper({ From a6aefa6798b7d54190d012f22211b6244fbf373d Mon Sep 17 00:00:00 2001 From: Peter <2892084432j@gmail.com> Date: Sun, 21 May 2023 17:54:05 -0400 Subject: [PATCH 105/108] remove client side port check --- src/components/InstanceCard.tsx | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/components/InstanceCard.tsx b/src/components/InstanceCard.tsx index c7983c70..7413d254 100644 --- a/src/components/InstanceCard.tsx +++ b/src/components/InstanceCard.tsx @@ -166,19 +166,6 @@ export default function InstanceCard({ gaEventTracker('Started Instance'); } - if (stateToApiEndpointMap[state] === '/start') { - const result = await axiosWrapper({ - method: 'get', - url: `/check/port/${port}`, - }); - if (result.is_in_use) { - toast.error( - `Port ${port} is not available, please change the port in the instance settings` - ); - setLoading(false); - return; - } - } axios .put(`/instance/${uuid}${stateToApiEndpointMap[state]}`) From 35314b052f6f095046123fe20f7ea84ed62198b5 Mon Sep 17 00:00:00 2001 From: Peter <2892084432j@gmail.com> Date: Sun, 21 May 2023 17:54:34 -0400 Subject: [PATCH 106/108] allow console to be interactive when instance is starting --- src/components/GameConsole.tsx | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/components/GameConsole.tsx b/src/components/GameConsole.tsx index 68837147..64ed169f 100644 --- a/src/components/GameConsole.tsx +++ b/src/components/GameConsole.tsx @@ -6,7 +6,7 @@ import { InstanceContext } from 'data/InstanceContext'; import { CommandHistoryContext } from 'data/CommandHistoryContext'; import { useUserAuthorized } from 'data/UserInfo'; import Tooltip from 'rc-tooltip'; -import { useContext, useEffect} from 'react'; +import { useContext, useEffect } from 'react'; import { useRef, useState } from 'react'; import { usePrevious } from 'utils/hooks'; import { DISABLE_AUTOFILL } from 'utils/util'; @@ -24,7 +24,9 @@ export default function GameConsole() { ); const { consoleLog, consoleStatus } = useConsoleStream(uuid); const [command, setCommand] = useState(''); - const { commandHistory, appendCommandHistory } = useContext(CommandHistoryContext); + const { commandHistory, appendCommandHistory } = useContext( + CommandHistoryContext + ); const [commandNav, setCommandNav] = useState(commandHistory.length); const listRef = useRef(null); const isAtBottom = listRef.current @@ -93,7 +95,7 @@ export default function GameConsole() { consoleStatusColor = 'text-red-200'; } // overwrites - if (instance.state !== 'Running') { + if (instance.state === 'Stopped') { consoleStatusMessage = `Instance is ${instance.state.toLowerCase()}`; consoleStatusColor = 'text-gray-500'; } @@ -101,7 +103,7 @@ export default function GameConsole() { let consoleInputMessage = ''; if (!canAccessConsole || consoleStatus === 'no-permission') consoleInputMessage = 'No permission'; - else if (instance.state !== 'Running') + else if (instance.state === 'Stopped') consoleInputMessage = `Instance is ${instance.state.toLowerCase()}`; else if (consoleStatus === 'closed') consoleInputMessage = 'Console is closed'; @@ -109,18 +111,16 @@ export default function GameConsole() { const handleKeyDown = (event: React.KeyboardEvent) => { if (event.key === 'ArrowUp') { setCommandNav((prev) => { - prev = Math.max(prev - 1, 0) + prev = Math.max(prev - 1, 0); setCommand(commandHistory[prev]); - return prev + return prev; }); - } else if (event.key === 'ArrowDown') { setCommandNav((prev) => { - prev = Math.min(prev + 1, commandHistory.length - 1) + prev = Math.min(prev + 1, commandHistory.length - 1); setCommand(commandHistory[prev]); - return prev + return prev; }); - } else { setCommandNav(commandHistory.length); } @@ -179,7 +179,7 @@ export default function GameConsole() { e.preventDefault(); sendCommand(command); appendCommandHistory(command); - setCommandNav(prev => prev + 1); + setCommandNav((prev) => prev + 1); setCommand(''); }} > From b35a220087bca334188cd3a1671bbddeede41169 Mon Sep 17 00:00:00 2001 From: Peter <2892084432j@gmail.com> Date: Sun, 21 May 2023 17:54:40 -0400 Subject: [PATCH 107/108] better toast --- src/utils/apis.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/utils/apis.ts b/src/utils/apis.ts index eb6037c5..e296bd49 100644 --- a/src/utils/apis.ts +++ b/src/utils/apis.ts @@ -80,7 +80,7 @@ export const deleteInstanceFile = async ( toast.error(error); return; } else { - toast.success(`Deleted ${file.name}`); + toast.success(`Deleted file: ${file.name}`); } const fileListKey = ['instance', uuid, 'fileList', directory]; @@ -107,6 +107,8 @@ export const deleteInstanceDirectory = async ( if (error) { toast.error(error); return; + } else { + toast.success(`Deleted directory: ${directory}`); } const fileListKey = ['instance', uuid, 'fileList', parentDirectory]; const fileList = queryClient.getQueryData(fileListKey); From e0237933822f72a6f155d8b4747496c9c059aff8 Mon Sep 17 00:00:00 2001 From: Peter <2892084432j@gmail.com> Date: Sun, 21 May 2023 17:55:42 -0400 Subject: [PATCH 108/108] cargo update --- src-tauri/Cargo.lock | 125 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 118 insertions(+), 7 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 259a000b..362e70b1 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -50,9 +50,9 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" +checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" dependencies = [ "aead", "aes", @@ -144,6 +144,55 @@ dependencies = [ "winapi", ] +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + [[package]] name = "anyhow" version = "1.0.71" @@ -620,9 +669,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" dependencies = [ "memchr", "serde", @@ -805,6 +854,48 @@ dependencies = [ "inout", ] +[[package]] +name = "clap" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +dependencies = [ + "anstream", + "anstyle", + "bitflags 1.3.2", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +dependencies = [ + "heck 0.4.1", + "proc-macro2 1.0.58", + "quote 1.0.27", + "syn 2.0.16", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + [[package]] name = "cloudabi" version = "0.0.3" @@ -878,6 +969,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "combine" version = "4.6.6" @@ -1201,9 +1298,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "data-url" @@ -3360,6 +3457,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -3764,7 +3873,7 @@ dependencies = [ [[package]] name = "lodestone_core" version = "0.4.4" -source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=main#2beb578af1ef7ed96ad9999e4aece7cc33a56048" +source = "git+https://github.com/Lodestone-Team/lodestone_core?branch=main#cbd5991820e9f6c5e12a358d5e1ba47ec47d9b64" dependencies = [ "ansi_term", "argon2", @@ -3775,6 +3884,7 @@ dependencies = [ "axum-server", "base64 0.20.0", "chrono", + "clap", "color-eyre", "dashmap", "deno_ast", @@ -3795,6 +3905,7 @@ dependencies = [ "jsonwebtoken", "lazy_static", "local-ip-address", + "once_cell", "port_scanner", "rand 0.6.5", "rand_core 0.6.4",