Upgrade to yarn berry

.gitignore

@@ -58,4 +58,7 @@ packages/dappmanager/dnp_repo
 packages/toolkit/truffle/contracts_build/*
 
 # docker tmp
-docker-compose-tmp.yml
+docker-compose-tmp.yml
+
+# yarn berry
+.yarn/install-state.gz

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

package.json

@@ -6,26 +6,25 @@
   "repository": "[email protected]:dappnode/DNP_DAPPMANAGER.git",
   "license": "GPL-3.0",
   "engines": {
-    "node": "20.x"
+    "node": "22.x"
   },
   "workspaces": {
     "packages": [
       "packages/*"
     ]
   },
   "scripts": {
-    "build": "lerna run build --include-dependencies --stream",
-    "test": "lerna run test --stream",
-    "lint": "lerna run lint --stream",
-    "test:int": "lerna run test:int --stream",
-    "pre-commit": "lerna run pre-commit --stream",
-    "mock-standalone:build": "lerna run mock-standalone:build --stream",
-    "generate": "lerna run generate --stream",
-    "clean": "yarn run clean:build && yarn run clean:libraries",
-    "clean:libraries": "rimraf packages/**/node_modules && rimraf node_modules",
-    "clean:build": "rimraf packages/**/dist && rimraf packages/**/build"
+    "build": "yarn workspaces foreach --all -pt run build",
+    "test": "yarn workspaces foreach --all -pt run test",
+    "test:int": "yarn workspaces foreach --all -pt run test:int",
+    "dev": "yarn workspaces foreach --all -pi run dev",
+    "lint": "yarn workspaces foreach --all -pt run lint",
+    "mock-standalone:build": "yarn workspaces focus admin-ui run mock-standalone:build",
+    "generate": "yarn workspaces focus common run generate",
+    "clean": "yarn workspaces foreach --all -pt run clean",
+    "clean:libraries": "yarn workspaces foreach --all -pt run clean:libraries",
+    "clean:build": "yarn workspaces foreach --all -pt run clean:build"
   },
-  "dependencies": {},
   "devDependencies": {
     "@types/chai": "^4.3.11",
     "@types/mocha": "^10.0.6",
@@ -36,11 +35,11 @@
     "depcheck": "^1.4.7",
     "eslint": "^8.44.0",
     "eslint-config-react-app": "^7.0.1",
-    "lerna": "^6.3.0",
     "mocha": "^10.2.0",
     "nodemon": "^3.0.2",
     "rimraf": "^3.0.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3"
-  }
+  },
+  "packageManager": "[email protected]"
 }

packages/admin-ui/package.json

@@ -9,7 +9,6 @@
     "analyze": "npx source-map-explorer build/static/js/main.*",
     "lint": "eslint --ext ts,tsx,js,jsx --fix src",
     "prettier": "prettier --write 'src/**/*.*'",
-    "pre-commit": "yarn lint && CI=true yarn test",
     "mock": "VITE_APP_API_URL=http://localhost:5000 yarn start",
     "server-mock": "PORT=5000 nodemon server-mock/index.ts",
     "server-mock:check-types": "tsc --noEmit --project tsconfig.server-mock.json",

packages/admin-ui/tsconfig.json

@@ -25,5 +25,5 @@
     "isolatedModules": true
   },
   "include": ["src/**/*"],
-  "exclude": ["test/**/*", "src/__tests__/*", "src/__mock-backend__/*"]
+  "exclude": ["test/**/*", "src/__tests__/*", "src/__mock-backend__/*", "build"]
 }

packages/chains/package.json

@@ -19,9 +19,9 @@
     "lint": "eslint . --ext .ts --fix src"
   },
   "dependencies": {
-    "@dappnode/types": "^0.1.36",
     "@dappnode/dockerapi": "^0.1.0",
     "@dappnode/logger": "^0.1.0",
+    "@dappnode/types": "^0.1.36",
     "@dappnode/utils": "^0.1.0",
     "bitcoin-core": "2.0.0",
     "monero-rpc": "0.5.0"

packages/chains/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test", "dist"]
 }

packages/common/tsconfig.json

@@ -16,5 +16,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test", "dist"]
 }

packages/daemons/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test", "dist"]
 }

packages/daemons/tsconfig.test.json

@@ -0,0 +1,8 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": "./test" // Root directory of input files
+  },
+  "include": ["test"],
+  "exclude": ["node_modules", "dist"]
+}

packages/dappmanager/package.json

@@ -16,7 +16,6 @@
     "test:all": "npm run test && npm run test:int",
     "lint": "eslint . --ext .ts --fix",
     "prettier": "prettier --write 'src/**/*.*' 'test/**/*.*'",
-    "pre-commit": "npm run build && npm run test",
     "clean": "rm -rf DNCORE/ dnp_repo/ .temp-transfer/ cache/ dist/"
   },
   "license": "GPL-3.0",

packages/dappmanager/tsconfig.json

@@ -17,5 +17,5 @@
     "experimentalResolver": true
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/db/package.json

@@ -19,12 +19,12 @@
     "lint": "eslint . --ext .ts --fix src"
   },
   "dependencies": {
-    "@dappnode/types": "^0.1.36",
     "@dappnode/dockerapi": "^0.1.0",
     "@dappnode/dockercompose": "^0.1.0",
     "@dappnode/eventbus": "^0.1.0",
     "@dappnode/logger": "^0.1.0",
     "@dappnode/params": "^0.1.0",
+    "@dappnode/types": "^0.1.36",
     "@dappnode/utils": "^0.1.0",
     "lodash-es": "^4.17.21"
   },

packages/db/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/dockerApi/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/dockerCompose/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/dyndns/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/ethicalMetrics/package.json

@@ -17,7 +17,6 @@
     "dev": "tsc -w",
     "lint": "eslint . --ext .ts --fix src"
   },
-  "dependencies": {},
   "devDependencies": {
     "@types/node": "^20.14.10"
   }

packages/ethicalMetrics/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/eventBus/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/hostScriptsServices/package.json

@@ -19,8 +19,8 @@
     "lint": "eslint . --ext .ts --fix src"
   },
   "dependencies": {
-    "@dappnode/types": "^0.1.36",
     "@dappnode/logger": "^0.1.0",
+    "@dappnode/types": "^0.1.36",
     "@dappnode/utils": "^0.1.0",
     "memoizee": "0.4.14"
   },

packages/hostScriptsServices/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/httpsPortal/package.json

@@ -19,11 +19,11 @@
     "lint": "eslint . --ext .ts --fix src"
   },
   "dependencies": {
-    "@dappnode/types": "^0.1.36",
     "@dappnode/dockerapi": "^0.1.0",
     "@dappnode/dockercompose": "^0.1.0",
     "@dappnode/logger": "^0.1.0",
     "@dappnode/params": "^0.1.0",
+    "@dappnode/types": "^0.1.36",
     "@dappnode/utils": "^0.1.0",
     "ajv": "6.10.2",
     "memoizee": "0.4.14"

packages/httpsPortal/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/installer/package.json

@@ -19,7 +19,6 @@
     "lint": "eslint . --ext .ts --fix src"
   },
   "dependencies": {
-    "@dappnode/types": "^0.1.36",
     "@dappnode/db": "^0.1.0",
     "@dappnode/dockerapi": "^0.1.0",
     "@dappnode/dockercompose": "^0.1.0",
@@ -30,6 +29,7 @@
     "@dappnode/params": "^0.1.0",
     "@dappnode/schemas": "^0.1.14",
     "@dappnode/toolkit": "^0.1.22",
+    "@dappnode/types": "^0.1.36",
     "@dappnode/utils": "^0.1.0",
     "deepmerge": "2.2.1",
     "ethers": "^6.10.0",

packages/installer/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/logger/package.json

@@ -19,9 +19,9 @@
     "lint": "eslint . --ext .ts --fix src"
   },
   "dependencies": {
-    "@dappnode/types": "^0.1.36",
     "@dappnode/eventbus": "^0.1.0",
     "@dappnode/params": "^0.1.0",
+    "@dappnode/types": "^0.1.36",
     "@dappnode/utils": "^0.1.0",
     "stack-trace": "0.0.10"
   },

packages/logger/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/migrations/package.json

@@ -20,15 +20,15 @@
     "lint": "eslint . --ext .ts --fix src"
   },
   "dependencies": {
-    "@dappnode/types": "^0.1.36",
     "@dappnode/db": "^0.1.0",
-    "@dappnode/stakers": "^0.1.0",
     "@dappnode/dockerapi": "^0.1.0",
     "@dappnode/dockercompose": "^0.1.0",
     "@dappnode/ethicalmetrics": "^0.1.0",
     "@dappnode/eventbus": "^0.1.0",
     "@dappnode/logger": "^0.1.0",
     "@dappnode/params": "^0.1.0",
+    "@dappnode/stakers": "^0.1.0",
+    "@dappnode/types": "^0.1.36",
     "@dappnode/utils": "^0.1.0",
     "lodash-es": "^4.17.21",
     "semver": "^7.3.8"

packages/migrations/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/optimism/package.json

@@ -18,11 +18,11 @@
     "lint": "eslint . --ext .ts --fix src"
   },
   "dependencies": {
-    "@dappnode/types": "^0.1.36",
     "@dappnode/db": "^0.1.0",
     "@dappnode/dockerapi": "^0.1.0",
     "@dappnode/dockercompose": "^0.1.0",
     "@dappnode/installer": "^0.1.0",
+    "@dappnode/types": "^0.1.36",
     "@dappnode/utils": "^0.1.0"
   },
   "devDependencies": {

packages/optimism/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/params/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/schemas/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/stakers/package.json

@@ -18,11 +18,11 @@
     "lint": "eslint . --ext .ts --fix src"
   },
   "dependencies": {
-    "@dappnode/types": "^0.1.36",
     "@dappnode/db": "^0.1.0",
     "@dappnode/dockerapi": "^0.1.0",
     "@dappnode/installer": "^0.1.0",
     "@dappnode/logger": "^0.1.0",
+    "@dappnode/types": "^0.1.36",
     "@dappnode/utils": "^0.1.0",
     "lodash-es": "^4.17.21",
     "semver": "7.3.8"

packages/stakers/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/toolkit/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/types/package.json

@@ -17,7 +17,6 @@
     "dev": "tsc -w",
     "lint": "eslint . --ext .ts --fix src"
   },
-  "dependencies": {},
   "devDependencies": {
     "@types/node": "^20.14.10"
   }

packages/types/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }

packages/upnpc/package.json

@@ -19,8 +19,8 @@
     "lint": "eslint . --ext .ts --fix src"
   },
   "dependencies": {
-    "@dappnode/types": "^0.1.36",
     "@dappnode/dockerapi": "^0.1.0",
+    "@dappnode/types": "^0.1.36",
     "@dappnode/utils": "^0.1.0",
     "is-ip": "3.0.0"
   },

packages/upnpc/tsconfig.json

@@ -12,5 +12,5 @@
   },
   "ts-node": { "esm": true, "experimentalSpecifierResolution": "node" },
   "include": ["src/**/*", "src/**/*.json"],
-  "exclude": ["node_modules", "test/**/*"]
+  "exclude": ["node_modules", "test/**/*", "dist"]
 }