@@ -217,32 +217,27 @@ const noBooleanCompareRules = {
217217 "@typescript-eslint/no-unnecessary-boolean-literal-compare" : 2 ,
218218} ;
219219
220- const noWebGlobalsRules = {
221- // This should contain every bulitin from builtins.ts.
222- "no-restricted-globals" : [
223- "error" ,
224- { "name" : "window" , "message" : "Use InjectedScript.window instead" } ,
225- { "name" : "document" , "message" : "Use InjectedScript.document instead" } ,
226- { "name" : "globalThis" , "message" : "Use InjectedScript.window instead" } ,
227- { "name" : "setTimeout" , "message" : "Use InjectedScript.builtins.setTimeout instead" } ,
228- { "name" : "clearTimeout" , "message" : "Use InjectedScript.builtins.clearTimeout instead" } ,
229- { "name" : "setInterval" , "message" : "Use InjectedScript.builtins.setInterval instead" } ,
230- { "name" : "clearInterval" , "message" : "Use InjectedScript.builtins.clearInterval instead" } ,
231- { "name" : "requestAnimationFrame" , "message" : "Use InjectedScript.builtins.requestAnimationFrame instead" } ,
232- { "name" : "cancelAnimationFrame" , "message" : "Use InjectedScript.builtins.cancelAnimationFrame instead" } ,
233- { "name" : "requestIdleCallback" , "message" : "Use InjectedScript.builtins.requestIdleCallback instead" } ,
234- { "name" : "cancelIdleCallback" , "message" : "Use InjectedScript.builtins.cancelIdleCallback instead" } ,
235- { "name" : "performance" , "message" : "Use InjectedScript.builtins.performance instead" } ,
236- { "name" : "eval" , "message" : "Use InjectedScript.builtins.eval instead" } ,
237- { "name" : "Date" , "message" : "Use InjectedScript.builtins.Date instead" } ,
238- { "name" : "Map" , "message" : "Use InjectedScript.builtins.Map instead" } ,
239- { "name" : "Set" , "message" : "Use InjectedScript.builtins.Set instead" } ,
240- ] ,
241- } ;
220+ // This should contain every builtin from builtins.ts.
221+ const noWebGlobalsRuleList = [
222+ { name : "window" , message : "Use InjectedScript.window instead" } ,
223+ { name : "document" , message : "Use InjectedScript.document instead" } ,
224+ { name : "globalThis" , message : "Use InjectedScript.window instead" } ,
225+ { name : "setTimeout" , message : "Use InjectedScript.builtins.setTimeout instead" } ,
226+ { name : "clearTimeout" , message : "Use InjectedScript.builtins.clearTimeout instead" } ,
227+ { name : "setInterval" , message : "Use InjectedScript.builtins.setInterval instead" } ,
228+ { name : "clearInterval" , message : "Use InjectedScript.builtins.clearInterval instead" } ,
229+ { name : "requestAnimationFrame" , message : "Use InjectedScript.builtins.requestAnimationFrame instead" } ,
230+ { name : "cancelAnimationFrame" , message : "Use InjectedScript.builtins.cancelAnimationFrame instead" } ,
231+ { name : "requestIdleCallback" , message : "Use InjectedScript.builtins.requestIdleCallback instead" } ,
232+ { name : "cancelIdleCallback" , message : "Use InjectedScript.builtins.cancelIdleCallback instead" } ,
233+ { name : "performance" , message : "Use InjectedScript.builtins.performance instead" } ,
234+ { name : "eval" , message : "Use InjectedScript.builtins.eval instead" } ,
235+ { name : "Date" , message : "Use InjectedScript.builtins.Date instead" } ,
236+ { name : "Map" , message : "Use InjectedScript.builtins.Map instead" } ,
237+ { name : "Set" , message : "Use InjectedScript.builtins.Set instead" } ,
238+ ] ;
242239
243- const noNodeGlobalsRules = {
244- "no-restricted-globals" : [ "error" , { name : "process" } ] ,
245- } ;
240+ const noNodeGlobalsRuleList = [ { name : "process" } ] ;
246241
247242const importOrderRules = {
248243 "import/order" : [
@@ -367,16 +362,34 @@ export default [
367362 "no-console" : "off" ,
368363 } ,
369364 } ,
365+ {
366+ files : [
367+ "packages/playwright-core/src/utils/**/*.ts" ,
368+ ] ,
369+ languageOptions : languageOptionsWithTsConfig ,
370+ rules : {
371+ "no-restricted-globals" : [
372+ "error" ,
373+ ...noNodeGlobalsRuleList ,
374+ // TODO: reenable once the violations are fixed is utils/isomorphic/*.
375+ // ...noWebGlobalsRules,
376+ ] ,
377+ ...noFloatingPromisesRules ,
378+ ...noBooleanCompareRules ,
379+ } ,
380+ } ,
370381 {
371382 files : [
372383 "packages/playwright-core/src/server/injected/**/*.ts" ,
373- "packages/playwright-core/src/utils/isomorphic/**/*.ts" ,
374384 "packages/playwright-core/src/server/pageBinding.ts" ,
375385 "packages/playwright-core/src/server/storageScript.ts" ,
376386 ] ,
377387 languageOptions : languageOptionsWithTsConfig ,
378388 rules : {
379- ...noWebGlobalsRules ,
389+ "no-restricted-globals" : [
390+ "error" ,
391+ ...noWebGlobalsRuleList ,
392+ ] ,
380393 ...noFloatingPromisesRules ,
381394 ...noBooleanCompareRules ,
382395 } ,
@@ -385,11 +398,13 @@ export default [
385398 files : [
386399 "packages/playwright-core/src/client/**/*.ts" ,
387400 "packages/playwright-core/src/protocol/**/*.ts" ,
388- "packages/playwright-core/src/utils/**/*.ts" ,
389401 ] ,
390402 languageOptions : languageOptionsWithTsConfig ,
391403 rules : {
392- ...noNodeGlobalsRules ,
404+ "no-restricted-globals" : [
405+ "error" ,
406+ ...noNodeGlobalsRuleList ,
407+ ] ,
393408 ...noFloatingPromisesRules ,
394409 ...noBooleanCompareRules ,
395410 } ,
0 commit comments