From f32bca2a1ceee07a17f3690175530b5adc5a36a0 Mon Sep 17 00:00:00 2001 From: zemnmez Date: Thu, 12 May 2022 14:14:11 -0700 Subject: [PATCH 1/3] Move tools/jest into js/jest --- {tools => js}/jest/BUILD | 0 {tools => js}/jest/jest_reporter.ts | 0 tools/jest/jest.bzl => js/jest/rules.bzl | 2 +- rules.bzl | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename {tools => js}/jest/BUILD (100%) rename {tools => js}/jest/jest_reporter.ts (100%) rename tools/jest/jest.bzl => js/jest/rules.bzl (93%) diff --git a/tools/jest/BUILD b/js/jest/BUILD similarity index 100% rename from tools/jest/BUILD rename to js/jest/BUILD diff --git a/tools/jest/jest_reporter.ts b/js/jest/jest_reporter.ts similarity index 100% rename from tools/jest/jest_reporter.ts rename to js/jest/jest_reporter.ts diff --git a/tools/jest/jest.bzl b/js/jest/rules.bzl similarity index 93% rename from tools/jest/jest.bzl rename to js/jest/rules.bzl index ac84928e57..1761f64638 100644 --- a/tools/jest/jest.bzl +++ b/js/jest/rules.bzl @@ -14,7 +14,7 @@ def jest_test(name, srcs, deps = [], jest_config = "//:jest.ts.config.js", link_ for src in srcs: templated_args.extend(["--runTestsByPath", "$(rootpath %s)" % src]) - data = [jest_config] + srcs + deps + ["//tools/jest:jest_reporter_js"] + data = [jest_config] + srcs + deps + ["//js/jest:jest_reporter_js"] _jest_test( name = name, data = data, diff --git a/rules.bzl b/rules.bzl index 4d31adab3f..275baae265 100644 --- a/rules.bzl +++ b/rules.bzl @@ -1,4 +1,4 @@ -load("//tools/jest:jest.bzl", _jest_test = "jest_test") +load("//js/jest:rules.bzl", _jest_test = "jest_test") load("//tools/go:go.bzl", _test_go_fmt = "test_go_fmt") load("@io_bazel_rules_go//go:def.bzl", _go_binary = "go_binary", _go_library = "go_library", _go_test = "go_test") load("@npm//@bazel/typescript:index.bzl", _ts_config = "ts_config", _ts_project = "ts_project") From 347de22a4cb6e1bdcd06c8caa8da984a1cbe39d6 Mon Sep 17 00:00:00 2001 From: Thomas Neil James Shadwell Date: Sun, 15 May 2022 17:59:10 +0900 Subject: [PATCH 2/3] Update rules.bzl --- rules.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules.bzl b/rules.bzl index 275baae265..bab9ae7012 100644 --- a/rules.bzl +++ b/rules.bzl @@ -1,5 +1,5 @@ load("//js/jest:rules.bzl", _jest_test = "jest_test") -load("//tools/go:go.bzl", _test_go_fmt = "test_go_fmt") +load("//go/lint:rules.bzl", _test_go_fmt = "test_go_fmt") load("@io_bazel_rules_go//go:def.bzl", _go_binary = "go_binary", _go_library = "go_library", _go_test = "go_test") load("@npm//@bazel/typescript:index.bzl", _ts_config = "ts_config", _ts_project = "ts_project") load("@npm//eslint:index.bzl", _eslint_test = "eslint_test") From 38290c790506c810b59cee49fbd0dda16405fa14 Mon Sep 17 00:00:00 2001 From: Thomas Neil James Shadwell Date: Sun, 15 May 2022 18:00:13 +0900 Subject: [PATCH 3/3] Update rules.bzl --- rules.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules.bzl b/rules.bzl index bab9ae7012..6bb2376e45 100644 --- a/rules.bzl +++ b/rules.bzl @@ -1,5 +1,5 @@ load("//js/jest:rules.bzl", _jest_test = "jest_test") -load("//go/lint:rules.bzl", _test_go_fmt = "test_go_fmt") +load("//go/fmt:rules.bzl", _test_go_fmt = "test_go_fmt") load("@io_bazel_rules_go//go:def.bzl", _go_binary = "go_binary", _go_library = "go_library", _go_test = "go_test") load("@npm//@bazel/typescript:index.bzl", _ts_config = "ts_config", _ts_project = "ts_project") load("@npm//eslint:index.bzl", _eslint_test = "eslint_test")