chore: more lint work

rstoenescu · rstoenescu · commit ce70aba58ef0 · 2026-04-08T18:21:26.000+03:00
diff --git a/.oxlintrc.json b/.oxlintrc.json
@@ -145,7 +145,7 @@
 
   "overrides": [
     {
-      "files": ["**/*.ts"],
+      "files": ["**/*.d.ts"],
       "rules": {
         "no-unassigned-import": "off"
       }
diff --git a/app-vite/exports/bex/content.js b/app-vite/exports/bex/content.js
@@ -42,9 +42,9 @@ if (
       port.onMessage.removeListener(onMessage)
 
       console.log(
-        chrome.runtime.lastError?.message?.indexOf(
+        chrome.runtime.lastError?.message?.includes(
           'Could not establish connection'
-        ) !== -1
+        )
           ? `${banner} Could not connect to background`
           : `${banner} Lost connection to background`
       )
diff --git a/app-vite/exports/bex/private/bex-bridge.js b/app-vite/exports/bex/private/bex-bridge.js
@@ -144,9 +144,7 @@ export class BexBridge {
 
       const onDisconnect = () => {
         if (
-          runtime.lastError?.message?.indexOf(
-            'Could not establish connection'
-          ) !== -1
+          runtime.lastError?.message?.includes('Could not establish connection')
         ) {
           this.isConnected = false
           portToBackground.onMessage.removeListener(onPacket)
@@ -441,7 +439,8 @@ export class BexBridge {
             listener: { type, callback }
           }
         )
-        return Promise.reject(err)
+
+        throw err
       }
     }
 
diff --git a/app-vite/lib/app-extension/AppExtensionInstance.js b/app-vite/lib/app-extension/AppExtensionInstance.js
@@ -276,7 +276,6 @@ export class AppExtensionInstance {
 
   #stripVersion(packageFullName) {
     const index = packageFullName.indexOf('@')
-
     return index !== -1 ? packageFullName.substring(0, index) : packageFullName
   }
 
diff --git a/app-vite/lib/app-extension/create-app-ext.js b/app-vite/lib/app-extension/create-app-ext.js
@@ -60,7 +60,7 @@ function getAppExtJson({ file, json, onListUpdate }) {
 
     getPrompts(extId) {
       const { __internal, ...prompts } = json[extId] || {}
-      return JSON.parse(JSON.stringify(prompts))
+      return structuredClone(prompts)
     },
 
     getInternal(extId) {
diff --git a/app-vite/lib/cmd/describe.js b/app-vite/lib/cmd/describe.js
@@ -218,7 +218,7 @@ function printProperties({ props }) {
 
   if (argv.filter) {
     keys.forEach(key => {
-      if (key.indexOf(argv.filter) === -1) {
+      if (key.includes(argv.filter) === false) {
         delete props[key]
       }
     })
@@ -246,7 +246,7 @@ function printSlots({ slots }) {
 
   if (argv.filter !== void 0) {
     keys.forEach(key => {
-      if (key.indexOf(argv.filter) === -1) {
+      if (key.includes(argv.filter) === false) {
         delete slots[key]
       }
     })
@@ -274,7 +274,7 @@ function printEvents({ events }) {
 
   if (argv.filter !== void 0) {
     keys.forEach(key => {
-      if (key.indexOf(argv.filter) === -1) {
+      if (key.includes(argv.filter) === false) {
         delete events[key]
       }
     })
@@ -312,7 +312,7 @@ function printMethods({ methods }) {
 
   if (argv.filter !== void 0) {
     keys.forEach(key => {
-      if (key.indexOf(argv.filter) === -1) {
+      if (key.includes(argv.filter) === false) {
         delete methods[key]
       }
     })
@@ -357,7 +357,7 @@ function printComputedProps({ computedProps }) {
 
   if (argv.filter) {
     keys.forEach(key => {
-      if (key.indexOf(argv.filter) === -1) {
+      if (key.includes(argv.filter) === false) {
         delete computedProps[key]
       }
     })
@@ -407,7 +407,7 @@ function printModifiers({ modifiers }) {
 
   if (argv.filter !== void 0) {
     keys.forEach(key => {
-      if (key.indexOf(argv.filter) === -1) {
+      if (key.includes(argv.filter) === false) {
         delete modifiers[key]
       }
     })
@@ -448,7 +448,7 @@ function printQuasarConfOptions({ quasarConfOptions }) {
 
   if (argv.filter !== void 0) {
     keys.forEach(key => {
-      if (key.indexOf(argv.filter) === -1) {
+      if (key.includes(argv.filter) === false) {
         delete conf[key]
       }
     })
@@ -553,7 +553,7 @@ async function listElements() {
   if (filter) {
     const needle = filter.toLowerCase()
     const filterBanner = green(filter)
-    api = api.filter(entry => entry.toLowerCase().indexOf(needle) !== -1)
+    api = api.filter(entry => entry.toLowerCase().includes(needle))
 
     if (api.length === 0) {
       console.log(
diff --git a/app-vite/lib/config-tools.js b/app-vite/lib/config-tools.js
@@ -351,7 +351,7 @@ export function createBrowserRolldownConfig(quasarConf, { shippedToClient }) {
   const target =
     browser === BASELINE_WIDELY_AVAILABLE_TARGET_STRING
       ? [...BASELINE_WIDELY_AVAILABLE]
-      : JSON.parse(JSON.stringify(browser))
+      : structuredClone(browser)
 
   return {
     platform: 'browser',
diff --git a/app-vite/lib/modes/capacitor/config-file.js b/app-vite/lib/modes/capacitor/config-file.js
@@ -265,7 +265,7 @@ export class CapacitorConfigFile {
 
     const originalContent = fs.readFileSync(file, 'utf8')
 
-    if (originalContent.indexOf(content) > -1) {
+    if (originalContent.includes(content)) {
       // it's already there
       return
     }
@@ -290,9 +290,7 @@ export class CapacitorConfigFile {
     if (!file) return
 
     const originalContent = fs.readFileSync(file, 'utf8')
-    const index = originalContent.indexOf(content)
-
-    if (index !== -1) {
+    if (originalContent.includes(content)) {
       const newContent = originalContent.replace(content, '')
       fs.writeFileSync(file, newContent, 'utf8')
     }
diff --git a/app-vite/lib/modes/cordova/android-cleartext.js b/app-vite/lib/modes/cordova/android-cleartext.js
@@ -12,8 +12,9 @@ export function fixAndroidCleartext(appPaths, action) {
   if (fs.existsSync(androidManifestPath) === false) return
 
   let androidManifest = fs.readFileSync(androidManifestPath, 'utf8')
-  const hasCleartext =
-    androidManifest.indexOf('android:usesCleartextTraffic="true"') !== -1
+  const hasCleartext = androidManifest.includes(
+    'android:usesCleartextTraffic="true"'
+  )
 
   if (action === 'add') {
     if (hasCleartext === false) {
diff --git a/app-vite/lib/modes/cordova/config-file.js b/app-vite/lib/modes/cordova/config-file.js
@@ -151,9 +151,9 @@ export class CordovaConfigFile {
 
       // required for allowing devserver's SSL certificate on iOS
       if (
-        tamperedFile.originalContent.indexOf(
+        tamperedFile.originalContent.includes(
           'allowsAnyHTTPSCertificateForHost'
-        ) === -1
+        ) === false
       ) {
         tamperedFile.content =
           tamperedFile.originalContent +
@@ -194,9 +194,9 @@ return YES;
         // Credit: https://gist.github.com/PeterStegnar/63cb8c9a39a13265c3a855e24a33ca37#file-cdvwkwebviewengine-m-L68-L74
         // Enables untrusted SSL connection
         if (
-          tamperedFile.originalContent.indexOf(
+          tamperedFile.originalContent.includes(
             'SecTrustRef serverTrust = challenge.protectionSpace.serverTrust'
-          ) === -1
+          ) === false
         ) {
           const lookupString = '@implementation CDVWKWebViewEngine'
           const insertIndex =
diff --git a/app-vite/lib/modes/electron/electron-builder.js b/app-vite/lib/modes/electron/electron-builder.js
@@ -92,12 +92,12 @@ export class QuasarModeBuilder extends AppBuilder {
     const npmrc = this.ctx.appPaths.resolve.app('.npmrc')
     let content = fse.existsSync(npmrc) ? this.readFile(npmrc) : ''
 
-    if (content.indexOf('shamefully-hoist') === -1) {
+    if (content.includes('shamefully-hoist') === false) {
       content += '\n# needed by pnpm\nshamefully-hoist=true'
     }
     // very important, otherwise PNPM creates symlinks which is NOT
     // what we want for an Electron app that should run cross-platform
-    if (content.indexOf('node-linker') === -1) {
+    if (content.includes('node-linker') === false) {
       content +=
         '\n# pnpm needs this otherwise it creates symlinks\nnode-linker=hoisted'
     }
diff --git a/app-vite/lib/modes/electron/electron-devserver.js b/app-vite/lib/modes/electron/electron-devserver.js
@@ -130,14 +130,15 @@ export class QuasarModeDevserver extends AppDevserver {
       code => {
         if (this.#killedPid === true) {
           this.#killedPid = false
-        } else if (code) {
-          warn()
-          fatal(`Electron process ended with error code: ${code}`)
-        } else {
-          // else it wasn't killed by us
-          warn()
-          fatal('Electron process was killed. Exiting...')
+          return
         }
+
+        warn()
+        fatal(
+          code
+            ? `Electron process ended with error code: ${code}`
+            : 'Electron process was killed. Exiting...'
+        )
       }
     )
   }
diff --git a/app-vite/lib/modes/pwa/pwa-config.js b/app-vite/lib/modes/pwa/pwa-config.js
@@ -110,13 +110,6 @@ export const quasarPwaConfig = {
       ) {
         quasarConf.ssr.pwaExtendGenerateSWOptions(opts)
       }
-
-      opts.swDest =
-        ctx.dev === true
-          ? appPaths.resolve.entry(
-              `service-worker/${quasarConf.pwa.swFilename}`
-            )
-          : join(quasarConf.build.distDir, quasarConf.pwa.swFilename)
     } else {
       // else workboxMode is "InjectManifest"
       if (ctx.prod === true || quasarConf.build.ignorePublicFolder !== true) {
@@ -140,14 +133,13 @@ export const quasarPwaConfig = {
       }
 
       opts.swSrc = appPaths.resolve.entry('compiled-custom-sw.js')
-      opts.swDest =
-        ctx.dev === true
-          ? appPaths.resolve.entry(
-              `service-worker/${quasarConf.pwa.swFilename}`
-            )
-          : join(quasarConf.build.distDir, quasarConf.pwa.swFilename)
     }
 
+    opts.swDest =
+      ctx.dev === true
+        ? appPaths.resolve.entry(`service-worker/${quasarConf.pwa.swFilename}`)
+        : join(quasarConf.build.distDir, quasarConf.pwa.swFilename)
+
     return opts
   },
 
diff --git a/app-vite/lib/quasar-config-file.js b/app-vite/lib/quasar-config-file.js
@@ -126,7 +126,7 @@ function uniquePathFilter(value, index, self) {
 
 const extRE = /\.[m|c]?[j|t]s$/
 function formatQuasarAssetPath(asset, type) {
-  return asset.indexOf('/') !== -1
+  return asset.includes('/')
     ? extRE.test(asset) === true
       ? asset
       : `${asset}.js`
diff --git a/app-vite/lib/utils/app-files-validations.js b/app-vite/lib/utils/app-files-validations.js
@@ -15,13 +15,13 @@ export function appFilesValidations(appPaths) {
 
   const content = fs.readFileSync(file, 'utf8')
 
-  if (content.indexOf(attachMarkup) !== -1) {
+  if (content.includes(attachMarkup)) {
     warn(`Please remove ${attachMarkup} from
     /index.html inside of <body>\n`)
     valid = false
   }
 
-  if (content.indexOf(entryPointMarkup) === -1) {
+  if (content.includes(entryPointMarkup) === false) {
     warn(`Please add ${entryPointMarkup} to
     /index.html inside of <body>\n`)
     valid = false
diff --git a/app-vite/lib/utils/get-caller-path.js b/app-vite/lib/utils/get-caller-path.js
@@ -4,7 +4,7 @@ import { fileURLToPath } from 'node:url'
 export function getCallerPath() {
   const _prepareStackTrace = Error.prepareStackTrace
   Error.prepareStackTrace = (_, stack) => stack
-  const stack = new Error().stack.slice(1)
+  const stack = new Error('err').stack.slice(1)
   Error.prepareStackTrace = _prepareStackTrace
   const filename = stack[1].getFileName()
   return dirname(
diff --git a/docs/build/md/md-parse.js b/docs/build/md/md-parse.js
@@ -62,9 +62,9 @@ export default function mdParse(code, id) {
   }
 
   if (frontMatter.overline === void 0) {
-    if (id.indexOf('quasar-cli-webpack') !== -1) {
+    if (id.includes('quasar-cli-webpack')) {
       frontMatter.overline = 'Quasar CLI with Webpack - @quasar/app-webpack'
-    } else if (id.indexOf('quasar-cli-vite') !== -1) {
+    } else if (id.includes('quasar-cli-vite')) {
       frontMatter.overline = 'Quasar CLI with Vite - @quasar/app-vite'
     }
   }
diff --git a/docs/build/search.js b/docs/build/search.js
@@ -18,7 +18,7 @@ const mdPagesDir = join(thisFolder, '../src/pages')
 const mdPagesList = globSync('**/*.md', { cwd: mdPagesDir })
   .filter(file => hiddenPageRE.test(file) === false)
   .map(key => {
-    if (key.indexOf('elements') !== -1) {
+    if (key.includes('elements')) {
       console.error('Not element:', key)
     }
     const parts = key.substring(0, key.length - 3).split('/')
diff --git a/docs/src/pages/components/ComponentsListing.vue b/docs/src/pages/components/ComponentsListing.vue
@@ -136,8 +136,7 @@ watch([searchTerms, filterTag], () => {
 
     const results = quasarElements.filter(
       entry =>
-        (tag === null || entry.tag === tag) &&
-        entry.haystack.indexOf(needle) !== -1
+        (tag === null || entry.tag === tag) && entry.haystack.includes(needle)
     )
 
     if (results.length === 0) {
diff --git a/docs/src/pages/start/release-notes/PackageReleases.vue b/docs/src/pages/start/release-notes/PackageReleases.vue
@@ -94,8 +94,8 @@ const filteredReleases = computed(() => {
     const val = search.value.toLowerCase()
     return props.releases.filter(
       release =>
-        release.version.indexOf(val) !== -1 ||
-        release.body.toLowerCase().indexOf(val) !== -1
+        release.version.includes(val) ||
+        release.body.toLowerCase().includes(val)
     )
   }
 
diff --git a/ui/src/components/tree/QTree.json b/ui/src/components/tree/QTree.json
@@ -158,7 +158,7 @@
         "desc": "Matches or not"
       },
       "examples": [
-        "(node, filter) => node.label.toLowerCase().indexOf(filter.toLowerCase()) !== -1"
+        "(node, filter) => node.label.toLowerCase().includes(filter.toLowerCase())"
       ],
       "category": "filter"
     },
diff --git a/ui/src/composables/private.use-router-link/use-router-link.js b/ui/src/composables/private.use-router-link/use-router-link.js
@@ -183,9 +183,7 @@ export default function useRouterLink({
       isSameRouteRecord.bind(null, routeMatched)
     )
 
-    if (index !== -1) {
-      return index
-    }
+    if (index !== -1) return index
 
     // possible parent record
     const parentRecordPath = getOriginalPath(matched[length - 2])
diff --git a/ui/src/directives/morph/Morph.js b/ui/src/directives/morph/Morph.js
@@ -199,16 +199,12 @@ export default createDirective(
 
           const group = morphGroups[ctx.group]
 
-          if (group !== void 0) {
-            const index = group.queue.indexOf(ctx)
+          if (group?.queue.includes(ctx)) {
+            group.queue = group.queue.filter(item => item !== ctx)
 
-            if (index !== -1) {
-              group.queue = group.queue.filter(item => item !== ctx)
-
-              if (group.queue.length === 0) {
-                group.cancel?.()
-                delete morphGroups[ctx.group]
-              }
+            if (group.queue.length === 0) {
+              group.cancel?.()
+              delete morphGroups[ctx.group]
             }
           }
 

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@`
`145`	`145`
`146`	`146`	`"overrides": [`
`147`	`147`	`{`
`148`		`- "files": ["*/.ts"],`
	`148`	`+ "files": ["*/.d.ts"],`
`149`	`149`	`"rules": {`
`150`	`150`	`"no-unassigned-import": "off"`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,9 +144,7 @@ export class BexBridge {`
`144`	`144`
`145`	`145`	`const onDisconnect = () => {`
`146`	`146`	`if (`
`147`		`- runtime.lastError?.message?.indexOf(`
`148`		`- 'Could not establish connection'`
`149`		`- ) !== -1`
	`147`	`+ runtime.lastError?.message?.includes('Could not establish connection')`
`150`	`148`	`) {`
`151`	`149`	`this.isConnected = false`
`152`	`150`	`portToBackground.onMessage.removeListener(onPacket)`
`@@ -441,7 +439,8 @@ export class BexBridge {`
`441`	`439`	`listener: { type, callback }`
`442`	`440`	`}`
`443`	`441`	`)`
`444`		`- return Promise.reject(err)`
	`442`	`+`
	`443`	`+ throw err`
`445`	`444`	`}`
`446`	`445`	`}`
`447`	`446`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,6 @@ export class AppExtensionInstance {`
`276`	`276`
`277`	`277`	`#stripVersion(packageFullName) {`
`278`	`278`	`const index = packageFullName.indexOf('@')`
`279`		`-`
`280`	`279`	`return index !== -1 ? packageFullName.substring(0, index) : packageFullName`
`281`	`280`	`}`
`282`	`281`