Skip to content

Commit 0988c94

Browse files
adolgachevadolgachev
authored
Merge branch 'angular:main' into chip-edit
2 parents fa63680 + 50a9a9b commit 0988c94

File tree

199 files changed

+1689
-2007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+1689
-2007
lines changed

‎.github/workflows/ci.material-aio.yml

+1-15
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,6 @@ defaults:
1717
shell: bash
1818

1919
jobs:
20-
lint:
21-
runs-on: ubuntu-latest
22-
steps:
23-
- name: Initialize environment
24-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e4bf37af223483ce00f9316d227fd62cd744dc4b
25-
- name: Setup Bazel
26-
uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b
27-
- name: Setup Bazel RBE
28-
uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4b
29-
- name: Install node modules
30-
run: pnpm install --frozen-lockfile
31-
- name: Execute Linting
32-
run: pnpm bazel test --test_tag_filters=lint //docs/...
33-
3420
build:
3521
runs-on: ubuntu-latest
3622
steps:
@@ -57,7 +43,7 @@ jobs:
5743
- name: Install node modules
5844
run: pnpm install --frozen-lockfile
5945
- name: Execute Tests
60-
run: pnpm bazel test --test_tag_filters=-lint,-e2e,-audit //docs/...
46+
run: pnpm bazel test --test_tag_filters=-e2e,-audit //docs/...
6147
- name: Store Test Logs
6248
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
6349
if: always()

‎.github/workflows/pr.material-aio.yml

+1-15
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,6 @@ defaults:
1515
shell: bash
1616

1717
jobs:
18-
lint:
19-
runs-on: ubuntu-latest
20-
steps:
21-
- name: Initialize environment
22-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e4bf37af223483ce00f9316d227fd62cd744dc4b
23-
- name: Setup Bazel
24-
uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b
25-
- name: Setup Bazel RBE
26-
uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4b
27-
- name: Install node modules
28-
run: pnpm install --frozen-lockfile
29-
- name: Execute Linting
30-
run: pnpm bazel test --test_tag_filters=lint //docs/...
31-
3218
build:
3319
runs-on: ubuntu-latest
3420
steps:
@@ -55,7 +41,7 @@ jobs:
5541
- name: Install node modules
5642
run: pnpm install --frozen-lockfile
5743
- name: Execute Tests
58-
run: pnpm bazel test --test_tag_filters=-lint,-e2e,-audit //docs/...
44+
run: pnpm bazel test --test_tag_filters=-e2e,-audit //docs/...
5945
- name: Store Test Logs
6046
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
6147
if: always()

‎.stylelintrc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
],
138138
"linebreaks": "unix",
139139
"selector-class-pattern": [
140-
"^_?(mat-|cdk-|example-|demo-|ng-|mdc-|map-|test-|youtube-player-)",
140+
"^_?(mat-|cdk-|example-|demo-|ng-|mdc-|map-|test-|youtube-player-|docs-|scene-|hljs)",
141141
{
142142
"resolveNestedSelectors": true
143143
}

‎docs/.eslintrc.json

-94
This file was deleted.

‎docs/BUILD.bazel

-8
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,6 @@ copy_to_bin(
2626
],
2727
)
2828

29-
# Lint config files
30-
copy_to_bin(
31-
name = "ng-base-lint-config",
32-
srcs = [
33-
".eslintrc.json",
34-
],
35-
)
36-
3729
# The main application
3830
ng_app(
3931
name = "app",

‎docs/angular.json

-12
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,6 @@
179179
]
180180
}
181181
},
182-
"lint": {
183-
"builder": "@angular-eslint/builder:lint",
184-
"options": {
185-
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
186-
}
187-
},
188182
"e2e": {
189183
"builder": "@angular-devkit/build-angular:protractor",
190184
"options": {
@@ -290,12 +284,6 @@
290284
}
291285
}
292286
},
293-
"lint": {
294-
"builder": "@angular-eslint/builder:lint",
295-
"options": {
296-
"lintFilePatterns": ["scenes/**/*.ts", "scenes/**/*.html"]
297-
}
298-
},
299287
"e2e": {
300288
"builder": "@angular-devkit/build-angular:protractor",
301289
"options": {

‎docs/defs.bzl

-40
Original file line numberDiff line numberDiff line change
@@ -86,28 +86,6 @@ E2E_DEPS = [
8686
"//docs:node_modules/webdriver-manager",
8787
]
8888

89-
LINT_CONFIG = COMMON_CONFIG + [
90-
# Lint uses the e2e config
91-
"//docs:ng-base-test-config",
92-
":ng-e2e-config",
93-
"//docs:ng-base-lint-config",
94-
"//docs:node_modules/@angular-eslint/builder",
95-
"//docs:node_modules/@angular-eslint/eslint-plugin",
96-
"//docs:node_modules/@angular-eslint/eslint-plugin-template",
97-
"//docs:node_modules/@angular-eslint/template-parser",
98-
"//docs:node_modules/eslint-plugin-ban",
99-
"//docs:node_modules/eslint-plugin-import",
100-
"//docs:node_modules/eslint-plugin-jsdoc",
101-
"//docs:node_modules/eslint-plugin-prefer-arrow",
102-
"//docs:node_modules/@typescript-eslint/eslint-plugin",
103-
"//docs:node_modules/@typescript-eslint/parser",
104-
"//docs:node_modules/@stylistic/eslint-plugin",
105-
]
106-
LINT_DEPS = [
107-
# TODO(bazel): this should be included as a transitive of @angular-devkit/architect-cli!?
108-
"//docs:node_modules/@angular-devkit/architect",
109-
]
110-
11189
# buildifier: disable=unused-variable
11290
def ng_app(name, project_name = None, deps = [], test_deps = [], e2e_deps = [], **kwargs):
11391
"""
@@ -164,16 +142,6 @@ def ng_app(name, project_name = None, deps = [], test_deps = [], e2e_deps = [],
164142
visibility = ["//visibility:private"],
165143
)
166144

167-
# Lint config files in addition to the root
168-
if native.package_name() != "":
169-
copy_to_bin(
170-
name = "lint-config",
171-
srcs = [
172-
".eslintrc.json",
173-
],
174-
visibility = ["//visibility:private"],
175-
)
176-
177145
project_name = project_name if project_name else name
178146

179147
native.alias(
@@ -234,14 +202,6 @@ def ng_app(name, project_name = None, deps = [], test_deps = [], e2e_deps = [],
234202
# **kwargs
235203
# )
236204

237-
_architect_test(
238-
project_name,
239-
"lint",
240-
srcs = srcs + test_srcs + e2e_srcs + deps + test_deps + NG_COMMON_DEPS + LINT_DEPS + LINT_CONFIG + ([":lint-config"] if native.package_name() != "" else []),
241-
tags = tags + ["lint"],
242-
**kwargs
243-
)
244-
245205
def _architect_build(project_name, configuration = None, args = [], srcs = [], **kwargs):
246206
output_dir = "%s%s" % (project_name, ".%s" % configuration if configuration else "")
247207

‎docs/e2e/src/app.e2e-spec.ts

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.dev/license
7+
*/
8+
19
import {MaterialDocsAppPage} from './app.po';
210
import {browser, logging} from 'protractor';
311

‎docs/e2e/src/app.po.ts

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.dev/license
7+
*/
8+
19
import {browser, by, element} from 'protractor';
210

311
export class MaterialDocsAppPage {

‎docs/package.json

-13
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"start:prod": "ng serve --configuration production",
1111
"start:scenes": "ng serve scenes",
1212
"start:emulators": "firebase emulators:start",
13-
"lint": "ng lint",
1413
"test": "ng test",
1514
"e2e": "ng e2e",
1615
"build": "ng build",
@@ -58,24 +57,12 @@
5857
"@angular-devkit/architect": "catalog:",
5958
"@angular-devkit/architect-cli": "catalog:",
6059
"@angular-devkit/build-angular": "catalog:",
61-
"@angular-eslint/builder": "19.3.0",
62-
"@angular-eslint/eslint-plugin": "19.3.0",
63-
"@angular-eslint/eslint-plugin-template": "19.3.0",
64-
"@angular-eslint/template-parser": "19.3.0",
6560
"@angular/cli": "catalog:",
6661
"@angular/compiler-cli": "catalog:",
6762
"@bazel/bazelisk": "^1.12.1",
68-
"@stylistic/eslint-plugin": "^2.6.2",
6963
"@types/jasmine": "5.1.7",
7064
"@types/node": "^22.14.1",
7165
"@types/shelljs": "0.8.15",
72-
"@typescript-eslint/eslint-plugin": "8.29.1",
73-
"@typescript-eslint/parser": "8.29.1",
74-
"eslint": "^8.56.0",
75-
"eslint-plugin-ban": "^1.5.2",
76-
"eslint-plugin-import": "^2.22.1",
77-
"eslint-plugin-jsdoc": "^48.2.1",
78-
"eslint-plugin-prefer-arrow": "^1.2.3",
7966
"firebase-tools": "^11.0.1",
8067
"jasmine-core": "5.6.0",
8168
"jasmine-spec-reporter": "7.0.0",

‎docs/scenes/.eslintrc.json

-3
This file was deleted.

‎docs/scenes/e2e/screenshot.ts

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.dev/license
7+
*/
8+
19
import * as fs from 'fs';
210
import * as path from 'path';
311
import {by, element} from 'protractor';

‎docs/scenes/e2e/src/app.e2e-spec.ts

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.dev/license
7+
*/
8+
19
import {AppPage} from './app.po';
210
import {screenshot} from '../screenshot';
311

‎docs/scenes/e2e/src/app.po.ts

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.dev/license
7+
*/
8+
19
import {browser} from 'protractor';
210

311
export class AppPage {

‎docs/scenes/src/app/app-routes.ts

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.dev/license
7+
*/
8+
19
import {ComponentType} from '@angular/cdk/overlay';
210
import {SceneViewer} from './scene-viewer/scene-viewer';
311
import {AutocompleteScene} from './scenes/autocomplete/autocomplete-scene';
@@ -93,5 +101,10 @@ export const routes: SceneViewerRoute[] = [
93101
{path: 'tooltip', component: SceneViewer, data: {scene: TooltipScene}},
94102
{path: 'tree', component: SceneViewer, data: {scene: TreeScene}},
95103
]
96-
.sort((a, b) => (a.path > b.path ? 1 : b.path > a.path ? -1 : 0))
104+
.sort((a, b) => {
105+
if (a.path > b.path) {
106+
return 1;
107+
}
108+
return b.path > a.path ? -1 : 0;
109+
})
97110
.map((route: SceneViewerRoute) => ({...route, data: {...route.data, hueRotate: 15 * hue++}}));

‎docs/scenes/src/app/app.component.ts

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.dev/license
7+
*/
8+
19
import {Component} from '@angular/core';
210
import {RouterOutlet} from '@angular/router';
311

0 commit comments

Comments
 (0)