From ab279ebb75ec1891d78cbaae904f3506eef66e08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:15:49 +0000 Subject: [PATCH 01/11] Bump svelte-check from 3.6.9 to 3.8.4 Bumps [svelte-check](https://github.com/sveltejs/language-tools) from 3.6.9 to 3.8.4. - [Release notes](https://github.com/sveltejs/language-tools/releases) - [Commits](https://github.com/sveltejs/language-tools/compare/svelte-check-3.6.9...svelte-check-3.8.4) --- updated-dependencies: - dependency-name: svelte-check dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 191 +--------------------------------------------- package.json | 2 +- 2 files changed, 5 insertions(+), 188 deletions(-) diff --git a/package-lock.json b/package-lock.json index f486245..e0aa448 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@tauri-apps/cli": "^1.4.0", "@tsconfig/svelte": "^5.0.0", "svelte": "^4.0.5", - "svelte-check": "^3.4.6", + "svelte-check": "^3.8.4", "svelte-preprocess": "^5.0.0", "tslib": "^2.6.0", "typescript": "^5.0.2", @@ -432,41 +432,6 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/@sveltejs/vite-plugin-svelte": { "version": "2.5.3", "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-2.5.3.tgz", @@ -815,15 +780,6 @@ "node": "*" } }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/chokidar": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", @@ -972,31 +928,6 @@ "@types/estree": "^1.0.0" } }, - "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", - "dev": true, - "dependencies": { - "reusify": "^1.0.4" - } - }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", @@ -1068,22 +999,6 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -1178,28 +1093,6 @@ "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==" }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "dependencies": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, "node_modules/min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -1293,18 +1186,6 @@ "wrappy": "1" } }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -1370,26 +1251,6 @@ "node": "^10 || ^12 || >=14" } }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -1402,25 +1263,6 @@ "node": ">=8.10.0" } }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, "node_modules/rimraf": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", @@ -1449,29 +1291,6 @@ "fsevents": "~2.3.2" } }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, "node_modules/sade": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz", @@ -1556,15 +1375,13 @@ } }, "node_modules/svelte-check": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-3.6.9.tgz", - "integrity": "sha512-hDQrk3L0osX07djQyMiXocKysTLfusqi8AriNcCiQxhQR49/LonYolcUGMtZ0fbUR8HTR198Prrgf52WWU9wEg==", + "version": "3.8.4", + "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-3.8.4.tgz", + "integrity": "sha512-61aHMkdinWyH8BkkTX9jPLYxYzaAAz/FK/VQqdr2FiCQQ/q04WCwDlpGbHff1GdrMYTmW8chlTFvRWL9k0A8vg==", "dev": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.17", "chokidar": "^3.4.1", - "fast-glob": "^3.2.7", - "import-fresh": "^3.2.1", "picocolors": "^1.0.0", "sade": "^1.7.4", "svelte-preprocess": "^5.1.3", diff --git a/package.json b/package.json index 849383a..f0b34e3 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@sveltejs/vite-plugin-svelte": "^2.4.2", "@tsconfig/svelte": "^5.0.0", "svelte": "^4.0.5", - "svelte-check": "^3.4.6", + "svelte-check": "^3.8.4", "svelte-preprocess": "^5.0.0", "tslib": "^2.6.0", "typescript": "^5.0.2", From de94ea4c21926ee84cd283e89468244be9c60ae8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:15:50 +0000 Subject: [PATCH 02/11] Bump svelte-preprocess from 5.1.4 to 6.0.2 Bumps [svelte-preprocess](https://github.com/sveltejs/svelte-preprocess) from 5.1.4 to 6.0.2. - [Changelog](https://github.com/sveltejs/svelte-preprocess/blob/main/CHANGELOG.md) - [Commits](https://github.com/sveltejs/svelte-preprocess/compare/v5.1.4...v6.0.2) --- updated-dependencies: - dependency-name: svelte-preprocess dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 102 ++++++++++++++++++++++++++++++++++++---------- package.json | 2 +- 2 files changed, 81 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index f486245..81a250c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "@tsconfig/svelte": "^5.0.0", "svelte": "^4.0.5", "svelte-check": "^3.4.6", - "svelte-preprocess": "^5.0.0", + "svelte-preprocess": "^6.0.2", "tslib": "^2.6.0", "typescript": "^5.0.2", "vite": "^4.4.4" @@ -807,12 +807,12 @@ } }, "node_modules/buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz", + "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==", "dev": true, "engines": { - "node": "*" + "node": ">=8.0.0" } }, "node_modules/callsites": { @@ -1034,6 +1034,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -1088,6 +1089,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dev": true, "dependencies": { "once": "^1.3.0", @@ -1425,6 +1427,7 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, "dependencies": { "glob": "^7.1.3" @@ -1497,13 +1500,13 @@ } }, "node_modules/sorcery": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/sorcery/-/sorcery-0.11.0.tgz", - "integrity": "sha512-J69LQ22xrQB1cIFJhPfgtLuI6BpWRiWu1Y3vSsIwK/eAScqJxd/+CJlUuHQRdX2C9NGFamq+KqNywGgaThwfHw==", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/sorcery/-/sorcery-0.11.1.tgz", + "integrity": "sha512-o7npfeJE6wi6J9l0/5LKshFzZ2rMatRiCDwYeDQaOzqdzRJwALhX7mk/A/ecg6wjMu7wdZbmXfD2S/vpOg0bdQ==", "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.14", - "buffer-crc32": "^0.2.5", + "buffer-crc32": "^1.0.0", "minimist": "^1.2.0", "sander": "^0.5.0" }, @@ -1577,19 +1580,7 @@ "svelte": "^3.55.0 || ^4.0.0-next.0 || ^4.0.0 || ^5.0.0-next.0" } }, - "node_modules/svelte-hmr": { - "version": "0.15.3", - "resolved": "https://registry.npmjs.org/svelte-hmr/-/svelte-hmr-0.15.3.tgz", - "integrity": "sha512-41snaPswvSf8TJUhlkoJBekRrABDXDMdpNpT2tfHIv4JuhgvHqLMhEPGtaQn0BmbNSTkuz2Ed20DF2eHw0SmBQ==", - "dev": true, - "engines": { - "node": "^12.20 || ^14.13.1 || >= 16" - }, - "peerDependencies": { - "svelte": "^3.19.0 || ^4.0.0" - } - }, - "node_modules/svelte-preprocess": { + "node_modules/svelte-check/node_modules/svelte-preprocess": { "version": "5.1.4", "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-5.1.4.tgz", "integrity": "sha512-IvnbQ6D6Ao3Gg6ftiM5tdbR6aAETwjhHV+UKGf5bHGYR69RQvF1ho0JKPcbUON4vy4R7zom13jPjgdOWCQ5hDA==", @@ -1651,6 +1642,73 @@ } } }, + "node_modules/svelte-hmr": { + "version": "0.15.3", + "resolved": "https://registry.npmjs.org/svelte-hmr/-/svelte-hmr-0.15.3.tgz", + "integrity": "sha512-41snaPswvSf8TJUhlkoJBekRrABDXDMdpNpT2tfHIv4JuhgvHqLMhEPGtaQn0BmbNSTkuz2Ed20DF2eHw0SmBQ==", + "dev": true, + "engines": { + "node": "^12.20 || ^14.13.1 || >= 16" + }, + "peerDependencies": { + "svelte": "^3.19.0 || ^4.0.0" + } + }, + "node_modules/svelte-preprocess": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-6.0.2.tgz", + "integrity": "sha512-OvDTLfaOkkhjprbDKO0SOCkjNYuHy16dbD4SpqbIi6QiabOMHxRT4km5/dzbFFkmW1L0E2INF3MFltG2pgOyKQ==", + "dev": true, + "hasInstallScript": true, + "engines": { + "node": ">= 18.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.10.2", + "coffeescript": "^2.5.1", + "less": "^3.11.3 || ^4.0.0", + "postcss": "^7 || ^8", + "postcss-load-config": ">=3", + "pug": "^3.0.0", + "sass": "^1.26.8", + "stylus": ">=0.55", + "sugarss": "^2.0.0 || ^3.0.0 || ^4.0.0", + "svelte": "^4.0.0 || ^5.0.0-next.100 || ^5.0.0", + "typescript": "^5.0.0" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "coffeescript": { + "optional": true + }, + "less": { + "optional": true + }, + "postcss": { + "optional": true + }, + "postcss-load-config": { + "optional": true + }, + "pug": { + "optional": true + }, + "sass": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "typescript": { + "optional": true + } + } + }, "node_modules/svelte-simple-modal": { "version": "1.6.2", "resolved": "https://registry.npmjs.org/svelte-simple-modal/-/svelte-simple-modal-1.6.2.tgz", diff --git a/package.json b/package.json index 849383a..7fa6636 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@tsconfig/svelte": "^5.0.0", "svelte": "^4.0.5", "svelte-check": "^3.4.6", - "svelte-preprocess": "^5.0.0", + "svelte-preprocess": "^6.0.2", "tslib": "^2.6.0", "typescript": "^5.0.2", "vite": "^4.4.4", From be41a9607c35fd0f6cc886bfba60654634c7e18a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:16:02 +0000 Subject: [PATCH 03/11] Bump tslib from 2.6.2 to 2.6.3 Bumps [tslib](https://github.com/Microsoft/tslib) from 2.6.2 to 2.6.3. - [Release notes](https://github.com/Microsoft/tslib/releases) - [Commits](https://github.com/Microsoft/tslib/compare/v2.6.2...v2.6.3) --- updated-dependencies: - dependency-name: tslib dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f486245..a068cc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "svelte": "^4.0.5", "svelte-check": "^3.4.6", "svelte-preprocess": "^5.0.0", - "tslib": "^2.6.0", + "tslib": "^2.6.3", "typescript": "^5.0.2", "vite": "^4.4.4" } @@ -1683,9 +1683,9 @@ } }, "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", + "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", "dev": true }, "node_modules/typescript": { diff --git a/package.json b/package.json index 849383a..14e1dc0 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "svelte": "^4.0.5", "svelte-check": "^3.4.6", "svelte-preprocess": "^5.0.0", - "tslib": "^2.6.0", + "tslib": "^2.6.3", "typescript": "^5.0.2", "vite": "^4.4.4", "@tauri-apps/cli": "^1.4.0" From 9bb770ce720a26195393464fa4567e085ebfdeb6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:16:06 +0000 Subject: [PATCH 04/11] Bump svelte from 4.2.15 to 4.2.18 Bumps [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte) from 4.2.15 to 4.2.18. - [Release notes](https://github.com/sveltejs/svelte/releases) - [Changelog](https://github.com/sveltejs/svelte/blob/svelte@4.2.18/packages/svelte/CHANGELOG.md) - [Commits](https://github.com/sveltejs/svelte/commits/svelte@4.2.18/packages/svelte) --- updated-dependencies: - dependency-name: svelte dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f486245..de0801c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@sveltejs/vite-plugin-svelte": "^2.4.2", "@tauri-apps/cli": "^1.4.0", "@tsconfig/svelte": "^5.0.0", - "svelte": "^4.0.5", + "svelte": "^4.2.18", "svelte-check": "^3.4.6", "svelte-preprocess": "^5.0.0", "tslib": "^2.6.0", @@ -1532,9 +1532,9 @@ } }, "node_modules/svelte": { - "version": "4.2.15", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.2.15.tgz", - "integrity": "sha512-j9KJSccHgLeRERPlhMKrCXpk2TqL2m5Z+k+OBTQhZOhIdCCd3WfqV+ylPWeipEwq17P/ekiSFWwrVQv93i3bsg==", + "version": "4.2.18", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.2.18.tgz", + "integrity": "sha512-d0FdzYIiAePqRJEb90WlJDkjUEx42xhivxN8muUBmfZnP+tzUgz12DJ2hRJi8sIHCME7jeK1PTMgKPSfTd8JrA==", "dependencies": { "@ampproject/remapping": "^2.2.1", "@jridgewell/sourcemap-codec": "^1.4.15", diff --git a/package.json b/package.json index 849383a..4805128 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "devDependencies": { "@sveltejs/vite-plugin-svelte": "^2.4.2", "@tsconfig/svelte": "^5.0.0", - "svelte": "^4.0.5", + "svelte": "^4.2.18", "svelte-check": "^3.4.6", "svelte-preprocess": "^5.0.0", "tslib": "^2.6.0", From ffe2108f018b8d36695c7d0a7bf8725d8d7c3b7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:16:12 +0000 Subject: [PATCH 05/11] Bump @tauri-apps/api from 1.5.3 to 1.6.0 Bumps [@tauri-apps/api](https://github.com/tauri-apps/tauri) from 1.5.3 to 1.6.0. - [Release notes](https://github.com/tauri-apps/tauri/releases) - [Commits](https://github.com/tauri-apps/tauri/compare/@tauri-apps/api-v1.5.3...@tauri-apps/api-v1.6) --- updated-dependencies: - dependency-name: "@tauri-apps/api" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f486245..62ed11f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "autd3-server", "version": "27.0.0-alpha.1", "dependencies": { - "@tauri-apps/api": "^1.4.0", + "@tauri-apps/api": "^1.6.0", "svelte-simple-modal": "^1.6.1", "svelte-tabs": "^1.1.0", "the-new-css-reset": "^1.9.0" @@ -507,9 +507,9 @@ } }, "node_modules/@tauri-apps/api": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.5.3.tgz", - "integrity": "sha512-zxnDjHHKjOsrIzZm6nO5Xapb/BxqUq1tc7cGkFXsFkGTsSWgCPH1D8mm0XS9weJY2OaR73I3k3S+b7eSzJDfqA==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.6.0.tgz", + "integrity": "sha512-rqI++FWClU5I2UBp4HXFvl+sBWkdigBkxnpJDQUWttNyG7IZP4FwQGhTNL5EOw0vI8i6eSAJ5frLqO7n7jbJdg==", "engines": { "node": ">= 14.6.0", "npm": ">= 6.6.0", diff --git a/package.json b/package.json index 849383a..6a95c63 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "^1.4.0", + "@tauri-apps/api": "^1.6.0", "svelte-simple-modal": "^1.6.1", "svelte-tabs": "^1.1.0", "the-new-css-reset": "^1.9.0" From 444fd8f13f9d9c754212c657acf5989e976ba07b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:16:13 +0000 Subject: [PATCH 06/11] Bump @tauri-apps/cli from 1.5.11 to 1.6.0 Bumps [@tauri-apps/cli](https://github.com/tauri-apps/tauri) from 1.5.11 to 1.6.0. - [Release notes](https://github.com/tauri-apps/tauri/releases) - [Commits](https://github.com/tauri-apps/tauri/compare/@tauri-apps/cli-v1.5.11...@tauri-apps/cli-v1.6.0) --- updated-dependencies: - dependency-name: "@tauri-apps/cli" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 88 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/package-lock.json b/package-lock.json index f486245..4dd0f52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "^2.4.2", - "@tauri-apps/cli": "^1.4.0", + "@tauri-apps/cli": "^1.6.0", "@tsconfig/svelte": "^5.0.0", "svelte": "^4.0.5", "svelte-check": "^3.4.6", @@ -521,9 +521,9 @@ } }, "node_modules/@tauri-apps/cli": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.5.11.tgz", - "integrity": "sha512-B475D7phZrq5sZ3kDABH4g2mEoUIHtnIO+r4ZGAAfsjMbZCwXxR/jlMGTEL+VO3YzjpF7gQe38IzB4vLBbVppw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.6.0.tgz", + "integrity": "sha512-DBBpBl6GhTzm8ImMbKkfaZ4fDTykWrC7Q5OXP4XqD91recmDEn2LExuvuiiS3HYe7uP8Eb5B9NPHhqJb+Zo7qQ==", "dev": true, "bin": { "tauri": "tauri.js" @@ -536,22 +536,22 @@ "url": "https://opencollective.com/tauri" }, "optionalDependencies": { - "@tauri-apps/cli-darwin-arm64": "1.5.11", - "@tauri-apps/cli-darwin-x64": "1.5.11", - "@tauri-apps/cli-linux-arm-gnueabihf": "1.5.11", - "@tauri-apps/cli-linux-arm64-gnu": "1.5.11", - "@tauri-apps/cli-linux-arm64-musl": "1.5.11", - "@tauri-apps/cli-linux-x64-gnu": "1.5.11", - "@tauri-apps/cli-linux-x64-musl": "1.5.11", - "@tauri-apps/cli-win32-arm64-msvc": "1.5.11", - "@tauri-apps/cli-win32-ia32-msvc": "1.5.11", - "@tauri-apps/cli-win32-x64-msvc": "1.5.11" + "@tauri-apps/cli-darwin-arm64": "1.6.0", + "@tauri-apps/cli-darwin-x64": "1.6.0", + "@tauri-apps/cli-linux-arm-gnueabihf": "1.6.0", + "@tauri-apps/cli-linux-arm64-gnu": "1.6.0", + "@tauri-apps/cli-linux-arm64-musl": "1.6.0", + "@tauri-apps/cli-linux-x64-gnu": "1.6.0", + "@tauri-apps/cli-linux-x64-musl": "1.6.0", + "@tauri-apps/cli-win32-arm64-msvc": "1.6.0", + "@tauri-apps/cli-win32-ia32-msvc": "1.6.0", + "@tauri-apps/cli-win32-x64-msvc": "1.6.0" } }, "node_modules/@tauri-apps/cli-darwin-arm64": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.5.11.tgz", - "integrity": "sha512-2NLSglDb5VfvTbMtmOKWyD+oaL/e8Z/ZZGovHtUFyUSFRabdXc6cZOlcD1BhFvYkHqm+TqGaz5qtPR5UbqDs8A==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.6.0.tgz", + "integrity": "sha512-SNRwUD9nqGxY47mbY1CGTt/jqyQOU7Ps7Mx/mpgahL0FVUDiCEY/5L9QfEPPhEgccgcelEVn7i6aQHIkHyUtCA==", "cpu": [ "arm64" ], @@ -565,9 +565,9 @@ } }, "node_modules/@tauri-apps/cli-darwin-x64": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.5.11.tgz", - "integrity": "sha512-/RQllHiJRH2fJOCudtZlaUIjofkHzP3zZgxi71ZUm7Fy80smU5TDfwpwOvB0wSVh0g/ciDjMArCSTo0MRvL+ag==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.6.0.tgz", + "integrity": "sha512-g2/uDR/eeH2arvuawA4WwaEOqv/7jDO/ZLNI3JlBjP5Pk8GGb3Kdy0ro1xQzF94mtk2mOnOXa4dMgAet4sUJ1A==", "cpu": [ "x64" ], @@ -581,9 +581,9 @@ } }, "node_modules/@tauri-apps/cli-linux-arm-gnueabihf": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.5.11.tgz", - "integrity": "sha512-IlBuBPKmMm+a5LLUEK6a21UGr9ZYd6zKuKLq6IGM4tVweQa8Sf2kP2Nqs74dMGIUrLmMs0vuqdURpykQg+z4NQ==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.6.0.tgz", + "integrity": "sha512-EVwf4oRkQyG8BpSrk0gqO7oA0sDM2MdNDtJpMfleYFEgCxLIOGZKNqaOW3M7U+0Y4qikmG3TtRK+ngc8Ymtrjg==", "cpu": [ "arm" ], @@ -597,9 +597,9 @@ } }, "node_modules/@tauri-apps/cli-linux-arm64-gnu": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.5.11.tgz", - "integrity": "sha512-w+k1bNHCU/GbmXshtAhyTwqosThUDmCEFLU4Zkin1vl2fuAtQry2RN7thfcJFepblUGL/J7yh3Q/0+BCjtspKQ==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.6.0.tgz", + "integrity": "sha512-YdpY17cAySrhK9dX4BUVEmhAxE2o+6skIEFg8iN/xrDwRxhaNPI9I80YXPatUTX54Kx55T5++25VJG9+3iw83A==", "cpu": [ "arm64" ], @@ -613,9 +613,9 @@ } }, "node_modules/@tauri-apps/cli-linux-arm64-musl": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.5.11.tgz", - "integrity": "sha512-PN6/dl+OfYQ/qrAy4HRAfksJ2AyWQYn2IA/2Wwpaa7SDRz2+hzwTQkvajuvy0sQ5L2WCG7ymFYRYMbpC6Hk9Pg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.6.0.tgz", + "integrity": "sha512-4U628tuf2U8pMr4tIBJhEkrFwt+46dwhXrDlpdyWSZtnop5RJAVKHODm0KbWns4xGKfTW1F3r6sSv+2ZxLcISA==", "cpu": [ "arm64" ], @@ -629,9 +629,9 @@ } }, "node_modules/@tauri-apps/cli-linux-x64-gnu": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.5.11.tgz", - "integrity": "sha512-MTVXLi89Nj7Apcvjezw92m7ZqIDKT5SFKZtVPCg6RoLUBTzko/BQoXYIRWmdoz2pgkHDUHgO2OMJ8oKzzddXbw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.6.0.tgz", + "integrity": "sha512-AKRzp76fVUaJyXj5KRJT9bJyhwZyUnRQU0RqIRqOtZCT5yr6qGP8rjtQ7YhCIzWrseBlOllc3Qvbgw3Yl0VQcA==", "cpu": [ "x64" ], @@ -645,9 +645,9 @@ } }, "node_modules/@tauri-apps/cli-linux-x64-musl": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.5.11.tgz", - "integrity": "sha512-kwzAjqFpz7rvTs7WGZLy/a5nS5t15QKr3E9FG95MNF0exTl3d29YoAUAe1Mn0mOSrTJ9Z+vYYAcI/QdcsGBP+w==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.6.0.tgz", + "integrity": "sha512-0edIdq6aMBTaRMIXddHfyAFL361JqulLLd2Wi2aoOie7DkQ2MYh6gv3hA7NB9gqFwNIGE+xtJ4BkXIP2tSGPlg==", "cpu": [ "x64" ], @@ -661,9 +661,9 @@ } }, "node_modules/@tauri-apps/cli-win32-arm64-msvc": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.5.11.tgz", - "integrity": "sha512-L+5NZ/rHrSUrMxjj6YpFYCXp6wHnq8c8SfDTBOX8dO8x+5283/vftb4vvuGIsLS4UwUFXFnLt3XQr44n84E67Q==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.6.0.tgz", + "integrity": "sha512-QwWpWk4ubcwJ1rljsRAmINgB2AwkyzZhpYbalA+MmzyYMREcdXWGkyixWbRZgqc6fEWEBmq5UG73qz5eBJiIKg==", "cpu": [ "arm64" ], @@ -677,9 +677,9 @@ } }, "node_modules/@tauri-apps/cli-win32-ia32-msvc": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.5.11.tgz", - "integrity": "sha512-oVlD9IVewrY0lZzTdb71kNXkjdgMqFq+ohb67YsJb4Rf7o8A9DTlFds1XLCe3joqLMm4M+gvBKD7YnGIdxQ9vA==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.6.0.tgz", + "integrity": "sha512-Vtw0yxO9+aEFuhuxQ57ALG43tjECopRimRuKGbtZYDCriB/ty5TrT3QWMdy0dxBkpDTu3Rqsz30sbDzw6tlP3Q==", "cpu": [ "ia32" ], @@ -693,9 +693,9 @@ } }, "node_modules/@tauri-apps/cli-win32-x64-msvc": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.5.11.tgz", - "integrity": "sha512-1CexcqUFCis5ypUIMOKllxUBrna09McbftWENgvVXMfA+SP+yPDPAVb8fIvUcdTIwR/yHJwcIucmTB4anww4vg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.6.0.tgz", + "integrity": "sha512-h54FHOvGi7+LIfRchzgZYSCHB1HDlP599vWXQQJ/XnwJY+6Rwr2E5bOe/EhqoG8rbGkfK0xX3KPAvXPbUlmggg==", "cpu": [ "x64" ], diff --git a/package.json b/package.json index 849383a..fd92a3f 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,6 @@ "tslib": "^2.6.0", "typescript": "^5.0.2", "vite": "^4.4.4", - "@tauri-apps/cli": "^1.4.0" + "@tauri-apps/cli": "^1.6.0" } } \ No newline at end of file From e222c27e5ffba4f3237ac15a355b7307971cc884 Mon Sep 17 00:00:00 2001 From: shun suzuki Date: Thu, 25 Jul 2024 08:22:47 +0900 Subject: [PATCH 07/11] bump to v27.0.0-alpha.3 --- Cargo.lock | 292 ++++++++++++------ SOEMAUTDServer/Cargo.toml | 10 +- SOEMAUTDServer/ThirdPartyNotice.txt | 16 +- TwinCATAUTDServerLightweight/Cargo.toml | 8 +- .../ThirdPartyNotice.txt | 14 +- package-lock.json | 4 +- package.json | 2 +- simulator/Cargo.toml | 14 +- simulator/ThirdPartyNotice.txt | 16 +- src-tauri/Cargo.toml | 6 +- src-tauri/ThirdPartyNotice.txt | 16 +- src-tauri/tauri.conf.json | 2 +- tools/license-checker/Cargo.toml | 2 +- 13 files changed, 247 insertions(+), 155 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 90e4f07..bc17683 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "SOEMAUTDServer" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" dependencies = [ "anyhow", "autd3-driver", @@ -22,7 +22,7 @@ dependencies = [ [[package]] name = "TwinCATAUTDServerLightweight" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" dependencies = [ "anyhow", "autd3-link-twincat", @@ -261,12 +261,6 @@ dependencies = [ "libloading 0.7.4", ] -[[package]] -name = "assert_approx_eq" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd" - [[package]] name = "async-broadcast" version = "0.7.1" @@ -474,9 +468,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autd3" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f08255796466ca10d1b5e9532a7b3b795497a3e1858fdc1eb894ae220e8df79b" +checksum = "71f90f42cd243a00b93afee5d23eabadfe13dd86126aa39c980410127fcc37b5" dependencies = [ "autd3-driver", "autd3-firmware-emulator", @@ -486,14 +480,14 @@ dependencies = [ "num", "thiserror", "tokio", - "windows 0.57.0", + "windows 0.58.0", ] [[package]] name = "autd3-derive" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41486912b34fc4da112a96ca22d5f9a00729461bf2ab338db6b90201bcdd286e" +checksum = "e8f2d9d0361679074c0a216b6d7627b4cf24f5bab35e66b344d092e6defe58ae" dependencies = [ "proc-macro2", "quote", @@ -503,9 +497,9 @@ dependencies = [ [[package]] name = "autd3-driver" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12a4fc3690327b0b4320e2b684f8e9b8e11b513695495bc9dda2458a0d23edc7" +checksum = "9f6aef3c06ef05abf7253e274a81adf540fa66e6fc89278d7ca742df526b7388" dependencies = [ "async-trait", "autd3-derive", @@ -513,8 +507,8 @@ dependencies = [ "bitfield-struct", "bitflags 2.6.0", "derive_more", - "itertools 0.12.1", - "nalgebra", + "itertools 0.13.0", + "nalgebra 0.33.0", "num-complex", "rayon", "serde", @@ -523,14 +517,14 @@ dependencies = [ "tokio", "tracing", "tynm", - "windows 0.57.0", + "windows 0.58.0", ] [[package]] name = "autd3-firmware-emulator" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ed38fd052a60e9b3279f297fe6fe76aa13c4b1129fa81387a7cb8af26351bd8" +checksum = "54fc529b489b2997e6a5026fd09946b2202b30c87774b873fa2c126f3759c55a" dependencies = [ "autd3-driver", "num-integer", @@ -540,15 +534,14 @@ dependencies = [ [[package]] name = "autd3-gain-holo" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd2ed0a8ba8b36ed8df4d2e66b5354cca910dd100b29c817c5099e9aad15af20" +checksum = "d3bd040e87da91a5e4f773ba05088ad95a680962b5194f27783fc6646e6da7d8" dependencies = [ - "assert_approx_eq", "autd3-driver", "bit-vec", "derive_more", - "nalgebra", + "nalgebra 0.33.0", "rand 0.8.5", "rayon", "thiserror", @@ -556,9 +549,9 @@ dependencies = [ [[package]] name = "autd3-link-simulator" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ac2a924f829fd05612eea1f62b6e5ff8d0cf8555704e7116db2fbf777c9551" +checksum = "d367e7b9a64c41a0b119b767eb68252083129103fb6bea7ca82e82a86b0168fe" dependencies = [ "autd3-driver", "autd3-protobuf", @@ -568,9 +561,9 @@ dependencies = [ [[package]] name = "autd3-link-soem" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48e119c43d98beac9d381ee432fd0b6361f60a45fc19c7e703218f42f0cc32d" +checksum = "298a0bf0585d625397b3013cd2fbeb0934591f4fac50460eed336270f4cf9f07" dependencies = [ "async-channel", "autd3-driver", @@ -586,14 +579,14 @@ dependencies = [ "time", "tokio", "tracing", - "windows 0.57.0", + "windows 0.58.0", ] [[package]] name = "autd3-link-twincat" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054a0585a585bdaf9546b512ef5c856396dc30709f35360dc9ee32dc518e5191" +checksum = "4a75beeb38f10255ab6eab85631f00d89e52f26fbc45c69c6453fffe88754c4c" dependencies = [ "autd3-driver", "libloading 0.8.5", @@ -602,9 +595,9 @@ dependencies = [ [[package]] name = "autd3-protobuf" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "742c75bee578faa076f110f28c47e03b0e01d6569a6e559dcb9c1d616fb34a7e" +checksum = "4d77be3d3d1669b724f6c068842b99660fc8f184c0f65792e512b514f8f8ce46" dependencies = [ "autd3", "autd3-driver", @@ -618,7 +611,7 @@ dependencies = [ [[package]] name = "autd3-server" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" dependencies = [ "autd3-driver", "autd3-link-soem", @@ -661,18 +654,17 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.20" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http", + "http 1.1.0", "http-body", - "hyper", + "http-body-util", "itoa 1.0.11", "matchit", "memchr", @@ -681,7 +673,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper", + "sync_wrapper 1.0.1", "tower", "tower-layer", "tower-service", @@ -689,17 +681,20 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", "futures-util", - "http", + "http 1.1.0", "http-body", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", ] @@ -751,9 +746,9 @@ checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" [[package]] name = "bitfield-struct" -version = "0.6.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc0846593a56638b74e136a45610f9934c052e14761bebca6b092d5522599e3" +checksum = "de05f8756f1c68937349406d4632ae96ae35901019b5e59c508d9c38c64715fb" dependencies = [ "proc-macro2", "quote", @@ -2247,16 +2242,16 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.26" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", - "http", + "http 1.1.0", "indexmap 2.2.6", "slab", "tokio", @@ -2373,14 +2368,37 @@ dependencies = [ "itoa 1.0.11", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.11", +] + [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body", "pin-project-lite", ] @@ -2404,38 +2422,56 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.30" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "h2", - "http", + "http 1.1.0", "http-body", "httparse", "httpdate", "itoa 1.0.11", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body", "hyper", "pin-project-lite", + "socket2", "tokio", - "tokio-io-timeout", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2663,6 +2699,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.8" @@ -3083,7 +3128,22 @@ dependencies = [ "num-complex", "num-rational", "num-traits", - "simba", + "simba 0.8.1", + "typenum", +] + +[[package]] +name = "nalgebra" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c4b5f057b303842cf3262c27e465f4c303572e7f6b0648f60e16248ac3397f4" +dependencies = [ + "approx 0.5.1", + "matrixmultiply", + "num-complex", + "num-rational", + "num-traits", + "simba 0.9.0", "typenum", ] @@ -3960,9 +4020,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes", "prost-derive", @@ -3970,12 +4030,12 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.13.0", "proc-macro2", "quote", "syn 2.0.72", @@ -4405,7 +4465,7 @@ dependencies = [ "geo", "lazy_static", "maplit", - "nalgebra", + "nalgebra 0.32.6", "num", "regex", "serde", @@ -4670,6 +4730,19 @@ dependencies = [ "wide", ] +[[package]] +name = "simba" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa" +dependencies = [ + "approx 0.5.1", + "num-complex", + "num-traits", + "paste", + "wide", +] + [[package]] name = "simd-adler32" version = "0.3.7" @@ -4687,7 +4760,7 @@ dependencies = [ [[package]] name = "simulator" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" dependencies = [ "anyhow", "autd3", @@ -4927,6 +5000,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "sys-locale" version = "0.2.4" @@ -5066,7 +5145,7 @@ dependencies = [ "glob", "gtk", "heck 0.5.0", - "http", + "http 0.2.12", "ignore", "nix 0.26.4", "notify-rust", @@ -5168,7 +5247,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3068ed62b63dedc705558f4248c7ecbd5561f0f8050949859ea0db2326f26012" dependencies = [ "gtk", - "http", + "http 0.2.12", "http-range", "rand 0.8.5", "raw-window-handle", @@ -5425,16 +5504,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.4.0" @@ -5551,23 +5620,26 @@ dependencies = [ [[package]] name = "tonic" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.7", + "base64 0.22.1", "bytes", "h2", - "http", + "http 1.1.0", "http-body", + "http-body-util", "hyper", "hyper-timeout", + "hyper-util", "percent-encoding", "pin-project", "prost", + "socket2", "tokio", "tokio-stream", "tower", @@ -6269,11 +6341,11 @@ dependencies = [ [[package]] name = "windows" -version = "0.57.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" dependencies = [ - "windows-core 0.57.0", + "windows-core 0.58.0", "windows-targets 0.52.6", ] @@ -6304,19 +6376,20 @@ checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" dependencies = [ "windows-implement 0.56.0", "windows-interface 0.56.0", - "windows-result", + "windows-result 0.1.2", "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.57.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" dependencies = [ - "windows-implement 0.57.0", - "windows-interface 0.57.0", - "windows-result", + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", + "windows-strings", "windows-targets 0.52.6", ] @@ -6343,9 +6416,9 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.57.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", @@ -6365,9 +6438,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.57.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", @@ -6389,6 +6462,25 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -6749,7 +6841,7 @@ dependencies = [ "glib", "gtk", "html5ever", - "http", + "http 0.2.12", "kuchikiki", "libc", "log", diff --git a/SOEMAUTDServer/Cargo.toml b/SOEMAUTDServer/Cargo.toml index c0a789d..1e0968b 100644 --- a/SOEMAUTDServer/Cargo.toml +++ b/SOEMAUTDServer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "SOEMAUTDServer" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" authors = ["shun suzuki "] edition = "2021" license = "MIT" @@ -13,12 +13,12 @@ keywords = ["autd"] [dependencies] clap = { version = "4.3.0", features = ["derive"] } tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread"] } -autd3-protobuf = { version = "27.0.0-alpha.1", features = ["lightweight", "async-trait"] } -autd3-link-soem = { version = "27.0.0-alpha.1", features = ["async-trait"] } -autd3-driver = { version = "27.0.0-alpha.1", features = ["async-trait"] } +autd3-protobuf = { version = "27.0.0-alpha.3", features = ["lightweight", "async-trait"] } +autd3-link-soem = { version = "27.0.0-alpha.3", features = ["async-trait"] } +autd3-driver = { version = "27.0.0-alpha.3", features = ["async-trait"] } anyhow = "1.0.72" ctrlc = "3.3.0" -tonic = "0.11.0" +tonic = "0.12.1" tracing = "0.1.37" tracing-subscriber = "0.3.17" chrono = "0.4.31" diff --git a/SOEMAUTDServer/ThirdPartyNotice.txt b/SOEMAUTDServer/ThirdPartyNotice.txt index a5e2c42..43bcd7e 100644 --- a/SOEMAUTDServer/ThirdPartyNotice.txt +++ b/SOEMAUTDServer/ThirdPartyNotice.txt @@ -6,7 +6,7 @@ The license terms for each of these components are provided later in this notice --------------------------------------------------------- -SOEMAUTDServer 27.0.0-alpha.1 (MIT) +SOEMAUTDServer 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-server --------------------------------------------------------- @@ -74,27 +74,27 @@ async-trait 0.1.80 (Apache-2.0 OR MIT) https://github.com/dtolnay/async-trait --------------------------------------------------------- -autd3 27.0.0-alpha.1 (MIT) +autd3 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-derive 27.0.0-alpha.1 (MIT) +autd3-derive 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-driver 27.0.0-alpha.1 (MIT) +autd3-driver 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-firmware-emulator 27.0.0-alpha.1 (MIT) +autd3-firmware-emulator 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-gain-holo 27.0.0-alpha.1 (MIT) +autd3-gain-holo 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-link-soem 27.0.0-alpha.1 +autd3-link-soem 27.0.0-alpha.3 https://github.com/shinolab/autd3-rs --- @@ -160,7 +160,7 @@ SOEM write to Beckhoff Automation GmbH, Eiserstrasse 5, D-33415 Verl, Germany --------------------------------------------------------- -autd3-protobuf 27.0.0-alpha.1 (MIT) +autd3-protobuf 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- diff --git a/TwinCATAUTDServerLightweight/Cargo.toml b/TwinCATAUTDServerLightweight/Cargo.toml index 1aaeb2f..38cabdd 100644 --- a/TwinCATAUTDServerLightweight/Cargo.toml +++ b/TwinCATAUTDServerLightweight/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "TwinCATAUTDServerLightweight" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" authors = ["shun suzuki "] edition = "2021" license = "MIT" @@ -13,11 +13,11 @@ keywords = ["autd"] [dependencies] clap = { version = "4.3.0", features = ["derive"] } tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread"] } -autd3-protobuf = { version = "27.0.0-alpha.1", features = ["lightweight", "async-trait"] } -autd3-link-twincat = { version = "27.0.0-alpha.1", features = ["async-trait"] } +autd3-protobuf = { version = "27.0.0-alpha.3", features = ["lightweight", "async-trait"] } +autd3-link-twincat = { version = "27.0.0-alpha.3", features = ["async-trait"] } anyhow = "1.0.72" ctrlc = "3.3.0" -tonic = "0.11.0" +tonic = "0.12.1" tracing = "0.1.37" tracing-subscriber = "0.3.17" chrono = "0.4.31" diff --git a/TwinCATAUTDServerLightweight/ThirdPartyNotice.txt b/TwinCATAUTDServerLightweight/ThirdPartyNotice.txt index b8e9cce..b8ff8fb 100644 --- a/TwinCATAUTDServerLightweight/ThirdPartyNotice.txt +++ b/TwinCATAUTDServerLightweight/ThirdPartyNotice.txt @@ -70,27 +70,27 @@ async-trait 0.1.80 (Apache-2.0 OR MIT) https://github.com/dtolnay/async-trait --------------------------------------------------------- -autd3 27.0.0-alpha.1 (MIT) +autd3 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-derive 27.0.0-alpha.1 (MIT) +autd3-derive 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-driver 27.0.0-alpha.1 (MIT) +autd3-driver 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-firmware-emulator 27.0.0-alpha.1 (MIT) +autd3-firmware-emulator 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-gain-holo 27.0.0-alpha.1 (MIT) +autd3-gain-holo 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-link-twincat 27.0.0-alpha.1 +autd3-link-twincat 27.0.0-alpha.3 https://github.com/shinolab/autd3-rs --- @@ -142,7 +142,7 @@ SOFTWARE. --------------------------------------------------------- -autd3-protobuf 27.0.0-alpha.1 (MIT) +autd3-protobuf 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- diff --git a/package-lock.json b/package-lock.json index f486245..656cc2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "autd3-server", - "version": "27.0.0-alpha.1", + "version": "27.0.0-alpha.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "autd3-server", - "version": "27.0.0-alpha.1", + "version": "27.0.0-alpha.3", "dependencies": { "@tauri-apps/api": "^1.4.0", "svelte-simple-modal": "^1.6.1", diff --git a/package.json b/package.json index 849383a..3ebd726 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "autd3-server", "type": "module", - "version": "27.0.0-alpha.1", + "version": "27.0.0-alpha.3", "scripts": { "dev": "vite", "build": "vite build", diff --git a/simulator/Cargo.toml b/simulator/Cargo.toml index 712cca3..d83f5a6 100644 --- a/simulator/Cargo.toml +++ b/simulator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "simulator" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" edition = "2021" authors = ["shun suzuki "] @@ -10,11 +10,11 @@ repository = "https://github.com/shinolab/autd3-server" keywords = ["autd"] [dependencies] -autd3 = { version = "27.0.0-alpha.1", features = ["async-trait"] } -autd3-driver = { version = "27.0.0-alpha.1", features = ["async-trait"] } -autd3-firmware-emulator = { version = "27.0.0-alpha.1", features = ["async-trait"] } -autd3-protobuf = { version = "27.0.0-alpha.1", features = ["lightweight"] } -autd3-link-simulator = { version = "27.0.0-alpha.1", features = ["async-trait"] } +autd3 = { version = "27.0.0-alpha.3", features = ["async-trait"] } +autd3-driver = { version = "27.0.0-alpha.3", features = ["async-trait"] } +autd3-firmware-emulator = { version = "27.0.0-alpha.3", features = ["async-trait"] } +autd3-protobuf = { version = "27.0.0-alpha.3", features = ["lightweight"] } +autd3-link-simulator = { version = "27.0.0-alpha.3", features = ["async-trait"] } bitflags = "2.3.1" bytemuck = { version = "1.13.1", features = ["derive", "extern_crate_std", "min_const_generics"] } camera_controllers = "0.34.0" @@ -32,7 +32,7 @@ crossbeam-channel = "0.5.8" image = "0.25.0" tokio = { version = "1.34.0", features = ["rt-multi-thread"] } futures-util = "0.3.28" -tonic = "0.11.0" +tonic = "0.12.1" anyhow = "1.0.83" chrono = "0.4.38" gltf = "1.4.1" diff --git a/simulator/ThirdPartyNotice.txt b/simulator/ThirdPartyNotice.txt index 5e15781..4b1b6d7 100644 --- a/simulator/ThirdPartyNotice.txt +++ b/simulator/ThirdPartyNotice.txt @@ -118,31 +118,31 @@ atomic-polyfill 1.0.3 (Apache-2.0 OR MIT) https://github.com/embassy-rs/atomic-polyfill --------------------------------------------------------- -autd3 27.0.0-alpha.1 (MIT) +autd3 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-derive 27.0.0-alpha.1 (MIT) +autd3-derive 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-driver 27.0.0-alpha.1 (MIT) +autd3-driver 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-firmware-emulator 27.0.0-alpha.1 (MIT) +autd3-firmware-emulator 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-gain-holo 27.0.0-alpha.1 (MIT) +autd3-gain-holo 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-link-simulator 27.0.0-alpha.1 (MIT) +autd3-link-simulator 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-protobuf 27.0.0-alpha.1 (MIT) +autd3-protobuf 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- @@ -1184,7 +1184,7 @@ simd_helpers 0.1.0 (MIT) https://github.com/lu-zero/simd_helpers --------------------------------------------------------- -simulator 27.0.0-alpha.1 (MIT) +simulator 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-server --------------------------------------------------------- diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index cad22a7..4a85a35 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "autd3-server" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" description = "AUTD3 Server app" authors = ["shun suzuki "] edition = "2021" @@ -22,8 +22,8 @@ serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } tauri = { version = "1.6.1", features = ["window-all", "shell-sidecar", "dialog-all", "notification-all", "os-all", "path-all"] } tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread", "time", "process"] } -autd3-driver = { version = "27.0.0-alpha.1", features = ["serde"] } -autd3-link-soem = { version = "27.0.0-alpha.1", features = ["serde"] } +autd3-driver = { version = "27.0.0-alpha.3", features = ["serde"] } +autd3-link-soem = { version = "27.0.0-alpha.3", features = ["serde"] } [target.'cfg(windows)'.dependencies] libloading = "0.8.0" diff --git a/src-tauri/ThirdPartyNotice.txt b/src-tauri/ThirdPartyNotice.txt index ef1567d..ff717d8 100644 --- a/src-tauri/ThirdPartyNotice.txt +++ b/src-tauri/ThirdPartyNotice.txt @@ -106,27 +106,27 @@ atomic-waker 1.1.2 (Apache-2.0 OR MIT) https://github.com/smol-rs/atomic-waker --------------------------------------------------------- -autd3 27.0.0-alpha.1 (MIT) +autd3 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-derive 27.0.0-alpha.1 (MIT) +autd3-derive 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-driver 27.0.0-alpha.1 (MIT) +autd3-driver 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-firmware-emulator 27.0.0-alpha.1 (MIT) +autd3-firmware-emulator 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-gain-holo 27.0.0-alpha.1 (MIT) +autd3-gain-holo 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-link-soem 27.0.0-alpha.1 +autd3-link-soem 27.0.0-alpha.3 https://github.com/shinolab/autd3-rs --- @@ -192,11 +192,11 @@ SOEM write to Beckhoff Automation GmbH, Eiserstrasse 5, D-33415 Verl, Germany --------------------------------------------------------- -autd3-protobuf 27.0.0-alpha.1 (MIT) +autd3-protobuf 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-server 27.0.0-alpha.1 (MIT) +autd3-server 27.0.0-alpha.3 (MIT) https://github.com/shinolab/autd3-server --------------------------------------------------------- diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index c83fdd7..785fd30 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -139,7 +139,7 @@ "fullscreen": false, "height": 600, "resizable": true, - "title": "AUTD3 Server v27.0.0-alpha.1", + "title": "AUTD3 Server v27.0.0-alpha.3", "width": 800 } ] diff --git a/tools/license-checker/Cargo.toml b/tools/license-checker/Cargo.toml index b141cdf..ccc899f 100644 --- a/tools/license-checker/Cargo.toml +++ b/tools/license-checker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "license-checker" -version = "27.0.0-alpha.1" +version = "27.0.0-alpha.3" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From b32e1910cdc781cbf0ff67513bc88810f93ed742 Mon Sep 17 00:00:00 2001 From: shun suzuki Date: Fri, 26 Jul 2024 14:41:55 +0900 Subject: [PATCH 08/11] update actions --- .github/actions/setup-build/action.yml | 6 +- .github/dependabot.yml | 2 - .github/workflows/build.yml | 92 +++--- .github/workflows/release.yml | 46 +-- Cargo.lock | 426 ++++++++++++------------- build.py | 16 + 6 files changed, 291 insertions(+), 297 deletions(-) diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml index dd18dd4..1f645fe 100644 --- a/.github/actions/setup-build/action.yml +++ b/.github/actions/setup-build/action.yml @@ -35,7 +35,7 @@ runs: shell: bash if: inputs.os == 'macos-latest' run: | - brew install git cmake ninja python@3.8 + brew install ninja - name: install dependencies shell: bash @@ -43,3 +43,7 @@ runs: run: | sudo apt-get update sudo apt-get install -y pkg-config libfreetype6-dev libfontconfig1-dev + sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev librsvg2-dev + + - name: setup cache + uses: swatinem/rust-cache@v2 diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d9c663d..7658aa8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,10 +4,8 @@ updates: directory: "/" schedule: interval: "weekly" - target-branch: "develop" - package-ecosystem: "npm" directory: "/" schedule: interval: "weekly" - target-branch: "develop" \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4dfaa76..8166c87 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,65 +1,81 @@ name: build on: - push: - branches: - - 'develop' pull_request: - types: [opened, reopened, review_requested] + branches: [ "main" ] + merge_group: + types: [ checks_requested ] jobs: - check-src: + + changed-files: + name: changed-files runs-on: ubuntu-latest - name: check if server files changed outputs: - status: ${{ steps.changed-files.outputs.modified_files }} + src: ${{ steps.changed-files-yaml.outputs.src_any_changed }} + lightweight: ${{ steps.changed-files-yaml.outputs.lightweight_any_changed }} + miri: ${{ steps.changed-files-yaml.outputs.miri_any_changed }} steps: - uses: actions/checkout@v4 - - uses: tj-actions/changed-files@v42 - id: changed-files + - id: changed-files-yaml + uses: tj-actions/changed-files@v44 with: - files: | - .github/actions/setup-build/action.yml - .github/workflows/build.yml - ./**/*.rs - ./**/*.toml - ./**/*.ts - ./**/*.svelte - ./package.json + files_yaml: | + src: + - '**/*.rs' + - '**/Cargo.toml' + - '**/*.ts' + - '**/*.svelte' + - 'package.json' - build-server: - needs: check-src - name: build-server + test: + needs: changed-files + name: test-on-${{ matrix.os }} strategy: fail-fast: false matrix: os: [macos-latest, ubuntu-latest, windows-latest] - - runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - - name: Setup - if: needs.check-src.outputs.status - uses: ./.github/actions/setup-build + if: ${{ needs.changed-files.outputs.src == 'true' }} + - uses: ./.github/actions/setup-build with: os: ${{ matrix.os }} - - - name: install dependencies (ubuntu only) - if: needs.check-src.outputs.status && matrix.os == 'ubuntu-latest' - run: | - sudo apt-get update - sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev librsvg2-dev - - - name: Sync node version and setup cache - if: needs.check-src.outputs.status - uses: actions/setup-node@v4 + if: ${{ needs.changed-files.outputs.src == 'true' }} + - uses: actions/setup-node@v4 with: node-version: 'lts/*' cache: 'npm' cache-dependency-path: package-lock.json - + if: ${{ needs.changed-files.outputs.src == 'true' }} - name: build server - if: needs.check-src.outputs.status run: | python3 build.py build + if: ${{ needs.changed-files.outputs.src == 'true' }} + + lint: + needs: changed-files + if: ${{ needs.changed-files.outputs.src == 'true' }} + name: lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ./.github/actions/setup-build + with: + os: ubuntu-latest + - run: python3 build.py lint + + auto-merge: + needs: + - test + - lint + permissions: + pull-requests: write + contents: write + runs-on: ubuntu-latest + if: ${{ always() && !cancelled() && !failure() && github.actor == 'dependabot[bot]' }} + steps: + - run: gh pr merge --auto "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 898d199..226d34d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,17 +11,13 @@ jobs: name: check-license steps: - uses: actions/checkout@v4 - - name: Sync node version and setup cache - uses: actions/setup-node@v4 + - uses: actions/setup-node@v4 with: node-version: 'lts/*' cache: 'npm' cache-dependency-path: package-lock.json - - name: install frontend dependencies - run: | - npm install - - name: Check license - run: | + - run: npm install + - run: | git submodule update --init tools/autd3-license-check cd tools/license-checker cargo run @@ -31,29 +27,24 @@ jobs: name: create-github-release runs-on: ubuntu-latest steps: - - name: Create Release - id: create_release + - id: create_release uses: ncipollo/release-action@v1 with: token: ${{ secrets.GITHUB_TOKEN }} draft: false prerelease: false - - name: Output Release URL File - run: | + - run: | echo "${{ steps.create_release.outputs.upload_url }}" > release_url.txt echo "${{ steps.create_release.outputs.id }}" > release_id.txt - - name: Save Release URL File for publish - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v1 with: name: release_url path: release_url.txt - - name: Save Release URL File for publish - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v1 with: name: release_id path: release_id.txt - publish-server: name: publish-server-${{ matrix.os }} needs: [release] @@ -63,37 +54,26 @@ jobs: fail-fast: false matrix: os: [macos-latest, ubuntu-latest, windows-latest] - runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - - name: Setup - uses: ./.github/actions/setup-build + - uses: ./.github/actions/setup-build with: os: ${{ matrix.os }} - - - name: install dependencies (ubuntu only) - if: matrix.os == 'ubuntu-latest' + - if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev librsvg2-dev - - - name: Sync node version and setup cache - uses: actions/setup-node@v4 + - uses: actions/setup-node@v4 with: node-version: 'lts/*' cache: 'npm' cache-dependency-path: package-lock.json - - name: build - run: | - python3 build.py build --external-only - - name: Load Release ID File from release job - uses: actions/download-artifact@v1 + - run: python3 build.py build --external-only + - uses: actions/download-artifact@v1 with: name: release_id - - name: Get Release File Name & Upload URL - id: get_release_info + - id: get_release_info uses: juliangruber/read-file-action@v1 with: path: ./release_id/release_id.txt diff --git a/Cargo.lock b/Cargo.lock index bc17683..82fa7ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -39,9 +39,9 @@ dependencies = [ [[package]] name = "ab_glyph" -version = "0.2.28" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" +checksum = "1c3a1cbc201cc13ed06cf875efb781f2249b3677f5c74571b67d817877f9d697" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -237,14 +237,14 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] name = "arrayref" -version = "0.3.8" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -287,9 +287,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.13.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ "async-task", "concurrent-queue", @@ -367,14 +367,14 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] name = "async-signal" -version = "0.2.9" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" dependencies = [ "async-io", "async-lock", @@ -407,7 +407,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -418,13 +418,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -492,7 +492,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -589,7 +589,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a75beeb38f10255ab6eab85631f00d89e52f26fbc45c69c6453fffe88754c4c" dependencies = [ "autd3-driver", - "libloading 0.8.5", + "libloading 0.8.4", "thiserror", ] @@ -615,7 +615,7 @@ version = "27.0.0-alpha.3" dependencies = [ "autd3-driver", "autd3-link-soem", - "libloading 0.8.5", + "libloading 0.8.4", "serde", "serde_json", "tauri", @@ -752,7 +752,7 @@ checksum = "de05f8756f1c68937349406d4632ae96ae35901019b5e59c508d9c38c64715fb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -769,9 +769,9 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitstream-io" -version = "2.5.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" +checksum = "415f8399438eb5e4b2f73ed3152a3448b98149dda642a957ee704e1daa5cf1d8" [[package]] name = "block" @@ -853,9 +853,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.4" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" +checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" [[package]] name = "bumpalo" @@ -880,7 +880,7 @@ checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -897,9 +897,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.6.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cairo-rs" @@ -964,12 +964,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.6" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" +checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -1020,12 +1021,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - [[package]] name = "cgmath" version = "0.18.0" @@ -1059,9 +1054,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.10" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6b81fb3c84f5563d509c59b5a48d935f689e993afa90fe39047f05adef9142" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ "clap_builder", "clap_derive", @@ -1069,9 +1064,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.10" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca6706fd5224857d9ac5eb9355f6683563cc0541c7cd9d014043b57cbec78ac" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstream", "anstyle", @@ -1088,7 +1083,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -1320,7 +1315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -1351,7 +1346,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -1366,9 +1361,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.10" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -1376,27 +1371,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.10" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] name = "darling_macro" -version = "0.20.10" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -1430,7 +1425,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -1497,7 +1492,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.5", + "libloading 0.8.4", ] [[package]] @@ -1545,14 +1540,14 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embed-resource" -version = "2.4.3" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602" +checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" dependencies = [ "cc", "memchr", "rustc_version", - "toml 0.8.15", + "toml 0.8.14", "vswhom", "winreg", ] @@ -1596,7 +1591,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -1816,7 +1811,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -2144,7 +2139,7 @@ dependencies = [ "base64 0.13.1", "byteorder", "gltf-json", - "image 0.25.2", + "image 0.25.1", "lazy_static", "serde_json", "urlencoding", @@ -2159,7 +2154,7 @@ dependencies = [ "inflections", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -2553,12 +2548,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", - "byteorder-lite", + "byteorder", "color_quant", "exr", "gif", @@ -2576,12 +2571,12 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.3" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" dependencies = [ "byteorder-lite", - "quick-error", + "thiserror", ] [[package]] @@ -2672,7 +2667,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -2765,9 +2760,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.32" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2852,12 +2847,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -2887,6 +2882,12 @@ dependencies = [ "libc", ] +[[package]] +name = "line-wrap" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" + [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -3104,18 +3105,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "mio" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", -] - [[package]] name = "nalgebra" version = "0.32.6" @@ -3155,7 +3144,7 @@ checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -3260,19 +3249,7 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.6.0", "cfg-if", - "cfg_aliases 0.1.1", - "libc", -] - -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases 0.2.1", + "cfg_aliases", "libc", "memoffset 0.9.1", ] @@ -3369,7 +3346,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -3413,6 +3390,16 @@ dependencies = [ "libm", ] +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + [[package]] name = "num_enum" version = "0.5.11" @@ -3452,7 +3439,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -3522,9 +3509,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -3589,9 +3576,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.24.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" +checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" dependencies = [ "ttf-parser", ] @@ -3645,7 +3632,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.2", "smallvec", "windows-targets 0.52.6", ] @@ -3766,7 +3753,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -3813,7 +3800,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -3884,13 +3871,14 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.7.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" +checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" dependencies = [ - "base64 0.22.1", + "base64 0.21.7", "indexmap 2.2.6", - "quick-xml 0.32.0", + "line-wrap", + "quick-xml", "serde", "time", ] @@ -4015,7 +4003,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -4035,10 +4023,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -4074,15 +4062,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "quick-xml" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" -dependencies = [ - "memchr", -] - [[package]] name = "quote" version = "1.0.36" @@ -4210,9 +4189,9 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.8" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12" +checksum = "67376f469e7e7840d0040bbf4b9b3334005bb167f814621326e4c7ab8cd6e944" dependencies = [ "avif-serialize", "imgref", @@ -4275,9 +4254,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ "bitflags 2.6.0", ] @@ -4363,9 +4342,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.45" +version = "0.8.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" +checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741" dependencies = [ "bytemuck", ] @@ -4534,29 +4513,29 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "indexmap 2.2.6", "itoa 1.0.11", @@ -4572,7 +4551,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -4586,9 +4565,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.9.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ "base64 0.22.1", "chrono", @@ -4604,14 +4583,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.9.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -4778,7 +4757,7 @@ dependencies = [ "directories", "futures-util", "gltf", - "image 0.25.2", + "image 0.25.1", "imgui", "png", "scarlet", @@ -4969,7 +4948,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -4985,9 +4964,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -5041,7 +5020,7 @@ dependencies = [ "cfg-expr 0.15.8", "heck 0.5.0", "pkg-config", - "toml 0.8.15", + "toml 0.8.14", "version-compare 0.2.0", ] @@ -5122,15 +5101,15 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.15" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tauri" -version = "1.7.1" +version = "1.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336bc661a3f3250853fa83c6e5245449ed1c26dce5dcb28bdee7efedf6278806" +checksum = "77567d2b3b74de4588d544147142d02297f3eaa171a25a065252141d8597a516" dependencies = [ "anyhow", "cocoa", @@ -5183,9 +5162,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "1.5.3" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c6ec7a5c3296330c7818478948b422967ce4649094696c985f61d50076d29c" +checksum = "ab30cba12974d0f9b09794f61e72cad6da2142d3ceb81e519321bab86ce53312" dependencies = [ "anyhow", "cargo_toml", @@ -5202,9 +5181,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.4.4" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1aed706708ff1200ec12de9cfbf2582b5d8ec05f6a7293911091effbd22036b" +checksum = "c3a1d90db526a8cdfd54444ad3f34d8d4d58fa5c536463915942393743bd06f8" dependencies = [ "base64 0.21.7", "brotli", @@ -5228,9 +5207,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "1.4.5" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88f831d2973ae4f81a706a0004e67dac87f2e4439973bbe98efbd73825d8ede" +checksum = "6a582d75414250122e4a597b9dd7d3c910a2c77906648fc2ac9353845ff0feec" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -5242,9 +5221,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.14.4" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3068ed62b63dedc705558f4248c7ecbd5561f0f8050949859ea0db2326f26012" +checksum = "cd7ffddf36d450791018e63a3ddf54979b9581d9644c584a5fb5611e6b5f20b4" dependencies = [ "gtk", "http 0.2.12", @@ -5263,9 +5242,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.14.9" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c3db170233096aa30330feadcd895bf9317be97e624458560a20e814db7955" +checksum = "1989b3b4d611f5428b3414a4abae6fa6df30c7eb8ed33250ca90a5f7e5bb3655" dependencies = [ "cocoa", "gtk", @@ -5283,9 +5262,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.6.0" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2826db448309d382dac14d520f0c0a40839b87b57b977e59cf5f296b3ace6a93" +checksum = "450b17a7102e5d46d4bdabae0d1590fd27953e704e691fc081f06c06d2253b35" dependencies = [ "brotli", "ctor", @@ -5327,7 +5306,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" dependencies = [ - "quick-xml 0.31.0", + "quick-xml", "windows 0.56.0", "windows-version", ] @@ -5363,22 +5342,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -5474,9 +5453,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ "tinyvec_macros", ] @@ -5489,30 +5468,31 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.1" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.1", + "mio", + "num_cpus", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -5562,14 +5542,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.15" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.16", + "toml_edit 0.22.14", ] [[package]] @@ -5607,15 +5587,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.16" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.15", + "winnow 0.6.13", ] [[package]] @@ -5699,7 +5679,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -5749,9 +5729,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ttf-parser" -version = "0.24.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8686b91785aff82828ed725225925b33b4fde44c4bb15876e5f7c832724c420a" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" [[package]] name = "tynm" @@ -5838,9 +5818,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom 0.2.15", ] @@ -5938,7 +5918,7 @@ dependencies = [ "half", "heck 0.4.1", "indexmap 2.2.6", - "libloading 0.8.5", + "libloading 0.8.4", "objc", "once_cell", "parking_lot", @@ -5977,7 +5957,7 @@ dependencies = [ "proc-macro2", "quote", "shaderc", - "syn 2.0.72", + "syn 2.0.68", "vulkano", ] @@ -6033,7 +6013,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", "wasm-bindgen-shared", ] @@ -6067,7 +6047,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6254,9 +6234,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wide" -version = "0.7.26" +version = "0.7.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901e8597c777fa042e9e245bd56c0dc4418c5db3f845b6ff94fbac732c6a0692" +checksum = "8a040b111774ab63a19ef46bbc149398ab372b4ccdcfd719e9814dbd7dfd76c8" dependencies = [ "bytemuck", "safe_arch", @@ -6411,7 +6391,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -6422,7 +6402,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -6433,7 +6413,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -6444,7 +6424,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -6769,14 +6749,14 @@ checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" dependencies = [ "android-activity", "bitflags 1.3.2", - "cfg_aliases 0.1.1", + "cfg_aliases", "core-foundation", "core-graphics", "dispatch", "instant", "libc", "log", - "mio 0.8.11", + "mio", "ndk 0.7.0", "objc2", "once_cell", @@ -6807,9 +6787,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.15" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "557404e450152cd6795bb558bca69e43c585055f4606e3bcae5894fc6dac9ba0" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -6896,9 +6876,9 @@ dependencies = [ [[package]] name = "xcursor" -version = "0.3.6" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d491ee231a51ae64a5b762114c3ac2104b967aadba1de45c86ca42cf051513b7" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" [[package]] name = "xdg-home" @@ -6924,9 +6904,9 @@ checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "zbus" -version = "4.4.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" +checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" dependencies = [ "async-broadcast", "async-executor", @@ -6944,7 +6924,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.29.0", + "nix 0.28.0", "ordered-stream", "rand 0.8.5", "serde", @@ -6962,14 +6942,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.4.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" +checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", "zvariant_utils", ] @@ -6986,22 +6966,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] [[package]] @@ -7021,18 +7001,18 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.4.13" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" dependencies = [ "zune-core", ] [[package]] name = "zvariant" -version = "4.2.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" dependencies = [ "endi", "enumflags2", @@ -7043,24 +7023,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.2.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "2.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.68", ] diff --git a/build.py b/build.py index 12478de..74b7390 100644 --- a/build.py +++ b/build.py @@ -170,6 +170,18 @@ def server_build(args): subprocess.run(["npm", "run", "tauri", "build"], shell=shell).check_returncode() +def server_lint(args): + with working_dir("."): + command = ["cargo", "clippy"] + command[1] = "clippy" + command.append("--tests") + command.append("--workspace") + command.append("--") + command.append("-D") + command.append("warnings") + subprocess.run(command).check_returncode() + + def server_clear(args): config = Config(args) @@ -316,6 +328,10 @@ def command_help(args): ) parser_server_build.set_defaults(handler=server_build) + # lint + parser_server_lint = subparsers.add_parser("lint", help="see `lint -h`") + parser_server_lint.set_defaults(handler=server_lint) + # server clear parser_server_clear = subparsers.add_parser("clear", help="see `clear -h`") parser_server_clear.set_defaults(handler=server_clear) From 8c34353bc7b2b16ddaf2eb2a795819bb11694008 Mon Sep 17 00:00:00 2001 From: shun suzuki Date: Fri, 26 Jul 2024 14:51:14 +0900 Subject: [PATCH 09/11] lint codes --- .github/workflows/build.yml | 17 ++--------------- TwinCATAUTDServerLightweight/src/main.rs | 2 +- build.py | 1 - simulator/src/lib.rs | 4 ++-- simulator/src/simulator.rs | 13 ++++++------- simulator/src/view/imgui/mod.rs | 11 ++++++----- simulator/src/view/transducers.rs | 6 +----- 7 files changed, 18 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8166c87..1b67eb0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,27 +48,14 @@ jobs: cache: 'npm' cache-dependency-path: package-lock.json if: ${{ needs.changed-files.outputs.src == 'true' }} - - name: build server - run: | + - run: | python3 build.py build + python3 build.py lint if: ${{ needs.changed-files.outputs.src == 'true' }} - lint: - needs: changed-files - if: ${{ needs.changed-files.outputs.src == 'true' }} - name: lint - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/setup-build - with: - os: ubuntu-latest - - run: python3 build.py lint - auto-merge: needs: - test - - lint permissions: pull-requests: write contents: write diff --git a/TwinCATAUTDServerLightweight/src/main.rs b/TwinCATAUTDServerLightweight/src/main.rs index 92fffa2..5a9a478 100644 --- a/TwinCATAUTDServerLightweight/src/main.rs +++ b/TwinCATAUTDServerLightweight/src/main.rs @@ -29,7 +29,7 @@ async fn main_() -> anyhow::Result<()> { let port = arg.port; - let server = LightweightServer::new(|| TwinCAT::builder()); + let server = LightweightServer::new(TwinCAT::builder); let (tx, mut rx) = mpsc::channel(1); ctrlc::set_handler(move || { diff --git a/build.py b/build.py index 74b7390..eebf4c6 100644 --- a/build.py +++ b/build.py @@ -173,7 +173,6 @@ def server_build(args): def server_lint(args): with working_dir("."): command = ["cargo", "clippy"] - command[1] = "clippy" command.append("--tests") command.append("--workspace") command.append("--") diff --git a/simulator/src/lib.rs b/simulator/src/lib.rs index 4bea64a..4654dd1 100644 --- a/simulator/src/lib.rs +++ b/simulator/src/lib.rs @@ -21,8 +21,8 @@ pub type Quaternion = cgmath::Quaternion; pub type Matrix3 = cgmath::Matrix3; pub type Matrix4 = cgmath::Matrix4; -const METER: f32 = autd3::driver::defined::METER as f32; -const MILLIMETER: f32 = autd3::driver::defined::MILLIMETER as f32; +const METER: f32 = autd3::driver::defined::METER; +const MILLIMETER: f32 = autd3::driver::defined::MILLIMETER; #[cfg(feature = "left_handed")] pub(crate) const ZPARITY: f32 = -1.; diff --git a/simulator/src/simulator.rs b/simulator/src/simulator.rs index 1919948..d7623c6 100644 --- a/simulator/src/simulator.rs +++ b/simulator/src/simulator.rs @@ -256,6 +256,7 @@ impl Simulator { self.run_simulator(server_th, rx_buf, rx, tx_shutdown, lightweight_server) } + #[allow(clippy::type_complexity)] fn run_simulator( &mut self, server_th: std::thread::JoinHandle>, @@ -546,14 +547,13 @@ impl Simulator { .enumerate() .for_each(|(i, d)| { d.amp = (PI - * cpu.fpga().to_pulse_width( - drives[i].intensity(), - m.into(), - ) + * cpu + .fpga() + .to_pulse_width(drives[i].intensity(), m) as f32 / ULTRASOUND_PERIOD_COUNT as f32) .sin(); - d.phase = drives[i].phase().radian() as f32; + d.phase = drives[i].phase().radian(); d.set_wave_number(self.settings.sound_speed); }); @@ -598,8 +598,7 @@ impl Simulator { let config = Config { source_num: sources.len() as _, - color_scale: T4010A1_AMPLITUDE as f32 - / self.settings.pressure_max, + color_scale: T4010A1_AMPLITUDE / self.settings.pressure_max, width: (self.settings.slice_width / self.settings.slice_pixel_size) as _, diff --git a/simulator/src/view/imgui/mod.rs b/simulator/src/view/imgui/mod.rs index 66bca9d..a69d7ab 100644 --- a/simulator/src/view/imgui/mod.rs +++ b/simulator/src/view/imgui/mod.rs @@ -412,14 +412,14 @@ impl ImGuiViewer { &mut settings.camera_near_clip, 1. * MILLIMETER, 0., - std::f32::MAX / 2., + f32::MAX / 2., ); drag_float( "Far clip", &mut settings.camera_far_clip, 1. * MILLIMETER, 0., - std::f32::MAX / 2., + f32::MAX / 2., ); tab.end(); } @@ -432,7 +432,7 @@ impl ImGuiViewer { &mut settings.sound_speed, 1. * MILLIMETER, 0., - std::f32::MAX / 2., + f32::MAX / 2., ) { cpus.iter().for_each(|cpu| { sources.drives_mut().skip(body_pointer[cpu.idx()]).take(cpu.num_transducers()).for_each( @@ -618,7 +618,7 @@ impl ImGuiViewer { &mut self.mod_plot_size[cpu.idx()], 1., 0., - std::f32::MAX / 2., + f32::MAX / 2., ); } } @@ -773,10 +773,11 @@ impl ImGuiViewer { let d = cpu.fpga().drives(cpu.fpga().current_stm_segment(), cpu.fpga().current_stm_idx())[value as usize]; let m = cpu.fpga().modulation_at(cpu.fpga().current_mod_segment(), cpu.fpga().current_mod_idx()); let phase = d.phase().value() as u32; - let pulse_width = cpu.fpga().to_pulse_width(d.intensity(), m.into()) as u32; + let pulse_width = cpu.fpga().to_pulse_width(d.intensity(), m) as u32; const T:u32 = ULTRASOUND_PERIOD_COUNT as u32; let rise = (T-phase*2-pulse_width/2+T)%T; let fall = (T-phase*2+(pulse_width+1)/2+T)%T; + #[allow(clippy::collapsible_else_if)] (0..T).map(|t| if rise <= fall { if (rise <= t) && (t < fall) { diff --git a/simulator/src/view/transducers.rs b/simulator/src/view/transducers.rs index a6a85c8..e72da06 100644 --- a/simulator/src/view/transducers.rs +++ b/simulator/src/view/transducers.rs @@ -361,11 +361,7 @@ impl TransViewer { .iter_mut() .zip(sources.positions().zip(sources.rotations())) .for_each(|(d, (pos, rot))| { - // d.model = (Matrix4::from_translation(pos.truncate()) - // * Matrix4::from_scale(0.5 * AUTD3::TRANS_SPACING as f32) - // * Matrix4::from(*rot)) - // .into(); - let s = 0.5 * AUTD3::TRANS_SPACING as f32; + let s = 0.5 * AUTD3::TRANS_SPACING; let mut m = Matrix4::from_scale(s); m[3][0] = pos[0]; m[3][1] = pos[1]; From a49c39da1cc83ab5af5323117bf1f2b6256f5b2f Mon Sep 17 00:00:00 2001 From: shun suzuki Date: Fri, 26 Jul 2024 14:52:44 +0900 Subject: [PATCH 10/11] add runs-on --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b67eb0..17a51dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,6 +31,7 @@ jobs: test: needs: changed-files name: test-on-${{ matrix.os }} + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: From bdcdef891c9e0b85a230c7d090a8286fab20f04f Mon Sep 17 00:00:00 2001 From: shun suzuki Date: Fri, 26 Jul 2024 15:11:16 +0900 Subject: [PATCH 11/11] lint codes --- package-lock.json | 4 ++-- src-tauri/src/main.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4373407..6d09121 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,10 +17,10 @@ "@sveltejs/vite-plugin-svelte": "^2.4.2", "@tauri-apps/cli": "^1.6.0", "@tsconfig/svelte": "^5.0.0", + "svelte": "^4.2.18", "svelte-check": "^3.8.4", "svelte-preprocess": "^6.0.2", "tslib": "^2.6.3", - "svelte": "^4.2.18", "typescript": "^5.0.2", "vite": "^4.4.4" } @@ -1652,4 +1652,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 166f60b..e457e62 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -34,7 +34,7 @@ fn get_settings_file_path(handle: &tauri::AppHandle) -> std::io::Result #[tauri::command] fn set_libpath(_: tauri::AppHandle) { if cfg!(target_os = "macos") { - let home = std::env::var("HOME").unwrap_or(String::new()); + let home = std::env::var("HOME").unwrap_or_default(); let libpath = format!("{}/lib:/usr/local/lib:/usr/lib", home); let fallback_path = if let Ok(path) = std::env::var("DYLD_FALLBACK_LIBRARY_PATH") { if path.contains(&libpath) {