Merge branch 'master' into i18n

* master:
  fix: use correct comment style
  build: remove patch-package dependency from loot-design
  Conditionally set MSYS
  build: update yarn.lock
  build: use workspace ranges for monorepo dependencies
  changes needed to build on windows

packages/desktop-client/package.json

@@ -85,10 +85,10 @@
   },
   "scripts": {
     "start": "cross-env PORT=3001 node scripts/start.js",
-    "start:browser": "./bin/watch-browser",
+    "start:browser": "cross-env ./bin/watch-browser",
     "watch": "cross-env PORT=3001 node scripts/start.js",
     "build": "cross-env INLINE_RUNTIME_CHUNK=false node scripts/build.js",
-    "build:browser": "./bin/build-browser",
+    "build:browser": "cross-env ./bin/build-browser",
     "lint": "eslint src",
     "check-i18n": "i18next"
   },

packages/desktop-electron/package.json

@@ -48,7 +48,7 @@
     "electron-is-dev": "2.0.0",
     "electron-log": "4.3.2",
     "electron-updater": "4.3.8",
-    "loot-core": "*",
+    "loot-core": "workspace:*",
     "node-fetch": "^1.6.3",
     "node-ipc": "9.1.4"
   },

packages/import-ynab4/package.json

@@ -16,7 +16,7 @@
   "bin": "./index.js",
   "homepage": "https://github.com/actualbudget/actual/tree/master/packages/import-ynab4#readme",
   "dependencies": {
-    "@actual-app/api": "^1.0.0",
+    "@actual-app/api": "workspace:*",
     "adm-zip": "^0.5.9",
     "date-fns": "2.0.0-alpha.27",
     "slash": "3.0.0",

packages/import-ynab5/package.json

@@ -16,7 +16,7 @@
   "bin": "./index.js",
   "homepage": "https://github.com/actualbudget/actual/tree/master/packages/import-ynab5#readme",
   "dependencies": {
-    "@actual-app/api": "^1.0.0",
+    "@actual-app/api": "workspace:*",
     "date-fns": "2.0.0-alpha.27",
     "uuid": "3.3.2"
   }

packages/loot-core/bin/build-browser

@@ -22,6 +22,10 @@ if [ $NODE_ENV == 'development' ]; then
   # Make sure to do this before starting the build since watch mode
   # will block
   WEBPACK_ARGS="$WEBPACK_ARGS --watch"
+  if [ "$OSTYPE" == "msys" ]; then
+    # Ensure symlinks are created as native Windows symlinks.
+    export MSYS=winsymlinks:nativestrict
+  fi
   ln -snf "$ROOT"/../lib-dist/browser ../../desktop-client/public/kcab
 fi
 

packages/loot-core/package.json

@@ -35,12 +35,12 @@
     "md5": "^2.3.0",
     "mitt": "^2.1.0",
     "node-fetch": "^1.6.3",
-    "node-libofx": "*",
+    "node-libofx": "workspace:*",
     "regenerator-runtime": "^0.13.7"
   },
   "devDependencies": {
-    "@actual-app/api": "*",
+    "@actual-app/api": "workspace:*",
-    "@actual-app/import-ynab4": "*",
+    "@actual-app/import-ynab4": "workspace:*",
     "@babel/core": "~7.14.3",
     "@types/jest": "^27.5.0",
     "adm-zip": "^0.5.9",

packages/loot-design/package.json

@@ -36,9 +36,7 @@
   "dependencies": {
     "@juggle/resize-observer": "^3.1.2",
     "hotkeys-js": "3.8.2",
-    "patch-package": "^6.1.2",
     "pikaday": "1.8.0",
-    "postinstall-postinstall": "^2.0.0",
     "react-dnd": "^10.0.2",
     "react-merge-refs": "^1.1.0",
     "react-modal": "3.4.4",
@@ -48,7 +46,6 @@
   "scripts": {
     "start": "react-scripts start",
     "start:mobile": "IS_REACT_NATIVE=1 react-scripts start",
-    "postinstall": "patch-package",
     "test": "npm-run-all -cp 'test:*'",
     "test:web": "jest -c jest.config.js",
     "test:react-native": "jest -c jest.rn.config.js"

yarn.lock

@@ -12,7 +12,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@actual-app/api@*, @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:
@@ -22,21 +22,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@actual-app/api@npm:^1.0.0":
+"@actual-app/import-ynab4@workspace:*, @actual-app/import-ynab4@workspace:packages/import-ynab4":
-  version: 1.1.3
-  resolution: "@actual-app/api@npm:1.1.3"
-  dependencies:
-    node-ipc: 9.1.1
-    uuid: 3.3.2
-  checksum: e7fccff7583d64ac908eb7a7c93226200fd75af92b9fe9718b6e3fe0d004d92d79d87485e212b0d3d86cb685827e6733c939ece799156eea64db886bf1457a94
-  languageName: node
-  linkType: hard
-
-"@actual-app/import-ynab4@*, @actual-app/import-ynab4@workspace:packages/import-ynab4":
   version: 0.0.0-use.local
   resolution: "@actual-app/import-ynab4@workspace:packages/import-ynab4"
   dependencies:
-    "@actual-app/api": ^1.0.0
+    "@actual-app/api": "workspace:*"
     adm-zip: ^0.5.9
     date-fns: 2.0.0-alpha.27
     slash: 3.0.0
@@ -50,7 +40,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@actual-app/import-ynab5@workspace:packages/import-ynab5"
   dependencies:
-    "@actual-app/api": ^1.0.0
+    "@actual-app/api": "workspace:*"
     date-fns: 2.0.0-alpha.27
     uuid: 3.3.2
   bin:
@@ -4312,7 +4302,7 @@ __metadata:
     electron-notarize: 1.0.0
     electron-rebuild: 2.3.5
     electron-updater: 4.3.8
-    loot-core: "*"
+    loot-core: "workspace:*"
     node-fetch: ^1.6.3
     node-ipc: 9.1.4
   languageName: unknown
@@ -9033,7 +9023,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"easy-stack@npm:^1.0.0, easy-stack@npm:^1.0.1":
+"easy-stack@npm:^1.0.1":
   version: 1.0.1
   resolution: "easy-stack@npm:1.0.1"
   checksum: 161a99e497b3857b0be4ec9e1ebbe90b241ea9d84702f9881b8e5b3f6822065b8c4e33436996935103e191bffba3607de70712a792f4d406a050def48c6bc381
@@ -14144,13 +14134,6 @@ jest-snapshot@test:
   languageName: node
   linkType: hard
 
-"js-message@npm:1.0.5":
-  version: 1.0.5
-  resolution: "js-message@npm:1.0.5"
-  checksum: fd2fc8837a88a115aa2fa859bf5c13d9b335fd7eeba8426c44da6eb006b04c52cfe6675b3c27d6b112ffc51dadb8bc51d58340c3a3aa5c555d7da6bdc72ce9c0
-  languageName: node
-  linkType: hard
-
 "js-message@npm:1.0.7":
   version: 1.0.7
   resolution: "js-message@npm:1.0.7"
@@ -14158,15 +14141,6 @@ jest-snapshot@test:
   languageName: node
   linkType: hard
 
-"js-queue@npm:2.0.0":
-  version: 2.0.0
-  resolution: "js-queue@npm:2.0.0"
-  dependencies:
-    easy-stack: ^1.0.0
-  checksum: 8f8e589cc20fd3bc3067db73ecaac77b55411c3ac58fdd6882868924ee19ab4203d19e68d3ec680c5c8f5e8282e30dafa377014dbec05c3f2d33be4596f4fb65
-  languageName: node
-  linkType: hard
-
 "js-queue@npm:2.0.2":
   version: 2.0.2
   resolution: "js-queue@npm:2.0.2"
@@ -15013,12 +14987,12 @@ jest-snapshot@test:
   languageName: node
   linkType: hard
 
-"loot-core@*, loot-core@workspace:packages/loot-core":
+"loot-core@*, loot-core@workspace:*, loot-core@workspace:packages/loot-core":
   version: 0.0.0-use.local
   resolution: "loot-core@workspace:packages/loot-core"
   dependencies:
-    "@actual-app/api": "*"
+    "@actual-app/api": "workspace:*"
-    "@actual-app/import-ynab4": "*"
+    "@actual-app/import-ynab4": "workspace:*"
     "@babel/core": ~7.14.3
     "@babel/register": ^7.12.10
     "@jlongster/mixpanel": ^0.13.4
@@ -15059,7 +15033,7 @@ jest-snapshot@test:
     mockdate: ^3.0.5
     murmurhash: ^0.0.2
     node-fetch: ^1.6.3
-    node-libofx: "*"
+    node-libofx: "workspace:*"
     npm-run-all: ^4.1.3
     perf-deets: ^1.0.15
     prettier: ^1.19.1
@@ -15104,10 +15078,8 @@ jest-snapshot@test:
     memoizee: ^0.4.12
     node-noop: 1.0.0
     npm-run-all: ^4.1.3
-    patch-package: ^6.1.2
     pikaday: 1.8.0
     polished: ^1.8.1
-    postinstall-postinstall: ^2.0.0
     prettier: ^1.14.2
     prop-types: 15.6.0
     react: 16.13.1
@@ -16587,17 +16559,6 @@ jest-snapshot@test:
   languageName: node
   linkType: hard
 
-"node-ipc@npm:9.1.1":
-  version: 9.1.1
-  resolution: "node-ipc@npm:9.1.1"
-  dependencies:
-    event-pubsub: 4.3.0
-    js-message: 1.0.5
-    js-queue: 2.0.0
-  checksum: 2b66099d1976e4328d34ae7fec853d3969ca337b52b5aefb48ae1d19387c37d6716c2b98d4a4934ec24aa79f0441721961d6c1beb858c294ad6a7a97ddf5460d
-  languageName: node
-  linkType: hard
-
 "node-ipc@npm:9.1.4":
   version: 9.1.4
   resolution: "node-ipc@npm:9.1.4"
@@ -16609,7 +16570,7 @@ jest-snapshot@test:
   languageName: node
   linkType: hard
 
-"node-libofx@*, node-libofx@workspace:packages/node-libofx":
+"node-libofx@workspace:*, node-libofx@workspace:packages/node-libofx":
   version: 0.0.0-use.local
   resolution: "node-libofx@workspace:packages/node-libofx"
   languageName: unknown
@@ -18787,13 +18748,6 @@ jest-snapshot@test:
   languageName: node
   linkType: hard
 
-"postinstall-postinstall@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "postinstall-postinstall@npm:2.1.0"
-  checksum: e1d34252cf8d2c5641c7d2db7426ec96e3d7a975f01c174c68f09ef5b8327bc8d5a9aa2001a45e693db2cdbf69577094d3fe6597b564ad2d2202b65fba76134b
-  languageName: node
-  linkType: hard
-
 "prebuild-install@npm:^6.0.1":
   version: 6.1.4
   resolution: "prebuild-install@npm:6.1.4"