Merge pull request #674 from thinc-org/beta

Deploy Production 9/3/2567
thinc-org · Mar 9, 2024 · 4a740cf · 4a740cf
2 parents ed51384 + 3c5f769
commit 4a740cf
Show file tree

Hide file tree

Showing 115 changed files with 6,156 additions and 6,471 deletions.
diff --git a/.changeset/polite-insects-flow.md b/.changeset/polite-insects-flow.md
@@ -0,0 +1,5 @@
+---
+"web": patch
+---
+
+test: migrate unit test
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -0,0 +1,22 @@
+{
+  "mode": "exit",
+  "tag": "beta",
+  "initialVersions": {
+    "admin-api": "1.1.0",
+    "admin-web": "1.1.0",
+    "api": "1.7.0",
+    "reg-scraper": "1.3.0",
+    "web": "1.8.0",
+    "web-e2e": "0.1.0",
+    "@cgr/codegen": "1.3.0",
+    "@cgr/course-utils": "1.1.0",
+    "@cgr/project-config": "1.1.0",
+    "@cgr/schema": "1.3.0"
+  },
+  "changesets": [
+    "polite-insects-flow",
+    "sixty-eels-explode",
+    "sixty-waves-tie",
+    "tiny-cheetahs-yawn"
+  ]
+}
diff --git a/.changeset/sixty-eels-explode.md b/.changeset/sixty-eels-explode.md
@@ -0,0 +1,5 @@
+---
+"web": patch
+---
+
+chore: enable new semester (2566/3)
diff --git a/.changeset/sixty-waves-tie.md b/.changeset/sixty-waves-tie.md
@@ -0,0 +1,14 @@
+---
+"@cgr/project-config": minor
+"@cgr/course-utils": minor
+"reg-scraper": minor
+"@cgr/codegen": minor
+"@cgr/schema": minor
+"admin-api": minor
+"admin-web": minor
+"web-e2e": minor
+"api": minor
+"web": minor
+---
+
+deps: upgrade to node 20 and bump all patch-minor
diff --git a/.changeset/tiny-cheetahs-yawn.md b/.changeset/tiny-cheetahs-yawn.md
@@ -0,0 +1,14 @@
+---
+"@cgr/project-config": minor
+"@cgr/codegen": minor
+"admin-web": minor
+"web": minor
+"@cgr/course-utils": patch
+"reg-scraper": patch
+"@cgr/schema": patch
+"admin-api": patch
+"web-e2e": patch
+"api": patch
+---
+
+feat: next 14 and minor dependencies
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -7,27 +7,26 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         name: Checkout
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2.0.1
+        uses: pnpm/action-setup@v2
         id: pnpm-install
         with:
-          version: 8
           run_install: false
 
       - name: Setup node with cache
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version-file: .nvmrc
           cache: pnpm
 
       - name: Get pnpm store directory
         id: pnpm-cache
         run: |
           echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Setup pnpm cache
         with:
           path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}

diff --git a/.github/workflows/pre-release.yaml b/.github/workflows/pre-release.yaml
@@ -14,19 +14,20 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18]
         os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version-file: .nvmrc
 
       - name: Check if pre.json exists
         id: pre-release-file
@@ -52,7 +53,7 @@ jobs:
         run: npx changeset pre exit
 
       - name: Commit Changes to the Pull Request
-        uses: EndBug/add-and-commit@v7
+        uses: EndBug/add-and-commit@v9
         with:
           add: .changeset/pre.json
           message: 'Configure pre-release mode'
diff --git a/.github/workflows/release-without-versioning.yaml b/.github/workflows/release-without-versioning.yaml
@@ -26,7 +26,6 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18]
         os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
@@ -39,20 +38,19 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version-file: .nvmrc
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2.2.2
+        uses: pnpm/action-setup@v2
         id: pnpm-install
         with:
-          version: 8
           run_install: false
 
       - name: Install turbo

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -48,7 +48,6 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18]
         os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
@@ -66,21 +65,20 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           # related to issue, https://github.com/changesets/action/issues/201
           fetch-depth: 0
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version-file: .nvmrc
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2.2.2
+        uses: pnpm/action-setup@v2
         id: pnpm-install
         with:
-          version: 8
           run_install: false
 
       - name: Get pnpm store directory
@@ -89,7 +87,7 @@ jobs:
           echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
 
       - name: Setup pnpm cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
@@ -100,7 +98,7 @@ jobs:
 
       - name: Create Versioning Pull Request
         id: changesets
-        uses: changesets/action@v1.4.1
+        uses: changesets/action@v1
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:

diff --git a/.github/workflows/reusable-ci.yaml b/.github/workflows/reusable-ci.yaml
@@ -16,29 +16,28 @@ jobs:
   run:
     runs-on: ${{ inputs.runs-on }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         name: Checkout
         with:
           fetch-depth: 0
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2.0.1
+        uses: pnpm/action-setup@v2
         id: pnpm-install
         with:
-          version: 8
           run_install: false
 
       - name: Setup node with cache
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version-file: .nvmrc
           cache: pnpm
 
       - name: Get pnpm store directory
         id: pnpm-cache
         run: |
           echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Setup pnpm cache
         with:
           path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
@@ -51,7 +50,7 @@ jobs:
 
       - name: Get branch name
         id: branch-name
-        uses: tj-actions/branch-names@v6
+        uses: tj-actions/branch-names@v8
 
       - name: Echo base branch name
         id: get-base-branch

diff --git a/.github/workflows/sync-beta.yaml b/.github/workflows/sync-beta.yaml
@@ -17,7 +17,6 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18]
         os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
@@ -27,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: beta
           fetch-depth: 0

diff --git a/.github/workflows/update-gitops.yaml b/.github/workflows/update-gitops.yaml
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ inputs.gitops-repository }}
           ref: ${{ inputs.gitops-ref }}
@@ -87,6 +87,7 @@ jobs:
           PACKAGES: ${{ inputs.packages }}
 
       - name: Create Pull Request to GitOps
+        # TODO Migrate
         uses: peter-evans/create-pull-request@v4
         if: ${{ inputs.mode == 'pr' }}
         with:

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-lts/hydrogen
+lts/iron
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,7 +1,3 @@
 {
-  "recommendations": [
-    "esbenp.prettier-vscode",
-    "firsttris.vscode-jest-runner",
-    "dbaeumer.vscode-eslint"
-  ]
+  "recommendations": ["esbenp.prettier-vscode", "dbaeumer.vscode-eslint"]
 }
diff --git a/apps/admin-api/CHANGELOG.md b/apps/admin-api/CHANGELOG.md
@@ -1,5 +1,24 @@
 # admin-api
 
+## 1.2.0-beta.1
+
+### Patch Changes
+
+- c0e5777: feat: next 14 and minor dependencies
+- Updated dependencies [c0e5777]
+  - @cgr/schema@1.4.0-beta.1
+
+## 1.2.0-beta.0
+
+### Minor Changes
+
+- 4f342ee: deps: upgrade to node 20 and bump all patch-minor
+
+### Patch Changes
+
+- Updated dependencies [4f342ee]
+  - @cgr/schema@1.4.0-beta.0
+
 ## 1.1.0
 
 ### Minor Changes

diff --git a/apps/admin-api/Dockerfile b/apps/admin-api/Dockerfile
@@ -1,6 +1,6 @@
 # When copying this Dockerfile for use in other apps, don't forget to change the scope (api, web, etc.) in RUN commands
 
-FROM node:18-alpine AS pnpm
+FROM node:20-alpine AS pnpm
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk add --no-cache libc6-compat
 RUN apk update

diff --git a/apps/admin-api/jest.config.ts b/apps/admin-api/jest.config.ts
diff --git a/apps/admin-api/package.json b/apps/admin-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "admin-api",
-  "version": "1.1.0",
+  "version": "1.2.0-beta.1",
   "description": "",
   "author": "",
   "private": true,
@@ -14,7 +14,7 @@
     "prebuild": "rimraf dist"
   },
   "dependencies": {
-    "@apollo/server": "^4.9.3",
+    "@apollo/server": "^4.10.0",
     "@cgr/schema": "workspace:*",
     "@nestjs/apollo": "^11.0.6",
     "@nestjs/axios": "^2.0.0",
@@ -37,14 +37,11 @@
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
-    "@types/cookie-parser": "^1.4.4",
-    "@types/express": "^4.17.18",
-    "@types/jest": "29.5.5",
-    "@types/node": "^18.18.1",
-    "eslint": "8.50.0",
-    "jest": "29.7.0",
-    "ts-jest": "29.1.1",
+    "@types/cookie-parser": "^1.4.6",
+    "@types/express": "^4.17.21",
+    "@types/node": "^20.11.17",
+    "eslint": "8.56.0",
     "ts-morph": "^20.0.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   }
 }
diff --git a/apps/admin-api/tsconfig.build.json b/apps/admin-api/tsconfig.build.json
@@ -1,4 +1,4 @@
 {
   "extends": "./tsconfig.json",
-  "exclude": ["node_modules", "../../node_modules", "jest.config.ts", "test", "dist", "**/*spec.ts"]
+  "exclude": ["node_modules", "../../node_modules", "test", "dist", "**/*spec.ts"]
 }