From f356f77921905552d85a6257bc1c1435dad775be Mon Sep 17 00:00:00 2001 From: Mike North Date: Sun, 4 May 2025 16:04:59 -0700 Subject: [PATCH 1/4] update CI workflow name --- .github/workflows/ci-website.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-website.yml b/.github/workflows/ci-website.yml index 963e7e02..ab370c6d 100644 --- a/.github/workflows/ci-website.yml +++ b/.github/workflows/ci-website.yml @@ -57,6 +57,7 @@ jobs: with: working-directory: packages/website start: yarn test-cypress + key: cypress-${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }} install-command: yarn install browser: chrome wait-on: 'http://localhost:8000' @@ -70,7 +71,6 @@ jobs: runs-on: ubuntu-latest continue-on-error: ${{ matrix.experimental }} strategy: - fail-fast: false matrix: typescript-version: [beta, next] include: @@ -80,9 +80,21 @@ jobs: - typescript-version: next experimental: true name: 'ts-canary' + steps: - uses: actions/checkout@v4 - uses: volta-cli/action@v4 + - run: yarn + - name: Installing TypeScript ${{ matrix.typescript-version }} + run: yarn workspaces foreach --exclude hello-ts --exclude '@mike-north/typescript-courses' -vpi add -D typescript@${{ matrix.typescript-version}} + - name: Build + run: yarn build + - name: Type-check website + run: yarn postinstall && yarn typecheck + - name: Test + run: yarn test + - name: Cypress + uses: cypress-io/github-action@v6 with: node-version: ${{ env.NODE_VERSION }} yarn-version: 3.6.4 From fcb5246793da140079bd3ccaacba1497da128ecc Mon Sep 17 00:00:00 2001 From: Mike North Date: Sun, 4 May 2025 17:26:28 -0700 Subject: [PATCH 2/4] update node types --- package.json | 1 + yarn.lock | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/package.json b/package.json index 3b29ef12..3ac63a91 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "devDependencies": { "@babel/core": "^7.23.2", "@babel/preset-typescript": "^7.23.2", + "@types/node": "latest", "core-js": "^3.33.0", "markdownlint-cli": "^0.37.0", "replace-in-file": "^7.0.1" diff --git a/yarn.lock b/yarn.lock index 6b1017d2..25c75a03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2970,6 +2970,7 @@ __metadata: dependencies: "@babel/core": ^7.23.2 "@babel/preset-typescript": ^7.23.2 + "@types/node": latest core-js: ^3.33.0 markdownlint-cli: ^0.37.0 replace-in-file: ^7.0.1 @@ -5033,6 +5034,15 @@ __metadata: languageName: node linkType: hard +"@types/node@npm:latest": + version: 22.15.3 + resolution: "@types/node@npm:22.15.3" + dependencies: + undici-types: ~6.21.0 + checksum: 26618a9fdfb84de3841e898b7c5fd372e1c0bdb9adc3ec71c12c38dd07d4e73da14681924919d27ff509ebf3714b8de941a21f51c26146cc8aaae31561ca7a5c + languageName: node + linkType: hard + "@types/normalize-package-data@npm:^2.4.0": version: 2.4.2 resolution: "@types/normalize-package-data@npm:2.4.2" @@ -23723,6 +23733,13 @@ __metadata: languageName: node linkType: hard +"undici-types@npm:~6.21.0": + version: 6.21.0 + resolution: "undici-types@npm:6.21.0" + checksum: 46331c7d6016bf85b3e8f20c159d62f5ae471aba1eb3dc52fff35a0259d58dcc7d592d4cc4f00c5f9243fa738a11cfa48bd20203040d4a9e6bc25e807fab7ab3 + languageName: node + linkType: hard + "unherit@npm:^1.0.4": version: 1.1.3 resolution: "unherit@npm:1.1.3" From 869efcd70206838d942b237ff23c45eb575b191f Mon Sep 17 00:00:00 2001 From: Mike North Date: Mon, 5 May 2025 15:57:05 -0700 Subject: [PATCH 3/4] update workspace file --- learn-typescript.code-workspace | 1 - 1 file changed, 1 deletion(-) diff --git a/learn-typescript.code-workspace b/learn-typescript.code-workspace index 6c9f9038..c0491076 100644 --- a/learn-typescript.code-workspace +++ b/learn-typescript.code-workspace @@ -1,6 +1,5 @@ { "folders": [ - { "name": "flights", "path": "packages/flights" }, { "name": "website", "path": "packages/website" }, { "name": "hello-ts", "path": "packages/hello-ts" } ], From 18a961622c9cc145731b9a5403e1da4f83266861 Mon Sep 17 00:00:00 2001 From: Mike North Date: Mon, 5 May 2025 16:02:43 -0700 Subject: [PATCH 4/4] Remove ts compatibility deployment check --- .github/workflows/ci-website.yml | 2 +- package.json | 2 +- yarn.lock | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci-website.yml b/.github/workflows/ci-website.yml index ab370c6d..b32c26bb 100644 --- a/.github/workflows/ci-website.yml +++ b/.github/workflows/ci-website.yml @@ -144,7 +144,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} publish: - needs: [build, ts-compatibility] + needs: [build] runs-on: ubuntu-latest if: success() && github.ref == 'refs/heads/main' steps: diff --git a/package.json b/package.json index 3ac63a91..0fdb50d9 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "devDependencies": { "@babel/core": "^7.23.2", "@babel/preset-typescript": "^7.23.2", - "@types/node": "latest", + "@types/node": "^22.15.8", "core-js": "^3.33.0", "markdownlint-cli": "^0.37.0", "replace-in-file": "^7.0.1" diff --git a/yarn.lock b/yarn.lock index 25c75a03..23932659 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2970,7 +2970,7 @@ __metadata: dependencies: "@babel/core": ^7.23.2 "@babel/preset-typescript": ^7.23.2 - "@types/node": latest + "@types/node": ^22.15.8 core-js: ^3.33.0 markdownlint-cli: ^0.37.0 replace-in-file: ^7.0.1 @@ -5027,6 +5027,15 @@ __metadata: languageName: node linkType: hard +"@types/node@npm:^22.15.8": + version: 22.15.8 + resolution: "@types/node@npm:22.15.8" + dependencies: + undici-types: ~6.21.0 + checksum: f3bd1e9819b91b813b247eccac7c40b754df89a49cc48cc7fd69e9013b3bec84a0c071da97ea82addd138459686ff1b8fab690b956021897b69b4a490105e321 + languageName: node + linkType: hard + "@types/node@npm:^8.5.7": version: 8.10.66 resolution: "@types/node@npm:8.10.66" @@ -5034,15 +5043,6 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:latest": - version: 22.15.3 - resolution: "@types/node@npm:22.15.3" - dependencies: - undici-types: ~6.21.0 - checksum: 26618a9fdfb84de3841e898b7c5fd372e1c0bdb9adc3ec71c12c38dd07d4e73da14681924919d27ff509ebf3714b8de941a21f51c26146cc8aaae31561ca7a5c - languageName: node - linkType: hard - "@types/normalize-package-data@npm:^2.4.0": version: 2.4.2 resolution: "@types/normalize-package-data@npm:2.4.2"