From 411bb1904ecfed019ac2286eaf4114e3ffadb269 Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Wed, 19 Sep 2018 10:00:23 +0100
Subject: [PATCH] refactor: always use process.client instead of
 process.browser (#3910)

---
 examples/auth-jwt/pages/index.vue       | 2 +-
 examples/auth-jwt/pages/login.vue       | 2 +-
 examples/plugins-vendor/pages/index.vue | 2 +-
 examples/web-worker/pages/index.vue     | 2 +-
 lib/app/index.js                        | 6 +++---
 lib/app/utils.js                        | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/auth-jwt/pages/index.vue b/examples/auth-jwt/pages/index.vue
index 0a316c44b6..8884d93a82 100644
--- a/examples/auth-jwt/pages/index.vue
+++ b/examples/auth-jwt/pages/index.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-const Cookie = process.browser ? require('js-cookie') : undefined
+const Cookie = process.client ? require('js-cookie') : undefined
 
 export default {
   methods: {
diff --git a/examples/auth-jwt/pages/login.vue b/examples/auth-jwt/pages/login.vue
index a4c40e4e8a..958d310b6e 100644
--- a/examples/auth-jwt/pages/login.vue
+++ b/examples/auth-jwt/pages/login.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-const Cookie = process.browser ? require('js-cookie') : undefined
+const Cookie = process.client ? require('js-cookie') : undefined
 
 export default {
   middleware: 'notAuthenticated',
diff --git a/examples/plugins-vendor/pages/index.vue b/examples/plugins-vendor/pages/index.vue
index 3d915f9a5f..f30f8f558f 100644
--- a/examples/plugins-vendor/pages/index.vue
+++ b/examples/plugins-vendor/pages/index.vue
@@ -7,7 +7,7 @@
 
 <script>
 let miniToastr
-if (process.browser) {
+if (process.client) {
   miniToastr = require('mini-toastr')
 }
 
diff --git a/examples/web-worker/pages/index.vue b/examples/web-worker/pages/index.vue
index 2a3b7744da..ce7cc49ce3 100644
--- a/examples/web-worker/pages/index.vue
+++ b/examples/web-worker/pages/index.vue
@@ -117,7 +117,7 @@ export default {
       worker.terminate()
     },
     createWorkers () {
-      if (process.browser) {
+      if (process.client) {
         for(let i = 0, len = navigator.hardwareConcurrency || 1; i < len; i++) {
           this.workers.push(this.$worker.createWorker())
         }
diff --git a/lib/app/index.js b/lib/app/index.js
index 7b9873743d..1bbed569c8 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -52,7 +52,7 @@ async function createApp (ssrContext) {
     <% if (mode === 'universal') { %>
     // Fix SSR caveat https://github.com/nuxt/nuxt.js/issues/3757#issuecomment-414689141
     const registerModule = store.registerModule
-    store.registerModule = (path, rawModule, options) => registerModule.call(store, path, rawModule, Object.assign({ preserveState: process.browser }, options))
+    store.registerModule = (path, rawModule, options) => registerModule.call(store, path, rawModule, Object.assign({ preserveState: process.client }, options))
     <% } %>
   <% } %>
 
@@ -151,7 +151,7 @@ async function createApp (ssrContext) {
   }
 
   <% if (store) { %>
-  if (process.browser) {
+  if (process.client) {
     // Replace store state before plugins execution
     if (window.__NUXT__ && window.__NUXT__.state) {
       store.replaceState(window.__NUXT__.state)
@@ -163,7 +163,7 @@ async function createApp (ssrContext) {
   <% plugins.filter(p => p.ssr).forEach((plugin) => { %>
   if (typeof <%= plugin.name %> === 'function') await <%= plugin.name %>(app.context, inject)<% }) %>
   <% if (plugins.filter(p => !p.ssr).length) { %>
-  if (process.browser) { <% plugins.filter((p) => !p.ssr).forEach((plugin) => { %>
+  if (process.client) { <% plugins.filter((p) => !p.ssr).forEach((plugin) => { %>
     if (typeof <%= plugin.name %> === 'function') await <%= plugin.name %>(app.context, inject)<% }) %>
   }<% } %>
 
diff --git a/lib/app/utils.js b/lib/app/utils.js
index 8a5d23c89e..316adc3773 100644
--- a/lib/app/utils.js
+++ b/lib/app/utils.js
@@ -4,7 +4,7 @@ const noopData = () => ({})
 
 // window.onNuxtReady(() => console.log('Ready')) hook
 // Useful for jsdom testing or plugins (https://github.com/tmpvar/jsdom#dealing-with-asynchronous-script-loading)
-if (process.browser) {
+if (process.client) {
   window._nuxtReadyCbs = []
   window.onNuxtReady = (cb) => {
     window._nuxtReadyCbs.push(cb)