Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: fix build failures in patch branch #55064

Closed
wants to merge 1 commit into from
Closed

ci: fix build failures in patch branch #55064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
52 changes: 12 additions & 40 deletions aio/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,16 @@
"root": true,
"overrides": [
{
"files": [
"*.ts"
],
"files": ["*.ts"],
"parserOptions": {
"project": [
"tsconfig.json",
"tools/firebase-test-utils/tsconfig.json",
"tests/e2e/tsconfig.json"
],
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/template/process-inline-templates"
],
"extends": ["plugin:@angular-eslint/template/process-inline-templates"],
"plugins": [
"@typescript-eslint",
"@angular-eslint",
Expand Down Expand Up @@ -84,9 +81,7 @@
"@typescript-eslint/no-namespace": "error",
"@typescript-eslint/no-non-null-assertion": "error",
"@typescript-eslint/no-parameter-properties": "off",
"@typescript-eslint/no-shadow": [
"error"
],
"@typescript-eslint/no-shadow": ["error"],
"@typescript-eslint/no-unused-expressions": "error",
"@typescript-eslint/no-use-before-define": "off",
"@typescript-eslint/no-var-requires": "off",
Expand All @@ -100,10 +95,7 @@
"avoidEscape": true
}
],
"@typescript-eslint/semi": [
"error",
"always"
],
"@typescript-eslint/semi": ["error", "always"],
"@typescript-eslint/triple-slash-reference": [
"error",
{
Expand All @@ -121,10 +113,7 @@
"constructor-super": "error",
"curly": "error",
"eol-last": "error",
"eqeqeq": [
"error",
"smart"
],
"eqeqeq": ["error", "smart"],
"guard-for-in": "error",
"id-denylist": [
"error",
Expand All @@ -144,22 +133,15 @@
"jsdoc/check-alignment": "error",
"jsdoc/no-types": "error",
"max-classes-per-file": "off",
"max-len": [
"error",
120
],
"max-len": ["error", 120],
"new-parens": "error",
"no-bitwise": "error",
"no-caller": "error",
"no-cond-assign": "error",
"no-console": [
"error",
{
"allow": [
"log",
"warn",
"error"
]
"allow": ["log", "warn", "error"]
}
],
"no-debugger": "error",
Expand Down Expand Up @@ -196,16 +178,10 @@
"no-use-before-define": "off",
"no-var": "error",
"object-shorthand": "error",
"one-var": [
"error",
"never"
],
"one-var": ["error", "never"],
"prefer-arrow/prefer-arrow-functions": "off",
"prefer-const": "error",
"quote-props": [
"error",
"as-needed"
],
"quote-props": ["error", "as-needed"],
"quotes": "off",
"radix": "error",
"sort-keys": "off",
Expand All @@ -222,12 +198,8 @@
}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended"
],
"files": ["*.html"],
"extends": ["plugin:@angular-eslint/template/recommended"],
"rules": {
"@angular-eslint/template/alt-text": "error",
"@angular-eslint/template/elements-content": "error",
Expand Down
48 changes: 28 additions & 20 deletions aio/scripts/audit-web-app.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,39 @@
* node scripts/audit-web-app.mjs <url> <min-scores> [<log-file>]
* ```
*
* Runs audits against the specified URL on specific categories (accessibility, best practices, performance, PWA, SEO).
* It fails, if the score in any category is below the score specified in `<min-scores>`. (Only runs audits for the
* specified categories.)
* Runs audits against the specified URL on specific categories (accessibility, best practices,
* performance, PWA, SEO). It fails, if the score in any category is below the score specified in
* `<min-scores>`. (Only runs audits for the specified categories.)
*
* `<min-scores>` is either a number (in which case it is interpreted as `all:<min-score>`) or a list of comma-separated
* strings of the form `key:value`, where `key` is one of `accessibility`, `best-practices`, `performance`, `pwa`, `seo`
* or `all` and `value` is a number (between 0 and 100).
* `<min-scores>` is either a number (in which case it is interpreted as `all:<min-score>`) or a
* list of comma-separated strings of the form `key:value`, where `key` is one of `accessibility`,
* `best-practices`, `performance`, `pwa`, `seo` or `all` and `value` is a number (between 0 and
* 100).
*
* Examples:
* - `95` _(Same as `all:95`.)_
* - `all:95` _(Run audits for all categories and require a score of 95 or higher.)_
* - `all:95,pwa:100` _(Same as `all:95`, except that a scope of 100 is required for the `pwa` category.)_
* - `performance:90` _(Only run audits for the `performance` category and require a score of 90 or higher.)_
* - `all:95,pwa:100` _(Same as `all:95`, except that a scope of 100 is required for the `pwa`
* category.)_
* - `performance:90` _(Only run audits for the `performance` category and require a score of 90 or
* higher.)_
*
* If `<log-file>` is defined, the full results will be logged there.
*/

// Imports
import lighthouse from 'lighthouse';
import * as printer from 'lighthouse/lighthouse-cli/printer.js';
import * as printer from 'lighthouse/cli/printer.js';
import logger from 'lighthouse-logger';
import puppeteer from 'puppeteer-core';
import path from 'path';
import {getAdjustedChromeBinPathForWindows} from '../tools/windows-chromium-path.js';

// Constants
const AUDIT_CATEGORIES = ['accessibility', 'best-practices', 'performance', 'pwa', 'seo'];
const LIGHTHOUSE_FLAGS = {logLevel: process.env.CI ? 'error' : 'info'}; // Be less verbose on CI.
const LIGHTHOUSE_FLAGS = {
logLevel: process.env.CI ? 'error' : 'info'
}; // Be less verbose on CI.
const VIEWER_URL = 'https://googlechrome.github.io/lighthouse/viewer';
const WAIT_FOR_SW_DELAY = 5000;

Expand Down Expand Up @@ -61,7 +66,10 @@ async function _main(args) {
try {
console.log('');
const startTime = Date.now();
const browser = await puppeteer.launch({executablePath: path.resolve(process.env.CHROME_BIN), args: ['--no-sandbox', '--headless']});
const browser = await puppeteer.launch({
executablePath: path.resolve(process.env.CHROME_BIN),
args: ['--no-sandbox', '--headless']
});
const browserVersion = await browser.version();
const results = await runLighthouse(browser, url, lhFlags, lhConfig);

Expand Down Expand Up @@ -104,9 +112,11 @@ function parseInput(args) {
const allValuesValid = Object.values(minScores).every(x => (0 <= x) && (x <= 1));

if (unknownCategories.length > 0) {
onError(`Invalid arguments: <min-scores> contains unknown category(-ies): ${unknownCategories.join(', ')}`);
onError(`Invalid arguments: <min-scores> contains unknown category(-ies): ${
unknownCategories.join(', ')}`);
} else if (!allValuesValid) {
onError(`Invalid arguments: <min-scores> has non-numeric or out-of-range values: ${minScoresRaw}`);
onError(
`Invalid arguments: <min-scores> has non-numeric or out-of-range values: ${minScoresRaw}`);
}

return {url, minScores, logFile};
Expand All @@ -119,13 +129,11 @@ function parseMinScores(raw) {
raw = `all:${raw}`;
}

raw.
split(',').
map(x => x.split(':')).
forEach(([key, val]) => minScores[key] = Number(val) / 100);
raw.split(',').map(x => x.split(':')).forEach(([key, val]) => minScores[key] = Number(val) / 100);

if (minScores.hasOwnProperty('all')) {
AUDIT_CATEGORIES.forEach(cat => minScores.hasOwnProperty(cat) || (minScores[cat] = minScores.all));
AUDIT_CATEGORIES.forEach(
cat => minScores.hasOwnProperty(cat) || (minScores[cat] = minScores.all));
delete minScores.all;
}

Expand All @@ -152,8 +160,8 @@ async function processResults(results, minScores, logFile) {
const minScore = minScores[cat];
const passed = !isNaN(score) && (score >= minScore);

console.log(
` - ${paddedTitle} ${formatScore(score)} (Required: ${formatScore(minScore)}) ${passed ? 'OK' : 'FAILED'}`);
console.log(` - ${paddedTitle} ${formatScore(score)} (Required: ${
formatScore(minScore)}) ${passed ? 'OK' : 'FAILED'}`);

return aggr && passed;
}, true);
Expand Down
3 changes: 2 additions & 1 deletion aio/tools/firebase-test-utils/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"esModuleInterop": true,
"module": "ES2020"
},
"include": ["**/*.ts"]
"include": ["**/*.ts"],
"exclude": []
}