A platform for community discussion. Free, open, simple.
DEV: Update sass-embedded to 1.99.0, sassc-embedded to 1.80.8 (#39155)
Jarek Radoszed1ba0b83b7d
diff --git a/Gemfile.lock b/Gemfile.lockindex ef4381028b1..07863aae137 100644--- a/Gemfile.lock+++ b/Gemfile.lock@@ -628,23 +628,23 @@ GEMsanitize (7.0.0)crass (~> 1.0.2)nokogiri (>= 1.16.8)- sass-embedded (1.91.0-aarch64-linux-gnu)+ sass-embedded (1.99.0-aarch64-linux-gnu)google-protobuf (~> 4.31)- sass-embedded (1.91.0-aarch64-linux-musl)+ sass-embedded (1.99.0-aarch64-linux-musl)google-protobuf (~> 4.31)- sass-embedded (1.91.0-arm-linux-gnueabihf)+ sass-embedded (1.99.0-arm-linux-gnueabihf)google-protobuf (~> 4.31)- sass-embedded (1.91.0-arm-linux-musleabihf)+ sass-embedded (1.99.0-arm-linux-musleabihf)google-protobuf (~> 4.31)- sass-embedded (1.91.0-arm64-darwin)+ sass-embedded (1.99.0-arm64-darwin)google-protobuf (~> 4.31)- sass-embedded (1.91.0-x86_64-darwin)+ sass-embedded (1.99.0-x86_64-darwin)google-protobuf (~> 4.31)- sass-embedded (1.91.0-x86_64-linux-gnu)+ sass-embedded (1.99.0-x86_64-linux-gnu)google-protobuf (~> 4.31)- sass-embedded (1.91.0-x86_64-linux-musl)+ sass-embedded (1.99.0-x86_64-linux-musl)google-protobuf (~> 4.31)- sassc-embedded (1.80.5)+ sassc-embedded (1.80.8)sass-embedded (~> 1.80)sawyer (0.9.3)addressable (>= 2.3.5)@@ -1209,15 +1209,15 @@ CHECKSUMSruby2_keywords (0.0.5) sha256=ffd13740c573b7301cf7a2e61fc857b2a8e3d3aff32545d6f8300d8bae10e3efrubyzip (3.2.2) sha256=c0ed99385f0625415c8f05bcae33fe649ed2952894a95ff8b08f26ca57ea5b3csanitize (7.0.0) sha256=269d1b9d7326e69307723af5643ec032ff86ad616e72a3b36d301ac75a273984- sass-embedded (1.91.0-aarch64-linux-gnu) sha256=932bf7223ffbbdeefc91cd364de6bf9dbfdc7d80201911eb4dae8d9a7f5bee50- sass-embedded (1.91.0-aarch64-linux-musl) sha256=08449fac861094055a1afe7da376f887f8192b3dba6658db1de7be17d32355c4- sass-embedded (1.91.0-arm-linux-gnueabihf) sha256=8e971474d34bdf15a31f5d4b0d7fcfb8bee87177d875323d7cc6d24e95602ca6- sass-embedded (1.91.0-arm-linux-musleabihf) sha256=6134921019684df17c71f976404a2a23c561d8ced727dcf7ab78ad33c18210b6- sass-embedded (1.91.0-arm64-darwin) sha256=04df4cb5661ea0c4bd2f2e819e73f22fee97307e58117ea158ae6c828ece9a77- sass-embedded (1.91.0-x86_64-darwin) sha256=8deab415ffc209249f27369a620be2497221ad40fe60fa86b6e961b13622ea76- sass-embedded (1.91.0-x86_64-linux-gnu) sha256=f94852f7b5442a2a34994544a578f7157cd64dc1a3b7b922baf059328734e813- sass-embedded (1.91.0-x86_64-linux-musl) sha256=d8cd06bc64fea00070fc4c89d306d7def0d7b343510b52ad9c86f9b285853bbf- sassc-embedded (1.80.5) sha256=b2720c938de54e9798bea17bc044ea0df05f552acec30b8e9a79060cceb9cb3e+ sass-embedded (1.99.0-aarch64-linux-gnu) sha256=a46615b0295ca7bd979b9ce79f6b9f1d26881736400188bd6fd5c4b7c9b46473+ sass-embedded (1.99.0-aarch64-linux-musl) sha256=eaa6d56968909d1d54073c46e21c13fd5bbcb5af609d7e4fbe6b196426ca8e49+ sass-embedded (1.99.0-arm-linux-gnueabihf) sha256=f5f0748934660cda6948917af6dc974caf4d36ea6121e450982153b7d9c49b55+ sass-embedded (1.99.0-arm-linux-musleabihf) sha256=29a4056e76bc136025ba5d03e82d86ecdabfb6c07a473a4fdedcd72fb28dbbc4+ sass-embedded (1.99.0-arm64-darwin) sha256=20773f2fb0e8f4d0194eb1874dab4c0ef60262ff6dafe29361e217beb2208629+ sass-embedded (1.99.0-x86_64-darwin) sha256=371774c83b6dce8a2cb7b5ce5a0f918ff2735bf200b00e3bc7067366654fff13+ sass-embedded (1.99.0-x86_64-linux-gnu) sha256=a4e2ae5e9951815cb8b3ab408cee8b800852491988a57de735f18d259c70d7c4+ sass-embedded (1.99.0-x86_64-linux-musl) sha256=94be72a6f856c610e67b12303dc76a58412e64b24ce97bdf4912199b8145c8dd+ sassc-embedded (1.80.8) sha256=ea62825e4031cc8267e6befd492bcf8e29f11ccc18500f4e8ee9adb7feb6d563sawyer (0.9.3) sha256=0d0f19298408047037638639fe62f4794483fb04320269169bd41af2bdcf5e41securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1shoulda-matchers (7.0.1) sha256=b4bfd8744c10e0a36c8ac1a687f921ee7e25ed529e50488d61b79a8688749c77diff --git a/app/assets/stylesheets/common/foundation/math.scss b/app/assets/stylesheets/common/foundation/math.scssindex 74ff5aa9249..ca1a509a4e5 100644--- a/app/assets/stylesheets/common/foundation/math.scss+++ b/app/assets/stylesheets/common/foundation/math.scss@@ -67,9 +67,10 @@ $SQRT2: 1.4142135623730951;// @param {Number} $x// @param {Number} $exp@function ldexp($x, $exp) {- $b: if($exp >= 0, 2, 1 * 0.5);+ $b: 2;@if $exp < 0 {+ $b: 0.5;$exp: $exp * -1;}@@ -135,7 +136,11 @@ $SQRT2: 1.4142135623730951;$base: $base * $base;}- @return if($s != 0, math.div(1, $r), $r);+ @if $s != 0 {+ $r: math.div(1, $r);+ }++ @return $r;}// Returns E^x, where x is the argument, and E is Euler's constant, the base of the natural logarithms.diff --git a/lib/stylesheet/compiler.rb b/lib/stylesheet/compiler.rbindex bc10897dc1d..fdfca7c2dcb 100644--- a/lib/stylesheet/compiler.rb+++ b/lib/stylesheet/compiler.rb@@ -54,15 +54,9 @@ module Stylesheetload_paths = [ASSET_ROOT]load_paths += options[:load_paths] if options[:load_paths]- silence_deprecations = %w[color-functions import global-builtin]+ silence_deprecations = %w[color-functions import global-builtin if-function]fatal_deprecations = []- if options[:strict_deprecations]- fatal_deprecations << "mixed-decls"- else- silence_deprecations << "mixed-decls"- end-engine =SassC::Engine.new(stylesheet,diff --git a/lib/stylesheet/manager/builder.rb b/lib/stylesheet/manager/builder.rbindex d8b5e6425d4..66976a1ef86 100644--- a/lib/stylesheet/manager/builder.rb+++ b/lib/stylesheet/manager/builder.rb@@ -46,7 +46,6 @@ class Stylesheet::Manager::Buildersource_map_file: source_map_url_relative_from_stylesheet,color_scheme_id: @color_scheme&.id,load_paths: load_paths,- strict_deprecations: %i[desktop mobile admin wizard].include?(@target),)rescue SassC::SyntaxError, SassC::NotRenderedError, AssetProcessor::TranspileError => eif Stylesheet::Manager::THEME_REGEX.match?(@target.to_s)