Skip to content

chore: remove turbo #1925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shikanime wants to merge 1 commit into from
Closed

chore: remove turbo #1925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,6 @@ La gestion des dépendances est effectuée à l'aide de [pnpm](https://pnpm.io/)
├── package.json
├── pnpm-lock.yaml
├── pnpm-workspace.yaml
├── turbo.json
└── README.md
```

Expand Down
4 changes: 2 additions & 2 deletions apps/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"preview": "vite preview --port 8080",
"test": "vitest run",
"test:cov": "vitest run --coverage",
"test:ct": "NODE_ENV=test cypress open --component --browser=firefox",
"test:ct-ci": "NODE_ENV=test cypress run --component --browser=firefox",
"test:ct": "pnpm --filter @cpn-console/shared run build && pnpm --filter @cpn-console/test-utils run build && NODE_ENV=test cypress open --component --browser=firefox",
"test:ct-ci": "pnpm --filter @cpn-console/shared run build && pnpm --filter @cpn-console/test-utils run build && NODE_ENV=test cypress run --component --browser=firefox",
"test:e2e": "cypress open --browser=firefox",
"test:e2e-ci": "cypress run --browser=firefox",
"type-check": "vue-tsc --noEmit -p tsconfig.json"
Expand Down
2 changes: 1 addition & 1 deletion apps/server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY --chown=node:root package.json ./
# Install pnpm version defined in package.json "packageManager" property
RUN npm install --global corepack@latest && corepack enable && corepack enable pnpm

COPY --chown=node:root pnpm-workspace.yaml pnpm-lock.yaml turbo.json ./
COPY --chown=node:root pnpm-workspace.yaml pnpm-lock.yaml ./
COPY --chown=node:root patches ./patches
COPY --chown=node:root apps/server/package.json ./apps/server/package.json

Expand Down
22 changes: 11 additions & 11 deletions ci/scripts/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,13 @@ cd "$PROJECT_DIR"

# Run lint
if [ "$RUN_LINT" == "true" ]; then
npm run lint -- --cache-dir=.turbo/cache --log-order=stream
pnpm run lint
fi


# Run unit tests
if [ "$RUN_UNIT_TESTS" == "true" ]; then
npm run test:cov -- --cache-dir=.turbo/cache --log-order=stream
pnpm run test:cov
fi


Expand All @@ -143,7 +143,7 @@ if [ "$RUN_COMPONENT_TESTS" == "true" ]; then

[[ -n "$BROWSER" ]] && BROWSER_ARGS="-- --browser $BROWSER"

npm run test:ct-ci -- --cache-dir=.turbo/cache --log-order=stream $BROWSER_ARGS
pnpm run test:ct-ci $BROWSER_ARGS
fi


Expand All @@ -156,23 +156,23 @@ if [ "$RUN_E2E_TESTS" == "true" ]; then

[[ -n "$BROWSER" ]] && BROWSER_ARGS="-- --browser $BROWSER"

npm --prefix $PROJECT_DIR/packages/shared run build
npm --prefix $PROJECT_DIR/packages/test-utils run build
pnpm --dir $PROJECT_DIR/packages/shared run build
pnpm --dir $PROJECT_DIR/packages/test-utils run build

if [[ "$RUN_E2E_WITH_KUBE" = "true" ]]; then
npm run kube:init
pnpm run kube:init
if [[ -n "$TAG" ]]; then
npm run kube:prod:run -- -t $TAG
pnpm run kube:prod:run -- -t $TAG
else
npm run kube:prod
pnpm run kube:prod
fi
npm run kube:e2e-ci -- --cache-dir=.turbo/cache --log-order=stream $BROWSER_ARGS
pnpm run kube:e2e-ci $BROWSER_ARGS
else
if [[ -n "$TAG" ]]; then
docker pull ghcr.io/cloud-pi-native/console/server:$TAG && docker tag ghcr.io/cloud-pi-native/console/server:$TAG dso-console/server:ci
docker pull ghcr.io/cloud-pi-native/console/client:$TAG && docker tag ghcr.io/cloud-pi-native/console/client:$TAG dso-console/client:ci
fi
npm run docker:e2e-ci -- --cache-dir=.turbo/cache --log-order=stream $BROWSER_ARGS
pnpm run docker:e2e-ci $BROWSER_ARGS
fi

printf "\n${red}${i}.${no_color} Remove resources\n"
Expand Down Expand Up @@ -207,5 +207,5 @@ if [ "$RUN_STATUS_CHECK" == "true" ]; then
printf "\n${red}${i}.${no_color} Remove resources\n"
i=$(($i + 1))

npm run kube:delete
pnpm run kube:delete
fi
29 changes: 14 additions & 15 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
"npm": ">=11.0.0"
},
"scripts": {
"build": "turbo run build --color --no-daemon",
"build:clean": "turbo run build:clean --no-daemon",
"db:generate": "turbo run db:generate --no-daemon",
"build": "pnpm -r --filter=!server-nestjs run build",
"build:clean": "pnpm -r run build:clean",
"db:generate": "pnpm -r run db:generate",
"dev": "docker compose -f ./docker/docker-compose.local.yml up -d --remove-orphans && echo '\nStart server and client with commands:\n\n pnpm --filter @cpn-console/server run dev\n pnpm --filter @cpn-console/client run dev\n\nMake sure you provide env variables in `.env` files.'",
"dev:clean": "docker compose -f ./docker/docker-compose.local.yml down --remove-orphans",
"dev:delete": "docker compose -f ./docker/docker-compose.local.yml down -v --remove-orphans",
"docker:dev": "docker compose -f ./docker/docker-compose.dev.yml up -d --remove-orphans; docker compose -f ./docker/docker-compose.dev.yml watch --no-up & docker compose -f ./docker/docker-compose.dev.yml logs server client -f",
"docker:dev:build": "export COMPOSE_FILE=./docker/docker-compose.dev.yml && ./scripts/run-build.sh $COMPOSE_FILE",
"docker:dev:clean": "docker compose -f ./docker/docker-compose.dev.yml down --remove-orphans",
"docker:dev:delete": "docker compose -f ./docker/docker-compose.dev.yml down -v --remove-orphans",
"docker:e2e": "docker compose -f ./docker/docker-compose.dev.yml up ${TAG:+--no-build} -d --remove-orphans; turbo run test:e2e --filter=@cpn-console/client --color --no-daemon; docker compose -f ./docker/docker-compose.dev.yml down --remove-orphans",
"docker:e2e-ci": "docker compose -f ./docker/docker-compose.ci.yml up ${TAG:+--no-build} -d --remove-orphans; turbo run test:e2e-ci --filter=@cpn-console/client --color --no-daemon",
"docker:e2e": "docker compose -f ./docker/docker-compose.dev.yml up ${TAG:+--no-build} -d --remove-orphans; pnpm --filter @cpn-console/shared run build && pnpm --filter @cpn-console/test-utils run build && pnpm --filter @cpn-console/client run test:e2e; docker compose -f ./docker/docker-compose.dev.yml down --remove-orphans",
"docker:e2e-ci": "docker compose -f ./docker/docker-compose.ci.yml up ${TAG:+--no-build} -d --remove-orphans; pnpm --filter @cpn-console/shared run build && pnpm --filter @cpn-console/test-utils run build && pnpm --filter @cpn-console/client run test:e2e-ci",
"docker:e2e-ci:delete": "docker compose -f ./docker/docker-compose.ci.yml down -v --remove-orphans",
"docker:integ": "docker compose --env-file apps/server/.env.integ -f ./docker/docker-compose.integ.yml up -d; docker compose --env-file apps/server/.env.integ -f ./docker/docker-compose.integ.yml watch --no-up & docker compose --env-file apps/server/.env.integ -f ./docker/docker-compose.integ.yml logs server client -f",
"docker:integ:build": "export $(cat apps/server/.env.integ | grep -v '#' | xargs) && export COMPOSE_FILE=./docker/docker-compose.integ.yml && cd $(dirname $COMPOSE_FILE) && docker buildx bake --allow=fs.read=.. --file $(basename $COMPOSE_FILE) --load && cd - > /dev/null",
Expand All @@ -29,26 +29,26 @@
"docker:prod": "docker compose -f ./docker/docker-compose.prod.yml up --remove-orphans",
"docker:prod:build": "export COMPOSE_FILE=./docker/docker-compose.prod.yml && ./scripts/run-build.sh $COMPOSE_FILE",
"docker:prod:delete": "docker compose -f ./docker/docker-compose.prod.yml down -v --remove-orphans",
"format": "turbo run format --color --no-daemon",
"format": "pnpm -r run format",
"format:root": "eslint . --fix",
"format:style": "turbo run format:style --color --no-daemon",
"format:style": "pnpm -r run format:style",
"fullclean": "sh ./ci/scripts/cleanup.sh",
"fullsetup": "sh ./ci/scripts/setup.sh",
"integ": "docker compose -f ./docker/docker-compose.local.yml up -d --remove-orphans postgres pgadmin && echo '\nStart server and client with commands:\n\n pnpm --filter @cpn-console/server run integ\n pnpm --filter @cpn-console/client run integ\n\nMake sure you provide env variables in `.env.integ` files.'",
"integ:clean": "docker compose -f ./docker/docker-compose.local.yml down --remove-orphans",
"integ:delete": "docker compose -f ./docker/docker-compose.local.yml down -v --remove-orphans",
"lint": "turbo run lint --color --no-daemon",
"lint": "pnpm -r run lint",
"lint:root": "eslint .",
"lint:style": "turbo run lint:style --color --no-daemon",
"lint:ts": "turbo run lint:ts --color --no-daemon",
"lint:style": "pnpm -r run lint:style",
"lint:ts": "pnpm -r run lint:ts",
"playwright:test": "pnpm --dir playwright run playwright:test",
"playwright:test:ui": "pnpm --dir playwright run playwright:test:ui",
"playwright:test:integration": "pnpm --dir playwright run playwright:test:integration",
"prepare": "husky",
"test": "turbo run test --concurrency 1 --color --no-daemon",
"test:cov": "turbo run test:cov --color --no-daemon",
"test": "pnpm -r --workspace-concurrency=1 run test",
"test:cov": "pnpm -r run test:cov",
"test:ct": "pnpm --filter @cpn-console/shared run build && pnpm --filter @cpn-console/test-utils run build && pnpm --filter @cpn-console/client run test:ct",
"test:ct-ci": "turbo run test:ct-ci --color --no-daemon",
"test:ct-ci": "pnpm -r run test:ct-ci",
"test:e2e": "pnpm kube:e2e",
"test:e2e-ci": "pnpm kube:prod; pnpm kube:e2e-ci"
},
Expand All @@ -58,8 +58,7 @@
"@cpn-console/eslint-config": "workspace:^",
"eslint": "^9.39.1",
"husky": "^9.1.7",
"lint-staged": "^15.5.2",
"turbo": "^2.7.1"
"lint-staged": "^15.5.2"
},
"pnpm": {
"patchedDependencies": {
Expand Down
64 changes: 0 additions & 64 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

142 changes: 0 additions & 142 deletions turbo.json
View file
Open in desktop

This file was deleted.