Merge branch 'canary' into canary

examples/using-preact/README.md

@@ -1,6 +1,6 @@
 # Preact example
 
-This example uses [Preact](https://github.com/developit/preact) instead of React. It's a React like UI framework which is fast and small. Here we've customized Next.js to use Preact instead of React.
+This example uses [Preact](https://github.com/preactjs/preact) instead of React. It's a React like UI framework which is fast and small. Here we've customized Next.js to use Preact instead of React.
 
 Here's how we did it:
 

examples/using-preact/package.json

@@ -9,8 +9,8 @@
  "dependencies": {
  "module-alias": "2.2.2",
  "next": "latest",
- "preact": "10.0.0",
- "preact-render-to-string": "5.0.7"
+ "preact": "10.2.1",
+ "preact-render-to-string": "5.1.4"
  },
  "license": "ISC",
  "devDependencies": {

lerna.json

@@ -12,5 +12,5 @@
  "registry": "https://registry.npmjs.org/"
  }
  },
- "version": "9.2.2-canary.4"
+ "version": "9.2.2-canary.6"
 }

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
  "name": "create-next-app",
- "version": "9.2.2-canary.4",
+ "version": "9.2.2-canary.6",
  "keywords": [
  "react",
  "next",

packages/next-bundle-analyzer/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@next/bundle-analyzer",
- "version": "9.2.2-canary.4",
+ "version": "9.2.2-canary.6",
  "main": "index.js",
  "license": "MIT",
  "repository": {

packages/next-mdx/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@next/mdx",
- "version": "9.2.2-canary.4",
+ "version": "9.2.2-canary.6",
  "main": "index.js",
  "license": "MIT",
  "repository": {

packages/next-plugin-google-analytics/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@next/plugin-google-analytics",
- "version": "9.2.2-canary.4",
+ "version": "9.2.2-canary.6",
  "nextjs": {
  "name": "Google Analytics",
  "required-env": [

packages/next-plugin-material-ui/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@next/plugin-material-ui",
- "version": "9.2.2-canary.4",
+ "version": "9.2.2-canary.6",
  "nextjs": {
  "name": "Material UI",
  "required-env": []

packages/next-plugin-sentry/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@next/plugin-sentry",
- "version": "9.2.2-canary.4",
+ "version": "9.2.2-canary.6",
  "nextjs": {
  "name": "Sentry",
  "required-env": [

packages/next-polyfill-nomodule/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@next/polyfill-nomodule",
- "version": "9.2.2-canary.4",
+ "version": "9.2.2-canary.6",
  "description": "A polyfill for non-dead, nomodule browsers.",
  "main": "dist/polyfill-nomodule.js",
  "license": "MIT",

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`

packages/next/package.json

@@ -1,6 +1,6 @@
 {
  "name": "next",
- "version": "9.2.2-canary.4",
+ "version": "9.2.2-canary.6",
  "description": "The React Framework",
  "main": "./dist/server/next.js",
  "license": "MIT",
@@ -73,7 +73,7 @@
  "@babel/preset-typescript": "7.7.2",
  "@babel/runtime": "7.7.2",
  "@babel/runtime-corejs2": "7.7.2",
- "@next/polyfill-nomodule": "9.2.2-canary.4",
+ "@next/polyfill-nomodule": "9.2.2-canary.6",
  "amphtml-validator": "1.0.23",
  "async-retry": "1.2.3",
  "async-sema": "3.0.0",

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')
+ })
+})