Merge pull request #1488 from SeedCompany/upgrades

.babelrc

@@ -20,7 +20,7 @@
     ["@babel/plugin-transform-runtime", {
       "absoluteRuntime": true
     }],
-    "@babel/plugin-proposal-numeric-separator",
+    "@babel/plugin-transform-numeric-separator",
     "./src/server/disableSsrByDefault",
     "@loadable/babel-plugin",
     ["babel-plugin-transform-imports", {

.github/actions/setup/action.yml

@@ -0,0 +1,22 @@
+name: Node Setup & Yarn Install
+description: 'Setup Node.js and install dependencies with Yarn'
+runs:
+  using: composite
+  steps:
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 20
+
+    - name: Yarn cache
+      uses: actions/cache@v3
+      with:
+        path: .yarn/cache
+        key: yarn-cache-${{ hashFiles('yarn.lock', '.yarnrc.yml') }}
+        restore-keys: yarn-cache-
+
+    - name: Install dependencies
+      shell: bash
+      run: yarn install
+      env:
+        # Use the local cache folder, so we can cache it above
+        YARN_ENABLE_GLOBAL_CACHE: 'false'

.github/workflows/ci.yml

@@ -21,13 +21,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 20
-          cache: yarn
 
-      - name: Install dependencies
-        run: yarn install && yarn dedupe --check
+      - name: Node Setup & Yarn Install
+        uses: ./.github/actions/setup
+
+      - name: Check for no duplicate dependencies
+        run: yarn dedupe --check
 
       - name: Match API PR
         uses: actions-ecosystem/action-regex-match@v2

.yarnrc.yml

@@ -1,10 +1,4 @@
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
-
-yarnPath: .yarn/releases/yarn-3.6.3.cjs
+yarnPath: .yarn/releases/yarn-4.0.0.cjs
 
 logFilters:
   # discard these messages that flood the build log
@@ -18,9 +12,6 @@ packageExtensions:
     peerDependencies:
       '@types/node': '*'
       'typescript': '*'
-  '@graphql-tools/graphql-tag-pluck@*':
-    dependencies:
-      '@babel/core': ^7
   '@graphql-codegen/named-operations-object@*':
     peerDependenciesMeta:
       # It doesn't actually use this peer dep

codegen.schema.yml

@@ -43,15 +43,14 @@ generates:
           placement: prepend
           content: |
             import { DateTime } from 'luxon';
-            import { CalendarDate } from '~/common';
-            import type { OutputData as RichTextData } from '@editorjs/editorjs';
+            import { CalendarDate, RichTextJson } from '~/common';
     config:
       scalars:
         Date: CalendarDate
         DateTime: DateTime
         JSONObject: Record<string, any>
         URL: string
-        RichText: RichTextData
+        RichText: RichTextJson
       defaultScalarType: unknown
       skipTypename: false
       enumsAsTypes: true