Skip to content

Commit 2888934

Browse files
devversiondevversion
committed
build: migrate theming tests to rules_js
Migrates the theming tests to `rules_js`. This also requires us to bring in the Jasmine ruleset, and fix some issues with the test tsconfig.
1 parent 2d7da0a commit 2888934

17 files changed

+89
-30
lines changed

‎.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
33
# This file should be checked into version control along with the pnpm-lock.yaml file.
44
.npmrc=-2023857461
5-
package.json=-2113674231
6-
pnpm-lock.yaml=409413002
5+
package.json=-370577278
6+
pnpm-lock.yaml=997015112
77
pnpm-workspace.yaml=1711114604
8-
yarn.lock=1593491870
8+
yarn.lock=-987404687

‎WORKSPACE

+11
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,17 @@ http_archive(
209209
url = "https://github.com/aspect-build/rules_rollup/releases/download/v2.0.0/rules_rollup-v2.0.0.tar.gz",
210210
)
211211

212+
http_archive(
213+
name = "aspect_rules_jasmine",
214+
sha256 = "0d2f9c977842685895020cac721d8cc4f1b37aae15af46128cf619741dc61529",
215+
strip_prefix = "rules_jasmine-2.0.0",
216+
url = "https://github.com/aspect-build/rules_jasmine/releases/download/v2.0.0/rules_jasmine-v2.0.0.tar.gz",
217+
)
218+
219+
load("@aspect_rules_jasmine//jasmine:dependencies.bzl", "rules_jasmine_dependencies")
220+
221+
rules_jasmine_dependencies()
222+
212223
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
213224

214225
git_repository(

‎package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"tslint": "tslint -c tslint.json --project ./tsconfig.json",
3939
"stylelint": "stylelint \"src/**/*.+(css|scss)\" --config .stylelintrc.json",
4040
"resync-caretaker-app": "ts-node --project scripts/tsconfig.json scripts/caretaking/resync-caretaker-app-prs.ts",
41-
"ts-circular-deps:check": "yarn -s ng-dev ts-circular-deps check --config ./src/circular-deps-test.conf.js",
42-
"ts-circular-deps:approve": "yarn -s ng-dev ts-circular-deps approve --config ./src/circular-deps-test.conf.js",
41+
"ts-circular-deps:check": "yarn -s ng-dev ts-circular-deps check --config ./src/circular-deps-test.conf.cjs",
42+
"ts-circular-deps:approve": "yarn -s ng-dev ts-circular-deps approve --config ./src/circular-deps-test.conf.cjs",
4343
"merge": "yarn -s ng-dev pr merge",
4444
"approve-api": "node ./scripts/approve-api-golden.js",
4545
"approve-size-tests": "node ./scripts/approve-size-golden.js",
@@ -134,6 +134,7 @@
134134
"inquirer": "^8.2.0",
135135
"jasmine": "^4.1.0",
136136
"jasmine-core": "^4.1.0",
137+
"jasmine-reporters": "^2.5.2",
137138
"jsonc-parser": "^3.0.0",
138139
"kagekiri": "^1.4.1",
139140
"karma": "^6.3.12",
@@ -164,6 +165,7 @@
164165
"semver": "^7.3.5",
165166
"send": "^0.17.2",
166167
"shelljs": "^0.8.5",
168+
"source-map-support": "^0.5.21",
167169
"stylelint": "^14.14.0",
168170
"terser": "^5.10.0",
169171
"ts-node": "^10.9.1",

‎pnpm-lock.yaml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/BUILD.bazel

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
load("@npm//@bazel/concatjs:index.bzl", "ts_config")
22
load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
3+
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
34
load("//src/cdk:config.bzl", "CDK_ENTRYPOINTS")
45
load("//src/material:config.bzl", "MATERIAL_ENTRYPOINTS", "MATERIAL_TESTING_ENTRYPOINTS")
56
load("//tools/dgeni:index.bzl", "dgeni_api_docs")
@@ -24,7 +25,16 @@ exports_files([
2425
ts_config(
2526
name = "tsconfig-test",
2627
src = "bazel-tsconfig-test.json",
27-
deps = ["bazel-tsconfig-build.json"],
28+
deps = [
29+
"bazel-tsconfig-build.json",
30+
"//:node_modules/@types/jasmine",
31+
"//:node_modules/@types/node",
32+
],
33+
)
34+
35+
copy_to_bin(
36+
name = "package_json",
37+
srcs = ["package.json"],
2838
)
2939

3040
dgeni_api_docs(

‎src/bazel-tsconfig-test.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"extends": "./bazel-tsconfig-build.json",
66
"compilerOptions": {
77
"importHelpers": true,
8-
"types": ["jasmine"]
8+
"types": ["jasmine", "node"]
99
},
1010
"bazelOptions": {
1111
"suppressTsconfigOverrideWarnings": true

‎src/circular-deps-test.conf.js ‎src/circular-deps-test.conf.cjs

File renamed without changes.

‎src/material/core/theming/tests/BUILD.bazel

+14-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
load("//tools:defaults.bzl", "jasmine_node_test", "sass_binary", "ts_library")
1+
load("//tools:defaults.bzl", "sass_binary")
2+
load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
23
load("@bazel_skylib//rules:build_test.bzl", "build_test")
34

45
package(default_visibility = ["//visibility:public"])
@@ -52,29 +53,29 @@ build_test(
5253
],
5354
)
5455

55-
ts_library(
56+
ts_project(
5657
name = "unit_test_lib",
5758
testonly = True,
5859
srcs = glob([
5960
"*.spec.ts",
6061
]),
61-
# TODO(ESM): remove this once the Bazel NodeJS rules can handle ESM with `nodejs_binary`.
62-
devmode_module = "commonjs",
6362
deps = [
64-
"//tools/postcss",
65-
"//tools/sass:sass_lib",
66-
"@npm//@bazel/runfiles",
67-
"@npm//@types/jasmine",
68-
"@npm//@types/node",
69-
"@npm//postcss",
70-
"@npm//sass",
63+
"//:node_modules/@bazel/runfiles",
64+
"//:node_modules/postcss",
65+
"//:node_modules/sass",
66+
"//tools/postcss:postcss_rjs",
67+
"//tools/sass:sass_lib_rjs",
7168
],
7269
)
7370

74-
jasmine_node_test(
71+
jasmine_test(
7572
name = "unit_tests",
76-
srcs = [":unit_test_lib"],
7773
data = [
74+
":unit_test_lib_rjs",
75+
"//src/material:sass_lib",
76+
"//src/material-experimental:sass_lib",
77+
],
78+
no_copy_to_bin = [
7879
"//src/material:sass_lib",
7980
"//src/material-experimental:sass_lib",
8081
],

‎src/material/core/theming/tests/m3-theme.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as path from 'path';
33
import {parse} from 'postcss';
44
import {compileString} from 'sass';
55

6-
import {createLocalAngularPackageImporter} from '../../../../../tools/sass/local-sass-importer';
6+
import {createLocalAngularPackageImporter} from '../../../../../tools/sass/local-sass-importer.js';
77

88
// Note: For Windows compatibility, we need to resolve the directory paths through runfiles
99
// which are guaranteed to reside in the source tree.

‎src/material/core/theming/tests/theming-definition-api.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {compileString} from 'sass';
33
import {runfiles} from '@bazel/runfiles';
44
import * as path from 'path';
55

6-
import {createLocalAngularPackageImporter} from '../../../../../tools/sass/local-sass-importer';
6+
import {createLocalAngularPackageImporter} from '../../../../../tools/sass/local-sass-importer.js';
77

88
// Note: For Windows compatibility, we need to resolve the directory paths through runfiles
99
// which are guaranteed to reside in the source tree.

‎src/material/core/theming/tests/theming-inspection-api.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {compileString} from 'sass';
22
import {runfiles} from '@bazel/runfiles';
33
import * as path from 'path';
44

5-
import {createLocalAngularPackageImporter} from '../../../../../tools/sass/local-sass-importer';
5+
import {createLocalAngularPackageImporter} from '../../../../../tools/sass/local-sass-importer.js';
66

77
// Note: For Windows compatibility, we need to resolve the directory paths through runfiles
88
// which are guaranteed to reside in the source tree.

‎src/material/core/theming/tests/theming-mixin-api.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import {compileString} from 'sass';
33
import {runfiles} from '@bazel/runfiles';
44
import * as path from 'path';
55

6-
import {compareNodes} from '../../../../../tools/postcss/compare-nodes';
7-
import {createLocalAngularPackageImporter} from '../../../../../tools/sass/local-sass-importer';
6+
import {compareNodes} from '../../../../../tools/postcss/compare-nodes.js';
7+
import {createLocalAngularPackageImporter} from '../../../../../tools/sass/local-sass-importer.js';
88

99
// Note: For Windows compatibility, we need to resolve the directory paths through runfiles
1010
// which are guaranteed to reside in the source tree.

‎src/material/core/theming/tests/theming-typography-hierarchy.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {compileString} from 'sass';
22
import {runfiles} from '@bazel/runfiles';
33
import * as path from 'path';
44

5-
import {createLocalAngularPackageImporter} from '../../../../../tools/sass/local-sass-importer';
5+
import {createLocalAngularPackageImporter} from '../../../../../tools/sass/local-sass-importer.js';
66

77
// Note: For Windows compatibility, we need to resolve the directory paths through runfiles
88
// which are guaranteed to reside in the source tree.

‎src/package.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"type": "module"
3+
}

‎tools/defaults.bzl

+4-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ def ts_library(
107107
**kwargs
108108
)
109109

110-
if module_name and not testonly:
110+
# TODO(devversion): Partner with ISE team to support `rules_js` here.
111+
if False and module_name and not testonly:
111112
_make_tsec_test(kwargs["name"])
112113

113114
def ng_module(
@@ -147,7 +148,8 @@ def ng_module(
147148
**kwargs
148149
)
149150

150-
if module_name and not testonly:
151+
# TODO(devversion): Partner with ISE team to support `rules_js` here.
152+
if False and module_name and not testonly:
151153
_make_tsec_test(kwargs["name"])
152154

153155
def ng_package(name, srcs = [], deps = [], externals = PKG_EXTERNALS, readme_md = None, visibility = None, **kwargs):

‎tools/defaults2.bzl

+24
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@aspect_rules_jasmine//jasmine:defs.bzl", _jasmine_test = "jasmine_test")
12
load("//tools/bazel:ts_project_interop.bzl", _ts_project = "ts_project")
23
load("//tools/bazel:module_name.bzl", "compute_module_name")
34

@@ -10,5 +11,28 @@ def ts_project(
1011
name,
1112
source_map = source_map,
1213
module_name = compute_module_name(testonly),
14+
testonly = testonly,
15+
**kwargs
16+
)
17+
18+
def jasmine_test(data = [], args = [], **kwargs):
19+
# Create relative path to root, from current package dir. Necessary as
20+
# we change the `chdir` below to the package directory.
21+
relative_to_root = "/".join([".."] * len(native.package_name().split("/")))
22+
23+
_jasmine_test(
24+
node_modules = "//:node_modules",
25+
chdir = native.package_name(),
26+
args = [
27+
"--require=%s/node_modules/source-map-support/register.js" % relative_to_root,
28+
"**/*spec.js",
29+
"**/*spec.mjs",
30+
"**/*spec.cjs",
31+
] + args,
32+
data = data + [
33+
"//:node_modules/source-map-support",
34+
# Needed to ensure code is recognized as ESM.
35+
"//src:package_json",
36+
],
1337
**kwargs
1438
)

‎yarn.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -9514,7 +9514,7 @@ jasmine-core@~2.8.0:
95149514
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
95159515
integrity sha512-SNkOkS+/jMZvLhuSx1fjhcNWUC/KG6oVyFUGkSBEr9n1axSNduWU8GlI7suaHXr4yxjet6KjrUZxUTE5WzzWwQ==
95169516

9517-
jasmine-reporters@~2.5.0:
9517+
jasmine-reporters@^2.5.2, jasmine-reporters@~2.5.0:
95189518
version "2.5.2"
95199519
resolved "https://registry.yarnpkg.com/jasmine-reporters/-/jasmine-reporters-2.5.2.tgz#b5dfa1d9c40b8020c5225e0e1e2b9953d66a4d69"
95209520
integrity sha512-qdewRUuFOSiWhiyWZX8Yx3YNQ9JG51ntBEO4ekLQRpktxFTwUHy24a86zD/Oi2BRTKksEdfWQZcQFqzjqIkPig==
@@ -13557,7 +13557,7 @@ source-map-resolve@^0.6.0:
1355713557
atob "^2.1.2"
1355813558
decode-uri-component "^0.2.0"
1355913559

13560-
[email protected], source-map-support@^0.5.5, source-map-support@~0.5.20:
13560+
[email protected], source-map-support@^0.5.21, source-map-support@^0.5.5, source-map-support@~0.5.20:
1356113561
version "0.5.21"
1356213562
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
1356313563
integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==

0 commit comments

Comments
 (0)