From deacfedef25c397eb6e6e9572a9b66f5f7b08afa Mon Sep 17 00:00:00 2001 From: Ben Warzeski Date: Mon, 7 Aug 2023 15:11:29 +0000 Subject: [PATCH 1/3] fix: remove tsconfig for commitlint job --- .github/workflows/commitlint.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index fec11d6c2..36e15a54c 100644 --- a/.github/workflows/commitlint.yml +++ b/.github/workflows/commitlint.yml @@ -7,4 +7,14 @@ on: jobs: commitlint: - uses: openedx/.github/.github/workflows/commitlint.yml@master + runs-on: ubuntu-20.04 + steps: + - name: Check out repository + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: remove tsconfig.json # see issue https://github.com/conventional-changelog/commitlint/issues/3256 + run: | + rm tsconfig.json + - name: Check commits + uses: wagoid/commitlint-github-action@v5 From 3b8f66af4fe2144133e01e037430aedf0d752e89 Mon Sep 17 00:00:00 2001 From: Ben Warzeski Date: Mon, 7 Aug 2023 15:21:49 +0000 Subject: [PATCH 2/3] fix: fis jest config for ts-jest access --- config/jest.config.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/jest.config.js b/config/jest.config.js index 716c0e10c..f9837eb56 100644 --- a/config/jest.config.js +++ b/config/jest.config.js @@ -1,6 +1,5 @@ const path = require('path'); const fs = require('fs'); -const { jsWithTs: tsjPreset } = require('ts-jest/presets'); const presets = require('../lib/presets'); @@ -40,6 +39,6 @@ module.exports = { configFile: presets.babel.resolvedFilepath, }, ], - ...tsjPreset.transform, + '^.+\\.[tj]sx?$': path.resolve(__dirname, '../node_modules/.bin/ts-jest'), }, }; From a0f24df6548a3a406235bb7bb9770f744a559f05 Mon Sep 17 00:00:00 2001 From: Ben Warzeski Date: Mon, 7 Aug 2023 15:35:50 +0000 Subject: [PATCH 3/3] fix: remove extraneous dependency --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 720aaf69c..9efaa9ba1 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,6 @@ "source-map-loader": "^4.0.1", "ts-jest": "^26.5.0", "style-loader": "3.3.3", - "ts-jest": "^26.5.0", "typescript": "^4.9.4", "url-loader": "4.1.1", "webpack": "5.88.2",