Allow error messages to be reported in Sass workers

package.bzl

@@ -26,8 +26,8 @@ def rules_sass_dependencies():
     _include_if_not_defined(
         http_archive,
         name = "build_bazel_rules_nodejs",
-        sha256 = "a54b2511d6dae42c1f7cdaeb08144ee2808193a088004fc3b464a04583d5aa2e",
-        urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.42.3/rules_nodejs-0.42.3.tar.gz"],
+        sha256 = "0f2de53628e848c1691e5729b515022f5a77369c76a09fbe55611e12731c90e3",
+        urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.0.1/rules_nodejs-2.0.1.tar.gz"],
     )
 
     # Dependencies from the NodeJS rules. We don't want to use the "package.bzl" dependency macro

sass/BUILD

@@ -10,10 +10,11 @@ exports_files([
 # Executable for the sass_binary rule
 nodejs_binary(
     name = "sass",
-    entry_point = "sass_wrapper",
     data = [
         ":sass_wrapper.js",
-        "@build_bazel_rules_sass_deps//sass",
         "@build_bazel_rules_sass_deps//@bazel/worker",
+        "@build_bazel_rules_sass_deps//minimist",
+        "@build_bazel_rules_sass_deps//sass",
     ],
+    entry_point = "sass_wrapper.js",
 )

sass/package.json

@@ -1,6 +1,7 @@
 {
   "devDependencies": {
     "@bazel/worker": "latest",
+    "minimist": "1.2.5",
     "sass": "1.26.10"
   }
 }

sass/sass.bzl

@@ -13,6 +13,8 @@
 # limitations under the License.
 "Compile Sass files to CSS"
 
+load("@build_bazel_rules_nodejs//:providers.bzl", "NodeRuntimeDepsInfo", "run_node")
+
 _ALLOWED_SRC_FILE_EXTENSIONS = [".sass", ".scss", ".css", ".svg", ".png", ".gif", ".cur", ".jpg", ".webp"]
 
 # Documentation for switching which compiler is used
@@ -104,10 +106,11 @@ def _run_sass(ctx, input, css_output, map_output = None):
     args.use_param_file("@%s", use_always = True)
     args.set_param_file_format("multiline")
 
-    ctx.actions.run(
+    run_node(
+        ctx,
         mnemonic = "SassCompiler",
-        executable = ctx.executable.compiler,
-        inputs = _collect_transitive_sources([input], ctx.attr.deps),
+        executable = "compiler",
+        inputs = _collect_transitive_sources([input], ctx.attr.deps).to_list(),
         tools = [ctx.executable.compiler],
         arguments = [args],
         outputs = [css_output, map_output] if map_output else [css_output],
@@ -239,10 +242,8 @@ sass_binary = rule(
 
 def _multi_sass_binary_impl(ctx):
   """multi_sass_binary accepts a list of sources and compile all in one pass.
-
   Args:
     ctx: The Bazel build context
-
   Returns:
     The multi_sass_binary rule.
   """
@@ -268,26 +269,27 @@ def _multi_sass_binary_impl(ctx):
       ))
 
   # Use the package directory as the compilation root given to the Sass compiler
-  root_dir = (ctx.label.workspace_root + "/" if ctx.label.workspace_root else "") + ctx.label.package
+  load_dir = (ctx.label.workspace_root + "/" if ctx.label.workspace_root else "") + ctx.label.package
 
   # Declare arguments passed through to the Sass compiler.
   # Start with flags and then expected program arguments.
   args = ctx.actions.args()
   args.add("--style", ctx.attr.output_style)
-  args.add("--load-path", root_dir)
+  args.add("--load-path", load_dir)
 
   if not ctx.attr.sourcemap:
     args.add("--no-source-map")
 
-  args.add(root_dir + ":" + ctx.bin_dir.path + '/' + root_dir)
+  args.add(load_dir + ":" + ctx.bin_dir.path + '/' + load_dir)
   args.use_param_file("@%s", use_always = True)
   args.set_param_file_format("multiline")
 
   if inputs:
-    ctx.actions.run(
+    run_node(
+        ctx,
         inputs = inputs,
         outputs = outputs,
-        executable = ctx.executable.compiler,
+        executable = "compiler",
         arguments = [args],
         mnemonic = "SassCompiler",
         progress_message = "Compiling Sass",

sass/sass_repositories.bzl

@@ -22,7 +22,8 @@ def sass_repositories():
 
     # 0.31.1: entry_point attribute of rules_nodejs is now a label
     # 0.32.0: @npm//node_modules/foobar:foobar.js labels changed to @npm//:node_modules/foobar/foobar.js with fix for bazelbuild/rules_nodejs#802.
-    check_rules_nodejs_version("0.32.0")
+    # 2.0.1: run_node exported as part of its external API
+    check_rules_nodejs_version("2.0.1")
 
     yarn_install(
         name = "build_bazel_rules_sass_deps",

sass/sass_wrapper.js

@@ -13,11 +13,44 @@
 const {debug, runAsWorker, runWorkerLoop} = require('@bazel/worker');
 const sass = require('sass');
 const fs = require('fs');
+const minimist = require('minimist');
 
 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 => {
+    const argv = minimist(args);
+    const positionalArgs = argv['_'];
+    const output = positionalArgs[1];
+    const input = positionalArgs[0];
+
+    const sourceMap =
+      typeof argv['source-map'] === 'boolean' ? argv['source-map'] : true;
+    const embedSources =
+      typeof argv['embed-sources'] === 'boolean'
+        ? argv['embed-sources']
+        : false;
+
+    try {
+      const result = sass.renderSync({
+        file: input,
+        outFile: output,
+        includePaths: argv['load-path'],
+        outputStyle: argv['style'],
+        sourceMap,
+        sourceMapContents: embedSources
+      });
+
+      fs.writeFileSync(output, result.css);
+      if (sourceMap) {
+        fs.writeFileSync(output + '.map', result.map);
+      }
+      return true;
+    } catch (e) {
+      console.error(e.message);
+      return false;
+    }
+  });
   // Note: intentionally don't process.exit() here, because runWorkerLoop
   // is waiting for async callbacks from node.
 } else {

sass/yarn.lock

@@ -155,6 +155,11 @@ long@^4.0.0:
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
+[email protected]:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
 normalize-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"