Browse Source

install correct bcrypt, move eslint to dev modules

pull/1250/head
Bernd Storath 10 months ago
parent
commit
74f327f332
  1. 1
      Dockerfile
  2. 5
      src/nuxt.config.ts
  3. 4
      src/package.json
  4. 40
      src/pnpm-lock.yaml
  5. 2
      src/utils/password.ts

1
Dockerfile

@ -47,6 +47,7 @@ RUN update-alternatives --install /sbin/iptables iptables /sbin/iptables-legacy
# Set Environment # Set Environment
ENV DEBUG=Server,WireGuard ENV DEBUG=Server,WireGuard
ENV PORT=51821
# Run Web UI # Run Web UI
WORKDIR /app WORKDIR /app

5
src/nuxt.config.ts

@ -2,5 +2,8 @@
export default defineNuxtConfig({ export default defineNuxtConfig({
compatibilityDate: '2024-04-03', compatibilityDate: '2024-04-03',
devtools: { enabled: true }, devtools: { enabled: true },
modules: ["@nuxtjs/i18n", "@nuxtjs/tailwindcss", "@nuxt/eslint"] modules: ["@nuxtjs/i18n", "@nuxtjs/tailwindcss"],
$development: {
modules: ["@nuxt/eslint"]
}
}) })

4
src/package.json

@ -18,7 +18,7 @@
"dependencies": { "dependencies": {
"@nuxtjs/i18n": "^8.3.3", "@nuxtjs/i18n": "^8.3.3",
"@nuxtjs/tailwindcss": "^6.12.1", "@nuxtjs/tailwindcss": "^6.12.1",
"bcrypt": "^5.1.1", "bcryptjs": "^2.4.3",
"debug": "^4.3.6", "debug": "^4.3.6",
"nuxt": "^3.12.4", "nuxt": "^3.12.4",
"qrcode": "^1.5.3", "qrcode": "^1.5.3",
@ -26,7 +26,7 @@
}, },
"devDependencies": { "devDependencies": {
"@nuxt/eslint": "^0.5.0", "@nuxt/eslint": "^0.5.0",
"@types/bcrypt": "^5.0.2", "@types/bcryptjs": "^2.4.6",
"@types/debug": "^4.1.12", "@types/debug": "^4.1.12",
"@types/qrcode": "^1.5.5", "@types/qrcode": "^1.5.5",
"eslint": "^9.8.0", "eslint": "^9.8.0",

40
src/pnpm-lock.yaml

@ -14,9 +14,9 @@ importers:
'@nuxtjs/tailwindcss': '@nuxtjs/tailwindcss':
specifier: ^6.12.1 specifier: ^6.12.1
version: 6.12.1([email protected])([email protected]) version: 6.12.1([email protected])([email protected])
bcrypt: bcryptjs:
specifier: ^5.1.1 specifier: ^2.4.3
version: 5.1.1 version: 2.4.3
debug: debug:
specifier: ^4.3.6 specifier: ^4.3.6
version: 4.3.6 version: 4.3.6
@ -33,9 +33,9 @@ importers:
'@nuxt/eslint': '@nuxt/eslint':
specifier: ^0.5.0 specifier: ^0.5.0
version: 0.5.0([email protected])([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])) version: 0.5.0([email protected])([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected]))
'@types/bcrypt': '@types/bcryptjs':
specifier: ^5.0.2 specifier: ^2.4.6
version: 5.0.2 version: 2.4.6
'@types/debug': '@types/debug':
specifier: ^4.1.12 specifier: ^4.1.12
version: 4.1.12 version: 4.1.12
@ -49,7 +49,7 @@ importers:
specifier: ^5.5.4 specifier: ^5.5.4
version: 5.5.4 version: 5.5.4
vue-tsc: vue-tsc:
specifier: ^2 specifier: ^2.0.29
version: 2.0.29([email protected]) version: 2.0.29([email protected])
packages: packages:
@ -1205,8 +1205,8 @@ packages:
resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==} resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
engines: {node: '>=10.13.0'} engines: {node: '>=10.13.0'}
'@types/bcrypt@5.0.2': '@types/bcrypt[email protected]':
resolution: {integrity: sha512-6atioO8Y75fNcbmj0G7UjI9lXN2pQ/IGJ2FWT4a/btd0Lk9lQalHLKhkgKVZ3r+spnmWUKfbMi1GEe9wyHQfNQ==} resolution: {integrity: sha512-9xlo6R2qDs5uixm0bcIqCeMCE6HiQsIyel9KQySStiyqNl2tnj2mP3DX1Nf56MD6KMenNNlBBsy3LJ7gUEQPXQ==}
'@types/[email protected]': '@types/[email protected]':
resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==} resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
@ -1592,9 +1592,8 @@ packages:
[email protected]: [email protected]:
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
[email protected]: [email protected]:
resolution: {integrity: sha512-AGBHOG5hPYZ5Xl9KXzU5iKq9516yEmvCKDg3ecP5kX2aB6UqTeXZxk2ELnDgDm6BQSMlLt9rDB4LoSMx0rYwww==} resolution: {integrity: sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==}
engines: {node: '>= 10.0.0'}
[email protected]: [email protected]:
resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
@ -3032,9 +3031,6 @@ packages:
xml2js: xml2js:
optional: true optional: true
[email protected]:
resolution: {integrity: sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==}
[email protected]: [email protected]:
resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==} resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
@ -5680,9 +5676,7 @@ snapshots:
'@trysound/[email protected]': {} '@trysound/[email protected]': {}
'@types/[email protected]': '@types/[email protected]': {}
dependencies:
'@types/node': 22.0.2
'@types/[email protected]': '@types/[email protected]':
dependencies: dependencies:
@ -6192,13 +6186,7 @@ snapshots:
[email protected]: {} [email protected]: {}
[email protected]: [email protected]: {}
dependencies:
'@mapbox/node-pre-gyp': 1.0.11
node-addon-api: 5.1.0
transitivePeerDependencies:
- encoding
- supports-color
[email protected]: {} [email protected]: {}
@ -7800,8 +7788,6 @@ snapshots:
- supports-color - supports-color
- uWebSockets.js - uWebSockets.js
[email protected]: {}
[email protected]: {} [email protected]: {}
[email protected]: {} [email protected]: {}

2
src/utils/password.ts

@ -1,4 +1,4 @@
import bcrypt from 'bcrypt'; import bcrypt from 'bcryptjs';
import { PASSWORD_HASH } from "~/utils/config"; import { PASSWORD_HASH } from "~/utils/config";

Loading…
Cancel
Save