Revert "Switch to npm"

This reverts commit ce5bf1edf0.
This commit is contained in:
Max Schmidt 2023-07-28 17:02:19 +02:00
parent a51b72d7b5
commit 27dfaa8f6a
15 changed files with 11095 additions and 19204 deletions

View File

@ -26,4 +26,4 @@ jobs:
key: ${{ secrets.KEY }}
script: |
cd ${{ secrets.PATH }}
npm run prod astro
yarn prod astro

View File

@ -70,5 +70,5 @@ jobs:
key: ${{ secrets.KEY }}
script: |
cd ${{ secrets.PATH }}
npm run prod payload
npm run prod astro
yarn prod payload
yarn prod astro

2
.gitignore vendored
View File

@ -1 +1,3 @@
data
yarn-debug.log*
yarn-error.log*

View File

@ -1,4 +1,4 @@
node_modules
package-lock.json
yarn.lock
Dockerfile
README.md

3
astro/.gitignore vendored
View File

@ -9,7 +9,8 @@ node_modules/
# logs
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*

View File

@ -1,20 +1,20 @@
FROM node:lts-alpine as base
WORKDIR /base
COPY ./package.json ./package.json
RUN npm install
RUN yarn install
COPY ./ ./
FROM base AS dev
ENV NODE_ENV=development
EXPOSE 3000
CMD ["npm", "run", "dev"]
CMD ["yarn","dev"]
FROM base AS build
ENV NODE_ENV=production
WORKDIR /build
COPY --from=base /base ./
ADD "https://random-uuid.deno.dev" skipcache
RUN npm run build
RUN yarn build
FROM nginx:stable AS prod
COPY --from=build /build/dist /usr/share/nginx/html

View File

@ -1,7 +1,6 @@
/* tslint:disable */
/* eslint-disable */
/**
* This file was automatically generated by Payload.
* This file was automatically generated by Payload CMS.
* DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
* and re-run `payload generate:types` to regenerate this file.
*/
@ -31,11 +30,9 @@ export interface User {
name?: string;
updatedAt: string;
createdAt: string;
email: string;
email?: string;
resetPasswordToken?: string;
resetPasswordExpiration?: string;
salt?: string;
hash?: string;
loginAttempts?: number;
lockUntil?: string;
password?: string;

4078
astro/yarn.lock Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,3 @@
node_modules
package-lock.json
yarn.lock
Dockerfile

1
payload/.gitignore vendored
View File

@ -3,4 +3,3 @@ node_modules/
build
dist
src/media
npm-debug.log*

View File

@ -1,29 +1,29 @@
FROM node:lts-alpine as base
WORKDIR /base
COPY ./package.json .
RUN npm install
RUN yarn install
COPY . .
FROM base AS dev
ENV NODE_ENV=development
EXPOSE 3001
CMD ["npm","run", "dev"]
CMD ["yarn","dev"]
FROM base AS build
ENV NODE_ENV=production
WORKDIR /build
COPY --from=base /base .
RUN npm run build
RUN yarn build
FROM build as prod
ENV NODE_ENV=production
WORKDIR /prod
COPY package*.json .
RUN npm install --production
RUN yarn install --production
COPY --from=build /build/tsconfig.json ./tsconfig.json
COPY --from=build /build/dist ./dist
COPY --from=build /build/build ./build
EXPOSE 3000
CMD ["npm", "run", "serve"]
CMD ["yarn", "serve"]

View File

@ -1,5 +1,5 @@
{
"ext": "ts",
"ignore": ["src/types.ts"],
"exec": "npm run generate:types && ts-node src/server.ts"
"exec": "yarn generate:types && ts-node src/server.ts"
}

19181
payload/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -8,7 +8,7 @@
"dev": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts nodemon",
"build:payload": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts node -r tsconfig-paths/register node_modules/payload/dist/bin/index.js build",
"build:server": "tsc",
"build": "npm run build:payload && npm run build:server",
"build": "yarn build:payload && yarn build:server",
"serve": "cross-env PAYLOAD_CONFIG_PATH=dist/payload.config.js node -r tsconfig-paths/register dist/server.js",
"generate:types": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts node -r tsconfig-paths/register node_modules/payload/dist/bin/index.js generate:types"
},

6995
payload/yarn.lock Normal file

File diff suppressed because it is too large Load Diff