Skip to content
This repository has been archived by the owner on Aug 25, 2024. It is now read-only.

Commit

Permalink
chore: update Aspect rules to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
alexeagle committed Oct 4, 2023
1 parent d9583eb commit ff9e95f
Show file tree
Hide file tree
Showing 14 changed files with 226 additions and 804 deletions.
3 changes: 3 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ test --test_output=errors --test_summary=detailed

common --enable_bzlmod

# passes an argument `--skipLibCheck` to *every* spawn of tsc
common --@aspect_rules_ts//ts:skipLibCheck=always

# The CNIOBoringSSL library uses C++14 features like 'enable_if_t' macro support.
# For more details on how to enable this in Bazel:
# https://stackoverflow.com/questions/40260242/how-to-set-c-standard-version-when-build-with-bazel/43388168#43388168
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.3.2
6.4.0rc1
4 changes: 4 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Disabling pnpm [hoisting](https://pnpm.io/npmrc#hoist) by setting `hoist=false` is recommended on
# projects using rules_js so that pnpm outside of Bazel lays out a node_modules tree similar to what
# rules_js lays out under Bazel (without a hidden node_modules/.pnpm/node_modules)
hoist=false
7 changes: 4 additions & 3 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
"Declare dependencies for bzlmod, see https://bazel.build/build/bzlmod"

bazel_dep(name = "aspect_bazel_lib", version = "1.19.0")
bazel_dep(name = "aspect_rules_js", version = "1.13.1")
bazel_dep(name = "aspect_rules_ts", version = "1.0.5")
bazel_dep(name = "aspect_bazel_lib", version = "1.35.0")
bazel_dep(name = "aspect_rules_js", version = "1.32.6")
bazel_dep(name = "aspect_rules_ts", version = "2.0.0")
bazel_dep(name = "aspect_rules_swc", version = "1.1.0")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
bazel_dep(name = "gazelle", version = "0.32.0", repo_name = "bazel_gazelle")
bazel_dep(name = "protobuf", version = "21.7")
Expand Down
1 change: 0 additions & 1 deletion backend/cmd/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (

"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/grpc"
// TODO(dannark): change to "github.com/dkelmer/bootcamp/proto/greeter" when moved
pb "bootcamp/schema/logger"
"google.golang.org/grpc/reflection"
)
Expand Down
3 changes: 3 additions & 0 deletions frontend/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
load("@aspect_rules_ts//ts:defs.bzl", "ts_project")
load("@aspect_rules_js//js:defs.bzl", "js_run_devserver")
load("@aspect_rules_swc//swc:defs.bzl", "swc")
load("@npm//:defs.bzl", "npm_link_all_packages")
load("@npm//frontend:http-server/package_json.bzl", "bin")

Expand All @@ -8,6 +9,8 @@ npm_link_all_packages(name = "node_modules")
ts_project(
name = "compile",
srcs = ["index.ts"],
declaration = True,
transpiler = swc,
deps = [
"//schema/logger:logger_ts_proto",
],
Expand Down
2 changes: 1 addition & 1 deletion frontend/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { LogMessage } from "../schema/logger/logger_ts_proto";
import type { LogMessage } from "../schema/logger/logger_pb";

class ServerLogs {
getServerLogs(): Promise<Array<LogMessage>> {
Expand Down
1 change: 1 addition & 0 deletions frontend/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"compilerOptions": {
"declaration": true,
"module": "ES2022",
"moduleResolution": "node",
"isolatedModules": true,
Expand Down
Loading

0 comments on commit ff9e95f

Please sign in to comment.