switch to pnpm and add import aliasing

This commit is contained in:
mrjvs
2023-09-14 20:19:07 +02:00
parent 2583a5126f
commit bd45c86ef5
9 changed files with 4125 additions and 6652 deletions

View File

@@ -12,18 +12,20 @@ jobs:
timeout-minutes: 60
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
run: npm install
- name: Install packages
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

View File

@@ -15,21 +15,23 @@ 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
run: npm install
- name: Install packages
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
run: npm install
- name: Install pnpm packages
run: pnpm install --frozen-lockfile
- name: Build Project
run: npm run build
run: pnpm build

View File

@@ -11,67 +11,69 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Checkout code
uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
- name: Get version
id: package-version
uses: martinbeentjes/npm-get-version-action@main
- name: Get version
id: package-version
uses: martinbeentjes/npm-get-version-action@main
- name: Install npm packages
run: npm install
- name: Install packages
run: pnpm install --frozen-lockfile
- name: Build for cloudflare
run: npm run build:cloudflare && cp ./.output/server/index.mjs ./cloudflare.worker.mjs
- name: Build for cloudflare
run: pnpm build:cloudflare && cp ./.output/server/index.mjs ./cloudflare.worker.mjs
- name: Build for AWS
run: npm run build:aws && cd .output/server && zip -r ../../lambda.zip .
- name: Build for AWS
run: pnpm build:aws && cd .output/server && zip -r ../../lambda.zip .
- name: Build for Node
run: npm run build:node && cd .output/server && zip -r ../../nodejs.zip .
- name: Build for Node
run: pnpm build:node && cd .output/server && zip -r ../../nodejs.zip .
- name: Create Release
id: create_release
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: Create Release
id: create_release
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
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./cloudflare.worker.mjs
asset_name: simple-proxy-cloudflare.mjs
asset_content_type: text/javascript
- name: Upload cloudflare build
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./cloudflare.worker.mjs
asset_name: simple-proxy-cloudflare.mjs
asset_content_type: text/javascript
- name: Upload AWS build
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./lambda.zip
asset_name: simple-proxy-aws-lambda.zip
asset_content_type: application/zip
- name: Upload AWS build
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./lambda.zip
asset_name: simple-proxy-aws-lambda.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
- 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

View File

@@ -4,10 +4,11 @@ WORKDIR /app
# Build layer
FROM base as build
COPY package-lock.json package.json ./
RUN npm install --frozen-lockfile
RUN npm i -g pnpm
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

View File

@@ -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")
}
});

6578
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -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": {

4036
pnpm-lock.yaml generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -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