rm bun

Author: Adam McKee

.github/workflows/ci_verify.yml

@@ -10,10 +10,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: rm /usr/local/bin/node
-      - uses: oven-sh/setup-bun@v2
-      - run: bun i
-      - run: bun test
-      - run: bun typecheck
-      - run: bun fmtcheck
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 24
+          cache: pnpm
+      - run: pnpm i
+      - run: pnpm test
+      - run: pnpm typecheck
+      - run: pnpm fmtcheck
       - run: echo 'Ba'

.github/workflows/npm_publish.yml

@@ -22,10 +22,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: oven-sh/setup-bun@v2
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 24
       - name: changelog entries
         if: ${{ inputs.semver-bump != 'prerelease' }}
-        run: bunx @eighty4/changelog check
+        run: npx -y @eighty4/changelog check
 
   verify:
     uses: ./.github/workflows/ci_verify.yml
@@ -38,10 +40,10 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 23
-      - uses: oven-sh/setup-bun@v2
+          node-version: 24
       - id: bump
         run: |
           GIT_TAG=$(npm version ${{ inputs.semver-bump }} --no-git-tag-version)
@@ -50,7 +52,7 @@ jobs:
       - if: inputs.semver-bump != 'prerelease'
         env:
           VERSION: ${{ steps.bump.outputs.version }}
-        run: bunx @eighty4/changelog rollover "v$VERSION"
+        run: npx -y @eighty4/changelog rollover "v$VERSION"
       - id: push
         env:
           GIT_TAG: ${{ steps.bump.outputs.tag }}
@@ -74,14 +76,17 @@ jobs:
         with:
           fetch-tags: true
           ref: ${{ needs.create-git-tag.outputs.tag }}
-      - uses: oven-sh/setup-bun@v2
-      - run: bun i
-      - run: bun run build
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 24
+      - run: pnpm i
+      - run: pnpm run build
       - name: publish
         env:
           NPM_CONFIG_TOKEN: ${{ secrets.NPM_TOKEN }}
           NPM_TAG: ${{ inputs.semver-bump == 'prerelease' && 'next' || 'latest' }}
-        run: bun publish --access public --tag $NPM_TAG
+        run: pnpm publish --access public --tag $NPM_TAG
 
   create-release-notes:
     runs-on: ubuntu-latest
@@ -91,7 +96,9 @@ jobs:
         with:
           fetch-tags: true
           ref: ${{ needs.create-git-tag.outputs.tag }}
-      - uses: oven-sh/setup-bun@v2
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 24
       - id: gen
         env:
           CHANGELOG_TAG: ${{ inputs.semver-bump == 'prerelease' && 'Unreleased' || needs.create-git-tag.outputs.tag }}
@@ -107,7 +114,7 @@ jobs:
 
           echo "## Release notes" >> release_notes.md
           echo >> release_notes.md
-          bunx @eighty4/changelog get "$CHANGELOG_TAG" >> release_notes.md
+          npx -y @eighty4/changelog get "$CHANGELOG_TAG" >> release_notes.md
           echo >> release_notes.md
 
           RELEASE_NOTES=$(cat release_notes.md | base64 -w 0)

.prettierignore

@@ -1,5 +1,4 @@
-bun.lock
+pnpm-lock.yaml
 examples/**/*.img
 examples/**/*.iso
 lib_types/**/*.d.ts
-

README.md

@@ -12,9 +12,6 @@ npm i -g @eighty4/c2
 c2 -h
 ```
 
-(tests use `bun:test` so [install Bun](https://bun.sh/docs/installation)
-for contributing!)
-
 ## Using the CLI program
 
 ```

bun.lock

@@ -29,7 +29,7 @@ fi
 
 # run through all the checks done for ci
 
-bun test
-bun --bun run build
-bun --bun run fmtcheck
-
+pnpm test
+pnpm build
+pnpm fmtcheck
+pnpm typecheck

ci_verify.sh

@@ -1,3 +1,3 @@
 .qemu
 bun.lock
-
+pnpm-lock.yaml

examples/.gitignore

@@ -5,15 +5,15 @@
 Many cloud providers support launching VMs from their JavaScript SDKs.
 This allows `c2` to integrate directly into your DevOps workflows.
 
-The TypeScript examples will require `bun i` or `pnpm i` in this directory
+The TypeScript examples will require `npm i` or `pnpm i` in this directory
 before running.
 
 ### linode.ts
 
 Create a Linode account and run with a `LINODE_TOKEN` env var:
 
 ```
-LINODE_TOKEN=XYZ bun linode.ts
+LINODE_TOKEN=XYZ node linode.ts
 ```
 
 ## Local Ubuntu with QEMU

examples/README.md

@@ -1,5 +1,6 @@
-import { afterEach, beforeEach, expect, test } from 'bun:test'
+import assert from 'node:assert/strict'
 import { join } from 'node:path'
+import { afterEach, beforeEach, test } from 'node:test'
 import { collectAttachments } from './attachments.ts'
 import { makeFile, makeTempDir, removeDir } from './fs.testing.ts'
 
@@ -11,14 +12,15 @@ afterEach(async () => await removeDir(tmpDir))
 
 test('collect throws error for unknown filetype', async () => {
     await makeFile('init-cloud', 'whoopie', tmpDir)
-    await expect(() => collectAttachments(tmpDir)).toThrow(
-        'init-cloud is an unsupported file type',
+    await assert.rejects(
+        () => collectAttachments(tmpDir),
+        new Error('init-cloud is an unsupported file type'),
     )
 })
 
 test('collect cloud config yml', async () => {
     await makeFile('init-cloud.yml', '#cloud-config\nwhoopie', tmpDir)
-    expect(await collectAttachments(tmpDir)).toStrictEqual([
+    assert.deepEqual(await collectAttachments(tmpDir), [
         {
             path: join(tmpDir, 'init-cloud.yml'),
             content: '#cloud-config\nwhoopie',
@@ -31,7 +33,7 @@ test('collect cloud config yml', async () => {
 
 test('collect cloud config yaml', async () => {
     await makeFile('init-cloud.yaml', '#cloud-config\nwhoopie', tmpDir)
-    expect(await collectAttachments(tmpDir)).toStrictEqual([
+    assert.deepEqual(await collectAttachments(tmpDir), [
         {
             path: join(tmpDir, 'init-cloud.yaml'),
             content: '#cloud-config\nwhoopie',
@@ -44,21 +46,23 @@ test('collect cloud config yaml', async () => {
 
 test('collect throws error when yml does not have #cloud-config comment', async () => {
     await makeFile('init-cloud.yml', 'whoopie', tmpDir)
-    await expect(() => collectAttachments(tmpDir)).toThrow(
-        'YAML cloud config must start with a #cloud-config comment',
+    await assert.rejects(
+        () => collectAttachments(tmpDir),
+        new Error('YAML cloud config must start with a #cloud-config comment'),
     )
 })
 
 test('collect throws error when yaml does not have #cloud-config comment', async () => {
     await makeFile('init-cloud.yaml', 'whoopie', tmpDir)
-    await expect(() => collectAttachments(tmpDir)).toThrow(
-        'YAML cloud config must start with a #cloud-config comment',
+    await assert.rejects(
+        () => collectAttachments(tmpDir),
+        new Error('YAML cloud config must start with a #cloud-config comment'),
     )
 })
 
 test('collect shell script', async () => {
     await makeFile('init-cloud.sh', 'whoopie', tmpDir)
-    expect(await collectAttachments(tmpDir)).toStrictEqual([
+    assert.deepEqual(await collectAttachments(tmpDir), [
         {
             path: join(tmpDir, 'init-cloud.sh'),
             content: 'whoopie',
@@ -77,7 +81,7 @@ test('evals template expressions', async () => {
         `\${{ file('${resourceTmpDir}/whoopie') }}`,
         tmpDir,
     )
-    expect(await collectAttachments(tmpDir)).toStrictEqual([
+    assert.deepEqual(await collectAttachments(tmpDir), [
         {
             path: tmpDir + '/init-cloud.sh',
             content: 'whoopie',
@@ -92,7 +96,7 @@ test('evals template expressions', async () => {
 test('sorts attachments by filename', async () => {
     await makeFile('01-init-cloud.sh', 'whoopie', tmpDir)
     await makeFile('02-init-cloud.sh', 'whoopie', tmpDir)
-    expect(await collectAttachments(tmpDir)).toStrictEqual([
+    assert.deepEqual(await collectAttachments(tmpDir), [
         {
             path: join(tmpDir, '01-init-cloud.sh'),
             content: 'whoopie',

lib/attachments.spec.ts

@@ -1,5 +1,5 @@
+import { readdir, readFile } from 'node:fs/promises'
 import { evalTemplateExpressions } from './expression.ts'
-import { readDirListing, readToString } from './fs.ts'
 
 export type AttachmentType = 'cloud-config' | 'x-shellscript'
 
@@ -14,11 +14,11 @@ export interface Attachment {
 export async function collectAttachments(
     dir: string,
 ): Promise<Array<Attachment>> {
-    const filenames = await readDirListing(dir)
+    const filenames = await readdir(dir)
     const attachments = await Promise.all(
         filenames.map(async filename => {
             const path = `${dir}/${filename}`
-            const source = await readToString(path)
+            const source = await readFile(path, 'utf-8')
             const type = resolveAttachmentType(filename, source)
             const content = await evalTemplateExpressions(source)
             return { content, filename, path, type, source }