Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit e13d7cf

Browse files
josephperrottclydin
authored andcommitted
refactor(@angular-devkit/build-angular): fix dependencies and import paths for strict deps requirements
1 parent 22b9edf commit e13d7cf

File tree

8 files changed

+31
-60
lines changed

8 files changed

+31
-60
lines changed

‎packages/angular_devkit/build_angular/BUILD.bazel‎

Lines changed: 22 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@ ts_project(
127127
"//packages/angular_devkit/build_angular:src/builders/web-test-runner/schema.ts",
128128
],
129129
data = RUNTIME_ASSETS,
130-
# TODO: Fix strict_deps failure
131-
ignore_strict_deps = True,
132130
module_name = "@angular-devkit/build-angular",
133131
deps = [
134132
":node_modules/@angular-devkit/architect",
@@ -170,6 +168,7 @@ ts_project(
170168
"//:node_modules/ansi-colors",
171169
"//:node_modules/autoprefixer",
172170
"//:node_modules/babel-loader",
171+
"//:node_modules/browser-sync",
173172
"//:node_modules/browserslist",
174173
"//:node_modules/copy-webpack-plugin",
175174
"//:node_modules/css-loader",
@@ -225,11 +224,10 @@ ts_project(
225224
data = [
226225
"//packages/angular_devkit/build_angular/test/hello-world-lib",
227226
],
228-
# TODO: Fix strict_deps failure
229-
ignore_strict_deps = True,
230227
deps = [
231228
":build_angular_rjs",
232229
":build_angular_test_utils_rjs",
230+
"//:node_modules/@types/node",
233231
"//:node_modules/fast-glob",
234232
"//:node_modules/prettier",
235233
"//:node_modules/typescript",
@@ -298,52 +296,40 @@ ts_project(
298296
data = [
299297
"//packages/angular_devkit/build_angular/test/hello-world-lib",
300298
],
301-
# TODO: Fix strict_deps failure
302-
ignore_strict_deps = True,
303299
deps = [
304300
":build_angular_rjs",
301+
":node_modules/@angular-devkit/architect",
302+
":node_modules/@angular-devkit/core",
303+
":node_modules/@angular/build",
305304
"//:node_modules/@types/jasmine",
305+
"//:node_modules/@types/node",
306+
"//:node_modules/rxjs",
306307
"//modules/testing/builder:builder_rjs",
307-
"//packages/angular/build:build_rjs",
308-
"//packages/angular/build/private:private_rjs",
309-
"//packages/angular_devkit/architect:architect_rjs",
310-
"//packages/angular_devkit/architect/node:node_rjs",
311-
"//packages/angular_devkit/architect/testing:testing_rjs",
312-
"//packages/angular_devkit/core:core_rjs",
313-
"//packages/angular_devkit/core/node:node_rjs",
314308
],
315309
)
316310

317311
LARGE_SPECS = {
318-
"app-shell": {
319-
# TODO: Fix strict_deps failure
320-
"ignore_strict_deps": True,
321-
},
312+
"app-shell": {},
322313
"dev-server": {
323-
# TODO: Fix strict_deps failure
324-
"ignore_strict_deps": True,
325314
"shards": 10,
326315
"size": "large",
327316
"flaky": True,
328317
"extra_deps": [
329-
"//packages/angular_devkit/build_webpack:build_webpack_rjs",
318+
":build_angular",
330319
"//:node_modules/@types/http-proxy",
320+
"//:node_modules/@types/node",
331321
"//:node_modules/http-proxy",
332322
"//:node_modules/puppeteer",
333323
"//:node_modules/undici",
334324
],
335325
},
336-
"extract-i18n": {
337-
# TODO: Fix strict_deps failure
338-
"ignore_strict_deps": True,
339-
},
326+
"extract-i18n": {},
340327
"karma": {
341-
# TODO: Fix strict_deps failure
342-
"ignore_strict_deps": True,
343328
"shards": 6,
344329
"size": "large",
345330
"flaky": True,
346331
"extra_deps": [
332+
"//:node_modules/@types/node",
347333
"//:node_modules/karma",
348334
"//:node_modules/karma-chrome-launcher",
349335
"//:node_modules/karma-coverage",
@@ -354,8 +340,6 @@ LARGE_SPECS = {
354340
],
355341
},
356342
"protractor": {
357-
# TODO: Fix strict_deps failure
358-
"ignore_strict_deps": True,
359343
"extra_deps": [
360344
"//:node_modules/jasmine-spec-reporter",
361345
"//:node_modules/protractor",
@@ -368,39 +352,29 @@ LARGE_SPECS = {
368352
"shards": 1,
369353
},
370354
"server": {
371-
# TODO: Fix strict_deps failure
372-
"ignore_strict_deps": True,
373355
"size": "large",
374356
"extra_deps": [
375357
"//:node_modules/@angular/animations",
376358
],
377359
},
378-
"ng-packagr": {
379-
# TODO: Fix strict_deps failure
380-
"ignore_strict_deps": True,
381-
},
360+
"ng-packagr": {},
382361
"browser": {
383-
# TODO: Fix strict_deps failure
384-
"ignore_strict_deps": True,
385362
"shards": 10,
386363
"size": "large",
387364
"flaky": True,
388365
"extra_deps": [
366+
"//:node_modules/@types/node",
389367
"//:node_modules/@angular/animations",
390368
"//:node_modules/@angular/material",
391369
],
392370
},
393-
"prerender": {
394-
# TODO: Fix strict_deps failure
395-
"ignore_strict_deps": True,
396-
},
371+
"prerender": {},
397372
"browser-esbuild": {},
398373
"ssr-dev-server": {
399-
# TODO: Fix strict_deps failure
400-
"ignore_strict_deps": True,
401374
"extra_deps": [
402-
"//packages/angular/ssr/node:node_rjs",
375+
":node_modules/@angular/ssr",
403376
"//:node_modules/@types/browser-sync",
377+
"//:node_modules/@types/node",
404378
"//:node_modules/browser-sync",
405379
"//:node_modules/express",
406380
"//:node_modules/undici",
@@ -413,19 +387,15 @@ LARGE_SPECS = {
413387
name = "build_angular_" + spec + "_test_lib",
414388
testonly = True,
415389
srcs = glob(["src/builders/" + spec + "/**/*_spec.ts"]),
416-
ignore_strict_deps = LARGE_SPECS[spec].get("ignore_strict_deps", False),
417390
deps = [
418391
# Dependencies needed to compile and run the specs themselves.
419392
":build_angular_rjs",
420-
"//packages/angular_devkit/core:core_rjs",
421-
"//packages/angular_devkit/core/node:node_rjs",
422-
"//modules/testing/builder:builder_rjs",
423393
":build_angular_test_utils_rjs",
424-
"//packages/angular/build:build_rjs",
425-
"//packages/angular/build/private:private_rjs",
426-
"//packages/angular_devkit/architect:architect_rjs",
427-
"//packages/angular_devkit/architect/node:node_rjs",
428-
"//packages/angular_devkit/architect/testing:testing_rjs",
394+
":node_modules/@angular/build",
395+
":node_modules/@angular-devkit/architect",
396+
":node_modules/@angular-devkit/core",
397+
":node_modules/@angular-devkit/build-webpack",
398+
"//modules/testing/builder:builder_rjs",
429399

430400
# Base dependencies for the application in hello-world-app.
431401
# Some tests also require extra dependencies.

‎packages/angular_devkit/build_angular/src/builders/browser/specs/allow-js_spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
*/
88

99
import { Architect } from '@angular-devkit/architect';
10-
import{BrowserBuilderOutput}from'@angular-devkit/build-angular';
10+
1111
import { join, normalize, relative, virtualFs } from '@angular-devkit/core';
1212
import { Observable, lastValueFrom, take, tap } from 'rxjs';
1313
import { createArchitect, host } from '../../../testing/test-utils';
14+
import { BrowserBuilderOutput } from '../index';
1415

1516
describe('Browser Builder allow js', () => {
1617
const targetSpec = { project: 'app', target: 'build' };

‎packages/angular_devkit/build_angular/src/builders/browser/specs/base-href_spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
*/
88

99
import { Architect } from '@angular-devkit/architect';
10-
import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
1110
import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
1211
import { lastValueFrom } from 'rxjs';
1312
import { createArchitect, host } from '../../../testing/test-utils';
13+
import { BrowserBuilderOutput } from '../index';
1414

1515
describe('Browser Builder base href', () => {
1616
const targetSpec = { project: 'app', target: 'build' };

‎packages/angular_devkit/build_angular/src/builders/browser/specs/build-optimizer_spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
*/
88

99
import { Architect } from '@angular-devkit/architect';
10-
import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
1110
import { join, normalize } from '@angular-devkit/core';
1211
import { lastValueFrom } from 'rxjs';
1312
import { browserBuild, createArchitect, host } from '../../../testing/test-utils';
13+
import { BrowserBuilderOutput } from '../index';
1414

1515
describe('Browser Builder build optimizer', () => {
1616
const targetSpec = { project: 'app', target: 'build' };

‎packages/angular_devkit/build_angular/src/builders/browser/specs/deploy-url_spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
*/
88

99
import { Architect } from '@angular-devkit/architect';
10-
import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
1110
import { join, normalize, virtualFs } from '@angular-devkit/core';
1211
import { lastValueFrom } from 'rxjs';
1312
import { createArchitect, host } from '../../../testing/test-utils';
13+
import { BrowserBuilderOutput } from '../index';
1414

1515
describe('Browser Builder deploy url', () => {
1616
const targetSpec = { project: 'app', target: 'build' };

‎packages/angular_devkit/build_angular/src/builders/browser/specs/index_spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
*/
88

99
import { Architect } from '@angular-devkit/architect';
10-
import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
1110
import { join, normalize, tags, virtualFs, workspaces } from '@angular-devkit/core';
1211
import { lastValueFrom } from 'rxjs';
1312
import { createArchitect, host } from '../../../testing/test-utils';
13+
import { BrowserBuilderOutput } from '../index';
1414

1515
describe('Browser Builder index HTML processing', () => {
1616
const targetSpec = { project: 'app', target: 'build' };

‎packages/angular_devkit/build_angular/src/builders/browser/specs/unused-files-warning_spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
*/
88

99
import { Architect } from '@angular-devkit/architect';
10-
import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
1110
import { logging } from '@angular-devkit/core';
1211
import { debounceTime, take, tap } from 'rxjs';
1312
import { createArchitect, host } from '../../../testing/test-utils';
13+
import { BrowserBuilderOutput } from '../index';
1414

1515
describe('Browser Builder unused files warnings', () => {
1616
const warningMessageSuffix = `is part of the TypeScript compilation but it's unused`;

‎packages/angular_devkit/build_angular/src/tools/webpack/plugins/karma/karma.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
/* eslint-disable */
1010
// TODO: cleanup this file, it's copied as is from Angular CLI.
11-
import * as http from 'http';
12-
import * as path from 'path';
11+
import * as http from 'node:http';
12+
import * as path from 'node:path';
1313
import webpack from 'webpack';
1414
import webpackDevMiddleware from 'webpack-dev-middleware';
1515

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /