Merge remote-tracking branch 'webkit/main' into 2023-11-24_add_saniti…

…ze_script
WebKit · Jan 24, 2024 · a81f810 · a81f810
2 parents 2c38d4b + 7c0931e
commit a81f810
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -3,8 +3,6 @@
 package-lock.json
 **/.angular
 
-/resources/tentative/*
-
 /resources/todomvc/architecture-examples/*
 !/resources/todomvc/architecture-examples/angular
 !/resources/todomvc/architecture-examples/angular-complex

diff --git a/.eslintrc b/.eslintrc
@@ -24,6 +24,7 @@
  */
 
 {
+    "root": true,
     "extends": ["eslint:recommended", "plugin:@typescript-eslint/base"],
     "env": {
         "browser": true,

diff --git a/.prettierignore b/.prettierignore
@@ -3,8 +3,6 @@
 package-lock.json
 **/.angular
 
-/resources/tentative/*
-
 /resources/todomvc/architecture-examples/*
 !/resources/todomvc/architecture-examples/angular
 !/resources/todomvc/architecture-examples/angular-complex

diff --git a/package.json b/package.json
@@ -17,8 +17,8 @@
     "scripts": {
         "dev": "http-server ./ -p 7000 -c-1 --cors",
         "server": "http-server ./ -p 7000 --cors",
-        "lint:check": "eslint **/*.mjs",
-        "lint:fix": "eslint \"**/*.{js,mjs,jsx,ts}\" --fix",
+        "lint:check": "eslint **/*.{js,mjs,jsx,ts,tsx}",
+        "lint:fix": "eslint \"**/*.{js,mjs,jsx,ts,tsx}\" --fix",
         "pretty:check": "prettier --check ./",
         "pretty:fix": "prettier --write ./",
         "format": "npm run pretty:fix ; npm run lint:fix",

diff --git a/resources/developer-mode.mjs b/resources/developer-mode.mjs
@@ -88,7 +88,6 @@ export function createUIForIterationCount() {
     return label;
 }
 
-
 export function createUIForSuites() {
     const control = document.createElement("nav");
     const ol = document.createElement("ol");
@@ -186,14 +185,14 @@ export function createUIForSuites() {
 
 function createUIForRun() {
     let button = document.createElement("button");
-    button.textContent = `Start Test`;
+    button.textContent = "Start Test";
     button.onclick = (event) => {
         globalThis.benchmarkClient.start();
-    }
+    };
     let buttons = document.createElement("div");
     buttons.className = "button-bar";
     buttons.appendChild(button);
-    return buttons
+    return buttons;
 }
 
 function updateURL() {

diff --git a/resources/newssite/news-next/.eslintrc.json b/resources/newssite/news-next/.eslintrc.json
@@ -1,3 +1,8 @@
 {
-    "extends": "plugin:@next/next/recommended"
+    "extends": "plugin:@next/next/recommended",
+    "settings": {
+        "next": {
+            "rootDir": "resources/newssite/news-next/"
+        }
+    }
 }