Fixing a few linters and formatters

Author: menny

.bazelrc

@@ -7,9 +7,9 @@ build --incompatible_merge_fixed_and_default_shell_env
 
 # Allow network for pnpm/npm fetching (until cached)
 # But standard build should be sandboxed
-# build --sandbox_default_allow_network=false
+build --sandbox_default_allow_network=false
 
 # Linting configuration
-build:lint --aspects=//tools/lint:linters.bzl%ktlint
+build:lint --aspects=@//tools/lint:linters.bzl%ktlint
 build:lint --output_groups=rules_lint_report
 build:lint --@aspect_rules_lint//lint:fail_on_violation

.editorconfig

@@ -9,4 +9,4 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 
 [*.kt]
-indent_size = 4
+indent_size = 2

BUILD.bazel

@@ -1,21 +1,10 @@
-load("@aspect_rules_js//js:defs.bzl", "js_library")
 load("@bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
 load("@npm_rulesjs//:defs.bzl", "npm_link_all_packages")
-load("@npm_rulesjs//:eslint/package_json.bzl", eslint_bin = "bin")
-load("@npm_rulesjs//:prettier/package_json.bzl", prettier_bin = "bin")
 
 package(default_visibility = ["//visibility:public"])
 
 npm_link_all_packages(name = "node_modules")
 
-exports_files([
-    ".editorconfig",
-    ".prettierrc",
-    ".prettierignore",
-    "eslint.config.mjs",
-    "package.json",
-])
-
 # copy_to_bin targets to expose configuration files to the output tree
 copy_to_bin(
     name = "editorconfig_bin",
@@ -37,49 +26,6 @@ copy_to_bin(
     srcs = [".prettierignore"],
 )
 
-js_library(
-    name = "eslint_config",
-    srcs = [":eslint_config_bin"],
-)
-
-js_library(
-    name = "prettier_config",
-    srcs = [
-        ":prettier_config_bin",
-        ":prettier_ignore_bin",
-    ],
-)
-
-prettier_bin.prettier_binary(
-    name = "prettier",
-    args = [
-        "--config=$(rootpath :prettier_config_bin)",
-        "--ignore-path=$(rootpath :prettier_ignore_bin)",
-        "--ignore-unknown",
-    ],
-    data = [
-        ":prettier_config_bin",
-        ":prettier_ignore_bin",
-    ],
-    env = {"BAZEL_BINDIR": "."},
-)
-
-eslint_bin.eslint_binary(
-    name = "eslint",
-    data = [
-        ":eslint_config",
-        "//:node_modules/@eslint/js",
-        "//:node_modules/typescript-eslint",
-    ],
-    env = {"BAZEL_BINDIR": "."},
-    fixed_args = ["--no-error-on-unmatched-pattern"],
-)
-
-alias(
-    name = "ktlint_jar_alias",
-    actual = "@ktlint_jar//jar",
-)
-
 alias(
     name = "format",
     actual = "//tools/format:format",

MODULE.bazel

@@ -31,9 +31,9 @@ bazel_dep(name = "aspect_rules_ts", version = "3.8.7")
 bazel_dep(name = "rules_nodejs", version = "6.7.3")
 
 # Linting
-bazel_dep(name = "aspect_rules_lint", version = "2.3.0")
+bazel_dep(name = "aspect_rules_lint", version = "2.5.0")
 
-bazel_dep(name = "buildifier_prebuilt", version = "8.2.1.1", dev_dependency = True)
+bazel_dep(name = "buildifier_prebuilt", version = "8.5.1", dev_dependency = True)
 
 # Node.js toolchain setup
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)
@@ -67,3 +67,7 @@ http_jar(
 lint = use_extension("@aspect_rules_lint//lint:extensions.bzl", "tools")
 lint.ktlint(name = "com_github_pinterest_ktlint")
 use_repo(lint, "com_github_pinterest_ktlint")
+
+format_tools = use_extension("@aspect_rules_lint//format:extensions.bzl", "tools")
+format_tools.ktfmt()
+use_repo(format_tools, "ktfmt")

MODULE.bazel.lock

@@ -1,3 +1,3 @@
 fun main() {
-    println("hello")
+  println("hello")
 }

backend/Main.kt

@@ -4,8 +4,8 @@ import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 
 class MainTest {
-    @Test
-    fun testAlwaysPasses() {
-        assertTrue(true)
-    }
+  @Test
+  fun testAlwaysPasses() {
+    assertTrue(true)
+  }
 }

backend/MainTest.kt

@@ -0,0 +1,37 @@
+load("@npm_rulesjs//:eslint/package_json.bzl", eslint_bin = "bin")
+load("@npm_rulesjs//:prettier/package_json.bzl", prettier_bin = "bin")
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
+
+package(default_visibility = ["//visibility:public"])
+
+prettier_bin.prettier_binary(
+    name = "prettier",
+    args = [
+        "--config=$(rootpath //:prettier_config_bin)",
+        "--ignore-path=$(rootpath //:prettier_ignore_bin)",
+        "--ignore-unknown",
+    ],
+    data = [
+        "//:prettier_config_bin",
+        "//:prettier_ignore_bin",
+    ],
+    env = {"BAZEL_BINDIR": "."},
+)
+
+sh_binary(
+    name = "prettier_filter_links",
+    srcs = ["prettier_filter_links.sh"],
+    data = [":prettier"],
+    env = {"PRETTIER_BIN": "$(rootpath :prettier)"},
+)
+
+eslint_bin.eslint_binary(
+    name = "eslint",
+    data = [
+        "//:node_modules/@eslint/js",
+        "//:node_modules/typescript-eslint",
+        "//:prettier_config_bin",
+    ],
+    env = {"BAZEL_BINDIR": "."},
+    fixed_args = ["--no-error-on-unmatched-pattern"],
+)

tools/BUILD.bazel

@@ -3,23 +3,16 @@ load("@aspect_rules_lint//format:defs.bzl", "format_multirun")
 package(default_visibility = ["//visibility:public"])
 
 java_binary(
-    name = "ktlint",
-    main_class = "com.pinterest.ktlint.Main",
-    runtime_deps = ["@ktlint_jar//jar"],
-)
-
-sh_binary(
-    name = "prettier",
-    srcs = ["prettier.sh"],
-    data = ["//:node_modules/prettier"],
+    name = "ktfmt",
+    main_class = "com.facebook.ktfmt.cli.Main",
+    runtime_deps = ["@ktfmt//jar"],
 )
 
 format_multirun(
     name = "format",
-    javascript = ":prettier",
-    kotlin = ":ktlint",
-    kotlin_fix_args = ["-F"],
-    markdown = ":prettier",
+    javascript = "//tools:prettier_filter_links",
+    kotlin = ":ktfmt",
+    markdown = "//tools:prettier_filter_links",
     starlark = "@buildifier_prebuilt//:buildifier",
-    yaml = ":prettier",
+    yaml = "//tools:prettier_filter_links",
 )