From f735b63d5df1bdc49626b648a18571536122ba73 Mon Sep 17 00:00:00 2001 From: Ricardo Gobbo de Souza Date: Fri, 26 Jul 2019 09:19:31 -0300 Subject: [PATCH] feat: upgrade vuetify to 2.x (#297) --- template/_package.json | 5 +- .../frameworks/vuetify/assets/style/app.styl | 2 - .../vuetify/assets/style/variables.styl | 1 - .../frameworks/vuetify/assets/variables.scss | 1 + .../frameworks/vuetify/layouts/default.vue | 44 +++++++++--------- template/frameworks/vuetify/pages/index.vue | 3 +- template/frameworks/vuetify/pages/inspire.vue | 2 +- template/nuxt/nuxt.config.js | 31 ++++++------ test/snapshots/index.test.js.md | 35 +++++++------- test/snapshots/index.test.js.snap | Bin 6407 -> 6340 bytes 10 files changed, 57 insertions(+), 67 deletions(-) delete mode 100644 template/frameworks/vuetify/assets/style/app.styl delete mode 100644 template/frameworks/vuetify/assets/style/variables.styl create mode 100644 template/frameworks/vuetify/assets/variables.scss diff --git a/template/_package.json b/template/_package.json index acb3aee72..182ba876e 100644 --- a/template/_package.json +++ b/template/_package.json @@ -73,8 +73,6 @@ <%_ if (ui === 'bootstrap') { _%> "bootstrap-vue": "^2.0.0-rc.11", "bootstrap": "^4.1.3", - <%_ } else if (ui === 'vuetify') { _%> - "@nuxtjs/vuetify": "0.5.5", <%_ } else if (ui === 'bulma') { _%> "@nuxtjs/bulma": "^1.2.1", <%_ } else if (ui === 'element-ui') { _%> @@ -105,8 +103,7 @@ <%_ if (ui === 'tailwind') { _%> "@nuxtjs/tailwindcss": "^1.0.0", <%_ } else if (ui === 'vuetify') { _%> - "stylus": "^0.54.5", - "stylus-loader": "^3.0.2", + "@nuxtjs/vuetify": "^1.0.0", <%_ } _%> <%_ if (eslint) { _%> "@nuxtjs/eslint-config": "^1.0.1", diff --git a/template/frameworks/vuetify/assets/style/app.styl b/template/frameworks/vuetify/assets/style/app.styl deleted file mode 100644 index dbb267990..000000000 --- a/template/frameworks/vuetify/assets/style/app.styl +++ /dev/null @@ -1,2 +0,0 @@ -// Import Vuetify styling -@require '~vuetify/src/stylus/app.styl' diff --git a/template/frameworks/vuetify/assets/style/variables.styl b/template/frameworks/vuetify/assets/style/variables.styl deleted file mode 100644 index 8a26685a8..000000000 --- a/template/frameworks/vuetify/assets/style/variables.styl +++ /dev/null @@ -1 +0,0 @@ -@require '~vuetify/src/stylus/settings/_variables.styl' diff --git a/template/frameworks/vuetify/assets/variables.scss b/template/frameworks/vuetify/assets/variables.scss new file mode 100644 index 000000000..eddcf778b --- /dev/null +++ b/template/frameworks/vuetify/assets/variables.scss @@ -0,0 +1 @@ +$font-size-root: 20px; diff --git a/template/frameworks/vuetify/layouts/default.vue b/template/frameworks/vuetify/layouts/default.vue index 8f6b9969c..dfdc26ec7 100644 --- a/template/frameworks/vuetify/layouts/default.vue +++ b/template/frameworks/vuetify/layouts/default.vue @@ -8,45 +8,45 @@ app > - - + {{ item.icon }} - - - - - + + + + + - - + - {{ `chevron_${miniVariant ? 'right' : 'left'}` }} + mdi-{{ `chevron-${miniVariant ? 'right' : 'left'}` }} - web + mdi-application - remove + mdi-minus @@ -54,9 +54,9 @@ icon @click.stop="rightDrawer = !rightDrawer" > - menu + mdi-menu - + @@ -69,14 +69,14 @@ fixed > - - + + - compare_arrows + mdi-repeat - - Switch drawer (click me) - + + Switch drawer (click me) + -
+
@@ -68,7 +68,6 @@ diff --git a/template/frameworks/vuetify/pages/inspire.vue b/template/frameworks/vuetify/pages/inspire.vue index be17a824f..008d06519 100644 --- a/template/frameworks/vuetify/pages/inspire.vue +++ b/template/frameworks/vuetify/pages/inspire.vue @@ -1,6 +1,6 @@