Merge branch 'canary' into bugfix/typescript-cache

vercel · May 11, 2021 · 36913a1 · 36913a1
2 parents ba122c2 + f97b82a
commit 36913a1
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 6 deletions.
diff --git a/packages/eslint-plugin-next/lib/rules/google-font-display.js b/packages/eslint-plugin-next/lib/rules/google-font-display.js
@@ -23,7 +23,7 @@ module.exports = {
         }
 
         const hrefValue = attributes.value('href')
-        const isGoogleFont = hrefValue.includes(
+        const isGoogleFont = hrefValue?.startsWith(
           'https://fonts.googleapis.com/css'
         )
 

diff --git a/packages/eslint-plugin-next/lib/rules/google-font-preconnect.js b/packages/eslint-plugin-next/lib/rules/google-font-preconnect.js
@@ -26,7 +26,7 @@ module.exports = {
           attributes.value('rel') !== 'preconnect'
 
         if (
-          hrefValue.includes('https://fonts.gstatic.com') &&
+          hrefValue?.startsWith('https://fonts.gstatic.com') &&
           preconnectMissing
         ) {
           context.report({

diff --git a/packages/eslint-plugin-next/lib/rules/no-page-custom-font.js b/packages/eslint-plugin-next/lib/rules/no-page-custom-font.js
@@ -38,7 +38,7 @@ module.exports = {
         }
 
         const hrefValue = attributes.value('href')
-        const isGoogleFont = hrefValue.includes(
+        const isGoogleFont = hrefValue?.startsWith(
           'https://fonts.googleapis.com/css'
         )
 

diff --git a/test/eslint-plugin-next/google-font-display.unit.test.js b/test/eslint-plugin-next/google-font-display.unit.test.js
@@ -3,7 +3,7 @@ const RuleTester = require('eslint').RuleTester
 
 RuleTester.setDefaultConfig({
   parserOptions: {
-    ecmaVersion: 2018,
+    ecmaVersion: 2020,
     sourceType: 'module',
     ecmaFeatures: {
       modules: true,
@@ -20,6 +20,15 @@ ruleTester.run('google-font-display', rule, {
      export default Test = () => {
       return (
         <Head>
+          <link href={test} rel="test" />
+          <link
+            href={process.env.NEXT_PUBLIC_CANONICAL_URL}
+            rel="canonical"
+          />
+          <link
+            href={new URL("../public/favicon.ico", import.meta.url).toString()}
+            rel="icon"
+          />
           <link
             href="https://fonts.googleapis.com/css2?family=Krona+One&display=optional"
             rel="stylesheet"

diff --git a/test/eslint-plugin-next/google-font-preconnect.unit.test.js b/test/eslint-plugin-next/google-font-preconnect.unit.test.js
@@ -3,7 +3,7 @@ const RuleTester = require('eslint').RuleTester
 
 RuleTester.setDefaultConfig({
   parserOptions: {
-    ecmaVersion: 2018,
+    ecmaVersion: 2020,
     sourceType: 'module',
     ecmaFeatures: {
       modules: true,
@@ -18,6 +18,14 @@ ruleTester.run('google-font-preconnect', rule, {
     `export const Test = () => (
         <div>
           <link rel="preconnect" href="https://fonts.gstatic.com"/>
+          <link
+            href={process.env.NEXT_PUBLIC_CANONICAL_URL}
+            rel="canonical"
+          />
+          <link
+            href={new URL("../public/favicon.ico", import.meta.url).toString()}
+            rel="icon"
+          />
         </div>
       )
     `,

diff --git a/test/eslint-plugin-next/no-page-custom-font.unit.test.js b/test/eslint-plugin-next/no-page-custom-font.unit.test.js
@@ -3,7 +3,7 @@ const RuleTester = require('eslint').RuleTester
 
 RuleTester.setDefaultConfig({
   parserOptions: {
-    ecmaVersion: 2018,
+    ecmaVersion: 2020,
     sourceType: 'module',
     ecmaFeatures: {
       modules: true,
@@ -26,6 +26,14 @@ ruleTester.run('no-page-custom-font', rule, {
                 href="https://fonts.googleapis.com/css2?family=Krona+One&display=swap"
                 rel="stylesheet"
               />
+              <link
+                href={process.env.NEXT_PUBLIC_CANONICAL_URL}
+                rel="canonical"
+              />
+              <link
+                href={new URL("../public/favicon.ico", import.meta.url).toString()}
+                rel="icon"
+              />
             </Head>
           </Html>
         );