Skip to content

Commit

Permalink
⬆️ (yarn) upgrade yarn to v4 and better-sqlite3 to v9.1.1 and node to…
Browse files Browse the repository at this point in the history
  • Loading branch information
MatissJanis authored and MMichotte committed Sep 9, 2024
1 parent ce3d5c9 commit b726d1e
Show file tree
Hide file tree
Showing 14 changed files with 2,776 additions and 3,322 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: 16
node-version: 18
- name: Cache
uses: actions/cache@v2
id: cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: 16
node-version: 18
- name: Cache
uses: actions/cache@v2
id: cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v1
with:
node-version: 16
node-version: 18
- name: Cache
uses: actions/cache@v2
id: cache
Expand Down
541 changes: 0 additions & 541 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

28 changes: 0 additions & 28 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

This file was deleted.

873 changes: 0 additions & 873 deletions .yarn/releases/yarn-3.4.1.cjs

This file was deleted.

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

Large diffs are not rendered by default.

8 changes: 1 addition & 7 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: '@yarnpkg/plugin-workspace-tools'
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-3.4.1.cjs
yarnPath: .yarn/releases/yarn-4.0.1.cjs
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM node:16-bullseye as base
FROM node:18-bullseye as base
RUN apt-get update && apt-get install -y openssl
WORKDIR /app
ADD .yarn ./.yarn
ADD yarn.lock package.json .yarnrc.yml ./
RUN yarn workspaces focus --all --production

FROM node:16-bullseye-slim as prod
FROM node:18-bullseye-slim as prod
RUN apt-get update && apt-get install tini && apt-get clean -y && rm -rf /var/lib/apt/lists/*
WORKDIR /app
COPY --from=base /app/node_modules /app/node_modules
Expand Down
4 changes: 2 additions & 2 deletions docker/edge-ubuntu.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-bullseye as base
FROM node:18-bullseye as base
RUN apt-get update && apt-get install -y openssl jq
WORKDIR /app
ADD .yarn ./.yarn
Expand All @@ -13,7 +13,7 @@ ARG GITHUB_TOKEN
RUN curl -L -o /tmp/desktop-client.zip --header "Authorization: Bearer ${GITHUB_TOKEN}" $(jq -r '.archive_download_url' /tmp/latest-build.json)
RUN unzip /tmp/desktop-client.zip -d /public

FROM node:16-bullseye-slim as prod
FROM node:18-bullseye-slim as prod
RUN apt-get update && apt-get install tini && apt-get clean -y && rm -rf /var/lib/apt/lists/*
WORKDIR /app
COPY --from=base /app/node_modules /app/node_modules
Expand Down
4 changes: 2 additions & 2 deletions docker/stable-ubuntu.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM node:16-bullseye as base
FROM node:18-bullseye as base
RUN apt-get update && apt-get install -y openssl
WORKDIR /app
ADD .yarn ./.yarn
ADD yarn.lock package.json .yarnrc.yml ./
RUN yarn workspaces focus --all --production

FROM node:16-bullseye-slim as prod
FROM node:18-bullseye-slim as prod
RUN apt-get update && apt-get install tini && apt-get clean -y && rm -rf /var/lib/apt/lists/*
WORKDIR /app
COPY --from=base /app/node_modules /app/node_modules
Expand Down
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@actual-app/crdt": "2.1.0",
"@actual-app/web": "23.11.0",
"bcrypt": "^5.1.0",
"better-sqlite3": "^8.6.0",
"better-sqlite3": "^9.1.1",
"body-parser": "^1.20.1",
"cors": "^2.8.5",
"date-fns": "^2.30.0",
Expand All @@ -35,7 +35,7 @@
"devDependencies": {
"@babel/preset-typescript": "^7.20.2",
"@types/bcrypt": "^5.0.0",
"@types/better-sqlite3": "^7.6.5",
"@types/better-sqlite3": "^7.6.7",
"@types/cors": "^2.8.13",
"@types/express": "^4.17.17",
"@types/express-actuator": "^1.8.0",
Expand All @@ -52,5 +52,8 @@
"supertest": "^6.3.1",
"typescript": "^4.9.5"
},
"packageManager": "[email protected]"
"engines": {
"node": ">=18.0.0"
},
"packageManager": "[email protected]"
}
6 changes: 6 additions & 0 deletions upcoming-release-notes/277.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
category: Maintenance
authors: [MatissJanis]
---

Upgrade `yarn` to v4 and `better-sqlite3` to v9.1.1
Loading

0 comments on commit b726d1e

Please sign in to comment.