From 539e14b5e84c4f945c7e65b90f2040967f5ccca7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 6 Jun 2026 15:53:29 +0000 Subject: [PATCH 1/2] Bump yeoman-environment from 6.0.1 to 6.1.0 Bumps [yeoman-environment](https://github.com/yeoman/environment) from 6.0.1 to 6.1.0. - [Release notes](https://github.com/yeoman/environment/releases) - [Changelog](https://github.com/yeoman/environment/blob/main/CHANGELOG.md) - [Commits](https://github.com/yeoman/environment/compare/v6.0.1...v6.1.0) --- updated-dependencies: - dependency-name: yeoman-environment dependency-version: 6.1.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 31 +++++++++++++------------------ 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index f502fb7aa..67630fbb7 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "typescript": "^6.0.3", "vitest": "^4.1.0", "yaml": "^2.9.0", - "yeoman-environment": "^6.0.1", + "yeoman-environment": "^6.1.0", "yeoman-generator": "^8.2.2" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index 11f87f307..de30b681c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2725,7 +2725,7 @@ p-queue "^9.1.0" text-table "^0.2.0" -"@yeoman/conflicter@^4.0.1": +"@yeoman/conflicter@^4.1.0": version "4.1.0" resolved "https://registry.yarnpkg.com/@yeoman/conflicter/-/conflicter-4.1.0.tgz#ebc339af505936fab1340105ed2b2e26e332cd13" integrity sha512-Py62rJdWHf1zMpf801Ql7kg+sbUeVmvfmZf++mgA1SOk/uByLIfcXUMDzQPSHkW4Y7I2yVWLKZATRGjoczXVFQ== @@ -2743,24 +2743,19 @@ slash "^5.1.0" textextensions "^6.11.0" -"@yeoman/namespace@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@yeoman/namespace/-/namespace-1.0.1.tgz#8034277c4a62bdf41e05e2d890bc674bc320eb99" - integrity sha512-XGdYL0HCoPvrzW7T8bxD6RbCY/B8uvR2jpOzJc/yEwTueKHwoVhjSLjVXkokQAO0LNl8nQFLVZ1aKfr2eFWZeA== - "@yeoman/namespace@^2.1.0": version "2.1.0" resolved "https://registry.yarnpkg.com/@yeoman/namespace/-/namespace-2.1.0.tgz#63d8e8524227f9603a386de8e7e9387a2b170025" integrity sha512-/BxsZlALPRp34juAzzh9QUr2hR9w9o+dBSw8sF/iv7NfUU/A/QI0xOyVtQJz2uCPuvtY6nkGDxYxZoKI/lnFQg== -"@yeoman/transform@^2.1.0", "@yeoman/transform@^2.1.1": +"@yeoman/transform@^2.1.1": version "2.1.2" resolved "https://registry.yarnpkg.com/@yeoman/transform/-/transform-2.1.2.tgz#2e6ad351fbd9e963004ae9003e3168fe334d11ea" integrity sha512-LdPNm5Moc+Z8l2YeQ0IzsybXoV531o7RmGJB8lpFr8SjtqqGkT2bZYlS1LftPpCcPJ//yE0MbI/fPGh1WWlabg== dependencies: minimatch "^9.0.9" -"@yeoman/types@^1.10.3": +"@yeoman/types@^1.11.0": version "1.11.1" resolved "https://registry.yarnpkg.com/@yeoman/types/-/types-1.11.1.tgz#00e9a3559e697d6f72d30fd6f3d7c782cfc1cbda" integrity sha512-27CI5hHQAHfq8ohYILmLNzClbdzBJzu+ny9AzUVV6naJO0l4/+t+67QDKlwQvt+TW3oE5j74I/Mh4Kn14rsVXA== @@ -6242,7 +6237,7 @@ medium-zoom@^1.1.0: resolved "https://registry.yarnpkg.com/medium-zoom/-/medium-zoom-1.1.0.tgz#6efb6bbda861a02064ee71a2617a8dc4381ecc71" integrity sha512-ewyDsp7k4InCUp3jRmwHBRFGyjBimKps/AJLjRSox+2q/2H4p/PNpQf+pwONWlJiOudkBXtbdmVbFjqyybfTmQ== -mem-fs-editor@^12.0.3, mem-fs-editor@^12.0.4: +mem-fs-editor@^12.0.4: version "12.0.4" resolved "https://registry.yarnpkg.com/mem-fs-editor/-/mem-fs-editor-12.0.4.tgz#234bcb93109be2e36b45930a20e83a86a547ee9a" integrity sha512-gc8b4VlisaGp5W+ot2f4Xc8jUgKnMn5UR2mKsdm8UdbESYCdSiQKqioktPu8gJ0Uxd8gV/m/M16Pp5n1Ge8pjA== @@ -10273,16 +10268,16 @@ yazl@^2.2.2: dependencies: buffer-crc32 "~0.2.3" -yeoman-environment@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-6.0.1.tgz#fef33af4eedd77604155a9b219cfce78bee6079f" - integrity sha512-038Feg5aE77uOr7XKW5HYIV3Issw4aJBWAml6ndQotDeghomLuiFJxrZNoJohV+TJdhBy4KzlSsDB0gb4u3wSQ== +yeoman-environment@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-6.1.0.tgz#751cc8348587e48d919a806b7e4c25c025a4b0ee" + integrity sha512-QSKMfrSx3js9fxbMDBa+sZG0ctF0NDxcO6VA5BnrWdo6wqhdalT2IUU/ZrNakQLZQ76E3B6b0lXHKEA7ivsWxA== dependencies: "@yeoman/adapter" "^4.0.2" - "@yeoman/conflicter" "^4.0.1" - "@yeoman/namespace" "^1.0.1" - "@yeoman/transform" "^2.1.0" - "@yeoman/types" "^1.10.3" + "@yeoman/conflicter" "^4.1.0" + "@yeoman/namespace" "^2.1.0" + "@yeoman/transform" "^2.1.1" + "@yeoman/types" "^1.11.0" arrify "^3.0.0" chalk "^5.6.2" commander "^14.0.3" @@ -10294,7 +10289,7 @@ yeoman-environment@^6.0.1: locate-path "^8.0.0" lodash-es "^4.18.1" mem-fs "^4.1.4" - mem-fs-editor "^12.0.3" + mem-fs-editor "^12.0.4" semver "^7.7.4" slash "^5.1.0" untildify "^6.0.0" From bdee5d9aa0d6a2db9b1937cca86ec6f17a30971c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 6 Jun 2026 16:35:38 +0000 Subject: [PATCH 2/2] Preload erubi before ActionView Erubi comparisons --- test/snapshot_utils.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/snapshot_utils.rb b/test/snapshot_utils.rb index 8d3dfbd9e..8cca1454b 100644 --- a/test/snapshot_utils.rb +++ b/test/snapshot_utils.rb @@ -355,6 +355,7 @@ def compare_with_erubi_evaluated(source, herb_result, locals, options, enforce_e def compare_with_actionview_erubi_evaluated(source, herb_result, locals, _options, enforce_equality: false) require "action_view" + require_erubi_silently begin erubi_engine = ActionView::Template::Handlers::ERB::Erubi.new(source, bufvar: "@output_buffer") @@ -489,6 +490,7 @@ def build_snapshot_metadata(source, options = {}) def evaluate_actionview_source(source, locals) require "action_view" + require_erubi_silently erubi_engine = ActionView::Template::Handlers::ERB::Erubi.new(source, bufvar: "@output_buffer")