Merge branch 'canary' into patch-4

vercel · Oct 22, 2019 · 5b86d63 · 5b86d63
2 parents 17b779f + ae3410c
commit 5b86d63
Show file tree

Hide file tree

Showing 7 changed files with 1,500 additions and 1,348 deletions.
diff --git a/package.json b/package.json
@@ -69,7 +69,6 @@
     "@babel/preset-react": "7.0.0",
     "@mdx-js/loader": "0.18.0",
     "@types/jest": "24.0.13",
-    "@types/ora": "3.2.0",
     "@types/string-hash": "1.1.1",
     "@zeit/next-css": "1.0.2-canary.2",
     "@zeit/next-sass": "1.0.2-canary.2",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -158,8 +158,8 @@
     "@types/mkdirp": "0.5.2",
     "@types/nanoid": "2.0.0",
     "@types/node-fetch": "2.3.4",
-    "@types/react": "16.8.18",
-    "@types/react-dom": "16.8.4",
+    "@types/react": "16.9.9",
+    "@types/react-dom": "16.9.2",
     "@types/react-is": "16.7.1",
     "@types/resolve": "0.0.8",
     "@types/send": "0.14.4",

diff --git a/test/integration/amp-export-validation/test/index.test.js b/test/integration/amp-export-validation/test/index.test.js
@@ -15,7 +15,7 @@ const nextConfig = new File(join(appDir, 'next.config.js'))
 
 let buildOutput
 
-describe('AMP Validation on Export', () => {
+xdescribe('AMP Validation on Export', () => {
   beforeAll(async () => {
     const { stdout = '', stderr = '' } = await nextBuild(appDir, [], {
       stdout: true,

diff --git a/test/integration/amphtml-fragment-style/test/index.test.js b/test/integration/amphtml-fragment-style/test/index.test.js
@@ -17,7 +17,7 @@ let appPort
 let server
 let app
 
-describe('AMP Fragment Styles', () => {
+xdescribe('AMP Fragment Styles', () => {
   beforeAll(async () => {
     await nextBuild(appDir)
     app = nextServer({

diff --git a/test/integration/amphtml/test/index.test.js b/test/integration/amphtml/test/index.test.js
@@ -27,7 +27,7 @@ jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 60 * 5
 
 const context = {}
 
-describe('AMP Usage', () => {
+xdescribe('AMP Usage', () => {
   beforeAll(async () => {
     await nextBuild(appDir)
     app = nextServer({

diff --git a/test/integration/styled-jsx-module/test/index.test.js b/test/integration/styled-jsx-module/test/index.test.js
@@ -27,7 +27,7 @@ function runTests () {
     expect(color).toMatch('0, 255, 255')
   })
 
-  it('should render styles during CSR (AMP)', async () => {
+  xit('should render styles during CSR (AMP)', async () => {
     const browser = await webdriver(appPort, '/amp')
     const color = await browser.eval(
       `getComputedStyle(document.querySelector('button')).color`
@@ -41,7 +41,7 @@ function runTests () {
     expect(html).toMatch(/color:.*?cyan/)
   })
 
-  it('should render styles during SSR (AMP)', async () => {
+  xit('should render styles during SSR (AMP)', async () => {
     const html = await renderViaHTTP(appPort, '/amp')
     expect(html).toMatch(/color:.*?cyan/)
   })

diff --git a/yarn.lock b/yarn.lock