switch to pnpm and add import aliasing

.github/workflows/cloudflare.yml

@@ -13,17 +13,19 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         
+      - uses: pnpm/action-setup@v2
+
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: 'npm'
+          cache: 'pnpm'
 
-      - name: Install npm packages
+      - name: Install packages
-        run: npm install
+        run: pnpm install --frozen-lockfile
 
       - name: Build Project
-        run: npm run build:cloudflare
+        run: pnpm build:cloudflare
 
       - name: Build & Deploy Worker
         uses: cloudflare/wrangler-action@v3

.github/workflows/linting.yml

@@ -16,20 +16,22 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
         
+      - uses: pnpm/action-setup@v2
+
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: 'npm'
+          cache: 'pnpm'
 
-      - name: Install npm packages
+      - name: Install packages
-        run: npm install
+        run: pnpm install --frozen-lockfile
 
       - name: Prepare for linting
-        run: npm run prepare
+        run: pnpm prepare
 
       - name: Run ESLint
-        run: npm run lint
+        run: pnpm lint
 
   building:
     name: Build project
@@ -38,15 +40,16 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
       
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: 'npm'
+          cache: 'pnpm'
       
-      - name: Install npm packages
+      - name: Install pnpm packages
-        run: npm install
+        run: pnpm install --frozen-lockfile
 
       - name: Build Project
-        run: npm run build
+        run: pnpm build

.github/workflows/release.yml

@@ -11,67 +11,69 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout code
+      - name: Checkout code
-      uses: actions/checkout@v3
+        uses: actions/checkout@v3
         
-    - name: Get version
+      - uses: pnpm/action-setup@v2
-      id: package-version
-      uses: martinbeentjes/npm-get-version-action@main
 
-    - name: Install npm packages
+      - name: Get version
-      run: npm install
+        id: package-version
+        uses: martinbeentjes/npm-get-version-action@main
 
-    - name: Build for cloudflare
+      - name: Install packages
-      run: npm run build:cloudflare && cp ./.output/server/index.mjs ./cloudflare.worker.mjs
+        run: pnpm install --frozen-lockfile
 
-    - name: Build for AWS
+      - name: Build for cloudflare
-      run: npm run build:aws && cd .output/server && zip -r ../../lambda.zip .
+        run: pnpm build:cloudflare && cp ./.output/server/index.mjs ./cloudflare.worker.mjs
 
-    - name: Build for Node
+      - name: Build for AWS
-      run: npm run build:node && cd .output/server && zip -r ../../nodejs.zip .
+        run: pnpm build:aws && cd .output/server && zip -r ../../lambda.zip .
 
-    - name: Create Release
+      - name: Build for Node
-      id: create_release
+        run: pnpm build:node && cd .output/server && zip -r ../../nodejs.zip .
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: v${{ steps.package-version.outputs.current-version }}
-        release_name: Bot v${{ steps.package-version.outputs.current-version }}
-        draft: false
-        prerelease: false
-        body: |
-          Instead of downloading a package, you can also run it in docker:
-          ```sh
-          docker run movie-web/simple-proxy:${{ steps.package-version.outputs.current-version }}
-          ```
 
-    - name: Upload cloudflare build
+      - name: Create Release
-      uses: actions/upload-release-asset@v1
+        id: create_release
-      env:
+        uses: actions/create-release@v1
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        env:
-      with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        with:
-        asset_path: ./cloudflare.worker.mjs
+          tag_name: v${{ steps.package-version.outputs.current-version }}
-        asset_name: simple-proxy-cloudflare.mjs
+          release_name: Bot v${{ steps.package-version.outputs.current-version }}
-        asset_content_type: text/javascript
+          draft: false
+          prerelease: false
+          body: |
+            Instead of downloading a package, you can also run it in docker:
+            ```sh
+            docker run movie-web/simple-proxy:${{ steps.package-version.outputs.current-version }}
+            ```
 
-    - name: Upload AWS build
+      - name: Upload cloudflare build
-      uses: actions/upload-release-asset@v1
+        uses: actions/upload-release-asset@v1
-      env:
+        env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
+        with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./lambda.zip
+          asset_path: ./cloudflare.worker.mjs
-        asset_name: simple-proxy-aws-lambda.zip
+          asset_name: simple-proxy-cloudflare.mjs
-        asset_content_type: application/zip
+          asset_content_type: text/javascript
 
-    - name: Upload Node build
+      - name: Upload AWS build
-      uses: actions/upload-release-asset@v1
+        uses: actions/upload-release-asset@v1
-      env:
+        env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
+        with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./node.zip
+          asset_path: ./lambda.zip
-        asset_name: simple-proxy-nodejs.zip
+          asset_name: simple-proxy-aws-lambda.zip
-        asset_content_type: application/zip
+          asset_content_type: application/zip
+
+      - name: Upload Node build
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./node.zip
+          asset_name: simple-proxy-nodejs.zip
+          asset_content_type: application/zip

Dockerfile

@@ -4,10 +4,11 @@ WORKDIR /app
 # Build layer
 FROM base as build
 
-COPY package-lock.json package.json ./
+RUN npm i -g pnpm
-RUN npm install --frozen-lockfile
+COPY pnpm-lock.yaml package.json ./
+RUN pnpm install --frozen-lockfile
 COPY . .
-RUN npm run build
+RUN pnpm build
 
 # Production layer
 FROM base as production

nitro.config.ts

@@ -1,5 +1,10 @@
+import { join } from "path";
+
 //https://nitro.unjs.io/config
 export default defineNitroConfig({
   noPublicDir: true,
-  srcDir: "./src"
+  srcDir: "./src",
+  alias: {
+    "@": join(__dirname, "src")
+  }
 });

package.json

@@ -11,9 +11,11 @@
     "build:node": "NITRO_PRESET=node-server npm run build",
     "start": "node .output/server/index.mjs",
     "lint": "eslint --ext .ts src/",
-    "lint:fix": "eslint --fix --ext .ts src/"
+    "lint:fix": "eslint --fix --ext .ts src/",
+    "preinstall": "npx only-allow pnpm"
   },
   "dependencies": {
+    "h3": "^1.8.1",
     "nitropack": "latest"
   },
   "devDependencies": {

src/routes/index.ts

@@ -1,4 +1,4 @@
-import { getProxyHeaders, getAfterResponseHeaders } from '../utils/headers';
+import { getProxyHeaders, getAfterResponseHeaders } from '@/utils/headers';
 
 export default defineEventHandler(async (event) => {
   // handle cors, if applicable