WordPress · obulat · Oct 31, 2024 · Oct 18, 2024 · Oct 18, 2024 · Oct 18, 2024
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -12,8 +12,7 @@
 
 /frontend/           @WordPress/openverse-frontend
 /packages/js/        @WordPress/openverse-frontend
-/.eslintignore       @WordPress/openverse-frontend
-/.eslintrc.js        @WordPress/openverse-frontend
+/eslint.config.mjs   @WordPress/openverse-frontend
 /.npmrc              @WordPress/openverse-frontend
 /.pnpmfile.cjs       @WordPress/openverse-frontend
 /.prettierignore     @WordPress/openverse-frontend

@@ -59,7 +59,7 @@ query ($repoOwner: String!, $repo: String!, $cursor: String) {
   try {
     let hasNextPage = true
     let cursor = null
-    let reviewablePrs = []
+    const reviewablePrs = []
     const pullRequest = context.payload.pull_request
     const result = {
       pr_count: 0,

@@ -1,4 +1,5 @@
 import { readFileSync } from "fs"
+
 import { PullRequest } from "./utils/pr.mjs"
 import { IdSet } from "./utils/id_set.mjs"
 
@@ -40,12 +41,12 @@ function getLabelsFromChanges(allLabels, changes) {
  * @returns {boolean} whether the list of labels covers all requirements
  */
 function getIsFullyLabeled(labels) {
-  for (let req of exactlyOne) {
+  for (const req of exactlyOne) {
     if (labels.filter((label) => label.name.includes(req)).length !== 1) {
       return false
     }
   }
-  for (let req of atleastOne) {
+  for (const req of atleastOne) {
     if (labels.filter((label) => label.name.includes(req)).length < 1) {
       return false
     }
@@ -133,7 +134,7 @@ export const main = async (octokit, core) => {
   // For each label that we only need one of, we check if the PR already has
   // such a label. If not, we check if the label pool contains any valid labels
   // and add the first one we find.
-  for (let rule of exactlyOne) {
+  for (const rule of exactlyOne) {
     if (finalLabels.items.some((label) => label.name.includes(rule))) {
       core.info(`PR already has a "${rule}" label.`)
       continue
@@ -147,7 +148,7 @@ export const main = async (octokit, core) => {
 
   // For each label that we need at least one of, we add all the valid labels
   // from the label pool. Our ID set implementation will weed out duplicates.
-  for (let rule of atleastOne) {
+  for (const rule of atleastOne) {
     const validLabels = labelPool.filter((label) => label.name.includes(rule))
     core.info(
       `Adding labels "${validLabels

@@ -35,6 +35,7 @@ if (!(pat && username && password)) process.exit(1)
 /* Read GitHub information from the data files */
 
 const githubDataFile = resolve("../data/github.yml") // resolved from `package.json`
+// eslint-disable-next-line import/no-named-as-default-member
 const githubInfo = yaml.load(readFileSync(githubDataFile))
 const org = githubInfo.org
 const repos = Object.values(githubInfo.repos)
@@ -87,7 +88,7 @@ const getItemsHtml = (title, items) => {
   ].sort()
 
   // Aggregate items by stack
-  let itemsByStack = {}
+  const itemsByStack = {}
 
   for (const stack of stacks) {
     const stackName = stack.split(":")[1].trim()

@@ -41,7 +41,7 @@ async function syncReviews(core, pr, prBoard, prCard) {
 async function syncIssues(core, pr, backlogBoard, destColumn) {
   core.info(`Synchronizing issues for PR ${pr.nodeId}.`)
 
-  for (let linkedIssue of pr.linkedIssues) {
+  for (const linkedIssue of pr.linkedIssues) {
     core.info(`Syncing issue ${linkedIssue.id}.`)
 
     // Create new, or get the existing, card for the current issue.

@@ -61,7 +61,7 @@ const GET_PROJECT_CARDS = `
  */
 module.exports = async ({ github, core }) => {
   try {
-    const isDryRun = process.env.DRY_RUN === "true" ?? false
+    const isDryRun = process.env.DRY_RUN === "true"
 
     const currentDate = new Date()
     // Create a date by subtracting DAYS_UPDATED_WITHIN days

@@ -68,7 +68,7 @@ export const main = async (octokit, core) => {
     infraLabels.map((label) => [label.name, label])
   )
 
-  for (let label of monoLabels) {
+  for (const label of monoLabels) {
     if (exclusions.some((rule) => label.name.match(rule))) {
       core.info(`Label "${label.name}" is excluded from sync.`)
       continue

@@ -155,7 +155,7 @@ export class PullRequest {
       DISMISSED: 0,
       PENDING: 0,
     }
-    for (let reviewState of this.reviewStates) {
+    for (const reviewState of this.reviewStates) {
       reviewCounts[reviewState] += 1
     }
     return reviewCounts

@@ -0,0 +1,72 @@
+import { fileURLToPath } from "node:url"
+import path from "node:path"
+import fs from "node:fs"
+
+// eslint-disable-next-line import/no-unresolved
+import { config as defineConfig } from "typescript-eslint"
+import { convertIgnorePatternToMinimatch } from "@eslint/compat"
+import openverse from "@openverse/eslint-plugin"
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+
+const gitignoreFiles = [
+  path.resolve(__dirname, ".gitignore"),
+  path.resolve(__dirname, "frontend", ".gitignore"),
+  path.resolve(__dirname, "automations", "js", ".gitignore"),
+  path.resolve(__dirname, "packages", "js", "api-client", ".gitignore"),
+]
+
+/**
+ * Vendored in from `@eslint/compat` to support multiple ignore files.
+ * Reads an ignore file and returns a list of ignore patterns.
+ * @param {string[]} ignoreFilePaths The absolute path to the ignore file.
+ * @returns {string[]} An array of ignore patterns.
+ * @throws {Error} If the ignore file path is not an absolute path.
+ */
+function mapIgnoreFiles(ignoreFilePaths) {
+  for (const ignoreFilePath of ignoreFilePaths) {
+    if (!path.isAbsolute(ignoreFilePath)) {
+      throw new Error("The ignore file location must be an absolute path.")
+    }
+  }
+
+  /** @type {string[]} */
+  const ignores = []
+  for (const ignoreFilePath of ignoreFilePaths) {
+    const ignoreFile = fs.readFileSync(ignoreFilePath, "utf8")
+    const lines = ignoreFile.split(/\r?\n/u)
+    ignores.push(
+      ...lines
+        .map((line) => line.trim())
+        .filter((line) => line && !line.startsWith("#"))
+        .map(convertIgnorePatternToMinimatch)
+    )
+  }
+
+  return ignores
+}
+
+// List of files from old .eslintignore
+const eslintIgnores = [
+  "**/dist/**",
+  "frontend/.pnpm-store/**",
+  "frontend/.nuxt/**",
+  "frontend/.output/**",
+  "frontend/.remake/**",
+  "frontend/src/locales/*.json",
+  // Vendored module. See explanation in file
+  "frontend/test/unit/test-utils/render-suspended.ts",
+  "**/coverage/**",
+  "frontend/test/tapes/**",
+  "frontend/storybook-static/**",
+  "packages/**/dist/**",
+]
+
+export default defineConfig(
+  {
+    name: "openverse:ignore-files",
+    ignores: [...mapIgnoreFiles(gitignoreFiles), ...eslintIgnores],
+  },
+  { files: [".pnpmfile.cjs"] },
+  ...openverse.default.configs.project
+)
@@ -127,7 +127,7 @@ function getInterfaceFields(node, ast) {
 function extractComments(node, ast) {
   const fullText = node.getFullText(ast)
 
-  let commentRanges = ts.getLeadingCommentRanges(fullText, 0)
+  const commentRanges = ts.getLeadingCommentRanges(fullText, 0)
   if (!commentRanges) {
     return undefined
   }
@@ -140,8 +140,8 @@ function extractComments(node, ast) {
     return undefined
   }
 
-  let links = []
-  let text = comments
+  const links = []
+  const text = comments
     .at(-1) // retain only the last doc comment
     .split("\n")
     .map((line) =>

@@ -83,7 +83,7 @@ const handleSubmit = async (event: Event) => {
       },
     })
     updateStatus(SENT)
-  } catch (error) {
+  } catch {
     updateStatus(FAILED)
   }
 }

@@ -28,7 +28,7 @@ const i18n = useI18n({ useScope: "global" })
 
 const images = Object.fromEntries(
   imageInfo.errors.map((errorItem) => {
-    let image = errorItem.image
+    const image = errorItem.image
     const errorImage: ErrorImage = {
       ...image,
       originalTitle: image.title,

@@ -35,7 +35,7 @@ const Template = (args) => ({
       // Skip license type filters as they can disable license filters
       let filterTypeIdx = 1
       for (let i = 0; i < filterCount; i++) {
-        let filterType = filterTypes[filterTypeIdx]
+        const filterType = filterTypes[filterTypeIdx]
         searchStore.toggleFilter({
           filterType,
           codeIdx: filterIdx,

@@ -20,7 +20,7 @@ const metadata = computed<null | Metadata[]>(() => {
   if (!props.media) {
     return null
   }
-  let imageInfo =
+  const imageInfo =
     props.media.frontendMediaType === IMAGE
       ? {
           width: props.media.width,

@@ -22,8 +22,8 @@ const sensitivityPath = computed(() => localePath("/sensitive-content"))
 const featureFlagStore = useFeatureFlagStore()
 const { $sendCustomEvent } = useNuxtApp()
 
-let fetchSensitive = computed(() => featureFlagStore.isOn("fetch_sensitive"))
-let setFetchSensitive = (data: Omit<CheckboxAttrs, "disabled">) => {
+const fetchSensitive = computed(() => featureFlagStore.isOn("fetch_sensitive"))
+const setFetchSensitive = (data: Omit<CheckboxAttrs, "disabled">) => {
   const checked = data.checked ?? false
   featureFlagStore.toggleFeature("fetch_sensitive", checked ? ON : OFF)
   $sendCustomEvent("TOGGLE_FETCH_SENSITIVE", { checked })
@@ -36,8 +36,8 @@ let setFetchSensitive = (data: Omit<CheckboxAttrs, "disabled">) => {
 }
 
 const uiStore = useUiStore()
-let blurSensitive = computed(() => uiStore.shouldBlurSensitive)
-let setBlurSensitive = (data: { checked?: boolean }) => {
+const blurSensitive = computed(() => uiStore.shouldBlurSensitive)
+const setBlurSensitive = (data: { checked?: boolean }) => {
   const checked = data.checked ?? false
   uiStore.setShouldBlurSensitive(checked)
   $sendCustomEvent("TOGGLE_BLUR_SENSITIVE", { checked })

@@ -108,7 +108,7 @@ const scroll = (to: "start" | "end") => {
 
   showScrollButton[to === "start" ? "end" : "start"] = true
 
-  let distToSide = getDistToSide(to, dir.value, innerContainer)
+  const distToSide = getDistToSide(to, dir.value, innerContainer)
   let adjustedScrollStep = scrollStep
 
   // If the scroll step is larger than the distance to the side, scroll
@@ -127,7 +127,7 @@ const scroll = (to: "start" | "end") => {
     adjustedScrollStep = -adjustedScrollStep
   }
 
-  let left = to === "start" ? -adjustedScrollStep : adjustedScrollStep
+  const left = to === "start" ? -adjustedScrollStep : adjustedScrollStep
   buttonsRef.value?.scrollBy({ left, behavior: "smooth" })
 }
 

@@ -86,7 +86,7 @@ const getFocusDirection = (
 }
 
 const handleKeyDown = (event: KeyboardEvent) => {
-  let list = tabContext.tabs.value
+  const list = tabContext.tabs.value
     .map((tab) => getDomElement(tab))
     .filter(Boolean) as HTMLElement[]
   const tabControlKeys = [

@@ -81,7 +81,7 @@ const tabGroupContext: TabsState = {
     }
   },
   unregisterTab(tab: (typeof tabs)["value"][number]) {
-    let idx = tabs.value.indexOf(tab)
+    const idx = tabs.value.indexOf(tab)
     if (idx !== -1) {
       tabs.value.splice(idx, 1)
     }
@@ -92,7 +92,7 @@ const tabGroupContext: TabsState = {
     }
   },
   unregisterPanel(panel: (typeof panels)["value"][number]) {
-    let idx = panels.value.indexOf(panel)
+    const idx = panels.value.indexOf(panel)
     if (idx !== -1) {
       panels.value.splice(idx, 1)
     }

@@ -40,7 +40,11 @@ export function useDialogControl({
   watch(internalVisibleRef, (visible, _, onCleanup) => {
     triggerA11yProps["aria-expanded"] = visible
     if (shouldLockBodyScroll.value) {
-      visible ? lock() : unlock()
+      if (visible) {
+        lock()
+      } else {
+        unlock()
+      }
     }
     emit(visible ? "open" : "close")
     onCleanup(() => {

@@ -47,7 +47,7 @@ const showScrollButton = ref(false)
  *
  * Note: template refs do not work in a Nuxt layout, so we get the `main-page` element using `document.getElementById`.
  */
-let mainPageElement = ref<HTMLElement | null>(null)
+const mainPageElement = ref<HTMLElement | null>(null)
 
 const { y: mainPageY } = useScroll(mainPageElement)
 watch(mainPageY, (y) => {

@@ -100,13 +100,13 @@ const getComment = (entry) => {
   }
 
   // comments given by the programmer, directed at the translator (#.)
-  let vars = checkStringForVars(entry.value)
+  const vars = checkStringForVars(entry.value)
   if (vars) {
     comment.push(vars)
   }
 
   // comments containing references to the program’s source code (#:)
-  let refComments = getRefComments(entry.lineage)
+  const refComments = getRefComments(entry.lineage)
   if (refComments.length) {
     comment.push(...refComments)
   }
@@ -128,8 +128,8 @@ const toPot = (entry) => {
   }
 
   // string-string type mapping
-  let poEntry = []
-  let comment = getComment(entry)
+  const poEntry = []
+  const comment = getComment(entry)
   if (comment) {
     poEntry.push(comment)
   }

@@ -167,9 +167,9 @@ const parseValue = (entry, valueNode) => {
  * @return {Entry} the entry generated by parsing the node
  */
 const parseObjProperty = (node) => {
-  let key = parseKey(node.key)
-  let comments = node.leadingComments?.map(parseComment).join("")
-  let entry = new Entry(key, comments)
+  const key = parseKey(node.key)
+  const comments = node.leadingComments?.map(parseComment).join("")
+  const entry = new Entry(key, comments)
   parseValue(entry, node.value)
   return entry
 }