From 944faaf003c7e68898ebe0c4d8f8e84562e25237 Mon Sep 17 00:00:00 2001 From: Arek Nawo Date: Thu, 6 Jun 2024 14:02:22 +0200 Subject: [PATCH] fix: Upgrade to Turborepo v2 --- apps/backend/api/Dockerfile | 2 +- apps/backend/app/Dockerfile | 2 +- apps/backend/assets/Dockerfile | 2 +- apps/backend/collaboration/Dockerfile | 2 +- apps/backend/usage-reporting/Dockerfile | 2 +- package.json | 4 +-- pnpm-lock.yaml | 45 ++++++++++++------------- turbo.json | 14 +++++--- 8 files changed, 39 insertions(+), 34 deletions(-) diff --git a/apps/backend/api/Dockerfile b/apps/backend/api/Dockerfile index 4692fff9..79256fe7 100644 --- a/apps/backend/api/Dockerfile +++ b/apps/backend/api/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --no-cache libc6-compat && npm install -g turbo COPY . . -RUN turbo prune --scope=@vrite/api --docker +RUN turbo prune @vrite/api --docker FROM base as installer diff --git a/apps/backend/app/Dockerfile b/apps/backend/app/Dockerfile index 7b63f536..dca145d7 100644 --- a/apps/backend/app/Dockerfile +++ b/apps/backend/app/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --no-cache libc6-compat && npm install -g turbo COPY . . -RUN turbo prune --scope=@vrite/app --docker +RUN turbo prune @vrite/app --docker FROM base as installer diff --git a/apps/backend/assets/Dockerfile b/apps/backend/assets/Dockerfile index c154d692..5c4b1ef3 100644 --- a/apps/backend/assets/Dockerfile +++ b/apps/backend/assets/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --no-cache libc6-compat && npm install -g turbo COPY . . -RUN turbo prune --scope=@vrite/assets --docker +RUN turbo prune @vrite/assets --docker FROM base as installer diff --git a/apps/backend/collaboration/Dockerfile b/apps/backend/collaboration/Dockerfile index 0f3fcc4e..e27da13f 100644 --- a/apps/backend/collaboration/Dockerfile +++ b/apps/backend/collaboration/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --no-cache libc6-compat && npm install -g turbo COPY . . -RUN turbo prune --scope=@vrite/collaboration --docker +RUN turbo prune @vrite/collaboration --docker FROM base as installer diff --git a/apps/backend/usage-reporting/Dockerfile b/apps/backend/usage-reporting/Dockerfile index fa1163ad..9d29bd53 100644 --- a/apps/backend/usage-reporting/Dockerfile +++ b/apps/backend/usage-reporting/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --no-cache libc6-compat && npm install -g turbo COPY . . -RUN turbo prune --scope=@vrite/usage-reporting --docker +RUN turbo prune @vrite/usage-reporting --docker FROM base as installer diff --git a/package.json b/package.json index 44a56e66..3bd08e0a 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "eslint-plugin-solid": "^0.12.1", "prettier": "^3.0.2", "prettier-plugin-astro": "^0.11.0", - "turbo": "^1.10.11", + "turbo": "^2.0.1", "typescript": "^5.1.6" }, "engines": { @@ -33,5 +33,5 @@ "dependencies": { "dotenv-cli": "^7.2.1" }, - "packageManager": "pnpm@8.8.0" + "packageManager": "pnpm@8.4.0" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7ed2e0e9..50f8fcf9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,8 +36,8 @@ importers: specifier: ^0.11.0 version: 0.11.0 turbo: - specifier: ^1.10.11 - version: 1.10.11 + specifier: ^2.0.1 + version: 2.0.1 typescript: specifier: ^5.1.6 version: 5.3.3 @@ -16671,65 +16671,64 @@ packages: safe-buffer: 5.2.1 optional: true - /turbo-darwin-64@1.10.11: - resolution: {integrity: sha512-pHNz6D5XUVB+bgZMKXIOegvH9GzPXucwgiHFatQcRoscAW1te1Zvn3fAWYo/mJ550AqPWQLmALZZel3z3lllLA==} + /turbo-darwin-64@2.0.1: + resolution: {integrity: sha512-GO391pUmI6c6l/EpUIaXNzwbVDWRvYahm5oLB176dAWRYKYO+Osqs/XBdOM0G3l7ZFdR6nUtRJc8qinJp7qDUQ==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.10.11: - resolution: {integrity: sha512-j3yGAvkBu0BqR+5nb9LiRs8UZsUQDOqpdP4S9OW3+W5jorJIxUxLawwk3XqoYVGhmPh84LWWOOrMgFQ/Y/3WSg==} + /turbo-darwin-arm64@2.0.1: + resolution: {integrity: sha512-rmjJoxeq7nmH/F2aWKapahrDE2zE2Uc15rvs4Rz6qHOzSqC8R5uyLpQyTKIPIZ95O/z9nKfLfVPyiRENuk5vpw==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.10.11: - resolution: {integrity: sha512-FZ+/VT3Yt188VvPuvqIwIyvosYALzu7e8ewxpl8yiYDwQbLwxMOEt2UKACsL+D7wzNtIMPRDxNmnhNvTbx9Afw==} + /turbo-linux-64@2.0.1: + resolution: {integrity: sha512-vwTOc4v4jm6tM+9WlsiDlN+zwHP8A2wlsAYiNqz2u0DZL55aCWaVdivh2VpVLN36Mr9HgREGH0Fw+jx6ObcNRg==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.10.11: - resolution: {integrity: sha512-IfxO8S1FiikunmUnlul1sd5piPlunU1QlnNNGFfhKJkMidkJ0rXsSbh2epn/pXO8RRPBnFRxYkp6gJz/FTUUTg==} + /turbo-linux-arm64@2.0.1: + resolution: {integrity: sha512-DkVt76fjwY940DfmqznWhpYIlKYduvKAoTtylkERrDlcWUpDYWwqNbcf9PRRIbnjnv9lIxvuom1KZmMY+cw/Ig==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.10.11: - resolution: {integrity: sha512-5qwTEk27duxYIsDycgZdpti1b41Xu2D3W+WRlg++sylwqhAgcPhfcppXMGd70h/SScgIh7IeLjzgTK7+YPE77g==} + /turbo-windows-64@2.0.1: + resolution: {integrity: sha512-XskV34kYuXVIHbRbgH8jr35Y8uA6kJOQ0LJStU4jFk7piiyk0a4n2GNDymMtvIwAxYdbuTe+pKuPCThFdirHBQ==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.10.11: - resolution: {integrity: sha512-FGvWCWvii4PZqy+4VBoanKaMkqeRD146iHL67YpY5sp8z5H/Gkywtu8xxBbkgP14lBr6fAsyRarHBuR+c52cDg==} + /turbo-windows-arm64@2.0.1: + resolution: {integrity: sha512-R2/RmKr2uQxkOCtXK5LNxdD3Iv7lUm56iy2FrDwTDgPI7X7K6WRjrxdirmFIu/fABYE5n6EampU3ejbG5mmGtg==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.10.11: - resolution: {integrity: sha512-6GzYbsG5Ro6dK62dJuBjA53RdpMr1PWVwN6ZZRSMgYgkvFmNDMwxzJUKuCSi+jfDSt6avwT7koNlwRPfgTFuOw==} + /turbo@2.0.1: + resolution: {integrity: sha512-sJhxfBaN14pYj//xxAG6zAyStkE2j4HI9JVXVMob35SGob6dz/HuSqV/4QlVqw0uKAkwc1lXIsnykbe8RLmOOw==} hasBin: true - requiresBuild: true optionalDependencies: - turbo-darwin-64: 1.10.11 - turbo-darwin-arm64: 1.10.11 - turbo-linux-64: 1.10.11 - turbo-linux-arm64: 1.10.11 - turbo-windows-64: 1.10.11 - turbo-windows-arm64: 1.10.11 + turbo-darwin-64: 2.0.1 + turbo-darwin-arm64: 2.0.1 + turbo-linux-64: 2.0.1 + turbo-linux-arm64: 2.0.1 + turbo-windows-64: 2.0.1 + turbo-windows-arm64: 2.0.1 dev: true /tw-to-css@0.0.11: diff --git a/turbo.json b/turbo.json index 2f52384f..8671428c 100644 --- a/turbo.json +++ b/turbo.json @@ -1,13 +1,19 @@ { "$schema": "https://turbo.build/schema.json", - "globalDependencies": ["**/.env.*local"], - "pipeline": { + "globalDependencies": [ + "**/.env.*local" + ], + "tasks": { "build": { - "dependsOn": ["^build"], + "dependsOn": [ + "^build" + ], "cache": false }, "@vrite/app#build": { - "dependsOn": ["@vrite/web#build"] + "dependsOn": [ + "@vrite/web#build" + ] }, "lint": { "outputs": []