package as "codeblocks", some refactoring

Author: Tsche

.github/workflows/pages.yaml

@@ -24,42 +24,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
           RELEASE_REPOSITORY: ${{ github.repository }}
-        run: |
-          set -euo pipefail
-          release_prefix="clangd-wasm/"
-          release_tag=$(
-            gh api --paginate "repos/${RELEASE_REPOSITORY}/releases?per_page=100" |
-              jq -sr --arg prefix "$release_prefix" '
-                add
-                | map(select(
-                    (.draft | not)
-                    and (.tag_name | startswith($prefix))
-                  ))
-                | sort_by(.published_at)
-                | last
-                | .tag_name // empty
-              '
-          )
-          if [[ -z "$release_tag" ]]; then
-            echo "No published clangd wasm release found with prefix ${release_prefix}" >&2
-            echo "Run scripts/release-clangd-wasm.sh locally first." >&2
-            exit 1
-          fi
-          artifact_dir=$(mktemp -d)
-          trap 'rm -rf "$artifact_dir"' EXIT
-          echo "Using ${release_tag}"
-          gh release download "$release_tag" \
-            --repo "$RELEASE_REPOSITORY" \
-            --pattern clangd.js \
-            --pattern clangd.wasm \
-            --pattern SHA256SUMS \
-            --dir "$artifact_dir"
-          (
-            cd "$artifact_dir"
-            sha256sum -c SHA256SUMS
-          )
-          install -m 0644 "$artifact_dir/clangd.js" public/wasm/clangd.js
-          install -m 0644 "$artifact_dir/clangd.wasm" public/wasm/clangd.wasm
+        run: scripts/install-latest-clangd-release
       - run: pnpm build
       - uses: actions/upload-pages-artifact@v3
         with:

.gitignore

@@ -9,7 +9,8 @@ lerna-debug.log*
 
 node_modules
 dist
-dist-ssr
+dist-*
+packages
 test-results
 playwright-report
 *.local

README.md

@@ -11,10 +11,7 @@ Copy the complete contents of `dist/` to one public directory, then include one
 <script src="./codeblocks.js"></script>
 
 <codeblock compiler="gsnapshot" args="-std=c++26 -freflection">
-#include &lt;print&gt;
-int main() {
-    std::println("foo {} bar", 42);
-}
+  #include &lt;print&gt; int main() { std::println("foo {} bar", 42); }
 </codeblock>
 ```
 
@@ -26,12 +23,8 @@ A block can also contain multiple tabbed sources:
 
 ```html
 <codeblock compiler="clang2110" args="-std=c++23" height="360px">
-  <codeblock-tab name="first.cpp">
-int main() { return 1; }
-  </codeblock-tab>
-  <codeblock-tab name="second.cpp">
-int main() { return 2; }
-  </codeblock-tab>
+  <codeblock-tab name="first.cpp"> int main() { return 1; } </codeblock-tab>
+  <codeblock-tab name="second.cpp"> int main() { return 2; } </codeblock-tab>
 </codeblock>
 ```
 
@@ -66,7 +59,7 @@ Supported attributes are:
     },
     styles: {
       "editor-height": "360px",
-      "accent": "#7c3aed",
+      accent: "#7c3aed",
     },
   });
 
@@ -176,6 +169,29 @@ pnpm exec playwright install chromium
 pnpm test:browser
 ```
 
+## npm packages
+
+The release workflow publishes two packages from the same source and version:
+
+- `codeblocks` is self-contained and includes the clangd JavaScript and
+  WebAssembly files from `public/wasm/`.
+- `codeblocks-remote` omits those large files and builds the worker to load
+  them from `https://clangd.cpp.social/wasm/`.
+
+Both packages contain the classic loader as the `./loader` export, the stylesheet
+as `./styles.css`, the typed ES module API at the package root, and every emitted
+chunk and worker required by that build.
+
+Local packaging never downloads artifacts. It uses the files already present in
+`public/wasm/`, so a manual package is built from exactly the current checkout:
+
+```bash
+pnpm build
+pnpm package:npm
+npm pack ./packages/codeblocks
+```
+
+
 Create a deployable archive with:
 
 ```bash

package.json

@@ -1,13 +1,20 @@
 {
-  "name": "clangd-in-browser",
+  "name": "codeblocks",
   "private": true,
-  "version": "0.0.0",
+  "version": "0.1.0",
+  "description": "Editable C++ code blocks backed by Monaco and clangd WebAssembly",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/cppsocial/clangd-web.git"
+  },
   "type": "module",
   "scripts": {
     "clean": "vite-node --config ./scripts/vite.node.ts ./scripts/clean.ts",
     "dev": "pnpm build",
     "watch": "tsc -w",
-    "build": "pnpm run clean && tsc && vite build && node scripts/copy-runtime-assets.mjs",
+    "build": "pnpm run clean && tsc && vite build && tsc -p tsconfig.types.json && node scripts/copy-runtime-assets.mjs",
+    "package:npm": "node scripts/prepare-npm-package.mjs dist packages/codeblocks codeblocks",
     "pack:runtime": "pnpm build && bash scripts/package-runtime.sh",
     "release:wasm": "bash scripts/release-clangd-wasm.sh",
     "demo:origins": "node scripts/serve-test.mjs",

scripts/copy-runtime-assets.mjs

@@ -3,20 +3,40 @@ import { existsSync } from "node:fs";
 
 const root = new URL("../", import.meta.url);
 const source = new URL("public/wasm/", root);
-const destination = new URL("dist/wasm/", root);
+const arguments_ = new Set(process.argv.slice(2));
+const outdirArgument = process.argv
+  .slice(2)
+  .find((value) => value.startsWith("--outdir="));
+const outdir = outdirArgument?.slice("--outdir=".length) ?? "dist";
+const includeWasm = !arguments_.has("--without-wasm");
+const destination = new URL(`${outdir}/wasm/`, root);
 
-for (const name of ["clangd.js", "clangd.wasm"]) {
-  if (!existsSync(new URL(name, source))) {
-    throw new Error(
-      `Missing public/wasm/${name}. Run scripts/install-clangd-artifacts first.`,
-    );
+if (includeWasm) {
+  for (const name of ["clangd.js", "clangd.wasm"]) {
+    if (!existsSync(new URL(name, source))) {
+      throw new Error(
+        `Missing public/wasm/${name}. Run scripts/install-clangd-artifacts first.`,
+      );
+    }
   }
+  await mkdir(destination, { recursive: true });
+  await cp(source, destination, {
+    recursive: true,
+    filter: (path) => !path.endsWith(".gitignore"),
+  });
 }
 
-await mkdir(destination, { recursive: true });
-await cp(source, destination, { recursive: true, filter: (path) => !path.endsWith(".gitignore") });
-await cp(new URL("public/_headers", root), new URL("dist/_headers", root));
+await cp(new URL("public/_headers", root), new URL(`${outdir}/_headers`, root));
 
-await cp(new URL("public/codeblocks.js", root), new URL("dist/codeblocks.js", root));
-await cp(new URL("public/index.html", root), new URL("dist/index.html", root));
-await cp(new URL("public/coi-serviceworker.js", root), new URL("dist/coi-serviceworker.js", root));
+await cp(
+  new URL("public/codeblocks.js", root),
+  new URL(`${outdir}/codeblocks.js`, root),
+);
+await cp(
+  new URL("public/coi-serviceworker.js", root),
+  new URL(`${outdir}/coi-serviceworker.js`, root),
+);
+await cp(
+  new URL("src/loader-api.d.ts", root),
+  new URL(`${outdir}/loader.d.ts`, root),
+);