Merge branch 'master' into redirects&status
This commit is contained in:
		
						commit
						adcd251076
					
				
					 5 changed files with 280 additions and 426 deletions
				
			
		
							
								
								
									
										647
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										647
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							|  | @ -97,9 +97,9 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@babel/eslint-parser": { |     "@babel/eslint-parser": { | ||||||
|       "version": "7.14.7", |       "version": "7.15.0", | ||||||
|       "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.14.7.tgz", |       "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.15.0.tgz", | ||||||
|       "integrity": "sha512-6WPwZqO5priAGIwV6msJcdc9TsEPzYeYdS/Xuoap+/ihkgN6dzHp2bcAAwyWZ5bLzk0vvjDmKvRwkqNaiJ8BiQ==", |       "integrity": "sha512-+gSPtjSBxOZz4Uh8Ggqu7HbfpB8cT1LwW0DnVVLZEJvzXauiD0Di3zszcBkRmfGGrLdYeHUwcflG7i3tr9kQlw==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "requires": { |       "requires": { | ||||||
|         "eslint-scope": "^5.1.1", |         "eslint-scope": "^5.1.1", | ||||||
|  | @ -384,9 +384,9 @@ | ||||||
|       "integrity": "sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==" |       "integrity": "sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==" | ||||||
|     }, |     }, | ||||||
|     "@babel/standalone": { |     "@babel/standalone": { | ||||||
|       "version": "7.14.8", |       "version": "7.15.1", | ||||||
|       "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.8.tgz", |       "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.15.1.tgz", | ||||||
|       "integrity": "sha512-5Aa1Bhis4oZD23iLJE5CDYHEs1zSC3ejppHE5aim0OWjGCWTa9Oq1PwopK4u1++ao6B6POW/PqNZjOCZNTSx0Q==", |       "integrity": "sha512-OJvIUtmXWEnTFvm+/TSMFkJK9vmbOF1wNmu/vbU18/Hlj9E6JdrkWxTkwbrsM1UjLtyb4w+pwZ/A1C4XZXorXg==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "@babel/template": { |     "@babel/template": { | ||||||
|  | @ -502,32 +502,32 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@fortawesome/fontawesome-common-types": { |     "@fortawesome/fontawesome-common-types": { | ||||||
|       "version": "0.2.35", |       "version": "0.2.36", | ||||||
|       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz", |       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz", | ||||||
|       "integrity": "sha512-IHUfxSEDS9dDGqYwIW7wTN6tn/O8E0n5PcAHz9cAaBoZw6UpG20IG/YM3NNLaGPwPqgjBAFjIURzqoQs3rrtuw==" |       "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==" | ||||||
|     }, |     }, | ||||||
|     "@fortawesome/fontawesome-svg-core": { |     "@fortawesome/fontawesome-svg-core": { | ||||||
|       "version": "1.2.35", |       "version": "1.2.36", | ||||||
|       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.35.tgz", |       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.36.tgz", | ||||||
|       "integrity": "sha512-uLEXifXIL7hnh2sNZQrIJWNol7cTVIzwI+4qcBIq9QWaZqUblm0IDrtSqbNg+3SQf8SMGHkiSigD++rHmCHjBg==", |       "integrity": "sha512-YUcsLQKYb6DmaJjIHdDWpBIGCcyE/W+p/LMGvjQem55Mm2XWVAP5kWTMKWLv9lwpCVjpLxPyOMOyUocP1GxrtA==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "@fortawesome/fontawesome-common-types": "^0.2.35" |         "@fortawesome/fontawesome-common-types": "^0.2.36" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@fortawesome/free-regular-svg-icons": { |     "@fortawesome/free-regular-svg-icons": { | ||||||
|       "version": "5.15.3", |       "version": "5.15.4", | ||||||
|       "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.3.tgz", |       "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.4.tgz", | ||||||
|       "integrity": "sha512-q4/p8Xehy9qiVTdDWHL4Z+o5PCLRChePGZRTXkl+/Z7erDVL8VcZUuqzJjs6gUz6czss4VIPBRdCz6wP37/zMQ==", |       "integrity": "sha512-9VNNnU3CXHy9XednJ3wzQp6SwNwT3XaM26oS4Rp391GsxVYA+0oDR2J194YCIWf7jNRCYKjUCOduxdceLrx+xw==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "@fortawesome/fontawesome-common-types": "^0.2.35" |         "@fortawesome/fontawesome-common-types": "^0.2.36" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@fortawesome/free-solid-svg-icons": { |     "@fortawesome/free-solid-svg-icons": { | ||||||
|       "version": "5.15.3", |       "version": "5.15.4", | ||||||
|       "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.3.tgz", |       "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz", | ||||||
|       "integrity": "sha512-XPeeu1IlGYqz4VWGRAT5ukNMd4VHUEEJ7ysZ7pSSgaEtNvSo+FLurybGJVmiqkQdK50OkSja2bfZXOeyMGRD8Q==", |       "integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "@fortawesome/fontawesome-common-types": "^0.2.35" |         "@fortawesome/fontawesome-common-types": "^0.2.36" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@fortawesome/vue-fontawesome": { |     "@fortawesome/vue-fontawesome": { | ||||||
|  | @ -552,6 +552,142 @@ | ||||||
|       "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", |       "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|  |     "@louislam/sqlite3": { | ||||||
|  |       "version": "5.0.3", | ||||||
|  |       "resolved": "https://registry.npmjs.org/@louislam/sqlite3/-/sqlite3-5.0.3.tgz", | ||||||
|  |       "integrity": "sha512-ZA+OAelA/JNI9bDC0oFLTKEagmG1RJCyqQievu6GNY5EaNxTfCHZJETvHkyOZK9HCPVJS4AvRmnbF4gG3WqEKw==", | ||||||
|  |       "requires": { | ||||||
|  |         "@mapbox/node-pre-gyp": "^1.0.0", | ||||||
|  |         "node-addon-api": "^3.0.0", | ||||||
|  |         "node-gyp": "7.x" | ||||||
|  |       }, | ||||||
|  |       "dependencies": { | ||||||
|  |         "lru-cache": { | ||||||
|  |           "version": "6.0.0", | ||||||
|  |           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", | ||||||
|  |           "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", | ||||||
|  |           "optional": true, | ||||||
|  |           "requires": { | ||||||
|  |             "yallist": "^4.0.0" | ||||||
|  |           } | ||||||
|  |         }, | ||||||
|  |         "node-gyp": { | ||||||
|  |           "version": "7.1.2", | ||||||
|  |           "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz", | ||||||
|  |           "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==", | ||||||
|  |           "optional": true, | ||||||
|  |           "requires": { | ||||||
|  |             "env-paths": "^2.2.0", | ||||||
|  |             "glob": "^7.1.4", | ||||||
|  |             "graceful-fs": "^4.2.3", | ||||||
|  |             "nopt": "^5.0.0", | ||||||
|  |             "npmlog": "^4.1.2", | ||||||
|  |             "request": "^2.88.2", | ||||||
|  |             "rimraf": "^3.0.2", | ||||||
|  |             "semver": "^7.3.2", | ||||||
|  |             "tar": "^6.0.2", | ||||||
|  |             "which": "^2.0.2" | ||||||
|  |           } | ||||||
|  |         }, | ||||||
|  |         "nopt": { | ||||||
|  |           "version": "5.0.0", | ||||||
|  |           "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", | ||||||
|  |           "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", | ||||||
|  |           "optional": true, | ||||||
|  |           "requires": { | ||||||
|  |             "abbrev": "1" | ||||||
|  |           } | ||||||
|  |         }, | ||||||
|  |         "rimraf": { | ||||||
|  |           "version": "3.0.2", | ||||||
|  |           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", | ||||||
|  |           "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", | ||||||
|  |           "optional": true, | ||||||
|  |           "requires": { | ||||||
|  |             "glob": "^7.1.3" | ||||||
|  |           } | ||||||
|  |         }, | ||||||
|  |         "semver": { | ||||||
|  |           "version": "7.3.5", | ||||||
|  |           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", | ||||||
|  |           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", | ||||||
|  |           "optional": true, | ||||||
|  |           "requires": { | ||||||
|  |             "lru-cache": "^6.0.0" | ||||||
|  |           } | ||||||
|  |         }, | ||||||
|  |         "which": { | ||||||
|  |           "version": "2.0.2", | ||||||
|  |           "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", | ||||||
|  |           "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", | ||||||
|  |           "optional": true, | ||||||
|  |           "requires": { | ||||||
|  |             "isexe": "^2.0.0" | ||||||
|  |           } | ||||||
|  |         }, | ||||||
|  |         "yallist": { | ||||||
|  |           "version": "4.0.0", | ||||||
|  |           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", | ||||||
|  |           "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", | ||||||
|  |           "optional": true | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "@mapbox/node-pre-gyp": { | ||||||
|  |       "version": "1.0.5", | ||||||
|  |       "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.5.tgz", | ||||||
|  |       "integrity": "sha512-4srsKPXWlIxp5Vbqz5uLfBN+du2fJChBoYn/f2h991WLdk7jUvcSk/McVLSv/X+xQIPI8eGD5GjrnygdyHnhPA==", | ||||||
|  |       "requires": { | ||||||
|  |         "detect-libc": "^1.0.3", | ||||||
|  |         "https-proxy-agent": "^5.0.0", | ||||||
|  |         "make-dir": "^3.1.0", | ||||||
|  |         "node-fetch": "^2.6.1", | ||||||
|  |         "nopt": "^5.0.0", | ||||||
|  |         "npmlog": "^4.1.2", | ||||||
|  |         "rimraf": "^3.0.2", | ||||||
|  |         "semver": "^7.3.4", | ||||||
|  |         "tar": "^6.1.0" | ||||||
|  |       }, | ||||||
|  |       "dependencies": { | ||||||
|  |         "lru-cache": { | ||||||
|  |           "version": "6.0.0", | ||||||
|  |           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", | ||||||
|  |           "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", | ||||||
|  |           "requires": { | ||||||
|  |             "yallist": "^4.0.0" | ||||||
|  |           } | ||||||
|  |         }, | ||||||
|  |         "nopt": { | ||||||
|  |           "version": "5.0.0", | ||||||
|  |           "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", | ||||||
|  |           "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", | ||||||
|  |           "requires": { | ||||||
|  |             "abbrev": "1" | ||||||
|  |           } | ||||||
|  |         }, | ||||||
|  |         "rimraf": { | ||||||
|  |           "version": "3.0.2", | ||||||
|  |           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", | ||||||
|  |           "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", | ||||||
|  |           "requires": { | ||||||
|  |             "glob": "^7.1.3" | ||||||
|  |           } | ||||||
|  |         }, | ||||||
|  |         "semver": { | ||||||
|  |           "version": "7.3.5", | ||||||
|  |           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", | ||||||
|  |           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", | ||||||
|  |           "requires": { | ||||||
|  |             "lru-cache": "^6.0.0" | ||||||
|  |           } | ||||||
|  |         }, | ||||||
|  |         "yallist": { | ||||||
|  |           "version": "4.0.0", | ||||||
|  |           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", | ||||||
|  |           "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|     "@nodelib/fs.scandir": { |     "@nodelib/fs.scandir": { | ||||||
|       "version": "2.1.5", |       "version": "2.1.5", | ||||||
|       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", |       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", | ||||||
|  | @ -579,9 +715,9 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@popperjs/core": { |     "@popperjs/core": { | ||||||
|       "version": "2.9.2", |       "version": "2.9.3", | ||||||
|       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", |       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.3.tgz", | ||||||
|       "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==" |       "integrity": "sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ==" | ||||||
|     }, |     }, | ||||||
|     "@stylelint/postcss-css-in-js": { |     "@stylelint/postcss-css-in-js": { | ||||||
|       "version": "0.37.2", |       "version": "0.37.2", | ||||||
|  | @ -811,13 +947,13 @@ | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "@vitejs/plugin-legacy": { |     "@vitejs/plugin-legacy": { | ||||||
|       "version": "1.5.0", |       "version": "1.5.1", | ||||||
|       "resolved": "https://registry.npmjs.org/@vitejs/plugin-legacy/-/plugin-legacy-1.5.0.tgz", |       "resolved": "https://registry.npmjs.org/@vitejs/plugin-legacy/-/plugin-legacy-1.5.1.tgz", | ||||||
|       "integrity": "sha512-q3F6/AEn6LNvK0ERkn0t8gzXTwPdexW4FtsIeIsCxopj02EQLtKi3XfWukU9+kjU599QouyRihvr+C2qO+0Xeg==", |       "integrity": "sha512-g+0iy0X3NJRUSKZK+OCeSxNWnCuuE/6lsmr2WLWPOEt1vp6LdfHuNCYRooCm6s0ccTZ/SiumVk8vt9DWSYs+8A==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "requires": { |       "requires": { | ||||||
|         "@babel/standalone": "^7.14.8", |         "@babel/standalone": "^7.14.9", | ||||||
|         "core-js": "^3.15.2", |         "core-js": "^3.16.0", | ||||||
|         "magic-string": "^0.25.7", |         "magic-string": "^0.25.7", | ||||||
|         "regenerator-runtime": "^0.13.9", |         "regenerator-runtime": "^0.13.9", | ||||||
|         "systemjs": "^6.10.2" |         "systemjs": "^6.10.2" | ||||||
|  | @ -830,24 +966,24 @@ | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "@vue/compiler-core": { |     "@vue/compiler-core": { | ||||||
|       "version": "3.1.1", |       "version": "3.1.5", | ||||||
|       "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.1.tgz", |       "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.5.tgz", | ||||||
|       "integrity": "sha512-Z1RO3T6AEtAUFf2EqqovFm3ohAeTvFzRtB0qUENW2nEerJfdlk13/LS1a0EgsqlzxmYfR/S/S/gW9PLbFZZxkA==", |       "integrity": "sha512-TXBhFinoBaXKDykJzY26UEuQU1K07FOp/0Ie+OXySqqk0bS0ZO7Xvl7UmiTUPYcLrWbxWBR7Bs/y55AI0MNc2Q==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "@babel/parser": "^7.12.0", |         "@babel/parser": "^7.12.0", | ||||||
|         "@babel/types": "^7.12.0", |         "@babel/types": "^7.12.0", | ||||||
|         "@vue/shared": "3.1.1", |         "@vue/shared": "3.1.5", | ||||||
|         "estree-walker": "^2.0.1", |         "estree-walker": "^2.0.1", | ||||||
|         "source-map": "^0.6.1" |         "source-map": "^0.6.1" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@vue/compiler-dom": { |     "@vue/compiler-dom": { | ||||||
|       "version": "3.1.1", |       "version": "3.1.5", | ||||||
|       "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.1.tgz", |       "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.5.tgz", | ||||||
|       "integrity": "sha512-nobRIo0t5ibzg+q8nC31m+aJhbq8FbWUoKvk6h3Vs1EqTDJaj6lBTcVTq5or8AYht7FbSpdAJ81isbJ1rWNX7A==", |       "integrity": "sha512-ZsL3jqJ52OjGU/YiT/9XiuZAmWClKInZM2aFJh9gnsAPqOrj2JIELMbkIFpVKR/CrVO/f2VxfPiiQdQTr65jcQ==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "@vue/compiler-core": "3.1.1", |         "@vue/compiler-core": "3.1.5", | ||||||
|         "@vue/shared": "3.1.1" |         "@vue/shared": "3.1.5" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@vue/compiler-sfc": { |     "@vue/compiler-sfc": { | ||||||
|  | @ -953,36 +1089,36 @@ | ||||||
|       "integrity": "sha512-44fPrrN1cqcs6bFkT0C+yxTM6PZXLbR+ESh1U1j8UD22yO04gXvxH62HApMjLbS3WqJO/iCNC+CYT+evPQh2EQ==" |       "integrity": "sha512-44fPrrN1cqcs6bFkT0C+yxTM6PZXLbR+ESh1U1j8UD22yO04gXvxH62HApMjLbS3WqJO/iCNC+CYT+evPQh2EQ==" | ||||||
|     }, |     }, | ||||||
|     "@vue/reactivity": { |     "@vue/reactivity": { | ||||||
|       "version": "3.1.1", |       "version": "3.1.5", | ||||||
|       "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.1.1.tgz", |       "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.1.5.tgz", | ||||||
|       "integrity": "sha512-DsH5woNVCcPK1M0RRYVgJEU1GJDU2ASOKpAqW3ppHk+XjoFLCbqc/26RTCgTpJYd9z8VN+79Q1u7/QqgQPbuLQ==", |       "integrity": "sha512-1tdfLmNjWG6t/CsPldh+foumYFo3cpyCHgBYQ34ylaMsJ+SNHQ1kApMIa8jN+i593zQuaw3AdWH0nJTARzCFhg==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "@vue/shared": "3.1.1" |         "@vue/shared": "3.1.5" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@vue/runtime-core": { |     "@vue/runtime-core": { | ||||||
|       "version": "3.1.1", |       "version": "3.1.5", | ||||||
|       "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.1.1.tgz", |       "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.1.5.tgz", | ||||||
|       "integrity": "sha512-GboqR02txOtkd9F3Ysd8ltPL68vTCqIx2p/J52/gFtpgb5FG9hvOAPEwFUqxeEJRu7ResvQnmdOHiEycGPCLhQ==", |       "integrity": "sha512-YQbG5cBktN1RowQDKA22itmvQ+b40f0WgQ6CXK4VYoYICAiAfu6Cc14777ve8zp1rJRGtk5oIeS149TOculrTg==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "@vue/reactivity": "3.1.1", |         "@vue/reactivity": "3.1.5", | ||||||
|         "@vue/shared": "3.1.1" |         "@vue/shared": "3.1.5" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@vue/runtime-dom": { |     "@vue/runtime-dom": { | ||||||
|       "version": "3.1.1", |       "version": "3.1.5", | ||||||
|       "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.1.1.tgz", |       "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.1.5.tgz", | ||||||
|       "integrity": "sha512-o57n/199e/BBAmLRMSXmD2r12Old/h/gf6BgL0RON1NT2pwm6MWaMY4Ul55eyq+FsDILz4jR/UgoPQ9vYB8xcw==", |       "integrity": "sha512-tNcf3JhVR0RfW0kw1p8xZgv30nvX8Y9rsz7eiQ0dHe273sfoCngAG0y4GvMaY4Xd8FsjUwFedd4suQ8Lu8meXg==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "@vue/runtime-core": "3.1.1", |         "@vue/runtime-core": "3.1.5", | ||||||
|         "@vue/shared": "3.1.1", |         "@vue/shared": "3.1.5", | ||||||
|         "csstype": "^2.6.8" |         "csstype": "^2.6.8" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@vue/shared": { |     "@vue/shared": { | ||||||
|       "version": "3.1.1", |       "version": "3.1.5", | ||||||
|       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.1.1.tgz", |       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.1.5.tgz", | ||||||
|       "integrity": "sha512-g+4pzAw7PYSjARtLBoDq6DmcblX8i9KJHSCnyM5VDDFFifUaUT9iHbFpOF/KOizQ9f7QAqU2JH3Y6aXjzUMhVA==" |       "integrity": "sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA==" | ||||||
|     }, |     }, | ||||||
|     "abbrev": { |     "abbrev": { | ||||||
|       "version": "1.1.1", |       "version": "1.1.1", | ||||||
|  | @ -1428,11 +1564,6 @@ | ||||||
|       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", |       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "bignumber.js": { |  | ||||||
|       "version": "9.0.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz", |  | ||||||
|       "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==" |  | ||||||
|     }, |  | ||||||
|     "binary-extensions": { |     "binary-extensions": { | ||||||
|       "version": "2.2.0", |       "version": "2.2.0", | ||||||
|       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", |       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", | ||||||
|  | @ -1444,15 +1575,6 @@ | ||||||
|       "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz", |       "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz", | ||||||
|       "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ=" |       "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ=" | ||||||
|     }, |     }, | ||||||
|     "block-stream": { |  | ||||||
|       "version": "0.0.9", |  | ||||||
|       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", |  | ||||||
|       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", |  | ||||||
|       "optional": true, |  | ||||||
|       "requires": { |  | ||||||
|         "inherits": "~2.0.0" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "bluebird": { |     "bluebird": { | ||||||
|       "version": "3.7.2", |       "version": "3.7.2", | ||||||
|       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", |       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", | ||||||
|  | @ -1492,9 +1614,9 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "bootstrap": { |     "bootstrap": { | ||||||
|       "version": "5.0.2", |       "version": "5.1.0", | ||||||
|       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.2.tgz", |       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.0.tgz", | ||||||
|       "integrity": "sha512-1Ge963tyEQWJJ+8qtXFU6wgmAVj9gweEjibUdbmcCEYsn38tVwRk8107rk2vzt6cfQcRr3SlZ8aQBqaD8aqf+Q==" |       "integrity": "sha512-bs74WNI9BgBo3cEovmdMHikSKoXnDgA6VQjJ7TyTotU6L7d41ZyCEEelPwkYEzsG/Zjv3ie9IE3EMAje0W9Xew==" | ||||||
|     }, |     }, | ||||||
|     "brace-expansion": { |     "brace-expansion": { | ||||||
|       "version": "1.1.11", |       "version": "1.1.11", | ||||||
|  | @ -1674,9 +1796,9 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "chownr": { |     "chownr": { | ||||||
|       "version": "1.1.4", |       "version": "2.0.0", | ||||||
|       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", |       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", | ||||||
|       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" |       "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" | ||||||
|     }, |     }, | ||||||
|     "class-utils": { |     "class-utils": { | ||||||
|       "version": "0.3.6", |       "version": "0.3.6", | ||||||
|  | @ -1823,9 +1945,9 @@ | ||||||
|       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" |       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" | ||||||
|     }, |     }, | ||||||
|     "core-js": { |     "core-js": { | ||||||
|       "version": "3.15.2", |       "version": "3.16.0", | ||||||
|       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz", |       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.0.tgz", | ||||||
|       "integrity": "sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==", |       "integrity": "sha512-5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "core-util-is": { |     "core-util-is": { | ||||||
|  | @ -1939,11 +2061,6 @@ | ||||||
|       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", |       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", | ||||||
|       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" |       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" | ||||||
|     }, |     }, | ||||||
|     "deep-extend": { |  | ||||||
|       "version": "0.6.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", |  | ||||||
|       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" |  | ||||||
|     }, |  | ||||||
|     "deep-is": { |     "deep-is": { | ||||||
|       "version": "0.1.3", |       "version": "0.1.3", | ||||||
|       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", |       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", | ||||||
|  | @ -2190,6 +2307,12 @@ | ||||||
|       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", |       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|  |     "env-paths": { | ||||||
|  |       "version": "2.2.1", | ||||||
|  |       "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", | ||||||
|  |       "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", | ||||||
|  |       "optional": true | ||||||
|  |     }, | ||||||
|     "error-ex": { |     "error-ex": { | ||||||
|       "version": "1.3.2", |       "version": "1.3.2", | ||||||
|       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", |       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", | ||||||
|  | @ -2223,9 +2346,9 @@ | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "eslint": { |     "eslint": { | ||||||
|       "version": "7.31.0", |       "version": "7.32.0", | ||||||
|       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz", |       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", | ||||||
|       "integrity": "sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA==", |       "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "requires": { |       "requires": { | ||||||
|         "@babel/code-frame": "7.12.11", |         "@babel/code-frame": "7.12.11", | ||||||
|  | @ -2318,15 +2441,15 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "eslint-plugin-vue": { |     "eslint-plugin-vue": { | ||||||
|       "version": "7.14.0", |       "version": "7.15.1", | ||||||
|       "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.14.0.tgz", |       "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.15.1.tgz", | ||||||
|       "integrity": "sha512-IW5A2Td0wEWjFGaGVEO24JNXa8cVFzAQTXrYv/Vu3zyDVS9sjwOpZY0iqub7FOkT2AK3Imtw4U4wg48pP9oWww==", |       "integrity": "sha512-4/r+n/i+ovyeW2gVRRH92kpy4lkpFbyPR4BMxGBTLtGnwqOKKzjSo6EMSaT0RhWPvEjK9uifcY8e7z5n8BIEgw==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "requires": { |       "requires": { | ||||||
|         "eslint-utils": "^2.1.0", |         "eslint-utils": "^2.1.0", | ||||||
|         "natural-compare": "^1.4.0", |         "natural-compare": "^1.4.0", | ||||||
|         "semver": "^6.3.0", |         "semver": "^6.3.0", | ||||||
|         "vue-eslint-parser": "^7.9.0" |         "vue-eslint-parser": "^7.10.0" | ||||||
|       }, |       }, | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "semver": { |         "semver": { | ||||||
|  | @ -2907,29 +3030,6 @@ | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "optional": true |       "optional": true | ||||||
|     }, |     }, | ||||||
|     "fstream": { |  | ||||||
|       "version": "1.0.12", |  | ||||||
|       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", |  | ||||||
|       "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", |  | ||||||
|       "optional": true, |  | ||||||
|       "requires": { |  | ||||||
|         "graceful-fs": "^4.1.2", |  | ||||||
|         "inherits": "~2.0.0", |  | ||||||
|         "mkdirp": ">=0.5 0", |  | ||||||
|         "rimraf": "2" |  | ||||||
|       }, |  | ||||||
|       "dependencies": { |  | ||||||
|         "mkdirp": { |  | ||||||
|           "version": "0.5.5", |  | ||||||
|           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", |  | ||||||
|           "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", |  | ||||||
|           "optional": true, |  | ||||||
|           "requires": { |  | ||||||
|             "minimist": "^1.2.5" |  | ||||||
|           } |  | ||||||
|         } |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "function-bind": { |     "function-bind": { | ||||||
|       "version": "1.1.1", |       "version": "1.1.1", | ||||||
|       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", |       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", | ||||||
|  | @ -3271,9 +3371,9 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "http-graceful-shutdown": { |     "http-graceful-shutdown": { | ||||||
|       "version": "3.1.2", |       "version": "3.1.3", | ||||||
|       "resolved": "https://registry.npmjs.org/http-graceful-shutdown/-/http-graceful-shutdown-3.1.2.tgz", |       "resolved": "https://registry.npmjs.org/http-graceful-shutdown/-/http-graceful-shutdown-3.1.3.tgz", | ||||||
|       "integrity": "sha512-2vmU3kWOsZqZy4Kn4EZp00CF+6glpNNN/NAYJPkO9bnMX/D8sRl29TsxIu9Vgyo8ygtCWazWJp720zHfqhSdXg==", |       "integrity": "sha512-o8NmJM4fS3KO8y+pCY4nY88NSNxjob+TyhzW22U155tNIxPPkTD9N2LDIhib+LbYQtuNdtXbCVxuYaoNy78ENw==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "debug": "^4.3.1" |         "debug": "^4.3.1" | ||||||
|       } |       } | ||||||
|  | @ -3324,14 +3424,6 @@ | ||||||
|       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", |       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "ignore-walk": { |  | ||||||
|       "version": "3.0.4", |  | ||||||
|       "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz", |  | ||||||
|       "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==", |  | ||||||
|       "requires": { |  | ||||||
|         "minimatch": "^3.0.4" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "import-fresh": { |     "import-fresh": { | ||||||
|       "version": "3.3.0", |       "version": "3.3.0", | ||||||
|       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", |       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", | ||||||
|  | @ -4203,7 +4295,8 @@ | ||||||
|     "minimist": { |     "minimist": { | ||||||
|       "version": "1.2.5", |       "version": "1.2.5", | ||||||
|       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", |       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", | ||||||
|       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" |       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", | ||||||
|  |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "minimist-options": { |     "minimist-options": { | ||||||
|       "version": "4.1.0", |       "version": "4.1.0", | ||||||
|  | @ -4284,17 +4377,6 @@ | ||||||
|       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", |       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", | ||||||
|       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" |       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" | ||||||
|     }, |     }, | ||||||
|     "mysql": { |  | ||||||
|       "version": "2.18.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.18.1.tgz", |  | ||||||
|       "integrity": "sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig==", |  | ||||||
|       "requires": { |  | ||||||
|         "bignumber.js": "9.0.0", |  | ||||||
|         "readable-stream": "2.3.7", |  | ||||||
|         "safe-buffer": "5.1.2", |  | ||||||
|         "sqlstring": "2.3.1" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "nanoid": { |     "nanoid": { | ||||||
|       "version": "3.1.23", |       "version": "3.1.23", | ||||||
|       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz", |       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz", | ||||||
|  | @ -4325,26 +4407,6 @@ | ||||||
|       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", |       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "needle": { |  | ||||||
|       "version": "2.6.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz", |  | ||||||
|       "integrity": "sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==", |  | ||||||
|       "requires": { |  | ||||||
|         "debug": "^3.2.6", |  | ||||||
|         "iconv-lite": "^0.4.4", |  | ||||||
|         "sax": "^1.2.4" |  | ||||||
|       }, |  | ||||||
|       "dependencies": { |  | ||||||
|         "debug": { |  | ||||||
|           "version": "3.2.7", |  | ||||||
|           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", |  | ||||||
|           "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", |  | ||||||
|           "requires": { |  | ||||||
|             "ms": "^2.1.1" |  | ||||||
|           } |  | ||||||
|         } |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "negotiator": { |     "negotiator": { | ||||||
|       "version": "0.6.2", |       "version": "0.6.2", | ||||||
|       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", |       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", | ||||||
|  | @ -4360,129 +4422,6 @@ | ||||||
|       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", |       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", | ||||||
|       "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" |       "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" | ||||||
|     }, |     }, | ||||||
|     "node-gyp": { |  | ||||||
|       "version": "3.8.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", |  | ||||||
|       "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", |  | ||||||
|       "optional": true, |  | ||||||
|       "requires": { |  | ||||||
|         "fstream": "^1.0.0", |  | ||||||
|         "glob": "^7.0.3", |  | ||||||
|         "graceful-fs": "^4.1.2", |  | ||||||
|         "mkdirp": "^0.5.0", |  | ||||||
|         "nopt": "2 || 3", |  | ||||||
|         "npmlog": "0 || 1 || 2 || 3 || 4", |  | ||||||
|         "osenv": "0", |  | ||||||
|         "request": "^2.87.0", |  | ||||||
|         "rimraf": "2", |  | ||||||
|         "semver": "~5.3.0", |  | ||||||
|         "tar": "^2.0.0", |  | ||||||
|         "which": "1" |  | ||||||
|       }, |  | ||||||
|       "dependencies": { |  | ||||||
|         "mkdirp": { |  | ||||||
|           "version": "0.5.5", |  | ||||||
|           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", |  | ||||||
|           "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", |  | ||||||
|           "optional": true, |  | ||||||
|           "requires": { |  | ||||||
|             "minimist": "^1.2.5" |  | ||||||
|           } |  | ||||||
|         }, |  | ||||||
|         "semver": { |  | ||||||
|           "version": "5.3.0", |  | ||||||
|           "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", |  | ||||||
|           "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", |  | ||||||
|           "optional": true |  | ||||||
|         }, |  | ||||||
|         "tar": { |  | ||||||
|           "version": "2.2.2", |  | ||||||
|           "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", |  | ||||||
|           "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", |  | ||||||
|           "optional": true, |  | ||||||
|           "requires": { |  | ||||||
|             "block-stream": "*", |  | ||||||
|             "fstream": "^1.0.12", |  | ||||||
|             "inherits": "2" |  | ||||||
|           } |  | ||||||
|         } |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node-pre-gyp": { |  | ||||||
|       "version": "0.11.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz", |  | ||||||
|       "integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==", |  | ||||||
|       "requires": { |  | ||||||
|         "detect-libc": "^1.0.2", |  | ||||||
|         "mkdirp": "^0.5.1", |  | ||||||
|         "needle": "^2.2.1", |  | ||||||
|         "nopt": "^4.0.1", |  | ||||||
|         "npm-packlist": "^1.1.6", |  | ||||||
|         "npmlog": "^4.0.2", |  | ||||||
|         "rc": "^1.2.7", |  | ||||||
|         "rimraf": "^2.6.1", |  | ||||||
|         "semver": "^5.3.0", |  | ||||||
|         "tar": "^4" |  | ||||||
|       }, |  | ||||||
|       "dependencies": { |  | ||||||
|         "fs-minipass": { |  | ||||||
|           "version": "1.2.7", |  | ||||||
|           "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", |  | ||||||
|           "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", |  | ||||||
|           "requires": { |  | ||||||
|             "minipass": "^2.6.0" |  | ||||||
|           } |  | ||||||
|         }, |  | ||||||
|         "minipass": { |  | ||||||
|           "version": "2.9.0", |  | ||||||
|           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", |  | ||||||
|           "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", |  | ||||||
|           "requires": { |  | ||||||
|             "safe-buffer": "^5.1.2", |  | ||||||
|             "yallist": "^3.0.0" |  | ||||||
|           } |  | ||||||
|         }, |  | ||||||
|         "minizlib": { |  | ||||||
|           "version": "1.3.3", |  | ||||||
|           "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", |  | ||||||
|           "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", |  | ||||||
|           "requires": { |  | ||||||
|             "minipass": "^2.9.0" |  | ||||||
|           } |  | ||||||
|         }, |  | ||||||
|         "mkdirp": { |  | ||||||
|           "version": "0.5.5", |  | ||||||
|           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", |  | ||||||
|           "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", |  | ||||||
|           "requires": { |  | ||||||
|             "minimist": "^1.2.5" |  | ||||||
|           } |  | ||||||
|         }, |  | ||||||
|         "nopt": { |  | ||||||
|           "version": "4.0.3", |  | ||||||
|           "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", |  | ||||||
|           "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", |  | ||||||
|           "requires": { |  | ||||||
|             "abbrev": "1", |  | ||||||
|             "osenv": "^0.1.4" |  | ||||||
|           } |  | ||||||
|         }, |  | ||||||
|         "tar": { |  | ||||||
|           "version": "4.4.13", |  | ||||||
|           "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", |  | ||||||
|           "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", |  | ||||||
|           "requires": { |  | ||||||
|             "chownr": "^1.1.1", |  | ||||||
|             "fs-minipass": "^1.2.5", |  | ||||||
|             "minipass": "^2.8.6", |  | ||||||
|             "minizlib": "^1.2.1", |  | ||||||
|             "mkdirp": "^0.5.0", |  | ||||||
|             "safe-buffer": "^5.1.2", |  | ||||||
|             "yallist": "^3.0.3" |  | ||||||
|           } |  | ||||||
|         } |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node-releases": { |     "node-releases": { | ||||||
|       "version": "1.1.73", |       "version": "1.1.73", | ||||||
|       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz", |       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz", | ||||||
|  | @ -4494,15 +4433,6 @@ | ||||||
|       "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.6.3.tgz", |       "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.6.3.tgz", | ||||||
|       "integrity": "sha512-faZFufgTMrphYoDjvyVpbpJcYzwyFnbAMmQtj1lVBYAUSm3SOy2fIdd9+Mr4UxPosBa0JRw9bJoIwQn+nswiew==" |       "integrity": "sha512-faZFufgTMrphYoDjvyVpbpJcYzwyFnbAMmQtj1lVBYAUSm3SOy2fIdd9+Mr4UxPosBa0JRw9bJoIwQn+nswiew==" | ||||||
|     }, |     }, | ||||||
|     "nopt": { |  | ||||||
|       "version": "3.0.6", |  | ||||||
|       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", |  | ||||||
|       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", |  | ||||||
|       "optional": true, |  | ||||||
|       "requires": { |  | ||||||
|         "abbrev": "1" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "normalize-package-data": { |     "normalize-package-data": { | ||||||
|       "version": "3.0.2", |       "version": "3.0.2", | ||||||
|       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz", |       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz", | ||||||
|  | @ -4559,29 +4489,6 @@ | ||||||
|       "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=", |       "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "npm-bundled": { |  | ||||||
|       "version": "1.1.2", |  | ||||||
|       "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz", |  | ||||||
|       "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==", |  | ||||||
|       "requires": { |  | ||||||
|         "npm-normalize-package-bin": "^1.0.1" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "npm-normalize-package-bin": { |  | ||||||
|       "version": "1.0.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", |  | ||||||
|       "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==" |  | ||||||
|     }, |  | ||||||
|     "npm-packlist": { |  | ||||||
|       "version": "1.4.8", |  | ||||||
|       "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", |  | ||||||
|       "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", |  | ||||||
|       "requires": { |  | ||||||
|         "ignore-walk": "^3.0.1", |  | ||||||
|         "npm-bundled": "^1.0.1", |  | ||||||
|         "npm-normalize-package-bin": "^1.0.1" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "npmlog": { |     "npmlog": { | ||||||
|       "version": "4.1.2", |       "version": "4.1.2", | ||||||
|       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", |       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", | ||||||
|  | @ -4709,25 +4616,6 @@ | ||||||
|         "word-wrap": "^1.2.3" |         "word-wrap": "^1.2.3" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "os-homedir": { |  | ||||||
|       "version": "1.0.2", |  | ||||||
|       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", |  | ||||||
|       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" |  | ||||||
|     }, |  | ||||||
|     "os-tmpdir": { |  | ||||||
|       "version": "1.0.2", |  | ||||||
|       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", |  | ||||||
|       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" |  | ||||||
|     }, |  | ||||||
|     "osenv": { |  | ||||||
|       "version": "0.1.5", |  | ||||||
|       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", |  | ||||||
|       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", |  | ||||||
|       "requires": { |  | ||||||
|         "os-homedir": "^1.0.0", |  | ||||||
|         "os-tmpdir": "^1.0.0" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "p-limit": { |     "p-limit": { | ||||||
|       "version": "2.3.0", |       "version": "2.3.0", | ||||||
|       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", |       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", | ||||||
|  | @ -5343,17 +5231,6 @@ | ||||||
|         "unpipe": "1.0.0" |         "unpipe": "1.0.0" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "rc": { |  | ||||||
|       "version": "1.2.8", |  | ||||||
|       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", |  | ||||||
|       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", |  | ||||||
|       "requires": { |  | ||||||
|         "deep-extend": "^0.6.0", |  | ||||||
|         "ini": "~1.3.0", |  | ||||||
|         "minimist": "^1.2.0", |  | ||||||
|         "strip-json-comments": "~2.0.1" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "read-pkg": { |     "read-pkg": { | ||||||
|       "version": "5.2.0", |       "version": "5.2.0", | ||||||
|       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", |       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", | ||||||
|  | @ -5443,23 +5320,22 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "redbean-node": { |     "redbean-node": { | ||||||
|       "version": "0.0.20", |       "version": "0.0.21", | ||||||
|       "resolved": "https://registry.npmjs.org/redbean-node/-/redbean-node-0.0.20.tgz", |       "resolved": "https://registry.npmjs.org/redbean-node/-/redbean-node-0.0.21.tgz", | ||||||
|       "integrity": "sha512-CcELyir3SETk3bznAcZqZgWUpxE0jWUxY6v4oHCh+MQgG/gpJQbyCC7LGA3XHHNidXGPoKbz2L2MQBqFhrUGqw==", |       "integrity": "sha512-Zi3REEOL02WvqQtVapOLqbUCQ1wGIiMjDDGwDmJfeqqRNlj/4uLpHyB3hZLt+hd5S2RaM/4J8kLY+J5uTyrHBw==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "@types/node": "^14.11.2", |         "@types/node": "^14.17.7", | ||||||
|         "await-lock": "^2.1.0", |         "await-lock": "^2.1.0", | ||||||
|         "dayjs": "^1.9.3", |         "dayjs": "^1.10.6", | ||||||
|         "glob": "^7.1.6", |         "glob": "^7.1.7", | ||||||
|         "knex": "^0.21.6", |         "knex": "^0.21.17", | ||||||
|         "mysql": "^2.18.1", |         "lodash": "^4.17.21" | ||||||
|         "sqlite3": "^5.0.0" |  | ||||||
|       }, |       }, | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "@types/node": { |         "@types/node": { | ||||||
|           "version": "14.17.3", |           "version": "14.17.9", | ||||||
|           "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz", |           "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.9.tgz", | ||||||
|           "integrity": "sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw==" |           "integrity": "sha512-CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g==" | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|  | @ -5626,14 +5502,6 @@ | ||||||
|       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", |       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "rimraf": { |  | ||||||
|       "version": "2.7.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", |  | ||||||
|       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", |  | ||||||
|       "requires": { |  | ||||||
|         "glob": "^7.1.3" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "rollup": { |     "rollup": { | ||||||
|       "version": "2.55.0", |       "version": "2.55.0", | ||||||
|       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.55.0.tgz", |       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.55.0.tgz", | ||||||
|  | @ -5671,19 +5539,14 @@ | ||||||
|       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" |       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" | ||||||
|     }, |     }, | ||||||
|     "sass": { |     "sass": { | ||||||
|       "version": "1.36.0", |       "version": "1.37.5", | ||||||
|       "resolved": "https://registry.npmjs.org/sass/-/sass-1.36.0.tgz", |       "resolved": "https://registry.npmjs.org/sass/-/sass-1.37.5.tgz", | ||||||
|       "integrity": "sha512-fQzEjipfOv5kh930nu3Imzq3ie/sGDc/4KtQMJlt7RRdrkQSfe37Bwi/Rf/gfuYHsIuE1fIlDMvpyMcEwjnPvg==", |       "integrity": "sha512-Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "requires": { |       "requires": { | ||||||
|         "chokidar": ">=3.0.0 <4.0.0" |         "chokidar": ">=3.0.0 <4.0.0" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "sax": { |  | ||||||
|       "version": "1.2.4", |  | ||||||
|       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", |  | ||||||
|       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" |  | ||||||
|     }, |  | ||||||
|     "semver": { |     "semver": { | ||||||
|       "version": "5.7.1", |       "version": "5.7.1", | ||||||
|       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", |       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", | ||||||
|  | @ -6088,21 +5951,6 @@ | ||||||
|       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", |       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "sqlite3": { |  | ||||||
|       "version": "5.0.2", |  | ||||||
|       "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.2.tgz", |  | ||||||
|       "integrity": "sha512-1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA==", |  | ||||||
|       "requires": { |  | ||||||
|         "node-addon-api": "^3.0.0", |  | ||||||
|         "node-gyp": "3.x", |  | ||||||
|         "node-pre-gyp": "^0.11.0" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "sqlstring": { |  | ||||||
|       "version": "2.3.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz", |  | ||||||
|       "integrity": "sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A=" |  | ||||||
|     }, |  | ||||||
|     "sshpk": { |     "sshpk": { | ||||||
|       "version": "1.16.1", |       "version": "1.16.1", | ||||||
|       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", |       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", | ||||||
|  | @ -6185,11 +6033,6 @@ | ||||||
|         "min-indent": "^1.0.0" |         "min-indent": "^1.0.0" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "strip-json-comments": { |  | ||||||
|       "version": "2.0.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", |  | ||||||
|       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" |  | ||||||
|     }, |  | ||||||
|     "style-search": { |     "style-search": { | ||||||
|       "version": "0.1.0", |       "version": "0.1.0", | ||||||
|       "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz", |       "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz", | ||||||
|  | @ -6546,9 +6389,9 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "tar": { |     "tar": { | ||||||
|       "version": "6.1.0", |       "version": "6.1.6", | ||||||
|       "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz", |       "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.6.tgz", | ||||||
|       "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==", |       "integrity": "sha512-oaWyu5dQbHaYcyZCTfyPpC+VmI62/OM2RTUYavTk1MDr1cwW5Boi3baeYQKiZbY2uSQJGr+iMOzb/JFxLrft+g==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "chownr": "^2.0.0", |         "chownr": "^2.0.0", | ||||||
|         "fs-minipass": "^2.0.0", |         "fs-minipass": "^2.0.0", | ||||||
|  | @ -6558,11 +6401,6 @@ | ||||||
|         "yallist": "^4.0.0" |         "yallist": "^4.0.0" | ||||||
|       }, |       }, | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "chownr": { |  | ||||||
|           "version": "2.0.0", |  | ||||||
|           "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", |  | ||||||
|           "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" |  | ||||||
|         }, |  | ||||||
|         "yallist": { |         "yallist": { | ||||||
|           "version": "4.0.0", |           "version": "4.0.0", | ||||||
|           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", |           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", | ||||||
|  | @ -6967,13 +6805,13 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "vue": { |     "vue": { | ||||||
|       "version": "3.1.1", |       "version": "3.1.5", | ||||||
|       "resolved": "https://registry.npmjs.org/vue/-/vue-3.1.1.tgz", |       "resolved": "https://registry.npmjs.org/vue/-/vue-3.1.5.tgz", | ||||||
|       "integrity": "sha512-j9fj3PNPMxo2eqOKYjMuss9XBS8ZtmczLY3kPvjcp9d3DbhyNqLYbaMQH18+1pDIzzVvQCQBvIf774LsjjqSKA==", |       "integrity": "sha512-Ho7HNb1nfDoO+HVb6qYZgeaobt1XbY6KXFe4HGs1b9X6RhkWG/113n4/SrtM1LUclM6OrP/Se5aPHHvAPG1iVQ==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "@vue/compiler-dom": "3.1.1", |         "@vue/compiler-dom": "3.1.5", | ||||||
|         "@vue/runtime-dom": "3.1.1", |         "@vue/runtime-dom": "3.1.5", | ||||||
|         "@vue/shared": "3.1.1" |         "@vue/shared": "3.1.5" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "vue-confirm-dialog": { |     "vue-confirm-dialog": { | ||||||
|  | @ -7086,7 +6924,8 @@ | ||||||
|     "yallist": { |     "yallist": { | ||||||
|       "version": "3.1.1", |       "version": "3.1.1", | ||||||
|       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", |       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", | ||||||
|       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" |       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", | ||||||
|  |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "yaml": { |     "yaml": { | ||||||
|       "version": "1.10.2", |       "version": "1.10.2", | ||||||
|  |  | ||||||
							
								
								
									
										30
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										30
									
								
								package.json
									
									
									
									
									
								
							|  | @ -24,48 +24,48 @@ | ||||||
|         "mark-as-nightly": "node extra/mark-as-nightly.js" |         "mark-as-nightly": "node extra/mark-as-nightly.js" | ||||||
|     }, |     }, | ||||||
|     "dependencies": { |     "dependencies": { | ||||||
|         "@fortawesome/fontawesome-svg-core": "^1.2.35", |         "@fortawesome/fontawesome-svg-core": "^1.2.36", | ||||||
|         "@fortawesome/free-regular-svg-icons": "^5.15.3", |         "@fortawesome/free-regular-svg-icons": "^5.15.4", | ||||||
|         "@fortawesome/free-solid-svg-icons": "^5.15.3", |         "@fortawesome/free-solid-svg-icons": "^5.15.4", | ||||||
|         "@fortawesome/vue-fontawesome": "^3.0.0-4", |         "@fortawesome/vue-fontawesome": "^3.0.0-4", | ||||||
|         "@popperjs/core": "^2.9.2", |         "@popperjs/core": "^2.9.3", | ||||||
|         "args-parser": "^1.3.0", |         "args-parser": "^1.3.0", | ||||||
|         "axios": "^0.21.1", |         "axios": "^0.21.1", | ||||||
|         "bcrypt": "^5.0.1", |         "bcrypt": "^5.0.1", | ||||||
|         "bootstrap": "^5.0.2", |         "bootstrap": "^5.1.0", | ||||||
|         "command-exists": "^1.2.9", |         "command-exists": "^1.2.9", | ||||||
|         "dayjs": "^1.10.6", |         "dayjs": "^1.10.6", | ||||||
|         "express": "^4.17.1", |         "express": "^4.17.1", | ||||||
|         "express-basic-auth": "^1.2.0", |         "express-basic-auth": "^1.2.0", | ||||||
|         "form-data": "^4.0.0", |         "form-data": "^4.0.0", | ||||||
|         "http-graceful-shutdown": "^3.1.2", |         "http-graceful-shutdown": "^3.1.3", | ||||||
|         "jsonwebtoken": "^8.5.1", |         "jsonwebtoken": "^8.5.1", | ||||||
|         "nodemailer": "^6.6.3", |         "nodemailer": "^6.6.3", | ||||||
|         "password-hash": "^1.2.2", |         "password-hash": "^1.2.2", | ||||||
|         "prom-client": "^13.1.0", |         "prom-client": "^13.1.0", | ||||||
|         "prometheus-api-metrics": "^3.2.0", |         "prometheus-api-metrics": "^3.2.0", | ||||||
|         "redbean-node": "0.0.20", |         "redbean-node": "0.0.21", | ||||||
|         "socket.io": "^4.1.3", |         "socket.io": "^4.1.3", | ||||||
|         "socket.io-client": "^4.1.3", |         "socket.io-client": "^4.1.3", | ||||||
|         "sqlite3": "^5.0.2", |         "@louislam/sqlite3": "^5.0.3", | ||||||
|         "tcp-ping": "^0.1.1", |         "tcp-ping": "^0.1.1", | ||||||
|         "v-pagination-3": "^0.1.6", |         "v-pagination-3": "^0.1.6", | ||||||
|         "vue": "^3.0.5", |         "vue": "^3.1.5", | ||||||
|         "vue-confirm-dialog": "^1.0.2", |         "vue-confirm-dialog": "^1.0.2", | ||||||
|         "vue-multiselect": "^3.0.0-alpha.2", |         "vue-multiselect": "^3.0.0-alpha.2", | ||||||
|         "vue-router": "^4.0.10", |         "vue-router": "^4.0.10", | ||||||
|         "vue-toastification": "^2.0.0-rc.1" |         "vue-toastification": "^2.0.0-rc.1" | ||||||
|     }, |     }, | ||||||
|     "devDependencies": { |     "devDependencies": { | ||||||
|         "@babel/eslint-parser": "^7.13.10", |         "@babel/eslint-parser": "^7.15.0", | ||||||
|         "@types/bootstrap": "^5.0.17", |         "@types/bootstrap": "^5.0.17", | ||||||
|         "@vitejs/plugin-legacy": "^1.5.0", |         "@vitejs/plugin-legacy": "^1.5.1", | ||||||
|         "@vitejs/plugin-vue": "^1.3.0", |         "@vitejs/plugin-vue": "^1.3.0", | ||||||
|         "@vue/compiler-sfc": "^3.1.5", |         "@vue/compiler-sfc": "^3.1.5", | ||||||
|         "core-js": "^3.15.2", |         "core-js": "^3.16.0", | ||||||
|         "eslint": "^7.31.0", |         "eslint": "^7.32.0", | ||||||
|         "eslint-plugin-vue": "^7.14.0", |         "eslint-plugin-vue": "^7.15.1", | ||||||
|         "sass": "^1.36.0", |         "sass": "^1.37.5", | ||||||
|         "stylelint": "^13.13.1", |         "stylelint": "^13.13.1", | ||||||
|         "stylelint-config-recommended": "^5.0.0", |         "stylelint-config-recommended": "^5.0.0", | ||||||
|         "stylelint-config-standard": "^22.0.0", |         "stylelint-config-standard": "^22.0.0", | ||||||
|  |  | ||||||
|  | @ -1,9 +1,8 @@ | ||||||
| const fs = require("fs"); | const fs = require("fs"); | ||||||
| const { sleep } = require("../src/util"); | const { sleep } = require("../src/util"); | ||||||
| const { R } = require("redbean-node"); | const { R } = require("redbean-node"); | ||||||
| const { | const { setSetting, setting } = require("./util-server"); | ||||||
|     setSetting, setting, | const knex = require("knex"); | ||||||
| } = require("./util-server"); |  | ||||||
| 
 | 
 | ||||||
| class Database { | class Database { | ||||||
| 
 | 
 | ||||||
|  | @ -12,6 +11,24 @@ class Database { | ||||||
|     static latestVersion = 6; |     static latestVersion = 6; | ||||||
|     static noReject = true; |     static noReject = true; | ||||||
| 
 | 
 | ||||||
|  |     static connect() { | ||||||
|  |         const Dialect = require("knex/lib/dialects/sqlite3/index.js"); | ||||||
|  |         Dialect.prototype._driver = () => require("@louislam/sqlite3"); | ||||||
|  | 
 | ||||||
|  |         R.setup(knex({ | ||||||
|  |             client: Dialect, | ||||||
|  |             connection: { | ||||||
|  |                 filename: Database.path, | ||||||
|  |             }, | ||||||
|  |             useNullAsDefault: true, | ||||||
|  |             pool: { | ||||||
|  |                 min: 1, | ||||||
|  |                 max: 1, | ||||||
|  |                 idleTimeoutMillis: 30000, | ||||||
|  |             } | ||||||
|  |         })); | ||||||
|  |     } | ||||||
|  | 
 | ||||||
|     static async patch() { |     static async patch() { | ||||||
|         let version = parseInt(await setting("database_version")); |         let version = parseInt(await setting("database_version")); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -650,9 +650,7 @@ async function initDatabase() { | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     console.log("Connecting to Database") |     console.log("Connecting to Database") | ||||||
|     R.setup("sqlite", { |     Database.connect(); | ||||||
|         filename: Database.path, |  | ||||||
|     }); |  | ||||||
|     console.log("Connected") |     console.log("Connected") | ||||||
| 
 | 
 | ||||||
|     // Patch the database
 |     // Patch the database
 | ||||||
|  |  | ||||||
|  | @ -99,7 +99,7 @@ export default { | ||||||
| .list { | .list { | ||||||
|     margin-top: 25px; |     margin-top: 25px; | ||||||
|     height: auto; |     height: auto; | ||||||
|     min-height: calc(100vh - 200px); |     min-height: calc(100vh - 240px); | ||||||
| 
 | 
 | ||||||
|     .item { |     .item { | ||||||
|         display: block; |         display: block; | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue