Merge branch 'dev' into 'main'
Replacing yarn with pnpm See merge request illegitimate/illegitimate-bot!291
This commit is contained in:
@@ -1 +0,0 @@
|
||||
nodeLinker: node-modules
|
||||
@@ -2,12 +2,11 @@ FROM node:21.7.3-alpine3.18 AS cache
|
||||
|
||||
WORKDIR /cache
|
||||
|
||||
COPY .yarnrc.yml .
|
||||
COPY package.json .
|
||||
COPY yarn.lock .
|
||||
COPY pnpm-lock.yaml .
|
||||
|
||||
RUN corepack enable
|
||||
RUN yarn install
|
||||
RUN pnpm install
|
||||
|
||||
# main image
|
||||
FROM node:21.7.3-alpine3.18
|
||||
@@ -18,6 +17,6 @@ COPY . .
|
||||
|
||||
RUN apk add --no-cache ffmpeg
|
||||
RUN corepack enable
|
||||
RUN yarn build
|
||||
RUN pnpm build
|
||||
|
||||
CMD [ "yarn", "start" ]
|
||||
CMD [ "pnpm", "start" ]
|
||||
|
||||
@@ -7,5 +7,5 @@
|
||||
"NODE_ENV": "dev"
|
||||
},
|
||||
"ext": "ts",
|
||||
"exec": "yarn build && yarn start"
|
||||
"exec": "pnpm build && pnpm start"
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
"dev:ts": "nodemon --config nodemon.json src/index.ts",
|
||||
"dev:js": "nodemon --config nodemon-js.json dist/index.js",
|
||||
"format": "dprint fmt \"**/*.ts\"",
|
||||
"check": "yarn tscheck && yarn lint",
|
||||
"check": "pnpm tscheck && pnpm lint",
|
||||
"tscheck": "tsc && echo \"TypeScript check passed!\"",
|
||||
"lint": "eslint && echo \"Linting passed!\"",
|
||||
"lint:fix": "eslint --fix",
|
||||
@@ -54,8 +54,8 @@
|
||||
"@swc/cli": "^0.4.0",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@types/ms": "^0.7.34",
|
||||
"@types/node": "^22.6.1",
|
||||
"@types/pg": "^8",
|
||||
"@types/node": "^22.7.2",
|
||||
"@types/pg": "^8.11.10",
|
||||
"@typescript-eslint/eslint-plugin": "^8.7.0",
|
||||
"@typescript-eslint/parser": "^8.7.0",
|
||||
"chokidar": "^4.0.1",
|
||||
@@ -66,5 +66,5 @@
|
||||
"tsx": "^4.19.1",
|
||||
"typescript": "^5.6.2"
|
||||
},
|
||||
"packageManager": "yarn@4.5.0"
|
||||
"packageManager": "pnpm@9.11.0+sha256.1c0e33f70e5df9eede84a357bdfa0b1f9dba6e58194628d48a1055756f553754"
|
||||
}
|
||||
|
||||
4572
pnpm-lock.yaml
generated
Normal file
4572
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user