diff --git a/WORKSPACE b/WORKSPACE index 6864ad3cfc32..4b9fc8f051f9 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,11 +15,11 @@ http_archive( # Add sass rules http_archive( name = "io_bazel_rules_sass", - sha256 = "596ab3616d370135e0ecc710e103422e0aa3719f1c970303a0886b70c81ee819", - strip_prefix = "rules_sass-1.32.2", + sha256 = "9ad74e6e75a86939f4349b31d43bb1db4279e4f2a139c5ebaf56cf99feea1faa", + strip_prefix = "rules_sass-1.32.8", urls = [ - "https://github.com/bazelbuild/rules_sass/archive/1.32.2.zip", - "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.32.2.zip", + "https://github.com/bazelbuild/rules_sass/archive/1.32.8.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.32.8.zip", ], ) diff --git a/package.json b/package.json index 32de4159e5c2..a274d070616f 100644 --- a/package.json +++ b/package.json @@ -205,7 +205,7 @@ "rollup-plugin-commonjs": "^10.1.0", "rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-sourcemaps": "^0.6.3", - "sass": "^1.29.0", + "sass": "^1.32.8", "selenium-webdriver": "^3.6.0", "semver": "^7.3.4", "send": "^0.17.1", diff --git a/tools/postinstall/sass_worker_async.patch b/tools/postinstall/sass_worker_async.patch deleted file mode 100644 index ec1f3594159b..000000000000 --- a/tools/postinstall/sass_worker_async.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git sass/sass_wrapper.js sass/sass_wrapper.js -index ad1f7a6..957d56e 100644 ---- sass/sass_wrapper.js -+++ sass/sass_wrapper.js -@@ -17,7 +17,17 @@ const fs = require('fs'); - const args = process.argv.slice(2); - if (runAsWorker(args)) { - debug('Starting Sass compiler persistent worker...'); -- runWorkerLoop(args => sass.cli_pkg_main_0_(args)); -+ runWorkerLoop(args => { -+ return new Promise(resolve => { -+ const result = sass.cli_pkg_main_0_(args); -+ const originalThen = result.then$1$2$onError; -+ let dynamicType; -+ result.then$1$2$onError = (receiver, done, error, type) => dynamicType = type; -+ result.then$1(); -+ result.then$1$2$onError = originalThen; -+ result.then$1$2$onError(null, () => resolve(true), () => resolve(false), dynamicType); -+ }); -+ }); - // Note: intentionally don't process.exit() here, because runWorkerLoop - // is waiting for async callbacks from node. - } else { diff --git a/yarn.lock b/yarn.lock index 36d28dd709f9..073a29494b1f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11492,7 +11492,7 @@ sass-lookup@^3.0.0: dependencies: commander "^2.16.0" -sass@^1.29.0: +sass@^1.32.8: version "1.32.8" resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz#f16a9abd8dc530add8834e506878a2808c037bdc" integrity sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==