From: Chris Duncan Date: Tue, 31 Mar 2026 10:12:03 +0000 (-0700) Subject: Fix organization of vault worker bundle build. X-Git-Url: https://git.codecow.com/?a=commitdiff_plain;h=5d42d5d9c43bdfcae3323bf1b92caad58def78da;p=libnemo.git Fix organization of vault worker bundle build. --- diff --git a/esbuild/config.mjs b/esbuild/config.mjs index 7305ce5..92f5b05 100644 --- a/esbuild/config.mjs +++ b/esbuild/config.mjs @@ -1,7 +1,7 @@ //! SPDX-FileCopyrightText: 2025 Chris Duncan //! SPDX-License-Identifier: GPL-3.0-or-later -import { browserVaultWorker, nodeVaultWorker } from './vault.mjs' +import { browserVaultWorker, nodeVaultWorker } from './inject/vault-worker.mjs' /** * @type {import('esbuild').BuildOptions} @@ -29,7 +29,9 @@ export const browserOptions = { entryPoints: [ { in: './src/main.ts', out: 'browser.min' } ], - inject: ['./esbuild/inject/buffer.mjs'], + inject: [ + './esbuild/inject/buffer.mjs' + ], define: { 'VAULT_WORKER': browserVaultWorker } @@ -47,7 +49,9 @@ export const nodeOptions = { { in: './src/main.ts', out: 'nodejs.min' } ], external: ['node:worker_threads'], - inject: ['./esbuild/inject/fake-indexeddb.mjs'], + inject: [ + './esbuild/inject/fake-indexeddb.mjs' + ], define: { 'VAULT_WORKER': nodeVaultWorker } diff --git a/esbuild/vault.mjs b/esbuild/inject/vault-worker.mjs similarity index 100% rename from esbuild/vault.mjs rename to esbuild/inject/vault-worker.mjs diff --git a/esbuild/vault/build.mjs b/esbuild/vault/build.mjs deleted file mode 100644 index bbaf291..0000000 --- a/esbuild/vault/build.mjs +++ /dev/null @@ -1,31 +0,0 @@ -//! SPDX-FileCopyrightText: 2025 Chris Duncan -//! SPDX-License-Identifier: GPL-3.0-or-later - -import { build } from 'esbuild' -import { writeFile } from 'node:fs/promises' - -/** - * @type import('esbuild').BuildOptions - */ -const options = { - entryPoints: [ - './esbuild/vault/dependencies.ts' - ], - bundle: true, - write: false, - platform: 'browser', - target: 'es2024', - legalComments: 'inline', - format: 'esm', - minify: true, - sourcemap: false, - outfile: './src/lib/vault/dependencies.ts' -} -// NODE: options.platform = 'node' -// BROWSER: options.platform = 'browser' -const dependencies = (await build(options)).outputFiles?.[0].text - -await writeFile( - './src/lib/vault/dependencies.ts', - `export const vaultDependencies = ${JSON.stringify(dependencies)}` -) diff --git a/esbuild/vault/dependencies.ts b/esbuild/vault/dependencies.ts deleted file mode 100644 index 4c830ec..0000000 --- a/esbuild/vault/dependencies.ts +++ /dev/null @@ -1,4 +0,0 @@ -//! SPDX-FileCopyrightText: 2025 Chris Duncan -//! SPDX-License-Identifier: GPL-3.0-or-later - -export * as nano25519 from 'nano25519'