Custom AMP Validator Variable Name Collision Fix (vercel#10371)

* Changing variable name internally

* Add tests for custom AMP validator

Co-authored-by: JJ Kasper <jj@jjsweb.site>

packages/next/export/index.ts

@@ -232,7 +232,7 @@ export default async function(
     hotReloader: null,
     canonicalBase: nextConfig.amp?.canonicalBase || '',
     isModern: nextConfig.experimental.modern,
-    ampValidator: nextConfig.experimental.amp?.validator || undefined,
+    ampValidatorPath: nextConfig.experimental.amp?.validator || undefined,
   }
 
   const { serverRuntimeConfig, publicRuntimeConfig } = nextConfig

packages/next/export/worker.js

@@ -214,7 +214,7 @@ export default async function({
     }
 
     if (curRenderOpts.inAmpMode) {
-      await validateAmp(html, path, curRenderOpts.ampValidator)
+      await validateAmp(html, path, curRenderOpts.ampValidatorPath)
     } else if (curRenderOpts.hybridAmp) {
       // we need to render the AMP version
       let ampHtmlFilename = `${ampPath}${sep}index.html`

test/integration/amphtml-custom-validator/next.config.js

@@ -0,0 +1,7 @@
+module.exports = {
+  experimental: {
+    amp: {
+      validator: 'https://cdn.ampproject.org/v0/validator.js',
+    },
+  },
+}

test/integration/amphtml-custom-validator/pages/index.js

@@ -0,0 +1,5 @@
+export const config = {
+  amp: true,
+}
+
+export default () => <p>Hello from AMP</p>

test/integration/amphtml-custom-validator/test/index.test.js

@@ -0,0 +1,49 @@
+/* eslint-env jest */
+/* global jasmine */
+import { join } from 'path'
+import {
+  nextBuild,
+  findPort,
+  nextStart,
+  killApp,
+  launchApp,
+  renderViaHTTP,
+} from 'next-test-utils'
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 60 * 1
+
+let app
+let appPort
+const appDir = join(__dirname, '../')
+
+describe('AMP Custom Validator', () => {
+  it('should build and start successfully', async () => {
+    const { code } = await nextBuild(appDir)
+    expect(code).toBe(0)
+
+    appPort = await findPort()
+    app = await nextStart(appDir, appPort)
+
+    const html = await renderViaHTTP(appPort, '/')
+    await killApp(app)
+
+    expect(html).toContain('Hello from AMP')
+  })
+
+  it('should run in dev mode successfully', async () => {
+    let stderr = ''
+
+    appPort = await findPort()
+    app = await launchApp(appDir, appPort, {
+      onStderr(msg) {
+        stderr += msg || ''
+      },
+    })
+
+    const html = await renderViaHTTP(appPort, '/')
+    await killApp(app)
+
+    expect(stderr).not.toContain('error')
+    expect(html).toContain('Hello from AMP')
+  })
+})