Merge pull request #10194 from Budibase/chore/lerna_and_nx

Chore - Update lerna and use nx
2023-04-04 10:53:02 +02:00 · 2023-04-04 10:53:02 +02:00 · 640c5c445a
parent b841cec4c9 e052ab50c7
commit 640c5c445a
12 changed files with 2632 additions and 3789 deletions
--- a/.nvmrc
+++ b/.nvmrc
@ -1 +1 @@
-v14.19.3
+v14.20.1
--- a/.nxignore
+++ b/.nxignore
@ -0,0 +1,14 @@
+node_modules
+**/node_modules
+
+**/dist/
+**/.routify/
+
+**/coverage/
+**/yarn-error.log
+
+**/prebuilds/
+**/build/
+
+packages/server/builder/*
+packages/server/client/*
--- a/.python-version
+++ b/.python-version
@ -1 +1 @@
-3.11.1
+3.10.0
--- a/.tool-versions
+++ b/.tool-versions
@ -1,2 +1,2 @@
-nodejs 14.19.3
+nodejs 14.20.1
 python 3.10.0
--- a/lerna.json
+++ b/lerna.json
@ -1,9 +1,7 @@
 {
  "version": "2.4.44-alpha.4",
  "npmClient": "yarn",
-  "packages": [
-    "packages/*"
-  ],
+  "packages": ["packages/*"],
  "command": {
    "publish": {
      "ignoreChanges": [
--- a/nx.json
+++ b/nx.json
@ -0,0 +1,10 @@
+{
+  "tasksRunnerOptions": {
+    "default": {
+      "runner": "nx/tasks-runners/default",
+      "options": {
+        "cacheableOperations": ["build", "test"]
+      }
+    }
+  }
+}
--- a/package.json
+++ b/package.json
@ -12,7 +12,7 @@
    "husky": "^7.0.1",
    "js-yaml": "^4.1.0",
    "kill-port": "^1.6.1",
-    "lerna": "3.14.1",
+    "lerna": "^6.6.1",
    "madge": "^6.0.0",
    "prettier": "^2.3.1",
    "prettier-plugin-svelte": "^2.3.0",
@ -24,10 +24,10 @@
  "scripts": {
    "setup": "node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev",
    "bootstrap": "lerna bootstrap && lerna link && ./scripts/link-dependencies.sh",
-    "build": "lerna run build",
-    "build:dev": "lerna run prebuild && tsc --build --watch --preserveWatchOutput",
-    "build:backend": "lerna run build --ignore @budibase/client --ignore @budibase/bbui --ignore @budibase/builder --ignore @budibase/cli",
-    "build:sdk": "lerna run build:sdk",
+    "build": "lerna run --stream build",
+    "build:dev": "lerna run --stream prebuild && tsc --build --watch --preserveWatchOutput",
+    "build:backend": "lerna run --stream build --ignore @budibase/client --ignore @budibase/bbui --ignore @budibase/builder --ignore @budibase/cli",
+    "build:sdk": "lerna run --stream build:sdk",
    "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular",
    "release": "lerna publish ${RELEASE_VERSION_TYPE:-patch} --yes --force-publish && yarn release:pro",
    "release:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop --exact && yarn release:pro:develop",
@ -36,15 +36,15 @@
    "restore": "yarn run clean && yarn run bootstrap && yarn run build",
    "nuke": "yarn run nuke:packages && yarn run nuke:docker",
    "nuke:packages": "yarn run restore",
-    "nuke:docker": "lerna run --parallel dev:stack:nuke",
+    "nuke:docker": "lerna run --stream --parallel dev:stack:nuke",
    "clean": "lerna clean",
    "kill-builder": "kill-port 3000",
    "kill-server": "kill-port 4001 4002",
    "kill-all": "yarn run kill-builder && yarn run kill-server",
-    "dev": "yarn run kill-all && lerna link && lerna run --parallel dev:builder --concurrency 1",
-    "dev:noserver": "yarn run kill-builder && lerna link && lerna run dev:stack:up && lerna run --parallel dev:builder --concurrency 1 --ignore @budibase/backend-core --ignore @budibase/server --ignore @budibase/worker",
-    "dev:server": "yarn run kill-server && lerna run --parallel dev:builder --concurrency 1 --scope @budibase/backend-core --scope @budibase/worker --scope @budibase/server",
-    "test": "lerna run test --stream",
+    "dev": "yarn run kill-all && lerna link && lerna run --stream --parallel dev:builder --concurrency 1 --stream",
+    "dev:noserver": "yarn run kill-builder && lerna link && lerna run --stream dev:stack:up && lerna run --stream --parallel dev:builder --concurrency 1 --ignore @budibase/backend-core --ignore @budibase/server --ignore @budibase/worker",
+    "dev:server": "yarn run kill-server && lerna run --stream --parallel dev:builder --concurrency 1 --scope @budibase/backend-core --scope @budibase/worker --scope @budibase/server",
+    "test": "lerna run --stream test --stream",
    "test:pro": "bash scripts/pro/test.sh",
    "lint:eslint": "eslint packages && eslint qa-core",
    "lint:prettier": "prettier --check \"packages/**/*.{js,ts,svelte}\" && prettier --write \"examples/**/*.{js,ts,svelte}\" && prettier --check \"qa-core/**/*.{js,ts,svelte}\"",
@ -52,12 +52,12 @@
    "lint:fix:eslint": "eslint --fix packages qa-core",
    "lint:fix:prettier": "prettier --write \"packages/**/*.{js,ts,svelte}\" && prettier --write \"examples/**/*.{js,ts,svelte}\" && prettier --write \"qa-core/**/*.{js,ts,svelte}\"",
    "lint:fix": "yarn run lint:fix:prettier && yarn run lint:fix:eslint",
-    "build:specs": "lerna run specs",
-    "build:docker": "lerna run build:docker && npm run build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION && cd -",
-    "build:docker:pre": "lerna run build && lerna run predocker",
+    "build:specs": "lerna run --stream specs",
+    "build:docker": "lerna run --stream build:docker && npm run build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION && cd -",
+    "build:docker:pre": "lerna run --stream build && lerna run --stream predocker",
    "build:docker:proxy": "docker build hosting/proxy -t proxy-service",
-    "build:docker:selfhost": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh latest && cd -",
-    "build:docker:develop": "node scripts/pinVersions && lerna run build:docker && npm run build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -",
+    "build:docker:selfhost": "lerna run --stream build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh latest && cd -",
+    "build:docker:develop": "node scripts/pinVersions && lerna run --stream build:docker && npm run build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -",
    "build:docker:airgap": "node hosting/scripts/airgapped/airgappedDockerBuild",
    "build:digitalocean": "cd hosting/digitalocean && ./build.sh && cd -",
    "build:docker:single:multiarch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/single/Dockerfile -t budibase:latest .",
@ -66,16 +66,16 @@
    "build:docker:dependencies": "docker build -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest ./hosting",
    "publish:docker:couch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile -t budibase/couchdb:latest -t budibase/couchdb:v3.2.1 --push ./hosting/couchdb",
    "publish:docker:dependencies": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest -t budibase/dependencies:v3.2.1 --push ./hosting",
-    "build:docs": "lerna run build:docs",
+    "build:docs": "lerna run --stream build:docs",
    "release:helm": "node scripts/releaseHelmChart",
-    "env:multi:enable": "lerna run env:multi:enable",
-    "env:multi:disable": "lerna run env:multi:disable",
-    "env:selfhost:enable": "lerna run env:selfhost:enable",
-    "env:selfhost:disable": "lerna run env:selfhost:disable",
+    "env:multi:enable": "lerna run --stream env:multi:enable",
+    "env:multi:disable": "lerna run --stream env:multi:disable",
+    "env:selfhost:enable": "lerna run --stream env:selfhost:enable",
+    "env:selfhost:disable": "lerna run --stream env:selfhost:disable",
    "env:localdomain:enable": "./scripts/localdomain.sh enable",
    "env:localdomain:disable": "./scripts/localdomain.sh disable",
-    "env:account:enable": "lerna run env:account:enable",
-    "env:account:disable": "lerna run env:account:disable",
+    "env:account:enable": "lerna run --stream env:account:enable",
+    "env:account:disable": "lerna run --stream env:account:disable",
    "mode:self": "yarn env:selfhost:enable && yarn env:multi:disable && yarn env:account:disable",
    "mode:cloud": "yarn env:selfhost:disable && yarn env:multi:enable && yarn env:account:disable",
    "mode:account": "yarn mode:cloud && yarn env:account:enable",
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -99,7 +99,7 @@
    "node-fetch": "2.6.7",
    "open": "8.4.0",
    "pg": "8.5.1",
-    "pino-pretty": "4.0.0",
+    "pino-pretty": "5.1.3",
    "posthog-node": "1.3.0",
    "pouchdb": "7.3.0",
    "pouchdb-adapter-memory": "7.2.2",
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@ -5031,14 +5031,6 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.1.0:
    escape-string-regexp "^1.0.5"
    supports-color "^5.3.0"

-chalk@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
-  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0:
  version "4.1.2"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
@ -5625,10 +5617,10 @@ date-utils@*:
  resolved "https://registry.yarnpkg.com/date-utils/-/date-utils-1.2.21.tgz#61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"
  integrity sha512-wJMBjqlwXR0Iv0wUo/lFbhSQ7MmG1hl36iuxuE91kW+5b5sWbase73manEqNH9sOLFAMG83B4ffNKq9/Iq0FVA==

-dateformat@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
-  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
+dateformat@^4.5.1:
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5"
+  integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==

 dayjs@^1.10.4, dayjs@^1.10.5:
  version "1.11.3"
@ -9315,12 +9307,7 @@ join-component@^1.1.0:
  resolved "https://registry.yarnpkg.com/join-component/-/join-component-1.1.0.tgz#b8417b750661a392bee2c2537c68b2a9d4977cd5"
  integrity sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==

-joycon@^2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/joycon/-/joycon-2.2.5.tgz#8d4cf4cbb2544d7b7583c216fcdfec19f6be1615"
-  integrity sha512-YqvUxoOcVPnCp0VU1/56f+iKSdvIRJYPznH22BdXV3xMk75SFXhWeJkZ8C9XxUWt1b5x2X1SxuFygW1U0FmkEQ==
-
-joycon@^3.0.1:
+joycon@^3.0.0, joycon@^3.0.1:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03"
  integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==
@ -11640,22 +11627,23 @@ pino-http@^5.0.1:
    pino "^6.13.0"
    pino-std-serializers "^4.0.0"

-pino-pretty@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-4.0.0.tgz#afbff81f946342b9d6eabc434942fe490e02faa9"
-  integrity sha512-YLy/n3dMXYWOodSm530gelkSAJGmEp29L9pqiycInlIae5FEJPWAkMRO3JFMbIFtjD2Ve4SH2aBcz2aRreGpBQ==
+pino-pretty@5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-5.1.3.tgz#c4085093d1dffda359ab52731f87d96f7f832dc9"
+  integrity sha512-Zj+0TVdYKkAAIx9EUCL5e4TttwgsaFvJh2ceIMQeFCY8ak9tseEZQGSgpvyjEj1/iIVGIh5tdhkGEQWSMILKHA==
  dependencies:
    "@hapi/bourne" "^2.0.0"
    args "^5.0.1"
-    chalk "^3.0.0"
-    dateformat "^3.0.3"
+    chalk "^4.0.0"
+    dateformat "^4.5.1"
    fast-safe-stringify "^2.0.7"
    jmespath "^0.15.0"
-    joycon "^2.2.5"
+    joycon "^3.0.0"
    pump "^3.0.0"
    readable-stream "^3.6.0"
+    rfdc "^1.3.0"
    split2 "^3.1.1"
-    strip-json-comments "^3.0.1"
+    strip-json-comments "^3.1.1"

 pino-std-serializers@^3.1.0:
  version "3.2.0"
@ -12699,7 +12687,7 @@ reusify@^1.0.4:
  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==

-rfdc@^1.2.0:
+rfdc@^1.2.0, rfdc@^1.3.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -66,7 +66,7 @@
    "passport-google-oauth": "2.0.0",
    "passport-jwt": "4.0.0",
    "passport-local": "1.0.0",
-    "pino-pretty": "4.8.0",
+    "pino-pretty": "5.1.3",
    "pouchdb": "7.3.0",
    "pouchdb-all-dbs": "1.1.1",
    "server-destroy": "1.0.1"
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@ -5765,10 +5765,10 @@ join-component@^1.1.0:
  resolved "https://registry.yarnpkg.com/join-component/-/join-component-1.1.0.tgz#b8417b750661a392bee2c2537c68b2a9d4977cd5"
  integrity sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==

-joycon@^2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/joycon/-/joycon-2.2.5.tgz#8d4cf4cbb2544d7b7583c216fcdfec19f6be1615"
-  integrity sha512-YqvUxoOcVPnCp0VU1/56f+iKSdvIRJYPznH22BdXV3xMk75SFXhWeJkZ8C9XxUWt1b5x2X1SxuFygW1U0FmkEQ==
+joycon@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03"
+  integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==

 js-tokens@^4.0.0:
  version "4.0.0"
@ -7265,10 +7265,10 @@ pino-http@^5.0.1:
    pino "^6.13.0"
    pino-std-serializers "^4.0.0"

-pino-pretty@4.8.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-4.8.0.tgz#f2f3055bf222456217b14ffb04d8be0a0cc17fce"
-  integrity sha512-mhQfHG4rw5ZFpWL44m0Utjo4GC2+HMfdNvxyA8lLw0sIqn6fCf7uQe6dPckUcW/obly+OQHD7B/MTso6LNizYw==
+pino-pretty@5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-5.1.3.tgz#c4085093d1dffda359ab52731f87d96f7f832dc9"
+  integrity sha512-Zj+0TVdYKkAAIx9EUCL5e4TttwgsaFvJh2ceIMQeFCY8ak9tseEZQGSgpvyjEj1/iIVGIh5tdhkGEQWSMILKHA==
  dependencies:
    "@hapi/bourne" "^2.0.0"
    args "^5.0.1"
@ -7276,7 +7276,7 @@ pino-pretty@4.8.0:
    dateformat "^4.5.1"
    fast-safe-stringify "^2.0.7"
    jmespath "^0.15.0"
-    joycon "^2.2.5"
+    joycon "^3.0.0"
    pump "^3.0.0"
    readable-stream "^3.6.0"
    rfdc "^1.3.0"
--- a/yarn.lock
+++ b/yarn.lock
 @ -1 +1 @@
 .11.1
 .10.0