diff --git a/.github/actions/node/action.yaml b/.github/actions/node/action.yaml index 8378ef9f0c..da7e4dd0d2 100644 --- a/.github/actions/node/action.yaml +++ b/.github/actions/node/action.yaml @@ -3,7 +3,8 @@ description: "This action install node and cache modules. It uses pnpm as packag inputs: node-version: description: "The node version to install (Default: lts)" - default: "lts/*" + # TODO: revert to lts/* after 20 is EOL + default: "22.x" required: false working-directory: description: "The working directory of your node package" diff --git a/.github/workflows/cli-ci.yaml b/.github/workflows/cli-ci.yaml index b632e711b3..b855cdde7c 100644 --- a/.github/workflows/cli-ci.yaml +++ b/.github/workflows/cli-ci.yaml @@ -71,7 +71,7 @@ jobs: strategy: matrix: - node-version: ['20.x', '22.x'] + node-version: ["22.x", "24.x"] steps: - uses: actions/checkout@v4 diff --git a/cli/README.md b/cli/README.md index ab9ce176cf..bf3dd04770 100644 --- a/cli/README.md +++ b/cli/README.md @@ -37,7 +37,7 @@ Whether you're building monolithic or federated GraphQL architectures, `wgc` pro ### Prerequisites -- [Node.js](https://nodejs.org/) v20 LTS or higher +- [Node.js](https://nodejs.org/) v22+ (>=22.11.0) ### Install via npm diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3434f8a958..31d3541d0b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1292,6 +1292,9 @@ importers: posthog-js: specifier: ^1.240.6 version: 1.242.2 + prettier: + specifier: 'catalog:' + version: 3.6.2 pretty-bytes: specifier: ^6.1.1 version: 6.1.1 @@ -24756,7 +24759,7 @@ snapshots: eslint: 8.57.1 eslint-import-resolver-node: 0.3.7 eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.27.5(eslint@8.57.1))(eslint@8.57.1) - eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.27.5(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) + eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-typescript@3.5.5)(eslint@8.57.1) eslint-plugin-jsx-a11y: 6.7.1(eslint@8.57.1) eslint-plugin-react: 7.33.0(eslint@8.57.1) eslint-plugin-react-hooks: 4.6.0(eslint@8.57.1) @@ -24809,8 +24812,8 @@ snapshots: debug: 4.4.1 enhanced-resolve: 5.15.0 eslint: 8.57.1 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.27.5(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) - eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.27.5(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.57.1) + eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-typescript@3.5.5)(eslint@8.57.1) get-tsconfig: 4.10.1 globby: 13.2.2 is-core-module: 2.12.1 @@ -24840,17 +24843,6 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.8.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.27.5(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1): - dependencies: - debug: 4.4.1 - optionalDependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.57.1)(typescript@5.5.2) - eslint: 8.57.1 - eslint-import-resolver-node: 0.3.7 - eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.27.5(eslint@8.57.1))(eslint@8.57.1) - transitivePeerDependencies: - - supports-color - eslint-module-utils@2.8.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.57.1): dependencies: debug: 4.4.1 @@ -24885,7 +24877,7 @@ snapshots: eslint-utils: 2.1.0 regexpp: 3.2.0 - eslint-plugin-import@2.27.5(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.27.5(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1): + eslint-plugin-import@2.27.5(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-typescript@3.5.5)(eslint@8.57.1): dependencies: array-includes: 3.1.6 array.prototype.flat: 1.3.1 @@ -24894,7 +24886,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.1 eslint-import-resolver-node: 0.3.7 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.27.5(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.5.2))(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.57.1) has: 1.0.3 is-core-module: 2.12.1 is-glob: 4.0.3 diff --git a/studio/package.json b/studio/package.json index e1047e264c..7197b181e7 100644 --- a/studio/package.json +++ b/studio/package.json @@ -98,6 +98,7 @@ "next": "15.5.15", "next-themes": "^0.2.1", "posthog-js": "^1.240.6", + "prettier": "catalog:", "pretty-bytes": "^6.1.1", "prism-react-renderer": "^2.0.6", "prismjs": "^1.30.0", diff --git a/studio/src/components/analytics/trace-details.tsx b/studio/src/components/analytics/trace-details.tsx index ee6f44e154..6a7a41764d 100644 --- a/studio/src/components/analytics/trace-details.tsx +++ b/studio/src/components/analytics/trace-details.tsx @@ -18,7 +18,7 @@ import { GraphQLSchema } from 'graphql'; import Link from 'next/link'; import { useRouter } from 'next/router'; import parserBabel from 'prettier/plugins/babel'; -import * as prettierPluginEstree from 'prettier/plugins/estree'; +import prettierPluginEstree from 'prettier/plugins/estree'; import graphQLPlugin from 'prettier/plugins/graphql'; import * as prettier from 'prettier/standalone'; import { useContext, useEffect, useState } from 'react';