From b9eaeafc1cc3987855ebfdc724de2af069df887f Mon Sep 17 00:00:00 2001
From: Michael Clark <5285928+MikesGlitch@users.noreply.github.com>
Date: Thu, 16 Jan 2025 09:51:37 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20=20Prep=20work=20for=20merging?=
 =?UTF-8?q?=20actual-server=20into=20actual=20repo=20(#4160)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* prep work for merging actual-server into actual repo

* release notes
---
 .yarnrc.yml                     | 2 ++
 eslint.config.mjs               | 1 +
 packages/loot-core/package.json | 4 ++--
 upcoming-release-notes/4160.md  | 6 ++++++
 yarn.lock                       | 8 ++++----
 5 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 upcoming-release-notes/4160.md

diff --git a/.yarnrc.yml b/.yarnrc.yml
index 4ea9859784..5f2f2bd3b6 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -2,6 +2,8 @@ compressionLevel: mixed
 
 enableGlobalCache: false
 
+enableTransparentWorkspaces: false
+
 nodeLinker: node-modules
 
 yarnPath: .yarn/releases/yarn-4.3.1.cjs
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 202b3986d5..0d02846700 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -113,6 +113,7 @@ export default [
       'packages/loot-core/**/node_modules/*',
       'packages/loot-core/**/lib-dist/*',
       'packages/loot-core/**/proto/*',
+      'packages/sync-server',
       '.yarn/*',
       '.github/*',
     ],
diff --git a/packages/loot-core/package.json b/packages/loot-core/package.json
index a5b50a07bb..e40604e4a5 100644
--- a/packages/loot-core/package.json
+++ b/packages/loot-core/package.json
@@ -40,8 +40,8 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@actual-app/api": "*",
-    "@actual-app/crdt": "*",
+    "@actual-app/api": "workspace:^",
+    "@actual-app/crdt": "workspace:^",
     "@swc/core": "^1.5.3",
     "@swc/helpers": "^0.5.11",
     "@swc/jest": "^0.2.36",
diff --git a/upcoming-release-notes/4160.md b/upcoming-release-notes/4160.md
new file mode 100644
index 0000000000..5ad73134f9
--- /dev/null
+++ b/upcoming-release-notes/4160.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MikesGlitch]
+---
+
+Updating linting rules and disabling yarn TransparentWorkspaces in prep for merging actual-server into actual repository
diff --git a/yarn.lock b/yarn.lock
index 0722add2e6..5f8c0ce4c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19,7 +19,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@actual-app/api@npm:*, @actual-app/api@workspace:packages/api":
+"@actual-app/api@workspace:^, @actual-app/api@workspace:packages/api":
   version: 0.0.0-use.local
   resolution: "@actual-app/api@workspace:packages/api"
   dependencies:
@@ -38,7 +38,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@actual-app/crdt@npm:*, @actual-app/crdt@workspace:^, @actual-app/crdt@workspace:packages/crdt":
+"@actual-app/crdt@workspace:^, @actual-app/crdt@workspace:packages/crdt":
   version: 0.0.0-use.local
   resolution: "@actual-app/crdt@workspace:packages/crdt"
   dependencies:
@@ -13728,8 +13728,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "loot-core@workspace:packages/loot-core"
   dependencies:
-    "@actual-app/api": "npm:*"
-    "@actual-app/crdt": "npm:*"
+    "@actual-app/api": "workspace:^"
+    "@actual-app/crdt": "workspace:^"
     "@jlongster/sql.js": "npm:^1.6.7"
     "@reduxjs/toolkit": "npm:^2.5.0"
     "@rschedule/core": "npm:^1.5.0"