Remove disabling of prefer-template eslint rule (#58230)

Author: heiskr

eslint.config.ts

@@ -93,14 +93,13 @@ export default [
       'no-redeclare': 'off', // Allow function overloads in TypeScript
       'i18n-text/no-en': 'off', // This rule causes eslint to not run at all
       'filenames/match-regex': 'off', // This rule causes eslint to not run at all
+      camelcase: 'off', // Many gh apis use underscores, 600+ uses
 
       // Disabled rules to review
       'github/no-then': 'off', // 30+
       '@typescript-eslint/ban-ts-comment': 'off', // 50+
       'no-shadow': 'off', // 150+
-      'prefer-template': 'off', // 150+
       'github/array-foreach': 'off', // 250+
-      camelcase: 'off', // 600+
       'no-console': 'off', // 800+
       '@typescript-eslint/no-explicit-any': 'off', // 1000+
     },

src/app/lib/language-utils.ts

@@ -34,7 +34,7 @@ export function hasLanguagePrefix(path: string): boolean {
 export function stripLanguagePrefix(path: string): string {
   if (hasLanguagePrefix(path)) {
     const pathSegments = path.split('/')
-    return '/' + pathSegments.slice(2).join('/')
+    return `/${pathSegments.slice(2).join('/')}`
   }
   return path
 }

src/archives/middleware/archived-enterprise-versions.ts

@@ -353,14 +353,14 @@ function getProxyPath(reqPath: string, requestedVersion: string) {
 
   // Releases 2.18 and higher
   if (versionSatisfiesRange(requestedVersion, `>${lastVersionWithoutArchivedRedirectsFile}`)) {
-    const newReqPath = reqPath.includes('redirects.json') ? `/${reqPath}` : reqPath + '/index.html'
+    const newReqPath = reqPath.includes('redirects.json') ? `/${reqPath}` : `${reqPath}/index.html`
     return ENTERPRISE_GH_PAGES_URL_PREFIX + requestedVersion + newReqPath
   }
 
   // Releases 2.13 - 2.17
   // redirect.json files don't exist for these versions
   if (versionSatisfiesRange(requestedVersion, `>=2.13`)) {
-    return ENTERPRISE_GH_PAGES_URL_PREFIX + requestedVersion + reqPath + '/index.html'
+    return `${ENTERPRISE_GH_PAGES_URL_PREFIX + requestedVersion + reqPath}/index.html`
   }
 
   // Releases 2.12 and lower

src/article-api/middleware/article.ts

@@ -167,7 +167,7 @@ function incrementArticleLookup(
   const source =
     req.get('X-Request-Source') ||
     (req.get('Referer')
-      ? 'external-' + (new URL(req.get('Referer') || '').hostname || 'unknown')
+      ? `external-${new URL(req.get('Referer') || '').hostname || 'unknown'}`
       : 'external')
 
   const tags = [

src/article-api/scripts/generate-api-docs.ts

@@ -156,10 +156,10 @@ function updateReadme(readmePath: string, markdown: string): void {
 
     // Replace API documentation section, or append to end
     if (readme.includes(placeholderComment)) {
-      const pattern = new RegExp(placeholderComment + '[\\s\\S]*', 'g')
-      readme = readme.replace(pattern, placeholderComment + '\n' + markdown)
+      const pattern = new RegExp(`${placeholderComment}[\\s\\S]*`, 'g')
+      readme = readme.replace(pattern, `${placeholderComment}\n${markdown}`)
     } else {
-      readme += '\n' + markdown
+      readme += `\n${markdown}`
     }
 
     writeFileSync(readmePath, readme)

src/assets/tests/dynamic-assets.ts

@@ -103,7 +103,7 @@ describe('dynamic assets', () => {
   })
 
   test.each(['key', 'key=value'])('any query string (%p) triggers a redirect', async (qs) => {
-    const res = await get('/assets/images/_fixtures/screenshot.webp?' + qs)
+    const res = await get(`/assets/images/_fixtures/screenshot.webp?${qs}`)
     expect(res.statusCode).toBe(302)
     expect(res.headers.location).toBe('/assets/images/_fixtures/screenshot.webp')
     expect(res.headers['cache-control']).toContain('public')

src/assets/tests/static-assets.ts

@@ -113,7 +113,7 @@ describe('static assets', () => {
     // This picks the first one found. We just need it to be anything
     // that actually resolves.
     const filePath = getNextStaticAsset('css')
-    const asURL = '/' + filePath.replace('.next', '_next').split(path.sep).join('/')
+    const asURL = `/${filePath.replace('.next', '_next').split(path.sep).join('/')}`
     const res = await get(asURL)
     expect(res.statusCode).toBe(200)
     checkCachingHeaders(res)

src/codeql-cli/scripts/sync.ts

@@ -41,7 +41,7 @@ async function main() {
     const matchHeading = '## Options\n'
     const primaryHeadingSourceContent = sourceContent.replace(
       matchHeading,
-      matchHeading + '\n### Primary Options\n',
+      `${matchHeading}\n### Primary Options\n`,
     )
     const currentFileName = path.basename(file)
     const { data, content } = await convertContentToDocs(

src/codeql-cli/tests/test-circular-links.ts

@@ -56,7 +56,7 @@ async function testCircularLinkFix(): Promise<boolean> {
     }
 
     console.log('\n--- Generated content preview ---')
-    console.log(result1.content.substring(0, 800) + '...')
+    console.log(`${result1.content.substring(0, 800)}...`)
 
     return !hasCircularLink && hasValidLink
   } catch (error) {

src/content-linter/lib/linting-rules/code-annotation-comment-spacing.ts

@@ -81,7 +81,7 @@ export const codeAnnotationCommentSpacing = {
             // No space after comment character - this is an error
             const lineNumber: number = token.lineNumber + index + 1
             const leadingWhitespace: string = line.match(/^\s*/)![0]
-            const fixedLine: string = leadingWhitespace + commentChar + ' ' + restOfLine
+            const fixedLine: string = `${leadingWhitespace + commentChar} ${restOfLine}`
 
             addError(
               onError,