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 c21632c

Browse files
josephperrottclydin
authored andcommitted
refactor(@angular/build): fix dependencies and import paths for strict deps requirements
1 parent 5e90c1b commit c21632c

File tree

5 files changed

+19
-21
lines changed

5 files changed

+19
-21
lines changed

‎packages/angular/build/BUILD.bazel‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ ts_project(
7272
"//packages/angular/build:src/builders/ng-packagr/schema.ts",
7373
],
7474
data = RUNTIME_ASSETS,
75-
# TODO: Fix strict_deps failure
76-
ignore_strict_deps = True,
7775
module_name = "@angular/build",
7876
deps = [
7977
":node_modules/@angular-devkit/architect",
@@ -137,10 +135,9 @@ ts_project(
137135
include = ["src/**/*_spec.ts"],
138136
exclude = ["src/builders/**/tests/**"],
139137
),
140-
# TODO: Fix strict_deps failure
141-
ignore_strict_deps = True,
142138
deps = [
143139
":build_rjs",
140+
":node_modules/@angular-devkit/core",
144141
"//:node_modules/@angular/compiler-cli",
145142
"//:node_modules/@babel/core",
146143
"//:node_modules/@types/jasmine",
@@ -159,13 +156,12 @@ ts_project(
159156
name = "application_integration_test_lib",
160157
testonly = True,
161158
srcs = glob(include = ["src/builders/application/tests/**/*.ts"]),
162-
# TODO: Fix strict_deps failure
163-
ignore_strict_deps = True,
164159
deps = [
165160
":build_rjs",
166161
"//packages/angular/build/private:private_rjs",
167162
"//modules/testing/builder:builder_rjs",
168163
":node_modules/@angular-devkit/architect",
164+
":node_modules/@angular-devkit/core",
169165

170166
# Base dependencies for the application in hello-world-app.
171167
"//:node_modules/@angular/common",
@@ -187,16 +183,16 @@ ts_project(
187183
name = "dev-server_integration_test_lib",
188184
testonly = True,
189185
srcs = glob(include = ["src/builders/dev-server/tests/**/*.ts"]),
190-
# TODO: Fix strict_deps failure
191-
ignore_strict_deps = True,
192186
deps = [
193187
":build_rjs",
194188
"//packages/angular/build/private:private_rjs",
195189
"//modules/testing/builder:builder_rjs",
196190
":node_modules/@angular-devkit/architect",
191+
":node_modules/@angular-devkit/core",
197192

198193
# dev server only test deps
199194
"//:node_modules/@types/http-proxy",
195+
"//:node_modules/@types/node",
200196
"//:node_modules/http-proxy",
201197
"//:node_modules/puppeteer",
202198

@@ -221,13 +217,13 @@ ts_project(
221217
name = "karma_integration_test_lib",
222218
testonly = True,
223219
srcs = glob(include = ["src/builders/karma/tests/**/*.ts"]),
224-
# TODO: Fix strict_deps failure
225-
ignore_strict_deps = True,
226220
deps = [
227221
":build_rjs",
228222
"//packages/angular/build/private:private_rjs",
229223
"//modules/testing/builder:builder_rjs",
230224
":node_modules/@angular-devkit/architect",
225+
":node_modules/@angular-devkit/core",
226+
"//:node_modules/@types/node",
231227

232228
# karma specific test deps
233229
"//:node_modules/karma-chrome-launcher",

‎packages/angular/build/src/builders/dev-server/internal.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
export { type BuildOutputFile, BuildOutputFileType } from '@angular/build';
9+
export { type BuildOutputFile, BuildOutputFileType } from '../../tools/esbuild/bundler-context';
1010
export { createRxjsEsmResolutionPlugin } from '../../tools/esbuild/rxjs-esm-resolution-plugin';
1111
export { JavaScriptTransformer } from '../../tools/esbuild/javascript-transformer';
1212
export { getFeatureSupport, isZonelessApp } from '../../tools/esbuild/utils';

‎packages/angular/build/src/builders/dev-server/tests/setup.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ import { json } from '@angular-devkit/core';
1010
import { readFileSync } from 'node:fs';
1111
import path from 'node:path';
1212
import { BuilderHarness } from '../../../../../../../modules/testing/builder/src';
13-
import { ApplicationBuilderOptions as AppilicationSchema, buildApplication } from '@angular/build';
13+
import {
14+
ApplicationBuilderOptions as AppilicationSchema,
15+
buildApplication,
16+
} from '../../../builders/application';
1417
import { Schema } from '../schema';
1518

1619
// TODO: Consider using package.json imports field instead of relative path

‎packages/angular/build/src/builders/karma/application_builder.ts‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import {
10-
ApplicationBuilderInternalOptions,
11-
Result,
12-
ResultFile,
13-
ResultKind,
14-
buildApplicationInternal,
15-
emitFilesToDisk,
16-
} from '@angular/build/private';
179
import type { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
1810
import glob from 'fast-glob';
1911
import type { Config, ConfigOptions, FilePattern, InlinePluginDef, Server } from 'karma';
@@ -24,6 +16,10 @@ import { createRequire } from 'node:module';
2416
import * as path from 'node:path';
2517
import { ReadableStreamController } from 'node:stream/web';
2618
import { BuildOutputFileType } from '../../tools/esbuild/bundler-context';
19+
import { emitFilesToDisk } from '../../tools/esbuild/utils';
20+
import { buildApplicationInternal } from '../application/index';
21+
import { ApplicationBuilderInternalOptions } from '../application/options';
22+
import { Result, ResultFile, ResultKind } from '../application/results';
2723
import { OutputHashing } from '../application/schema';
2824
import { findTests, getTestEntrypoints } from './find-tests';
2925
import { Schema as KarmaBuilderOptions } from './schema';

‎packages/angular/build/src/builders/karma/tests/setup.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
import { Schema } from '../schema';
1010
import { BuilderHandlerFn } from '@angular-devkit/architect';
1111
import { json } from '@angular-devkit/core';
12-
import { ApplicationBuilderOptions as ApplicationSchema, buildApplication } from '@angular/build';
12+
import {
13+
ApplicationBuilderOptions as ApplicationSchema,
14+
buildApplication,
15+
} from '../../../builders/application';
1316
import * as path from 'node:path';
1417
import { readFileSync } from 'node:fs';
1518
import {

0 commit comments

Comments
(0)

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