From 1aab98c837386c690ca23c9865752bf274df03cc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 16:13:54 +0000 Subject: [PATCH 1/9] chore(db): update turbo monorepo to v2 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 +- packages/api/package.json | 2 +- packages/db/package.json | 2 +- packages/eslint-config/package.json | 2 +- pnpm-lock.yaml | 94 ++++++++++++++--------------- 5 files changed, 52 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index 1703b29911..83e8828058 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ }, "devDependencies": { "@changesets/cli": "2.27.5", - "@turbo/gen": "1.13.4", + "@turbo/gen": "2.0.3", "@types/lint-staged": "13.3.0", "@types/node": "20.14.2", "@types/yargs": "17.0.32", @@ -58,7 +58,7 @@ "prettier-plugin-prisma": "5.0.0", "sherif": "0.8.4", "tsx": "4.15.4", - "turbo": "1.13.4", + "turbo": "2.0.3", "typescript": "5.4.5", "typesync": "0.12.1", "yargs": "17.7.2" diff --git a/packages/api/package.json b/packages/api/package.json index 2bae9dce10..f396bd6d30 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -53,7 +53,7 @@ "zod": "3.23.8" }, "devDependencies": { - "@turbo/gen": "1.13.4", + "@turbo/gen": "2.0.3", "@types/eslint": "8.56.10", "@types/google.maps": "3.55.9", "@types/luxon": "3.4.2", diff --git a/packages/db/package.json b/packages/db/package.json index 4db203f28f..7c5a47351d 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -67,7 +67,7 @@ "@snaplet/copycat": "5.0.0", "@snaplet/seed": "0.97.20", "@terraformer/wkt": "2.2.1", - "@turbo/gen": "1.13.4", + "@turbo/gen": "2.0.3", "@turf/helpers": "7.0.0", "@types/eslint": "8.56.10", "@types/inquirer": "9.0.7", diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index 068de8073e..417edd0967 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -33,7 +33,7 @@ "eslint-plugin-node": "npm:eslint-plugin-n@16.6.2", "eslint-plugin-react": "7.34.2", "eslint-plugin-storybook": "0.8.0", - "eslint-plugin-turbo": "1.13.4", + "eslint-plugin-turbo": "2.0.3", "next": "14.2.4", "resolve-pkg-maps": "1.0.0", "typescript": "5.4.5" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 11102b7394..b47ed31dbd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -33,8 +33,8 @@ importers: specifier: 2.27.5 version: 2.27.5 '@turbo/gen': - specifier: 1.13.4 - version: 1.13.4(@swc/core@1.5.29)(@types/node@20.14.2)(typescript@5.4.5) + specifier: 2.0.3 + version: 2.0.3(@swc/core@1.5.29)(@types/node@20.14.2)(typescript@5.4.5) '@types/lint-staged': specifier: 13.3.0 version: 13.3.0 @@ -90,8 +90,8 @@ importers: specifier: 4.15.4 version: 4.15.4 turbo: - specifier: 1.13.4 - version: 1.13.4 + specifier: 2.0.3 + version: 2.0.3 typescript: specifier: 5.4.5 version: 5.4.5 @@ -747,8 +747,8 @@ importers: version: 3.23.8 devDependencies: '@turbo/gen': - specifier: 1.13.4 - version: 1.13.4(@swc/core@1.5.29)(@types/node@20.14.2)(typescript@5.4.5) + specifier: 2.0.3 + version: 2.0.3(@swc/core@1.5.29)(@types/node@20.14.2)(typescript@5.4.5) '@types/eslint': specifier: 8.56.10 version: 8.56.10 @@ -1014,8 +1014,8 @@ importers: specifier: 2.2.1 version: 2.2.1 '@turbo/gen': - specifier: 1.13.4 - version: 1.13.4(@swc/core@1.5.29)(@types/node@20.14.2)(typescript@5.4.5) + specifier: 2.0.3 + version: 2.0.3(@swc/core@1.5.29)(@types/node@20.14.2)(typescript@5.4.5) '@turf/helpers': specifier: 7.0.0 version: 7.0.0 @@ -1249,8 +1249,8 @@ importers: specifier: 0.8.0 version: 0.8.0(eslint@8.57.0)(typescript@5.4.5) eslint-plugin-turbo: - specifier: 1.13.4 - version: 1.13.4(eslint@8.57.0) + specifier: 2.0.3 + version: 2.0.3(eslint@8.57.0) next: specifier: 14.2.4 version: 14.2.4(@babel/core@7.24.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -5588,12 +5588,12 @@ packages: '@tsconfig/node16@1.0.4': resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==} - '@turbo/gen@1.13.4': - resolution: {integrity: sha512-PK38N1fHhDUyjLi0mUjv0RbX0xXGwDLQeRSGsIlLcVpP1B5fwodSIwIYXc9vJok26Yne94BX5AGjueYsUT3uUw==} + '@turbo/gen@2.0.3': + resolution: {integrity: sha512-UY/90ikcHg5cUUhzyGf9tGj43OZFoKYlpWrk+Q8o89aHvsUwMH9cZ25tlBZ1Iu6PKztCHiPIFTTg+9LLkn57hA==} hasBin: true - '@turbo/workspaces@1.13.4': - resolution: {integrity: sha512-3uYg2b5TWCiupetbDFMbBFMHl33xQTvp5DNg0fZSYal73Z9AlFH9yWabHWMYw6ywmwM1evkYRpTVA2n7GgqT5A==} + '@turbo/workspaces@2.0.3': + resolution: {integrity: sha512-b3SPg9k3m6rgvhyabE1zdSc5Ln5NBCpFa4sYwfVaFnZWHnn0CBxOircwNpMR+VffsSYchc0m4Pszvp1XwlgXrg==} hasBin: true '@turf/boolean-point-in-polygon@6.5.0': @@ -8184,8 +8184,8 @@ packages: peerDependencies: eslint: '>=6' - eslint-plugin-turbo@1.13.4: - resolution: {integrity: sha512-82GfMzrewI/DJB92Bbch239GWbGx4j1zvjk1lqb06lxIlMPnVwUHVwPbAnLfyLG3JuhLv9whxGkO/q1CL18JTg==} + eslint-plugin-turbo@2.0.3: + resolution: {integrity: sha512-mplP4nYaRvtTNuwF5QTLYKLu0/8LTRsHPgX4ARhaof+QZI2ttglONe1/iJpKB4pg0KqFp7WHziKoJL+s0+CJ1w==} peerDependencies: eslint: '>6.6.0' @@ -13778,38 +13778,38 @@ packages: tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} - turbo-darwin-64@1.13.4: - resolution: {integrity: sha512-A0eKd73R7CGnRinTiS7txkMElg+R5rKFp9HV7baDiEL4xTG1FIg/56Vm7A5RVgg8UNgG2qNnrfatJtb+dRmNdw==} + turbo-darwin-64@2.0.3: + resolution: {integrity: sha512-v7ztJ8sxdHw3SLfO2MhGFeeU4LQhFii1hIGs9uBiXns/0YTGOvxLeifnfGqhfSrAIIhrCoByXO7nR9wlm10n3Q==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@1.13.4: - resolution: {integrity: sha512-eG769Q0NF6/Vyjsr3mKCnkG/eW6dKMBZk6dxWOdrHfrg6QgfkBUk0WUUujzdtVPiUIvsh4l46vQrNVd9EOtbyA==} + turbo-darwin-arm64@2.0.3: + resolution: {integrity: sha512-LUcqvkV9Bxtng6QHbevp8IK8zzwbIxM6HMjCE7FEW6yJBN1KwvTtRtsGBwwmTxaaLO0wD1Jgl3vgkXAmQ4fqUw==} cpu: [arm64] os: [darwin] - turbo-linux-64@1.13.4: - resolution: {integrity: sha512-Bq0JphDeNw3XEi+Xb/e4xoKhs1DHN7OoLVUbTIQz+gazYjigVZvtwCvgrZI7eW9Xo1eOXM2zw2u1DGLLUfmGkQ==} + turbo-linux-64@2.0.3: + resolution: {integrity: sha512-xpdY1suXoEbsQsu0kPep2zrB8ijv/S5aKKrntGuQ62hCiwDFoDcA/Z7FZ8IHQ2u+dpJARa7yfiByHmizFE0r5Q==} cpu: [x64] os: [linux] - turbo-linux-arm64@1.13.4: - resolution: {integrity: sha512-BJcXw1DDiHO/okYbaNdcWN6szjXyHWx9d460v6fCHY65G8CyqGU3y2uUTPK89o8lq/b2C8NK0yZD+Vp0f9VoIg==} + turbo-linux-arm64@2.0.3: + resolution: {integrity: sha512-MBACTcSR874L1FtLL7gkgbI4yYJWBUCqeBN/iE29D+8EFe0d3fAyviFlbQP4K/HaDYet1i26xkkOiWr0z7/V9A==} cpu: [arm64] os: [linux] - turbo-windows-64@1.13.4: - resolution: {integrity: sha512-OFFhXHOFLN7A78vD/dlVuuSSVEB3s9ZBj18Tm1hk3aW1HTWTuAw0ReN6ZNlVObZUHvGy8d57OAGGxf2bT3etQw==} + turbo-windows-64@2.0.3: + resolution: {integrity: sha512-zi3YuKPkM9JxMTshZo3excPk37hUrj5WfnCqh4FjI26ux6j/LJK+Dh3SebMHd9mR7wP9CMam4GhmLCT+gDfM+w==} cpu: [x64] os: [win32] - turbo-windows-arm64@1.13.4: - resolution: {integrity: sha512-u5A+VOKHswJJmJ8o8rcilBfU5U3Y1TTAfP9wX8bFh8teYF1ghP0EhtMRLjhtp6RPa+XCxHHVA2CiC3gbh5eg5g==} + turbo-windows-arm64@2.0.3: + resolution: {integrity: sha512-wmed4kkenLvRbidi7gISB4PU77ujBuZfgVGDZ4DXTFslE/kYpINulwzkVwJIvNXsJtHqyOq0n6jL8Zwl3BrwDg==} cpu: [arm64] os: [win32] - turbo@1.13.4: - resolution: {integrity: sha512-1q7+9UJABuBAHrcC4Sxp5lOqYS5mvxRrwa33wpIyM18hlOCpRD/fTJNxZ0vhbMcJmz15o9kkVm743mPn7p6jpQ==} + turbo@2.0.3: + resolution: {integrity: sha512-jF1K0tTUyryEWmgqk1V0ALbSz3VdeZ8FXUo6B64WsPksCMCE48N5jUezGOH2MN0+epdaRMH8/WcPU0QQaVfeLA==} hasBin: true tween-functions@1.2.0: @@ -20166,9 +20166,9 @@ snapshots: '@tsconfig/node16@1.0.4': {} - '@turbo/gen@1.13.4(@swc/core@1.5.29)(@types/node@20.14.2)(typescript@5.4.5)': + '@turbo/gen@2.0.3(@swc/core@1.5.29)(@types/node@20.14.2)(typescript@5.4.5)': dependencies: - '@turbo/workspaces': 1.13.4 + '@turbo/workspaces': 2.0.3 chalk: 2.4.2 commander: 10.0.1 fs-extra: 10.1.0 @@ -20186,7 +20186,7 @@ snapshots: - supports-color - typescript - '@turbo/workspaces@1.13.4': + '@turbo/workspaces@2.0.3': dependencies: chalk: 2.4.2 commander: 10.0.1 @@ -23403,7 +23403,7 @@ snapshots: - supports-color - typescript - eslint-plugin-turbo@1.13.4(eslint@8.57.0): + eslint-plugin-turbo@2.0.3(eslint@8.57.0): dependencies: dotenv: 16.0.3 eslint: 8.57.0 @@ -30547,32 +30547,32 @@ snapshots: dependencies: safe-buffer: 5.2.1 - turbo-darwin-64@1.13.4: + turbo-darwin-64@2.0.3: optional: true - turbo-darwin-arm64@1.13.4: + turbo-darwin-arm64@2.0.3: optional: true - turbo-linux-64@1.13.4: + turbo-linux-64@2.0.3: optional: true - turbo-linux-arm64@1.13.4: + turbo-linux-arm64@2.0.3: optional: true - turbo-windows-64@1.13.4: + turbo-windows-64@2.0.3: optional: true - turbo-windows-arm64@1.13.4: + turbo-windows-arm64@2.0.3: optional: true - turbo@1.13.4: + turbo@2.0.3: optionalDependencies: - turbo-darwin-64: 1.13.4 - turbo-darwin-arm64: 1.13.4 - turbo-linux-64: 1.13.4 - turbo-linux-arm64: 1.13.4 - turbo-windows-64: 1.13.4 - turbo-windows-arm64: 1.13.4 + turbo-darwin-64: 2.0.3 + turbo-darwin-arm64: 2.0.3 + turbo-linux-64: 2.0.3 + turbo-linux-arm64: 2.0.3 + turbo-windows-64: 2.0.3 + turbo-windows-arm64: 2.0.3 tween-functions@1.2.0: {} From 6ae25744193acb8cae8bbb2a710e801328dd07e6 Mon Sep 17 00:00:00 2001 From: Joe Karow <58997957+JoeKarow@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:11:58 -0400 Subject: [PATCH 2/9] v2 config changes --- apps/app/turbo.json | 2 +- apps/web/turbo.json | 2 +- lambdas/cognito-messaging/turbo.json | 2 +- lambdas/cognito-user-migrate/turbo.json | 2 +- packages/analytics/turbo.json | 2 +- packages/api/turbo.json | 2 +- packages/crowdin/turbo.json | 2 +- packages/db/turbo.json | 6 +++--- packages/ui/turbo.json | 2 +- packages/util/turbo.json | 2 +- turbo.json | 6 ++---- 11 files changed, 14 insertions(+), 16 deletions(-) diff --git a/apps/app/turbo.json b/apps/app/turbo.json index 0d28210946..0964abce0b 100644 --- a/apps/app/turbo.json +++ b/apps/app/turbo.json @@ -1,7 +1,7 @@ { "$schema": "https://turbo.build/schema.json", "extends": ["//"], - "pipeline": { + "tasks": { "build": { "dependsOn": [ "build:prebuild", diff --git a/apps/web/turbo.json b/apps/web/turbo.json index 19f812a0d5..9eaf467469 100644 --- a/apps/web/turbo.json +++ b/apps/web/turbo.json @@ -1,7 +1,7 @@ { "$schema": "https://turbo.build/schema.json", "extends": ["//"], - "pipeline": { + "tasks": { "build": { "dependsOn": [], "env": [ diff --git a/lambdas/cognito-messaging/turbo.json b/lambdas/cognito-messaging/turbo.json index 375e35e909..268f81f75a 100644 --- a/lambdas/cognito-messaging/turbo.json +++ b/lambdas/cognito-messaging/turbo.json @@ -1,7 +1,7 @@ { "$schema": "https://turbo.build/schema.json", "extends": ["//"], - "pipeline": { + "tasks": { "build:aws": { "dependsOn": ["format", "lint:fix", "type-check"], "inputs": ["./src/**"], diff --git a/lambdas/cognito-user-migrate/turbo.json b/lambdas/cognito-user-migrate/turbo.json index cffd304cad..0963fd81ea 100644 --- a/lambdas/cognito-user-migrate/turbo.json +++ b/lambdas/cognito-user-migrate/turbo.json @@ -1,7 +1,7 @@ { "$schema": "https://turbo.build/schema.json", "extends": ["//"], - "pipeline": { + "tasks": { "build:aws": { "dependsOn": ["format", "lint:fix", "^db:generate", "type-check"], "inputs": ["./src/**"], diff --git a/packages/analytics/turbo.json b/packages/analytics/turbo.json index fed7bb1a55..3c09cdfd65 100644 --- a/packages/analytics/turbo.json +++ b/packages/analytics/turbo.json @@ -1,5 +1,5 @@ { "$schema": "https://turbo.build/schema.json", "extends": ["//"], - "pipeline": {} + "tasks": {} } diff --git a/packages/api/turbo.json b/packages/api/turbo.json index fed7bb1a55..3c09cdfd65 100644 --- a/packages/api/turbo.json +++ b/packages/api/turbo.json @@ -1,5 +1,5 @@ { "$schema": "https://turbo.build/schema.json", "extends": ["//"], - "pipeline": {} + "tasks": {} } diff --git a/packages/crowdin/turbo.json b/packages/crowdin/turbo.json index fed7bb1a55..3c09cdfd65 100644 --- a/packages/crowdin/turbo.json +++ b/packages/crowdin/turbo.json @@ -1,5 +1,5 @@ { "$schema": "https://turbo.build/schema.json", "extends": ["//"], - "pipeline": {} + "tasks": {} } diff --git a/packages/db/turbo.json b/packages/db/turbo.json index 3230008fa5..ebb623a1f8 100644 --- a/packages/db/turbo.json +++ b/packages/db/turbo.json @@ -1,18 +1,18 @@ { "$schema": "https://turborepo.org/schema.json", "extends": ["//"], - "pipeline": { + "tasks": { "db:dataMigrate": { "dependsOn": ["db:generate", "db:deploy"], "env": ["DATABASE_URL", "DB_DIRECT_URL"], "inputs": ["./prisma/data-migrations/**/*.ts", "./prisma/dataMigrationRunner.ts"], - "outputMode": "new-only" + "outputLogs": "new-only" }, "db:deploy": { "dependsOn": ["db:generate", "^docker:up"], "env": ["DATABASE_URL", "DB_DIRECT_URL"], "inputs": ["./prisma/migrations/**/*"], - "outputMode": "new-only" + "outputLogs": "new-only" }, "db:generate": { "cache": false, diff --git a/packages/ui/turbo.json b/packages/ui/turbo.json index b9b0acaf7c..9bfdc82084 100644 --- a/packages/ui/turbo.json +++ b/packages/ui/turbo.json @@ -1,7 +1,7 @@ { "$schema": "https://turbo.build/schema.json", "extends": ["//"], - "pipeline": { + "tasks": { "build": { "dependsOn": ["^build"], "inputs": ["./icon/iconList.ts", "./icon/iconCollection.ts"], diff --git a/packages/util/turbo.json b/packages/util/turbo.json index fed7bb1a55..3c09cdfd65 100644 --- a/packages/util/turbo.json +++ b/packages/util/turbo.json @@ -1,5 +1,5 @@ { "$schema": "https://turbo.build/schema.json", "extends": ["//"], - "pipeline": {} + "tasks": {} } diff --git a/turbo.json b/turbo.json index c36da9ba55..128f92db80 100644 --- a/turbo.json +++ b/turbo.json @@ -1,10 +1,8 @@ { "$schema": "https://turborepo.org/schema.json", - "experimentalUI": true, - "globalDependencies": ["./packages/config/tsconfig/base.json"], - "globalDotEnv": [".env"], + "globalDependencies": ["./packages/config/tsconfig/base.json", ".env"], "globalEnv": ["NODE_ENV"], - "pipeline": { + "tasks": { "//#clean": { "cache": false }, From a6fbd991d40bc186d490cf63a8a82d94ed05b624 Mon Sep 17 00:00:00 2001 From: Joe Karow <58997957+JoeKarow@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:13:53 -0400 Subject: [PATCH 3/9] update workspace config --- InReach.code-workspace | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InReach.code-workspace b/InReach.code-workspace index 97da54f2b8..c998597433 100644 --- a/InReach.code-workspace +++ b/InReach.code-workspace @@ -215,7 +215,7 @@ }, "prettier.resolveGlobalModules": false, "typescript.preferences.importModuleSpecifier": "non-relative", - "typescript.tsdk": "node_modules/typescript/lib", + "typescript.tsdk": "🚀 InReach App (@weareinreach/app)/node_modules/typescript/lib", "typescript.enablePromptUseWorkspaceTsdk": true, "typescript.workspaceSymbols.scope": "allOpenProjects", "sonarlint.connectedMode.project": { From 766f6665e7de08fee0737fb19dadea096d5bd30e Mon Sep 17 00:00:00 2001 From: Joe Karow <58997957+JoeKarow@users.noreply.github.com> Date: Fri, 14 Jun 2024 11:46:19 -0400 Subject: [PATCH 4/9] update devDep to include missing basics --- packages/analytics/package.json | 6 ++- packages/config/package.json | 2 + packages/env/package.json | 6 ++- packages/util/package.json | 6 ++- pnpm-lock.yaml | 90 ++++++++++++++++++++++++--------- 5 files changed, 83 insertions(+), 27 deletions(-) diff --git a/packages/analytics/package.json b/packages/analytics/package.json index a4c62c8d80..ee807b7668 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -16,12 +16,16 @@ "just-compact": "3.2.0" }, "devDependencies": { + "@types/eslint": "8.56.10", "@types/gtag.js": "0.0.20", + "@types/node": "20.14.2", "@weareinreach/config": "workspace:*", "@weareinreach/eslint-config": "workspace:*", + "eslint": "8.57.0", "next": "14.2.4", "nextjs-google-analytics": "2.3.3", - "type-fest": "4.20.0" + "type-fest": "4.20.0", + "typescript": "5.4.5" }, "peerDependencies": { "next": "14.2.4", diff --git a/packages/config/package.json b/packages/config/package.json index 2789c76840..4270dab6b0 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -15,9 +15,11 @@ "preinstall": "npx only-allow pnpm" }, "devDependencies": { + "@types/eslint": "8.56.10", "@types/node": "20.14.2", "@weareinreach/eslint-config": "workspace:*", "alex": "11.0.1", + "eslint": "8.57.0", "next-i18next": "15.3.0", "typescript": "5.4.5" } diff --git a/packages/env/package.json b/packages/env/package.json index 2dd1ef8901..2a9a45d0e3 100644 --- a/packages/env/package.json +++ b/packages/env/package.json @@ -23,7 +23,11 @@ "zod": "3.23.8" }, "devDependencies": { + "@types/eslint": "8.56.10", + "@types/node": "20.14.2", "@weareinreach/config": "workspace:*", - "@weareinreach/eslint-config": "workspace:*" + "@weareinreach/eslint-config": "workspace:*", + "eslint": "8.57.0", + "typescript": "5.4.5" } } diff --git a/packages/util/package.json b/packages/util/package.json index b0cfec0c74..a378cdfe29 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -20,8 +20,12 @@ "tslog": "4.9.3" }, "devDependencies": { + "@types/eslint": "8.56.10", "@types/luxon": "3.4.2", + "@types/node": "20.14.2", "@weareinreach/config": "workspace:*", - "@weareinreach/eslint-config": "workspace:*" + "@weareinreach/eslint-config": "workspace:*", + "eslint": "8.57.0", + "typescript": "5.4.5" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b47ed31dbd..f630ab40cc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -616,15 +616,24 @@ importers: specifier: 3.2.0 version: 3.2.0 devDependencies: + '@types/eslint': + specifier: 8.56.10 + version: 8.56.10 '@types/gtag.js': specifier: 0.0.20 version: 0.0.20 + '@types/node': + specifier: 20.14.2 + version: 20.14.2 '@weareinreach/config': specifier: workspace:* version: link:../config '@weareinreach/eslint-config': specifier: workspace:* version: link:../eslint-config + eslint: + specifier: 8.57.0 + version: 8.57.0 next: specifier: 14.2.4 version: 14.2.4(@babel/core@7.24.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -634,6 +643,9 @@ importers: type-fest: specifier: 4.20.0 version: 4.20.0 + typescript: + specifier: 5.4.5 + version: 5.4.5 packages/api: dependencies: @@ -870,6 +882,9 @@ importers: packages/config: devDependencies: + '@types/eslint': + specifier: 8.56.10 + version: 8.56.10 '@types/node': specifier: 20.14.2 version: 20.14.2 @@ -879,6 +894,9 @@ importers: alex: specifier: 11.0.1 version: 11.0.1 + eslint: + specifier: 8.57.0 + version: 8.57.0 next-i18next: specifier: 15.3.0 version: 15.3.0(i18next@23.11.5)(next@14.2.4(@babel/core@7.24.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-i18next@14.1.2(i18next@23.11.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) @@ -1182,12 +1200,24 @@ importers: specifier: 3.23.8 version: 3.23.8 devDependencies: + '@types/eslint': + specifier: 8.56.10 + version: 8.56.10 + '@types/node': + specifier: 20.14.2 + version: 20.14.2 '@weareinreach/config': specifier: workspace:* version: link:../config '@weareinreach/eslint-config': specifier: workspace:* version: link:../eslint-config + eslint: + specifier: 8.57.0 + version: 8.57.0 + typescript: + specifier: 5.4.5 + version: 5.4.5 packages/eslint-config: devDependencies: @@ -1724,15 +1754,27 @@ importers: specifier: 4.9.3 version: 4.9.3 devDependencies: + '@types/eslint': + specifier: 8.56.10 + version: 8.56.10 '@types/luxon': specifier: 3.4.2 version: 3.4.2 + '@types/node': + specifier: 20.14.2 + version: 20.14.2 '@weareinreach/config': specifier: workspace:* version: link:../config '@weareinreach/eslint-config': specifier: workspace:* version: link:../eslint-config + eslint: + specifier: 8.57.0 + version: 8.57.0 + typescript: + specifier: 5.4.5 + version: 5.4.5 packages: @@ -14735,10 +14777,10 @@ snapshots: dependencies: '@aws-crypto/sha256-browser': 3.0.0 '@aws-crypto/sha256-js': 3.0.0 - '@aws-sdk/client-sso-oidc': 3.596.0(@aws-sdk/client-sts@3.596.0) - '@aws-sdk/client-sts': 3.596.0 + '@aws-sdk/client-sso-oidc': 3.596.0 + '@aws-sdk/client-sts': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0) '@aws-sdk/core': 3.592.0 - '@aws-sdk/credential-provider-node': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))(@aws-sdk/client-sts@3.596.0) + '@aws-sdk/credential-provider-node': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0)(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)) '@aws-sdk/middleware-host-header': 3.577.0 '@aws-sdk/middleware-logger': 3.577.0 '@aws-sdk/middleware-recursion-detection': 3.577.0 @@ -14777,13 +14819,13 @@ snapshots: transitivePeerDependencies: - aws-crt - '@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0)': + '@aws-sdk/client-sso-oidc@3.596.0': dependencies: '@aws-crypto/sha256-browser': 3.0.0 '@aws-crypto/sha256-js': 3.0.0 - '@aws-sdk/client-sts': 3.596.0 + '@aws-sdk/client-sts': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0) '@aws-sdk/core': 3.592.0 - '@aws-sdk/credential-provider-node': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))(@aws-sdk/client-sts@3.596.0) + '@aws-sdk/credential-provider-node': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0)(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)) '@aws-sdk/middleware-host-header': 3.577.0 '@aws-sdk/middleware-logger': 3.577.0 '@aws-sdk/middleware-recursion-detection': 3.577.0 @@ -14820,7 +14862,6 @@ snapshots: '@smithy/util-utf8': 3.0.0 tslib: 2.6.3 transitivePeerDependencies: - - '@aws-sdk/client-sts' - aws-crt '@aws-sdk/client-sso@3.592.0': @@ -14866,13 +14907,13 @@ snapshots: transitivePeerDependencies: - aws-crt - '@aws-sdk/client-sts@3.596.0': + '@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)': dependencies: '@aws-crypto/sha256-browser': 3.0.0 '@aws-crypto/sha256-js': 3.0.0 - '@aws-sdk/client-sso-oidc': 3.596.0(@aws-sdk/client-sts@3.596.0) + '@aws-sdk/client-sso-oidc': 3.596.0 '@aws-sdk/core': 3.592.0 - '@aws-sdk/credential-provider-node': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))(@aws-sdk/client-sts@3.596.0) + '@aws-sdk/credential-provider-node': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0)(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)) '@aws-sdk/middleware-host-header': 3.577.0 '@aws-sdk/middleware-logger': 3.577.0 '@aws-sdk/middleware-recursion-detection': 3.577.0 @@ -14909,6 +14950,7 @@ snapshots: '@smithy/util-utf8': 3.0.0 tslib: 2.6.3 transitivePeerDependencies: + - '@aws-sdk/client-sso-oidc' - aws-crt '@aws-sdk/core@3.592.0': @@ -14940,14 +14982,14 @@ snapshots: '@smithy/util-stream': 3.0.1 tslib: 2.6.3 - '@aws-sdk/credential-provider-ini@3.596.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))(@aws-sdk/client-sts@3.596.0)': + '@aws-sdk/credential-provider-ini@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0))': dependencies: - '@aws-sdk/client-sts': 3.596.0 + '@aws-sdk/client-sts': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0) '@aws-sdk/credential-provider-env': 3.587.0 '@aws-sdk/credential-provider-http': 3.596.0 '@aws-sdk/credential-provider-process': 3.587.0 - '@aws-sdk/credential-provider-sso': 3.592.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0)) - '@aws-sdk/credential-provider-web-identity': 3.587.0(@aws-sdk/client-sts@3.596.0) + '@aws-sdk/credential-provider-sso': 3.592.0(@aws-sdk/client-sso-oidc@3.596.0) + '@aws-sdk/credential-provider-web-identity': 3.587.0(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)) '@aws-sdk/types': 3.577.0 '@smithy/credential-provider-imds': 3.1.0 '@smithy/property-provider': 3.1.0 @@ -14958,14 +15000,14 @@ snapshots: - '@aws-sdk/client-sso-oidc' - aws-crt - '@aws-sdk/credential-provider-node@3.596.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))(@aws-sdk/client-sts@3.596.0)': + '@aws-sdk/credential-provider-node@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0))': dependencies: '@aws-sdk/credential-provider-env': 3.587.0 '@aws-sdk/credential-provider-http': 3.596.0 - '@aws-sdk/credential-provider-ini': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))(@aws-sdk/client-sts@3.596.0) + '@aws-sdk/credential-provider-ini': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0)(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)) '@aws-sdk/credential-provider-process': 3.587.0 - '@aws-sdk/credential-provider-sso': 3.592.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0)) - '@aws-sdk/credential-provider-web-identity': 3.587.0(@aws-sdk/client-sts@3.596.0) + '@aws-sdk/credential-provider-sso': 3.592.0(@aws-sdk/client-sso-oidc@3.596.0) + '@aws-sdk/credential-provider-web-identity': 3.587.0(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)) '@aws-sdk/types': 3.577.0 '@smithy/credential-provider-imds': 3.1.0 '@smithy/property-provider': 3.1.0 @@ -14985,10 +15027,10 @@ snapshots: '@smithy/types': 3.0.0 tslib: 2.6.3 - '@aws-sdk/credential-provider-sso@3.592.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))': + '@aws-sdk/credential-provider-sso@3.592.0(@aws-sdk/client-sso-oidc@3.596.0)': dependencies: '@aws-sdk/client-sso': 3.592.0 - '@aws-sdk/token-providers': 3.587.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0)) + '@aws-sdk/token-providers': 3.587.0(@aws-sdk/client-sso-oidc@3.596.0) '@aws-sdk/types': 3.577.0 '@smithy/property-provider': 3.1.0 '@smithy/shared-ini-file-loader': 3.1.0 @@ -14998,9 +15040,9 @@ snapshots: - '@aws-sdk/client-sso-oidc' - aws-crt - '@aws-sdk/credential-provider-web-identity@3.587.0(@aws-sdk/client-sts@3.596.0)': + '@aws-sdk/credential-provider-web-identity@3.587.0(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0))': dependencies: - '@aws-sdk/client-sts': 3.596.0 + '@aws-sdk/client-sts': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0) '@aws-sdk/types': 3.577.0 '@smithy/property-provider': 3.1.0 '@smithy/types': 3.0.0 @@ -15043,9 +15085,9 @@ snapshots: '@smithy/util-middleware': 3.0.0 tslib: 2.6.3 - '@aws-sdk/token-providers@3.587.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))': + '@aws-sdk/token-providers@3.587.0(@aws-sdk/client-sso-oidc@3.596.0)': dependencies: - '@aws-sdk/client-sso-oidc': 3.596.0(@aws-sdk/client-sts@3.596.0) + '@aws-sdk/client-sso-oidc': 3.596.0 '@aws-sdk/types': 3.577.0 '@smithy/property-provider': 3.1.0 '@smithy/shared-ini-file-loader': 3.1.0 From d77c8cfc35720ff8aed856b252110180b3694bfa Mon Sep 17 00:00:00 2001 From: Joe Karow <58997957+JoeKarow@users.noreply.github.com> Date: Fri, 14 Jun 2024 11:46:41 -0400 Subject: [PATCH 5/9] update config per docs --- packages/env/index.ts | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/packages/env/index.ts b/packages/env/index.ts index 5885ad1040..07d9a35208 100644 --- a/packages/env/index.ts +++ b/packages/env/index.ts @@ -45,37 +45,8 @@ export const env = createEnv({ NEXT_PUBLIC_VERCEL_ENV: z.enum(['production', 'development', 'preview']).optional(), NEXT_PUBLIC_GA_MEASUREMENT_ID: z.string(), }, - runtimeEnv: { - // Server - CI: process.env.CI, - COGNITO_ACCESS_KEY: process.env.COGNITO_ACCESS_KEY, - COGNITO_CLIENT_ID: process.env.COGNITO_CLIENT_ID, - COGNITO_CLIENT_SECRET: process.env.COGNITO_CLIENT_SECRET, - COGNITO_SECRET: process.env.COGNITO_SECRET, - COGNITO_USER_POOL_ID: process.env.COGNITO_USER_POOL_ID, - CRON_KEY: process.env.CRON_KEY, - CROWDIN_TOKEN: process.env.CROWDIN_TOKEN, - DATABASE_URL: process.env.DATABASE_URL, - DB_DIRECT_URL: process.env.DB_DIRECT_URL, - EDGE_CONFIG_TOKEN: process.env.EDGE_CONFIG_TOKEN, - EDGE_CONFIG: process.env.EDGE_CONFIG, - FEATURE_FLAG_CONFIG: process.env.FEATURE_FLAG_CONFIG, - GOOGLE_PLACES_API_KEY: process.env.GOOGLE_PLACES_API_KEY, - KV_REST_API_READ_ONLY_TOKEN: process.env.KV_REST_API_READ_ONLY_TOKEN, - KV_REST_API_TOKEN: process.env.KV_REST_API_TOKEN, - KV_REST_API_URL: process.env.KV_REST_API_URL, - KV_URL: process.env.KV_URL, - NEXT_RUNTIME: process.env.NEXT_RUNTIME, - NEXTAUTH_SECRET: process.env.NEXTAUTH_SECRET, - NEXTAUTH_URL: process.env.NEXTAUTH_URL, - NODE_ENV: process.env.NODE_ENV, - OTEL_SERVER: process.env.OTEL_SERVER, - PORT: process.env.PORT, - VERCEL_ENV: process.env.VERCEL_ENV, - VERCEL_URL: process.env.VERCEL_URL, - VERCEL: process.env.VERCEL, - // Client + experimental__runtimeEnv: { NEXT_PUBLIC_GA_MEASUREMENT_ID: process.env.NEXT_PUBLIC_GA_MEASUREMENT_ID, NEXT_PUBLIC_GOOGLE_MAPS_API: process.env.NEXT_PUBLIC_GOOGLE_MAPS_API, NEXT_PUBLIC_VERCEL_ENV: process.env.NEXT_PUBLIC_VERCEL_ENV, @@ -91,5 +62,3 @@ export const env = createEnv({ export const getEnv = (envVar: T): (typeof env)[T] => env[envVar] export * from './checks' -// export const isDev = process.env.NODE_ENV === 'development' -// export const isVercelProd = process.env.VERCEL_ENV === 'production' From d966da061d3f0ea6ea5db3b23d5375a790bb8cd5 Mon Sep 17 00:00:00 2001 From: Joe Karow <58997957+JoeKarow@users.noreply.github.com> Date: Fri, 14 Jun 2024 11:55:43 -0400 Subject: [PATCH 6/9] validate env on build --- apps/app/next.config.mjs | 3 +++ apps/app/package.json | 1 + pnpm-lock.yaml | 57 +++++++++++++++++++++++----------------- 3 files changed, 37 insertions(+), 24 deletions(-) diff --git a/apps/app/next.config.mjs b/apps/app/next.config.mjs index aa973c2f6c..006ae0a2db 100644 --- a/apps/app/next.config.mjs +++ b/apps/app/next.config.mjs @@ -5,6 +5,7 @@ import { PrismaPlugin } from '@prisma/nextjs-monorepo-workaround-plugin' import { RelativeCiAgentWebpackPlugin } from '@relative-ci/agent' import { withSentryConfig } from '@sentry/nextjs' import { I18NextHMRPlugin } from 'i18next-hmr/webpack' +import createJiti from 'jiti' import routes from 'nextjs-routes/config' import path from 'path' @@ -14,6 +15,8 @@ import i18nConfig from './next-i18next.config.mjs' const __filename = fileURLToPath(import.meta.url) const __dirname = path.dirname(__filename) +const jiti = createJiti(__filename) +jiti('../../packages/env') const isVercelActiveDev = process.env.VERCEL_ENV === 'preview' && process.env.VERCEL_GIT_COMMIT_REF !== 'dev' const isVercelProd = process.env.VERCEL_ENV === 'production' diff --git a/apps/app/package.json b/apps/app/package.json index cb77fcbc4e..bc370a381e 100644 --- a/apps/app/package.json +++ b/apps/app/package.json @@ -129,6 +129,7 @@ "eslint": "8.57.0", "eslint-plugin-i18next": "6.0.3", "i18next-hmr": "3.1.2", + "jiti": "1.21.6", "listr2": "8.2.1", "prettier": "3.3.2", "trpc-panel": "1.3.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f630ab40cc..49a72d528d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -414,6 +414,9 @@ importers: i18next-hmr: specifier: 3.1.2 version: 3.1.2 + jiti: + specifier: 1.21.6 + version: 1.21.6 listr2: specifier: 8.2.1 version: 8.2.1 @@ -9978,6 +9981,10 @@ packages: resolution: {integrity: sha512-uy2bNX5zQ+tESe+TiC7ilGRz8AtRGmnJH55NC5S0nSUjvvvM2hJHmefHErugGXN4pNv4Qx7vLsnNw9qJ9mtIsw==} hasBin: true + jiti@1.21.6: + resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==} + hasBin: true + jmespath@0.16.0: resolution: {integrity: sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==} engines: {node: '>= 0.6.0'} @@ -14777,10 +14784,10 @@ snapshots: dependencies: '@aws-crypto/sha256-browser': 3.0.0 '@aws-crypto/sha256-js': 3.0.0 - '@aws-sdk/client-sso-oidc': 3.596.0 - '@aws-sdk/client-sts': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0) + '@aws-sdk/client-sso-oidc': 3.596.0(@aws-sdk/client-sts@3.596.0) + '@aws-sdk/client-sts': 3.596.0 '@aws-sdk/core': 3.592.0 - '@aws-sdk/credential-provider-node': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0)(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)) + '@aws-sdk/credential-provider-node': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))(@aws-sdk/client-sts@3.596.0) '@aws-sdk/middleware-host-header': 3.577.0 '@aws-sdk/middleware-logger': 3.577.0 '@aws-sdk/middleware-recursion-detection': 3.577.0 @@ -14819,13 +14826,13 @@ snapshots: transitivePeerDependencies: - aws-crt - '@aws-sdk/client-sso-oidc@3.596.0': + '@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0)': dependencies: '@aws-crypto/sha256-browser': 3.0.0 '@aws-crypto/sha256-js': 3.0.0 - '@aws-sdk/client-sts': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0) + '@aws-sdk/client-sts': 3.596.0 '@aws-sdk/core': 3.592.0 - '@aws-sdk/credential-provider-node': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0)(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)) + '@aws-sdk/credential-provider-node': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))(@aws-sdk/client-sts@3.596.0) '@aws-sdk/middleware-host-header': 3.577.0 '@aws-sdk/middleware-logger': 3.577.0 '@aws-sdk/middleware-recursion-detection': 3.577.0 @@ -14862,6 +14869,7 @@ snapshots: '@smithy/util-utf8': 3.0.0 tslib: 2.6.3 transitivePeerDependencies: + - '@aws-sdk/client-sts' - aws-crt '@aws-sdk/client-sso@3.592.0': @@ -14907,13 +14915,13 @@ snapshots: transitivePeerDependencies: - aws-crt - '@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)': + '@aws-sdk/client-sts@3.596.0': dependencies: '@aws-crypto/sha256-browser': 3.0.0 '@aws-crypto/sha256-js': 3.0.0 - '@aws-sdk/client-sso-oidc': 3.596.0 + '@aws-sdk/client-sso-oidc': 3.596.0(@aws-sdk/client-sts@3.596.0) '@aws-sdk/core': 3.592.0 - '@aws-sdk/credential-provider-node': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0)(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)) + '@aws-sdk/credential-provider-node': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))(@aws-sdk/client-sts@3.596.0) '@aws-sdk/middleware-host-header': 3.577.0 '@aws-sdk/middleware-logger': 3.577.0 '@aws-sdk/middleware-recursion-detection': 3.577.0 @@ -14950,7 +14958,6 @@ snapshots: '@smithy/util-utf8': 3.0.0 tslib: 2.6.3 transitivePeerDependencies: - - '@aws-sdk/client-sso-oidc' - aws-crt '@aws-sdk/core@3.592.0': @@ -14982,14 +14989,14 @@ snapshots: '@smithy/util-stream': 3.0.1 tslib: 2.6.3 - '@aws-sdk/credential-provider-ini@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0))': + '@aws-sdk/credential-provider-ini@3.596.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))(@aws-sdk/client-sts@3.596.0)': dependencies: - '@aws-sdk/client-sts': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0) + '@aws-sdk/client-sts': 3.596.0 '@aws-sdk/credential-provider-env': 3.587.0 '@aws-sdk/credential-provider-http': 3.596.0 '@aws-sdk/credential-provider-process': 3.587.0 - '@aws-sdk/credential-provider-sso': 3.592.0(@aws-sdk/client-sso-oidc@3.596.0) - '@aws-sdk/credential-provider-web-identity': 3.587.0(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)) + '@aws-sdk/credential-provider-sso': 3.592.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0)) + '@aws-sdk/credential-provider-web-identity': 3.587.0(@aws-sdk/client-sts@3.596.0) '@aws-sdk/types': 3.577.0 '@smithy/credential-provider-imds': 3.1.0 '@smithy/property-provider': 3.1.0 @@ -15000,14 +15007,14 @@ snapshots: - '@aws-sdk/client-sso-oidc' - aws-crt - '@aws-sdk/credential-provider-node@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0))': + '@aws-sdk/credential-provider-node@3.596.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))(@aws-sdk/client-sts@3.596.0)': dependencies: '@aws-sdk/credential-provider-env': 3.587.0 '@aws-sdk/credential-provider-http': 3.596.0 - '@aws-sdk/credential-provider-ini': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0)(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)) + '@aws-sdk/credential-provider-ini': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))(@aws-sdk/client-sts@3.596.0) '@aws-sdk/credential-provider-process': 3.587.0 - '@aws-sdk/credential-provider-sso': 3.592.0(@aws-sdk/client-sso-oidc@3.596.0) - '@aws-sdk/credential-provider-web-identity': 3.587.0(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0)) + '@aws-sdk/credential-provider-sso': 3.592.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0)) + '@aws-sdk/credential-provider-web-identity': 3.587.0(@aws-sdk/client-sts@3.596.0) '@aws-sdk/types': 3.577.0 '@smithy/credential-provider-imds': 3.1.0 '@smithy/property-provider': 3.1.0 @@ -15027,10 +15034,10 @@ snapshots: '@smithy/types': 3.0.0 tslib: 2.6.3 - '@aws-sdk/credential-provider-sso@3.592.0(@aws-sdk/client-sso-oidc@3.596.0)': + '@aws-sdk/credential-provider-sso@3.592.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))': dependencies: '@aws-sdk/client-sso': 3.592.0 - '@aws-sdk/token-providers': 3.587.0(@aws-sdk/client-sso-oidc@3.596.0) + '@aws-sdk/token-providers': 3.587.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0)) '@aws-sdk/types': 3.577.0 '@smithy/property-provider': 3.1.0 '@smithy/shared-ini-file-loader': 3.1.0 @@ -15040,9 +15047,9 @@ snapshots: - '@aws-sdk/client-sso-oidc' - aws-crt - '@aws-sdk/credential-provider-web-identity@3.587.0(@aws-sdk/client-sts@3.596.0(@aws-sdk/client-sso-oidc@3.596.0))': + '@aws-sdk/credential-provider-web-identity@3.587.0(@aws-sdk/client-sts@3.596.0)': dependencies: - '@aws-sdk/client-sts': 3.596.0(@aws-sdk/client-sso-oidc@3.596.0) + '@aws-sdk/client-sts': 3.596.0 '@aws-sdk/types': 3.577.0 '@smithy/property-provider': 3.1.0 '@smithy/types': 3.0.0 @@ -15085,9 +15092,9 @@ snapshots: '@smithy/util-middleware': 3.0.0 tslib: 2.6.3 - '@aws-sdk/token-providers@3.587.0(@aws-sdk/client-sso-oidc@3.596.0)': + '@aws-sdk/token-providers@3.587.0(@aws-sdk/client-sso-oidc@3.596.0(@aws-sdk/client-sts@3.596.0))': dependencies: - '@aws-sdk/client-sso-oidc': 3.596.0 + '@aws-sdk/client-sso-oidc': 3.596.0(@aws-sdk/client-sts@3.596.0) '@aws-sdk/types': 3.577.0 '@smithy/property-provider': 3.1.0 '@smithy/shared-ini-file-loader': 3.1.0 @@ -25723,6 +25730,8 @@ snapshots: jiti@1.21.3: {} + jiti@1.21.6: {} + jmespath@0.16.0: {} joi@17.13.1: From a7677798b9a49f8ba67ab3322dd38bd0bb9de729 Mon Sep 17 00:00:00 2001 From: Joe Karow <58997957+JoeKarow@users.noreply.github.com> Date: Fri, 14 Jun 2024 12:04:09 -0400 Subject: [PATCH 7/9] add/sort build env vars --- apps/app/turbo.json | 24 ++++++++++++------------ turbo.json | 35 +++++++++++++++++++---------------- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/apps/app/turbo.json b/apps/app/turbo.json index 0964abce0b..bdec664e32 100644 --- a/apps/app/turbo.json +++ b/apps/app/turbo.json @@ -12,26 +12,26 @@ "^db:dataMigrate" ], "env": [ - "DATABASE_URL", - "DB_DIRECT_URL", - "NEXTAUTH_SECRET", - "NEXTAUTH_URL", - "VERCEL_URL", - "PORT", + "AWS_REGION", + "COGNITO_ACCESS_KEY", "COGNITO_CLIENT_ID", "COGNITO_CLIENT_SECRET", "COGNITO_ISSUER", - "COGNITO_USER_POOL_ID", - "AWS_REGION", - "COGNITO_ACCESS_KEY", "COGNITO_SECRET", - "NODE_ENV", + "COGNITO_USER_POOL_ID", + "DATABASE_URL", + "DB_DIRECT_URL", "GOOGLE_PLACES_API_KEY", "NEXT_PUBLIC_GOOGLE_MAPS_API", - "SENTRY_AUTH_TOKEN", "NEXT_PUBLIC_SENTRY_DSN", + "NEXTAUTH_SECRET", + "NEXTAUTH_URL", + "NODE_ENV", + "PORT", + "SENTRY_AUTH_TOKEN", + "SENTRY_ORG", "SENTRY_PROJECT", - "SENTRY_ORG" + "VERCEL_URL" ], "outputs": [".next/**"] }, diff --git a/turbo.json b/turbo.json index 128f92db80..b34c4fbcef 100644 --- a/turbo.json +++ b/turbo.json @@ -12,27 +12,30 @@ "build": { "dependsOn": ["^db:generate", "^generate:data", "^build", "^build:icons"], "env": [ - "NODE_ENV", - "DATABASE_URL", - "DB_DIRECT_URL", - "KV_URL", - "KV_REST_API_URL", - "KV_REST_API_TOKEN", - "KV_REST_API_READ_ONLY_TOKEN", - "NEXTAUTH_SECRET", - "NEXTAUTH_URL", + "CACHE_ACCESS_KEY", + "CACHE_READ_URL", + "CACHE_SECRET", + "CACHE_WRITE_URL", "COGNITO_ACCESS_KEY", - "COGNITO_SECRET", "COGNITO_CLIENT_ID", "COGNITO_CLIENT_SECRET", + "COGNITO_SECRET", + "CRON_KEY", + "CROWDIN_TOKEN", + "DATABASE_URL", + "DB_DIRECT_URL", + "EDGE_CONFIG", + "FEATURE_FLAG_CONFIG", "GOOGLE_PLACES_API_KEY", + "KV_REST_API_READ_ONLY_TOKEN", + "KV_REST_API_TOKEN", + "KV_REST_API_URL", + "KV_URL", + "NEXT_PUBLIC_GA_MEASUREMENT_ID", "NEXT_PUBLIC_GOOGLE_MAPS_API", - "CACHE_ACCESS_KEY", - "CACHE_SECRET", - "CACHE_READ_URL", - "CACHE_WRITE_URL", - "CROWDIN_TOKEN", - "NEXT_PUBLIC_GA_MEASUREMENT_ID" + "NEXTAUTH_SECRET", + "NEXTAUTH_URL", + "NODE_ENV" ] }, "build:aws": {}, From e30a60edde57fda68b7b6f0cecbfbddbc1ec9663 Mon Sep 17 00:00:00 2001 From: Joe Karow <58997957+JoeKarow@users.noreply.github.com> Date: Fri, 14 Jun 2024 12:08:33 -0400 Subject: [PATCH 8/9] remove inferred vars, add package specific vars --- apps/app/turbo.json | 10 ++++++++-- turbo.json | 2 -- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/app/turbo.json b/apps/app/turbo.json index bdec664e32..7050769910 100644 --- a/apps/app/turbo.json +++ b/apps/app/turbo.json @@ -19,11 +19,17 @@ "COGNITO_ISSUER", "COGNITO_SECRET", "COGNITO_USER_POOL_ID", + "CRON_KEY", + "CROWDIN_TOKEN", "DATABASE_URL", "DB_DIRECT_URL", + "EDGE_CONFIG", + "FEATURE_FLAG_CONFIG", "GOOGLE_PLACES_API_KEY", - "NEXT_PUBLIC_GOOGLE_MAPS_API", - "NEXT_PUBLIC_SENTRY_DSN", + "KV_REST_API_READ_ONLY_TOKEN", + "KV_REST_API_TOKEN", + "KV_REST_API_URL", + "KV_URL", "NEXTAUTH_SECRET", "NEXTAUTH_URL", "NODE_ENV", diff --git a/turbo.json b/turbo.json index b34c4fbcef..a68244aa15 100644 --- a/turbo.json +++ b/turbo.json @@ -31,8 +31,6 @@ "KV_REST_API_TOKEN", "KV_REST_API_URL", "KV_URL", - "NEXT_PUBLIC_GA_MEASUREMENT_ID", - "NEXT_PUBLIC_GOOGLE_MAPS_API", "NEXTAUTH_SECRET", "NEXTAUTH_URL", "NODE_ENV" From fb4fedbc66d3e8328dc20b748af6800d1e0daf82 Mon Sep 17 00:00:00 2001 From: Joe Karow <58997957+JoeKarow@users.noreply.github.com> Date: Fri, 14 Jun 2024 12:11:21 -0400 Subject: [PATCH 9/9] remove unused vars --- turbo.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/turbo.json b/turbo.json index a68244aa15..95394313d9 100644 --- a/turbo.json +++ b/turbo.json @@ -12,10 +12,6 @@ "build": { "dependsOn": ["^db:generate", "^generate:data", "^build", "^build:icons"], "env": [ - "CACHE_ACCESS_KEY", - "CACHE_READ_URL", - "CACHE_SECRET", - "CACHE_WRITE_URL", "COGNITO_ACCESS_KEY", "COGNITO_CLIENT_ID", "COGNITO_CLIENT_SECRET",