Skip to content

Commit 553b3ea

Browse files
authored
chore: remove use of WORKSPACE in main repo (#181)
### Changes are visible to end-users: no ### Test plan - Covered by existing test cases
1 parent 13d4aec commit 553b3ea

7 files changed

Lines changed: 57 additions & 153 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ jobs:
7777
- os: windows
7878
bazel-version:
7979
major: 6
80+
# Root repository no longer tests non-bzlmod/WORKSPACE
81+
- folder: .
82+
bzlmod: 0
8083
# TODO
8184
- folder: e2e/loaders
8285
bzlmod: 1

BUILD.bazel

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary")
2-
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
32
load("@buildifier_prebuilt//:rules.bzl", "buildifier")
43
load("@npm//:defs.bzl", "npm_link_all_packages")
54

@@ -32,13 +31,3 @@ buildifier(
3231
mode = "diff",
3332
tags = ["manual"], # tag as manual so windows ci does not build it by default
3433
)
35-
36-
bzl_library(
37-
name = "internal_deps",
38-
srcs = ["internal_deps.bzl"],
39-
visibility = ["//visibility:public"],
40-
deps = [
41-
"@bazel_tools//tools/build_defs/repo:http.bzl",
42-
"@bazel_tools//tools/build_defs/repo:utils.bzl",
43-
],
44-
)

MODULE.bazel

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,32 @@ use_repo(tel, "aspect_tools_telemetry_report")
1818
####### Dev dependencies ########
1919

2020
bazel_dep(name = "bazel_features", version = "0.1.0", dev_dependency = True)
21+
bazel_dep(name = "platforms", version = "0.0.8", dev_dependency = True)
2122
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True)
2223
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
2324
bazel_dep(name = "gazelle", version = "0.36.0", dev_dependency = True, repo_name = "bazel_gazelle")
24-
bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True, repo_name = "io_bazel_stardoc")
25+
26+
buildifier_prebuilt = use_extension(
27+
"@buildifier_prebuilt//:defs.bzl",
28+
"buildifier_prebuilt_deps_extension",
29+
dev_dependency = True,
30+
)
31+
use_repo(
32+
buildifier_prebuilt,
33+
"buildifier_prebuilt_toolchains",
34+
)
35+
36+
register_toolchains(
37+
"@buildifier_prebuilt_toolchains//:all",
38+
dev_dependency = True,
39+
)
40+
41+
# NPM packages for testing
42+
npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm", dev_dependency = True)
43+
npm.npm_translate_lock(
44+
name = "npm",
45+
npmrc = "//:.npmrc",
46+
pnpm_lock = "//:pnpm-lock.yaml",
47+
verify_node_modules_ignored = "//:.bazelignore",
48+
)
49+
use_repo(npm, "npm")

WORKSPACE

Lines changed: 1 addition & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1 @@
1-
workspace(name = "aspect_rules_webpack")
2-
3-
load("//:internal_deps.bzl", "rules_webpack_internal_deps")
4-
5-
rules_webpack_internal_deps()
6-
7-
load("//webpack:dependencies.bzl", "rules_webpack_dependencies")
8-
9-
rules_webpack_dependencies()
10-
11-
load("@aspect_rules_js//js:toolchains.bzl", "DEFAULT_NODE_VERSION", "rules_js_register_toolchains")
12-
13-
rules_js_register_toolchains(node_version = DEFAULT_NODE_VERSION)
14-
15-
load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
16-
17-
npm_translate_lock(
18-
name = "npm",
19-
npmrc = "//:.npmrc",
20-
pnpm_lock = "//:pnpm-lock.yaml",
21-
verify_node_modules_ignored = "//:.bazelignore",
22-
)
23-
24-
load("@npm//:repositories.bzl", "npm_repositories")
25-
26-
npm_repositories()
27-
28-
# For running our own unit tests
29-
load("@bazel_skylib//lib:unittest.bzl", "register_unittest_toolchains")
30-
31-
register_unittest_toolchains()
32-
33-
############################################
34-
# Gazelle, for generating bzl_library targets
35-
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
36-
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
37-
38-
go_rules_dependencies()
39-
40-
go_register_toolchains(version = "1.19.3")
41-
42-
gazelle_dependencies()
43-
44-
############################################
45-
# Stardoc
46-
load("@io_bazel_stardoc//:setup.bzl", "stardoc_repositories")
47-
48-
stardoc_repositories()
49-
50-
load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
51-
52-
rules_jvm_external_deps()
53-
54-
load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
55-
56-
rules_jvm_external_setup()
57-
58-
load("@io_bazel_stardoc//:deps.bzl", "stardoc_external_deps")
59-
60-
stardoc_external_deps()
61-
62-
load("@stardoc_maven//:defs.bzl", stardoc_pinned_maven_install = "pinned_maven_install")
63-
64-
stardoc_pinned_maven_install()
65-
66-
# Buildifier
67-
load("@buildifier_prebuilt//:deps.bzl", "buildifier_prebuilt_deps")
68-
69-
buildifier_prebuilt_deps()
70-
71-
load("@buildifier_prebuilt//:defs.bzl", "buildifier_prebuilt_register_toolchains")
72-
73-
buildifier_prebuilt_register_toolchains()
1+
fail("No local WORKSPACE development - use MODULE.bazel")

WORKSPACE.bzlmod

Whitespace-only changes.

0 commit comments

Comments
 (0)