Skip to content

Commit b0d7386

Browse files
devversionrenovate-bot
authored and
zarend
committed
build: update dev-infra package and format json files with prettier (#24303)
* build: update angular shared dev-infra code * refactor: format all json files with `ng-dev format` command With the latest build of the shared dev-infra tool, we have enabled `.json` file formatting by default if the `prettier` formatter is configured in `.ng-dev/format.ts`. This commit formats all JSON files to ensure lint/the format check continues to pass. Co-authored-by: Renovate Bot <[email protected]> (cherry picked from commit cff93c8)
1 parent 0181623 commit b0d7386

Some content is hidden

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

49 files changed

+235
-319
lines changed

‎.github/workflows/dev-infra.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v2
12-
- uses: angular/dev-infra/github-actions/commit-message-based-labels@8298e121c51960857ef39abc16b743775ff6be68
12+
- uses: angular/dev-infra/github-actions/commit-message-based-labels@0fff09d0d3bb34d2b1a535e7be9f32df56cfa6ea
1313
with:
1414
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

‎.github/workflows/lock-closed.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
lock_closed:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: angular/dev-infra/github-actions/lock-closed@8298e121c51960857ef39abc16b743775ff6be68
12+
- uses: angular/dev-infra/github-actions/lock-closed@0fff09d0d3bb34d2b1a535e7be9f32df56cfa6ea
1313
with:
1414
lock-bot-key: ${{ secrets.LOCK_BOT_PRIVATE_KEY }}

‎.ng-dev/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"noEmit": true,
77
"skipLibCheck": true,
88
"types": []
9-
},
9+
}
1010
}

‎.stylelintrc.json‎

Lines changed: 62 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,54 @@
1717
"./tools/stylelint/no-unused-import.ts"
1818
],
1919
"rules": {
20-
"material/no-prefixes": [true, {
21-
"browsers": ["last 2 versions", "not dead", "not and_qq > 0", "not OperaMini all", "not ie > 0", "not edge < 78"],
22-
"filePattern": "**/!(*-example.css)"
23-
}],
20+
"material/no-prefixes": [
21+
true,
22+
{
23+
"browsers": [
24+
"last 2 versions",
25+
"not dead",
26+
"not and_qq > 0",
27+
"not OperaMini all",
28+
"not ie > 0",
29+
"not edge < 78"
30+
],
31+
"filePattern": "**/!(*-example.css)"
32+
}
33+
],
2434
"material/theme-mixin-api": true,
2535
"material/selector-no-deep": true,
2636
"material/no-nested-mixin": true,
2737
"material/no-unused-import": true,
28-
"material/single-line-comment-only": [true, {
29-
"filePattern": "\\.scss$"
30-
}],
31-
"material/no-import": [true, {
32-
"exclude": "\\.import\\.scss$"
33-
}],
34-
"material/no-ampersand-beyond-selector-start": [true, {
35-
"filePattern": "-theme\\.scss$"
36-
}],
37-
"material/no-concrete-rules": [true, {
38-
"filePattern": "^_.*\\.scss$"
39-
}],
40-
"material/no-top-level-ampersand-in-mixin": [true, {
41-
"filePattern": "-theme\\.scss$"
42-
}],
38+
"material/single-line-comment-only": [
39+
true,
40+
{
41+
"filePattern": "\\.scss$"
42+
}
43+
],
44+
"material/no-import": [
45+
true,
46+
{
47+
"exclude": "\\.import\\.scss$"
48+
}
49+
],
50+
"material/no-ampersand-beyond-selector-start": [
51+
true,
52+
{
53+
"filePattern": "-theme\\.scss$"
54+
}
55+
],
56+
"material/no-concrete-rules": [
57+
true,
58+
{
59+
"filePattern": "^_.*\\.scss$"
60+
}
61+
],
62+
"material/no-top-level-ampersand-in-mixin": [
63+
true,
64+
{
65+
"filePattern": "-theme\\.scss$"
66+
}
67+
],
4368

4469
"color-hex-case": "lower",
4570
"color-no-invalid-hex": true,
@@ -71,9 +96,12 @@
7196
"property-case": "lower",
7297
"no-duplicate-at-import-rules": true,
7398

74-
"declaration-block-no-duplicate-properties": [true, {
75-
"ignore": ["consecutive-duplicates-with-different-values"]
76-
}],
99+
"declaration-block-no-duplicate-properties": [
100+
true,
101+
{
102+
"ignore": ["consecutive-duplicates-with-different-values"]
103+
}
104+
],
77105
"declaration-block-trailing-semicolon": "always",
78106
"declaration-block-single-line-max-declarations": 1,
79107
"declaration-block-semicolon-space-before": "never",
@@ -105,12 +133,18 @@
105133
"selector-max-id": 0,
106134
"no-missing-end-of-source-newline": true,
107135
"no-eol-whitespace": true,
108-
"max-line-length": [100, {
109-
"ignorePattern": "/https?://.*/"
110-
}],
136+
"max-line-length": [
137+
100,
138+
{
139+
"ignorePattern": "/https?://.*/"
140+
}
141+
],
111142
"linebreaks": "unix",
112-
"selector-class-pattern": ["^_?(mat-|cdk-|example-|demo-|ng-|mdc-|map-|test-)", {
113-
"resolveNestedSelectors": true
114-
}]
143+
"selector-class-pattern": [
144+
"^_?(mat-|cdk-|example-|demo-|ng-|mdc-|map-|test-)",
145+
{
146+
"resolveNestedSelectors": true
147+
}
148+
]
115149
}
116150
}

‎.vscode/extensions.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,5 @@
33
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
44

55
// List of extensions which should be recommended for users of this workspace.
6-
"recommendations": [
7-
"ms-vscode.vscode-typescript-tslint-plugin",
8-
"esbenp.prettier-vscode"
9-
]
6+
"recommendations": ["ms-vscode.vscode-typescript-tslint-plugin", "esbenp.prettier-vscode"]
107
}

‎.vscode/settings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"**/.git/subtree-cache/**": true,
55
"**/node_modules/**": true,
66
"**/bazel-out/**": true,
7-
"**/dist/**": true,
7+
"**/dist/**": true
88
},
99
"search.exclude": {
1010
"**/node_modules": true,
1111
"**/bazel-out": true,
12-
"**/dist": true,
12+
"**/dist": true
1313
},
1414
"git.ignoreLimitWarning": true,
1515
"[javascript]": {

‎firebase.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
]
1919
}
2020
],
21-
"ignore": [
22-
"firebase.json"
23-
]
21+
"ignore": ["firebase.json"]
2422
}
2523
}

‎goldens/ts-circular-deps.json‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,14 @@
33
"src/cdk-experimental/dialog/dialog-config.ts",
44
"src/cdk-experimental/dialog/dialog-container.ts"
55
],
6-
[
7-
"src/cdk/drag-drop/directives/drag.ts",
8-
"src/cdk/drag-drop/directives/drop-list.ts"
9-
],
10-
[
11-
"src/cdk/drag-drop/directives/drag.ts",
12-
"src/cdk/drag-drop/drag-events.ts"
13-
],
6+
["src/cdk/drag-drop/directives/drag.ts", "src/cdk/drag-drop/directives/drop-list.ts"],
7+
["src/cdk/drag-drop/directives/drag.ts", "src/cdk/drag-drop/drag-events.ts"],
148
[
159
"src/cdk/drag-drop/directives/drag.ts",
1610
"src/cdk/drag-drop/drag-events.ts",
1711
"src/cdk/drag-drop/directives/drop-list.ts"
1812
],
19-
[
20-
"src/cdk/drag-drop/drag-ref.ts",
21-
"src/cdk/drag-drop/drop-list-ref.ts"
22-
],
23-
[
24-
"src/cdk/scrolling/scroll-dispatcher.ts",
25-
"src/cdk/scrolling/scrollable.ts"
26-
],
27-
[
28-
"src/cdk/scrolling/virtual-scroll-strategy.ts",
29-
"src/cdk/scrolling/virtual-scroll-viewport.ts"
30-
]
31-
]
13+
["src/cdk/drag-drop/drag-ref.ts", "src/cdk/drag-drop/drop-list-ref.ts"],
14+
["src/cdk/scrolling/scroll-dispatcher.ts", "src/cdk/scrolling/scrollable.ts"],
15+
["src/cdk/scrolling/virtual-scroll-strategy.ts", "src/cdk/scrolling/virtual-scroll-viewport.ts"]
16+
]

‎goldens/tsec-exemption.json‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
2-
"ban-trustedtypes-createpolicy": [
3-
"../src/material/icon/trusted-types.ts"
4-
],
5-
"ban-element-innerhtml-assignments": [
6-
"../src/material/icon/icon-registry.ts"
7-
],
2+
"ban-trustedtypes-createpolicy": ["../src/material/icon/trusted-types.ts"],
3+
"ban-element-innerhtml-assignments": ["../src/material/icon/icon-registry.ts"],
84
"ban-element-setattribute": [
95
"../src/cdk/a11y/aria-describer/aria-reference.ts",
106
"../src/material-experimental/mdc-checkbox/checkbox.ts",

‎integration/harness-e2e-cli/angular.json‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,8 @@
2626
"polyfills": "src/polyfills.ts",
2727
"tsConfig": "tsconfig.app.json",
2828
"inlineStyleLanguage": "scss",
29-
"assets": [
30-
"src/favicon.ico",
31-
"src/assets"
32-
],
33-
"styles": [
34-
"src/styles.scss"
35-
],
29+
"assets": ["src/favicon.ico", "src/assets"],
30+
"styles": ["src/styles.scss"],
3631
"scripts": []
3732
},
3833
"configurations": {
@@ -94,13 +89,8 @@
9489
"tsConfig": "tsconfig.spec.json",
9590
"karmaConfig": "karma.conf.js",
9691
"inlineStyleLanguage": "scss",
97-
"assets": [
98-
"src/favicon.ico",
99-
"src/assets"
100-
],
101-
"styles": [
102-
"src/styles.scss"
103-
],
92+
"assets": ["src/favicon.ico", "src/assets"],
93+
"styles": ["src/styles.scss"],
10494
"scripts": []
10595
}
10696
}

0 commit comments

Comments
 (0)