Merge branch 'main' of github.com:MCPJam/inspector

Author: chelojimenez

.github/workflows/docker-build-deploy.yml

@@ -49,3 +49,5 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           platforms: linux/amd64
+          build-args: |
+            BUILDKIT_INLINE_CACHE=1

.github/workflows/npm-publish.yml

@@ -27,11 +27,24 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           registry-url: "https://registry.npmjs.org"
 
-      - name: Install dependencies
+      - name: Clear npm cache and rebuild native modules
         run: |
-          npm install
+          npm cache clean --force
+          rm -rf ~/.npm
+          rm -rf node_modules package-lock.json
+          rm -rf client/node_modules client/package-lock.json
+          rm -rf server/node_modules server/package-lock.json
+
+      - name: Install dependencies with fresh state
+        run: |
+          npm install --legacy-peer-deps --no-optional
           npm run install:deps
 
+      - name: Rebuild native dependencies
+        run: |
+          cd server && npm rebuild esbuild
+          cd ../client && npm rebuild
+
       - name: Build for npm
         run: npm run build
 

.github/workflows/windows-release.yml

@@ -33,15 +33,34 @@ jobs:
         with:
           node-version: 20
 
-      - name: Install dependencies
+      - name: Clean dependencies
         run: |
-          npm install
+          npm cache clean --force
+          if (Test-Path "node_modules") { Remove-Item "node_modules" -Force -Recurse -ErrorAction SilentlyContinue }
+          if (Test-Path "package-lock.json") { Remove-Item "package-lock.json" -Force -ErrorAction SilentlyContinue }
+          if (Test-Path "client/node_modules") { Remove-Item "client/node_modules" -Force -Recurse -ErrorAction SilentlyContinue }
+          if (Test-Path "client/package-lock.json") { Remove-Item "client/package-lock.json" -Force -ErrorAction SilentlyContinue }
+          if (Test-Path "server/node_modules") { Remove-Item "server/node_modules" -Force -Recurse -ErrorAction SilentlyContinue }
+          if (Test-Path "server/package-lock.json") { Remove-Item "server/package-lock.json" -Force -ErrorAction SilentlyContinue }
+        shell: powershell
+
+      - name: Install dependencies fresh
+        run: |
+          npm install --legacy-peer-deps --no-optional
           npm run install:deps
+        shell: powershell
 
-      - name: Workaround npm optional deps bug (rollup prebuilt)
-        if: runner.os == 'Windows'
+      - name: Rebuild native modules for Windows
         run: |
+          # Rebuild esbuild specifically to fix version mismatch
+          cd server
+          npm rebuild esbuild --verbose
+          cd ..
+          # Install Windows-specific binaries
           npm i -D @rollup/rollup-win32-x64-msvc@^4
+          cd client
+          npm i lightningcss@^1 --save-dev
+        shell: powershell
 
       - name: Restore code signing cert
         if: env.WINDOWS_PFX_BASE64 != ''
@@ -52,12 +71,14 @@ jobs:
 
       - name: Build
         run: npm run build
+        shell: powershell
 
       - name: Make (Windows)
         env:
           WINDOWS_PFX_FILE: ${{ runner.temp }}\\codesign.pfx
           WINDOWS_PFX_PASSWORD: ${{ secrets.WINDOWS_PFX_PASSWORD }}
         run: npm run electron:make
+        shell: powershell
 
       - name: Rename installer to consistent name
         run: |

Dockerfile

@@ -2,14 +2,21 @@
 # Multi-stage build for client and server
 
 # Stage 1: Dependencies base (shared)
-FROM node:20-alpine AS deps-base
+FROM node:20-slim AS deps-base
 WORKDIR /app
-COPY package.json package-lock.json ./
-COPY client/package*.json ./client/
-COPY server/package*.json ./server/
-RUN npm install --include=dev
-RUN cd client && npm install --include=dev
-RUN cd server && npm install --include=dev
+
+# Clear npm cache and remove any existing lock files to avoid conflicts
+RUN npm cache clean --force
+
+COPY package.json ./
+COPY client/package.json ./client/
+COPY server/package.json ./server/
+
+# Install dependencies with clean slate approach (no lock files)
+
+RUN npm install --no-package-lock --include=dev
+RUN cd client && npm install --no-package-lock --include=dev
+RUN cd server && npm install --no-package-lock --include=dev
 
 # Stage 2: Build client
 FROM deps-base AS client-builder
@@ -26,10 +33,10 @@ COPY client/ ./client/
 RUN cd server && npm run build
 
 # Stage 4: Production image - extend existing or create new
-FROM node:20-alpine AS production
+FROM node:20-slim AS production
 
 # Install dumb-init for proper signal handling
-RUN apk add --no-cache dumb-init
+RUN apt-get update && apt-get install -y --no-install-recommends dumb-init && rm -rf /var/lib/apt/lists/*
 
 # Create app directory
 WORKDIR /app
@@ -55,8 +62,8 @@ COPY shared/ ./shared/
 COPY bin/ ./bin/
 
 # Create non-root user
-RUN addgroup -g 1001 -S nodejs && \
-    adduser -S mcpjam -u 1001
+RUN groupadd --gid 1001 nodejs && \
+    useradd --uid 1001 --gid nodejs --shell /bin/bash --create-home mcpjam
 
 # Change ownership of the app directory
 RUN chown -R mcpjam:nodejs /app

README.md

@@ -230,12 +230,12 @@ This project is licensed under the **Apache License 2.0** - see the [LICENSE](LI
 
 </div>
 
-
 # ⭐ Star History
+
 <a href="https://star-history.com/#MCPJam/inspector&Date">
  <picture>
    <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=MCPJam/inspector&type=Date&theme=dark" />
    <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=MCPJam/inspector&type=Date" />
    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=MCPJam/inspector&type=Date" />
  </picture>
-</a>
+</a>