Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Add JS bundler to AliasVault.Client (#1493)

Leendert de Borstad19256d006a
diff --git a/.gitignore b/.gitignore
index ed283abe0..7f0f8d51b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -446,3 +446,6 @@ apps/browser-extension/src/utils/dist/core/rust
# Server .NET bindings (built by: cd core/rust && ./build.sh --server)
apps/server/Utilities/AliasVault.RustCore/
apps/server/AliasVault.Client/wwwroot/wasm
+
+# Client JS bundle (built by: npm run build:js in apps/server/AliasVault.Client)
+apps/server/AliasVault.Client/wwwroot/js/bundle.min.js
diff --git a/apps/server/AliasVault.Client/AliasVault.Client.csproj b/apps/server/AliasVault.Client/AliasVault.Client.csproj
index 17954128c..0448e1932 100644
--- a/apps/server/AliasVault.Client/AliasVault.Client.csproj
+++ b/apps/server/AliasVault.Client/AliasVault.Client.csproj
@@ -45,6 +45,14 @@
</Task>
</UsingTask>
+ <Target Name="NpmInstall" BeforeTargets="NpmBuild" Condition="!Exists('node_modules')">
+ <Exec Command="npm install" WorkingDirectory="$(ProjectDir)" />
+ </Target>
+
+ <Target Name="NpmBuild" BeforeTargets="GenerateCacheBustedIndexHtml">
+ <Exec Command="npm run build:js" WorkingDirectory="$(ProjectDir)" />
+ </Target>
+
<Target Name="GenerateCacheBustedIndexHtml" BeforeTargets="Build">
<ReplaceText InputFile="wwwroot/index.template.html" OutputFile="wwwroot/index.html" CacheBuster="$(CacheBuster)" BuildVersion="$(BuildVersion)" />
</Target>
diff --git a/apps/server/AliasVault.Client/package-lock.json b/apps/server/AliasVault.Client/package-lock.json
index 715c4d53f..b382b1d3f 100644
--- a/apps/server/AliasVault.Client/package-lock.json
+++ b/apps/server/AliasVault.Client/package-lock.json
@@ -12,6 +12,9 @@
"autoprefixer": "^10.4.19",
"postcss": "^8.4.38",
"tailwindcss": "^3.4.3"
+ },
+ "devDependencies": {
+ "esbuild": "^0.24.0"
}
},
"node_modules/@alloc/quick-lru": {
@@ -25,6 +28,431 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/@esbuild/aix-ppc64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz",
+ "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "aix"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/android-arm": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz",
+ "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/android-arm64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz",
+ "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/android-x64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz",
+ "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/darwin-arm64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz",
+ "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/darwin-x64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz",
+ "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/freebsd-arm64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz",
+ "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/freebsd-x64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz",
+ "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-arm": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz",
+ "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-arm64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz",
+ "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-ia32": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz",
+ "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-loong64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz",
+ "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==",
+ "cpu": [
+ "loong64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-mips64el": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz",
+ "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==",
+ "cpu": [
+ "mips64el"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-ppc64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz",
+ "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-riscv64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz",
+ "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-s390x": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz",
+ "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-x64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz",
+ "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/netbsd-arm64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz",
+ "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "netbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/netbsd-x64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz",
+ "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "netbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/openbsd-arm64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz",
+ "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "openbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/openbsd-x64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz",
+ "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "openbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/sunos-x64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz",
+ "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "sunos"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/win32-arm64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz",
+ "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/win32-ia32": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz",
+ "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/win32-x64": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz",
+ "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
"node_modules/@isaacs/cliui": {
"version": "8.0.2",
"resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -406,6 +834,47 @@
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
},
+ "node_modules/esbuild": {
+ "version": "0.24.2",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz",
+ "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
+ "dev": true,
+ "hasInstallScript": true,
+ "license": "MIT",
+ "bin": {
+ "esbuild": "bin/esbuild"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "optionalDependencies": {
+ "@esbuild/aix-ppc64": "0.24.2",
+ "@esbuild/android-arm": "0.24.2",
+ "@esbuild/android-arm64": "0.24.2",
+ "@esbuild/android-x64": "0.24.2",
+ "@esbuild/darwin-arm64": "0.24.2",
+ "@esbuild/darwin-x64": "0.24.2",
+ "@esbuild/freebsd-arm64": "0.24.2",
+ "@esbuild/freebsd-x64": "0.24.2",
+ "@esbuild/linux-arm": "0.24.2",
+ "@esbuild/linux-arm64": "0.24.2",
+ "@esbuild/linux-ia32": "0.24.2",
+ "@esbuild/linux-loong64": "0.24.2",
+ "@esbuild/linux-mips64el": "0.24.2",
+ "@esbuild/linux-ppc64": "0.24.2",
+ "@esbuild/linux-riscv64": "0.24.2",
+ "@esbuild/linux-s390x": "0.24.2",
+ "@esbuild/linux-x64": "0.24.2",
+ "@esbuild/netbsd-arm64": "0.24.2",
+ "@esbuild/netbsd-x64": "0.24.2",
+ "@esbuild/openbsd-arm64": "0.24.2",
+ "@esbuild/openbsd-x64": "0.24.2",
+ "@esbuild/sunos-x64": "0.24.2",
+ "@esbuild/win32-arm64": "0.24.2",
+ "@esbuild/win32-ia32": "0.24.2",
+ "@esbuild/win32-x64": "0.24.2"
+ }
+ },
"node_modules/escalade": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
diff --git a/apps/server/AliasVault.Client/package.json b/apps/server/AliasVault.Client/package.json
index 12421d407..83333e8d2 100644
--- a/apps/server/AliasVault.Client/package.json
+++ b/apps/server/AliasVault.Client/package.json
@@ -5,7 +5,10 @@
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
- "build:client-css": "tailwindcss -i ./tailwind.css -o ./wwwroot/css/tailwind.css --watch"
+ "build:client-css": "tailwindcss -i ./tailwind.css -o ./wwwroot/css/tailwind.css --watch",
+ "build:js": "node scripts/bundle-js.mjs",
+ "build:js:watch": "node scripts/bundle-js.mjs --watch",
+ "build": "npm run build:js && tailwindcss -i ./tailwind.css -o ./wwwroot/css/tailwind.css --minify"
},
"keywords": [],
"author": "",
@@ -14,5 +17,8 @@
"autoprefixer": "^10.4.19",
"postcss": "^8.4.38",
"tailwindcss": "^3.4.3"
+ },
+ "devDependencies": {
+ "esbuild": "^0.24.0"
}
}
diff --git a/apps/server/AliasVault.Client/scripts/bundle-js.mjs b/apps/server/AliasVault.Client/scripts/bundle-js.mjs
new file mode 100644
index 000000000..5b82e4a59
--- /dev/null
+++ b/apps/server/AliasVault.Client/scripts/bundle-js.mjs
@@ -0,0 +1,90 @@
+/**
+ * Bundle and minify JavaScript files for AliasVault.Client
+ * Uses esbuild to concatenate and minify global scripts that attach to window object.
+ */
+import * as esbuild from 'esbuild';
+import * as fs from 'fs';
+import * as path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const isWatch = process.argv.includes('--watch');
+const isDev = process.argv.includes('--dev');
+
+// Files to bundle (order matters - dependencies first)
+const inputFiles = [
+ 'wwwroot/js/encryption-utils.js',
+ 'wwwroot/js/utilities.js',
+ 'wwwroot/lib/qrcode.min.js',
+ 'wwwroot/js/rustCoreInterop.js',
+];
+
+const outputFile = 'wwwroot/js/bundle.min.js';
+const rootDir = path.resolve(__dirname, '..');
+
+async function build() {
+ // Read and concatenate all input files
+ let concatenated = '';
+ for (const file of inputFiles) {
+ const filePath = path.join(rootDir, file);
+ const content = fs.readFileSync(filePath, 'utf-8');
+ concatenated += `// Source: ${file}\n${content}\n\n`;
+ }
+
+ // Write concatenated file to temp location
+ const tempFile = path.join(rootDir, 'wwwroot/js/.bundle-temp.js');
+ fs.writeFileSync(tempFile, concatenated);
+
+ try {
+ // Use esbuild to minify
+ const result = await esbuild.build({
+ entryPoints: [tempFile],
+ outfile: path.join(rootDir, outputFile),
+ bundle: false,
+ minify: !isDev,
+ sourcemap: isDev ? 'inline' : false,
+ target: 'es2020',
+ write: true,
+ });
+
+ console.log(`✓ Bundled ${inputFiles.length} files to ${outputFile}${isDev ? ' (dev mode)' : ''}`);
+
+ if (result.warnings.length > 0) {
+ console.warn('Warnings:', result.warnings);
+ }
+ } finally {
+ // Clean up temp file
+ if (fs.existsSync(tempFile)) {
+ fs.unlinkSync(tempFile);
+ }
+ }
+}
+
+async function watch() {
+ console.log('Watching for changes...');
+
+ // Initial build
+ await build();
+
+ // Watch input files
+ for (const file of inputFiles) {
+ const filePath = path.join(rootDir, file);
+ fs.watch(filePath, async (eventType) => {
+ if (eventType === 'change') {
+ console.log(`\nFile changed: ${file}`);
+ await build();
+ }
+ });
+ }
+}
+
+if (isWatch) {
+ watch().catch(console.error);
+} else {
+ build().catch((err) => {
+ console.error(err);
+ process.exit(1);
+ });
+}
diff --git a/apps/server/AliasVault.Client/wwwroot/index.template.html b/apps/server/AliasVault.Client/wwwroot/index.template.html
index ec6620ef4..0f3e61ef1 100644
--- a/apps/server/AliasVault.Client/wwwroot/index.template.html
+++ b/apps/server/AliasVault.Client/wwwroot/index.template.html
@@ -31,7 +31,6 @@
<link rel="manifest" href="manifest.json" />
<link rel="apple-touch-icon" sizes="500x500" href="img/icon-500.png" />
<link rel="apple-touch-icon" sizes="192x192" href="img/icon-192.png" />
- <!-- Preload Rust WASM module for faster initialization -->
<link rel="preload" href="/wasm/aliasvault_core_bg.wasm?v=@CacheBuster" as="fetch" type="application/wasm" crossorigin />
<link rel="modulepreload" href="/wasm/aliasvault_core.js?v=@CacheBuster" />
</head>
@@ -143,13 +142,12 @@
</div>
<script>
- // Pre-loading localization system with JSON loading
let translations = {};
function getCurrentLanguage() {
return localStorage.getItem('blazorCulture') ||
localStorage.getItem('AppLanguage') ||
- (navigator.language.split('-')[0] === 'nl' ? 'nl' : 'en');
+ 'en';
}
async function loadTranslations() {
@@ -200,35 +198,22 @@
}
function localizeContent() {
- // Localize main loading screen
- const loadingTitle = document.getElementById('loading-title');
- const loadingMessage = document.getElementById('loading-message');
- if (loadingTitle) {
- loadingTitle.textContent = getTranslation('loading.title');
- }
- if (loadingMessage) {
- loadingMessage.textContent = getTranslation('loading.message');
- }
-
- // Localize refresh button section
- const refreshText = document.getElementById('refresh-text');
- const refreshButtonText = document.getElementById('refresh-button-text');
- if (refreshText) {
- refreshText.textContent = getTranslation('loading.refreshText');
- }
- if (refreshButtonText) {
- refreshButtonText.textContent = getTranslation('loading.refreshButtonText');
- }
-
- // Localize error section
- const unhandledErrorText = document.getElementById('unhandled-error-text');
- const reloadPageText = document.getElementById('reload-page-text');
- if (unhandledErrorText) {
- unhandledErrorText.textContent = getTranslation('errors.unhandledError');
- }
- if (reloadPageText) {
- reloadPageText.textContent = getTranslation('errors.reloadPageText');
- }
+ // Localize loading screen
+ const localizations = [
+ { id: 'loading-title', key: 'loading.title' },
+ { id: 'loading-message', key: 'loading.message' },
+ { id: 'refresh-text', key: 'loading.refreshText' },
+ { id: 'refresh-button-text', key: 'loading.refreshButtonText' },
+ { id: 'unhandled-error-text', key: 'errors.unhandledError' },
+ { id: 'reload-page-text', key: 'errors.reloadPageText' }
+ ];
+
+ localizations.forEach(({ id, key }) => {
+ const element = document.getElementById(id);
+ if (element) {
+ element.textContent = getTranslation(key);
+ }
+ });
// Set random security quote
const securityQuotes = getTranslation('quotes.security');
@@ -241,13 +226,11 @@
}
}
- // Initialize localization
async function initializeLocalization() {
await loadTranslations();
localizeContent();
}
- // Apply localization immediately
document.addEventListener('DOMContentLoaded', initializeLocalization);
if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', initializeLocalization);
@@ -260,6 +243,7 @@
const minDisplayTime = 1000;
const checkInterval = 500;
const refreshButtonTimeout = 300000;
+ const scriptsCheckTimeout = 5000; // Check for blocked scripts after 5 seconds
const appElement = document.getElementById('app');
const refreshButton = document.getElementById('refresh-button');
@@ -305,54 +289,37 @@
document.querySelector('.loading-progress-text').classList.add('hidden');
document.querySelector('svg.animate-spin').classList.add('hidden');
};
-
- // Listen for unhandled errors
window.addEventListener('error', function(event) {
if (event.error && event.error.message && event.error.message.includes('WebAssembly')) {
showError(getTranslation('errors.webAssemblyError'));
}
});
-
- // Listen for unhandled promise rejections
window.addEventListener('unhandledrejection', function(event) {
if (event.reason && event.reason.message && event.reason.message.includes('WebAssembly')) {
showError(getTranslation('errors.webAssemblyError'));
}
});
-
window.addEventListener('load', manageLoadingScreen);
- </script>
-
- <script>
window.blazorCulture = {
get: function() {
return localStorage.getItem('blazorCulture') ||
localStorage.getItem('AppLanguage') ||
- (navigator.language.split('-')[0] === 'nl' ? 'nl' : 'en');
+ 'en';
},
set: function(culture) {
localStorage.setItem('blazorCulture', culture);
}
};
- </script>
-
- <script>window.__CACHE_BUSTER__ = '@CacheBuster';</script>
- <script src="js/crypto.js?v=@CacheBuster" async></script>
- <script src="js/utilities.js?v=@CacheBuster" async></script>
- <script src="js/rustCoreInterop.js?v=@CacheBuster"></script>
- <script>
- // Start WASM initialization early (non-blocking)
+ window.__CACHE_BUSTER__ = '@CacheBuster';
if (typeof window.rustCoreIsAvailable === 'function') {
window.rustCoreIsAvailable().catch(() => {});
}
- </script>
- <script src="_framework/blazor.webassembly.js?v=@CacheBuster" async></script>
- <script src="lib/qrcode.min.js?v=@CacheBuster" defer></script>
- <script>
if ('serviceWorker' in navigator) {
navigator.serviceWorker.register('service-worker.js');
}
</script>
+ <script src="js/bundle.min.js?v=@CacheBuster"></script>
+ <script src="_framework/blazor.webassembly.js?v=@CacheBuster" async></script>
</body>
</html>
diff --git a/apps/server/AliasVault.Client/wwwroot/js/crypto.js b/apps/server/AliasVault.Client/wwwroot/js/encryption-utils.js
similarity index 100%
rename from apps/server/AliasVault.Client/wwwroot/js/crypto.js
rename to apps/server/AliasVault.Client/wwwroot/js/encryption-utils.js