diff --git a/README.md b/README.md index d39282678..94728e957 100644 --- a/README.md +++ b/README.md @@ -174,6 +174,13 @@ turbo frontend#dev backend#start admin#start --env-mode=loose Tip: for local setup use a local nginx server with similar config like docker nginx [nginx.conf](./nginx/gradido.conf) but replace docker image name with localhost +### Clear +In root folder calling `yarn clear` will clear all turbo caches, node_modules and build folders of all workspaces for a clean rebuild. + +```bash +yarn clear +``` + ## Services defined in this package diff --git a/admin/package.json b/admin/package.json index 31b69defc..98c8cc89e 100644 --- a/admin/package.json +++ b/admin/package.json @@ -19,7 +19,8 @@ "test:debug": "cross-env TZ=UTC node --inspect-brk ./node_modules/vitest/vitest.mjs", "test:watch": "cross-env TZ=UTC vitest", "locales": "scripts/sort.sh", - "locales:fix": "scripts/sort.sh --fix" + "locales:fix": "scripts/sort.sh --fix", + "clear": "rm -rf node_modules && rm -rf build && rm -rf .turbo" }, "dependencies": { "@iconify/json": "^2.2.228", diff --git a/backend/package.json b/backend/package.json index cd06351aa..94abef346 100644 --- a/backend/package.json +++ b/backend/package.json @@ -22,7 +22,8 @@ "locales": "scripts/sort.sh", "locales:fix": "scripts/sort.sh --fix", "start": "cross-env TZ=UTC node build/index.js", - "typecheck": "tsc --noEmit" + "typecheck": "tsc --noEmit", + "clear": "rm -rf node_modules && rm -rf build && rm -rf .turbo" }, "nodemonConfig": { "ignore": [ diff --git a/config-schema/package.json b/config-schema/package.json index c3a6a2b1d..4ac90e45c 100644 --- a/config-schema/package.json +++ b/config-schema/package.json @@ -21,7 +21,8 @@ "test": "bun test", "test:debug": "bun test --inspect-brk", "lint": "biome check --error-on-warnings .", - "lint:fix": "biome check --error-on-warnings . --write" + "lint:fix": "biome check --error-on-warnings . --write", + "clear": "rm -rf node_modules && rm -rf build && rm -rf .turbo" }, "devDependencies": { "@biomejs/biome": "2.0.0", diff --git a/core/package.json b/core/package.json index 98863bb60..8f5b9901d 100644 --- a/core/package.json +++ b/core/package.json @@ -21,7 +21,8 @@ "test:debug": "bun test --inspect-brk", "typecheck": "tsc --noEmit", "lint": "biome check --error-on-warnings .", - "lint:fix": "biome check --error-on-warnings . --write" + "lint:fix": "biome check --error-on-warnings . --write", + "clear": "rm -rf node_modules && rm -rf build && rm -rf .turbo" }, "devDependencies": { "@biomejs/biome": "2.0.0", diff --git a/database/package.json b/database/package.json index 21d027427..b763cf1ca 100644 --- a/database/package.json +++ b/database/package.json @@ -19,7 +19,7 @@ "typecheck": "tsc --noEmit", "lint": "biome check --error-on-warnings .", "lint:fix": "biome check --error-on-warnings . --write", - "clear": "cross-env TZ=UTC tsx migration/index.ts clear", + "clearDB": "cross-env TZ=UTC tsx migration/index.ts clear", "test": "cross-env TZ=UTC NODE_ENV=development DB_DATABASE=gradido_test vitest --reporter verbose --no-file-parallelism run", "test:debug": "cross-env TZ=UTC NODE_ENV=development DB_DATABASE=gradido_test node --inspect-brk node_modules/.bin/jest --bail --runInBand --forceExit --detectOpenHandles", "up": "cross-env TZ=UTC tsx migration/index.ts up", @@ -28,7 +28,8 @@ "up:test": "cross-env TZ=UTC DB_DATABASE=gradido_test tsx migration/index.ts up", "up:backend_test": "cross-env TZ=UTC DB_DATABASE=gradido_test_backend tsx migration/index.ts up", "up:federation_test": "cross-env TZ=UTC DB_DATABASE=gradido_test_federation tsx migration/index.ts up", - "up:dht_test": "cross-env TZ=UTC DB_DATABASE=gradido_test_dht tsx migration/index.ts up" + "up:dht_test": "cross-env TZ=UTC DB_DATABASE=gradido_test_dht tsx migration/index.ts up", + "clear": "rm -rf node_modules && rm -rf build && rm -rf .turbo" }, "devDependencies": { "@biomejs/biome": "2.0.0", diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index 0eda8958a..498a112b9 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -282,7 +282,7 @@ bun install # build all modules log_step 'build all modules' -turbo build --env-mode=loose +turbo build --env-mode=loose --concurrency=$(nproc) # database log_step 'Updating database' diff --git a/dht-node/package.json b/dht-node/package.json index 8a5cd4462..e2f64191c 100644 --- a/dht-node/package.json +++ b/dht-node/package.json @@ -17,7 +17,8 @@ "lint:fix": "biome check --error-on-warnings . --write", "test": "cross-env TZ=UTC NODE_ENV=development DB_DATABASE=gradido_test_dht jest --verbose --runInBand --forceExit --detectOpenHandles", "test:debug": "cross-env TZ=UTC NODE_ENV=development DB_DATABASE=gradido_test_dht node --inspect-brk node_modules/.bin/jest --bail --runInBand --forceExit --detectOpenHandles", - "test:coverage": "cross-env TZ=UTC NODE_ENV=development DB_DATABASE=gradido_test_dht jest --coverage --runInBand --forceExit --detectOpenHandles" + "test:coverage": "cross-env TZ=UTC NODE_ENV=development DB_DATABASE=gradido_test_dht jest --coverage --runInBand --forceExit --detectOpenHandles", + "clear": "rm -rf node_modules && rm -rf build && rm -rf .turbo" }, "dependencies": { "cross-env": "^7.0.3", diff --git a/federation/package.json b/federation/package.json index f2bae7d73..147ba4437 100644 --- a/federation/package.json +++ b/federation/package.json @@ -18,7 +18,8 @@ "test:debug": "cross-env TZ=UTC NODE_ENV=development DB_DATABASE=gradido_test_federation node --inspect-brk node_modules/.bin/jest --bail --runInBand --forceExit --detectOpenHandles", "test:coverage": "cross-env TZ=UTC NODE_ENV=development DB_DATABASE=gradido_test_federation jest --coverage --runInBand --forceExit --detectOpenHandles", "lint": "biome check --error-on-warnings .", - "lint:fix": "biome check --error-on-warnings . --write" + "lint:fix": "biome check --error-on-warnings . --write", + "clear": "rm -rf node_modules && rm -rf build && rm -rf .turbo" }, "dependencies": { "cross-env": "^7.0.3", diff --git a/frontend/package.json b/frontend/package.json index 4dbace5c1..3dd82ff8c 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -21,7 +21,8 @@ "compile-scss": "node ./scripts/scss.mjs compile", "watch-scss": "node ./scripts/scss.mjs watch", "compile-scss-sass": "node ./scripts/scss.mjs compile sass", - "watch-scss-sass": "node ./scripts/scss.mjs watch sass" + "watch-scss-sass": "node ./scripts/scss.mjs watch sass", + "clear": "rm -rf node_modules && rm -rf build && rm -rf .turbo" }, "dependencies": { "@morev/vue-transitions": "^3.0.2", diff --git a/frontend/src/components/Auth/AuthNavbar.vue b/frontend/src/components/Auth/AuthNavbar.vue index 710d15b30..be605bc86 100644 --- a/frontend/src/components/Auth/AuthNavbar.vue +++ b/frontend/src/components/Auth/AuthNavbar.vue @@ -8,11 +8,11 @@ - + {{ $t('signup') }} {{ $t('|') }} - + {{ $t('signin') }} @@ -25,7 +25,7 @@ import { useAuthLinks } from '@/composables/useAuthLinks' import NavItem from '../Menu/NavItem.vue' -const { login, register } = useAuthLinks() +const { routeWithParamsAndQuery } = useAuthLinks() const backgroundHeader = '/img/template/gradido_background_header.png' const logo = '/img/brand/gradido-logo_200x59.png' diff --git a/frontend/src/components/Auth/AuthNavbarSmall.vue b/frontend/src/components/Auth/AuthNavbarSmall.vue index e7917ffe8..32986c7ab 100644 --- a/frontend/src/components/Auth/AuthNavbarSmall.vue +++ b/frontend/src/components/Auth/AuthNavbarSmall.vue @@ -2,9 +2,13 @@ @@ -14,7 +18,7 @@ import { useAuthLinks } from '@/composables/useAuthLinks' import NavItem from '../Menu/NavItem.vue' -const { login, register } = useAuthLinks() +const { routeWithParamsAndQuery } = useAuthLinks()