Skip to content

Commit 28d6d14

Browse files
committed
Merge remote-tracking branch 'origin/main' into APL-820
2 parents e3f2b80 + 1b94c75 commit 28d6d14

File tree

11 files changed

+3961
-1917
lines changed

11 files changed

+3961
-1917
lines changed

.github/workflows/coverage.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- '*.ts'
1111
jobs:
1212
coverage:
13+
continue-on-error: true
1314
if: ${{ github.actor != 'dependabot[bot]' }}
1415
runs-on: ubuntu-latest
1516
steps:
@@ -33,7 +34,9 @@ jobs:
3334
node -v
3435
npm install
3536
36-
- uses: ArtiomTr/jest-coverage-report-action@v2
37+
- name: Compare Coverage
38+
continue-on-error: true
39+
uses: ArtiomTr/jest-coverage-report-action@v2
3740
with:
3841
test-script: npm run test
3942
annotations: none

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20.18
1+
v22

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20.19.2-alpine as ci
1+
FROM node:22-alpine as ci
22

33
ENV NODE_ENV=test
44
ENV BLUEBIRD_DEBUG=0
@@ -21,7 +21,7 @@ FROM ci as clean
2121
# below command removes the packages specified in devDependencies and set NODE_ENV to production
2222
RUN npm prune --production
2323
# --------------- Production stage
24-
FROM node:20.18.1-alpine AS prod
24+
FROM node:22-alpine AS prod
2525

2626
ENV NODE_ENV=production
2727
ENV NODE_PATH='dist'

babel.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
presets: [
3+
['@babel/preset-env', { targets: { node: 'current' } }],
4+
'@babel/preset-typescript',
5+
],
6+
};

jest.config.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import type { Config } from '@jest/types'
22

33
const config: Config.InitialOptions = {
4-
preset: 'ts-jest',
54
roots: ['<rootDir>/src'],
65
moduleDirectories: ['node_modules', __dirname],
76
testEnvironment: 'node',
87
transform: {
9-
'^.+.tsx?$': ['ts-jest', { tsconfig: 'tsconfig.jest.json' }],
8+
'^.+\\.tsx?$': 'babel-jest',
9+
'^.+\\.jsx?$': 'babel-jest',
1010
},
11+
transformIgnorePatterns: ['/node_modules/(?!(@kubernetes/client-node|openid-client|oauth4webapi|jose)/)'],
1112
silent: false,
1213
verbose: true,
1314
}

0 commit comments

Comments
 (0)