@koumoul/vjsf 2.10.0 → 2.11.0

package/lib/VJsfNoDeps.js

@@ -63,6 +63,8 @@ export default {
     },
     fullOptions() {
       const _global = (typeof window !== 'undefined' && window) || (typeof global !== 'undefined' && global) || {}
+      defaultOptions.locale = (this.$vuetify.lang && this.$vuetify.lang.current) || 'en'
+      defaultOptions.defaultLocale = (this.$vuetify.lang && this.$vuetify.lang.defaultLocale) || 'en'
       const fullOptions = Object.assign({}, defaultOptions, this.options || {}, this.resolvedSchema['x-options'] || {})
 
       fullOptions.markdown = fullOptions.markdown ||
@@ -118,7 +120,7 @@ export default {
         fullOptions.icons = { ...fullOptions.defaultIcons, ...fullOptions.icons }
       }
 
-      fullOptions.messages = { ...(localizedMessages[fullOptions.locale] || localizedMessages.en), ...fullOptions.messages }
+      fullOptions.messages = { ...(localizedMessages[fullOptions.defaultLocale] || localizedMessages.en), ...(localizedMessages[fullOptions.locale] || localizedMessages.en), ...fullOptions.messages }
       fullOptions.formats = { ...formats, ...fullOptions.formats }
       if (fullOptions.deleteReadOnly) fullOptions.hideReadOnly = true
       return fullOptions

package/lib/utils/options.js

@@ -1,8 +1,8 @@
 import { mdiCalendar, mdiClock, mdiInformation, mdiPlus, mdiPencil, mdiDelete } from '@mdi/js'
 
 export const defaultOptions = {
-  locale: 'en',
-  defaultLocale: 'en',
+  locale: '',
+  defaultLocale: '',
   rootDisplay: '',
   objectContainerClass: '',
   sectionsClass: 'pl-2 pt-2',
@@ -130,10 +130,10 @@ export const localizedMessages = {
     required: 'Esta información es requerida',
     noData: 'No se encontraron valores coincidentes',
     search: 'Buscar...',
-    minimum: 'El valor debe ser mayor o igual que {mínimo}',
-    exclusiveMinimum: 'El valor debe ser mayor que {minimum}',
+    minimum: 'El valor debe ser mayor o igual que {minimum}',
+    exclusiveMinimum: 'El valor debe ser mayor que {exclusiveMinimum}',
     maximum: 'El valor debe ser menor o igual a {maximum}',
-    exclusiveMaximum: 'El valor debe ser inferior a {maximum}',
+    exclusiveMaximum: 'El valor debe ser inferior a {exclusiveMaximum}',
     minLength: '{minLength} caracteres mínimo',
     maxLength: '{maxLength} caractères máximo',
     minItems: 'Al menos {minItems} articulos',
@@ -145,10 +145,10 @@ export const localizedMessages = {
     required: 'Diese Informationen sind erforderlich',
     noData: 'Keine passenden Artikel',
     search: 'Suche...',
-    minimum: 'Der Wert muss größer oder gleich {Minimum} sein',
+    minimum: 'Der Wert muss größer oder gleich {minimum} sein',
     exclusiveMinimum: 'Der Wert muss größer als {exclusiveMinimum} sein',
-    maximum: 'Der Wert muss kleiner oder gleich {Maximum} sein',
-    exclusiveMaximum: 'Der Wert muss kleiner als {maximum} sein',
+    maximum: 'Der Wert muss kleiner oder gleich {maximum} sein',
+    exclusiveMaximum: 'Der Wert muss kleiner als {exclusiveMaximum} sein',
     minLength: 'Mindestens {minLength} Zeichen',
     maxLength: 'Maximal {maxLength} Zeichen',
     minItems: 'Mindestens {minItems} Elemente',
@@ -178,7 +178,7 @@ export const localizedMessages = {
     minimum: 'Değer {minimum} dan büyük olmalı',
     exclusiveMinimum: 'Değer {exclusiveMinimum} dan büyük olmalı',
     maximum: 'Değer, {maximum} değerinden küçük veya ona eşit olmalıdır',
-    exclusiveMaximum: 'Değer {maximum} dan küçük olmalı',
+    exclusiveMaximum: 'Değer {exclusiveMaximum} dan küçük olmalı',
     minLength: '{minLength} asgari karakter sayısı',
     maxLength: '{maxLength} azami  karakter sayısı',
     minItems: 'En az seçenek sayısı {minItems}',
@@ -193,7 +193,7 @@ export const localizedMessages = {
     minimum: 'De waarde moet groter zijn dan of gelijk zijn aan {minimum}',
     exclusiveMinimum: 'Waarde moet meer zijn dan {exclusiveMinimum}',
     maximum: 'De waarde moet lager zijn dan of gelijk zijn aan {maximum}',
-    exclusiveMaximum: 'Waarde moet minder zijn dan {maximum}',
+    exclusiveMaximum: 'Waarde moet minder zijn dan {exclusiveMaximum}',
     minLength: 'Minimaal {minLength} tekens',
     maxLength: 'Maximaal {maxLength} tekens',
     minItems: 'Minimaal {minItems} antwoorden',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koumoul/vjsf",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "description": "Generate forms for the vuetify UI library (vuejs) based on annotated JSON schemas.",
   "main": "dist/main.js",
   "scripts": {
@@ -46,38 +46,36 @@
   },
   "homepage": "https://github.com/koumoul-dev/vuetify-jsonschema-form#readme",
   "dependencies": {
-    "@mdi/js": "^5.5.55",
-    "ajv": "^8.6.2",
+    "@mdi/js": "^6.5.95",
+    "ajv": "^8.9.0",
     "ajv-formats": "^2.1.1",
-    "ajv-i18n": "^4.1.0",
-    "debounce": "^1.2.0",
+    "ajv-i18n": "^4.2.0",
+    "debounce": "^1.2.1",
+    "debug": "^4.3.3",
     "fast-copy": "^2.1.1",
-    "fast-equals": "^2.0.0",
-    "markdown-it": "^8.4.2",
-    "match-all": "^1.2.5",
-    "object-hash": "^2.1.1",
-    "property-expr": "^2.0.4",
+    "fast-equals": "^2.0.4",
+    "markdown-it": "^12.3.2",
+    "match-all": "^1.2.6",
+    "object-hash": "^2.2.0",
+    "property-expr": "^2.0.5",
     "vuedraggable": "^2.24.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/core": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
+    "@babel/core": "^7.16.12",
+    "@babel/preset-env": "^7.16.11",
     "@koumoul/data-fair-search-widget": "^0.3.0",
     "@koumoul/gh-pages-multi": "^0.6.0",
-    "@mdi/font": "^3.8.95",
+    "@mdi/font": "^6.5.95",
     "@nuxtjs/axios": "^5.13.6",
     "@nuxtjs/vuetify": "^1.12.3",
     "@toast-ui/vue-editor": "^2.5.1",
-    "@vue/test-utils": "^1.0.3",
-    "axios": "^0.21.1",
+    "@vue/test-utils": "^1.3.0",
+    "axios": "^0.25.0",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-eslint": "^10.0.2",
-    "babel-jest": "^26.1.0",
-    "babel-loader": "^8.0.6",
-    "babel-polyfill": "^6.26.0",
+    "babel-eslint": "^10.1.0",
+    "babel-loader": "^8.2.3",
     "brace": "^0.11.1",
-    "easymde": "^2.14.0",
+    "easymde": "^2.16.1",
     "eslint": "^6.1.0",
     "eslint-config-standard": "^13.0.1",
     "eslint-plugin-import": "^2.18.2",
@@ -85,26 +83,23 @@
     "eslint-plugin-node": "^9.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.0",
-    "eslint-plugin-vue": "^5.2.3",
-    "fuse.js": "^3.4.6",
-    "highlight.js": "^10.4.1",
-    "hjson": "^3.1.2",
+    "eslint-plugin-vue": "^7.20.0",
+    "highlight.js": "^11.4.0",
     "jest": "^26.1.0",
     "jest-serializer-vue": "^2.0.2",
-    "mini-css-extract-plugin": "^0.8.0",
-    "nuxt": "^2.15.3",
+    "mini-css-extract-plugin": "^1.6.2",
+    "nuxt": "^2.15.8",
     "random-words": "^1.1.0",
-    "sanitize-html": "^2.3.0",
+    "sanitize-html": "^2.6.1",
     "stringify-object": "^3.3.0",
     "tiptap-vuetify": "^2.24.0",
     "v-mask": "^2.3.0",
     "vue-axios": "^2.1.5",
     "vue-cropperjs": "^4.2.0",
-    "vue-jest": "^3.0.5",
-    "vue-template-compiler": "^2.6.11",
-    "vuetify": "^2.5.2",
-    "webpack": "^4.39.0",
-    "webpack-cli": "^3.3.6",
-    "yaml": "^1.7.1"
+    "vue-jest": "^3.0.7",
+    "vue-template-compiler": "^2.6.14",
+    "vuetify": "^2.6.2",
+    "webpack-cli": "^4.9.1",
+    "yaml": "^1.10.2"
   }
 }

package/webpack.config.js

@@ -1,5 +1,5 @@
 const path = require('path')
-const VueLoaderPlugin = require('vue-loader/lib/plugin')
+const { VueLoaderPlugin } = require('vue-loader')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 
 const base = {
@@ -8,22 +8,16 @@ const base = {
     rules: [{
       test: /\.js$/,
       exclude: /(node_modules)/,
-      loader: 'babel-loader',
-      options: {
-        presets: ['@babel/preset-env']
-      }
+      use: 'babel-loader'
     }, {
       test: /\.vue$/,
-      loader: 'vue-loader'
+      use: 'vue-loader'
     }, {
       test: /\.css$/,
-      loader: [MiniCssExtractPlugin.loader, 'css-loader']
-    }, {
-      test: /\.less$/,
-      loader: [MiniCssExtractPlugin.loader, 'css-loader', 'less-loader']
+      use: [MiniCssExtractPlugin.loader, 'css-loader']
     }, {
       test: /\.(svg|eot|woff|ttf|woff2)$/,
-      loader: ['file-loader']
+      use: 'file-loader'
     }]
   },
   plugins: [