nuxt · pi0 · Oct 21, 2019 · Oct 13, 2019 · Oct 14, 2019 · Oct 15, 2019
diff --git a/README.md b/README.md
@@ -210,10 +210,16 @@ Please refer to our [Contribution Guide](https://nuxtjs.org/guide/contribution-g
 
 ## Cross-browser testing
 
-Thanks to BrowserStack!
+Thanks to [BrowserStack](http://browserstack.com)!
 
 <a href="http://browserstack.com"><img height="70" src="https://nuxtjs.org/browserstack.svg" alt="BrowserStack"></a>
 
+## Automated testing
+
+Thanks to [SauceLabs](https://saucelabs.com) for supporting Open Source <3
+
+<a href="https://saucelabs.com"><img height="70" src="https://nuxtjs.org/saucelabs.svg" alt="SauceLabs"></a>
+
 ## Security
 
 If you discover a security vulnerability regarding Nuxt.js, please send an e-mail to the team via security@nuxtjs.org! All security vulnerabilities will be promptly addressed.

diff --git a/distributions/nuxt-start/package.json b/distributions/nuxt-start/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt-start",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "description": "Starts Nuxt.js Application in production mode",
   "keywords": [
     "nuxt",
@@ -55,8 +55,8 @@
   "main": "dist/nuxt-start.js",
   "bin": "bin/nuxt-start.js",
   "dependencies": {
-    "@nuxt/cli": "2.10.1",
-    "@nuxt/core": "2.10.1",
+    "@nuxt/cli": "2.10.2",
+    "@nuxt/core": "2.10.2",
     "node-fetch": "^2.6.0",
     "vue": "^2.6.10",
     "vue-client-only": "^2.0.0",

diff --git a/distributions/nuxt/package.json b/distributions/nuxt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
   "keywords": [
     "nuxt",
@@ -57,13 +57,13 @@
     "postinstall": "opencollective || exit 0"
   },
   "dependencies": {
-    "@nuxt/builder": "2.10.1",
-    "@nuxt/cli": "2.10.1",
-    "@nuxt/core": "2.10.1",
-    "@nuxt/generator": "2.10.1",
+    "@nuxt/builder": "2.10.2",
+    "@nuxt/cli": "2.10.2",
+    "@nuxt/core": "2.10.2",
+    "@nuxt/generator": "2.10.2",
     "@nuxt/loading-screen": "^1.2.0",
     "@nuxt/opencollective": "^0.3.0",
-    "@nuxt/webpack": "2.10.1"
+    "@nuxt/webpack": "2.10.2"
   },
   "engines": {
     "node": ">=8.9.0",

diff --git a/examples/with-sockets/io/index.js b/examples/with-sockets/io/index.js
@@ -2,23 +2,25 @@ import http from 'http'
 import socketIO from 'socket.io'
 
 export default function () {
-  const server = http.createServer(this.nuxt.renderer.app)
-  const io = socketIO(server)
+  this.nuxt.hook('render:before', (renderer) => {
+    const server = http.createServer(this.nuxt.renderer.app)
+    const io = socketIO(server)
 
-  // overwrite nuxt.server.listen()
-  this.nuxt.server.listen = (port, host) => new Promise(resolve => server.listen(port || 3000, host || 'localhost', resolve))
-  // close this server on 'close' event
-  this.nuxt.hook('close', () => new Promise(server.close))
+    // overwrite nuxt.server.listen()
+    this.nuxt.server.listen = (port, host) => new Promise(resolve => server.listen(port || 3000, host || 'localhost', resolve))
+    // close this server on 'close' event
+    this.nuxt.hook('close', () => new Promise(server.close))
 
-  // Add socket.io events
-  const messages = []
-  io.on('connection', (socket) => {
-    socket.on('last-messages', function (fn) {
-      fn(messages.slice(-50))
-    })
-    socket.on('send-message', function (message) {
-      messages.push(message)
-      socket.broadcast.emit('new-message', message)
+    // Add socket.io events
+    const messages = []
+    io.on('connection', (socket) => {
+      socket.on('last-messages', function (fn) {
+        fn(messages.slice(-50))
+      })
+      socket.on('send-message', function (message) {
+        messages.push(message)
+        socket.broadcast.emit('new-message', message)
+      })
     })
   })
 }
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.10.1",
+  "version": "2.10.2",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "conventionalCommits": true,

diff --git a/package.json b/package.json
@@ -43,28 +43,28 @@
     "eslint": "6.5.1",
     "eslint-multiplexer": "^2.0.0",
     "esm": "^3.2.25",
-    "execa": "^2.1.0",
+    "execa": "^3.2.0",
     "express": "^4.17.1",
     "finalhandler": "^1.1.2",
-    "fork-ts-checker-webpack-plugin": "^1.5.0",
+    "fork-ts-checker-webpack-plugin": "^1.5.1",
     "fs-extra": "^8.1.0",
     "get-port": "^5.0.0",
-    "glob": "^7.1.4",
+    "glob": "^7.1.5",
     "is-wsl": "^2.1.1",
     "jest": "^24.9.0",
     "jest-junit": "^8.0.0",
-    "jsdom": "^15.1.1",
+    "jsdom": "^15.2.0",
     "klaw-sync": "^6.0.0",
-    "lerna": "^3.17.0",
+    "lerna": "^3.18.1",
     "lodash": "^4.17.15",
     "node-fetch": "^2.6.0",
     "node-sass": "^4.12.0",
     "puppeteer-core": "^1.20.0",
     "request": "^2.88.0",
     "request-promise-native": "^1.0.7",
     "rimraf": "^3.0.0",
-    "rollup": "^1.23.1",
-    "rollup-plugin-alias": "^2.0.1",
+    "rollup": "^1.25.1",
+    "rollup-plugin-alias": "^2.2.0",
     "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-json": "^4.0.0",

diff --git a/packages/babel-preset-app/package.json b/packages/babel-preset-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/babel-preset-app",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "description": "babel-preset-app for nuxt.js",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",

diff --git a/packages/builder/package.json b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/builder",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -9,12 +9,12 @@
   "main": "dist/builder.js",
   "dependencies": {
     "@nuxt/devalue": "^1.2.4",
-    "@nuxt/utils": "2.10.1",
-    "@nuxt/vue-app": "2.10.1",
-    "chokidar": "^3.2.1",
+    "@nuxt/utils": "2.10.2",
+    "@nuxt/vue-app": "2.10.2",
+    "chokidar": "^3.2.2",
     "consola": "^2.10.1",
     "fs-extra": "^8.1.0",
-    "glob": "^7.1.4",
+    "glob": "^7.1.5",
     "hash-sum": "^2.0.0",
     "ignore": "^5.1.4",
     "lodash": "^4.17.15",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/cli",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -12,13 +12,13 @@
     "nuxt-cli": "bin/nuxt-cli.js"
   },
   "dependencies": {
-    "@nuxt/config": "2.10.1",
-    "@nuxt/utils": "2.10.1",
+    "@nuxt/config": "2.10.2",
+    "@nuxt/utils": "2.10.2",
     "boxen": "^4.1.0",
     "chalk": "^2.4.2",
     "consola": "^2.10.1",
     "esm": "^3.2.25",
-    "execa": "^2.1.0",
+    "execa": "^3.2.0",
     "exit": "^0.1.2",
     "fs-extra": "^8.1.0",
     "hable": "^2.3.2",

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/config",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -10,7 +10,7 @@
   "main": "dist/config.js",
   "typings": "index.d.ts",
   "dependencies": {
-    "@nuxt/utils": "2.10.1",
+    "@nuxt/utils": "2.10.2",
     "consola": "^2.10.1",
     "std-env": "^2.2.1"
   },

diff --git a/packages/config/src/options.js b/packages/config/src/options.js
@@ -241,9 +241,16 @@ export function getNuxtConfig (_options) {
       allowedSources: undefined,
       policies: undefined,
       addMeta: Boolean(options._generate),
-      unsafeInlineCompatiblity: false,
+      unsafeInlineCompatibility: false,
       reportOnly: options.debug
     })
+
+    // TODO: Remove this if statement in Nuxt 3, we will stop supporting this typo (more on: https://github.com/nuxt/nuxt.js/pull/6583)
+    if (options.render.csp.unsafeInlineCompatiblity) {
+      consola.warn('Using `unsafeInlineCompatiblity` is deprecated and will be removed in Nuxt 3. Use `unsafeInlineCompatibility` instead.')
+      options.render.csp.unsafeInlineCompatibility = options.render.csp.unsafeInlineCompatiblity
+      delete options.render.csp.unsafeInlineCompatiblity
+    }
   }
 
   // cssSourceMap

diff --git a/packages/config/test/options.test.js b/packages/config/test/options.test.js
@@ -102,7 +102,21 @@ describe('config: options', () => {
     expect(csp).toEqual({
       hashAlgorithm: 'sha256',
       addMeta: false,
-      unsafeInlineCompatiblity: false,
+      unsafeInlineCompatibility: false,
+      allowedSources: true,
+      policies: undefined,
+      reportOnly: false,
+      test: true
+    })
+  })
+
+  // TODO: Remove this test in Nuxt 3, we will stop supporting this typo (more on: https://github.com/nuxt/nuxt.js/pull/6583)
+  test('should enable csp with old typo property name, avoiding breaking changes', () => {
+    const { render: { csp } } = getNuxtConfig({ render: { csp: { allowedSources: true, test: true, unsafeInlineCompatiblity: true } } })
+    expect(csp).toEqual({
+      hashAlgorithm: 'sha256',
+      addMeta: false,
+      unsafeInlineCompatibility: true,
       allowedSources: true,
       policies: undefined,
       reportOnly: false,

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,18 +1,18 @@
 {
   "name": "@nuxt/core",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
     "dist"
   ],
   "main": "dist/core.js",
   "dependencies": {
-    "@nuxt/config": "2.10.1",
+    "@nuxt/config": "2.10.2",
     "@nuxt/devalue": "^1.2.4",
-    "@nuxt/server": "2.10.1",
-    "@nuxt/utils": "2.10.1",
-    "@nuxt/vue-renderer": "2.10.1",
+    "@nuxt/server": "2.10.2",
+    "@nuxt/utils": "2.10.2",
+    "@nuxt/vue-renderer": "2.10.2",
     "consola": "^2.10.1",
     "debug": "^4.1.1",
     "esm": "^3.2.25",

diff --git a/packages/generator/package.json b/packages/generator/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@nuxt/generator",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
     "dist"
   ],
   "main": "dist/generator.js",
   "dependencies": {
-    "@nuxt/utils": "2.10.1",
+    "@nuxt/utils": "2.10.2",
     "chalk": "^2.4.2",
     "consola": "^2.10.1",
     "fs-extra": "^8.1.0",

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,15 +1,15 @@
 {
   "name": "@nuxt/server",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
     "dist"
   ],
   "main": "dist/server.js",
   "dependencies": {
-    "@nuxt/config": "2.10.1",
-    "@nuxt/utils": "2.10.1",
+    "@nuxt/config": "2.10.2",
+    "@nuxt/utils": "2.10.2",
     "@nuxtjs/youch": "^4.2.3",
     "chalk": "^2.4.2",
     "compression": "^1.7.4",

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/utils",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [

diff --git a/packages/vue-app/package.json b/packages/vue-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vue-app",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [

diff --git a/packages/vue-app/template/client.js b/packages/vue-app/template/client.js
@@ -40,7 +40,7 @@ Object.assign(Vue.config, <%= serialize(vue.config) %>)<%= isTest ? '// eslint-d
 const logs = NUXT.logs || []
   if (logs.length > 0) {
   const ssrLogSyle = 'background: #2E495E;border-radius: 0.5em;color: white;font-weight: bold;padding: 2px 0.5em;'
-  console.group && console.group <%= nuxtOptions.render.ssrLog === 'collapsed' ? 'Collapsed' : '' %> ("%cNuxt SSR", ssrLogSyle)
+  console.group && console.group<%= nuxtOptions.render.ssrLog === 'collapsed' ? 'Collapsed' : '' %> ("%cNuxt SSR", ssrLogSyle)
   logs.forEach(logObj => (console[logObj.type] || console.log)(...logObj.args))
   delete NUXT.logs
   console.groupEnd && console.groupEnd()

diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vue-renderer",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -9,7 +9,7 @@
   "main": "dist/vue-renderer.js",
   "dependencies": {
     "@nuxt/devalue": "^1.2.4",
-    "@nuxt/utils": "2.10.1",
+    "@nuxt/utils": "2.10.2",
     "consola": "^2.10.1",
     "fs-extra": "^8.1.0",
     "lru-cache": "^5.1.1",

diff --git a/packages/vue-renderer/src/renderers/ssr.js b/packages/vue-renderer/src/renderers/ssr.js
@@ -138,7 +138,7 @@ export default class SSRRenderer extends BaseRenderer {
     if (csp) {
       // Only add the hash if 'unsafe-inline' rule isn't present to avoid conflicts (#5387)
       const containsUnsafeInlineScriptSrc = csp.policies && csp.policies['script-src'] && csp.policies['script-src'].includes(`'unsafe-inline'`)
-      if (csp.unsafeInlineCompatiblity || !containsUnsafeInlineScriptSrc) {
+      if (csp.unsafeInlineCompatibility || !containsUnsafeInlineScriptSrc) {
         const hash = crypto.createHash(csp.hashAlgorithm)
         hash.update(serializedSession)
         cspScriptSrcHashes.push(`'${csp.hashAlgorithm}-${hash.digest('base64')}'`)