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
16 changes: 1 addition & 15 deletions .github/workflows/ci.material-aio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,6 @@ defaults:
shell: bash

jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e4bf37af223483ce00f9316d227fd62cd744dc4b
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4b
- name: Install node modules
run: pnpm install --frozen-lockfile
- name: Execute Linting
run: pnpm bazel test --test_tag_filters=lint //docs/...

build:
runs-on: ubuntu-latest
steps:
Expand All @@ -57,7 +43,7 @@ jobs:
- name: Install node modules
run: pnpm install --frozen-lockfile
- name: Execute Tests
run: pnpm bazel test --test_tag_filters=-lint,-e2e,-audit //docs/...
run: pnpm bazel test --test_tag_filters=-e2e,-audit //docs/...
- name: Store Test Logs
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
if: always()
Expand Down
16 changes: 1 addition & 15 deletions .github/workflows/pr.material-aio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,6 @@ defaults:
shell: bash

jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e4bf37af223483ce00f9316d227fd62cd744dc4b
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4b
- name: Install node modules
run: pnpm install --frozen-lockfile
- name: Execute Linting
run: pnpm bazel test --test_tag_filters=lint //docs/...

build:
runs-on: ubuntu-latest
steps:
Expand All @@ -55,7 +41,7 @@ jobs:
- name: Install node modules
run: pnpm install --frozen-lockfile
- name: Execute Tests
run: pnpm bazel test --test_tag_filters=-lint,-e2e,-audit //docs/...
run: pnpm bazel test --test_tag_filters=-e2e,-audit //docs/...
- name: Store Test Logs
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
if: always()
Expand Down
2 changes: 1 addition & 1 deletion .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
],
"linebreaks": "unix",
"selector-class-pattern": [
"^_?(mat-|cdk-|example-|demo-|ng-|mdc-|map-|test-|youtube-player-)",
"^_?(mat-|cdk-|example-|demo-|ng-|mdc-|map-|test-|youtube-player-|docs-|scene-|hljs)",
{
"resolveNestedSelectors": true
}
Expand Down
94 changes: 0 additions & 94 deletions docs/.eslintrc.json

This file was deleted.

8 changes: 0 additions & 8 deletions docs/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@ copy_to_bin(
],
)

# Lint config files
copy_to_bin(
name = "ng-base-lint-config",
srcs = [
".eslintrc.json",
],
)

# The main application
ng_app(
name = "app",
Expand Down
12 changes: 0 additions & 12 deletions docs/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,6 @@
]
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
Expand Down Expand Up @@ -290,12 +284,6 @@
}
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": ["scenes/**/*.ts", "scenes/**/*.html"]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
Expand Down
40 changes: 0 additions & 40 deletions docs/defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -86,28 +86,6 @@ E2E_DEPS = [
"//docs:node_modules/webdriver-manager",
]

LINT_CONFIG = COMMON_CONFIG + [
# Lint uses the e2e config
"//docs:ng-base-test-config",
":ng-e2e-config",
"//docs:ng-base-lint-config",
"//docs:node_modules/@angular-eslint/builder",
"//docs:node_modules/@angular-eslint/eslint-plugin",
"//docs:node_modules/@angular-eslint/eslint-plugin-template",
"//docs:node_modules/@angular-eslint/template-parser",
"//docs:node_modules/eslint-plugin-ban",
"//docs:node_modules/eslint-plugin-import",
"//docs:node_modules/eslint-plugin-jsdoc",
"//docs:node_modules/eslint-plugin-prefer-arrow",
"//docs:node_modules/@typescript-eslint/eslint-plugin",
"//docs:node_modules/@typescript-eslint/parser",
"//docs:node_modules/@stylistic/eslint-plugin",
]
LINT_DEPS = [
# TODO(bazel): this should be included as a transitive of @angular-devkit/architect-cli!?
"//docs:node_modules/@angular-devkit/architect",
]

# buildifier: disable=unused-variable
def ng_app(name, project_name = None, deps = [], test_deps = [], e2e_deps = [], **kwargs):
"""
Expand Down Expand Up @@ -164,16 +142,6 @@ def ng_app(name, project_name = None, deps = [], test_deps = [], e2e_deps = [],
visibility = ["//visibility:private"],
)

# Lint config files in addition to the root
if native.package_name() != "":
copy_to_bin(
name = "lint-config",
srcs = [
".eslintrc.json",
],
visibility = ["//visibility:private"],
)

project_name = project_name if project_name else name

native.alias(
Expand Down Expand Up @@ -234,14 +202,6 @@ def ng_app(name, project_name = None, deps = [], test_deps = [], e2e_deps = [],
# **kwargs
# )

_architect_test(
project_name,
"lint",
srcs = srcs + test_srcs + e2e_srcs + deps + test_deps + NG_COMMON_DEPS + LINT_DEPS + LINT_CONFIG + ([":lint-config"] if native.package_name() != "" else []),
tags = tags + ["lint"],
**kwargs
)

def _architect_build(project_name, configuration = None, args = [], srcs = [], **kwargs):
output_dir = "%s%s" % (project_name, ".%s" % configuration if configuration else "")

Expand Down
8 changes: 8 additions & 0 deletions docs/e2e/src/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/**
* @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.dev/license
*/

import {MaterialDocsAppPage} from './app.po';
import {browser, logging} from 'protractor';

Expand Down
8 changes: 8 additions & 0 deletions docs/e2e/src/app.po.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/**
* @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.dev/license
*/

import {browser, by, element} from 'protractor';

export class MaterialDocsAppPage {
Expand Down
13 changes: 0 additions & 13 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"start:prod": "ng serve --configuration production",
"start:scenes": "ng serve scenes",
"start:emulators": "firebase emulators:start",
"lint": "ng lint",
"test": "ng test",
"e2e": "ng e2e",
"build": "ng build",
Expand Down Expand Up @@ -58,24 +57,12 @@
"@angular-devkit/architect": "catalog:",
"@angular-devkit/architect-cli": "catalog:",
"@angular-devkit/build-angular": "catalog:",
"@angular-eslint/builder": "19.3.0",
"@angular-eslint/eslint-plugin": "19.3.0",
"@angular-eslint/eslint-plugin-template": "19.3.0",
"@angular-eslint/template-parser": "19.3.0",
"@angular/cli": "catalog:",
"@angular/compiler-cli": "catalog:",
"@bazel/bazelisk": "^1.12.1",
"@stylistic/eslint-plugin": "^2.6.2",
"@types/jasmine": "5.1.7",
"@types/node": "^22.14.1",
"@types/shelljs": "0.8.15",
"@typescript-eslint/eslint-plugin": "8.29.1",
"@typescript-eslint/parser": "8.29.1",
"eslint": "^8.56.0",
"eslint-plugin-ban": "^1.5.2",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsdoc": "^48.2.1",
"eslint-plugin-prefer-arrow": "^1.2.3",
"firebase-tools": "^11.0.1",
"jasmine-core": "5.6.0",
"jasmine-spec-reporter": "7.0.0",
Expand Down
3 changes: 0 additions & 3 deletions docs/scenes/.eslintrc.json

This file was deleted.

8 changes: 8 additions & 0 deletions docs/scenes/e2e/screenshot.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/**
* @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.dev/license
*/

import * as fs from 'fs';
import * as path from 'path';
import {by, element} from 'protractor';
Expand Down
8 changes: 8 additions & 0 deletions docs/scenes/e2e/src/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/**
* @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.dev/license
*/

import {AppPage} from './app.po';
import {screenshot} from '../screenshot';

Expand Down
8 changes: 8 additions & 0 deletions docs/scenes/e2e/src/app.po.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/**
* @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.dev/license
*/

import {browser} from 'protractor';

export class AppPage {
Expand Down
15 changes: 14 additions & 1 deletion docs/scenes/src/app/app-routes.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/**
* @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.dev/license
*/

import {ComponentType} from '@angular/cdk/overlay';
import {SceneViewer} from './scene-viewer/scene-viewer';
import {AutocompleteScene} from './scenes/autocomplete/autocomplete-scene';
Expand Down Expand Up @@ -93,5 +101,10 @@ export const routes: SceneViewerRoute[] = [
{path: 'tooltip', component: SceneViewer, data: {scene: TooltipScene}},
{path: 'tree', component: SceneViewer, data: {scene: TreeScene}},
]
.sort((a, b) => (a.path > b.path ? 1 : b.path > a.path ? -1 : 0))
.sort((a, b) => {
if (a.path > b.path) {
return 1;
}
return b.path > a.path ? -1 : 0;
})
.map((route: SceneViewerRoute) => ({...route, data: {...route.data, hueRotate: 15 * hue++}}));
8 changes: 8 additions & 0 deletions docs/scenes/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/**
* @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.dev/license
*/

import {Component} from '@angular/core';
import {RouterOutlet} from '@angular/router';

Expand Down
Loading
Loading