Skip to content

Commit

Permalink
Merge pull request #820 from amvanbaren/bugfix/fix-815
Browse files Browse the repository at this point in the history
Update cli to yarn 4.0.0
  • Loading branch information
amvanbaren authored Oct 26, 2023
2 parents f9e26e3 + 7a7b42d commit 228ee38
Show file tree
Hide file tree
Showing 11 changed files with 4,151 additions and 4,104 deletions.
874 changes: 0 additions & 874 deletions cli/.yarn/releases/yarn-3.6.1.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions cli/.yarn/releases/yarn-4.0.0.cjs

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion cli/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
compressionLevel: mixed

enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.6.1.cjs
yarnPath: .yarn/releases/yarn-4.0.0.cjs
2 changes: 1 addition & 1 deletion cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,5 @@
"publish:next": "yarn npm publish --tag next",
"publish:latest": "yarn npm publish --tag latest"
},
"packageManager": "yarn@3.6.1"
"packageManager": "yarn@4.0.0"
}
1,416 changes: 708 additions & 708 deletions cli/yarn.lock

Large diffs are not rendered by default.

874 changes: 0 additions & 874 deletions webui/.yarn/releases/yarn-3.6.1.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions webui/.yarn/releases/yarn-4.0.0.cjs

Large diffs are not rendered by default.

14 changes: 9 additions & 5 deletions webui/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
nodeLinker: node-modules
compressionLevel: mixed

enableGlobalCache: false

yarnPath: .yarn/releases/yarn-3.6.1.cjs
nodeLinker: node-modules

packageExtensions:
"react-avatar-editor@^13.0.0":
packageExtensions:
react-avatar-editor@^13.0.0:
peerDependencies:
"@babel/core": "^7.0.0"
"@babel/core": ^7.0.0

yarnPath: .yarn/releases/yarn-4.0.0.cjs
9 changes: 5 additions & 4 deletions webui/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
FROM node:18-alpine3.17 as builder
FROM node:20-alpine3.17 as builder

# Copy sources
COPY --chown=node:node package.json tsconfig.json yarn.lock /home/node/builder/
COPY --chown=node:node package.json tsconfig.json yarn.lock .yarnrc.yml /home/node/builder/
WORKDIR /home/node/builder
COPY --chown=node:node .yarn ./.yarn/
COPY --chown=node:node configs ./configs/
COPY --chown=node:node src ./src/
COPY --chown=node:node static ./static/
Expand All @@ -11,13 +12,13 @@ COPY --chown=node:node test ./test/
# Build and test the library and default app
RUN corepack enable
RUN corepack prepare yarn@stable --activate
RUN yarn install --frozen-lockfile
RUN yarn install --immutable
RUN yarn test
RUN yarn build
RUN yarn build:default


FROM node:18-alpine3.17
FROM node:20-alpine3.17

# Copy build result to runtime directory
COPY --chown=node:node --from=builder /home/node/builder/static /home/node/webui/static/
Expand Down
2 changes: 1 addition & 1 deletion webui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,5 @@
"publish:next": "yarn npm publish --tag next",
"publish:latest": "yarn npm publish --tag latest"
},
"packageManager": "yarn@3.6.1"
"packageManager": "yarn@4.0.0"
}
Loading

0 comments on commit 228ee38

Please sign in to comment.