Merge branch 'dev' into user-profiles

.gitignore

@@ -2,6 +2,7 @@
 
 # dependencies
 /node_modules
+/tooldb-worker/node_modules
 /.pnp
 .pnp.js
 
@@ -21,12 +22,12 @@
 ipfs
 .idea
 
-/public/worker.js
-
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 build-storybook.log
 storybook-static/**
 src/info.json
-dist-worker
+dist-worker
+dist-cards-worker
+dist-tooldb-worker

worker-tsconfig.json → cards-worker-tsconfig.json

@@ -7,7 +7,7 @@
     ],
     "module": "commonjs",
     "sourceMap": false,
-    "outDir": "./dist-worker",
+    "outDir": "./dist-cards-worker",
     "downlevelIteration": true,
     "strict": true,
     "moduleResolution": "classic",
@@ -18,4 +18,4 @@
   "include": [
     "src/cards-worker"
   ]
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mtgatool-desktop",
-  "version": "6.2.13",
+  "version": "6.3.8",
   "private": true,
   "main": "public/electron.js",
   "homepage": "./",
@@ -22,7 +22,7 @@
     "lodash": "^4.17.21",
     "match-sorter": "^6.3.0",
     "mathjs": "^9.3.0",
-    "mtgatool-db": "^2.1.4",
+    "mtgatool-db": "^2.1.6",
     "mtgatool-shared": "^2.2.0",
     "qrcode": "^1.5.1",
     "queue": "^6.0.2",
@@ -46,13 +46,15 @@
     "zlib": "^1.0.5"
   },
   "scripts": {
-    "start": "npm run build:worker && nf start -p 3001",
+    "start": "npm run build:workers && nf start -p 3001",
     "cm": "git-cz",
-    "build:worker": "tsc --p worker-tsconfig.json && browserify ./dist-worker/cards-worker/collectionDataWorker.js --standalone worker > ./dist-worker/index.js && uglifyjs ./dist-worker/index.js -c > ./public/worker/index.js",
+    "build:tooldb-worker": "tsc --p tooldb-worker-tsconfig.json && browserify ./dist-tooldb-worker/toolDbWorker.js --standalone tooldbworker > ./public/tooldb-worker/index.js",
+    "build:cards-worker": "tsc --p cards-worker-tsconfig.json && browserify ./dist-cards-worker/cards-worker/collectionDataWorker.js --standalone cardsworker > ./dist-cards-worker/index.js && uglifyjs ./dist-cards-worker/index.js -c > ./public/cards-worker/index.js",
+    "build:workers": "npm run build:tooldb-worker && npm run build:cards-worker",
     "react-start": "node generateInfo.js && craco start",
     "react-build": "craco build",
-    "start:web": "npm run build:worker && craco start --config craco.web.config.js",
-    "build:web": "npm run build:worker && craco build --config craco.web.config.js",
+    "start:web": "npm run build:workers && craco start --config craco.web.config.js",
+    "build:web": "npm run build:workers && craco build --config craco.web.config.js",
     "jest-server": "http-server ./build -p 3000",
     "jest:watch": "craco test --env=jsdom",
     "jest:ci": "craco test --env=jsdom --watchAll=false --testPathIgnorePatterns \"src/__tests__/\"",
@@ -64,7 +66,7 @@
     "electron-start": "node src/start-react",
     "release": "npm run electron-rebuild && npm run react-build && electron-builder --publish=always",
     "build:nopublish": "electron-builder --x64 --publish=never",
-    "build": "npm run build:worker && npm run electron-rebuild && npm run react-build && npm run build:nopublish",
+    "build": "npm run build:workers && npm run electron-rebuild && npm run react-build && npm run build:nopublish",
     "electron-rebuild": "electron-rebuild",
     "semantic-release": "semantic-release",
     "install:ci": "npm install && npm install @craco/craco"