diff --git a/html/package-lock.json b/html/package-lock.json
index 3eb1e848..860fcde5 100644
--- a/html/package-lock.json
+++ b/html/package-lock.json
@@ -7,11 +7,11 @@
"license": "MIT",
"devDependencies": {
"animate.css": "^4.1.1",
- "copy-webpack-plugin": "^10.0.0",
+ "copy-webpack-plugin": "^10.2.0",
"css-loader": "^6.5.1",
"default-passive-events": "^2.0.0",
"element-ui": "^2.15.6",
- "eslint": "^8.4.0",
+ "eslint": "^8.5.0",
"eslint-config-prettier": "^8.3.0",
"famfamfam-flags": "^1.0.0",
"html-webpack-plugin": "^5.5.0",
@@ -22,17 +22,16 @@
"pug": "^3.0.2",
"pug-plain-loader": "^1.1.0",
"raw-loader": "^4.0.2",
- "sass": "^1.44.0",
- "sass-loader": "^12.3.0",
+ "sass": "^1.45.1",
+ "sass-loader": "^12.4.0",
"uuid": "^8.3.2",
"vue": "^2.6.14",
"vue-data-tables": "^3.4.5",
"vue-lazyload": "^1.3.3",
"vue-marquee-text-component": "^1.2.0",
- "vue-swatches": "^2.1.1",
- "webpack": "^5.64.4",
+ "webpack": "^5.65.0",
"webpack-cli": "^4.9.1",
- "worker-timers": "^7.0.42"
+ "worker-timers": "^7.0.43"
}
},
"node_modules/@babel/helper-validator-identifier": {
@@ -45,9 +44,9 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.16.4",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz",
- "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==",
+ "version": "7.16.6",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz",
+ "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==",
"dev": true,
"bin": {
"parser": "bin/babel-parser.js"
@@ -57,9 +56,9 @@
}
},
"node_modules/@babel/runtime": {
- "version": "7.16.3",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
- "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
+ "version": "7.16.5",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.5.tgz",
+ "integrity": "sha512-TXWihFIS3Pyv5hzR7j6ihmeLkZfrXGxAr5UfSl8CHf+6q/wpiYDkUau0czckpYG8QmnCIuPpdLtuA9VmuGGyMA==",
"dev": true,
"dependencies": {
"regenerator-runtime": "^0.13.4"
@@ -182,9 +181,9 @@
}
},
"node_modules/@types/eslint-scope": {
- "version": "3.7.1",
- "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz",
- "integrity": "sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==",
+ "version": "3.7.2",
+ "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.2.tgz",
+ "integrity": "sha512-TzgYCWoPiTeRg6RQYgtuW7iODtVoKu3RVL72k3WohqhjfaOLK5Mg2T4Tg1o2bSfu0vPkoI48wdQFv5b/Xe04wQ==",
"dev": true,
"dependencies": {
"@types/eslint": "*",
@@ -210,9 +209,9 @@
"dev": true
},
"node_modules/@types/node": {
- "version": "16.11.11",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.11.tgz",
- "integrity": "sha512-KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw==",
+ "version": "17.0.3",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.3.tgz",
+ "integrity": "sha512-bAKB1GcA28FR/D8HHQ5U4FYk7nvoZdp7TZSy9oIyQ8gpYCzpeESa3LCK2TbeocXic7GwIXCkCItJg0DttO3ZaQ==",
"dev": true
},
"node_modules/@webassemblyjs/ast": {
@@ -675,13 +674,13 @@
}
},
"node_modules/browserslist": {
- "version": "4.18.1",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz",
- "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==",
+ "version": "4.19.1",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+ "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
"dev": true,
"dependencies": {
- "caniuse-lite": "^1.0.30001280",
- "electron-to-chromium": "^1.3.896",
+ "caniuse-lite": "^1.0.30001286",
+ "electron-to-chromium": "^1.4.17",
"escalade": "^3.1.1",
"node-releases": "^2.0.1",
"picocolors": "^1.0.0"
@@ -736,9 +735,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001285",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001285.tgz",
- "integrity": "sha512-KAOkuUtcQ901MtmvxfKD+ODHH9YVDYnBt+TGYSz2KIfnq22CiArbUxXPN9067gNbgMlnNYRSwho8OPXZPALB9Q==",
+ "version": "1.0.30001292",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001292.tgz",
+ "integrity": "sha512-jnT4Tq0Q4ma+6nncYQVe7d73kmDmE9C3OGTx3MvW7lBM/eY1S1DZTMBON7dqV481RhNiS5OxD7k9JQvmDOTirw==",
"dev": true,
"funding": {
"type": "opencollective",
@@ -888,9 +887,9 @@
}
},
"node_modules/copy-webpack-plugin": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.0.0.tgz",
- "integrity": "sha512-tuCVuFMBbRsb7IH0q1CUb50/Skv+7a6c7DJ+xi4fAbOzNLTYVMUTPnf8uGvKPtmqTvzYBrfEFo7YgP4TsUWmtg==",
+ "version": "10.2.0",
+ "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.0.tgz",
+ "integrity": "sha512-my6iXII95c78w14HzYCNya5TlJYa44lOppAge5GSTMM1SyDxNsVGCJvhP4/ld6snm8lzjn3XOonMZD6s1L86Og==",
"dev": true,
"dependencies": {
"fast-glob": "^3.2.7",
@@ -960,16 +959,16 @@
}
},
"node_modules/css-select": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
- "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.2.0.tgz",
+ "integrity": "sha512-6YVG6hsH9yIb/si3Th/is8Pex7qnVHO6t7q7U6TIUnkQASGbS8tnUDBftnPynLNnuUl/r2+PTd0ekiiq7R0zJw==",
"dev": true,
"dependencies": {
"boolbase": "^1.0.0",
- "css-what": "^5.0.0",
- "domhandler": "^4.2.0",
- "domutils": "^2.6.0",
- "nth-check": "^2.0.0"
+ "css-what": "^5.1.0",
+ "domhandler": "^4.3.0",
+ "domutils": "^2.8.0",
+ "nth-check": "^2.0.1"
},
"funding": {
"url": "https://github.com/sponsors/fb55"
@@ -1142,9 +1141,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.4.11",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.11.tgz",
- "integrity": "sha512-2OhsaYgsWGhWjx2et8kaUcdktPbBGjKM2X0BReUCKcSCPttEY+hz2zie820JLbttU8jwL92+JJysWwkut3wZgA==",
+ "version": "1.4.27",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.27.tgz",
+ "integrity": "sha512-uZ95szi3zUbzRDx1zx/xnsCG+2xgZyy57pDOeaeO4r8zx5Dqe8Jv1ti8cunvBwJHVI5LzPuw8umKwZb3WKYxSQ==",
"dev": true
},
"node_modules/element-ui": {
@@ -1247,9 +1246,9 @@
}
},
"node_modules/eslint": {
- "version": "8.4.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.4.0.tgz",
- "integrity": "sha512-kv0XQcAQJL/VD9THQKhTQZVqkJKA+tIj/v2ZKNaIHRAADcJWFb+B/BAewUYuF6UVg1s2xC5qXVoDk0G8sKGeTA==",
+ "version": "8.5.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.5.0.tgz",
+ "integrity": "sha512-tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg==",
"dev": true,
"dependencies": {
"@eslint/eslintrc": "^1.0.5",
@@ -1506,12 +1505,12 @@
"dev": true
},
"node_modules/fast-unique-numbers": {
- "version": "6.0.9",
- "resolved": "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-6.0.9.tgz",
- "integrity": "sha512-AsAHIl9JebIZoEjlu53gFAP1nPTkjHp8cbBVFDfYkYxTWF93Edxi/Q/ybHjj264XRO2wMPIuP6vkjdABtEsWlw==",
+ "version": "6.0.10",
+ "resolved": "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-6.0.10.tgz",
+ "integrity": "sha512-zALEq0Ew7lhAvAbj6IYxhYUEfnz2X6it6Ca/F3GR7X/k0kfR+E8s4mIrXodHKH5+W5PI+FQDO96kfyjk5pMNSQ==",
"dev": true,
"dependencies": {
- "@babel/runtime": "^7.16.3",
+ "@babel/runtime": "^7.16.5",
"tslib": "^2.3.1"
},
"engines": {
@@ -1721,9 +1720,9 @@
}
},
"node_modules/globby/node_modules/ignore": {
- "version": "5.1.9",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
- "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+ "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
"dev": true,
"engines": {
"node": ">= 4"
@@ -2095,9 +2094,9 @@
}
},
"node_modules/jest-worker": {
- "version": "27.4.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.2.tgz",
- "integrity": "sha512-0QMy/zPovLfUPyHuOuuU4E+kGACXXE84nRnq6lBVI9GJg5DCBiA97SATi+ZP8CpiJwEQy1oCPjRBf8AnLjN+Ag==",
+ "version": "27.4.5",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.5.tgz",
+ "integrity": "sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==",
"dev": true,
"dependencies": {
"@types/node": "*",
@@ -2664,9 +2663,9 @@
}
},
"node_modules/postcss": {
- "version": "8.4.4",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz",
- "integrity": "sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q==",
+ "version": "8.4.5",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",
+ "integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==",
"dev": true,
"dependencies": {
"nanoid": "^3.1.30",
@@ -2741,9 +2740,9 @@
}
},
"node_modules/postcss-selector-parser": {
- "version": "6.0.6",
- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
- "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+ "version": "6.0.8",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz",
+ "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==",
"dev": true,
"dependencies": {
"cssesc": "^3.0.0",
@@ -3240,13 +3239,14 @@
]
},
"node_modules/sass": {
- "version": "1.44.0",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.44.0.tgz",
- "integrity": "sha512-0hLREbHFXGQqls/K8X+koeP+ogFRPF4ZqetVB19b7Cst9Er8cOR0rc6RU7MaI4W1JmUShd1BPgPoeqmmgMMYFw==",
+ "version": "1.45.1",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.45.1.tgz",
+ "integrity": "sha512-pwPRiq29UR0o4X3fiQyCtrESldXvUQAAE0QmcJTpsI4kuHHcLzZ54M1oNBVIXybQv8QF2zfkpFcTxp8ta97dUA==",
"dev": true,
"dependencies": {
"chokidar": ">=3.0.0 <4.0.0",
- "immutable": "^4.0.0"
+ "immutable": "^4.0.0",
+ "source-map-js": ">=0.6.2 <2.0.0"
},
"bin": {
"sass": "sass.js"
@@ -3256,9 +3256,9 @@
}
},
"node_modules/sass-loader": {
- "version": "12.3.0",
- "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.3.0.tgz",
- "integrity": "sha512-6l9qwhdOb7qSrtOu96QQ81LVl8v6Dp9j1w3akOm0aWHyrTYtagDt5+kS32N4yq4hHk3M+rdqoRMH+lIdqvW6HA==",
+ "version": "12.4.0",
+ "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.4.0.tgz",
+ "integrity": "sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg==",
"dev": true,
"dependencies": {
"klona": "^2.0.4",
@@ -3273,7 +3273,7 @@
},
"peerDependencies": {
"fibers": ">= 3.1.0",
- "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0",
+ "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
"sass": "^1.3.0",
"webpack": "^5.0.0"
},
@@ -3525,12 +3525,12 @@
}
},
"node_modules/terser-webpack-plugin": {
- "version": "5.2.5",
- "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.5.tgz",
- "integrity": "sha512-3luOVHku5l0QBeYS8r4CdHYWEGMmIj3H1U64jgkdZzECcSOJAyJ9TjuqcQZvw1Y+4AOBN9SeYJPJmFn2cM4/2g==",
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz",
+ "integrity": "sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ==",
"dev": true,
"dependencies": {
- "jest-worker": "^27.0.6",
+ "jest-worker": "^27.4.1",
"schema-utils": "^3.1.1",
"serialize-javascript": "^6.0.0",
"source-map": "^0.6.1",
@@ -3746,9 +3746,9 @@
}
},
"node_modules/vue-marquee-text-component/node_modules/core-js": {
- "version": "3.19.3",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.3.tgz",
- "integrity": "sha512-LeLBMgEGSsG7giquSzvgBrTS7V5UL6ks3eQlUSbN8dJStlLFiRzUm5iqsRyzUB8carhfKjkJ2vzKqE6z1Vga9g==",
+ "version": "3.20.0",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.0.tgz",
+ "integrity": "sha512-KjbKU7UEfg4YPpskMtMXPhUKn7m/1OdTHTVjy09ScR2LVaoUXe8Jh0UdvN2EKUR6iKTJph52SJP95mAB0MnVLQ==",
"dev": true,
"hasInstallScript": true,
"funding": {
@@ -3756,12 +3756,6 @@
"url": "https://opencollective.com/core-js"
}
},
- "node_modules/vue-swatches": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/vue-swatches/-/vue-swatches-2.1.1.tgz",
- "integrity": "sha512-YugkNbByxMz1dnx1nZyHSL3VSf/TnBH3/NQD+t8JKxPSqUmX87sVGBxjEaqH5IMraOLfVmU0pHCHl2BfXNypQg==",
- "dev": true
- },
"node_modules/watchpack": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
@@ -3776,9 +3770,9 @@
}
},
"node_modules/webpack": {
- "version": "5.64.4",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.64.4.tgz",
- "integrity": "sha512-LWhqfKjCLoYJLKJY8wk2C3h77i8VyHowG3qYNZiIqD6D0ZS40439S/KVuc/PY48jp2yQmy0mhMknq8cys4jFMw==",
+ "version": "5.65.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.65.0.tgz",
+ "integrity": "sha512-Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw==",
"dev": true,
"dependencies": {
"@types/eslint-scope": "^3.7.0",
@@ -3803,7 +3797,7 @@
"schema-utils": "^3.1.0",
"tapable": "^2.1.1",
"terser-webpack-plugin": "^5.1.3",
- "watchpack": "^2.3.0",
+ "watchpack": "^2.3.1",
"webpack-sources": "^3.2.2"
},
"bin": {
@@ -3982,36 +3976,36 @@
}
},
"node_modules/worker-timers": {
- "version": "7.0.42",
- "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-7.0.42.tgz",
- "integrity": "sha512-EfDUS5qf+xe0TvJsAIKpIUTXRk9SYC2XX5tScgOfgCwci1LUGswtso09q+mh4LerHgWcdrCraYeEpdsd41iVlw==",
+ "version": "7.0.43",
+ "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-7.0.43.tgz",
+ "integrity": "sha512-mAtn6JIP7TTIZmOQC7Ekzcjn9joJQbR2AT0+ue5uQCSzp5TPebEgAIHfMlacFDTNUhfUVWPudOsG7T3ykoy3vw==",
"dev": true,
"dependencies": {
- "@babel/runtime": "^7.16.3",
+ "@babel/runtime": "^7.16.5",
"tslib": "^2.3.1",
- "worker-timers-broker": "^6.0.63",
- "worker-timers-worker": "^7.0.30"
+ "worker-timers-broker": "^6.0.64",
+ "worker-timers-worker": "^7.0.31"
}
},
"node_modules/worker-timers-broker": {
- "version": "6.0.63",
- "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-6.0.63.tgz",
- "integrity": "sha512-cOYMsGKP7k/UUODVYCumYxAOsHEeg1aAhhLzuJm2WVsLjra1faoj3D1L6nt472PrvDXgqP+PGCOiHQYKNXltiQ==",
+ "version": "6.0.64",
+ "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-6.0.64.tgz",
+ "integrity": "sha512-nW5+YPbaI02HlL3tMZFx9S29kbj9LCWwUWmID9lFzcb5UywiPziYhAkSOtKagrHy2DHf2iRyTtjn8r3bPwaD8Q==",
"dev": true,
"dependencies": {
- "@babel/runtime": "^7.16.3",
- "fast-unique-numbers": "^6.0.9",
+ "@babel/runtime": "^7.16.5",
+ "fast-unique-numbers": "^6.0.10",
"tslib": "^2.3.1",
- "worker-timers-worker": "^7.0.30"
+ "worker-timers-worker": "^7.0.31"
}
},
"node_modules/worker-timers-worker": {
- "version": "7.0.30",
- "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-7.0.30.tgz",
- "integrity": "sha512-jASIdgMm08dRaUTLQ5w6Nxaz4qTNxMV6ygTSS93SxTXnWTQuwzvaft7LAy8T3kxRrO4VOr4n6rvSHEqITI7LHg==",
+ "version": "7.0.31",
+ "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-7.0.31.tgz",
+ "integrity": "sha512-dmMLx57hQ5drR+PEeA36r51muo1+s4kO3NiysFZ310i8TG1tTBxEpE/VVJ9egIiGBiyUn0vSlu44BjKYmN1SsA==",
"dev": true,
"dependencies": {
- "@babel/runtime": "^7.16.3",
+ "@babel/runtime": "^7.16.5",
"tslib": "^2.3.1"
}
},
@@ -4036,15 +4030,15 @@
"dev": true
},
"@babel/parser": {
- "version": "7.16.4",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz",
- "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==",
+ "version": "7.16.6",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz",
+ "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==",
"dev": true
},
"@babel/runtime": {
- "version": "7.16.3",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
- "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
+ "version": "7.16.5",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.5.tgz",
+ "integrity": "sha512-TXWihFIS3Pyv5hzR7j6ihmeLkZfrXGxAr5UfSl8CHf+6q/wpiYDkUau0czckpYG8QmnCIuPpdLtuA9VmuGGyMA==",
"dev": true,
"requires": {
"regenerator-runtime": "^0.13.4"
@@ -4145,9 +4139,9 @@
}
},
"@types/eslint-scope": {
- "version": "3.7.1",
- "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz",
- "integrity": "sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==",
+ "version": "3.7.2",
+ "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.2.tgz",
+ "integrity": "sha512-TzgYCWoPiTeRg6RQYgtuW7iODtVoKu3RVL72k3WohqhjfaOLK5Mg2T4Tg1o2bSfu0vPkoI48wdQFv5b/Xe04wQ==",
"dev": true,
"requires": {
"@types/eslint": "*",
@@ -4173,9 +4167,9 @@
"dev": true
},
"@types/node": {
- "version": "16.11.11",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.11.tgz",
- "integrity": "sha512-KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw==",
+ "version": "17.0.3",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.3.tgz",
+ "integrity": "sha512-bAKB1GcA28FR/D8HHQ5U4FYk7nvoZdp7TZSy9oIyQ8gpYCzpeESa3LCK2TbeocXic7GwIXCkCItJg0DttO3ZaQ==",
"dev": true
},
"@webassemblyjs/ast": {
@@ -4566,13 +4560,13 @@
}
},
"browserslist": {
- "version": "4.18.1",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz",
- "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==",
+ "version": "4.19.1",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+ "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
"dev": true,
"requires": {
- "caniuse-lite": "^1.0.30001280",
- "electron-to-chromium": "^1.3.896",
+ "caniuse-lite": "^1.0.30001286",
+ "electron-to-chromium": "^1.4.17",
"escalade": "^3.1.1",
"node-releases": "^2.0.1",
"picocolors": "^1.0.0"
@@ -4611,9 +4605,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001285",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001285.tgz",
- "integrity": "sha512-KAOkuUtcQ901MtmvxfKD+ODHH9YVDYnBt+TGYSz2KIfnq22CiArbUxXPN9067gNbgMlnNYRSwho8OPXZPALB9Q==",
+ "version": "1.0.30001292",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001292.tgz",
+ "integrity": "sha512-jnT4Tq0Q4ma+6nncYQVe7d73kmDmE9C3OGTx3MvW7lBM/eY1S1DZTMBON7dqV481RhNiS5OxD7k9JQvmDOTirw==",
"dev": true
},
"chalk": {
@@ -4732,9 +4726,9 @@
}
},
"copy-webpack-plugin": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.0.0.tgz",
- "integrity": "sha512-tuCVuFMBbRsb7IH0q1CUb50/Skv+7a6c7DJ+xi4fAbOzNLTYVMUTPnf8uGvKPtmqTvzYBrfEFo7YgP4TsUWmtg==",
+ "version": "10.2.0",
+ "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.0.tgz",
+ "integrity": "sha512-my6iXII95c78w14HzYCNya5TlJYa44lOppAge5GSTMM1SyDxNsVGCJvhP4/ld6snm8lzjn3XOonMZD6s1L86Og==",
"dev": true,
"requires": {
"fast-glob": "^3.2.7",
@@ -4779,16 +4773,16 @@
}
},
"css-select": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
- "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.2.0.tgz",
+ "integrity": "sha512-6YVG6hsH9yIb/si3Th/is8Pex7qnVHO6t7q7U6TIUnkQASGbS8tnUDBftnPynLNnuUl/r2+PTd0ekiiq7R0zJw==",
"dev": true,
"requires": {
"boolbase": "^1.0.0",
- "css-what": "^5.0.0",
- "domhandler": "^4.2.0",
- "domutils": "^2.6.0",
- "nth-check": "^2.0.0"
+ "css-what": "^5.1.0",
+ "domhandler": "^4.3.0",
+ "domutils": "^2.8.0",
+ "nth-check": "^2.0.1"
}
},
"css-what": {
@@ -4911,9 +4905,9 @@
}
},
"electron-to-chromium": {
- "version": "1.4.11",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.11.tgz",
- "integrity": "sha512-2OhsaYgsWGhWjx2et8kaUcdktPbBGjKM2X0BReUCKcSCPttEY+hz2zie820JLbttU8jwL92+JJysWwkut3wZgA==",
+ "version": "1.4.27",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.27.tgz",
+ "integrity": "sha512-uZ95szi3zUbzRDx1zx/xnsCG+2xgZyy57pDOeaeO4r8zx5Dqe8Jv1ti8cunvBwJHVI5LzPuw8umKwZb3WKYxSQ==",
"dev": true
},
"element-ui": {
@@ -4986,9 +4980,9 @@
"dev": true
},
"eslint": {
- "version": "8.4.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.4.0.tgz",
- "integrity": "sha512-kv0XQcAQJL/VD9THQKhTQZVqkJKA+tIj/v2ZKNaIHRAADcJWFb+B/BAewUYuF6UVg1s2xC5qXVoDk0G8sKGeTA==",
+ "version": "8.5.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.5.0.tgz",
+ "integrity": "sha512-tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg==",
"dev": true,
"requires": {
"@eslint/eslintrc": "^1.0.5",
@@ -5184,12 +5178,12 @@
"dev": true
},
"fast-unique-numbers": {
- "version": "6.0.9",
- "resolved": "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-6.0.9.tgz",
- "integrity": "sha512-AsAHIl9JebIZoEjlu53gFAP1nPTkjHp8cbBVFDfYkYxTWF93Edxi/Q/ybHjj264XRO2wMPIuP6vkjdABtEsWlw==",
+ "version": "6.0.10",
+ "resolved": "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-6.0.10.tgz",
+ "integrity": "sha512-zALEq0Ew7lhAvAbj6IYxhYUEfnz2X6it6Ca/F3GR7X/k0kfR+E8s4mIrXodHKH5+W5PI+FQDO96kfyjk5pMNSQ==",
"dev": true,
"requires": {
- "@babel/runtime": "^7.16.3",
+ "@babel/runtime": "^7.16.5",
"tslib": "^2.3.1"
}
},
@@ -5347,9 +5341,9 @@
},
"dependencies": {
"ignore": {
- "version": "5.1.9",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
- "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+ "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
"dev": true
}
}
@@ -5610,9 +5604,9 @@
"dev": true
},
"jest-worker": {
- "version": "27.4.2",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.2.tgz",
- "integrity": "sha512-0QMy/zPovLfUPyHuOuuU4E+kGACXXE84nRnq6lBVI9GJg5DCBiA97SATi+ZP8CpiJwEQy1oCPjRBf8AnLjN+Ag==",
+ "version": "27.4.5",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.5.tgz",
+ "integrity": "sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==",
"dev": true,
"requires": {
"@types/node": "*",
@@ -6053,9 +6047,9 @@
}
},
"postcss": {
- "version": "8.4.4",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz",
- "integrity": "sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q==",
+ "version": "8.4.5",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",
+ "integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==",
"dev": true,
"requires": {
"nanoid": "^3.1.30",
@@ -6100,9 +6094,9 @@
}
},
"postcss-selector-parser": {
- "version": "6.0.6",
- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
- "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+ "version": "6.0.8",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz",
+ "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==",
"dev": true,
"requires": {
"cssesc": "^3.0.0",
@@ -6474,19 +6468,20 @@
"dev": true
},
"sass": {
- "version": "1.44.0",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.44.0.tgz",
- "integrity": "sha512-0hLREbHFXGQqls/K8X+koeP+ogFRPF4ZqetVB19b7Cst9Er8cOR0rc6RU7MaI4W1JmUShd1BPgPoeqmmgMMYFw==",
+ "version": "1.45.1",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.45.1.tgz",
+ "integrity": "sha512-pwPRiq29UR0o4X3fiQyCtrESldXvUQAAE0QmcJTpsI4kuHHcLzZ54M1oNBVIXybQv8QF2zfkpFcTxp8ta97dUA==",
"dev": true,
"requires": {
"chokidar": ">=3.0.0 <4.0.0",
- "immutable": "^4.0.0"
+ "immutable": "^4.0.0",
+ "source-map-js": ">=0.6.2 <2.0.0"
}
},
"sass-loader": {
- "version": "12.3.0",
- "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.3.0.tgz",
- "integrity": "sha512-6l9qwhdOb7qSrtOu96QQ81LVl8v6Dp9j1w3akOm0aWHyrTYtagDt5+kS32N4yq4hHk3M+rdqoRMH+lIdqvW6HA==",
+ "version": "12.4.0",
+ "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.4.0.tgz",
+ "integrity": "sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg==",
"dev": true,
"requires": {
"klona": "^2.0.4",
@@ -6672,12 +6667,12 @@
}
},
"terser-webpack-plugin": {
- "version": "5.2.5",
- "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.5.tgz",
- "integrity": "sha512-3luOVHku5l0QBeYS8r4CdHYWEGMmIj3H1U64jgkdZzECcSOJAyJ9TjuqcQZvw1Y+4AOBN9SeYJPJmFn2cM4/2g==",
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz",
+ "integrity": "sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ==",
"dev": true,
"requires": {
- "jest-worker": "^27.0.6",
+ "jest-worker": "^27.4.1",
"schema-utils": "^3.1.1",
"serialize-javascript": "^6.0.0",
"source-map": "^0.6.1",
@@ -6824,19 +6819,13 @@
},
"dependencies": {
"core-js": {
- "version": "3.19.3",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.3.tgz",
- "integrity": "sha512-LeLBMgEGSsG7giquSzvgBrTS7V5UL6ks3eQlUSbN8dJStlLFiRzUm5iqsRyzUB8carhfKjkJ2vzKqE6z1Vga9g==",
+ "version": "3.20.0",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.0.tgz",
+ "integrity": "sha512-KjbKU7UEfg4YPpskMtMXPhUKn7m/1OdTHTVjy09ScR2LVaoUXe8Jh0UdvN2EKUR6iKTJph52SJP95mAB0MnVLQ==",
"dev": true
}
}
},
- "vue-swatches": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/vue-swatches/-/vue-swatches-2.1.1.tgz",
- "integrity": "sha512-YugkNbByxMz1dnx1nZyHSL3VSf/TnBH3/NQD+t8JKxPSqUmX87sVGBxjEaqH5IMraOLfVmU0pHCHl2BfXNypQg==",
- "dev": true
- },
"watchpack": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
@@ -6848,9 +6837,9 @@
}
},
"webpack": {
- "version": "5.64.4",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.64.4.tgz",
- "integrity": "sha512-LWhqfKjCLoYJLKJY8wk2C3h77i8VyHowG3qYNZiIqD6D0ZS40439S/KVuc/PY48jp2yQmy0mhMknq8cys4jFMw==",
+ "version": "5.65.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.65.0.tgz",
+ "integrity": "sha512-Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw==",
"dev": true,
"requires": {
"@types/eslint-scope": "^3.7.0",
@@ -6875,7 +6864,7 @@
"schema-utils": "^3.1.0",
"tapable": "^2.1.1",
"terser-webpack-plugin": "^5.1.3",
- "watchpack": "^2.3.0",
+ "watchpack": "^2.3.1",
"webpack-sources": "^3.2.2"
},
"dependencies": {
@@ -6986,36 +6975,36 @@
"dev": true
},
"worker-timers": {
- "version": "7.0.42",
- "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-7.0.42.tgz",
- "integrity": "sha512-EfDUS5qf+xe0TvJsAIKpIUTXRk9SYC2XX5tScgOfgCwci1LUGswtso09q+mh4LerHgWcdrCraYeEpdsd41iVlw==",
+ "version": "7.0.43",
+ "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-7.0.43.tgz",
+ "integrity": "sha512-mAtn6JIP7TTIZmOQC7Ekzcjn9joJQbR2AT0+ue5uQCSzp5TPebEgAIHfMlacFDTNUhfUVWPudOsG7T3ykoy3vw==",
"dev": true,
"requires": {
- "@babel/runtime": "^7.16.3",
+ "@babel/runtime": "^7.16.5",
"tslib": "^2.3.1",
- "worker-timers-broker": "^6.0.63",
- "worker-timers-worker": "^7.0.30"
+ "worker-timers-broker": "^6.0.64",
+ "worker-timers-worker": "^7.0.31"
}
},
"worker-timers-broker": {
- "version": "6.0.63",
- "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-6.0.63.tgz",
- "integrity": "sha512-cOYMsGKP7k/UUODVYCumYxAOsHEeg1aAhhLzuJm2WVsLjra1faoj3D1L6nt472PrvDXgqP+PGCOiHQYKNXltiQ==",
+ "version": "6.0.64",
+ "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-6.0.64.tgz",
+ "integrity": "sha512-nW5+YPbaI02HlL3tMZFx9S29kbj9LCWwUWmID9lFzcb5UywiPziYhAkSOtKagrHy2DHf2iRyTtjn8r3bPwaD8Q==",
"dev": true,
"requires": {
- "@babel/runtime": "^7.16.3",
- "fast-unique-numbers": "^6.0.9",
+ "@babel/runtime": "^7.16.5",
+ "fast-unique-numbers": "^6.0.10",
"tslib": "^2.3.1",
- "worker-timers-worker": "^7.0.30"
+ "worker-timers-worker": "^7.0.31"
}
},
"worker-timers-worker": {
- "version": "7.0.30",
- "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-7.0.30.tgz",
- "integrity": "sha512-jASIdgMm08dRaUTLQ5w6Nxaz4qTNxMV6ygTSS93SxTXnWTQuwzvaft7LAy8T3kxRrO4VOr4n6rvSHEqITI7LHg==",
+ "version": "7.0.31",
+ "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-7.0.31.tgz",
+ "integrity": "sha512-dmMLx57hQ5drR+PEeA36r51muo1+s4kO3NiysFZ310i8TG1tTBxEpE/VVJ9egIiGBiyUn0vSlu44BjKYmN1SsA==",
"dev": true,
"requires": {
- "@babel/runtime": "^7.16.3",
+ "@babel/runtime": "^7.16.5",
"tslib": "^2.3.1"
}
},
diff --git a/html/package.json b/html/package.json
index eb89fc7f..461d0398 100644
--- a/html/package.json
+++ b/html/package.json
@@ -23,11 +23,11 @@
"homepage": "https://github.com/pypy-vrc/VRCX#readme",
"devDependencies": {
"animate.css": "^4.1.1",
- "copy-webpack-plugin": "^10.0.0",
+ "copy-webpack-plugin": "^10.2.0",
"css-loader": "^6.5.1",
"default-passive-events": "^2.0.0",
"element-ui": "^2.15.6",
- "eslint": "^8.4.0",
+ "eslint": "^8.5.0",
"eslint-config-prettier": "^8.3.0",
"famfamfam-flags": "^1.0.0",
"html-webpack-plugin": "^5.5.0",
@@ -38,16 +38,15 @@
"pug": "^3.0.2",
"pug-plain-loader": "^1.1.0",
"raw-loader": "^4.0.2",
- "sass": "^1.44.0",
- "sass-loader": "^12.3.0",
+ "sass": "^1.45.1",
+ "sass-loader": "^12.4.0",
"uuid": "^8.3.2",
"vue": "^2.6.14",
"vue-data-tables": "^3.4.5",
"vue-lazyload": "^1.3.3",
"vue-marquee-text-component": "^1.2.0",
- "vue-swatches": "^2.1.1",
- "webpack": "^5.64.4",
+ "webpack": "^5.65.0",
"webpack-cli": "^4.9.1",
- "worker-timers": "^7.0.42"
+ "worker-timers": "^7.0.43"
}
}
diff --git a/html/src/app.js b/html/src/app.js
index b66da6bb..30a59d90 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -8,8 +8,6 @@ import Noty from 'noty';
import Vue from 'vue';
import VueLazyload from 'vue-lazyload';
import {DataTables} from 'vue-data-tables';
-import VSwatches from 'vue-swatches';
-Vue.component('v-swatches', VSwatches);
import ElementUI from 'element-ui';
import locale from 'element-ui/lib/locale/lang/en';
import {v4 as uuidv4} from 'uuid';
@@ -8190,58 +8188,58 @@ speechSynthesis.getVoices();
var timeSinceLastEvent = dtNow - Date.parse(dt);
if (timeSinceLastEvent > this.photonLobbyTimeoutThreshold) {
if (this.photonLobbyJointime.has(id)) {
- var {joinTime} = this.photonLobbyJointime.get(id);
- }
- if (!joinTime || joinTime + 120000 < dtNow) {
- // wait 2mins for user to load in
- hudTimeout.unshift({
- userId: this.getUserIdFromPhotonId(id),
- displayName: this.getDisplayNameFromPhotonId(id),
- time: Math.round(timeSinceLastEvent / 1000)
- });
- }
+ var {joinTime} = this.photonLobbyJointime.get(id);
}
- });
- if (this.photonLobbyTimeout.length > 0 || hudTimeout.length > 0) {
- hudTimeout.sort(function (a, b) {
- if (a.time > b.time) {
- return 1;
- }
- if (a.time < b.time) {
- return -1;
- }
- return 0;
- });
- if (this.timeoutHudOverlay) {
- if (
- this.timeoutHudOverlayFilter === 'VIP' ||
- this.timeoutHudOverlayFilter === 'Friends'
- ) {
- var filteredHudTimeout = [];
- hudTimeout.forEach((item) => {
- if (
- this.timeoutHudOverlayFilter === 'VIP' &&
- API.cachedFavoritesByObjectId.has(item.userId)
- ) {
- filteredHudTimeout.push(item);
- } else if (
- this.timeoutHudOverlayFilter === 'Friends' &&
- this.friends.has(item.userId)
- ) {
- filteredHudTimeout.push(item);
- }
- });
- } else {
- var filteredHudTimeout = hudTimeout;
- }
- AppApi.ExecuteVrOverlayFunction(
- 'updateHudTimeout',
- JSON.stringify(filteredHudTimeout)
- );
+ if (!joinTime || joinTime + 120000 < dtNow) {
+ // wait 2mins for user to load in
+ hudTimeout.unshift({
+ userId: this.getUserIdFromPhotonId(id),
+ displayName: this.getDisplayNameFromPhotonId(id),
+ time: Math.round(timeSinceLastEvent / 1000)
+ });
}
- this.photonLobbyTimeout = hudTimeout;
- this.getCurrentInstanceUserList();
}
+ });
+ if (this.photonLobbyTimeout.length > 0 || hudTimeout.length > 0) {
+ hudTimeout.sort(function (a, b) {
+ if (a.time > b.time) {
+ return 1;
+ }
+ if (a.time < b.time) {
+ return -1;
+ }
+ return 0;
+ });
+ if (this.timeoutHudOverlay) {
+ if (
+ this.timeoutHudOverlayFilter === 'VIP' ||
+ this.timeoutHudOverlayFilter === 'Friends'
+ ) {
+ var filteredHudTimeout = [];
+ hudTimeout.forEach((item) => {
+ if (
+ this.timeoutHudOverlayFilter === 'VIP' &&
+ API.cachedFavoritesByObjectId.has(item.userId)
+ ) {
+ filteredHudTimeout.push(item);
+ } else if (
+ this.timeoutHudOverlayFilter === 'Friends' &&
+ this.friends.has(item.userId)
+ ) {
+ filteredHudTimeout.push(item);
+ }
+ });
+ } else {
+ var filteredHudTimeout = hudTimeout;
+ }
+ AppApi.ExecuteVrOverlayFunction(
+ 'updateHudTimeout',
+ JSON.stringify(filteredHudTimeout)
+ );
+ }
+ this.photonLobbyTimeout = hudTimeout;
+ this.getCurrentInstanceUserList();
+ }
this.photonBotCheck(dtNow);
workerTimers.setTimeout(() => this.photonLobbyWatcher(), 500);
};
@@ -8617,8 +8615,8 @@ speechSynthesis.getVoices();
var date = this.lastPortalList.get(portalId);
var time = timeToText(Date.parse(gameLogDate) - date);
this.addEntryPhotonEvent({
- photonId: senderId,
- text: `DeletedPortal ${time}`,
+ photonId: senderId,
+ text: `DeletedPortal ${time}`,
created_at: gameLogDate
});
return;
@@ -8627,14 +8625,14 @@ speechSynthesis.getVoices();
if (this.lastPortalId) {
this.lastPortalList.set(
this.lastPortalId,
- Date.parse(gameLogDate)
- );
- this.lastPortalId = '';
- }
- var displayName = this.getDisplayNameFromPhotonId(senderId);
- if (displayName) {
- var ref1 = {
- id: this.getUserIdFromPhotonId(senderId),
+ Date.parse(gameLogDate)
+ );
+ this.lastPortalId = '';
+ }
+ var displayName = this.getDisplayNameFromPhotonId(senderId);
+ if (displayName) {
+ var ref1 = {
+ id: this.getUserIdFromPhotonId(senderId),
displayName
};
this.portalQueue = 'skip';
@@ -8691,8 +8689,8 @@ speechSynthesis.getVoices();
}
this.addEntryPhotonEvent({
photonId: senderId,
- text,
- created_at: gameLogDate
+ text,
+ created_at: gameLogDate
});
} else {
var eventType = '';
@@ -11201,21 +11199,6 @@ speechSynthesis.getVoices();
configRepository.getString('VRCX_trustColor')
);
- $app.data.trustColorSwatches = [
- '#CCCCCC',
- '#1778FF',
- '#2BCF5C',
- '#FF7B42',
- '#B18FFF',
- '#FFD000',
- '#FF69B4',
- '#ABCDEF',
- '#8143E6',
- '#B52626',
- '#FF2626',
- '#782F2F'
- ];
-
$app.methods.updatetrustColor = function () {
var trustColor = $app.trustColor;
if (trustColor) {
diff --git a/html/src/app.scss b/html/src/app.scss
index fe2a41b5..ee29cb66 100644
--- a/html/src/app.scss
+++ b/html/src/app.scss
@@ -13,7 +13,6 @@
@import '~noty/lib/noty.css';
@import '~element-ui/lib/theme-chalk/index.css';
@import '~famfamfam-flags/dist/sprite/famfamfam-flags.min.css';
-@import '~vue-swatches/dist/vue-swatches.css';
.color-palettes {
background: #409eff;
@@ -580,6 +579,15 @@ i.x-user-status.busy {
.color-picker {
font-size: 18px;
+ vertical-align: top;
+}
+
+.el-color-picker__trigger {
+ border: unset;
+}
+
+.el-color-picker__color {
+ border: 0.5px solid #999;
}
.disableToggleSwitch ul li label {
diff --git a/html/src/index.pug b/html/src/index.pug
index e98e20b9..dacebf27 100644
--- a/html/src/index.pug
+++ b/html/src/index.pug
@@ -899,33 +899,33 @@ html
span.header User Colors
div.options-container-item
div
- v-swatches(v-model="trustColor.untrusted" show-fallback fallback-input-type="color" popover-x="right" :swatches="trustColorSwatches" class="x-tag-untrusted")
- span.color-picker(slot="trigger") #[i.el-icon-s-open] Visitor
- div
- v-swatches(v-model="trustColor.basic" show-fallback fallback-input-type="color" popover-x="right" :swatches="trustColorSwatches" class="x-tag-basic")
- span.color-picker(slot="trigger") #[i.el-icon-s-open] New User
- div
- v-swatches(v-model="trustColor.known" show-fallback fallback-input-type="color" popover-x="right" :swatches="trustColorSwatches" class="x-tag-known")
- span.color-picker(slot="trigger") #[i.el-icon-s-open] User
- div
- v-swatches(v-model="trustColor.trusted" show-fallback fallback-input-type="color" popover-x="right" :swatches="trustColorSwatches" class="x-tag-trusted")
- span.color-picker(slot="trigger") #[i.el-icon-s-open] Known User
- div
- v-swatches(v-model="trustColor.veteran" show-fallback fallback-input-type="color" popover-x="right" :swatches="trustColorSwatches" class="x-tag-veteran")
- span.color-picker(slot="trigger") #[i.el-icon-s-open] Trusted User
- div
- v-swatches(v-model="trustColor.legend" show-fallback fallback-input-type="color" popover-x="right" :swatches="trustColorSwatches" class="x-tag-legend")
- span.color-picker(slot="trigger") #[i.el-icon-s-open] Veteran User
+ el-color-picker(v-model="trustColor.untrusted" size="mini" :predefine="['#CCCCCC']")
+ span.color-picker(slot="trigger" class="x-tag-untrusted") Visitor
div
- v-swatches(v-model="trustColor.vip" show-fallback fallback-input-type="color" popover-x="right" :swatches="trustColorSwatches" class="x-tag-vip")
- span.color-picker(slot="trigger") #[i.el-icon-s-open] VRChat Team
+ el-color-picker(v-model="trustColor.basic" size="mini" :predefine="['#1778ff']")
+ span.color-picker(slot="trigger" class="x-tag-basic") New User
div
- v-swatches(v-model="trustColor.troll" show-fallback fallback-input-type="color" popover-x="right" :swatches="trustColorSwatches" class="x-tag-troll")
- span.color-picker(slot="trigger") #[i.el-icon-s-open] Nuisance
+ el-color-picker(v-model="trustColor.known" size="mini" :predefine="['#2bcf5c']")
+ span.color-picker(slot="trigger" class="x-tag-known") User
div
- v-swatches(v-model="trustColor.legendary" show-fallback fallback-input-type="color" popover-x="right" :swatches="trustColorSwatches" class="x-tag-legendary")
- span.color-picker(slot="trigger") #[i.el-icon-s-open] Legend
- el-switch(v-model="legendColorOverride" style="padding-bottom:5px;padding-left:3px" @change="saveLegendColorOverride")
+ el-color-picker(v-model="trustColor.trusted" size="mini" :predefine="['#ff7b42']")
+ span.color-picker(slot="trigger" class="x-tag-trusted") Known User
+ div
+ el-color-picker(v-model="trustColor.veteran" size="mini" :predefine="['#b18fff', '#8143e6']")
+ span.color-picker(slot="trigger" class="x-tag-veteran") Trusted User
+ div
+ el-color-picker(v-model="trustColor.legend" size="mini" :predefine="['#ffd000', '#abcdef']")
+ span.color-picker(slot="trigger" class="x-tag-legend") Veteran User
+ div
+ el-color-picker(v-model="trustColor.vip" size="mini" :predefine="['#ff2626']")
+ span.color-picker(slot="trigger" class="x-tag-vip") VRChat Team
+ div
+ el-color-picker(v-model="trustColor.troll" size="mini" :predefine="['#782f2f']")
+ span.color-picker(slot="trigger" class="x-tag-troll") Nuisance
+ div
+ el-color-picker(v-model="trustColor.legendary" size="mini" :predefine="['#ff69b4', '#b52626']")
+ span.color-picker(slot="trigger" class="x-tag-legendary") Legend
+ el-switch(v-model="legendColorOverride" style="padding-bottom:21px;padding-left:6px" @change="saveLegendColorOverride")
div.options-container
span.header Discord Presence
div.options-container-item
@@ -2940,30 +2940,6 @@ html
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
- div(style="margin-top:15px")
- p(style="font-weight:bold") vue-swatches
- pre(style="font-size:12px;white-space:pre-line").
- MIT License
-
- Copyright (c) 2018 - Present Diego Jara
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/html/webpack.config.js b/html/webpack.config.js
index 51ab2c43..265784bd 100644
--- a/html/webpack.config.js
+++ b/html/webpack.config.js
@@ -12,7 +12,6 @@ module.exports = {
'vue',
'vue-data-tables',
'vue-lazyload',
- 'vue-swatches',
'uuid'
],
app: {