Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions packages/angular/build/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ ts_project(
"//packages/angular/build:src/builders/ng-packagr/schema.ts",
],
data = RUNTIME_ASSETS,
# TODO: Fix strict_deps failure
ignore_strict_deps = True,
module_name = "@angular/build",
deps = [
":node_modules/@angular-devkit/architect",
Expand Down Expand Up @@ -137,10 +135,9 @@ ts_project(
include = ["src/**/*_spec.ts"],
exclude = ["src/builders/**/tests/**"],
),
# TODO: Fix strict_deps failure
ignore_strict_deps = True,
deps = [
":build_rjs",
":node_modules/@angular-devkit/core",
"//:node_modules/@angular/compiler-cli",
"//:node_modules/@babel/core",
"//:node_modules/@types/jasmine",
Expand All @@ -159,13 +156,12 @@ ts_project(
name = "application_integration_test_lib",
testonly = True,
srcs = glob(include = ["src/builders/application/tests/**/*.ts"]),
# TODO: Fix strict_deps failure
ignore_strict_deps = True,
deps = [
":build_rjs",
"//packages/angular/build/private:private_rjs",
"//modules/testing/builder:builder_rjs",
":node_modules/@angular-devkit/architect",
":node_modules/@angular-devkit/core",

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

# dev server only test deps
"//:node_modules/@types/http-proxy",
"//:node_modules/@types/node",
"//:node_modules/http-proxy",
"//:node_modules/puppeteer",

Expand Down
2 changes: 1 addition & 1 deletion packages/angular/build/src/builders/dev-server/internal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/

export { type BuildOutputFile, BuildOutputFileType } from '@angular/build';
export { type BuildOutputFile, BuildOutputFileType } from '../../tools/esbuild/bundler-context';
export { createRxjsEsmResolutionPlugin } from '../../tools/esbuild/rxjs-esm-resolution-plugin';
export { JavaScriptTransformer } from '../../tools/esbuild/javascript-transformer';
export { getFeatureSupport, isZonelessApp } from '../../tools/esbuild/utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ import { json } from '@angular-devkit/core';
import { readFileSync } from 'node:fs';
import path from 'node:path';
import { BuilderHarness } from '../../../../../../../modules/testing/builder/src';
import { ApplicationBuilderOptions as AppilicationSchema, buildApplication } from '@angular/build';
import {
ApplicationBuilderOptions as AppilicationSchema,
buildApplication,
} from '../../../builders/application';
import { Schema } from '../schema';

// TODO: Consider using package.json imports field instead of relative path
Expand Down
12 changes: 4 additions & 8 deletions packages/angular/build/src/builders/karma/application_builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@
* found in the LICENSE file at https://angular.dev/license
*/

import {
ApplicationBuilderInternalOptions,
Result,
ResultFile,
ResultKind,
buildApplicationInternal,
emitFilesToDisk,
} from '@angular/build/private';
import type { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
import glob from 'fast-glob';
import type { Config, ConfigOptions, FilePattern, InlinePluginDef, Server } from 'karma';
Expand All @@ -24,6 +16,10 @@ import { createRequire } from 'node:module';
import * as path from 'node:path';
import { ReadableStreamController } from 'node:stream/web';
import { BuildOutputFileType } from '../../tools/esbuild/bundler-context';
import { emitFilesToDisk } from '../../tools/esbuild/utils';
import { buildApplicationInternal } from '../application/index';
import { ApplicationBuilderInternalOptions } from '../application/options';
import { Result, ResultFile, ResultKind } from '../application/results';
import { OutputHashing } from '../application/schema';
import { findTests, getTestEntrypoints } from './find-tests';
import { Schema as KarmaBuilderOptions } from './schema';
Expand Down
9 changes: 4 additions & 5 deletions packages/angular/cli/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,14 @@ ts_project(
"node_modules/**",
],
),
# TODO: Fix strict_deps failure
ignore_strict_deps = True,
deps = [
":angular-cli_rjs",
":node_modules/@angular-devkit/core",
":node_modules/@angular-devkit/schematics",
"//:node_modules/@types/semver",
"//:node_modules/@types/yargs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/schematics:schematics_rjs",
"//packages/angular_devkit/schematics/testing:testing_rjs",
"//:node_modules/semver",
"//:node_modules/yargs",
],
)

Expand Down
4 changes: 1 addition & 3 deletions packages/angular/pwa/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,11 @@ ts_project(
name = "pwa_test_lib",
testonly = True,
srcs = glob(["pwa/**/*_spec.ts"]),
# TODO: Fix strict_deps failure
ignore_strict_deps = True,
deps = [
":node_modules/@angular-devkit/schematics",
":pwa_rjs",
"//:node_modules/@types/jasmine",
"//:node_modules/@types/node",
"//packages/angular_devkit/schematics/testing:testing_rjs",
],
)

Expand Down
4 changes: 1 addition & 3 deletions packages/angular_devkit/schematics/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,9 @@ ts_project(
name = "schematics_test_lib",
testonly = True,
srcs = glob(["src/**/*_spec.ts"]),
# TODO: Fix strict_deps failure
ignore_strict_deps = True,
deps = [
":node_modules/@angular-devkit/core",
":schematics",
":schematics_rjs",
"//:node_modules/@types/jasmine",
"//:node_modules/rxjs",
"//packages/angular_devkit/schematics/testing:testing_rjs",
Expand Down
2 changes: 0 additions & 2 deletions packages/schematics/angular/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@ ts_project(
for (src, _) in ALL_SCHEMA_TARGETS
],
data = RUNTIME_ASSETS,
# TODO: Fix strict_deps failure
ignore_strict_deps = True,
module_name = "@schematics/angular",
deps = [
":node_modules/@angular-devkit/core",
Expand Down
5 changes: 4 additions & 1 deletion packages/schematics/angular/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ import {
strings,
url,
} from '@angular-devkit/schematics';
import { AngularBuilder, readWorkspace, updateWorkspace } from '@schematics/angular/utility';
import { posix as path } from 'node:path';
import { relativePathToWorkspaceRoot } from '../utility/paths';
// TODO: Determine if getWorkspace still needs to be imported as readWorkspace.
import { getWorkspace as readWorkspace, updateWorkspace } from '../utility/workspace';
// TODO: Determine if Builders still needs to be imported as AngularBuilder.
import { Builders as AngularBuilder } from '../utility/workspace-models';
import { Schema as ConfigOptions, Type as ConfigType } from './schema';

export default function (options: ConfigOptions): Rule {
Expand Down
13 changes: 5 additions & 8 deletions packages/schematics/angular/e2e/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,14 @@ import {
strings,
url,
} from '@angular-devkit/schematics';
import {
AngularBuilder,
DependencyType,
ExistingBehavior,
addDependency,
addRootProvider,
updateWorkspace,
} from '@schematics/angular/utility';
import { posix as path } from 'node:path';
import { DependencyType, ExistingBehavior, addDependency } from '../utility/dependency';
import { JSONFile } from '../utility/json-file';
import { latestVersions } from '../utility/latest-versions';
import { addRootProvider } from '../utility/standalone';
import { updateWorkspace } from '../utility/workspace';
// TODO: Determine if Builders still needs to be imported as AngularBuilder.
import { Builders as AngularBuilder } from '../utility/workspace-models';
import { Schema as E2eOptions } from './schema';

/**
Expand Down
4 changes: 3 additions & 1 deletion packages/schematics/angular/environments/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
*/

import { Rule, SchematicsException, chain } from '@angular-devkit/schematics';
import { AngularBuilder, TargetDefinition, updateWorkspace } from '@schematics/angular/utility';
// TODO: Determine if Builders still needs to be imported as AngularBuilder.
import { posix as path } from 'node:path';
import { TargetDefinition, updateWorkspace } from '../utility/workspace';
import { Builders as AngularBuilder } from '../utility/workspace-models';
import { Schema as EnvironmentOptions } from './schema';

const ENVIRONMENTS_DIRECTORY = 'environments';
Expand Down
Loading