pnpm (#47)

* Switched to pnpm

* Added docusaurus build

* Drop node version

* More cleanup

* Cleanup workflow

* Maybe?

* Last attempt

* New folder nesting to allow for other examples

Author: nebrius

.github/workflows/docs-md.yaml

@@ -17,18 +17,27 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "24"
+          node-version: "22"
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
       - name: Install dependencies
-        run: npm ci
+        run: pnpm install --frozen-lockfile
       - name: Lint
         working-directory: ./packages/docs-md
-        run: npm run lint
-      - name: Type check
-        working-directory: ./packages/docs-md
-        run: npm run type-check
-      - name: Test
-        working-directory: ./packages/docs-md
-        run: npm run test
+        run: pnpm run lint
       - name: Build
         working-directory: ./packages/docs-md
-        run: npm run build
+        run: pnpm run build

.github/workflows/docusaurus-example.yaml

@@ -0,0 +1,32 @@
+name: Docusaurus Petstore Example
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  merge_group:
+
+jobs:
+  build-and-test:
+    name: Docusaurus Petstore Example Build and Test
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+      - name: Build Docs MD
+        working-directory: ./packages/docs-md
+        run: pnpm run build
+      - name: Build Docusaurus
+        working-directory: ./examples/docusaurus/petstore
+        run: pnpm run build

.npmrc

@@ -0,0 +1,17 @@
+# Enable workspace hoisting for better dependency management
+enable-pre-post-scripts=true
+
+# Auto install peer dependencies
+auto-install-peers=true
+
+# Use strict peer dependencies (recommended for monorepos)
+strict-peer-dependencies=false
+
+# Store path optimization
+store-dir=~/.pnpm-store
+
+# Use link workspace packages to save disk space
+link-workspace-packages=true
+
+# Shamefully hoist (helps with some compatibility issues)
+shamefully-hoist=false

.vscode/launch.json

@@ -29,35 +29,24 @@
     {
       "type": "node",
       "request": "launch",
-      "name": "Apiture",
+      "name": "Petstore (Nextra)",
       "skipFiles": [
         "<node_internals>/**"
       ],
       "program": "${workspaceFolder}/packages/docs-md/src/cli/cli.ts",
       "runtimeArgs": ["--experimental-strip-types"],
-      "cwd": "${workspaceFolder}/../apiture-docs-demo-docusaurus"
+      "cwd": "${workspaceFolder}/examples/nextra/petstore"
     },
     {
       "type": "node",
       "request": "launch",
-      "name": "Speakeasy (Nextra)",
+      "name": "Petstore (Docusaurus)",
       "skipFiles": [
         "<node_internals>/**"
       ],
       "program": "${workspaceFolder}/packages/docs-md/src/cli/cli.ts",
       "runtimeArgs": ["--experimental-strip-types"],
-      "cwd": "${workspaceFolder}/../speakeasy-docs-demo-nextra"
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Speakeasy (Docusaurus)",
-      "skipFiles": [
-        "<node_internals>/**"
-      ],
-      "program": "${workspaceFolder}/packages/docs-md/src/cli/cli.ts",
-      "runtimeArgs": ["--experimental-strip-types"],
-      "cwd": "${workspaceFolder}/../speakeasy-docs-demo-docusaurus"
+      "cwd": "${workspaceFolder}/examples/docusaurus/petstore"
     },
   ]
 }

Makefile

@@ -1,33 +1,32 @@
 type-check:
-	npm run type-check --workspaces
+	pnpm run type-check --recursive
 
 lint:
-	npm run lint --workspaces
+	pnpm run lint --recursive
 
 test: type-check lint
-	npm test --workspaces
+	pnpm test --recursive
 
 format:
-	npm run format --workspaces
+	pnpm run format --recursive
 
 install:
-	npm install
-	npm install --workspaces
+	pnpm install
 
 build: install
-	npm run build --workspaces
+	pnpm run build --recursive
 
 start:
-	npx concurrently \
-	"npm run dev --workspace=server" \
-	"npm run dev --workspace=client/web" \
-	"npm run dev --workspace=demos" \
-	"npm run dev --workspace=asset-proxy"
+	pnpm dlx concurrently \
+	"pnpm run dev --filter=server" \
+	"pnpm run dev --filter=client/web" \
+	"pnpm run dev --filter=demos" \
+	"pnpm run dev --filter=asset-proxy"
 
 add-demo:
-	npm run add-demo --workspace="@speakeasy-api/codewords-demos"
+	pnpm run add-demo --filter="@speakeasy-api/codewords-demos"
 
 .PHONY: interactive
 
 interactive:
-	npm run interactive --workspace=server -- --spec=$(spec) --lang=$(lang) --token=$(token) --command=$(command)
+	pnpm run interactive --filter=server -- --spec=$(spec) --lang=$(lang) --token=$(token) --command=$(command)