Skip to content

Commit 4a740cf

Browse files
leomotorsleomotors
authored
Merge pull request #674 from thinc-org/beta
Deploy Production 9/3/2567
2 parents ed51384 + 3c5f769 commit 4a740cf

File tree

115 files changed

+6156
-6471
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+6156
-6471
lines changed

‎.changeset/polite-insects-flow.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"web": patch
3+
---
4+
5+
test: migrate unit test

‎.changeset/pre.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"mode": "exit",
3+
"tag": "beta",
4+
"initialVersions": {
5+
"admin-api": "1.1.0",
6+
"admin-web": "1.1.0",
7+
"api": "1.7.0",
8+
"reg-scraper": "1.3.0",
9+
"web": "1.8.0",
10+
"web-e2e": "0.1.0",
11+
"@cgr/codegen": "1.3.0",
12+
"@cgr/course-utils": "1.1.0",
13+
"@cgr/project-config": "1.1.0",
14+
"@cgr/schema": "1.3.0"
15+
},
16+
"changesets": [
17+
"polite-insects-flow",
18+
"sixty-eels-explode",
19+
"sixty-waves-tie",
20+
"tiny-cheetahs-yawn"
21+
]
22+
}

‎.changeset/sixty-eels-explode.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"web": patch
3+
---
4+
5+
chore: enable new semester (2566/3)

‎.changeset/sixty-waves-tie.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
"@cgr/project-config": minor
3+
"@cgr/course-utils": minor
4+
"reg-scraper": minor
5+
"@cgr/codegen": minor
6+
"@cgr/schema": minor
7+
"admin-api": minor
8+
"admin-web": minor
9+
"web-e2e": minor
10+
"api": minor
11+
"web": minor
12+
---
13+
14+
deps: upgrade to node 20 and bump all patch-minor

‎.changeset/tiny-cheetahs-yawn.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
"@cgr/project-config": minor
3+
"@cgr/codegen": minor
4+
"admin-web": minor
5+
"web": minor
6+
"@cgr/course-utils": patch
7+
"reg-scraper": patch
8+
"@cgr/schema": patch
9+
"admin-api": patch
10+
"web-e2e": patch
11+
"api": patch
12+
---
13+
14+
feat: next 14 and minor dependencies

‎.github/workflows/e2e.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,26 @@ jobs:
77
timeout-minutes: 60
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111
name: Checkout
1212

1313
- name: Install pnpm
14-
uses: pnpm/action-setup@v2.0.1
14+
uses: pnpm/action-setup@v2
1515
id: pnpm-install
1616
with:
17-
version: 8
1817
run_install: false
1918

2019
- name: Setup node with cache
21-
uses: actions/setup-node@v3
20+
uses: actions/setup-node@v4
2221
with:
23-
node-version: 18
22+
node-version-file: .nvmrc
2423
cache: pnpm
2524

2625
- name: Get pnpm store directory
2726
id: pnpm-cache
2827
run: |
2928
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
30-
- uses: actions/cache@v3
29+
- uses: actions/cache@v4
3130
name: Setup pnpm cache
3231
with:
3332
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}

‎.github/workflows/pre-release.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,20 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
node-version: [18]
1817
os: [ubuntu-latest]
1918

2019
runs-on: ${{ matrix.os }}
2120

2221
steps:
2322
- name: Checkout Repo
24-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
24+
with:
25+
ref: ${{ github.event.pull_request.head.ref }}
2526

2627
- name: Setup Node.js
27-
uses: actions/setup-node@v3
28+
uses: actions/setup-node@v4
2829
with:
29-
node-version: ${{ matrix.node-version }}
30+
node-version-file: .nvmrc
3031

3132
- name: Check if pre.json exists
3233
id: pre-release-file
@@ -52,7 +53,7 @@ jobs:
5253
run: npx changeset pre exit
5354

5455
- name: Commit Changes to the Pull Request
55-
uses: EndBug/add-and-commit@v7
56+
uses: EndBug/add-and-commit@v9
5657
with:
5758
add: .changeset/pre.json
5859
message: 'Configure pre-release mode'

‎.github/workflows/release-without-versioning.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626

2727
strategy:
2828
matrix:
29-
node-version: [18]
3029
os: [ubuntu-latest]
3130

3231
runs-on: ${{ matrix.os }}
@@ -39,20 +38,19 @@ jobs:
3938

4039
steps:
4140
- name: Checkout Repo
42-
uses: actions/checkout@v3
41+
uses: actions/checkout@v4
4342
with:
4443
fetch-depth: 0
4544

4645
- name: Setup Node.js
47-
uses: actions/setup-node@v3
46+
uses: actions/setup-node@v4
4847
with:
49-
node-version: ${{ matrix.node-version }}
48+
node-version-file: .nvmrc
5049

5150
- name: Install pnpm
52-
uses: pnpm/action-setup@v2.2.2
51+
uses: pnpm/action-setup@v2
5352
id: pnpm-install
5453
with:
55-
version: 8
5654
run_install: false
5755

5856
- name: Install turbo

‎.github/workflows/release.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ jobs:
4848

4949
strategy:
5050
matrix:
51-
node-version: [18]
5251
os: [ubuntu-latest]
5352

5453
runs-on: ${{ matrix.os }}
@@ -66,21 +65,20 @@ jobs:
6665

6766
steps:
6867
- name: Checkout Repo
69-
uses: actions/checkout@v2
68+
uses: actions/checkout@v4
7069
with:
7170
# related to issue, https://github.com/changesets/action/issues/201
7271
fetch-depth: 0
7372

7473
- name: Setup Node.js
75-
uses: actions/setup-node@v3
74+
uses: actions/setup-node@v4
7675
with:
77-
node-version: ${{ matrix.node-version }}
76+
node-version-file: .nvmrc
7877

7978
- name: Install pnpm
80-
uses: pnpm/action-setup@v2.2.2
79+
uses: pnpm/action-setup@v2
8180
id: pnpm-install
8281
with:
83-
version: 8
8482
run_install: false
8583

8684
- name: Get pnpm store directory
@@ -89,7 +87,7 @@ jobs:
8987
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
9088
9189
- name: Setup pnpm cache
92-
uses: actions/cache@v3
90+
uses: actions/cache@v4
9391
with:
9492
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
9593
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
@@ -100,7 +98,7 @@ jobs:
10098

10199
- name: Create Versioning Pull Request
102100
id: changesets
103-
uses: changesets/action@v1.4.1
101+
uses: changesets/action@v1
104102
env:
105103
GITHUB_TOKEN: ${{ github.token }}
106104
with:

‎.github/workflows/reusable-ci.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,28 @@ jobs:
1616
run:
1717
runs-on: ${{ inputs.runs-on }}
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
name: Checkout
2121
with:
2222
fetch-depth: 0
2323

2424
- name: Install pnpm
25-
uses: pnpm/action-setup@v2.0.1
25+
uses: pnpm/action-setup@v2
2626
id: pnpm-install
2727
with:
28-
version: 8
2928
run_install: false
3029

3130
- name: Setup node with cache
32-
uses: actions/setup-node@v3
31+
uses: actions/setup-node@v4
3332
with:
34-
node-version: 18
33+
node-version-file: .nvmrc
3534
cache: pnpm
3635

3736
- name: Get pnpm store directory
3837
id: pnpm-cache
3938
run: |
4039
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
41-
- uses: actions/cache@v3
40+
- uses: actions/cache@v4
4241
name: Setup pnpm cache
4342
with:
4443
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
@@ -51,7 +50,7 @@ jobs:
5150

5251
- name: Get branch name
5352
id: branch-name
54-
uses: tj-actions/branch-names@v6
53+
uses: tj-actions/branch-names@v8
5554

5655
- name: Echo base branch name
5756
id: get-base-branch

‎.github/workflows/sync-beta.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717

1818
strategy:
1919
matrix:
20-
node-version: [18]
2120
os: [ubuntu-latest]
2221

2322
runs-on: ${{ matrix.os }}
@@ -27,7 +26,7 @@ jobs:
2726

2827
steps:
2928
- name: Checkout Repo
30-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3130
with:
3231
ref: beta
3332
fetch-depth: 0

‎.github/workflows/update-gitops.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
steps:
4646
- name: Checkout Repo
47-
uses: actions/checkout@v3
47+
uses: actions/checkout@v4
4848
with:
4949
repository: ${{ inputs.gitops-repository }}
5050
ref: ${{ inputs.gitops-ref }}
@@ -87,6 +87,7 @@ jobs:
8787
PACKAGES: ${{ inputs.packages }}
8888

8989
- name: Create Pull Request to GitOps
90+
# TODO Migrate
9091
uses: peter-evans/create-pull-request@v4
9192
if: ${{ inputs.mode == 'pr' }}
9293
with:

‎.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
lts/hydrogen
1+
lts/iron

‎.vscode/extensions.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
{
2-
"recommendations": [
3-
"esbenp.prettier-vscode",
4-
"firsttris.vscode-jest-runner",
5-
"dbaeumer.vscode-eslint"
6-
]
2+
"recommendations": ["esbenp.prettier-vscode", "dbaeumer.vscode-eslint"]
73
}

‎apps/admin-api/CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# admin-api
22

3+
## 1.2.0-beta.1
4+
5+
### Patch Changes
6+
7+
- c0e5777: feat: next 14 and minor dependencies
8+
- Updated dependencies [c0e5777]
9+
- @cgr/schema@1.4.0-beta.1
10+
11+
## 1.2.0-beta.0
12+
13+
### Minor Changes
14+
15+
- 4f342ee: deps: upgrade to node 20 and bump all patch-minor
16+
17+
### Patch Changes
18+
19+
- Updated dependencies [4f342ee]
20+
- @cgr/schema@1.4.0-beta.0
21+
322
## 1.1.0
423

524
### Minor Changes

‎apps/admin-api/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# When copying this Dockerfile for use in other apps, don't forget to change the scope (api, web, etc.) in RUN commands
22

3-
FROM node:18-alpine AS pnpm
3+
FROM node:20-alpine AS pnpm
44
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
55
RUN apk add --no-cache libc6-compat
66
RUN apk update

‎apps/admin-api/jest.config.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎apps/admin-api/package.json

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "admin-api",
3-
"version": "1.1.0",
3+
"version": "1.2.0-beta.1",
44
"description": "",
55
"author": "",
66
"private": true,
@@ -14,7 +14,7 @@
1414
"prebuild": "rimraf dist"
1515
},
1616
"dependencies": {
17-
"@apollo/server": "^4.9.3",
17+
"@apollo/server": "^4.10.0",
1818
"@cgr/schema": "workspace:*",
1919
"@nestjs/apollo": "^11.0.6",
2020
"@nestjs/axios": "^2.0.0",
@@ -37,14 +37,11 @@
3737
"rxjs": "^7.8.1"
3838
},
3939
"devDependencies": {
40-
"@types/cookie-parser": "^1.4.4",
41-
"@types/express": "^4.17.18",
42-
"@types/jest": "29.5.5",
43-
"@types/node": "^18.18.1",
44-
"eslint": "8.50.0",
45-
"jest": "29.7.0",
46-
"ts-jest": "29.1.1",
40+
"@types/cookie-parser": "^1.4.6",
41+
"@types/express": "^4.17.21",
42+
"@types/node": "^20.11.17",
43+
"eslint": "8.56.0",
4744
"ts-morph": "^20.0.0",
48-
"typescript": "~5.2.2"
45+
"typescript": "~5.3.3"
4946
}
5047
}

‎apps/admin-api/tsconfig.build.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"extends": "./tsconfig.json",
3-
"exclude": ["node_modules", "../../node_modules", "jest.config.ts", "test", "dist", "**/*spec.ts"]
3+
"exclude": ["node_modules", "../../node_modules", "test", "dist", "**/*spec.ts"]
44
}

0 commit comments

Comments
 (0)