restructure dist into per platform-arch folders

Each build now lives in dist/<platform>-<arch>/dawn.node so it can sit
next to its own runtime deps. d3dcompiler_47.dll moves into dist/win32-x64/
where it belongs, which is what makes room for a win32-arm64 build to carry
its own ARM64 copy instead of colliding on the filename.

Artifacts are now named for the platform-arch alone, so the package job
drops merge-multiple and lets download-artifact reassemble the layout.
Release assets are staged with their prefix restored, since that namespace
is flat and four files named dawn.node would collide.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: greggman

.github/workflows/build.yml

@@ -110,18 +110,27 @@ jobs:
         run: |
           npm test
 
+      # Named for the platform-arch alone so the package job can download
+      # artifacts straight into dist/<platform-arch>/ without merging.
       - name: Upload Artifact ⬆️
         uses: actions/upload-artifact@v4
         with:
-          path: ./dist/*.dawn.node
-          name: ${{ matrix.config.artifact }}.dawn.node
+          path: ./dist/${{ matrix.config.artifact }}/dawn.node
+          name: ${{ matrix.config.artifact }}
           overwrite: true
 
+      # Release assets are a flat namespace, so give each one back its
+      # platform-arch prefix rather than uploading four files named dawn.node.
+      - name: Stage release asset
+        if: startsWith(github.ref, 'refs/tags/')
+        shell: bash
+        run: cp dist/${{ matrix.config.artifact }}/dawn.node ${{ matrix.config.artifact }}.dawn.node
+
       - name: Release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: dist/*.dawn.node
+          files: ${{ matrix.config.artifact }}.dawn.node
 
   package:
     needs: build
@@ -149,11 +158,12 @@ jobs:
         echo github.ref: ${{ github.ref }}
         echo github.ref_type: ${{ github.ref_type }}
 
+    # No merge-multiple: each artifact lands in dist/<its name>/, which is
+    # exactly the per-platform-arch layout index.js resolves against.
     - name: Download artifacts
       uses: actions/download-artifact@v4
       with:
         path: dist
-        merge-multiple: true
 
     - name: Build and Publish
       shell: bash

build/build.js

@@ -77,7 +77,7 @@ async function createProject() {
 
 async function copyResult(filepath, target) {
   const srcFilename = path.join(...[filepath, ...addElemIf(isWin, kConfig), 'dawn.node']);
-  const dstFilename = path.join('dist', `${target}.dawn.node`);
+  const dstFilename = path.join('dist', target, 'dawn.node');
   fs.mkdirSync(path.dirname(dstFilename), {recursive: true});
   fs.copyFileSync(srcFilename, dstFilename);
   return dstFilename;

build/download-run-artifacts.js

@@ -108,9 +108,11 @@ const data = await github.getRunArtifacts({
 });
 const filenames = await Promise.all(
   data.artifacts
-    .filter(({name}) => name?.endsWith('.node'))
-    .map(({id}) => {
+    // Artifacts are named for the platform-arch they were built for, and each
+    // unpacks into the dist directory of that same name.
+    .filter(({name}) => /^(darwin|linux|win32)-/.test(name ?? ''))
+    .map(({id, name}) => {
       const url = `https://github.com/${owner}/${repo}/actions/runs/${args.run_id}/artifacts/${id}`;
-      return downloadFileFromZip(url, 'dist');
+      return downloadFileFromZip(url, path.join('dist', name));
     })
 );

build/postinstall.js

@@ -10,7 +10,7 @@ const debug = DEBUG('postinstall');
 
 async function main() {
   if (isMac) {
-    const dawnNode = 'dist/darwin-universal.dawn.node';
+    const dawnNode = 'dist/darwin-universal/dawn.node';
     const attribute = 'com.apple.quarantine'
     if (!exists(dawnNode)) {
       debug(`${dawnNode} does not exist`);

dist/d3dcompiler_47.dll dist/win32-x64/d3dcompiler_47.dlldist/d3dcompiler_47.dll renamed to dist/win32-x64/d3dcompiler_47.dll

@@ -6,6 +6,8 @@ export const isMac = process.platform === 'darwin';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const arch = isMac ? 'universal' : process.arch;
-const dawnNodePath = join(__dirname, 'dist', `${process.platform}-${arch}.dawn.node`);
+// One directory per platform-arch so each build can sit next to its own
+// runtime deps (win32 needs its matching d3dcompiler_47.dll beside it).
+const dawnNodePath = join(__dirname, 'dist', `${process.platform}-${arch}`, 'dawn.node');
 const { create, globals } = require(dawnNodePath);
 export { create, globals }