Skip to content

Commit 1e6cc42

Browse files
alexeaglekara
authored andcommitted
test: migrate remaining public-api tests to Bazel (angular#22639)
We now create npm packages to cover all the public api assertions in tools/public_api_guard. We no longer depend on ts-api-guardian from npm - it is now stale since the repository was archived. There is no longer a gulp task to enforce or accept the public API, this is in CircleCI as part of running all bazel test targets. PR Close angular#22639
1 parent b26a905 commit 1e6cc42

File tree

33 files changed

+207
-237
lines changed

33 files changed

+207
-237
lines changed

aio/tools/transforms/angular-api-package/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
4343
readTypeScriptModules.ignoreExportsMatching = [/^[_ɵ]|^VERSION$/];
4444
readTypeScriptModules.hidePrivateMembers = true;
4545

46-
// NOTE: This list shold be in sync with tools/gulp-tasks/public-api.js
46+
// NOTE: This list shold be in sync with tools/public_api_guard/BUILD.bazel
4747
readTypeScriptModules.sourceFiles = [
4848
'animations/index.ts',
4949
'animations/browser/index.ts',

gulpfile.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ gulp.task('format:enforce', loadTask('format', 'enforce'));
3131
gulp.task('format', loadTask('format', 'format'));
3232
gulp.task('build.sh', loadTask('build', 'all'));
3333
gulp.task('build.sh:no-bundle', loadTask('build', 'no-bundle'));
34-
gulp.task('public-api:enforce', loadTask('public-api', 'enforce'));
35-
gulp.task('public-api:update', ['build.sh'], loadTask('public-api', 'update'));
3634
gulp.task('lint', ['format:enforce', 'validate-commit-messages', 'tslint']);
3735
gulp.task('tslint', ['tools:build'], loadTask('lint'));
3836
gulp.task('validate-commit-messages', loadTask('validate-commit-message'));

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
"source-map": "0.5.7",
101101
"source-map-support": "0.4.18",
102102
"systemjs": "0.18.10",
103-
"ts-api-guardian": "^0.3.0",
104103
"tsickle": "0.26.0",
105104
"tslint": "5.7.0",
106105
"tslint-eslint-rules": "4.1.1",

packages/animations/BUILD.bazel

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package(default_visibility = ["//visibility:public"])
22

3-
load("//tools:defaults.bzl", "ng_module")
3+
load("//tools:defaults.bzl", "ng_module", "ng_package")
44

55
ng_module(
66
name = "animations",
@@ -15,3 +15,18 @@ ng_module(
1515
"//packages/core",
1616
],
1717
)
18+
19+
ng_package(
20+
name = "npm_package",
21+
srcs = ["package.json"],
22+
entry_point = "packages/animations/index.js",
23+
secondary_entry_points = [
24+
"browser",
25+
"browser/testing",
26+
],
27+
deps = [
28+
":animations",
29+
"//packages/animations/browser",
30+
"//packages/animations/browser/testing",
31+
],
32+
)

packages/animations/browser/src/private_export.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
export {Animation as ɵAnimation} from './dsl/animation';
99
export {AnimationStyleNormalizer as ɵAnimationStyleNormalizer, NoopAnimationStyleNormalizer as ɵNoopAnimationStyleNormalizer} from './dsl/style_normalization/animation_style_normalizer';
1010
export {WebAnimationsStyleNormalizer as ɵWebAnimationsStyleNormalizer} from './dsl/style_normalization/web_animations_style_normalizer';
11-
export {NoopAnimationDriver as ɵNoopAnimationDriver} from './render/animation_driver';
11+
export {AnimationDriver as ɵAnimationDriver, NoopAnimationDriver as ɵNoopAnimationDriver} from './render/animation_driver';
1212
export {AnimationEngine as ɵAnimationEngine} from './render/animation_engine_next';
1313
export {CssKeyframesDriver as ɵCssKeyframesDriver} from './render/css_keyframes/css_keyframes_driver';
1414
export {CssKeyframesPlayer as ɵCssKeyframesPlayer} from './render/css_keyframes/css_keyframes_player';
15+
export {containsElement as ɵcontainsElement, invokeQuery as ɵinvokeQuery, matchesElement as ɵmatchesElement, validateStyleProperty as ɵvalidateStyleProperty} from './render/shared';
1516
export {WebAnimationsDriver as ɵWebAnimationsDriver, supportsWebAnimations as ɵsupportsWebAnimations} from './render/web_animations/web_animations_driver';
1617
export {WebAnimationsPlayer as ɵWebAnimationsPlayer} from './render/web_animations/web_animations_player';
18+
export {allowPreviousPlayerStylesMerge as ɵallowPreviousPlayerStylesMerge} from './util';

packages/animations/browser/testing/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ load("//tools:defaults.bzl", "ng_module")
44

55
ng_module(
66
name = "testing",
7-
testonly = 1,
87
srcs = glob(["**/*.ts"]),
98
module_name = "@angular/animations/browser/testing",
109
deps = [

packages/animations/browser/testing/rollup.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const sourcemaps = require('rollup-plugin-sourcemaps');
1212
const globals = {
1313
'@angular/core': 'ng.core',
1414
'@angular/animations': 'ng.animations',
15+
'@angular/animations/browser': 'ng.animations.browser',
1516
'rxjs/Observable': 'Rx',
1617
'rxjs/Subject': 'Rx',
1718
};

packages/animations/browser/testing/src/mock_animation_driver.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88
import {AUTO_STYLE, AnimationPlayer, NoopAnimationPlayer, ɵStyleData} from '@angular/animations';
9-
10-
import {AnimationDriver} from '../../src/render/animation_driver';
11-
import {containsElement, invokeQuery, matchesElement, validateStyleProperty} from '../../src/render/shared';
12-
import {allowPreviousPlayerStylesMerge} from '../../src/util';
9+
import {ɵAnimationDriver as AnimationDriver, ɵallowPreviousPlayerStylesMerge as allowPreviousPlayerStylesMerge, ɵcontainsElement as containsElement, ɵinvokeQuery as invokeQuery, ɵmatchesElement as matchesElement, ɵvalidateStyleProperty as validateStyleProperty} from '@angular/animations/browser';
1310

1411

1512
/**

packages/animations/browser/testing/tsconfig-build.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"rootDir": "../../",
77
"paths": {
88
"@angular/animations": ["../../../../dist/packages/animations"],
9+
"@angular/animations/browser": ["../../../../dist/packages/animations/browser"],
910
"@angular/core": ["../../../../dist/packages/core"]
1011
},
1112
"outDir": "../../../../dist/packages/animations"

packages/bazel/src/ng_package/ng_package.bzl

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,54 @@ load("//packages/bazel/src:esm5.bzl", "esm5_outputs_aspect", "ESM5Info")
1616
# TODO(alexeagle): this list is incomplete, add more as material ramps up
1717
WELL_KNOWN_GLOBALS = {
1818
"@angular/core": "ng.core",
19+
"@angular/core/testing": "ng.core.testing",
1920
"@angular/common": "ng.common",
21+
"@angular/compiler": "ng.compiler",
22+
"@angular/compiler/testing": "ng.compiler.testing",
2023
"@angular/platform-browser": "ng.platformBrowser",
24+
"@angular/platform-browser/testing": "ng.platformBrowser.testing",
25+
"@angular/platform-browser-dynamic": "ng.platformBrowserDynamic",
2126
}
2227
WELL_KNOWN_GLOBALS.update({"rxjs/%s" % s: "Rx" for s in [
2328
"BehaviorSubject",
29+
"ConnectableObservable",
2430
"Observable",
2531
"Observer",
2632
"Subject",
2733
"Subscription",
34+
"ReplaySubject",
2835
"util/EmptyError",
2936
]})
3037
WELL_KNOWN_GLOBALS.update({"rxjs/observable/%s" % s: "Rx.Observable" for s in [
38+
"concat",
39+
"defer",
3140
"from",
41+
"fromEvent",
3242
"fromPromise",
3343
"forkJoin",
3444
"merge",
45+
"never",
3546
"of",
47+
"throw",
3648
]})
3749
WELL_KNOWN_GLOBALS.update({"rxjs/operator/%s" % s: "Rx.Observable.prototype" for s in [
3850
"catch",
3951
"concatAll",
4052
"concatMap",
53+
"do",
4154
"every",
4255
"first",
4356
"filter",
4457
"last",
4558
"map",
4659
"mergeAll",
4760
"mergeMap",
61+
"publish",
4862
"reduce",
4963
"share",
64+
"startWith",
65+
"switchMap",
66+
"take",
5067
"toPromise",
5168
]})
5269

@@ -238,7 +255,7 @@ def ng_package_outputs(name, entry_point):
238255
# we assume the files should be named "package.*.js"
239256
basename = entry_point.split("/")[-2] if entry_point.find("/") >=0 else name
240257
return {
241-
"fesm5": "%s.js" % basename,
258+
"fesm5": "fesm5/%s.js" % basename,
242259
"fesm2015": "fesm2015/%s.js" % basename,
243260
"umd": "%s.umd.js" % basename,
244261
"umd_min": "%s.umd.min.js" % basename,

packages/common/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ ng_module(
1919

2020
ng_package(
2121
name = "npm_package",
22+
srcs = ["package.json"],
2223
entry_point = "packages/common/index.js",
2324
secondary_entry_points = [
2425
"testing",

packages/compiler/BUILD.bazel

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package(default_visibility = ["//visibility:public"])
22

3-
load("//tools:defaults.bzl", "ts_library")
3+
load("//tools:defaults.bzl", "ts_library", "ng_package")
44

55
ts_library(
66
name = "compiler",
@@ -12,3 +12,16 @@ ts_library(
1212
),
1313
module_name = "@angular/compiler",
1414
)
15+
16+
ng_package(
17+
name = "npm_package",
18+
srcs = ["package.json"],
19+
entry_point = "packages/compiler/compiler.js",
20+
secondary_entry_points = [
21+
"testing",
22+
],
23+
deps = [
24+
":compiler",
25+
"//packages/compiler/testing",
26+
],
27+
)

packages/compiler/testing/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ load("//tools:defaults.bzl", "ts_library")
44

55
ts_library(
66
name = "testing",
7-
testonly = 1,
87
srcs = glob(["**/*.ts"]),
98
module_name = "@angular/compiler/testing",
109
deps = [

packages/forms/BUILD.bazel

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package(default_visibility = ["//visibility:public"])
22

3-
load("//tools:defaults.bzl", "ng_module")
3+
load("//tools:defaults.bzl", "ng_module", "ng_package")
44

55
ng_module(
66
name = "forms",
@@ -17,3 +17,12 @@ ng_module(
1717
"@rxjs",
1818
],
1919
)
20+
21+
ng_package(
22+
name = "npm_package",
23+
srcs = ["package.json"],
24+
entry_point = "packages/forms/index.js",
25+
deps = [
26+
":forms",
27+
],
28+
)

packages/http/BUILD.bazel

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package(default_visibility = ["//visibility:public"])
22

3-
load("//tools:defaults.bzl", "ng_module")
3+
load("//tools:defaults.bzl", "ng_module", "ng_package")
44

55
ng_module(
66
name = "http",
@@ -17,3 +17,16 @@ ng_module(
1717
"@rxjs",
1818
],
1919
)
20+
21+
ng_package(
22+
name = "npm_package",
23+
srcs = ["package.json"],
24+
entry_point = "packages/http/index.js",
25+
secondary_entry_points = [
26+
"testing",
27+
],
28+
deps = [
29+
":http",
30+
"//packages/http/testing",
31+
],
32+
)

packages/http/testing/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ load("//tools:defaults.bzl", "ng_module")
44

55
ng_module(
66
name = "testing",
7-
testonly = 1,
87
srcs = glob(["**/*.ts"]),
98
module_name = "@angular/http/testing",
109
deps = [

packages/platform-browser-dynamic/BUILD.bazel

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package(default_visibility = ["//visibility:public"])
22

3-
load("//tools:defaults.bzl", "ng_module")
3+
load("//tools:defaults.bzl", "ng_module", "ng_package")
44

55
ng_module(
66
name = "platform-browser-dynamic",
@@ -19,3 +19,16 @@ ng_module(
1919
"//packages/platform-browser",
2020
],
2121
)
22+
23+
ng_package(
24+
name = "npm_package",
25+
srcs = ["package.json"],
26+
entry_point = "packages/platform-browser-dynamic/index.js",
27+
secondary_entry_points = [
28+
"testing",
29+
],
30+
deps = [
31+
":platform-browser-dynamic",
32+
"//packages/platform-browser-dynamic/testing",
33+
],
34+
)

packages/platform-browser-dynamic/testing/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ load("//tools:defaults.bzl", "ng_module")
44

55
ng_module(
66
name = "testing",
7-
testonly = 1,
87
srcs = glob(["**/*.ts"]),
98
module_name = "@angular/platform-browser-dynamic/testing",
109
deps = [

packages/platform-browser/BUILD.bazel

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package(default_visibility = ["//visibility:public"])
22

3-
load("//tools:defaults.bzl", "ng_module")
3+
load("//tools:defaults.bzl", "ng_module", "ng_package")
44

55
ng_module(
66
name = "platform-browser",
@@ -17,3 +17,18 @@ ng_module(
1717
"//packages/core",
1818
],
1919
)
20+
21+
ng_package(
22+
name = "npm_package",
23+
srcs = ["package.json"],
24+
entry_point = "packages/platform-browser/index.js",
25+
secondary_entry_points = [
26+
"animations",
27+
"testing",
28+
],
29+
deps = [
30+
":platform-browser",
31+
"//packages/platform-browser/animations",
32+
"//packages/platform-browser/testing",
33+
],
34+
)

packages/platform-browser/testing/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ load("//tools:defaults.bzl", "ng_module")
44

55
ng_module(
66
name = "testing",
7-
testonly = 1,
87
srcs = glob(["**/*.ts"]),
98
module_name = "@angular/platform-browser/testing",
109
deps = [

packages/platform-server/BUILD.bazel

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package(default_visibility = ["//visibility:public"])
22

3-
load("//tools:defaults.bzl", "ng_module")
3+
load("//tools:defaults.bzl", "ng_module", "ng_package")
44

55
ng_module(
66
name = "platform-server",
@@ -24,3 +24,16 @@ ng_module(
2424
"@rxjs",
2525
],
2626
)
27+
28+
ng_package(
29+
name = "npm_package",
30+
srcs = ["package.json"],
31+
entry_point = "packages/platform-server/index.js",
32+
secondary_entry_points = [
33+
"testing",
34+
],
35+
deps = [
36+
":platform-server",
37+
"//packages/platform-server/testing",
38+
],
39+
)

packages/platform-server/testing/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ load("//tools:defaults.bzl", "ng_module")
44

55
ng_module(
66
name = "testing",
7-
testonly = 1,
87
srcs = glob(["**/*.ts"]),
98
module_name = "@angular/platform-server/testing",
109
deps = [

packages/platform-webworker-dynamic/BUILD.bazel

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package(default_visibility = ["//visibility:public"])
22

3-
load("//tools:defaults.bzl", "ts_library")
3+
load("//tools:defaults.bzl", "ng_module", "ng_package")
44

5-
ts_library(
5+
ng_module(
66
name = "platform-webworker-dynamic",
77
srcs = glob(
88
[
@@ -19,3 +19,10 @@ ts_library(
1919
"//packages/platform-browser-dynamic",
2020
],
2121
)
22+
23+
ng_package(
24+
name = "npm_package",
25+
srcs = ["package.json"],
26+
entry_point = "packages/platform-webworker-dynamic/index.js",
27+
deps = [":platform-webworker-dynamic"],
28+
)

0 commit comments

Comments
 (0)