Skip to content

chore: remove unused eslint-disable directives #35482

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

Merged
yury-s merged 2 commits into from
Apr 3, 2025
Merged

chore: remove unused eslint-disable directives #35482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a66ebf2
chore: remove unused eslint-disable directives
yury-s Apr 3, 2025
7a363f6
update eslint rules, delete stale DEPS
yury-s Apr 3, 2025
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
73 changes: 44 additions & 29 deletions eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,32 +217,27 @@ const noBooleanCompareRules = {
"@typescript-eslint/no-unnecessary-boolean-literal-compare": 2,
};

const noWebGlobalsRules = {
// This should contain every bulitin from builtins.ts.
"no-restricted-globals": [
"error",
{ "name": "window", "message": "Use InjectedScript.window instead" },
{ "name": "document", "message": "Use InjectedScript.document instead" },
{ "name": "globalThis", "message": "Use InjectedScript.window instead" },
{ "name": "setTimeout", "message": "Use InjectedScript.builtins.setTimeout instead" },
{ "name": "clearTimeout", "message": "Use InjectedScript.builtins.clearTimeout instead" },
{ "name": "setInterval", "message": "Use InjectedScript.builtins.setInterval instead" },
{ "name": "clearInterval", "message": "Use InjectedScript.builtins.clearInterval instead" },
{ "name": "requestAnimationFrame", "message": "Use InjectedScript.builtins.requestAnimationFrame instead" },
{ "name": "cancelAnimationFrame", "message": "Use InjectedScript.builtins.cancelAnimationFrame instead" },
{ "name": "requestIdleCallback", "message": "Use InjectedScript.builtins.requestIdleCallback instead" },
{ "name": "cancelIdleCallback", "message": "Use InjectedScript.builtins.cancelIdleCallback instead" },
{ "name": "performance", "message": "Use InjectedScript.builtins.performance instead" },
{ "name": "eval", "message": "Use InjectedScript.builtins.eval instead" },
{ "name": "Date", "message": "Use InjectedScript.builtins.Date instead" },
{ "name": "Map", "message": "Use InjectedScript.builtins.Map instead" },
{ "name": "Set", "message": "Use InjectedScript.builtins.Set instead" },
],
};
// This should contain every builtin from builtins.ts.
const noWebGlobalsRuleList = [
{ name: "window", message: "Use InjectedScript.window instead" },
{ name: "document", message: "Use InjectedScript.document instead" },
{ name: "globalThis", message: "Use InjectedScript.window instead" },
{ name: "setTimeout", message: "Use InjectedScript.builtins.setTimeout instead" },
{ name: "clearTimeout", message: "Use InjectedScript.builtins.clearTimeout instead" },
{ name: "setInterval", message: "Use InjectedScript.builtins.setInterval instead" },
{ name: "clearInterval", message: "Use InjectedScript.builtins.clearInterval instead" },
{ name: "requestAnimationFrame", message: "Use InjectedScript.builtins.requestAnimationFrame instead" },
{ name: "cancelAnimationFrame", message: "Use InjectedScript.builtins.cancelAnimationFrame instead" },
{ name: "requestIdleCallback", message: "Use InjectedScript.builtins.requestIdleCallback instead" },
{ name: "cancelIdleCallback", message: "Use InjectedScript.builtins.cancelIdleCallback instead" },
{ name: "performance", message: "Use InjectedScript.builtins.performance instead" },
{ name: "eval", message: "Use InjectedScript.builtins.eval instead" },
{ name: "Date", message: "Use InjectedScript.builtins.Date instead" },
{ name: "Map", message: "Use InjectedScript.builtins.Map instead" },
{ name: "Set", message: "Use InjectedScript.builtins.Set instead" },
];

const noNodeGlobalsRules = {
"no-restricted-globals": ["error", { name: "process" }],
};
const noNodeGlobalsRuleList = [{ name: "process" }];

const importOrderRules = {
"import/order": [
Expand Down Expand Up @@ -367,16 +362,34 @@ export default [
"no-console": "off",
},
},
{
files: [
"packages/playwright-core/src/utils/**/*.ts",
],
languageOptions: languageOptionsWithTsConfig,
rules: {
"no-restricted-globals": [
"error",
...noNodeGlobalsRuleList,
// TODO: reenable once the violations are fixed is utils/isomorphic/*.
// ...noWebGlobalsRules,
],
...noFloatingPromisesRules,
...noBooleanCompareRules,
},
},
{
files: [
"packages/playwright-core/src/server/injected/**/*.ts",
"packages/playwright-core/src/utils/isomorphic/**/*.ts",
"packages/playwright-core/src/server/pageBinding.ts",
"packages/playwright-core/src/server/storageScript.ts",
],
languageOptions: languageOptionsWithTsConfig,
rules: {
...noWebGlobalsRules,
"no-restricted-globals": [
"error",
...noWebGlobalsRuleList,
],
...noFloatingPromisesRules,
...noBooleanCompareRules,
},
Expand All @@ -385,11 +398,13 @@ export default [
files: [
"packages/playwright-core/src/client/**/*.ts",
"packages/playwright-core/src/protocol/**/*.ts",
"packages/playwright-core/src/utils/**/*.ts",
],
languageOptions: languageOptionsWithTsConfig,
rules: {
...noNodeGlobalsRules,
"no-restricted-globals": [
"error",
...noNodeGlobalsRuleList,
],
...noFloatingPromisesRules,
...noBooleanCompareRules,
},
Expand Down
6 changes: 0 additions & 6 deletions packages/playwright-core/src/utils/DEPS.list
View file
Open in desktop

This file was deleted.

Empty file added packages/playwright-core/src/utils/isomorphic/DEPS.list
View file
Open in desktop
Empty file.
2 changes: 0 additions & 2 deletions packages/playwright-core/src/utils/isomorphic/builtins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
* limitations under the License.
*/

/* eslint-disable no-restricted-globals */

// Make sure to update eslint.config.mjs when changing the list of builitins.
export type Builtins = {
setTimeout: Window['setTimeout'],
Expand Down
3 changes: 0 additions & 3 deletions packages/playwright-core/src/utils/isomorphic/utilityScriptSerializers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,10 @@ export function source(builtins: Builtins) {

function serialize(value: any, handleSerializer: (value: any) => HandleOrValue, visitorInfo: VisitorInfo): SerializedValue {
if (value && typeof value === 'object') {
// eslint-disable-next-line no-restricted-globals
if (typeof globalThis.Window === 'function' && value instanceof globalThis.Window)
return 'ref: <Window>';
// eslint-disable-next-line no-restricted-globals
if (typeof globalThis.Document === 'function' && value instanceof globalThis.Document)
return 'ref: <Document>';
// eslint-disable-next-line no-restricted-globals
if (typeof globalThis.Node === 'function' && value instanceof globalThis.Node)
return 'ref: <Node>';
}
Expand Down
Loading