From 48a0640a079d9569baf113556c805e3192af501e Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 19 May 2025 10:26:10 +1000 Subject: [PATCH 1/6] Revert "feat(scheduler): add from_queue flag to CardAnswer (#3976)" This reverts commit 1f95d030bbc7ebcc004ffe1e2be2a320c9fe1e94. Buggy: https://github.com/ankitects/anki/pull/3983 --- proto/anki/scheduler.proto | 1 - rslib/src/scheduler/reviews.rs | 4 ++-- rslib/src/scheduler/service/answering.rs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/proto/anki/scheduler.proto b/proto/anki/scheduler.proto index 0675465ef..364bf50ad 100644 --- a/proto/anki/scheduler.proto +++ b/proto/anki/scheduler.proto @@ -279,7 +279,6 @@ message CardAnswer { Rating rating = 4; int64 answered_at_millis = 5; uint32 milliseconds_taken = 6; - optional bool from_queue = 7; } message CustomStudyRequest { diff --git a/rslib/src/scheduler/reviews.rs b/rslib/src/scheduler/reviews.rs index 79bbafb9e..983ecc452 100644 --- a/rslib/src/scheduler/reviews.rs +++ b/rslib/src/scheduler/reviews.rs @@ -163,10 +163,10 @@ impl Collection { rating, milliseconds_taken: 0, answered_at_millis: TimestampMillis::now().into(), - // Process the card without updating queues yet - from_queue: Some(false), } .into(); + // Process the card without updating queues yet + answer.from_queue = false; col.answer_card_inner(&mut answer)?; } Ok(()) diff --git a/rslib/src/scheduler/service/answering.rs b/rslib/src/scheduler/service/answering.rs index d858e894e..778cf49a1 100644 --- a/rslib/src/scheduler/service/answering.rs +++ b/rslib/src/scheduler/service/answering.rs @@ -21,7 +21,7 @@ impl From for CardAnswer { answered_at: TimestampMillis(answer.answered_at_millis), milliseconds_taken: answer.milliseconds_taken, custom_data, - from_queue: answer.from_queue.unwrap_or(true), + from_queue: true, } } } From a402670c4e8e0077d7bc4de730d9aab72912b174 Mon Sep 17 00:00:00 2001 From: Lukas Sommer Date: Mon, 19 May 2025 00:44:54 +0000 Subject: [PATCH 2/6] Update sync.ftl (#4003) * Update sync.ftl * Update ftl/core/sync.ftl Improved string by @GithubAnon0000 Co-authored-by: GithubAnon0000 <160563432+GithubAnon0000@users.noreply.github.com> --------- Co-authored-by: GithubAnon0000 <160563432+GithubAnon0000@users.noreply.github.com> --- ftl/core/sync.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/ftl/core/sync.ftl b/ftl/core/sync.ftl index 34889dc9f..e1d954c4a 100644 --- a/ftl/core/sync.ftl +++ b/ftl/core/sync.ftl @@ -50,6 +50,7 @@ sync-account-required = A free account is required to keep your collection synchronized. Please sign up for an account, then enter your details below. sync-sanity-check-failed = Please use the Check Database function, then sync again. If problems persist, please force a one-way sync in the preferences screen. sync-clock-off = Unable to sync - your clock is not set to the correct time. +# “details” expands to a string such as “300.14 MB > 300.00 MB” sync-upload-too-large = Your collection file is too large to send to AnkiWeb. You can reduce its size by removing any unwanted decks (optionally exporting them first), and then using Check Database to shrink the file size down. From 277061498d4b445782930354c5988ca605a84ead Mon Sep 17 00:00:00 2001 From: sorata Date: Mon, 19 May 2025 08:39:43 +0530 Subject: [PATCH 3/6] update backup restore message (#4005) * update backup restore message * Update ftl/qt/qt-misc.ftl Co-authored-by: GithubAnon0000 <160563432+GithubAnon0000@users.noreply.github.com> --------- Co-authored-by: GithubAnon0000 <160563432+GithubAnon0000@users.noreply.github.com> --- ftl/qt/qt-misc.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ftl/qt/qt-misc.ftl b/ftl/qt/qt-misc.ftl index 8cacbfd3f..294cd8a83 100644 --- a/ftl/qt/qt-misc.ftl +++ b/ftl/qt/qt-misc.ftl @@ -3,7 +3,7 @@ qt-misc-addons = Add-ons qt-misc-all-cards-notes-and-media-for = All cards, notes, and media for this profile will be deleted. Are you sure? qt-misc-all-cards-notes-and-media-for2 = All cards, notes, and media for the profile "{ $name }" will be deleted. Are you sure? qt-misc-anki-updatedanki-has-been-released =

Anki Updated

Anki { $val } has been released.

-qt-misc-automatic-syncing-and-backups-have-been = Automatic syncing and backups have been disabled while restoring. To enable them again, close the profile or restart Anki. +qt-misc-automatic-syncing-and-backups-have-been = Backup successfully restored. Automatic syncing and backups have been disabled for now. To enable them again, close the profile or restart Anki. qt-misc-back-side-only = Back Side Only qt-misc-backing-up = Backing Up... qt-misc-browse = Browse From ed13a351b95439e38701c5ed7cd870723afbffba Mon Sep 17 00:00:00 2001 From: Luc Mcgrady Date: Mon, 19 May 2025 04:10:47 +0100 Subject: [PATCH 4/6] Fix/Prevent manual resize of params input (#4008) --- ts/routes/deck-options/ParamsInput.svelte | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ts/routes/deck-options/ParamsInput.svelte b/ts/routes/deck-options/ParamsInput.svelte index 5bed775cf..595e02c14 100644 --- a/ts/routes/deck-options/ParamsInput.svelte +++ b/ts/routes/deck-options/ParamsInput.svelte @@ -14,7 +14,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html function updateHeight() { if (taRef) { taRef.style.height = "auto"; - taRef.style.height = `${taRef.scrollHeight}px`; + // +2 for "overflow-y: auto" in case js breaks + taRef.style.height = `${taRef.scrollHeight + 2}px`; } } @@ -45,3 +46,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html class="w-100" placeholder={render(defaults)} > + + From d667abffd1fb9a0779333de0e6419a2cce838fe1 Mon Sep 17 00:00:00 2001 From: llama Date: Mon, 19 May 2025 11:15:23 +0800 Subject: [PATCH 5/6] Fix searching for non-blank adjacent wildcard fields (#4009) * modify collect_ranges to take param on whether to join ranges * update tests * update existing call * fix searching for non-empty wildcard fields --- rslib/src/search/sqlwriter.rs | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/rslib/src/search/sqlwriter.rs b/rslib/src/search/sqlwriter.rs index f53fe5a48..03d2e0950 100644 --- a/rslib/src/search/sqlwriter.rs +++ b/rslib/src/search/sqlwriter.rs @@ -583,8 +583,10 @@ impl SqlWriter<'_> { } fn write_single_field(&mut self, field_name: &str, val: &str) -> Result<()> { - let field_indicies_by_notetype = - self.num_fields_and_fields_indices_by_notetype(field_name)?; + let field_indicies_by_notetype = self.num_fields_and_fields_indices_by_notetype( + field_name, + matches!(val, "*" | "_*" | "*_"), + )?; if field_indicies_by_notetype.is_empty() { write!(self.sql, "false").unwrap(); return Ok(()); @@ -630,6 +632,7 @@ impl SqlWriter<'_> { fn num_fields_and_fields_indices_by_notetype( &mut self, field_name: &str, + test_for_nonempty: bool, ) -> Result> { let matches_glob = glob_matcher(field_name); @@ -640,7 +643,7 @@ impl SqlWriter<'_> { .iter() .filter(|&field| matches_glob(&field.name)) .map(|field| field.ord.unwrap_or_default()) - .collect_ranges(); + .collect_ranges(!test_for_nonempty); if !matched_fields.is_empty() { field_map.push(FieldQualifiedSearchContext { ntid: nt.id, @@ -697,7 +700,7 @@ impl SqlWriter<'_> { } (!field.config.exclude_from_search).then_some(ord) }) - .collect_ranges(); + .collect_ranges(true); if !matched_fields.is_empty() { field_map.push(UnqualifiedSearchContext { ntid: nt.id, @@ -899,7 +902,7 @@ impl RequiredTable { /// contiguous numbers. trait CollectRanges { type Item; - fn collect_ranges(self) -> Vec>; + fn collect_ranges(self, join: bool) -> Vec>; } impl< @@ -909,7 +912,7 @@ impl< { type Item = Idx; - fn collect_ranges(self) -> Vec> { + fn collect_ranges(self, join: bool) -> Vec> { let mut result = Vec::new(); let mut iter = self.into_iter(); let next = iter.next(); @@ -920,7 +923,7 @@ impl< let mut end = next.unwrap(); for i in iter { - if i == end + 1.into() { + if join && i == end + 1.into() { end = end + 1.into(); } else { result.push(start..end + 1.into()); @@ -1334,7 +1337,8 @@ c.odue != 0 then c.odue else c.due end) != {days}) or (c.queue in (1,4) and #[allow(clippy::single_range_in_vec_init)] #[test] fn ranges() { - assert_eq!([1, 2, 3].collect_ranges(), [1..4]); - assert_eq!([1, 3, 4].collect_ranges(), [1..2, 3..5]); + assert_eq!([1, 2, 3].collect_ranges(true), [1..4]); + assert_eq!([1, 3, 4].collect_ranges(true), [1..2, 3..5]); + assert_eq!([1, 2, 5, 6].collect_ranges(false), [1..2, 2..3, 5..6, 6..7]); } } From 63fd1ffbff811a7b20c5dc36f944ce5f6c1a4116 Mon Sep 17 00:00:00 2001 From: spiritualfather Date: Mon, 19 May 2025 06:25:05 +0300 Subject: [PATCH 6/6] upgrade esbuild versions (#4011) * upgrade esbuild versions * Update license file --- CONTRIBUTORS | 1 + package.json | 4 +- ts/licenses.json | 20 ++-- yarn.lock | 247 ++++++++++++++++++++++++----------------------- 4 files changed, 145 insertions(+), 127 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 2297786ae..800b55e1c 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -228,6 +228,7 @@ Matt Brubeck Yaoliang Chen KolbyML Adnane Taghi +Spiritual Father ******************** diff --git a/package.json b/package.json index b0795c918..146d18406 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,8 @@ "cross-env": "^7.0.2", "diff": "^5.0.0", "dprint": "^0.47.2", - "esbuild": "^0.25.0", - "esbuild-sass-plugin": "^2", + "esbuild": "^0.25.3", + "esbuild-sass-plugin": "^3.3.1", "esbuild-svelte": "^0.9.2", "eslint": "^8.44.0", "eslint-plugin-compat": "^4.1.4", diff --git a/ts/licenses.json b/ts/licenses.json index 9d6f7d2c1..2e88336b3 100644 --- a/ts/licenses.json +++ b/ts/licenses.json @@ -95,8 +95,8 @@ "repository": "https://github.com/TooTallNate/node-agent-base", "publisher": "Nathan Rajlich", "email": "nathan@tootallnate.net", - "path": "node_modules/agent-base", - "licenseFile": "node_modules/agent-base/README.md" + "path": "node_modules/http-proxy-agent/node_modules/agent-base", + "licenseFile": "node_modules/http-proxy-agent/node_modules/agent-base/README.md" }, "asynckit@0.4.0": { "licenses": "MIT", @@ -572,6 +572,14 @@ "path": "node_modules/lodash-es", "licenseFile": "node_modules/lodash-es/LICENSE" }, + "lru-cache@10.4.3": { + "licenses": "ISC", + "repository": "https://github.com/isaacs/node-lru-cache", + "publisher": "Isaac Z. Schlueter", + "email": "i@izs.me", + "path": "node_modules/lru-cache", + "licenseFile": "node_modules/lru-cache/LICENSE" + }, "marked@5.1.2": { "licenses": "MIT", "repository": "https://github.com/markedjs/marked", @@ -768,16 +776,16 @@ "repository": "https://github.com/jsdom/whatwg-url", "publisher": "Sebastian Mayr", "email": "github@smayr.name", - "path": "node_modules/whatwg-url", - "licenseFile": "node_modules/whatwg-url/LICENSE.txt" + "path": "node_modules/jsdom/node_modules/whatwg-url", + "licenseFile": "node_modules/jsdom/node_modules/whatwg-url/LICENSE.txt" }, "whatwg-url@11.0.0": { "licenses": "MIT", "repository": "https://github.com/jsdom/whatwg-url", "publisher": "Sebastian Mayr", "email": "github@smayr.name", - "path": "node_modules/data-urls/node_modules/whatwg-url", - "licenseFile": "node_modules/data-urls/node_modules/whatwg-url/LICENSE.txt" + "path": "node_modules/whatwg-url", + "licenseFile": "node_modules/whatwg-url/LICENSE.txt" }, "ws@8.18.0": { "licenses": "MIT", diff --git a/yarn.lock b/yarn.lock index f6b772dd5..483b6e44e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -113,9 +113,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/aix-ppc64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/aix-ppc64@npm:0.25.0" +"@esbuild/aix-ppc64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/aix-ppc64@npm:0.25.3" conditions: os=aix & cpu=ppc64 languageName: node linkType: hard @@ -134,9 +134,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/android-arm64@npm:0.25.0" +"@esbuild/android-arm64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/android-arm64@npm:0.25.3" conditions: os=android & cpu=arm64 languageName: node linkType: hard @@ -155,9 +155,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/android-arm@npm:0.25.0" +"@esbuild/android-arm@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/android-arm@npm:0.25.3" conditions: os=android & cpu=arm languageName: node linkType: hard @@ -176,9 +176,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-x64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/android-x64@npm:0.25.0" +"@esbuild/android-x64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/android-x64@npm:0.25.3" conditions: os=android & cpu=x64 languageName: node linkType: hard @@ -197,9 +197,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/darwin-arm64@npm:0.25.0" +"@esbuild/darwin-arm64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/darwin-arm64@npm:0.25.3" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard @@ -218,9 +218,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/darwin-x64@npm:0.25.0" +"@esbuild/darwin-x64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/darwin-x64@npm:0.25.3" conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -239,9 +239,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/freebsd-arm64@npm:0.25.0" +"@esbuild/freebsd-arm64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/freebsd-arm64@npm:0.25.3" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard @@ -260,9 +260,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/freebsd-x64@npm:0.25.0" +"@esbuild/freebsd-x64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/freebsd-x64@npm:0.25.3" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard @@ -281,9 +281,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/linux-arm64@npm:0.25.0" +"@esbuild/linux-arm64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/linux-arm64@npm:0.25.3" conditions: os=linux & cpu=arm64 languageName: node linkType: hard @@ -302,9 +302,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/linux-arm@npm:0.25.0" +"@esbuild/linux-arm@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/linux-arm@npm:0.25.3" conditions: os=linux & cpu=arm languageName: node linkType: hard @@ -323,9 +323,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/linux-ia32@npm:0.25.0" +"@esbuild/linux-ia32@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/linux-ia32@npm:0.25.3" conditions: os=linux & cpu=ia32 languageName: node linkType: hard @@ -344,9 +344,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/linux-loong64@npm:0.25.0" +"@esbuild/linux-loong64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/linux-loong64@npm:0.25.3" conditions: os=linux & cpu=loong64 languageName: node linkType: hard @@ -365,9 +365,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/linux-mips64el@npm:0.25.0" +"@esbuild/linux-mips64el@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/linux-mips64el@npm:0.25.3" conditions: os=linux & cpu=mips64el languageName: node linkType: hard @@ -386,9 +386,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/linux-ppc64@npm:0.25.0" +"@esbuild/linux-ppc64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/linux-ppc64@npm:0.25.3" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard @@ -407,9 +407,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/linux-riscv64@npm:0.25.0" +"@esbuild/linux-riscv64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/linux-riscv64@npm:0.25.3" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard @@ -428,9 +428,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/linux-s390x@npm:0.25.0" +"@esbuild/linux-s390x@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/linux-s390x@npm:0.25.3" conditions: os=linux & cpu=s390x languageName: node linkType: hard @@ -449,16 +449,16 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/linux-x64@npm:0.25.0" +"@esbuild/linux-x64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/linux-x64@npm:0.25.3" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"@esbuild/netbsd-arm64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/netbsd-arm64@npm:0.25.0" +"@esbuild/netbsd-arm64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/netbsd-arm64@npm:0.25.3" conditions: os=netbsd & cpu=arm64 languageName: node linkType: hard @@ -477,16 +477,16 @@ __metadata: languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/netbsd-x64@npm:0.25.0" +"@esbuild/netbsd-x64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/netbsd-x64@npm:0.25.3" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/openbsd-arm64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/openbsd-arm64@npm:0.25.0" +"@esbuild/openbsd-arm64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/openbsd-arm64@npm:0.25.3" conditions: os=openbsd & cpu=arm64 languageName: node linkType: hard @@ -505,9 +505,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/openbsd-x64@npm:0.25.0" +"@esbuild/openbsd-x64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/openbsd-x64@npm:0.25.3" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard @@ -526,9 +526,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/sunos-x64@npm:0.25.0" +"@esbuild/sunos-x64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/sunos-x64@npm:0.25.3" conditions: os=sunos & cpu=x64 languageName: node linkType: hard @@ -547,9 +547,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/win32-arm64@npm:0.25.0" +"@esbuild/win32-arm64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/win32-arm64@npm:0.25.3" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard @@ -568,9 +568,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/win32-ia32@npm:0.25.0" +"@esbuild/win32-ia32@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/win32-ia32@npm:0.25.3" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard @@ -589,9 +589,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.25.0": - version: 0.25.0 - resolution: "@esbuild/win32-x64@npm:0.25.0" +"@esbuild/win32-x64@npm:0.25.3": + version: 0.25.3 + resolution: "@esbuild/win32-x64@npm:0.25.3" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -2018,8 +2018,8 @@ __metadata: d3: "npm:^7.0.0" diff: "npm:^5.0.0" dprint: "npm:^0.47.2" - esbuild: "npm:^0.25.0" - esbuild-sass-plugin: "npm:^2" + esbuild: "npm:^0.25.3" + esbuild-sass-plugin: "npm:^3.3.1" esbuild-svelte: "npm:^0.9.2" eslint: "npm:^8.44.0" eslint-plugin-compat: "npm:^4.1.4" @@ -3396,15 +3396,17 @@ __metadata: languageName: node linkType: hard -"esbuild-sass-plugin@npm:^2": - version: 2.16.1 - resolution: "esbuild-sass-plugin@npm:2.16.1" +"esbuild-sass-plugin@npm:^3.3.1": + version: 3.3.1 + resolution: "esbuild-sass-plugin@npm:3.3.1" dependencies: - resolve: "npm:^1.22.6" - sass: "npm:^1.7.3" + resolve: "npm:^1.22.8" + safe-identifier: "npm:^0.4.2" + sass: "npm:^1.71.1" peerDependencies: - esbuild: ^0.19.4 - checksum: 10c0/2e0eedfb5863642cd03712a780f6a1896efbb17d41f7de7ae0558948077bb1a9b55b1bc1e235562939c14b528ddacfd8a3eb255eaceffabfa02489fd64403af6 + esbuild: ">=0.20.1" + sass-embedded: ^1.71.1 + checksum: 10c0/bbbef049ebe58c449caa8db0c893abbaf97c4b83ca349d8c541c11503092475afc4ed504218987cb745d61bfb1a26a19118688a450057a43e3943d2224ee2060 languageName: node linkType: hard @@ -3500,35 +3502,35 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.25.0": - version: 0.25.0 - resolution: "esbuild@npm:0.25.0" +"esbuild@npm:^0.25.3": + version: 0.25.3 + resolution: "esbuild@npm:0.25.3" dependencies: - "@esbuild/aix-ppc64": "npm:0.25.0" - "@esbuild/android-arm": "npm:0.25.0" - "@esbuild/android-arm64": "npm:0.25.0" - "@esbuild/android-x64": "npm:0.25.0" - "@esbuild/darwin-arm64": "npm:0.25.0" - "@esbuild/darwin-x64": "npm:0.25.0" - "@esbuild/freebsd-arm64": "npm:0.25.0" - "@esbuild/freebsd-x64": "npm:0.25.0" - "@esbuild/linux-arm": "npm:0.25.0" - "@esbuild/linux-arm64": "npm:0.25.0" - "@esbuild/linux-ia32": "npm:0.25.0" - "@esbuild/linux-loong64": "npm:0.25.0" - "@esbuild/linux-mips64el": "npm:0.25.0" - "@esbuild/linux-ppc64": "npm:0.25.0" - "@esbuild/linux-riscv64": "npm:0.25.0" - "@esbuild/linux-s390x": "npm:0.25.0" - "@esbuild/linux-x64": "npm:0.25.0" - "@esbuild/netbsd-arm64": "npm:0.25.0" - "@esbuild/netbsd-x64": "npm:0.25.0" - "@esbuild/openbsd-arm64": "npm:0.25.0" - "@esbuild/openbsd-x64": "npm:0.25.0" - "@esbuild/sunos-x64": "npm:0.25.0" - "@esbuild/win32-arm64": "npm:0.25.0" - "@esbuild/win32-ia32": "npm:0.25.0" - "@esbuild/win32-x64": "npm:0.25.0" + "@esbuild/aix-ppc64": "npm:0.25.3" + "@esbuild/android-arm": "npm:0.25.3" + "@esbuild/android-arm64": "npm:0.25.3" + "@esbuild/android-x64": "npm:0.25.3" + "@esbuild/darwin-arm64": "npm:0.25.3" + "@esbuild/darwin-x64": "npm:0.25.3" + "@esbuild/freebsd-arm64": "npm:0.25.3" + "@esbuild/freebsd-x64": "npm:0.25.3" + "@esbuild/linux-arm": "npm:0.25.3" + "@esbuild/linux-arm64": "npm:0.25.3" + "@esbuild/linux-ia32": "npm:0.25.3" + "@esbuild/linux-loong64": "npm:0.25.3" + "@esbuild/linux-mips64el": "npm:0.25.3" + "@esbuild/linux-ppc64": "npm:0.25.3" + "@esbuild/linux-riscv64": "npm:0.25.3" + "@esbuild/linux-s390x": "npm:0.25.3" + "@esbuild/linux-x64": "npm:0.25.3" + "@esbuild/netbsd-arm64": "npm:0.25.3" + "@esbuild/netbsd-x64": "npm:0.25.3" + "@esbuild/openbsd-arm64": "npm:0.25.3" + "@esbuild/openbsd-x64": "npm:0.25.3" + "@esbuild/sunos-x64": "npm:0.25.3" + "@esbuild/win32-arm64": "npm:0.25.3" + "@esbuild/win32-ia32": "npm:0.25.3" + "@esbuild/win32-x64": "npm:0.25.3" dependenciesMeta: "@esbuild/aix-ppc64": optional: true @@ -3582,7 +3584,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: 10c0/5767b72da46da3cfec51661647ec850ddbf8a8d0662771139f10ef0692a8831396a0004b2be7966cecdb08264fb16bdc16290dcecd92396fac5f12d722fa013d + checksum: 10c0/127aff654310ede4e2eb232a7b1d8823f5b5d69222caf17aa7f172574a5b6b75f71ce78c6d8a40030421d7c75b784dc640de0fb1b87b7ea77ab2a1c832fa8df8 languageName: node linkType: hard @@ -5860,7 +5862,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.22.6": +"resolve@npm:^1.22.8": version: 1.22.10 resolution: "resolve@npm:1.22.10" dependencies: @@ -5886,7 +5888,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.22.6#optional!builtin": +"resolve@patch:resolve@npm%3A^1.22.8#optional!builtin": version: 1.22.10 resolution: "resolve@patch:resolve@npm%3A1.22.10#optional!builtin::version=1.22.10&hash=c3c19d" dependencies: @@ -6062,6 +6064,13 @@ __metadata: languageName: node linkType: hard +"safe-identifier@npm:^0.4.2": + version: 0.4.2 + resolution: "safe-identifier@npm:0.4.2" + checksum: 10c0/a6b0cdb5347e48c5ea4ddf4cdca5359b12529a11a7368225c39f882fcc0e679c81e82e3b13e36bd27ba7bdec9286f4cc062e3e527464d93ba61290b6e0bc6747 + languageName: node + linkType: hard + "safe-regex-test@npm:^1.0.3": version: 1.0.3 resolution: "safe-regex-test@npm:1.0.3" @@ -6105,9 +6114,9 @@ __metadata: languageName: node linkType: hard -"sass@npm:^1.7.3": - version: 1.85.0 - resolution: "sass@npm:1.85.0" +"sass@npm:^1.71.1": + version: 1.87.0 + resolution: "sass@npm:1.87.0" dependencies: "@parcel/watcher": "npm:^2.4.1" chokidar: "npm:^4.0.0" @@ -6118,7 +6127,7 @@ __metadata: optional: true bin: sass: sass.js - checksum: 10c0/a1af0c0596ae1904f66337d0c70a684db6e12210f97be4326cc3dcf18b0f956d7bc45ab2bcc7a8422d433d3eb3c9cb2cc8e60b2dafbdd01fb1ae5a23f5424690 + checksum: 10c0/bd245faf14e4783dc547765350cf05817edaac0d6d6f6e4da8ab751f3eb3cc3873afd563c0ce416a24aa6c9c4e9023b05096447fc006660a01f76adffb54fbc6 languageName: node linkType: hard