Skip to content

Commit ef429c4

Browse files
devversionjosephperrott
authored andcommitted
fix(schematics): do not publish testing utilities to npm (#13633)
1 parent 240acf6 commit ef429c4

File tree

15 files changed

+35
-17
lines changed

15 files changed

+35
-17
lines changed

src/cdk/schematics/BUILD.bazel

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ ts_library(
1919
srcs = glob(["**/*.ts"], exclude=[
2020
"**/files/**/*.ts",
2121
"**/*.spec.ts",
22-
"ng-update/test-cases/**/*",
22+
"ng-update/test-cases/**/*.ts",
23+
"testing/**/*.ts"
2324
]),
2425
tsconfig = ":tsconfig.json",
2526
deps = [
@@ -28,11 +29,8 @@ ts_library(
2829
# TODO(devversion): Only include jasmine for test sources (See: tsconfig types).
2930
"@npm//@types/jasmine",
3031
"@npm//@types/node",
31-
# TODO(devversion): Similarly to "jasmine", we need to extract these into testing only.
32-
"@npm//fs-extra",
3332
"@npm//glob",
3433
"@npm//parse5",
35-
"@npm//rxjs",
3634
"@npm//tslint",
3735
"@npm//typescript"
3836
],
@@ -58,14 +56,15 @@ ts_library(
5856
name = "schematics_test_sources",
5957
srcs = glob(["**/*.spec.ts"], exclude = ["**/files/**/*.spec.ts"]),
6058
deps = [
61-
":schematics",
59+
"//src/cdk/schematics/testing",
6260
"@npm//@schematics/angular",
6361
"@npm//@angular-devkit/schematics",
6462
"@npm//@types/jasmine",
6563
"@npm//@types/node",
6664
"@npm//mock-fs",
6765
"@npm//tslint",
6866
"@npm//typescript",
67+
":schematics",
6968
],
7069
tsconfig = ":tsconfig.json",
7170
testonly = True,

src/cdk/schematics/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77
*/
88

99
export * from './utils';
10-
export * from './testing';
1110
export * from './ng-update/public-api';
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package(default_visibility = ["//visibility:public"])
2+
3+
load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
4+
5+
ts_library(
6+
name = "testing",
7+
module_name = "@angular/cdk/schematics/testing",
8+
srcs = glob(["**/*.ts"]),
9+
deps = [
10+
"@npm//@angular-devkit/core",
11+
"@npm//@angular-devkit/schematics",
12+
"@npm//@schematics/angular",
13+
"@npm//@types/node",
14+
"@npm//@types/fs-extra",
15+
"@npm//fs-extra",
16+
"@npm//rxjs",
17+
],
18+
)

src/cdk/schematics/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
"exclude": [
2121
"**/files/**/*",
2222
"**/*.spec.ts",
23-
"ng-update/test-cases/**/*"
23+
"ng-update/test-cases/**/*",
24+
"testing/**/*.ts"
2425
],
2526
"bazelOptions": {
2627
"suppressTsconfigOverrideWarnings": true

src/lib/schematics/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ ts_library(
5353
deps = [
5454
":schematics",
5555
"//src/cdk/schematics",
56+
"//src/cdk/schematics/testing",
5657
"@npm//@schematics/angular",
5758
"@npm//@angular-devkit/schematics",
5859
"@npm//@types/jasmine",

src/lib/schematics/address-form/index.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
2-
import {createTestApp} from '@angular/cdk/schematics';
2+
import {createTestApp} from '@angular/cdk/schematics/testing';
33
import {getFileContent} from '@schematics/angular/utility/test';
44
import {Schema} from './schema';
55

src/lib/schematics/dashboard/index.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
2-
import {createTestApp} from '@angular/cdk/schematics';
2+
import {createTestApp} from '@angular/cdk/schematics/testing';
33
import {getFileContent} from '@schematics/angular/utility/test';
44
import {Schema} from './schema';
55

src/lib/schematics/nav/index.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
22
import {Schema} from './schema';
33
import {getFileContent} from '@schematics/angular/utility/test';
4-
import {createTestApp} from '@angular/cdk/schematics';
4+
import {createTestApp} from '@angular/cdk/schematics/testing';
55

66
describe('material-nav-schematic', () => {
77
let runner: SchematicTestRunner;

src/lib/schematics/ng-add/index.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import {Tree} from '@angular-devkit/schematics';
44
import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
55
import {
66
addModuleImportToRootModule,
7-
createTestApp,
87
getProjectFromWorkspace,
98
getProjectStyleFile,
109
getProjectTargetOptions,
1110
} from '@angular/cdk/schematics';
11+
import {createTestApp} from '@angular/cdk/schematics/testing';
1212
import {getWorkspace} from '@schematics/angular/utility/config';
1313
import {getFileContent} from '@schematics/angular/utility/test';
1414
import {getIndexHtmlPath} from './fonts/project-index-html';

src/lib/schematics/ng-update/test-cases/misc/constructor-checks.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {migrationCollection} from '../index.spec';
2-
import {runTestCases} from '@angular/cdk/schematics';
2+
import {runTestCases} from '@angular/cdk/schematics/testing';
33

44
describe('constructor checks', () => {
55

0 commit comments

Comments
 (0)