Merge branch 'canary' into update-with-react-intl-example

vercel · Oct 24, 2019 · 6102fec · 6102fec
2 parents dc9458e + 8227baf
commit 6102fec
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -35,7 +35,7 @@ commands:
     steps:
       - run:
           name: Installing Dependencies
-          command: yarn install --frozen-lockfile
+          command: yarn install --frozen-lockfile --check-files
   yarn_lint:
     steps:
       - run:
@@ -56,7 +56,7 @@ commands:
       - run:
           name: Run All Tests
           command: |
-            yarn check && node run-tests.js $(
+            node run-tests.js $(
               circleci tests glob "test/**/*.test.*" | \
               circleci tests split
             )

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -35,7 +35,7 @@ steps:
     displayName: Cache Yarn packages
 
   - script: |
-      yarn --frozen-lockfile --check-files
+      yarn install --frozen-lockfile --check-files
     displayName: 'Install dependencies'
 
   - script: |

diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "9.1.2-canary.7"
+  "version": "9.1.2-canary.8"
 }
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "dev": "lerna run build --stream --parallel",
     "dev2": "while true; do yarn --check-files && yarn dev; done",
     "testonly": "jest",
-    "testall": "yarn check && yarn run testonly -- --ci --reporters=default --reporters=jest-junit --forceExit --runInBand",
+    "testall": "yarn run testonly -- --ci --reporters=default --reporters=jest-junit --forceExit --runInBand",
     "pretest": "yarn run lint",
     "git-reset": "git reset --hard HEAD",
     "git-clean": "git clean -d -x -e node_modules -e packages -f",

diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "9.1.2-canary.7",
+  "version": "9.1.2-canary.8",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "9.1.2-canary.7",
+  "version": "9.1.2-canary.8",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "9.1.2-canary.7",
+  "version": "9.1.2-canary.8",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next/README.md b/packages/next/README.md
@@ -1240,7 +1240,7 @@ Then, import `micro-cors` and [configure it](https://github.com/possibilities/mi
 import Cors from 'micro-cors'
 
 const cors = Cors({
-  allowedMethods: ['GET', 'HEAD'],
+  allowMethods: ['GET', 'HEAD'],
 })
 
 function Endpoint(req, res) {

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "9.1.2-canary.7",
+  "version": "9.1.2-canary.8",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",

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
 
-xdescribe('AMP Validation on Export', () => {
+describe('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
 
-xdescribe('AMP Fragment Styles', () => {
+describe('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 = {}
 
-xdescribe('AMP Usage', () => {
+describe('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')
   })
 
-  xit('should render styles during CSR (AMP)', async () => {
+  it('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/)
   })
 
-  xit('should render styles during SSR (AMP)', async () => {
+  it('should render styles during SSR (AMP)', async () => {
     const html = await renderViaHTTP(appPort, '/amp')
     expect(html).toMatch(/color:.*?cyan/)
   })