Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ packages/angular_devkit/schematics/package.json=673943597
packages/angular_devkit/schematics_cli/package.json=-2026655035
packages/ngtools/webpack/package.json=605871936
packages/schematics/angular/package.json=251715148
pnpm-lock.yaml=610919784
pnpm-workspace.yaml=-1056556036
pnpm-lock.yaml=1642270121
pnpm-workspace.yaml=-1264044456
tests/package.json=700948366
yarn.lock=1260513060
1 change: 1 addition & 0 deletions .bazelignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ packages/angular_devkit/schematics_cli/node_modules
packages/ngtools/webpack/node_modules
packages/schematics/angular/node_modules
modules/testing/builder/node_modules
tests/node_modules
1 change: 1 addition & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ npm_translate_lock(
"//packages/angular_devkit/schematics_cli:package.json",
"//packages/ngtools/webpack:package.json",
"//packages/schematics/angular:package.json",
"//tests:package.json",
],
lifecycle_hooks_envs = {
# TODO: Standardize browser management for `rules_js`
Expand Down
16 changes: 6 additions & 10 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 All @@ -221,13 +217,13 @@ ts_project(
name = "karma_integration_test_lib",
testonly = True,
srcs = glob(include = ["src/builders/karma/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",
"//:node_modules/@types/node",

# karma specific test deps
"//:node_modules/karma-chrome-launcher",
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
5 changes: 4 additions & 1 deletion packages/angular/build/src/builders/karma/tests/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
import { Schema } from '../schema';
import { BuilderHandlerFn } from '@angular-devkit/architect';
import { json } from '@angular-devkit/core';
import { ApplicationBuilderOptions as ApplicationSchema, buildApplication } from '@angular/build';
import {
ApplicationBuilderOptions as ApplicationSchema,
buildApplication,
} from '../../../builders/application';
import * as path from 'node:path';
import { readFileSync } from 'node:fs';
import {
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
5 changes: 1 addition & 4 deletions packages/angular_devkit/architect/testing/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,11 @@ ts_project(
include = ["**/*.ts"],
exclude = ["**/*_spec.ts"],
),
# TODO: Fix strict_deps failure
ignore_strict_deps = True,
module_name = "@angular-devkit/architect/testing",
deps = [
"//:node_modules/@types/node",
"//:node_modules/rxjs",
"//packages/angular_devkit/architect:architect_rjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
"//packages/angular_devkit/architect:node_modules/@angular-devkit/core",
],
)
74 changes: 22 additions & 52 deletions packages/angular_devkit/build_angular/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,6 @@ ts_project(
"//packages/angular_devkit/build_angular:src/builders/web-test-runner/schema.ts",
],
data = RUNTIME_ASSETS,
# TODO: Fix strict_deps failure
ignore_strict_deps = True,
module_name = "@angular-devkit/build-angular",
deps = [
":node_modules/@angular-devkit/architect",
Expand Down Expand Up @@ -170,6 +168,7 @@ ts_project(
"//:node_modules/ansi-colors",
"//:node_modules/autoprefixer",
"//:node_modules/babel-loader",
"//:node_modules/browser-sync",
"//:node_modules/browserslist",
"//:node_modules/copy-webpack-plugin",
"//:node_modules/css-loader",
Expand Down Expand Up @@ -225,11 +224,10 @@ ts_project(
data = [
"//packages/angular_devkit/build_angular/test/hello-world-lib",
],
# TODO: Fix strict_deps failure
ignore_strict_deps = True,
deps = [
":build_angular_rjs",
":build_angular_test_utils_rjs",
"//:node_modules/@types/node",
"//:node_modules/fast-glob",
"//:node_modules/prettier",
"//:node_modules/typescript",
Expand Down Expand Up @@ -298,52 +296,40 @@ ts_project(
data = [
"//packages/angular_devkit/build_angular/test/hello-world-lib",
],
# TODO: Fix strict_deps failure
ignore_strict_deps = True,
deps = [
":build_angular_rjs",
":node_modules/@angular-devkit/architect",
":node_modules/@angular-devkit/core",
":node_modules/@angular/build",
"//:node_modules/@types/jasmine",
"//:node_modules/@types/node",
"//:node_modules/rxjs",
"//modules/testing/builder:builder_rjs",
"//packages/angular/build:build_rjs",
"//packages/angular/build/private:private_rjs",
"//packages/angular_devkit/architect:architect_rjs",
"//packages/angular_devkit/architect/node:node_rjs",
"//packages/angular_devkit/architect/testing:testing_rjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
],
)

LARGE_SPECS = {
"app-shell": {
# TODO: Fix strict_deps failure
"ignore_strict_deps": True,
},
"app-shell": {},
"dev-server": {
# TODO: Fix strict_deps failure
"ignore_strict_deps": True,
"shards": 10,
"size": "large",
"flaky": True,
"extra_deps": [
"//packages/angular_devkit/build_webpack:build_webpack_rjs",
":build_angular",
"//:node_modules/@types/http-proxy",
"//:node_modules/@types/node",
"//:node_modules/http-proxy",
"//:node_modules/puppeteer",
"//:node_modules/undici",
],
},
"extract-i18n": {
# TODO: Fix strict_deps failure
"ignore_strict_deps": True,
},
"extract-i18n": {},
"karma": {
# TODO: Fix strict_deps failure
"ignore_strict_deps": True,
"shards": 6,
"size": "large",
"flaky": True,
"extra_deps": [
"//:node_modules/@types/node",
"//:node_modules/karma",
"//:node_modules/karma-chrome-launcher",
"//:node_modules/karma-coverage",
Expand All @@ -354,8 +340,6 @@ LARGE_SPECS = {
],
},
"protractor": {
# TODO: Fix strict_deps failure
"ignore_strict_deps": True,
"extra_deps": [
"//:node_modules/jasmine-spec-reporter",
"//:node_modules/protractor",
Expand All @@ -368,39 +352,29 @@ LARGE_SPECS = {
"shards": 1,
},
"server": {
# TODO: Fix strict_deps failure
"ignore_strict_deps": True,
"size": "large",
"extra_deps": [
"//:node_modules/@angular/animations",
],
},
"ng-packagr": {
# TODO: Fix strict_deps failure
"ignore_strict_deps": True,
},
"ng-packagr": {},
"browser": {
# TODO: Fix strict_deps failure
"ignore_strict_deps": True,
"shards": 10,
"size": "large",
"flaky": True,
"extra_deps": [
"//:node_modules/@types/node",
"//:node_modules/@angular/animations",
"//:node_modules/@angular/material",
],
},
"prerender": {
# TODO: Fix strict_deps failure
"ignore_strict_deps": True,
},
"prerender": {},
"browser-esbuild": {},
"ssr-dev-server": {
# TODO: Fix strict_deps failure
"ignore_strict_deps": True,
"extra_deps": [
"//packages/angular/ssr/node:node_rjs",
":node_modules/@angular/ssr",
"//:node_modules/@types/browser-sync",
"//:node_modules/@types/node",
"//:node_modules/browser-sync",
"//:node_modules/express",
"//:node_modules/undici",
Expand All @@ -413,19 +387,15 @@ LARGE_SPECS = {
name = "build_angular_" + spec + "_test_lib",
testonly = True,
srcs = glob(["src/builders/" + spec + "/**/*_spec.ts"]),
ignore_strict_deps = LARGE_SPECS[spec].get("ignore_strict_deps", False),
deps = [
# Dependencies needed to compile and run the specs themselves.
":build_angular_rjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
"//modules/testing/builder:builder_rjs",
":build_angular_test_utils_rjs",
"//packages/angular/build:build_rjs",
"//packages/angular/build/private:private_rjs",
"//packages/angular_devkit/architect:architect_rjs",
"//packages/angular_devkit/architect/node:node_rjs",
"//packages/angular_devkit/architect/testing:testing_rjs",
":node_modules/@angular/build",
":node_modules/@angular-devkit/architect",
":node_modules/@angular-devkit/core",
":node_modules/@angular-devkit/build-webpack",
"//modules/testing/builder:builder_rjs",

# Base dependencies for the application in hello-world-app.
# Some tests also require extra dependencies.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
*/

import { Architect } from '@angular-devkit/architect';
import { BrowserBuilderOutput } from '@angular-devkit/build-angular';

import { join, normalize, relative, virtualFs } from '@angular-devkit/core';
import { Observable, lastValueFrom, take, tap } from 'rxjs';
import { createArchitect, host } from '../../../testing/test-utils';
import { BrowserBuilderOutput } from '../index';

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