Merge v3.0.1 changes.

diff --git a/esbuild.mjs b/esbuild.mjs
index 3a5d93b8b6aa419df8a97d0e7f1210639dc33c2e..2ccecf6c44b54040583cdf683f8f75d5fee2e5ac 100644 (file)
--- a/esbuild.mjs
+++ b/esbuild.mjs
@@ -1,18 +1,19 @@
-// SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
-// SPDX-License-Identifier: GPL-3.0-or-later
+//! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
+//! 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 6f9d8cad347f8ba0f34e98f103bfe6466991834a..08afcab47ad27fccded6387097313594691e850f 100644 (file)
--- 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 fc2b7e46ef0c3dc56aad6d81d59244a2ae5e2245..071389bf1538bcf93271262320643e9e78c7fef2 100644 (file)
--- 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 <chris@zoso.dev>\\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 520ab89364933676c7a01e10a9fa8eea303653d0..e1b2ff961b474c96620d8edca47c332e45062108 100644 (file)
--- a/src/classes/gl.ts
+++ b/src/classes/gl.ts
@@ -1,6 +1,6 @@
-// SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
-// SPDX-FileContributor: Ben Green <ben@latenightsketches.com>
-// SPDX-License-Identifier: GPL-3.0-or-later AND MIT
+//! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
+//! SPDX-FileContributor: Ben Green <ben@latenightsketches.com>
+//! 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 b00e72723bf13f8d6616cfd9e3ea50d53fa9e83f..3c605967637b1665ec412b61808473b83a00eebe 100644 (file)
--- a/src/classes/gpu.ts
+++ b/src/classes/gpu.ts
@@ -1,5 +1,5 @@
-// SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
-// SPDX-License-Identifier: GPL-3.0-or-later
+//! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
+//! SPDX-License-Identifier: GPL-3.0-or-later
 /// <reference types="@webgpu/types" />
 
 import { NanoPowGpuComputeShader } from '../shaders'

diff --git a/src/classes/index.ts b/src/classes/index.ts
index 1979ef7b14c8f81b001bf484829a68edf83ddc90..52b3393256cbbaf79cb56f2930a492bbe2591ee7 100644 (file)
--- a/src/classes/index.ts
+++ b/src/classes/index.ts
@@ -1,5 +1,5 @@
-// SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
-// SPDX-License-Identifier: GPL-3.0-or-later
+//! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
+//! 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 8936e2ff53a917a90fdc3cc7f3e2604417c29306..b0f5054f52d5df7824c50aa0b437db9cd33a27f5 100644 (file)
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,5 +1,5 @@
-// SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
-// SPDX-License-Identifier: GPL-3.0-or-later
+//! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
+//! 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 6cc1543ed789732ad65ea04dbad24f1252a78eab..3429785314c7054bcabe57e73787f84bf68322ba 100644 (file)
--- a/src/shaders/compute.wgsl
+++ b/src/shaders/compute.wgsl
@@ -1,5 +1,5 @@
-// SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
-// SPDX-License-Identifier: GPL-3.0-or-later
+//! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
+//! 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 edfc8dc75fbcfd2897107855bb9be18c5b72ae47..9f15b47b6b237d9e2245b600826280d36a3e89c9 100644 (file)
--- a/src/shaders/gl-downsample.ts
+++ b/src/shaders/gl-downsample.ts
@@ -1,5 +1,5 @@
-// SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
-// SPDX-License-Identifier: GPL-3.0-or-later
+//! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
+//! 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 b4d5d8b9b28c95d728389b1786ea39bd5b5ab857..2f230e8e88cd8c07f3cf714057ae5ffe7a05ad3b 100644 (file)
--- a/src/shaders/gl-draw.ts
+++ b/src/shaders/gl-draw.ts
@@ -1,6 +1,6 @@
-// SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
-// SPDX-FileContributor: Ben Green <ben@latenightsketches.com>
-// SPDX-License-Identifier: GPL-3.0-or-later AND MIT
+//! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
+//! SPDX-FileContributor: Ben Green <ben@latenightsketches.com>
+//! 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 ba7d00adb4c2d840d0cd00d09f4d4e22000d2cfa..4a2f87657aab565a934634bb92f7645cc4bfddf9 100644 (file)
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,7 +17,6 @@
        },
        "include": [
                "src/main.ts",
-               "src/global.ts",
                "src/*",
                "src/**/*"
        ]