From 8d9ec0dcfd48972d16e10d957c235e2a0c0a7b1a Mon Sep 17 00:00:00 2001 From: Ren Amamiya <123083837+reyamir@users.noreply.github.com> Date: Tue, 3 Oct 2023 18:43:39 +0700 Subject: [PATCH 1/2] update config --- package.json | 2 +- pnpm-lock.yaml | 16 ++++++++-------- src-tauri/tauri.conf.json | 4 ---- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index fa776198..4cbb9215 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@tiptap/react": "^2.1.11", "@tiptap/starter-kit": "^2.1.11", "@tiptap/suggestion": "^2.1.11", - "@vidstack/react": "^1.1.4", + "@vidstack/react": "^1.1.5", "dayjs": "^1.11.10", "destr": "^2.0.1", "html-to-text": "^9.0.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e5b15684..38dc34e3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -72,8 +72,8 @@ dependencies: specifier: ^2.1.11 version: 2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11) '@vidstack/react': - specifier: ^1.1.4 - version: 1.1.4(@types/react@18.2.24)(react@18.2.0) + specifier: ^1.1.5 + version: 1.1.5(@types/react@18.2.24)(react@18.2.0) dayjs: specifier: ^1.11.10 version: 1.11.10 @@ -2703,8 +2703,8 @@ packages: eslint-visitor-keys: 3.4.3 dev: true - /@vidstack/react@1.1.4(@types/react@18.2.24)(react@18.2.0): - resolution: {integrity: sha512-B7YOPIHm69bjMWbJu0vWLbEHlPAeCN8w0MYJJabTrj8x8NqEL508o47GF4sdSeeQ+hePn4/VneycSf90/m82Ag==} + /@vidstack/react@1.1.5(@types/react@18.2.24)(react@18.2.0): + resolution: {integrity: sha512-EutVuOU2b6XTryEmPU23T2Ftu3j4BuJGdGbyHoDtc15m6iL/DtpkBJCLqRVI7PaiuQtqneKcvKUNcBNogVz5KQ==} engines: {node: '>=18'} peerDependencies: '@types/react': ^18.0.0 @@ -2901,7 +2901,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.22.1 - caniuse-lite: 1.0.30001542 + caniuse-lite: 1.0.30001543 fraction.js: 4.3.6 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -2957,7 +2957,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001542 + caniuse-lite: 1.0.30001543 electron-to-chromium: 1.4.539 node-releases: 2.0.13 update-browserslist-db: 1.0.13(browserslist@4.22.1) @@ -2988,8 +2988,8 @@ packages: engines: {node: '>= 6'} dev: true - /caniuse-lite@1.0.30001542: - resolution: {integrity: sha512-UrtAXVcj1mvPBFQ4sKd38daP8dEcXXr5sQe6QNNinaPd0iA/cxg9/l3VrSdL73jgw5sKyuQ6jNgiKO12W3SsVA==} + /caniuse-lite@1.0.30001543: + resolution: {integrity: sha512-qxdO8KPWPQ+Zk6bvNpPeQIOH47qZSYdFZd6dXQzb2KzhnSXju4Kd7H1PkSJx6NICSMgo/IhRZRhhfPTHYpJUCA==} dev: true /case-anything@2.1.13: diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index dbca863f..ac57948b 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -125,10 +125,6 @@ ] }, "security": { - "csp": { - "content-security-policy": "upgrade-insecure-requests" - }, - "dangerousUseHttpScheme": true, "dangerousRemoteDomainIpcAccess": [ { "scheme": "https", From 8e39bca57c65ded27f2ae09719d4ff3264446c25 Mon Sep 17 00:00:00 2001 From: Ren Amamiya <123083837+reyamir@users.noreply.github.com> Date: Wed, 4 Oct 2023 07:48:20 +0700 Subject: [PATCH 2/2] fix build --- package.json | 4 +-- pnpm-lock.yaml | 54 ++++++++++++++-------------- src-tauri/Cargo.lock | 75 ++++++++++++++++++++++++++------------- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 3 +- 5 files changed, 81 insertions(+), 57 deletions(-) diff --git a/package.json b/package.json index 4cbb9215..fa225e38 100644 --- a/package.json +++ b/package.json @@ -94,12 +94,12 @@ "lint-staged": "^14.0.1", "postcss": "^8.4.31", "prettier": "^3.0.3", - "prettier-plugin-tailwindcss": "^0.5.4", + "prettier-plugin-tailwindcss": "^0.5.5", "prop-types": "^15.8.1", "tailwind-merge": "^1.14.0", "tailwindcss": "^3.3.3", "typescript": "^5.2.2", - "vite": "^4.4.9", + "vite": "^4.4.10", "vite-tsconfig-paths": "^4.2.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 38dc34e3..03f698a9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -186,7 +186,7 @@ devDependencies: version: 6.7.4(eslint@8.50.0)(typescript@5.2.2) '@vitejs/plugin-react-swc': specifier: ^3.4.0 - version: 3.4.0(vite@4.4.9) + version: 3.4.0(vite@4.4.10) autoprefixer: specifier: ^10.4.16 version: 10.4.16(postcss@8.4.31) @@ -230,8 +230,8 @@ devDependencies: specifier: ^3.0.3 version: 3.0.3 prettier-plugin-tailwindcss: - specifier: ^0.5.4 - version: 0.5.4(@trivago/prettier-plugin-sort-imports@4.2.0)(prettier@3.0.3) + specifier: ^0.5.5 + version: 0.5.5(@trivago/prettier-plugin-sort-imports@4.2.0)(prettier@3.0.3) prop-types: specifier: ^15.8.1 version: 15.8.1 @@ -245,11 +245,11 @@ devDependencies: specifier: ^5.2.2 version: 5.2.2 vite: - specifier: ^4.4.9 - version: 4.4.9(@types/node@20.8.2) + specifier: ^4.4.10 + version: 4.4.10(@types/node@20.8.2) vite-tsconfig-paths: specifier: ^4.2.1 - version: 4.2.1(typescript@5.2.2)(vite@4.4.9) + version: 4.2.1(typescript@5.2.2)(vite@4.4.10) packages: @@ -2715,13 +2715,13 @@ packages: react: 18.2.0 dev: false - /@vitejs/plugin-react-swc@3.4.0(vite@4.4.9): + /@vitejs/plugin-react-swc@3.4.0(vite@4.4.10): resolution: {integrity: sha512-m7UaA4Uvz82N/0EOVpZL4XsFIakRqrFKeSNxa1FBLSXGvWrWRBwmZb4qxk+ZIVAZcW3c3dn5YosomDgx62XWcQ==} peerDependencies: vite: ^4 dependencies: '@swc/core': 1.3.91 - vite: 4.4.9(@types/node@20.8.2) + vite: 4.4.10(@types/node@20.8.2) transitivePeerDependencies: - '@swc/helpers' dev: true @@ -2958,7 +2958,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001543 - electron-to-chromium: 1.4.539 + electron-to-chromium: 1.4.540 node-releases: 2.0.13 update-browserslist-db: 1.0.13(browserslist@4.22.1) dev: true @@ -3369,8 +3369,8 @@ packages: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} dev: true - /electron-to-chromium@1.4.539: - resolution: {integrity: sha512-wRmWJ8F7rgmINuI32S6r2SLrw/h/bJQsDSvBiq9GBfvc2Lh73qTOwn73r3Cf67mjVgFGJYcYtmERzySa5jIWlg==} + /electron-to-chromium@1.4.540: + resolution: {integrity: sha512-aoCqgU6r9+o9/S7wkcSbmPRFi7OWZWiXS9rtjEd+Ouyu/Xyw5RSq2XN8s5Qp8IaFOLiRrhQCphCIjAxgG3eCAg==} dev: true /emoji-regex@9.2.2: @@ -3408,7 +3408,7 @@ packages: get-symbol-description: 1.0.0 globalthis: 1.0.3 gopd: 1.0.1 - has: 1.0.3 + has: 1.0.4 has-property-descriptors: 1.0.0 has-proto: 1.0.1 has-symbols: 1.0.3 @@ -3462,14 +3462,14 @@ packages: engines: {node: '>= 0.4'} dependencies: get-intrinsic: 1.2.1 - has: 1.0.3 + has: 1.0.4 has-tostringtag: 1.0.0 dev: true /es-shim-unscopables@1.0.0: resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==} dependencies: - has: 1.0.3 + has: 1.0.4 dev: true /es-to-primitive@1.2.1: @@ -3580,7 +3580,7 @@ packages: damerau-levenshtein: 1.0.8 emoji-regex: 9.2.2 eslint: 8.50.0 - has: 1.0.3 + has: 1.0.4 jsx-ast-utils: 3.3.5 language-tags: 1.0.5 minimatch: 3.1.2 @@ -3869,7 +3869,7 @@ packages: resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==} dependencies: function-bind: 1.1.1 - has: 1.0.3 + has: 1.0.4 has-proto: 1.0.1 has-symbols: 1.0.3 dev: true @@ -4010,11 +4010,9 @@ packages: has-symbols: 1.0.3 dev: true - /has@1.0.3: - resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==} + /has@1.0.4: + resolution: {integrity: sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==} engines: {node: '>= 0.4.0'} - dependencies: - function-bind: 1.1.1 dev: true /hast-util-whitespace@2.0.1: @@ -4097,7 +4095,7 @@ packages: engines: {node: '>= 0.4'} dependencies: get-intrinsic: 1.2.1 - has: 1.0.3 + has: 1.0.4 side-channel: 1.0.4 dev: true @@ -4156,7 +4154,7 @@ packages: /is-core-module@2.13.0: resolution: {integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==} dependencies: - has: 1.0.3 + has: 1.0.4 dev: true /is-date-object@1.0.5: @@ -5355,8 +5353,8 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier-plugin-tailwindcss@0.5.4(@trivago/prettier-plugin-sort-imports@4.2.0)(prettier@3.0.3): - resolution: {integrity: sha512-QZzzB1bID6qPsKHTeA9qPo1APmmxfFrA5DD3LQ+vbTmAnY40eJI7t9Q1ocqel2EKMWNPLJqdTDWZj1hKYgqSgg==} + /prettier-plugin-tailwindcss@0.5.5(@trivago/prettier-plugin-sort-imports@4.2.0)(prettier@3.0.3): + resolution: {integrity: sha512-voy0CjWv/CM8yeaduv5ZwovovpTGMR5LbzlhGF+LtEvMJt9wBeVTVnW781hL38R/RcDXCJwN2rolsgr94B/n0Q==} engines: {node: '>=14.21.3'} peerDependencies: '@ianvs/prettier-plugin-sort-imports': '*' @@ -6543,7 +6541,7 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /vite-tsconfig-paths@4.2.1(typescript@5.2.2)(vite@4.4.9): + /vite-tsconfig-paths@4.2.1(typescript@5.2.2)(vite@4.4.10): resolution: {integrity: sha512-GNUI6ZgPqT3oervkvzU+qtys83+75N/OuDaQl7HmOqFTb0pjZsuARrRipsyJhJ3enqV8beI1xhGbToR4o78nSQ==} peerDependencies: vite: '*' @@ -6554,14 +6552,14 @@ packages: debug: 4.3.4 globrex: 0.1.2 tsconfck: 2.1.2(typescript@5.2.2) - vite: 4.4.9(@types/node@20.8.2) + vite: 4.4.10(@types/node@20.8.2) transitivePeerDependencies: - supports-color - typescript dev: true - /vite@4.4.9(@types/node@20.8.2): - resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==} + /vite@4.4.10(@types/node@20.8.2): + resolution: {integrity: sha512-TzIjiqx9BEXF8yzYdF2NTf1kFFbjMjUSV0LFZ3HyHoI3SGSPLnnFUKiIQtL3gl2AjHvMrprOvQ3amzaHgQlAxw==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 627d1b29..202bc54f 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -329,7 +329,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -574,7 +574,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -1721,7 +1721,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -1738,7 +1738,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -1752,7 +1752,7 @@ dependencies = [ "gobject-sys", "libc", "pkg-config", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -1764,7 +1764,7 @@ dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", "x11", ] @@ -1857,7 +1857,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", "winapi", ] @@ -1903,7 +1903,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -1933,7 +1933,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -1974,7 +1974,7 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -3188,7 +3188,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -3499,7 +3499,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -3760,9 +3760,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.21" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78fdbab6a7e1d7b13cc8ff10197f47986b41c639300cc3c8158cac7847c9bbef" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64 0.21.4", "bytes", @@ -4818,14 +4818,14 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.1" +version = "6.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "94af52f9402f94aac4948a2518b43359be8d9ce6cd9efc1c4de3b2f7b7e897d6" dependencies = [ "cfg-expr 0.15.5", "heck 0.4.1", "pkg-config", - "toml 0.7.8", + "toml 0.8.2", "version-compare 0.1.1", ] @@ -5019,7 +5019,7 @@ dependencies = [ [[package]] name = "tauri-plugin-autostart" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b96996b5a90a6a57d587ce4312975f13a4d8bc2" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa32d1afa97f52f74d814c5619b8d95da3268e3e" dependencies = [ "auto-launch", "log", @@ -5032,7 +5032,7 @@ dependencies = [ [[package]] name = "tauri-plugin-single-instance" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b96996b5a90a6a57d587ce4312975f13a4d8bc2" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa32d1afa97f52f74d814c5619b8d95da3268e3e" dependencies = [ "log", "serde", @@ -5046,7 +5046,7 @@ dependencies = [ [[package]] name = "tauri-plugin-sql" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b96996b5a90a6a57d587ce4312975f13a4d8bc2" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa32d1afa97f52f74d814c5619b8d95da3268e3e" dependencies = [ "futures-core", "log", @@ -5062,7 +5062,7 @@ dependencies = [ [[package]] name = "tauri-plugin-store" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b96996b5a90a6a57d587ce4312975f13a4d8bc2" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa32d1afa97f52f74d814c5619b8d95da3268e3e" dependencies = [ "log", "serde", @@ -5074,7 +5074,7 @@ dependencies = [ [[package]] name = "tauri-plugin-stronghold" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b96996b5a90a6a57d587ce4312975f13a4d8bc2" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa32d1afa97f52f74d814c5619b8d95da3268e3e" dependencies = [ "hex", "iota-crypto 0.23.0", @@ -5093,7 +5093,7 @@ dependencies = [ [[package]] name = "tauri-plugin-upload" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b96996b5a90a6a57d587ce4312975f13a4d8bc2" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa32d1afa97f52f74d814c5619b8d95da3268e3e" dependencies = [ "futures-util", "log", @@ -5382,7 +5382,19 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -5407,6 +5419,19 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.0.2", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower-service" version = "0.3.2" @@ -5824,7 +5849,7 @@ dependencies = [ "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 4ea6cee2..b4ae74bf 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -11,7 +11,7 @@ rust-version = "1.66" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = { version = "1.4.1", features = [] } +tauri-build = { version = "1.5", features = [] } [dependencies] serde_json = "1.0" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index ac57948b..9440a30c 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -107,7 +107,8 @@ "frameworks": [], "providerShortName": null, "signingIdentity": null, - "minimumSystemVersion": "10.15.0" + "minimumSystemVersion": "10.15.0", + "license": "../LICENSE" }, "resources": [], "shortDescription": "",