Skip to content

Commit f8a2c0c

Browse files
committed
chore: upgrade rules_nodejs to 2.0
1 parent 5e5d004 commit f8a2c0c

File tree

30 files changed

+649
-434
lines changed

30 files changed

+649
-434
lines changed

BUILD.bazel

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,70 @@
11
load("@io_bazel_rules_k8s//k8s:objects.bzl", "k8s_objects")
2+
load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
23

34
package(default_visibility = ["//services:__subpackages__"])
45

56
exports_files(["tsconfig.json"])
67

8+
pkg_npm(
9+
name = "config_pkg",
10+
package_name = "@centsideas/config",
11+
deps = ["//packages/config"],
12+
)
13+
14+
pkg_npm(
15+
name = "dependency_injection_pkg",
16+
package_name = "@centsideas/dependency-injection",
17+
deps = ["//packages/dependency-injection"],
18+
)
19+
20+
pkg_npm(
21+
name = "enums_pkg",
22+
package_name = "@centsideas/enums",
23+
deps = ["//packages/enums"],
24+
)
25+
26+
pkg_npm(
27+
name = "event_sourcing_pkg",
28+
package_name = "@centsideas/event-sourcing",
29+
deps = ["//packages/event-sourcing"],
30+
)
31+
32+
pkg_npm(
33+
name = "models_pkg",
34+
package_name = "@centsideas/models",
35+
deps = ["//packages/models"],
36+
)
37+
38+
pkg_npm(
39+
name = "rpc_pkg",
40+
package_name = "@centsideas/rpc",
41+
deps = ["//packages/rpc"],
42+
)
43+
44+
pkg_npm(
45+
name = "schemas_pkg",
46+
package_name = "@centsideas/schemas",
47+
deps = ["//packages/schemas"],
48+
)
49+
50+
pkg_npm(
51+
name = "testing_pkg",
52+
package_name = "@centsideas/testing",
53+
deps = ["//packages/testing"],
54+
)
55+
56+
pkg_npm(
57+
name = "types_pkg",
58+
package_name = "@centsideas/types",
59+
deps = ["//packages/types"],
60+
)
61+
62+
pkg_npm(
63+
name = "utils_pkg",
64+
package_name = "@centsideas/utils",
65+
deps = ["//packages/utils"],
66+
)
67+
768
k8s_objects(
869
name = "k8s",
970
objects = [

WORKSPACE

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,16 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
88
# https://github.com/bazelbuild/rules_nodejs/releases
99
http_archive(
1010
name = "build_bazel_rules_nodejs",
11-
sha256 = "84abf7ac4234a70924628baa9a73a5a5cbad944c4358cf9abdb4aab29c9a5b77",
12-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.7.0/rules_nodejs-1.7.0.tar.gz"],
11+
sha256 = "10fffa29f687aa4d8eb6dfe8731ab5beb63811ab00981fc84a93899641fd4af1",
12+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/2.0.3/rules_nodejs-2.0.3.tar.gz"],
13+
)
14+
15+
# https://github.com/bazelbuild/rules_sass#setup
16+
http_archive(
17+
name = "io_bazel_rules_sass",
18+
sha256 = "9dcfba04e4af896626f4760d866f895ea4291bc30bf7287887cefcf4707b6a62",
19+
strip_prefix = "rules_sass-1.26.3",
20+
url = "https://github.com/bazelbuild/rules_sass/archive/1.26.3.zip",
1321
)
1422

1523
load("@build_bazel_rules_nodejs//:index.bzl", "yarn_install")
@@ -20,18 +28,17 @@ yarn_install(
2028
yarn_lock = "//:yarn.lock",
2129
)
2230

23-
load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
24-
25-
install_bazel_dependencies()
26-
27-
load("@npm_bazel_protractor//:package.bzl", "npm_bazel_protractor_dependencies")
31+
# Load @bazel/protractor dependencies
32+
load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")
2833

2934
npm_bazel_protractor_dependencies()
3035

31-
load("@npm_bazel_karma//:package.bzl", "npm_bazel_karma_dependencies")
36+
# Load @bazel/karma dependencies
37+
load("@npm//@bazel/karma:package.bzl", "npm_bazel_karma_dependencies")
3238

3339
npm_bazel_karma_dependencies()
3440

41+
# Setup the rules_webtesting toolchain
3542
load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
3643

3744
web_test_repositories()
@@ -42,18 +49,13 @@ browser_repositories(
4249
chromium = True,
4350
firefox = True,
4451
)
52+
# load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
4553

46-
load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
54+
# install_bazel_dependencies()
4755

48-
ts_setup_workspace()
56+
# load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
4957

50-
# https://github.com/bazelbuild/rules_sass#setup
51-
http_archive(
52-
name = "io_bazel_rules_sass",
53-
sha256 = "9dcfba04e4af896626f4760d866f895ea4291bc30bf7287887cefcf4707b6a62",
54-
strip_prefix = "rules_sass-1.26.3",
55-
url = "https://github.com/bazelbuild/rules_sass/archive/1.26.3.zip",
56-
)
58+
# ts_setup_workspace()
5759

5860
load("@io_bazel_rules_sass//:package.bzl", "rules_sass_dependencies")
5961

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/node_modules/jest-haste-map/build/crawlers/node.js b/node_modules/jest-haste-map/build/crawlers/node.js
2+
index e952733..9310716 100644
3+
--- a/node_modules/jest-haste-map/build/crawlers/node.js
4+
+++ b/node_modules/jest-haste-map/build/crawlers/node.js
5+
@@ -217,7 +217,11 @@ function find(roots, extensions, ignore, callback) {
6+
7+
function findNative(roots, extensions, ignore, callback) {
8+
const args = Array.from(roots);
9+
+ args.push('(');
10+
args.push('-type', 'f');
11+
+ args.push('-o');
12+
+ args.push('-type', 'l');
13+
+ args.push(')');
14+
15+
if (extensions.length) {
16+
args.push('(');

misc/patches/typescript+3.9.6.patch renamed to misc/patches/typescript+3.9.7.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/node_modules/typescript/lib/typescript.js b/node_modules/typescript/lib/typescript.js
2-
index 73d31bc..b455995 100644
2+
index cb5199f..665d249 100644
33
--- a/node_modules/typescript/lib/typescript.js
44
+++ b/node_modules/typescript/lib/typescript.js
5-
@@ -92621,6 +92621,7 @@ var ts;
5+
@@ -92623,6 +92623,7 @@ var ts;
66
}
77
ts.isInternalDeclaration = isInternalDeclaration;
88
var declarationEmitNodeBuilderFlags = 1024 /* MultilineObjectLiterals */ |

package.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,13 @@
7979
"@babel/cli": "7.10.5",
8080
"@bazel/bazelisk": "1.5.0",
8181
"@bazel/buildifier": "3.3.0",
82+
"@bazel/buildozer": "^3.4.0",
8283
"@bazel/ibazel": "0.13.1",
83-
"@bazel/karma": "1.7.0",
84-
"@bazel/protractor": "1.7.0",
85-
"@bazel/rollup": "1.7.0",
86-
"@bazel/terser": "1.7.0",
87-
"@bazel/typescript": "1.7.0",
84+
"@bazel/karma": "^2.0.3",
85+
"@bazel/protractor": "^2.0.3",
86+
"@bazel/rollup": "^2.0.3",
87+
"@bazel/terser": "^2.0.3",
88+
"@bazel/typescript": "^2.0.3",
8889
"@ngrx/store-devtools": "9.2.0",
8990
"@nguniversal/builders": "10.0.1",
9091
"@types/async-retry": "1.4.2",
@@ -98,6 +99,7 @@
9899
"@types/jasmine": "3.5.11",
99100
"@types/jasminewd2": "2.0.8",
100101
"@types/jest": "^26.0.5",
102+
"@types/jest-cli": "^24.3.0",
101103
"@types/jsonwebtoken": "8.5.0",
102104
"@types/kafkajs": "1.9.0",
103105
"@types/module-alias": "2.0.0",
@@ -118,6 +120,7 @@
118120
"jasmine-core": "3.5.0",
119121
"jasmine-spec-reporter": "5.0.2",
120122
"jest": "26.1.0",
123+
"jest-cli": "^26.4.2",
121124
"karma": "5.1.0",
122125
"karma-chrome-launcher": "3.1.0",
123126
"karma-firefox-launcher": "1.3.0",

packages/config/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_bazel_typescript//:index.bzl", "ts_library")
1+
load("@npm//@bazel/typescript:index.bzl", "ts_library")
22

33
package(default_visibility = ["//visibility:public"])
44

packages/dependency-injection/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_bazel_typescript//:index.bzl", "ts_library")
1+
load("@npm//@bazel/typescript:index.bzl", "ts_library")
22

33
package(default_visibility = ["//visibility:public"])
44

packages/enums/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_bazel_typescript//:index.bzl", "ts_library")
1+
load("@npm//@bazel/typescript:index.bzl", "ts_library")
22

33
package(default_visibility = ["//visibility:public"])
44

packages/event-sourcing/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm_bazel_typescript//:index.bzl", "ts_library")
1+
load("@npm//@bazel/typescript:index.bzl", "ts_library")
22
load("@centsideas//packages/jest:jest.bzl", "ts_jest")
33

44
package(default_visibility = ["//visibility:public"])

packages/jest/jest.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
load("@npm//jest-cli:index.bzl", _jest_test = "jest_test")
2-
load("@npm_bazel_typescript//:index.bzl", "ts_library")
2+
load("@npm//@bazel/typescript:index.bzl", "ts_library")
3+
#load("@npm_bazel_typescript//:index.bzl", "ts_library")
34

45
def jest_test(name, srcs, deps, jest_config, data = [], **kwargs):
56
"""Wrapper for running jest tests with the jest cli

0 commit comments

Comments
 (0)