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
15 changes: 14 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,20 @@
"@typescript-eslint/no-unnecessary-qualifier": "error",
"@typescript-eslint/no-unused-expressions": "error",
"curly": "error",
"header/header": ["error", "block", [{ "pattern": "Copyright Google LLC" }]],
"header/header": [
"error",
"block",
[
"*",
" * @license",
" * Copyright Google LLC All Rights Reserved.",
" *",
" * Use of this source code is governed by an MIT-style license that can be",
" * found in the LICENSE file at https://angular.io/license",
" "
],
2
],
"import/first": "error",
"import/newline-after-import": "error",
"import/no-absolute-path": "error",
Expand Down
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
/goldens/public-api
/packages/angular_devkit/build_angular/test/
/packages/angular_devkit/core/src/workspace/json/test/
/tests/
/README.md
/CONTRIBUTING.md
.yarn/
Expand Down
1 change: 1 addition & 0 deletions lib/registries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

/** URL to Wombat NPM registry proxy. */
export const wombat = 'https://wombat-dressing-room.appspot.com';
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@
"@angular/router": "12.0.0-rc.1",
"@angular/service-worker": "12.0.0-rc.1",
"@babel/core": "7.14.0",
"@babel/generator": "7.14.0",
"@babel/generator": "7.14.1",
"@babel/plugin-transform-runtime": "7.13.15",
"@babel/preset-env": "7.14.0",
"@babel/preset-env": "7.14.1",
"@babel/runtime": "7.14.0",
"@babel/template": "7.12.13",
"@bazel/bazelisk": "1.8.0",
"@bazel/bazelisk": "1.8.1",
"@bazel/buildifier": "4.0.1",
"@bazel/jasmine": "3.4.2",
"@bazel/typescript": "3.4.2",
Expand Down Expand Up @@ -122,11 +122,11 @@
"@types/text-table": "^0.2.1",
"@types/uuid": "^8.0.0",
"@types/webpack-dev-server": "^3.1.7",
"@typescript-eslint/eslint-plugin": "4.22.0",
"@typescript-eslint/parser": "4.22.0",
"@typescript-eslint/eslint-plugin": "4.22.1",
"@typescript-eslint/parser": "4.22.1",
"@yarnpkg/lockfile": "1.1.0",
"ajv": "8.2.0",
"ajv-formats": "2.0.2",
"ajv-formats": "2.1.0",
"ansi-colors": "4.1.1",
"babel-loader": "8.2.2",
"bootstrap": "^4.0.0",
Expand Down Expand Up @@ -196,7 +196,7 @@
"postcss-preset-env": "6.7.0",
"prettier": "^2.0.0",
"protractor": "~7.0.0",
"puppeteer": "9.1.0",
"puppeteer": "9.1.1",
"quicktype-core": "6.0.69",
"raw-loader": "4.0.2",
"regenerator-runtime": "0.13.7",
Expand Down
1 change: 1 addition & 0 deletions packages/angular/cli/commands/config-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { JsonValue, tags } from '@angular-devkit/core';
import { v4 as uuidV4 } from 'uuid';
import { Command } from '../models/command';
Expand Down
1 change: 1 addition & 0 deletions packages/angular/cli/commands/doc-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import * as open from 'open';
import { Command } from '../models/command';
import { Arguments } from '../models/interface';
Expand Down
1 change: 1 addition & 0 deletions packages/angular/cli/commands/e2e-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { ArchitectCommand } from '../models/architect-command';
import { Arguments } from '../models/interface';
import { Schema as E2eCommandSchema } from './e2e';
Expand Down
1 change: 1 addition & 0 deletions packages/angular/cli/commands/extract-i18n-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { ArchitectCommand } from '../models/architect-command';
import { Arguments } from '../models/interface';
import { Schema as ExtractI18nCommandSchema } from './extract-i18n';
Expand Down
1 change: 1 addition & 0 deletions packages/angular/cli/commands/run-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
import { Arguments } from '../models/interface';
import { Schema as RunCommandSchema } from './run';
Expand Down
1 change: 1 addition & 0 deletions packages/angular/cli/commands/test-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
import { Arguments } from '../models/interface';
import { Schema as TestCommandSchema } from './test';
Expand Down
1 change: 1 addition & 0 deletions packages/angular/cli/models/error.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

export class NgToolkitError extends Error {
constructor(message?: string) {
super();
Expand Down
1 change: 1 addition & 0 deletions packages/angular/cli/models/version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

// Same structure as used in framework packages
export class Version {
public readonly major: string;
Expand Down
1 change: 1 addition & 0 deletions packages/angular/cli/utilities/find-up.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { existsSync } from 'fs';
import * as path from 'path';

Expand Down
1 change: 1 addition & 0 deletions packages/angular/cli/utilities/install-package.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { logging } from '@angular-devkit/core';
import { spawnSync } from 'child_process';
import { existsSync, mkdtempSync, readFileSync, realpathSync, writeFileSync } from 'fs';
Expand Down
1 change: 1 addition & 0 deletions packages/angular/cli/utilities/json-file.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { JsonValue } from '@angular-devkit/core';
import { readFileSync, writeFileSync } from 'fs';
import {
Expand Down
1 change: 1 addition & 0 deletions packages/angular/cli/utilities/log-file.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { appendFileSync, mkdtempSync, realpathSync } from 'fs';
import { tmpdir } from 'os';
import { normalize } from 'path';
Expand Down
1 change: 1 addition & 0 deletions packages/angular/cli/utilities/package-tree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import * as fs from 'fs';
import { dirname, join } from 'path';
import * as resolve from 'resolve';
Expand Down
1 change: 1 addition & 0 deletions packages/angular/cli/utilities/spinner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import * as ora from 'ora';
import { colors } from './color';

Expand Down
1 change: 1 addition & 0 deletions packages/angular/cli/utilities/tty.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

function _isTruthy(value: undefined | string): boolean {
// Returns true if value is a string that is anything but 0 or false.
return value !== undefined && value !== '0' && value.toUpperCase() !== 'FALSE';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import {
Path,
PathFragment,
Expand Down
1 change: 1 addition & 0 deletions packages/angular_devkit/benchmark/src/command.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

export class Command {
constructor(
public cmd: string,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { Observable } from 'rxjs';
import { map, reduce } from 'rxjs/operators';
import { AggregatedProcessStats, Capture, MetricGroup } from './interfaces';
Expand Down
1 change: 1 addition & 0 deletions packages/angular_devkit/benchmark/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

export * from './interfaces';
export * from './command';
export * from './default-reporter';
Expand Down
1 change: 1 addition & 0 deletions packages/angular_devkit/benchmark/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { logging, tags } from '@angular-devkit/core';
import { ProcessOutput } from '@angular-devkit/core/node';
import * as ansiColors from 'ansi-colors';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { dirname } from 'path';
import { toArray } from 'rxjs/operators';
import { Command } from './command';
Expand Down
1 change: 1 addition & 0 deletions packages/angular_devkit/benchmark/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { AggregatedMetric, Metric, MetricGroup } from './interfaces';

// Prefers to keep v1 when both are equal.
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/build_angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"@angular-devkit/build-webpack": "0.0.0",
"@angular-devkit/core": "0.0.0",
"@babel/core": "7.14.0",
"@babel/generator": "7.14.0",
"@babel/generator": "7.14.1",
"@babel/plugin-transform-async-to-generator": "7.13.0",
"@babel/plugin-transform-runtime": "7.13.15",
"@babel/preset-env": "7.14.0",
"@babel/preset-env": "7.14.1",
"@babel/runtime": "7.14.0",
"@babel/template": "7.12.13",
"@discoveryjs/json-ext": "0.5.2",
Expand Down
1 change: 1 addition & 0 deletions packages/angular_devkit/build_angular/plugins/karma.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

module.exports = require('../src/webpack/plugins/karma/karma');
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@
"type": "boolean",
"description": "Show circular dependency warnings on builds.",
"default": false,
"x-deprecated": "The recommended method to detect circular dependencies in project code is to use a either a lint rule or other external tooling."
"x-deprecated": "The recommended method to detect circular dependencies in project code is to use either a lint rule or other external tooling."
},
"buildOptimizer": {
"type": "boolean",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { Architect } from '@angular-devkit/architect';
import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
import { join, logging, normalize, virtualFs } from '@angular-devkit/core';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { Architect } from '@angular-devkit/architect';
import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { Architect } from '@angular-devkit/architect';
import { BrowserBuilderOutput, CrossOrigin } from '@angular-devkit/build-angular';
import { join, normalize, virtualFs } from '@angular-devkit/core';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { Architect } from '@angular-devkit/architect';
import { PathFragment } from '@angular-devkit/core';
import { browserBuild, createArchitect, host } from '../../test-utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { Architect } from '@angular-devkit/architect';
import { logging } from '@angular-devkit/core';
import { createArchitect, host } from '../../test-utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { Architect } from '@angular-devkit/architect';
import { TestProjectHost } from '@angular-devkit/architect/testing';
import { logging } from '@angular-devkit/core';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { Architect } from '@angular-devkit/architect';
import { browserBuild, createArchitect, host } from '../../test-utils';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { Architect } from '@angular-devkit/architect';
import { getSystemPath, join, virtualFs } from '@angular-devkit/core';
import * as fs from 'fs';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { Architect } from '@angular-devkit/architect';
import { debounceTime, take, tap } from 'rxjs/operators';
import { createArchitect, host } from '../../test-utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { Architect } from '@angular-devkit/architect';
import { logging, normalize, virtualFs } from '@angular-devkit/core';
import { of, race } from 'rxjs';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { Architect } from '@angular-devkit/architect';
import { join, virtualFs } from '@angular-devkit/core';
import { take, tap } from 'rxjs/operators';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { Architect } from '@angular-devkit/architect';
import { logging } from '@angular-devkit/core';
import { browserBuild, createArchitect, host } from '../../test-utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { Architect } from '@angular-devkit/architect';
import { browserBuild, createArchitect, host } from '../../test-utils';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { Architect } from '@angular-devkit/architect';
import { join, logging, virtualFs } from '@angular-devkit/core';
import { timer } from 'rxjs';
Expand Down
Loading