From 107bbcd8823581761ff8398d51a22fc742758607 Mon Sep 17 00:00:00 2001 From: Lionel Bijaoui Date: Mon, 1 Oct 2018 16:46:36 +0200 Subject: [PATCH] Improve Codacy score --- .gitignore | 2 +- dev/mixins/utils.js | 31 +------- dev/projects/basic/app.vue | 2 +- dev/projects/basic/index.html | 1 + dev/projects/basic/main.js | 6 +- dev/projects/checklist/app.vue | 2 +- dev/projects/checklist/index.html | 1 + dev/projects/checklist/main.js | 6 +- dev/projects/custom/app.vue | 2 +- dev/projects/custom/index.html | 1 + dev/projects/custom/main.js | 6 +- dev/projects/full/app.vue | 2 +- dev/projects/full/index.html | 1 + dev/projects/full/main.js | 6 +- dev/projects/grouping/app.vue | 2 +- dev/projects/grouping/index.html | 1 + dev/projects/grouping/main.js | 6 +- dev/projects/multi/app.vue | 2 +- dev/projects/multi/index.html | 1 + dev/projects/multi/main.js | 6 +- dev/projects/multiselect/app.vue | 2 +- dev/projects/multiselect/index.html | 1 + dev/projects/multiselect/main.js | 6 +- dev/projects/picker/app.vue | 2 +- dev/projects/picker/index.html | 1 + dev/projects/picker/main.js | 6 +- dev/style.scss | 22 +----- package-lock.json | 77 +++++++++++-------- package.json | 4 +- tests/unit/specs/VueFormGenerator.spec.js | 9 ++- tests/unit/specs/fields/abstractField.spec.js | 2 +- tests/unit/specs/formElement.spec.js | 2 +- tests/unit/specs/utils/schema.spec.js | 1 + tests/unit/specs/utils/validators.spec.js | 1 + vue.config.js | 4 +- 35 files changed, 116 insertions(+), 111 deletions(-) diff --git a/.gitignore b/.gitignore index 70f23cd9..ff6b5b48 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ .DS_Store node_modules/ dist/*-report.html -test/unit/coverage +tests/unit/coverage # local env files .env.local diff --git a/dev/mixins/utils.js b/dev/mixins/utils.js index 034fdece..edeea40c 100644 --- a/dev/mixins/utils.js +++ b/dev/mixins/utils.js @@ -1,36 +1,7 @@ export default { computed: { prettyModel() { - return this.prettyJSON(this.model); - } - }, - methods: { - prettyJSON(json) { - if (json) { - json = JSON.stringify(json, null, 4); - json = json - .replace(/&/g, "&") - .replace(//g, ">"); - return json.replace( - /("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?)/g, - function(match) { - let cls = "number"; - if (/^"/.test(match)) { - if (/:$/.test(match)) { - cls = "key"; - } else { - cls = "string"; - } - } else if (/true|false/.test(match)) { - cls = "boolean"; - } else if (/null/.test(match)) { - cls = "null"; - } - return "" + match + ""; - } - ); - } + return JSON.stringify(this.model, null, 4); } } }; diff --git a/dev/projects/basic/app.vue b/dev/projects/basic/app.vue index c01d7bdb..8b5b0594 100644 --- a/dev/projects/basic/app.vue +++ b/dev/projects/basic/app.vue @@ -8,7 +8,7 @@
-

+				
diff --git a/dev/projects/basic/index.html b/dev/projects/basic/index.html index e1a1be49..32232395 100644 --- a/dev/projects/basic/index.html +++ b/dev/projects/basic/index.html @@ -7,6 +7,7 @@ <%= htmlWebpackPlugin.options.title %> + diff --git a/dev/projects/basic/main.js b/dev/projects/basic/main.js index dcec9623..93c7785b 100644 --- a/dev/projects/basic/main.js +++ b/dev/projects/basic/main.js @@ -1,7 +1,11 @@ import Vue from "vue"; -import VueFormGenerator from "../../../src"; + +import VueFormGenerator from "@"; Vue.use(VueFormGenerator); +import VueHighlightJS from "vue-highlightjs"; +Vue.use(VueHighlightJS); + import App from "./app.vue"; new Vue({ diff --git a/dev/projects/checklist/app.vue b/dev/projects/checklist/app.vue index c013bfcc..9db66144 100644 --- a/dev/projects/checklist/app.vue +++ b/dev/projects/checklist/app.vue @@ -8,7 +8,7 @@
-

+				
diff --git a/dev/projects/checklist/index.html b/dev/projects/checklist/index.html index b6bbbbf7..c81e2b07 100644 --- a/dev/projects/checklist/index.html +++ b/dev/projects/checklist/index.html @@ -7,6 +7,7 @@ <%= htmlWebpackPlugin.options.title %> + diff --git a/dev/projects/checklist/main.js b/dev/projects/checklist/main.js index 9870095e..93c7785b 100644 --- a/dev/projects/checklist/main.js +++ b/dev/projects/checklist/main.js @@ -1,7 +1,11 @@ import Vue from "vue"; -import VueFormGenerator from "./../../../src"; + +import VueFormGenerator from "@"; Vue.use(VueFormGenerator); +import VueHighlightJS from "vue-highlightjs"; +Vue.use(VueHighlightJS); + import App from "./app.vue"; new Vue({ diff --git a/dev/projects/custom/app.vue b/dev/projects/custom/app.vue index 47f2a839..39cd1fa7 100644 --- a/dev/projects/custom/app.vue +++ b/dev/projects/custom/app.vue @@ -49,7 +49,7 @@
-

+				
diff --git a/dev/projects/custom/index.html b/dev/projects/custom/index.html index 8797b6b9..f07ee077 100644 --- a/dev/projects/custom/index.html +++ b/dev/projects/custom/index.html @@ -9,6 +9,7 @@ + diff --git a/dev/projects/custom/main.js b/dev/projects/custom/main.js index dcec9623..93c7785b 100644 --- a/dev/projects/custom/main.js +++ b/dev/projects/custom/main.js @@ -1,7 +1,11 @@ import Vue from "vue"; -import VueFormGenerator from "../../../src"; + +import VueFormGenerator from "@"; Vue.use(VueFormGenerator); +import VueHighlightJS from "vue-highlightjs"; +Vue.use(VueHighlightJS); + import App from "./app.vue"; new Vue({ diff --git a/dev/projects/full/app.vue b/dev/projects/full/app.vue index 46bfaaec..2c7064a7 100644 --- a/dev/projects/full/app.vue +++ b/dev/projects/full/app.vue @@ -27,7 +27,7 @@
-

+				
diff --git a/dev/projects/full/index.html b/dev/projects/full/index.html index e23b3ccb..f438f574 100644 --- a/dev/projects/full/index.html +++ b/dev/projects/full/index.html @@ -6,6 +6,7 @@ <%= htmlWebpackPlugin.options.title %> + diff --git a/dev/projects/full/main.js b/dev/projects/full/main.js index dcec9623..93c7785b 100644 --- a/dev/projects/full/main.js +++ b/dev/projects/full/main.js @@ -1,7 +1,11 @@ import Vue from "vue"; -import VueFormGenerator from "../../../src"; + +import VueFormGenerator from "@"; Vue.use(VueFormGenerator); +import VueHighlightJS from "vue-highlightjs"; +Vue.use(VueHighlightJS); + import App from "./app.vue"; new Vue({ diff --git a/dev/projects/grouping/app.vue b/dev/projects/grouping/app.vue index 9a81fb18..91b52ab7 100644 --- a/dev/projects/grouping/app.vue +++ b/dev/projects/grouping/app.vue @@ -8,7 +8,7 @@
-

+				
diff --git a/dev/projects/grouping/index.html b/dev/projects/grouping/index.html index b91d5f57..4395d467 100644 --- a/dev/projects/grouping/index.html +++ b/dev/projects/grouping/index.html @@ -7,6 +7,7 @@ <%= htmlWebpackPlugin.options.title %> + diff --git a/dev/projects/grouping/main.js b/dev/projects/grouping/main.js index dcec9623..93c7785b 100644 --- a/dev/projects/grouping/main.js +++ b/dev/projects/grouping/main.js @@ -1,7 +1,11 @@ import Vue from "vue"; -import VueFormGenerator from "../../../src"; + +import VueFormGenerator from "@"; Vue.use(VueFormGenerator); +import VueHighlightJS from "vue-highlightjs"; +Vue.use(VueHighlightJS); + import App from "./app.vue"; new Vue({ diff --git a/dev/projects/multi/app.vue b/dev/projects/multi/app.vue index 694f86f5..3940d979 100644 --- a/dev/projects/multi/app.vue +++ b/dev/projects/multi/app.vue @@ -13,7 +13,7 @@
-

+				
diff --git a/dev/projects/multi/index.html b/dev/projects/multi/index.html index e1a1be49..32232395 100644 --- a/dev/projects/multi/index.html +++ b/dev/projects/multi/index.html @@ -7,6 +7,7 @@ <%= htmlWebpackPlugin.options.title %> + diff --git a/dev/projects/multi/main.js b/dev/projects/multi/main.js index dcec9623..93c7785b 100644 --- a/dev/projects/multi/main.js +++ b/dev/projects/multi/main.js @@ -1,7 +1,11 @@ import Vue from "vue"; -import VueFormGenerator from "../../../src"; + +import VueFormGenerator from "@"; Vue.use(VueFormGenerator); +import VueHighlightJS from "vue-highlightjs"; +Vue.use(VueHighlightJS); + import App from "./app.vue"; new Vue({ diff --git a/dev/projects/multiselect/app.vue b/dev/projects/multiselect/app.vue index 4374ee4f..69600b21 100644 --- a/dev/projects/multiselect/app.vue +++ b/dev/projects/multiselect/app.vue @@ -8,7 +8,7 @@
-

+				
diff --git a/dev/projects/multiselect/index.html b/dev/projects/multiselect/index.html index ac66173e..81dfd0dc 100644 --- a/dev/projects/multiselect/index.html +++ b/dev/projects/multiselect/index.html @@ -7,6 +7,7 @@ <%= htmlWebpackPlugin.options.title %> + diff --git a/dev/projects/multiselect/main.js b/dev/projects/multiselect/main.js index dcec9623..93c7785b 100644 --- a/dev/projects/multiselect/main.js +++ b/dev/projects/multiselect/main.js @@ -1,7 +1,11 @@ import Vue from "vue"; -import VueFormGenerator from "../../../src"; + +import VueFormGenerator from "@"; Vue.use(VueFormGenerator); +import VueHighlightJS from "vue-highlightjs"; +Vue.use(VueHighlightJS); + import App from "./app.vue"; new Vue({ diff --git a/dev/projects/picker/app.vue b/dev/projects/picker/app.vue index a94544f5..3631f83b 100644 --- a/dev/projects/picker/app.vue +++ b/dev/projects/picker/app.vue @@ -8,7 +8,7 @@
-

+				
diff --git a/dev/projects/picker/index.html b/dev/projects/picker/index.html index e6de5332..bbbe2995 100644 --- a/dev/projects/picker/index.html +++ b/dev/projects/picker/index.html @@ -7,6 +7,7 @@ <%= htmlWebpackPlugin.options.title %> + diff --git a/dev/projects/picker/main.js b/dev/projects/picker/main.js index dcec9623..93c7785b 100644 --- a/dev/projects/picker/main.js +++ b/dev/projects/picker/main.js @@ -1,7 +1,11 @@ import Vue from "vue"; -import VueFormGenerator from "../../../src"; + +import VueFormGenerator from "@"; Vue.use(VueFormGenerator); +import VueHighlightJS from "vue-highlightjs"; +Vue.use(VueHighlightJS); + import App from "./app.vue"; new Vue({ diff --git a/dev/style.scss b/dev/style.scss index 7c88b638..2a78e91a 100644 --- a/dev/style.scss +++ b/dev/style.scss @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Open+Sans+Condensed:300|Open+Sans:300,600,700&subset=latin-ext"); +@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,600,700&subset=latin-ext"); html { font-family: "Open Sans"; font-size: 14px; @@ -10,26 +10,6 @@ html { box-sizing: border-box; } -pre { - overflow: auto; - - .string { - color: #885800; - } - .number { - color: blue; - } - .boolean { - color: magenta; - } - .null { - color: red; - } - .key { - color: green; - } -} - .control-buttons { button { margin: 0.2em 0.3em; diff --git a/package-lock.json b/package-lock.json index ff8eb988..1f413e64 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1385,7 +1385,7 @@ }, "acorn-jsx": { "version": "3.0.1", - "resolved": "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", "dev": true, "requires": { @@ -1394,7 +1394,7 @@ "dependencies": { "acorn": { "version": "3.3.0", - "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", "dev": true } @@ -2270,7 +2270,7 @@ }, "babylon": { "version": "7.0.0-beta.44", - "resolved": "http://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.44.tgz", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.44.tgz", "integrity": "sha512-5Hlm13BJVAioCHpImtFqNOF2H3ieTOHd0fmFGMxOJ9jgeFqeAwsv3u5P5cR7CSeFrkgHsT19DgFJkHV0/Mcd8g==", "dev": true } @@ -2430,7 +2430,7 @@ }, "babel-plugin-syntax-dynamic-import": { "version": "6.18.0", - "resolved": "http://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz", "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=", "dev": true }, @@ -2822,7 +2822,7 @@ }, "browserify-aes": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { @@ -2859,7 +2859,7 @@ }, "browserify-rsa": { "version": "4.0.1", - "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { @@ -2903,7 +2903,7 @@ }, "buffer": { "version": "4.9.1", - "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { @@ -4043,7 +4043,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -4285,7 +4285,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -4413,7 +4413,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -4595,7 +4595,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } @@ -4622,7 +4622,7 @@ }, "create-hash": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { @@ -4635,7 +4635,7 @@ }, "create-hmac": { "version": "1.1.7", - "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { @@ -5269,7 +5269,7 @@ }, "diffie-hellman": { "version": "5.0.3", - "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { @@ -5629,7 +5629,7 @@ }, "eslint": { "version": "4.19.1", - "resolved": "http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", "dev": true, "requires": { @@ -5885,7 +5885,7 @@ }, "express": { "version": "4.16.3", - "resolved": "http://registry.npmjs.org/express/-/express-4.16.3.tgz", + "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz", "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=", "dev": true, "requires": { @@ -5979,7 +5979,7 @@ }, "external-editor": { "version": "2.2.0", - "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", "dev": true, "requires": { @@ -7511,7 +7511,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -7642,7 +7642,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, @@ -7813,7 +7813,7 @@ }, "got": { "version": "6.7.1", - "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz", + "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", "dev": true, "requires": { @@ -8942,7 +8942,7 @@ }, "is-builtin-module": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { @@ -9114,7 +9114,7 @@ }, "is-obj": { "version": "1.0.1", - "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", "dev": true }, @@ -9853,7 +9853,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -10479,7 +10479,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } @@ -10655,7 +10655,7 @@ }, "minimist": { "version": "0.0.8", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, @@ -10728,7 +10728,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { @@ -11297,7 +11297,7 @@ }, "promise": { "version": "1.3.0", - "resolved": "http://registry.npmjs.org/promise/-/promise-1.3.0.tgz", + "resolved": "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz", "integrity": "sha1-5cyaTIJ45GZP/twBx9qEhCsEAXU=", "dev": true, "requires": { @@ -12937,7 +12937,7 @@ }, "parse-asn1": { "version": "5.1.1", - "resolved": "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz", "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==", "dev": true, "requires": { @@ -13910,7 +13910,7 @@ }, "public-encrypt": { "version": "4.0.2", - "resolved": "http://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz", "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==", "dev": true, "requires": { @@ -14281,7 +14281,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } @@ -15588,7 +15588,7 @@ }, "sha.js": { "version": "2.4.11", - "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { @@ -16554,7 +16554,7 @@ }, "through": { "version": "2.3.8", - "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, @@ -17341,6 +17341,15 @@ "lodash": "4.17.11" } }, + "vue-highlightjs": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/vue-highlightjs/-/vue-highlightjs-1.3.3.tgz", + "integrity": "sha1-KaDVcTL8HOFc+mHolpGPW3GMXVI=", + "dev": true, + "requires": { + "highlight.js": "9.12.0" + } + }, "vue-hot-reload-api": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz", @@ -18262,7 +18271,7 @@ "dependencies": { "acorn": { "version": "3.3.0", - "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", "dev": true }, @@ -18302,7 +18311,7 @@ }, "wrap-ansi": { "version": "2.1.0", - "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { diff --git a/package.json b/package.json index 0415a83f..9a188910 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "sinon": "6.3.4", "vue": "2.5.17", "vue-cli-plugin-pug": "1.0.7", + "vue-highlightjs": "^1.3.3", "vue-markdown": "2.2.4", "vue-multiselect": "2.1.0", "vue-template-compiler": "2.5.17" @@ -97,7 +98,8 @@ 1, "double", { - "allowTemplateLiterals": true + "allowTemplateLiterals": true, + "avoidEscape": true } ], "semi": [ diff --git a/tests/unit/specs/VueFormGenerator.spec.js b/tests/unit/specs/VueFormGenerator.spec.js index abce20ba..58dee415 100644 --- a/tests/unit/specs/VueFormGenerator.spec.js +++ b/tests/unit/specs/VueFormGenerator.spec.js @@ -1,3 +1,4 @@ +/* eslint no-undefined: 0 */ import { mount, createLocalVue } from "@vue/test-utils"; import Vue from "vue"; @@ -22,7 +23,7 @@ function createFormGenerator(data, methods, template) { }; return _data; }, - methods: methods + methods }; const _wrapper = mount(Component, { @@ -59,7 +60,7 @@ describe("VueFormGenerator.vue", () => { before(() => { createFormGenerator( { schema }, - undefined, + {}, `` ); }); @@ -146,7 +147,7 @@ describe("VueFormGenerator.vue", () => { validationSuccessClass: "has-success", validationErrorClass: "has-error" }; - createFormGenerator({ schema, options: options }); + createFormGenerator({ schema, options }); formGenerator = wrapper.find({ name: "formGenerator" }); formElement = wrapper.find({ name: "form-element" }); }); @@ -962,7 +963,7 @@ describe("VueFormGenerator.vue", () => { before(() => { createFormGenerator( { schema, model }, - { onValidated: onValidated }, + { onValidated }, `` ); formGenerator = wrapper.find({ name: "formGenerator" }); diff --git a/tests/unit/specs/fields/abstractField.spec.js b/tests/unit/specs/fields/abstractField.spec.js index ca1b014e..26788cb0 100644 --- a/tests/unit/specs/fields/abstractField.spec.js +++ b/tests/unit/specs/fields/abstractField.spec.js @@ -221,7 +221,7 @@ describe("abstractField.vue", () => { wrapper.setProps({ formOptions: { validateAfterChanged: true } }); // console.log("---", field.value); // console.log("---", wrapper); - const textInput = wrapper.find(`input[type="text"]`); + const textInput = wrapper.find('input[type="text"]'); // console.log("---", wrapper); textInput.setValue("Jane Roe"); // field.value.set("Jane Roe"); diff --git a/tests/unit/specs/formElement.spec.js b/tests/unit/specs/formElement.spec.js index 92c1961f..33ff521f 100644 --- a/tests/unit/specs/formElement.spec.js +++ b/tests/unit/specs/formElement.spec.js @@ -13,7 +13,7 @@ function createFormElement(data, methods) { eventBus: new Vue(), ...data }, - methods: methods + methods }); wrapper = _wrapper; diff --git a/tests/unit/specs/utils/schema.spec.js b/tests/unit/specs/utils/schema.spec.js index 78d988ea..13bc6e22 100644 --- a/tests/unit/specs/utils/schema.spec.js +++ b/tests/unit/specs/utils/schema.spec.js @@ -1,3 +1,4 @@ +/* eslint no-undefined: 0 */ import { clone } from "lodash"; import { createDefaultObject, getMultipleFields, mergeMultiObjectFields } from "@/utils/schema"; diff --git a/tests/unit/specs/utils/validators.spec.js b/tests/unit/specs/utils/validators.spec.js index 800f25ee..927e48a7 100644 --- a/tests/unit/specs/utils/validators.spec.js +++ b/tests/unit/specs/utils/validators.spec.js @@ -1,3 +1,4 @@ +/* eslint no-undefined: 0 */ import v from "@/utils/validators"; function check(validator, value, field, errorCount) { diff --git a/vue.config.js b/vue.config.js index f0ac7332..68f9fb18 100644 --- a/vue.config.js +++ b/vue.config.js @@ -37,12 +37,12 @@ module.exports = { runtimeCompiler: false, transpileDependencies: [], productionSourceMap: false, - pages: process.env.NODE_ENV !== "development" ? undefined : generateDevProjects(), + pages: process.env.NODE_ENV !== "development" ? {} : generateDevProjects(), chainWebpack: (config) => { if (process.env.NODE_ENV === "production") { config.plugin("banner").use(webpack.BannerPlugin, [ { - banner: banner, + banner, raw: true, entryOnly: true }