Skip to content

Commit

Permalink
Updating sync server package name to @actual-app/sync-server (actualb…
Browse files Browse the repository at this point in the history
…udget#4370)

* updating sync server to have a consistent package name

* release notes
  • Loading branch information
MikesGlitch authored and lelemm committed Feb 18, 2025
1 parent b272885 commit df25849
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 52 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"scripts": {
"start": "yarn start:browser",
"start:server": "yarn workspace actual-sync start",
"start:server": "yarn workspace @actual-app/sync-server start",
"start:desktop": "yarn rebuild-electron && npm-run-all --parallel 'start:desktop-*'",
"start:desktop-node": "yarn workspace loot-core watch:node",
"start:desktop-client": "yarn workspace @actual-app/web watch",
Expand All @@ -41,7 +41,7 @@
"rebuild-node": "yarn workspace loot-core rebuild",
"lint": "eslint . --max-warnings 0",
"lint:verbose": "DEBUG=eslint:cli-engine eslint . --max-warnings 0",
"install:server": "yarn workspaces focus actual-sync --production",
"install:server": "yarn workspaces focus @actual-app/sync-server --production",
"typecheck": "yarn tsc && tsc-strict",
"jq": "./node_modules/node-jq/bin/jq",
"prepare": "husky"
Expand Down
2 changes: 1 addition & 1 deletion packages/sync-server/docker/edge-alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR /app
COPY .yarn ./.yarn
COPY yarn.lock packages/sync-server/package.json .yarnrc.yml ./
RUN if [ "$(uname -m)" = "armv7l" ]; then yarn config set taskPoolConcurrency 2; yarn config set networkConcurrency 5; fi
RUN yarn workspaces focus actual-sync --production
RUN yarn workspaces focus @actual-app/sync-server --production
RUN if [ "$(uname -m)" = "armv7l" ]; then npm install bcrypt better-sqlite3 --build-from-source; fi

RUN mkdir /public
Expand Down
2 changes: 1 addition & 1 deletion packages/sync-server/docker/edge-ubuntu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR /app
COPY .yarn ./.yarn
COPY yarn.lock packages/sync-server/package.json .yarnrc.yml ./
RUN if [ "$(uname -m)" = "armv7l" ]; then yarn config set taskPoolConcurrency 2; yarn config set networkConcurrency 5; fi
RUN yarn workspaces focus actual-sync --production
RUN yarn workspaces focus @actual-app/sync-server --production

RUN mkdir /public
COPY artifacts.json /tmp/artifacts.json
Expand Down
2 changes: 1 addition & 1 deletion packages/sync-server/docker/stable-alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR /app
COPY .yarn ./.yarn
COPY yarn.lock packages/sync-server/package.json .yarnrc.yml ./
RUN if [ "$(uname -m)" = "armv7l" ]; then yarn config set taskPoolConcurrency 2; yarn config set networkConcurrency 5; fi
RUN yarn workspaces focus actual-sync --production
RUN yarn workspaces focus @actual-app/sync-server --production
RUN if [ "$(uname -m)" = "armv7l" ]; then npm install bcrypt better-sqlite3 --build-from-source; fi

FROM alpine:3.18 AS prod
Expand Down
2 changes: 1 addition & 1 deletion packages/sync-server/docker/stable-ubuntu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR /app
COPY .yarn ./.yarn
COPY yarn.lock packages/sync-server/package.json .yarnrc.yml ./
RUN if [ "$(uname -m)" = "armv7l" ]; then yarn config set taskPoolConcurrency 2; yarn config set networkConcurrency 5; fi
RUN yarn workspaces focus actual-sync --production
RUN yarn workspaces focus @actual-app/sync-server --production

FROM node:18-bookworm-slim AS prod
RUN apt-get update && apt-get install tini && apt-get clean -y && rm -rf /var/lib/apt/lists/*
Expand Down
2 changes: 1 addition & 1 deletion packages/sync-server/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "actual-sync",
"name": "@actual-app/sync-server",
"version": "25.2.1",
"license": "MIT",
"description": "actual syncing server",
Expand Down
2 changes: 1 addition & 1 deletion sync-server.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ RUN apt-get update && apt-get install -y openssl
WORKDIR /app
COPY .yarn ./.yarn
COPY yarn.lock packages/sync-server/package.json .yarnrc.yml ./
RUN yarn workspaces focus actual-sync --production
RUN yarn workspaces focus @actual-app/sync-server --production

FROM node:18-bookworm-slim as prod
RUN apt-get update && apt-get install tini && apt-get clean -y && rm -rf /var/lib/apt/lists/*
Expand Down
6 changes: 6 additions & 0 deletions upcoming-release-notes/4370.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
category: Maintenance
authors: [MikesGlitch]
---

Update package name of sync server to be consistent with the rest of the workspace
88 changes: 44 additions & 44 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,50 @@ __metadata:
languageName: unknown
linkType: soft

"@actual-app/sync-server@workspace:packages/sync-server":
version: 0.0.0-use.local
resolution: "@actual-app/sync-server@workspace:packages/sync-server"
dependencies:
"@actual-app/crdt": "npm:2.1.0"
"@actual-app/web": "npm:25.2.1"
"@babel/preset-typescript": "npm:^7.20.2"
"@types/bcrypt": "npm:^5.0.2"
"@types/better-sqlite3": "npm:^7.6.12"
"@types/cors": "npm:^2.8.13"
"@types/express": "npm:^4.17.17"
"@types/express-actuator": "npm:^1.8.0"
"@types/jest": "npm:^29.2.3"
"@types/node": "npm:^17.0.45"
"@types/supertest": "npm:^2.0.12"
"@types/uuid": "npm:^9.0.0"
"@typescript-eslint/eslint-plugin": "npm:^5.51.0"
"@typescript-eslint/parser": "npm:^5.51.0"
bcrypt: "npm:^5.1.1"
better-sqlite3: "npm:^11.7.0"
body-parser: "npm:^1.20.3"
cors: "npm:^2.8.5"
date-fns: "npm:^2.30.0"
debug: "npm:^4.3.4"
eslint: "npm:^8.33.0"
eslint-plugin-prettier: "npm:^4.2.1"
express: "npm:4.20.0"
express-actuator: "npm:1.8.4"
express-rate-limit: "npm:^6.7.0"
express-response-size: "npm:^0.0.3"
express-winston: "npm:^4.2.0"
jest: "npm:^29.3.1"
jws: "npm:^4.0.0"
migrate: "npm:^2.0.1"
nordigen-node: "npm:^1.4.0"
openid-client: "npm:^5.4.2"
prettier: "npm:^2.8.3"
supertest: "npm:^6.3.1"
typescript: "npm:^4.9.5"
uuid: "npm:^9.0.0"
winston: "npm:^3.14.2"
languageName: unknown
linkType: soft

"@actual-app/web@npm:25.2.1":
version: 25.2.1
resolution: "@actual-app/web@npm:25.2.1"
Expand Down Expand Up @@ -7485,50 +7529,6 @@ __metadata:
languageName: node
linkType: hard

"actual-sync@workspace:packages/sync-server":
version: 0.0.0-use.local
resolution: "actual-sync@workspace:packages/sync-server"
dependencies:
"@actual-app/crdt": "npm:2.1.0"
"@actual-app/web": "npm:25.2.1"
"@babel/preset-typescript": "npm:^7.20.2"
"@types/bcrypt": "npm:^5.0.2"
"@types/better-sqlite3": "npm:^7.6.12"
"@types/cors": "npm:^2.8.13"
"@types/express": "npm:^4.17.17"
"@types/express-actuator": "npm:^1.8.0"
"@types/jest": "npm:^29.2.3"
"@types/node": "npm:^17.0.45"
"@types/supertest": "npm:^2.0.12"
"@types/uuid": "npm:^9.0.0"
"@typescript-eslint/eslint-plugin": "npm:^5.51.0"
"@typescript-eslint/parser": "npm:^5.51.0"
bcrypt: "npm:^5.1.1"
better-sqlite3: "npm:^11.7.0"
body-parser: "npm:^1.20.3"
cors: "npm:^2.8.5"
date-fns: "npm:^2.30.0"
debug: "npm:^4.3.4"
eslint: "npm:^8.33.0"
eslint-plugin-prettier: "npm:^4.2.1"
express: "npm:4.20.0"
express-actuator: "npm:1.8.4"
express-rate-limit: "npm:^6.7.0"
express-response-size: "npm:^0.0.3"
express-winston: "npm:^4.2.0"
jest: "npm:^29.3.1"
jws: "npm:^4.0.0"
migrate: "npm:^2.0.1"
nordigen-node: "npm:^1.4.0"
openid-client: "npm:^5.4.2"
prettier: "npm:^2.8.3"
supertest: "npm:^6.3.1"
typescript: "npm:^4.9.5"
uuid: "npm:^9.0.0"
winston: "npm:^3.14.2"
languageName: unknown
linkType: soft

"actual@workspace:.":
version: 0.0.0-use.local
resolution: "actual@workspace:."
Expand Down

0 comments on commit df25849

Please sign in to comment.