Ensure validator is included in vendored AMP validator (#70482)

This aims to provide more stability so we aren't hitting the network to
grab the validator more than we need to and instead leverage the one
from build instead which should also reduce some test flakiness we've
been seeing.

packages/next/src/export/routes/pages.ts

@@ -56,6 +56,12 @@ export async function exportPagesPage(
     hybrid: components.pageConfig?.amp === 'hybrid',
   }
 
+  if (!ampValidatorPath) {
+    ampValidatorPath = require.resolve(
+      'next/dist/compiled/amphtml-validator/validator_wasm.js'
+    )
+  }
+
   const inAmpMode = isInAmpMode(ampState)
   const hybridAmp = ampState.hybrid
 

packages/next/src/server/dev/next-dev-server.ts

@@ -176,9 +176,13 @@ export default class DevServer extends Server {
       this.nextConfig.experimental?.amp?.skipValidation ?? false
     this.renderOpts.ampValidator = (html: string, pathname: string) => {
       const validatorPath =
-        this.nextConfig.experimental &&
-        this.nextConfig.experimental.amp &&
-        this.nextConfig.experimental.amp.validator
+        (this.nextConfig.experimental &&
+          this.nextConfig.experimental.amp &&
+          this.nextConfig.experimental.amp.validator) ||
+        require.resolve(
+          'next/dist/compiled/amphtml-validator/validator_wasm.js'
+        )
+
       const AmpHtmlValidator =
         require('next/dist/compiled/amphtml-validator') as typeof import('next/dist/compiled/amphtml-validator')
       return AmpHtmlValidator.getInstance(validatorPath).then((validator) => {

packages/next/taskfile.js

@@ -2260,6 +2260,21 @@ export async function precompile(task, opts) {
     ['browser_polyfills', 'copy_ncced', 'copy_styled_jsx_assets'],
     opts
   )
+
+  const validatorRes = await fetch(
+    'https://cdn.ampproject.org/v0/validator_wasm.js'
+  )
+
+  if (!validatorRes.ok) {
+    throw new Error(
+      `Failed to get the AMP validator, status: ${validatorRes.status}`
+    )
+  }
+
+  await fs.writeFile(
+    join(__dirname, 'dist/compiled/amphtml-validator/validator_wasm.js'),
+    require('buffer').Buffer.from(await validatorRes.arrayBuffer())
+  )
 }
 
 // eslint-disable-next-line camelcase

test/e2e/async-modules/next.config.js

@@ -1,7 +1 @@
-module.exports = {
-  experimental: {
-    amp: {
-      validator: require.resolve('./amp-validator-wasm.js'),
-    },
-  },
-}
+module.exports = {}

test/integration/amp-export-validation/next.config.js

@@ -1,9 +1,4 @@
 module.exports = {
   output: 'export',
-  experimental: {
-    amp: {
-      validator: require.resolve('../../lib/amp-validator-wasm.js'),
-    },
-  },
   // exportPathMap
 }

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

@@ -1,7 +1,6 @@
 module.exports = {
   experimental: {
     amp: {
-      validator: require.resolve('../../lib/amp-validator-wasm.js'),
       optimizer: {
         ampRuntimeVersion: '001515617716922',
         rtv: true,

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

@@ -1,7 +1 @@
-module.exports = {
-  experimental: {
-    amp: {
-      validator: require.resolve('../../lib/amp-validator-wasm.js'),
-    },
-  },
-}
+module.exports = {}

test/integration/amphtml-fragment-style/next.config.js

@@ -1,7 +1 @@
-module.exports = {
-  experimental: {
-    amp: {
-      validator: require.resolve('../../lib/amp-validator-wasm.js'),
-    },
-  },
-}
+module.exports = {}

test/integration/amphtml-ssg/next.config.js

@@ -1,7 +1 @@
-module.exports = {
-  experimental: {
-    amp: {
-      validator: require.resolve('../../lib/amp-validator-wasm.js'),
-    },
-  },
-}
+module.exports = {}

test/integration/amphtml/next.config.js

@@ -6,10 +6,5 @@ module.exports = {
   amp: {
     canonicalBase: 'http://localhost:1234',
   },
-  experimental: {
-    amp: {
-      validator: require.resolve('../../lib/amp-validator-wasm.js'),
-    },
-  },
   // edit here
 }

test/integration/auto-export-query-error/next.config.js

@@ -7,9 +7,4 @@ module.exports = {
       '/ssr': { page: '/ssr', query: { another: 'one' } },
     }
   },
-  experimental: {
-    amp: {
-      validator: require.resolve('../../lib/amp-validator-wasm.js'),
-    },
-  },
 }

test/integration/build-output/fixtures/with-amp/next.config.js

@@ -1,7 +1 @@
-module.exports = {
-  experimental: {
-    amp: {
-      validator: require.resolve('../../../../lib/amp-validator-wasm.js'),
-    },
-  },
-}
+module.exports = {}

test/integration/export-default-map/next.config.js

@@ -1,8 +1,3 @@
 module.exports = {
   output: 'export',
-  experimental: {
-    amp: {
-      validator: require.resolve('../../lib/amp-validator-wasm.js'),
-    },
-  },
 }

test/integration/i18n-support-base-path/next.config.js

@@ -1,10 +1,5 @@
 module.exports = {
   basePath: '/docs',
-  experimental: {
-    amp: {
-      validator: require.resolve('../../lib/amp-validator-wasm.js'),
-    },
-  },
   i18n: {
     // localeDetection: false,
     locales: [

test/integration/i18n-support/next.config.js

@@ -1,11 +1,6 @@
 module.exports = {
   // basePath: '/docs',
   // trailingSlash: true,
-  experimental: {
-    amp: {
-      validator: require.resolve('../../lib/amp-validator-wasm.js'),
-    },
-  },
   i18n: {
     // localeDetection: false,
     locales: [

test/integration/page-config/next.config.js

@@ -1,7 +1 @@
-module.exports = {
-  experimental: {
-    amp: {
-      validator: require.resolve('../../lib/amp-validator-wasm.js'),
-    },
-  },
-}
+module.exports = {}

test/production/pages-dir/production/fixture/next.config.js

@@ -2,11 +2,6 @@
 setInterval(() => {}, 250)
 
 module.exports = {
-  experimental: {
-    amp: {
-      validator: require.resolve('./amp-validator-wasm.js'),
-    },
-  },
   onDemandEntries: {
     // Make sure entries are not getting disposed.
     maxInactiveAge: 1000 * 60 * 60,