From 4e3a36ec0de3c63a49e10946c4daf2ed85726e1b Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Fri, 14 Apr 2023 10:47:54 +0200
Subject: [PATCH] fix css order conflict during build

---
 nuxt.config.js      |  8 ++++++--
 package.json        |  1 +
 pages/Admin.vue     |  3 +--
 pages/setup/_db.vue | 10 ++++++----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/nuxt.config.js b/nuxt.config.js
index 5c1fcfb1..f3a8d2c8 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,6 +1,6 @@
 const config = require('./server/config.js')
 const locales = require('./locales/index')
-
+import { ca, de, en, es, eu, fr, gl, it, nb, nl, pl, pt, sk, ru, zhHans  } from 'vuetify/es5/locale'
 
 const isDev = (process.env.NODE_ENV !== 'production')
 module.exports = {
@@ -140,7 +140,11 @@ module.exports = {
     }
   },
   buildModules: ['@nuxtjs/vuetify'],
-  vuetify: { defaultAssets: false, optionsPath: './vuetify.options.js' },
+  vuetify: {
+    lang: { locales: { ca, de, en, es, eu, fr, gl, it, nb, nl, pl, pt, sk, ru, zhHans } },
+    treeShake: true,    
+    defaultAssets: false,
+    optionsPath: './vuetify.options.js' },
   build: {
     extend(config, { isDev, isClient }) {
       // ..
diff --git a/package.json b/package.json
index cd6f45d0..b10d5e6f 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "doc:dev": "cd docs && bundle exec jekyll s --drafts",
     "migrate": "NODE_ENV=production sequelize db:migrate",
     "migrate:dev": "sequelize db:migrate",
+    "analyze": "nuxt build --analyze",
     "build:wc": "cd webcomponents; yarn build:lib; cp dist/gancio-events.js ../wp-plugin/js/gancio-events.es.js; cp dist/gancio-events.js ../assets/gancio-events.es.js; cp dist/gancio-events.js ../docs/assets/js/gancio-events.es.js; cp dist/gancio-events.js ../static/gancio-events.es.js;"
   },
   "files": [
diff --git a/pages/Admin.vue b/pages/Admin.vue
index 7f623363..35d67a87 100644
--- a/pages/Admin.vue
+++ b/pages/Admin.vue
@@ -73,12 +73,11 @@ v-container.container.pa-0.pa-md-3
 <script>
 import { mapState } from 'vuex'
 import { mdiAlert, mdiChevronRight, mdiChevronLeft } from '@mdi/js'
-import Settings from '@/components/admin/Settings'
 
 export default {
   name: 'Admin',
   components: { 
-    Settings,
+    Settings: () => import(/* webpackChunkName: "admin" */'../components/admin/Settings.vue'),
     Users:  () => import(/* webpackChunkName: "admin" */'../components/admin/Users'),
     Events: () => import(/* webpackChunkName: "admin" */'../components/admin/Events'),
     Places: () => import(/* webpackChunkName: "admin" */'../components/admin/Places'),
diff --git a/pages/setup/_db.vue b/pages/setup/_db.vue
index 4db91804..73485a89 100644
--- a/pages/setup/_db.vue
+++ b/pages/setup/_db.vue
@@ -20,17 +20,19 @@ v-container.pa-6
         Completed(ref='completed' :isHttp='isHttp')
 </template>
 <script>
-import DbStep from '@/components/DbStep'
-import Settings from '@/components/admin/Settings'
-import Completed from '@/components/Completed'
 
 export default {
-  components: { DbStep, Settings, Completed },
+  components: {
+    Settings: () => import(/* webpackChunkName: "setup" */'@/components/admin/Settings.vue'),
+    DbStep: () => import(/* webpackChunkName: "setup" */'@/components/DbStep.vue'),
+    Completed: () => import(/* webpackChunkName: "setup" */'@/components/Completed.vue'),
+  },
   middleware: 'setup',
   layout: 'clean',
   head: {
     title: 'Setup',
   },
+  name: 'Setup',
   auth: false,
   asyncData ({ params, req }) {
     const protocol = process.client ? window.location.protocol : req.protocol + ':'