olinox14 2 år sedan
förälder
incheckning
3a36fe91c6
4 ändrade filer med 616 tillägg och 319 borttagningar
  1. 1 1
      app/README.md
  2. 9 35
      app/nuxt.config.ts
  3. 32 36
      app/package.json
  4. 574 247
      app/yarn.lock

+ 1 - 1
app/README.md

@@ -50,7 +50,7 @@ More information about the usage of this directory in [the documentation](https:
 
 ### `plugins`
 
-The plugins directory contains JavaScript plugins that you want to run before instantiating the root Vue.js Application. This is the place to add Vue plugins and to inject functions or constants. Every time you need to use `Vue.use()`, you should create a file in `plugins/` and add its path to plugins in `nuxt.config.js`.
+The plugins directory contains JavaScript plugins that you want to run before instantiating the root Vue.js Application. This is the place to add Vue plugins and to inject functions or constants. Every time you need to use `Vue.use()`, you should create a file in `plugins/` and add its path to plugins in `nuxt.config.ts`.
 
 More information about the usage of this directory in [the documentation](https://nuxtjs.org/docs/2.x/directory-structure/plugins).
 

+ 9 - 35
app/nuxt.config.js → app/nuxt.config.ts

@@ -1,9 +1,9 @@
 import fs from 'fs';
 
-export default {
+export default defineNuxtConfig({
   app: {
     head: {
-      title: 'App',
+      title: 'Ossatura',
       meta: [
         { charset: 'utf-8' },
         { name: 'viewport', content: 'width=device-width, initial-scale=1' },
@@ -12,7 +12,7 @@ export default {
         { name: 'msapplication-TileImage', content: '/favicon/mstile-144x144.png' }
       ],
       link: [
-        { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
+        { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }
       ]
     }
   },
@@ -27,48 +27,22 @@ export default {
           // automatically imports `usePinia()`
           'defineStore',
           // automatically imports `usePinia()` as `usePiniaStore()`
-          ['defineStore', 'definePiniaStore'],
-        ],
+          ['defineStore', 'definePiniaStore']
+        ]
       }
     ],
     '@pinia-orm/nuxt',
     'nuxt-lodash',
-    '@nuxtjs/i18n',
   ],
   typescript: {
     strict: true
   },
-  //@ts-ignore
-  i18n: {
-    langDir: 'lang',
-    lazy: true,
-    locales: [
-      {
-        code: 'en',
-        iso: 'en-US',
-        file: 'en.json',
-        name: 'English'
-      },
-      {
-        code: 'fr',
-        iso: 'fr-FR',
-        file: 'fr.json',
-        name: 'Français'
-      }
-    ],
-    defaultLocale: 'fr',
-    fallbackLocale: 'en',
-    detectBrowserLanguage: false,
-    vueI18n: {
-      legacy: false,
-    }
-  },
   build: {
-    transpile: ['vuetify'],
+    transpile: ['vuetify']
   },
   vite: {
     define: {
-      'process.env.DEBUG': process.env.DEBUG,
+      'process.env.DEBUG': process.env.DEBUG
     },
     //@ts-ignore
     server : {
@@ -77,6 +51,6 @@ export default {
       hmr: {
         protocol: 'wss'
       }
-    },
+    }
   }
-}
+})

+ 32 - 36
app/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "dev": "rm -rf /tmp/nitro && nuxt --hostname '0.0.0.0' --port 3002 dev",
+    "dev": "rm -rf /tmp/nitro && nuxi dev --host='0.0.0.0' --port=3002",
     "build": "nuxt build",
     "start": "nuxt start",
     "generate": "nuxt generate",
@@ -13,45 +13,41 @@
     "test": "jest"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^6.2.1",
+    "@fortawesome/fontawesome-free": "^6.4",
     "@mdi/font": "^7.0.96",
-    "@nuxt/image": "^0.7.1",
-    "@nuxtjs/i18n": "^8.0.0-beta.7",
-    "@pinia-orm/nuxt": "^1.1.4",
-    "@pinia/nuxt": "^0.4.3",
-    "date-fns": "^2.29.3",
-    "core-js": "^3.19.3",
-    "nuxt": "^3.0.0",
-    "nuxt-lodash": "^2.4.1",
-    "pinia": "^2.0.28",
-    "pinia-orm": "^1.3.0",
-    "sass": "^1.56.1",
-    "uuid": "^9.0.0",
-    "vuetify": "^3.0.7",
-    "webpack": "^4.46.0"
+    "@nuxt/image": "^1.0.0-rc.2",
+    "@nuxtjs/i18n": "8.0.0-rc.4",
+    "@pinia-orm/nuxt": "^1.7",
+    "@pinia/nuxt": "^0.4.1",
+    "date-fns": "^2.30",
+    "core-js": "^3.32",
+    "nuxt": "^3.7.0",
+    "nuxt-lodash": "^2.5",
+    "pinia": "^2.1",
+    "pinia-orm": "^1.7",
+    "sass": "^1.67",
+    "uuid": "^9.0",
+    "vuetify": "^3.3.17"
   },
   "devDependencies": {
-    "@nuxt/test-utils-edge": "^3.0.1-rc.0-27810184.d991a55",
-    "@nuxtjs/eslint-config": "^11.0.0",
-    "@nuxtjs/eslint-config-typescript": "^11.0.0",
-    "@nuxtjs/eslint-module": "^3.1.0",
-    "@types/cleave.js": "^1.4.7",
-    "@types/event-source-polyfill": "^1.0.0",
-    "@types/jest": "^29.2.3",
-    "@types/lodash": "^4.14.189",
-    "@types/uuid": "^8.3.4",
-    "@typescript-eslint/eslint-plugin": "^5.43.0",
-    "@typescript-eslint/parser": "^5.43.0",
+    "@nuxt/test-utils-edge": "4.0.0-27970394.60d07df4",
+    "@nuxtjs/eslint-config": "^12.0",
+    "@nuxtjs/eslint-config-typescript": "^12.1",
+    "@nuxtjs/eslint-module": "^4.1.0",
+    "@types/lodash": "^4.14",
+    "@types/uuid": "^9.0",
+    "@typescript-eslint/eslint-plugin": "^6.7",
+    "@typescript-eslint/parser": "^6.7",
     "@vue/eslint-config-standard": "^8.0.1",
-    "eslint": "^8.27.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint": "^8.49",
+    "eslint-config-prettier": "^9.0",
     "eslint-plugin-nuxt": "^4.0.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-vue": "^9.7.0",
-    "prettier": "^2.7.1",
-    "ts-jest": "^29.0.3",
-    "typescript": "^4.9.3",
-    "vitest": "^0.25.2",
-    "vue-jest": "^3.0.7"
+    "eslint-plugin-prettier": "^5.0",
+    "eslint-plugin-vue": "^9.17",
+    "prettier": "^3.0",
+    "ts-jest": "^29.1",
+    "typescript": "^5.2",
+    "vitest": "^0.34",
+    "vue-jest": "^3.0"
   }
 }

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 574 - 247
app/yarn.lock


Vissa filer visades inte eftersom för många filer har ändrats