From 09b6137d7020ddf5fccfe9be8ddbc8d10bb62191 Mon Sep 17 00:00:00 2001 From: Fabian-Lars Date: Wed, 19 Jul 2023 17:52:06 +0000 Subject: [PATCH] Merge v1 into v2 (#468) Co-authored-by: Fabian-Lars Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: FabianLars Co-authored-by: FabianLars Co-authored-by: Alexandre Dang <124160233+vdang-crabnebula@users.noreply.github.com> Co-authored-by: Ludea Co-authored-by: Amr Bashir Co-authored-by: Duke Jones <104690+dukejones@users.noreply.github.com> Co-authored-by: NaokiM03 <37442712+NaokiM03@users.noreply.github.com> Co-authored-by: Thibault Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: David Blythe <49919035+writeDavid@users.noreply.github.com> Co-authored-by: Lucas Nogueira fix(stronghold): change wrong argument name for `remove` (#422) fix(window-state): correctly set decoration state if no saved state exists, fixes #421 (#424) fix(stronghold): return null if there is no record (#129) fix(window-state): propagate promise (#435) closes #432 fix(window-state): manual default implentation (#425) fix(window-state): manual default implentation, closes #421 fix(deps): update rust crate iota-crypto to 0.21 (#438) fix readme example (#447) fix: handle recursive directory correctly (#455) fix(deps): update rust crate sqlx to 0.7. plugin-sql msrv is now 1.65 (#464) fix(persisted-scope): separately save asset protocol patterns (#459) fix(deps): update rust crate iota-crypto to 0.22 (#475) fix(deps): update tauri monorepo to v1.4.0 (#482) resolve to v15.1.0 (#489) fix(deps): update rust crate iota-crypto to 0.23 (#495) Committed via a GitHub action: https://github.com/tauri-apps/plugins-workspace/actions/runs/5602434141 Co-authored-by: lucasfernog --- node_modules/tslib | 2 +- rollup.config.mjs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/node_modules/tslib b/node_modules/tslib index 878199c..7af52f1 120000 --- a/node_modules/tslib +++ b/node_modules/tslib @@ -1 +1 @@ -../../../node_modules/.pnpm/tslib@2.5.0/node_modules/tslib \ No newline at end of file +../../../node_modules/.pnpm/tslib@2.6.0/node_modules/tslib \ No newline at end of file diff --git a/rollup.config.mjs b/rollup.config.mjs index 6555e98..99a3dd3 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -5,7 +5,7 @@ import { createConfig } from "../../shared/rollup.config.mjs"; export default createConfig({ input: "guest-js/index.ts", pkg: JSON.parse( - readFileSync(new URL("./package.json", import.meta.url), "utf8") + readFileSync(new URL("./package.json", import.meta.url), "utf8"), ), external: [/^@tauri-apps\/api/], });