Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cubejs-backend-shared/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const base = require('../../jest.base.config');
const base = require('../../jest.base-ts.config');

/** @type {import('jest').Config} */
module.exports = {
Expand Down
3 changes: 2 additions & 1 deletion packages/cubejs-backend-shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"watch": "tsc -w",
"lint": "eslint src/* --ext .ts",
"lint:fix": "eslint --fix src/* --ext .ts",
"unit": "jest --coverage dist/test"
"unit": "jest --coverage"
},
"files": [
"README.md",
Expand All @@ -32,6 +32,7 @@
"@types/shelljs": "^0.8.5",
"@types/throttle-debounce": "^2.1.0",
"jest": "^29",
"ts-jest": "^29",
"typescript": "~5.2.2"
},
"dependencies": {
Expand Down
7 changes: 6 additions & 1 deletion packages/cubejs-base-driver/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
const base = require('../../jest.base.config');
const base = require('../../jest.base-ts.config');

/** @type {import('jest').Config} */
module.exports = {
...base,
rootDir: '.',
transform: {
'^.+\\.ts$': ['ts-jest', {
tsconfig: '<rootDir>/tsconfig.jest.json'
}],
},
};
3 changes: 2 additions & 1 deletion packages/cubejs-base-driver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"tsc": "tsc",
"watch": "tsc -w",
"test": "npm run unit && npm run integration",
"unit": "jest --runInBand --coverage --verbose dist/test/unit",
"unit": "jest --runInBand --coverage --verbose test/unit",
"lint": "eslint src/* test/* --ext .ts,.js",
"lint:fix": "eslint --fix src/* test/* --ext .ts,.js"
},
Expand All @@ -41,6 +41,7 @@
"@types/jest": "^29",
"@types/node": "^20",
"jest": "^29",
"ts-jest": "^29",
"typescript": "~5.2.2"
},
"license": "Apache-2.0",
Expand Down
9 changes: 9 additions & 0 deletions packages/cubejs-base-driver/tsconfig.jest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"module": "CommonJS",
"paths": {
"@cubejs-backend/shared": ["../cubejs-backend-shared/src"]
}
}
}
7 changes: 6 additions & 1 deletion packages/cubejs-query-orchestrator/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
const base = require('../../jest.base.config');
const base = require('../../jest.base-ts.config');

/** @type {import('jest').Config} */
module.exports = {
...base,
rootDir: '.',
transform: {
'^.+\\.ts$': ['ts-jest', {
tsconfig: '<rootDir>/tsconfig.jest.json'
}],
},
};
7 changes: 4 additions & 3 deletions packages/cubejs-query-orchestrator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"tsc": "tsc",
"watch": "tsc -w",
"test": "npm run unit && npm run integration",
"unit": "jest --runInBand --forceExit --coverage --verbose dist/test/unit",
"integration": "jest --runInBand --verbose dist/test/integration",
"integration:cubestore": "jest --runInBand --verbose dist/test/integration/cubestore",
"unit": "jest --runInBand --forceExit --coverage --verbose test/unit",
"integration": "jest --runInBand --verbose test/integration",
"integration:cubestore": "jest --runInBand --verbose test/integration/cubestore",
"lint": "eslint src/* test/* --ext .ts,.js",
"lint:fix": "eslint --fix src/* test/* --ext .ts,.js"
},
Expand All @@ -43,6 +43,7 @@
"@types/ramda": "^0.27.32",
"@types/uuid": "^8.3.0",
"jest": "^29",
"ts-jest": "^29",
"typescript": "~5.2.2"
},
"license": "Apache-2.0",
Expand Down
10 changes: 10 additions & 0 deletions packages/cubejs-query-orchestrator/tsconfig.jest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"module": "CommonJS",
"paths": {
"@cubejs-backend/shared": ["../cubejs-backend-shared/src"],
"@cubejs-backend/base-driver": ["../cubejs-base-driver/src"]
}
}
}
Loading