Skip to content

Commit 2be790f

Browse files
committed
build(@angular-devkit/build-angular): WIP build and test using Bazel
1 parent 478ea9f commit 2be790f

File tree

5 files changed

+2644
-157
lines changed

5 files changed

+2644
-157
lines changed

package.json

Lines changed: 61 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,24 @@
6868
"devDependencies": {
6969
"@angular/compiler": "9.0.4",
7070
"@angular/compiler-cli": "9.0.4",
71+
"@angular/localize": "9.0.4",
72+
"@angular/service-worker": "9.0.4",
7173
"@bazel/bazel": "2.1.0",
7274
"@bazel/buildifier": "0.29.0",
7375
"@bazel/jasmine": "1.3.0",
7476
"@bazel/karma": "1.3.0",
7577
"@bazel/labs": "1.3.0",
7678
"@bazel/typescript": "1.3.0",
7779
"@types/babel__core": "7.1.6",
80+
"@types/babel__template": "7.0.2",
7881
"@types/browserslist": "^4.4.0",
7982
"@types/caniuse-lite": "^1.0.0",
8083
"@types/copy-webpack-plugin": "^5.0.0",
8184
"@types/cssnano": "^4.0.0",
8285
"@types/debug": "^4.1.2",
8386
"@types/express": "^4.16.0",
8487
"@types/find-cache-dir": "^3.0.0",
85-
"@types/glob": "^7.0.3",
88+
"@types/glob": "^7.1.1",
8689
"@types/inquirer": "^0.0.44",
8790
"@types/jasmine": "~3.5.0",
8891
"@types/karma": "^4.0.0",
@@ -101,7 +104,6 @@
101104
"@types/webpack-dev-server": "^3.1.7",
102105
"@types/webpack-sources": "^0.1.5",
103106
"@yarnpkg/lockfile": "1.1.0",
104-
"ajv": "6.12.0",
105107
"ansi-colors": "4.1.1",
106108
"common-tags": "^1.8.0",
107109
"conventional-changelog": "^3.0.0",
@@ -111,15 +113,12 @@
111113
"fast-json-stable-stringify": "2.1.0",
112114
"gh-got": "^9.0.0",
113115
"git-raw-commits": "^2.0.0",
114-
"glob": "^7.0.3",
115116
"husky": "^4.0.10",
116117
"jasmine": "^3.3.1",
117118
"jasmine-spec-reporter": "^4.2.1",
118-
"karma": "~4.4.1",
119119
"karma-jasmine": "~3.1.0",
120120
"karma-jasmine-html-reporter": "^1.4.0",
121121
"license-checker": "^25.0.0",
122-
"minimatch": "^3.0.4",
123122
"minimist": "^1.2.0",
124123
"node-fetch": "^2.2.0",
125124
"npm-registry-client": "8.6.0",
@@ -130,16 +129,11 @@
130129
"prettier": "^1.16.4",
131130
"puppeteer": "2.1.1",
132131
"quicktype-core": "^6.0.15",
133-
"rxjs": "6.5.4",
134132
"sauce-connect-proxy": "https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz",
135-
"semver": "7.1.3",
136-
"source-map": "^0.7.3",
137-
"source-map-support": "^0.5.0",
138133
"spdx-satisfies": "^5.0.0",
139134
"tar": "^6.0.0",
140135
"temp": "^0.9.0",
141136
"through2": "^3.0.0",
142-
"tree-kill": "^1.2.2",
143137
"ts-api-guardian": "0.5.0",
144138
"ts-node": "^5.0.0",
145139
"tslint": "^5.15.0",
@@ -149,7 +143,63 @@
149143
"verdaccio": "4.4.4",
150144
"webpack": "4.42.0",
151145
"webpack-dev-server": "3.10.3",
152-
"webpack-sources": "1.4.3"
146+
147+
148+
"@types/minimatch": "3.0.3",
149+
"@babel/core": "7.8.6",
150+
"@babel/preset-env": "7.8.6",
151+
"@babel/template": "7.8.6",
152+
"ajv": "6.12.0",
153+
"autoprefixer": "9.7.4",
154+
"babel-loader": "8.0.6",
155+
"browserslist": "4.8.6",
156+
"cacache": "15.0.0",
157+
"caniuse-lite": "1.0.30001023",
158+
"cssnano": "4.1.10",
159+
"circular-dependency-plugin": "5.2.0",
160+
"coverage-istanbul-loader": "2.0.3",
161+
"copy-webpack-plugin": "5.1.1",
162+
"core-js": "3.6.4",
163+
"file-loader": "5.1.0",
164+
"find-cache-dir": "3.3.0",
165+
"glob": "7.1.6",
166+
"jest-worker": "25.1.0",
167+
"karma-source-map-support": "1.4.0",
168+
"less": "3.11.1",
169+
"less-loader": "5.0.0",
170+
"license-webpack-plugin": "2.1.3",
171+
"loader-utils": "1.4.0",
172+
"mini-css-extract-plugin": "0.9.0",
173+
"minimatch": "3.0.4",
174+
"parse5": "4.0.0",
175+
"open": "7.0.2",
176+
"postcss": "7.0.27",
177+
"postcss-import": "12.0.1",
178+
"postcss-loader": "3.0.0",
179+
"raw-loader": "4.0.0",
180+
"regenerator-runtime": "0.13.3",
181+
"rimraf": "3.0.2",
182+
"rollup": "1.32.0",
183+
"rxjs": "6.5.4",
184+
"sass": "1.26.2",
185+
"sass-loader": "8.0.2",
186+
"semver": "7.1.3",
187+
"source-map": "0.7.3",
188+
"source-map-support": "0.5.16",
189+
"source-map-loader": "0.2.4",
190+
"speed-measure-webpack-plugin": "1.3.1",
191+
"style-loader": "1.1.3",
192+
"stylus": "0.54.7",
193+
"stylus-loader": "3.0.2",
194+
"tree-kill": "1.2.2",
195+
"terser": "4.6.4",
196+
"terser-webpack-plugin": "2.3.5",
197+
"webpack-dev-middleware": "3.7.2",
198+
"webpack-merge": "4.2.2",
199+
"webpack-sources": "1.4.3",
200+
"webpack-subresource-integrity": "1.4.0",
201+
"worker-plugin": "3.2.0",
202+
"karma": "~4.4.1"
153203
},
154204
"husky": {
155205
"hooks": {
Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
# # Copyright Google Inc. All Rights Reserved.
2+
# #
3+
# # Use of this source code is governed by an MIT-style license that can be
4+
# # found in the LICENSE file at https://angular.io/license
5+
6+
# licenses(["notice"]) # MIT
7+
8+
# load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
9+
# load("@npm_bazel_typescript//:index.bzl", "ts_library")
10+
# load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
11+
# load("//tools:ts_json_schema.bzl", "ts_json_schema")
12+
13+
# package(default_visibility = ["//visibility:public"])
14+
15+
# ts_json_schema(
16+
# name = "app_shell_schema",
17+
# src = "src/app-shell/schema.json",
18+
# )
19+
20+
# ts_json_schema(
21+
# name = "browser_schema",
22+
# src = "src/browser/schema.json",
23+
# )
24+
25+
# ts_json_schema(
26+
# name = "dev_server_schema",
27+
# src = "src/dev-server/schema.json",
28+
# )
29+
30+
# ts_json_schema(
31+
# name = "extract_i18n_schema",
32+
# src = "src/extract-i18n/schema.json",
33+
# )
34+
35+
# ts_json_schema(
36+
# name = "karma_schema",
37+
# src = "src/karma/schema.json",
38+
# )
39+
40+
# ts_json_schema(
41+
# name = "protractor_schema",
42+
# src = "src/protractor/schema.json",
43+
# )
44+
45+
# ts_json_schema(
46+
# name = "server_schema",
47+
# src = "src/server/schema.json",
48+
# )
49+
50+
# ts_json_schema(
51+
# name = "tslint_schema",
52+
# src = "src/tslint/schema.json",
53+
# )
54+
55+
# ts_library(
56+
# name = "build_angular",
57+
# srcs = glob(
58+
# include = [
59+
# "src/**/*.ts",
60+
# "plugins/**/*.ts",
61+
# ],
62+
# exclude = [
63+
# "src/**/*_spec.ts",
64+
# "plugins/**/*_spec.ts",
65+
# ],
66+
# ) + [
67+
# "//packages/angular_devkit/build_angular:src/app-shell/schema.ts",
68+
# "//packages/angular_devkit/build_angular:src/browser/schema.ts",
69+
# "//packages/angular_devkit/build_angular:src/dev-server/schema.ts",
70+
# "//packages/angular_devkit/build_angular:src/extract-i18n/schema.ts",
71+
# "//packages/angular_devkit/build_angular:src/karma/schema.ts",
72+
# "//packages/angular_devkit/build_angular:src/protractor/schema.ts",
73+
# "//packages/angular_devkit/build_angular:src/server/schema.ts",
74+
# "//packages/angular_devkit/build_angular:src/tslint/schema.ts",
75+
# ],
76+
# data = glob(
77+
# include = [
78+
# # figure out all the js files too
79+
# "package.json",
80+
# "builders.json",
81+
# "src/**/schema.json",
82+
# "angular-cli-files/models/es5-jit-polyfills.js",
83+
# "angular-cli-files/models/es5-polyfills.js",
84+
# "angular-cli-files/models/jit-polyfills.js",
85+
# "utils/empty.js",
86+
# "utils/process-bundle-bootstrap.js",
87+
# "utils/run-module-worker.js",
88+
# ],
89+
# ),
90+
# deps = [
91+
# "//packages/angular_devkit/core",
92+
# "//packages/angular_devkit/core:node",
93+
# "//packages/angular_devkit/architect",
94+
# "//packages/angular_devkit/build_optimizer",
95+
# "//packages/angular_devkit/build_webpack",
96+
# "//packages/ngtools/webpack",
97+
98+
# "@npm//@types/node",
99+
# "@npm//@types/babel__core",
100+
# "@npm//@types/babel__template",
101+
# "@npm//@types/browserslist",
102+
# "@npm//@types/caniuse-lite",
103+
# "@npm//@types/copy-webpack-plugin",
104+
# "@npm//@types/cssnano",
105+
# "@npm//@types/find-cache-dir",
106+
# "@npm//@types/glob",
107+
# "@npm//@types/loader-utils",
108+
# "@npm//@types/minimatch",
109+
# "@npm//@types/rimraf",
110+
# "@npm//@types/semver",
111+
# "@npm//@types/webpack",
112+
# "@npm//@types/webpack-dev-server",
113+
# "@npm//@types/webpack-sources",
114+
115+
# "@npm//@babel/core",
116+
# "@npm//@babel/preset-env",
117+
# "@npm//@babel/template",
118+
# "@npm//ajv",
119+
# "@npm//autoprefixer",
120+
# "@npm//babel-loader",
121+
# "@npm//browserslist",
122+
# "@npm//cacache",
123+
# "@npm//caniuse-lite",
124+
# "@npm//cssnano",
125+
# "@npm//circular-dependency-plugin",
126+
# "@npm//coverage-istanbul-loader",
127+
# "@npm//copy-webpack-plugin",
128+
# "@npm//core-js",
129+
# "@npm//file-loader",
130+
# "@npm//find-cache-dir",
131+
# "@npm//glob",
132+
# "@npm//jest-worker",
133+
# "@npm//karma-source-map-support",
134+
# "@npm//less",
135+
# "@npm//less-loader",
136+
# "@npm//license-webpack-plugin",
137+
# "@npm//loader-utils",
138+
# "@npm//mini-css-extract-plugin",
139+
# "@npm//minimatch",
140+
# "@npm//parse5",
141+
# "@npm//open",
142+
# "@npm//postcss",
143+
# "@npm//postcss-import",
144+
# "@npm//postcss-loader",
145+
# "@npm//raw-loader",
146+
# "@npm//regenerator-runtime",
147+
# "@npm//rimraf",
148+
# "@npm//rollup",
149+
# "@npm//rxjs",
150+
# "@npm//sass",
151+
# "@npm//sass-loader",
152+
# "@npm//semver",
153+
# "@npm//source-map",
154+
# "@npm//source-map-support",
155+
# "@npm//source-map-loader",
156+
# "@npm//speed-measure-webpack-plugin",
157+
# "@npm//style-loader",
158+
# "@npm//stylus",
159+
# "@npm//stylus-loader",
160+
# "@npm//tree-kill",
161+
# "@npm//terser",
162+
# "@npm//terser-webpack-plugin",
163+
# "@npm//webpack",
164+
# "@npm//webpack-dev-middleware",
165+
# "@npm//webpack-dev-server",
166+
# "@npm//webpack-merge",
167+
# "@npm//webpack-sources",
168+
# "@npm//webpack-subresource-integrity",
169+
# "@npm//worker-plugin",
170+
171+
172+
# "@npm//typescript",
173+
# "@npm//@angular/compiler-cli",
174+
# "@npm//@angular/localize",
175+
# "@npm//@angular/service-worker",
176+
# "@npm//karma",
177+
# "@npm//tslint",
178+
# "@npm//@types/karma",
179+
180+
181+
182+
# ],
183+
# )

packages/angular_devkit/build_angular/src/protractor/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ async function updateWebdriver() {
7070
}
7171

7272
// tslint:disable-next-line:max-line-length no-implicit-dependencies
73-
const webdriverUpdate = await import(path) as typeof import ('webdriver-manager/built/lib/cmds/update');
73+
const webdriverUpdate = await import(path);
74+
// const webdriverUpdate = await import(path) as typeof import ('webdriver-manager/built/lib/cmds/update');
7475

7576
// run `webdriver-manager update --standalone false --gecko false --quiet`
7677
// if you change this, update the command comment in prev line

packages/ngtools/webpack/src/interfaces.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ export interface AngularCompilerPluginOptions {
4545
logger?: logging.Logger;
4646
directTemplateLoading?: boolean;
4747

48-
/* @internal */
4948
emitClassMetadata?: boolean;
50-
/* @internal */
5149
emitNgModuleScope?: boolean;
5250

5351
/**

0 commit comments

Comments
 (0)