Skip to content

Commit 894c1c5

Browse files
josephperrottthePunderWoman
authored andcommitted
refactor: apply prettier formatting to integration (angular#54653)
Apply prettier formatting to integration directories PR Close angular#54653
1 parent ade0244 commit 894c1c5

153 files changed

Lines changed: 916 additions & 754 deletions

File tree

Some content is hidden

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

.ng-dev/format.mts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export const format: FormatConfig = {
99
'**/*.{yaml,yml}',
1010
'adev/**/*.{js,ts}',
1111
'devtools/**/*.{js,ts}',
12+
'integration/**/*.{js,ts}',
1213
'tools/**/*.{js,ts}',
1314
'modules/**/*.{js,ts}',
1415
'scripts/**/*.{js,ts}',

integration/animations-async/karma.conf.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ module.exports = function (config) {
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-coverage-istanbul-reporter'),
13-
require('@angular-devkit/build-angular/plugins/karma')
13+
require('@angular-devkit/build-angular/plugins/karma'),
1414
],
1515
client: {
16-
clearContext: false // leave Jasmine Spec Runner output visible in browser
16+
clearContext: false, // leave Jasmine Spec Runner output visible in browser
1717
},
1818
coverageIstanbulReporter: {
1919
dir: require('path').join(__dirname, './coverage/latest-app'),
2020
reports: ['html', 'lcovonly', 'text-summary'],
21-
fixWebpackSourcePaths: true
21+
fixWebpackSourcePaths: true,
2222
},
2323
reporters: ['progress', 'kjhtml'],
2424
port: 9876,
@@ -29,11 +29,18 @@ module.exports = function (config) {
2929
ChromeHeadlessNoSandbox: {
3030
base: 'ChromeHeadless',
3131
// See /integration/README.md#browser-tests for more info on these args
32-
flags: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
33-
}
32+
flags: [
33+
'--no-sandbox',
34+
'--headless',
35+
'--disable-gpu',
36+
'--disable-dev-shm-usage',
37+
'--hide-scrollbars',
38+
'--mute-audio',
39+
],
40+
},
3441
},
3542
browsers: ['ChromeHeadlessNoSandbox'],
3643
singleRun: false,
37-
restartOnFileChange: true
44+
restartOnFileChange: true,
3845
});
3946
};

integration/animations-async/src/app/app.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ import {RouterModule} from '@angular/router';
66
imports: [RouterModule],
77
standalone: true,
88
})
9-
export class AppComponent {
10-
}
9+
export class AppComponent {}

integration/animations-async/src/app/open-close.component.ts

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,13 @@ import {Component} from '@angular/core';
33
@Component({
44
selector: 'app-open-close',
55
animations: [
6-
trigger(
7-
'openClose',
8-
[
9-
// ...
10-
state(
11-
'open',
12-
style({height: '200px', opacity: 1, backgroundColor: 'yellow'})),
13-
state(
14-
'closed',
15-
style({height: '100px', opacity: 0.8, backgroundColor: 'blue'})),
16-
transition('open => closed', [animate('1s')]),
17-
transition('closed => open', [animate('0.5s')]),
18-
]),
6+
trigger('openClose', [
7+
// ...
8+
state('open', style({height: '200px', opacity: 1, backgroundColor: 'yellow'})),
9+
state('closed', style({height: '100px', opacity: 0.8, backgroundColor: 'blue'})),
10+
transition('open => closed', [animate('1s')]),
11+
transition('closed => open', [animate('0.5s')]),
12+
]),
1913
],
2014
template: `<nav>
2115
<button type="button" (click)="toggle()">Toggle Open/Close</button>
@@ -24,7 +18,8 @@ import {Component} from '@angular/core';
2418
<div [@openClose]="isOpen ? 'open' : 'closed'" class="open-close-container">
2519
<p>The box is now {{ isOpen ? 'Open' : 'Closed' }}!</p>
2620
</div>`,
27-
styles: [`:host {
21+
styles: [
22+
`:host {
2823
display: block;
2924
margin-top: 1rem;
3025
}
@@ -36,7 +31,8 @@ import {Component} from '@angular/core';
3631
color: #000000;
3732
font-weight: bold;
3833
font-size: 20px;
39-
}`],
34+
}`,
35+
],
4036
standalone: true,
4137
})
4238
export class OpenCloseComponent {
@@ -45,4 +41,4 @@ export class OpenCloseComponent {
4541
toggle() {
4642
this.isOpen = !this.isOpen;
4743
}
48-
}
44+
}

integration/animations/karma.conf.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ module.exports = function (config) {
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-coverage-istanbul-reporter'),
13-
require('@angular-devkit/build-angular/plugins/karma')
13+
require('@angular-devkit/build-angular/plugins/karma'),
1414
],
1515
client: {
16-
clearContext: false // leave Jasmine Spec Runner output visible in browser
16+
clearContext: false, // leave Jasmine Spec Runner output visible in browser
1717
},
1818
coverageIstanbulReporter: {
1919
dir: require('path').join(__dirname, './coverage/latest-app'),
2020
reports: ['html', 'lcovonly', 'text-summary'],
21-
fixWebpackSourcePaths: true
21+
fixWebpackSourcePaths: true,
2222
},
2323
reporters: ['progress', 'kjhtml'],
2424
port: 9876,
@@ -29,11 +29,18 @@ module.exports = function (config) {
2929
ChromeHeadlessNoSandbox: {
3030
base: 'ChromeHeadless',
3131
// See /integration/README.md#browser-tests for more info on these args
32-
flags: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
33-
}
32+
flags: [
33+
'--no-sandbox',
34+
'--headless',
35+
'--disable-gpu',
36+
'--disable-dev-shm-usage',
37+
'--hide-scrollbars',
38+
'--mute-audio',
39+
],
40+
},
3441
},
3542
browsers: ['ChromeHeadlessNoSandbox'],
3643
singleRun: false,
37-
restartOnFileChange: true
44+
restartOnFileChange: true,
3845
});
3946
};

integration/animations/src/app/app.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ import {RouterModule} from '@angular/router';
66
imports: [RouterModule],
77
standalone: true,
88
})
9-
export class AppComponent {
10-
}
9+
export class AppComponent {}

integration/animations/src/app/open-close.component.ts

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,13 @@ import {Component} from '@angular/core';
33
@Component({
44
selector: 'app-open-close',
55
animations: [
6-
trigger(
7-
'openClose',
8-
[
9-
// ...
10-
state(
11-
'open',
12-
style({height: '200px', opacity: 1, backgroundColor: 'yellow'})),
13-
state(
14-
'closed',
15-
style({height: '100px', opacity: 0.8, backgroundColor: 'blue'})),
16-
transition('open => closed', [animate('1s')]),
17-
transition('closed => open', [animate('0.5s')]),
18-
]),
6+
trigger('openClose', [
7+
// ...
8+
state('open', style({height: '200px', opacity: 1, backgroundColor: 'yellow'})),
9+
state('closed', style({height: '100px', opacity: 0.8, backgroundColor: 'blue'})),
10+
transition('open => closed', [animate('1s')]),
11+
transition('closed => open', [animate('0.5s')]),
12+
]),
1913
],
2014
template: `<nav>
2115
<button type="button" (click)="toggle()">Toggle Open/Close</button>
@@ -24,7 +18,8 @@ import {Component} from '@angular/core';
2418
<div [@openClose]="isOpen ? 'open' : 'closed'" class="open-close-container">
2519
<p>The box is now {{ isOpen ? 'Open' : 'Closed' }}!</p>
2620
</div>`,
27-
styles: [`:host {
21+
styles: [
22+
`:host {
2823
display: block;
2924
margin-top: 1rem;
3025
}
@@ -36,7 +31,8 @@ import {Component} from '@angular/core';
3631
color: #000000;
3732
font-weight: bold;
3833
font-size: 20px;
39-
}`],
34+
}`,
35+
],
4036
standalone: true,
4137
})
4238
export class OpenCloseComponent {
@@ -45,4 +41,4 @@ export class OpenCloseComponent {
4541
toggle() {
4642
this.isOpen = !this.isOpen;
4743
}
48-
}
44+
}

integration/check-dependencies.js

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,29 @@ const nonExactDeps = deps.filter(([, version]) => !/^\d+\.\d+\.\d+(?:-\w+\.\d+)?
5555

5656
if (nonExactDeps.length) {
5757
throw new Error(
58-
`The following dependencies in '${projectDir}' are not pinned to exact versions (of the ` +
58+
`The following dependencies in '${projectDir}' are not pinned to exact versions (of the ` +
5959
'format X.Y.Z[-<pre-release-identifier>]):' +
60-
nonExactDeps.map(([name, version]) => `\n ${name}: ${version}`));
60+
nonExactDeps.map(([name, version]) => `\n ${name}: ${version}`),
61+
);
6162
}
6263

6364
// Check for dependencies that are not in-sync between `package.json` and the lockfile.
6465
const {object: parsedLockfile} = parseLockfile(readFileSync(lockfilePath, 'utf8'));
6566
const outOfSyncDeps = deps
66-
.map(([depName, pkgJsonVersion]) => [
67-
depName,
68-
pkgJsonVersion,
69-
(parsedLockfile[`${depName}@${pkgJsonVersion}`] || {}).version,
70-
])
71-
.filter(([, pkgJsonVersion, lockfileVersion]) => pkgJsonVersion !== lockfileVersion);
67+
.map(([depName, pkgJsonVersion]) => [
68+
depName,
69+
pkgJsonVersion,
70+
(parsedLockfile[`${depName}@${pkgJsonVersion}`] || {}).version,
71+
])
72+
.filter(([, pkgJsonVersion, lockfileVersion]) => pkgJsonVersion !== lockfileVersion);
7273

7374
if (outOfSyncDeps.length) {
7475
throw new Error(
75-
`The following dependencies in '${projectDir}' are out-of-sync between 'package.json' and ` +
76+
`The following dependencies in '${projectDir}' are out-of-sync between 'package.json' and ` +
7677
'the lockfile:' +
77-
outOfSyncDeps.map(([name, pkgJsonVersion, lockfileVersion]) =>
78-
`\n ${name}: ${pkgJsonVersion} vs ${lockfileVersion}`));
78+
outOfSyncDeps.map(
79+
([name, pkgJsonVersion, lockfileVersion]) =>
80+
`\n ${name}: ${pkgJsonVersion} vs ${lockfileVersion}`,
81+
),
82+
);
7983
}

integration/cli-elements-universal/e2e/protractor.conf.js

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,28 @@
22
// Protractor configuration file, see link for more information
33
// https://github.com/angular/protractor/blob/master/lib/config.ts
44

5-
const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter');
5+
const {SpecReporter, StacktraceOption} = require('jasmine-spec-reporter');
66

77
/**
88
* @type { import("protractor").Config }
99
*/
1010
exports.config = {
1111
allScriptsTimeout: 11000,
12-
specs: [
13-
'./src/**/*.e2e-spec.ts'
14-
],
12+
specs: ['./src/**/*.e2e-spec.ts'],
1513
chromeDriver: process.env.CHROMEDRIVER_BIN,
1614
capabilities: {
1715
browserName: 'chrome',
1816
chromeOptions: {
1917
binary: process.env.CHROME_BIN,
2018
// See /integration/README.md#browser-tests for more info on these args
21-
args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
19+
args: [
20+
'--no-sandbox',
21+
'--headless',
22+
'--disable-gpu',
23+
'--disable-dev-shm-usage',
24+
'--hide-scrollbars',
25+
'--mute-audio',
26+
],
2227
},
2328
},
2429
directConnect: true,
@@ -28,16 +33,18 @@ exports.config = {
2833
jasmineNodeOpts: {
2934
showColors: true,
3035
defaultTimeoutInterval: 30000,
31-
print: function() {}
36+
print: function () {},
3237
},
3338
onPrepare() {
3439
require('ts-node').register({
35-
project: require('path').join(__dirname, './tsconfig.json')
40+
project: require('path').join(__dirname, './tsconfig.json'),
3641
});
37-
jasmine.getEnv().addReporter(new SpecReporter({
38-
spec: {
39-
displayStacktrace: StacktraceOption.PRETTY
40-
}
41-
}));
42-
}
42+
jasmine.getEnv().addReporter(
43+
new SpecReporter({
44+
spec: {
45+
displayStacktrace: StacktraceOption.PRETTY,
46+
},
47+
}),
48+
);
49+
},
4350
};

integration/cli-elements-universal/e2e/src/app.e2e-spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { AppPage } from './app.po';
2-
import { browser, logging } from 'protractor';
1+
import {AppPage} from './app.po';
2+
import {browser, logging} from 'protractor';
33

44
describe('workspace-project App', () => {
55
let page: AppPage;

0 commit comments

Comments
 (0)