fix(deps): update turbo monorepo to v2 (major) (#384)

* fix(deps): update turbo monorepo to v2 * fix turbo.json * fix dockerfile * fix docker build * fix format --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: chiol <chiyoung.jeong@linecorp.com>
line · Jul 19, 2024 · ad91773 · ad91773
1 parent b8303b6
commit ad91773
Show file tree

Hide file tree

Showing 22 changed files with 71 additions and 64 deletions.
diff --git a/apps/web/next.config.mjs b/apps/web/next.config.mjs
@@ -1,10 +1,10 @@
-import './src/env.mjs';
-
 import path from 'path';
 import { fileURLToPath } from 'url';
+import createJiti from 'jiti';
 
 import * as i18nConfig from './next-i18next.config.js';
 
+createJiti(fileURLToPath(import.meta.url))('./src/env');
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
 
 /** @type {import('next').NextConfig} */

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -99,6 +99,7 @@
     "eslint": "^9.0.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
+    "jiti": "^1.21.6",
     "msw": "^2.3.0",
     "next-router-mock": "^0.9.13",
     "node-mocks-http": "^1.14.1",

diff --git a/apps/web/src/entities/field/ui/feedback-request-code-popover.ui.tsx b/apps/web/src/entities/field/ui/feedback-request-code-popover.ui.tsx
@@ -27,7 +27,7 @@ import {
 
 import { cn, useOAIQuery } from '@/shared';
 
-import { env } from '@/env.mjs';
+import { env } from '@/env';
 
 interface IProps {
   channelId: number;

diff --git a/apps/web/src/entities/tenant/ui/tenant-guard.ui.spec.tsx b/apps/web/src/entities/tenant/ui/tenant-guard.ui.spec.tsx
@@ -19,7 +19,7 @@ import mockRouter from 'next-router-mock';
 
 import { Path } from '@/shared';
 
-import { env } from '@/env.mjs';
+import { env } from '@/env';
 import { server } from '@/msw';
 import { render, screen, waitFor } from '@/test-utils';
 import { useTenantStore } from '../tenant.model';

diff --git a/apps/web/src/env.mjs → apps/web/src/env.ts b/apps/web/src/env.mjs → apps/web/src/env.ts
diff --git a/apps/web/src/features/auth/sign-in-with-oauth/__mocks__/sign-in-with-oauth.mock-handler.ts b/apps/web/src/features/auth/sign-in-with-oauth/__mocks__/sign-in-with-oauth.mock-handler.ts
@@ -16,7 +16,7 @@
 import { faker } from '@faker-js/faker';
 import { http, HttpResponse } from 'msw';
 
-import { env } from '@/env.mjs';
+import { env } from '@/env';
 
 export const signInWithOAuthMockHandlers = [
   http.get(

diff --git a/apps/web/src/features/create-tenant/create-tenant-form.spec.tsx b/apps/web/src/features/create-tenant/create-tenant-form.spec.tsx
@@ -17,7 +17,7 @@ import { faker } from '@faker-js/faker';
 import userEvent from '@testing-library/user-event';
 import { http, HttpResponse } from 'msw';
 
-import { env } from '@/env.mjs';
+import { env } from '@/env';
 import { server } from '@/msw';
 import { render, screen, waitFor } from '@/test-utils';
 import CreateTenantForm from './create-tenant-form.ui';

diff --git a/apps/web/src/pages/api/login.ts b/apps/web/src/pages/api/login.ts
@@ -20,7 +20,7 @@ import { z } from 'zod';
 
 import type { Jwt } from '@/shared';
 
-import { env } from '@/env.mjs';
+import { env } from '@/env';
 import { createNextApiHandler, procedure } from '@/server/api-handler';
 import type { JwtSession } from '@/server/iron-option';
 import { ironOption } from '@/server/iron-option';

diff --git a/apps/web/src/pages/api/oauth.ts b/apps/web/src/pages/api/oauth.ts
@@ -19,7 +19,7 @@ import { z } from 'zod';
 
 import type { Jwt } from '@/shared';
 
-import { env } from '@/env.mjs';
+import { env } from '@/env';
 import { createNextApiHandler, procedure } from '@/server/api-handler';
 import type { JwtSession } from '@/server/iron-option';
 import { ironOption } from '@/server/iron-option';

diff --git a/apps/web/src/pages/api/refresh-jwt.ts b/apps/web/src/pages/api/refresh-jwt.ts
@@ -19,7 +19,7 @@ import { getIronSession } from 'iron-session';
 
 import type { Jwt } from '@/shared';
 
-import { env } from '@/env.mjs';
+import { env } from '@/env';
 import { createNextApiHandler } from '@/server/api-handler';
 import type { JwtSession } from '@/server/iron-option';
 import { ironOption } from '@/server/iron-option';

diff --git a/apps/web/src/server/iron-option.ts b/apps/web/src/server/iron-option.ts
@@ -15,7 +15,7 @@
  */
 import type { SessionOptions } from 'iron-session';
 
-import { env } from '@/env.mjs';
+import { env } from '@/env';
 
 export const ironOption: SessionOptions = {
   cookieName: 'user-feedback',

diff --git a/apps/web/src/shared/lib/client.ts b/apps/web/src/shared/lib/client.ts
@@ -28,7 +28,7 @@ import type {
   OAIResponse,
 } from '@/shared';
 
-import { env } from '@/env.mjs';
+import { env } from '@/env';
 
 class client {
   private axiosInstance = axios.create({

diff --git a/apps/web/src/shared/ui/help-card-docs.tsx b/apps/web/src/shared/ui/help-card-docs.tsx
@@ -17,7 +17,7 @@ import { Trans } from 'react-i18next';
 
 import { Icon } from '@ufb/ui';
 
-import { env } from '@/env.mjs';
+import { env } from '@/env';
 
 type I18nKey =
   | 'help-card.image-config'

diff --git a/apps/web/src/shared/utils/path-parsing.ts b/apps/web/src/shared/utils/path-parsing.ts
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-import { env } from '@/env.mjs';
+import { env } from '@/env';
 
 export const getRequestUrl = (
   path: string,

diff --git a/apps/web/src/widgets/feedback-table/model/feedback-table.context.tsx b/apps/web/src/widgets/feedback-table/model/feedback-table.context.tsx
@@ -20,7 +20,7 @@ import type { DateRangeType } from '@/shared';
 import { DATE_FORMAT, useQueryParamsState } from '@/shared';
 import { EMPTY_FUNCTION } from '@/shared/utils/empty-function';
 
-import { env } from '@/env.mjs';
+import { env } from '@/env';
 
 const DEFAULT_DATE_RANGE: DateRangeType = {
   startDate: dayjs().subtract(env.NEXT_PUBLIC_MAX_DAYS, 'day').toDate(),

diff --git a/apps/web/src/widgets/feedback-table/ui/feedback-table-bar.tsx b/apps/web/src/widgets/feedback-table/ui/feedback-table-bar.tsx
@@ -22,7 +22,7 @@ import { DateRangePicker, TablePagination, TableSearchInput } from '@/shared';
 import type { Field } from '@/entities/field';
 import { useIssueSearch } from '@/entities/issue';
 
-import { env } from '@/env.mjs';
+import { env } from '@/env';
 import type { FeedbackColumnType } from '../feedback-table-columns';
 import { useFeedbackTable } from '../model';
 import ChannelSelectBox from './channel-select-box';

diff --git a/docker/api.dockerfile b/docker/api.dockerfile
@@ -8,7 +8,7 @@ RUN apk add --no-cache libc6-compat
 
 # Set working directory
 WORKDIR /app
-RUN npm install -g turbo@^1.13.2
+RUN npm install -g turbo
 COPY . .
 RUN turbo prune --scope=api --docker
 

diff --git a/docker/web.dockerfile b/docker/web.dockerfile
@@ -8,7 +8,7 @@ RUN apk add --no-cache libc6-compat
 
 # Set working directory
 WORKDIR /app
-RUN npm install -g turbo@^1.13.2
+RUN npm install -g turbo
 COPY . .
 RUN turbo prune --scope=web --docker
 
@@ -41,7 +41,7 @@ ARG TURBO_TEAM
 ENV TURBO_TEAM=${TURBO_TEAM}
 
 COPY --from=builder /app/apps/web/.env.build /app/apps/web/.env.production
-RUN SKIP_ENV_VALIDATION=1 pnpm dlx turbo run build --filter=web...
+RUN SKIP_ENV_VALIDATION=true pnpm dlx turbo run build --filter=web...
 
 FROM base AS runner
 WORKDIR /app

diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
   "devDependencies": {
     "@ufb/prettier-config": "workspace:*",
     "prettier": "^3.2.5",
-    "turbo": "^1.13.2",
+    "turbo": "^2.0.0",
     "typescript": "^5.4.5"
   },
   "packageManager": "pnpm@9.4.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tooling/eslint/package.json b/tooling/eslint/package.json
@@ -18,7 +18,7 @@
     "@typescript-eslint/eslint-plugin": "^7.7.1",
     "@typescript-eslint/parser": "^7.7.1",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-config-turbo": "^1.13.2",
+    "eslint-config-turbo": "^2.0.0",
     "@ufb/eslint-plugin-header": "workspace:*",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-prettier": "^5.1.3",

diff --git a/turbo.json b/turbo.json
@@ -1,8 +1,7 @@
 {
   "$schema": "https://turbo.build/schema.json",
-  "experimentalUI": true,
-  "globalDependencies": ["**/.env"],
-  "pipeline": {
+  "ui": "tui",
+  "tasks": {
     "topo": {
       "dependsOn": ["^topo"]
     },
@@ -22,7 +21,7 @@
     },
     "format": {
       "outputs": ["node_modules/.cache/.prettiercache"],
-      "outputMode": "new-only"
+      "outputLogs": "new-only"
     },
     "@ufb/tailwind#build": {
       "outputs": ["dist/**"]
@@ -48,6 +47,7 @@
       "cache": false
     }
   },
+  "globalDependencies": ["**/.env"],
   "globalEnv": [
     "NODE_ENV",
     "SESSION_PASSWORD",
@@ -72,6 +72,9 @@
     "AUTO_MIGRATION",
     "MASTER_API_KEY",
     "BASE_URL",
-    "NEXT_PUBLIC_MAX_DAYS"
-  ]
+    "NEXT_PUBLIC_MAX_DAYS",
+    "SKIP_ENV_VALIDATION",
+    "PORT"
+  ],
+  "globalPassThroughEnv": ["NODE_ENV", "CI", "npm_lifecycle_event"]
 }