Skip to content

Commit

Permalink
migrate yarn to pnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
nullxx committed May 18, 2024
1 parent 377a44f commit 7a50aba
Show file tree
Hide file tree
Showing 7 changed files with 13,499 additions and 9,942 deletions.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e # exit on error
_PREFIX=mpp-pynq
FRONT_CONTAINER_NAME="${_PREFIX}-front"

TARGET_PLATFORMS="linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x"
TARGET_PLATFORMS="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/s390x"
REPO="nullx0/mpp-pynq-front"

VERSION=$(<VERSION)
Expand Down
10 changes: 5 additions & 5 deletions mpp-pynq-front/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM node:alpine AS install-deps
FROM node:22-alpine3.19 AS install-deps

WORKDIR /app
COPY package.json package.json
COPY yarn.lock yarn.lock
COPY pnpm-lock.yaml pnpm-lock.yaml

RUN yarn cache clean && yarn config delete proxy && yarn config delete https-proxy && yarn config delete registry && yarn install --frozen-lockfile --network-timeout 1000000
RUN npm install -g pnpm && pnpm install


FROM node:alpine AS build
FROM node:22-alpine3.19 AS build

ENV GENERATE_SOURCEMAP=false

Expand All @@ -16,7 +16,7 @@ WORKDIR /app
COPY . .
COPY --from=install-deps /app/node_modules /app/node_modules

RUN yarn build
RUN npm run build

FROM nginx:latest
COPY deploy/nginx/nginx.conf /etc/nginx/conf.d/default.conf
Expand Down
6 changes: 4 additions & 2 deletions mpp-pynq-front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@ant-design/colors": "^7.0.2",
"@ant-design/icons": "^5.3.7",
"@reactour/tour": "^3.1.1",
"ace-builds": "^1.4.14",
"antd": "^5.17.2",
Expand All @@ -18,7 +20,6 @@
"socket.io-client": "^4.7.5",
"styletron-engine-atomic": "^1.4.8",
"styletron-react": "^6.0.2",
"typescript": "^4.6.3",
"web-vitals": "^2.1.0"
},
"repository": {
Expand Down Expand Up @@ -68,6 +69,7 @@
"@types/react-dom": "^18.0.1",
"@types/styletron-engine-atomic": "^1.1.1",
"@types/styletron-react": "^5.0.3",
"react-scripts": "^5.0.1"
"react-scripts": "^5.0.1",
"typescript": "^4.6.3"
}
}
Loading

0 comments on commit 7a50aba

Please sign in to comment.