From: Chris Duncan Date: Mon, 10 Mar 2025 01:59:16 +0000 (-0700) Subject: Merge v3.0.1 changes. X-Git-Url: https://zoso.dev/?a=commitdiff_plain;h=refs%2Fheads%2Fnext%2Fcpu;p=nano-pow.git Merge v3.0.1 changes. --- diff --git a/esbuild.mjs b/esbuild.mjs index 3a5d93b..2ccecf6 100644 --- a/esbuild.mjs +++ b/esbuild.mjs @@ -1,18 +1,19 @@ -// SPDX-FileCopyrightText: 2025 Chris Duncan -// SPDX-License-Identifier: GPL-3.0-or-later +//! SPDX-FileCopyrightText: 2025 Chris Duncan +//! SPDX-License-Identifier: GPL-3.0-or-later import { build } from 'esbuild' import { glsl } from "esbuild-plugin-glsl" await build({ + bundle: true, + platform: 'browser', entryPoints: [ { out: 'main.min', in: './src/main.js' } ], + format: 'esm', + legalComments: 'inline', outdir: 'dist', target: 'esnext', - format: 'esm', - platform: 'browser', - bundle: true, plugins: [ glsl({ minify: true diff --git a/package-lock.json b/package-lock.json index 6f9d8ca..08afcab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,19 +1,19 @@ { "name": "nano-pow", - "version": "3.0.0", + "version": "3.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nano-pow", - "version": "3.0.0", + "version": "3.0.1", "license": "(GPL-3.0-or-later AND MIT)", "devDependencies": { - "@types/node": "^22.13.8", - "@webgpu/types": "^0.1.54", + "@types/node": "^22.13.10", + "@webgpu/types": "^0.1.55", "assemblyscript": "^0.27.34", "esbuild": "^0.25.0", - "esbuild-plugin-glsl": "^1.2.2", + "esbuild-plugin-glsl": "^1.2.3", "typescript": "^5.8.2" }, "funding": { @@ -447,9 +447,9 @@ } }, "node_modules/@types/node": { - "version": "22.13.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.8.tgz", - "integrity": "sha512-G3EfaZS+iOGYWLLRCEAXdWK9my08oHNZ+FHluRiggIYJPOXzhOiDgpVCUHaUvyIC5/fj7C/p637jdzC666AOKQ==", + "version": "22.13.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz", + "integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==", "dev": true, "license": "MIT", "dependencies": { @@ -457,9 +457,9 @@ } }, "node_modules/@webgpu/types": { - "version": "0.1.54", - "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.54.tgz", - "integrity": "sha512-81oaalC8LFrXjhsczomEQ0u3jG+TqE6V9QHLA8GNZq/Rnot0KDugu3LhSYSlie8tSdooAN1Hov05asrUUp9qgg==", + "version": "0.1.55", + "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.55.tgz", + "integrity": "sha512-p97I8XEC1h04esklFqyIH+UhFrUcj8/1/vBWgc6lAK4jMJc+KbhUy8D4dquHYztFj6pHLqGcp/P1xvBBF4r3DA==", "dev": true, "license": "BSD-3-Clause" }, @@ -539,13 +539,13 @@ } }, "node_modules/esbuild-plugin-glsl": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/esbuild-plugin-glsl/-/esbuild-plugin-glsl-1.2.2.tgz", - "integrity": "sha512-HqRe6qf+9q3U4ugce7EXnXf+c+bRGZZWNkUSiJBYCKRLkA5ThhklNxlc1Z/rcBM8DIAKAdZGk+j6nTBaA5SV6A==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/esbuild-plugin-glsl/-/esbuild-plugin-glsl-1.2.3.tgz", + "integrity": "sha512-PUM4rGm0ZBZI46Q9sF7XNZqEhVX1aa8Pxnh+kWPDMyeY7CPO4oEeC4wmKeTBmQekMuiRDB/tdAr0K79ZUbnmtQ==", "dev": true, "license": "Zlib", "engines": { - "node": ">= 0.10.18" + "node": ">=18" }, "peerDependencies": { "esbuild": "0.x.x" diff --git a/package.json b/package.json index fc2b7e4..071389b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nano-pow", - "version": "3.0.0", + "version": "3.0.1", "description": "Proof-of-work generation and validation with WebGPU/WebGL for Nano cryptocurrency.", "keywords": [ "nemo", @@ -40,15 +40,16 @@ "url": "git+https://zoso.dev/nano-pow.git" }, "scripts": { - "build": "rm -rf types && tsc && node esbuild.mjs && cp types.d.ts dist", - "asbuild": "asc src/shaders/cpu-hash.ts --target release" + "build": "rm -rf {dist,types} && tsc && node esbuild.mjs && npm run fix-copyright && cp types.d.ts dist", + "asbuild": "asc src/shaders/cpu-hash.ts --target release", + "fix-copyright": "sed -i '/\\/\\/ src\\/shaders\\/compute\\.wgsl/a //! SPDX-FileCopyrightText: 2025 Chris Duncan \\n//! SPDX-License-Identifier: GPL-3.0-or-later' dist/main.min.js" }, "devDependencies": { - "@types/node": "^22.13.8", - "@webgpu/types": "^0.1.54", + "@types/node": "^22.13.10", + "@webgpu/types": "^0.1.55", "assemblyscript": "^0.27.34", "esbuild": "^0.25.0", - "esbuild-plugin-glsl": "^1.2.2", + "esbuild-plugin-glsl": "^1.2.3", "typescript": "^5.8.2" }, "type": "module", diff --git a/src/classes/gl.ts b/src/classes/gl.ts index 520ab89..e1b2ff9 100644 --- a/src/classes/gl.ts +++ b/src/classes/gl.ts @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2025 Chris Duncan -// SPDX-FileContributor: Ben Green -// SPDX-License-Identifier: GPL-3.0-or-later AND MIT +//! SPDX-FileCopyrightText: 2025 Chris Duncan +//! SPDX-FileContributor: Ben Green +//! SPDX-License-Identifier: GPL-3.0-or-later AND MIT import { NanoPowGlDownsampleShader, NanoPowGlDrawShader, NanoPowGlVertexShader } from '../shaders' import type { FBO, NanoPowOptions } from '../../types.d.ts' diff --git a/src/classes/gpu.ts b/src/classes/gpu.ts index b00e727..3c60596 100644 --- a/src/classes/gpu.ts +++ b/src/classes/gpu.ts @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2025 Chris Duncan -// SPDX-License-Identifier: GPL-3.0-or-later +//! SPDX-FileCopyrightText: 2025 Chris Duncan +//! SPDX-License-Identifier: GPL-3.0-or-later /// import { NanoPowGpuComputeShader } from '../shaders' diff --git a/src/classes/index.ts b/src/classes/index.ts index 1979ef7..52b3393 100644 --- a/src/classes/index.ts +++ b/src/classes/index.ts @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2025 Chris Duncan -// SPDX-License-Identifier: GPL-3.0-or-later +//! SPDX-FileCopyrightText: 2025 Chris Duncan +//! SPDX-License-Identifier: GPL-3.0-or-later import { NanoPowCpu } from './cpu.js' import { NanoPowGl } from './gl.js' diff --git a/src/main.ts b/src/main.ts index 8936e2f..b0f5054 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2025 Chris Duncan -// SPDX-License-Identifier: GPL-3.0-or-later +//! SPDX-FileCopyrightText: 2025 Chris Duncan +//! SPDX-License-Identifier: GPL-3.0-or-later import { NanoPow, NanoPowCpu, NanoPowGl, NanoPowGpu } from "./classes" export { NanoPow, NanoPowCpu, NanoPowGl, NanoPowGpu } diff --git a/src/shaders/compute.wgsl b/src/shaders/compute.wgsl index 6cc1543..3429785 100644 --- a/src/shaders/compute.wgsl +++ b/src/shaders/compute.wgsl @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2025 Chris Duncan -// SPDX-License-Identifier: GPL-3.0-or-later +//! SPDX-FileCopyrightText: 2025 Chris Duncan +//! SPDX-License-Identifier: GPL-3.0-or-later /** * Input buffers diff --git a/src/shaders/gl-downsample.ts b/src/shaders/gl-downsample.ts index edfc8dc..9f15b47 100644 --- a/src/shaders/gl-downsample.ts +++ b/src/shaders/gl-downsample.ts @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2025 Chris Duncan -// SPDX-License-Identifier: GPL-3.0-or-later +//! SPDX-FileCopyrightText: 2025 Chris Duncan +//! SPDX-License-Identifier: GPL-3.0-or-later export const NanoPowGlDownsampleShader = `#version 300 es #pragma vscode_glsllint_stage: frag diff --git a/src/shaders/gl-draw.ts b/src/shaders/gl-draw.ts index b4d5d8b..2f230e8 100644 --- a/src/shaders/gl-draw.ts +++ b/src/shaders/gl-draw.ts @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2025 Chris Duncan -// SPDX-FileContributor: Ben Green -// SPDX-License-Identifier: GPL-3.0-or-later AND MIT +//! SPDX-FileCopyrightText: 2025 Chris Duncan +//! SPDX-FileContributor: Ben Green +//! SPDX-License-Identifier: GPL-3.0-or-later AND MIT export const NanoPowGlDrawShader = `#version 300 es #pragma vscode_glsllint_stage: frag diff --git a/tsconfig.json b/tsconfig.json index ba7d00a..4a2f876 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,7 +17,6 @@ }, "include": [ "src/main.ts", - "src/global.ts", "src/*", "src/**/*" ]