[SDPA-3270] Upgraded Nuxt to v2.9.2 (#561)

* Upgraded Nuxt to v2.9.2 * [SDPA-3270] Update yarn lock for nuxt upgrade * Removed 'jest-vue-preprocessor' which is not needed and cause dependency issues
dpc-sdp · Oct 14, 2019 · 72504be · 72504be
1 parent 9cf6ef4
commit 72504be
Show file tree

Hide file tree

Showing 13 changed files with 1,881 additions and 2,404 deletions.
diff --git a/examples/basic-examples/package.json b/examples/basic-examples/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@dpc-sdp/ripple-nuxt-tide": "1.2.1",
     "dotenv": "^5.0.1",
-    "nuxt": "2.6.3",
+    "nuxt": "2.9.2",
     "run-script-os": "^1.0.7"
   },
   "devDependencies": {

diff --git a/examples/vic-gov-au/package.json b/examples/vic-gov-au/package.json
@@ -24,7 +24,7 @@
     "@dpc-sdp/ripple-nuxt-tide": "1.2.1",
     "@nuxtjs/robots": "^2.0.0",
     "dotenv": "^5.0.1",
-    "nuxt": "2.6.3",
+    "nuxt": "2.9.2",
     "run-script-os": "^1.0.7"
   },
   "devDependencies": {

diff --git a/jest.config.js b/jest.config.js
@@ -8,7 +8,7 @@ module.exports = {
   setupFilesAfterEnv: ['<rootDir>/.jest/moment.js'],
   transform: {
     '^.+\\.js$': '<rootDir>/node_modules/babel-jest',
-    '.*\\.(vue)$': '<rootDir>/node_modules/jest-vue-preprocessor',
+    '.*\\.(vue)$': 'vue-jest',
     '^.+\\.md?$': 'markdown-loader-jest'
   },
   transformIgnorePatterns: [

diff --git a/package.json b/package.json
@@ -78,7 +78,6 @@
     "jest": "^24.8.0",
     "jest-canvas-mock": "^2.1.0",
     "jest-junit": "^8.0.0",
-    "jest-vue-preprocessor": "^1.5.0",
     "lerna": "^3.0.0",
     "markdown-loader-jest": "^0.1.1",
     "mockdate": "^2.0.3",

diff --git a/packages/create-ripple-app/__tests__/__mocks__/v18/package.json b/packages/create-ripple-app/__tests__/__mocks__/v18/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "@dpc-sdp/ripple-nuxt-tide": "^1.3.0",
     "dotenv": "^5.0.1",
-    "nuxt": "2.6.3",
+    "nuxt": "2.9.2",
     "run-script-os": "^1.0.7"
   },
   "devDependencies": {

diff --git a/packages/create-ripple-app/template/_package.json b/packages/create-ripple-app/template/_package.json
@@ -31,7 +31,7 @@
   "dependencies": {
     "@dpc-sdp/ripple-nuxt-tide": "^<%= version %>",
     "dotenv": "^5.0.1",
-    "nuxt": "2.6.3",
+    "nuxt": "2.9.2",
     "run-script-os": "^1.0.7"
   },
   "devDependencies": {

diff --git a/packages/ripple-nuxt-tide/lib/layouts/default.vue b/packages/ripple-nuxt-tide/lib/layouts/default.vue
@@ -2,7 +2,7 @@
   <rpl-base-layout>
     <template slot="header">
       <rpl-alert-base class="app-preview" v-if="preview">Draft only and not yet published</rpl-alert-base>
-      <no-ssr>
+      <client-only>
         <component v-if="alerts" :is="alerts" />
         <rpl-site-header
           :logo="header.logo"
@@ -25,7 +25,7 @@
             :showLogout="false"
           />
         </template>
-      </no-ssr>
+      </client-only>
     </template>
 
     <nuxt/>

diff --git a/packages/ripple-nuxt-tide/modules/alert/components/TideAlert.vue b/packages/ripple-nuxt-tide/modules/alert/components/TideAlert.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="tide-alert" v-if="alerts && alerts.length > 0">
-    <no-ssr>
+    <client-only>
       <rpl-alert v-for="alert in alerts" :key="alert.id" @rplAlertClose="dismissAlert" v-bind="alert"/>
-    </no-ssr>
+    </client-only>
   </div>
 </template>
 

diff --git a/packages/ripple-nuxt-tide/modules/landing-page/pages/index.vue b/packages/ripple-nuxt-tide/modules/landing-page/pages/index.vue
@@ -7,9 +7,9 @@
     </template>
     <template v-for="dComponent in dynamicComponents" v-if="dynamicComponents">
       <rpl-col cols="full" :colsBp="dComponent.cols" :key="dComponent.id">
-        <no-ssr v-if="dComponent.ssr === false">
+        <client-only v-if="dComponent.ssr === false">
           <component :is="dComponent.component" v-bind="dComponent.data" :class="dComponent.class"></component>
-        </no-ssr>
+        </client-only>
         <component v-else :is="dComponent.component" v-bind="dComponent.data" :class="dComponent.class"></component>
       </rpl-col>
     </template>

diff --git a/packages/ripple-nuxt-tide/modules/publication/pages/index.vue b/packages/ripple-nuxt-tide/modules/publication/pages/index.vue
@@ -9,9 +9,9 @@
     <template v-if="dynamicComponents">
       <template v-for="dComponent in dynamicComponents">
         <rpl-col cols="full" :colsBp="dComponent.cols" :key="dComponent.id">
-          <no-ssr v-if="dComponent.ssr === false">
+          <client-only v-if="dComponent.ssr === false">
             <component :is="dComponent.component" v-bind="dComponent.data" :class="dComponent.class"></component>
-          </no-ssr>
+          </client-only>
           <component v-else :is="dComponent.component" v-bind="dComponent.data" :class="dComponent.class"></component>
         </rpl-col>
       </template>

diff --git a/packages/ripple-nuxt-tide/package.json b/packages/ripple-nuxt-tide/package.json
@@ -73,7 +73,7 @@
   },
   "peerDependencies": {
     "@nuxtjs/axios": "^5.3.1",
-    "nuxt": "^2.4.3"
+    "nuxt": "^2.9.2"
   },
   "devDependencies": {
     "mockdate": "^2.0.3",

diff --git a/packages/ripple-nuxt-ui/package.json b/packages/ripple-nuxt-ui/package.json
@@ -19,7 +19,7 @@
     "svgo-loader": "^2.1.0"
   },
   "peerDependencies": {
-    "nuxt": "^2.4.3",
+    "nuxt": "^2.9.2",
     "webpack-node-externals": "^1.6.0"
   }
 }