Skip to content

Commit a823329

Browse files
committed
fix tools settings
1 parent 0ba94ef commit a823329

File tree

6 files changed

+33
-81
lines changed

6 files changed

+33
-81
lines changed

packages/cubejs-client-core/.eslintrc.js

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

packages/cubejs-client-core/babel.config.js

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

packages/cubejs-client-core/jest.config.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,4 @@ const base = require('../../jest.base.config');
44
module.exports = {
55
...base,
66
rootDir: '.',
7-
transform: {
8-
'^.+\\.js$': 'babel-jest',
9-
},
107
};

packages/cubejs-client-core/package.json

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"directory": "packages/cubejs-client-core"
99
},
1010
"description": "cube.js client",
11-
"main": "dist/cubejs-client-core.js",
11+
"main": "dist/src/index.js",
1212
"module": "dist/cubejs-client-core.esm.js",
13-
"types": "index.d.ts",
13+
"typings": "dist/src/index.d.ts",
1414
"author": "Cube Dev, Inc.",
1515
"dependencies": {
1616
"@babel/runtime": "^7.1.2",
@@ -22,27 +22,31 @@
2222
"uuid": "^8.3.2"
2323
},
2424
"scripts": {
25+
"build": "rm -rf dist && npm run tsc",
26+
"tsc": "tsc",
27+
"watch": "tsc -w",
2528
"test": "npm run unit",
26-
"unit": "jest",
27-
"lint": "eslint src/*.js",
28-
"lint:fix": "eslint --fix src/*.js"
29+
"unit": "jest --coverage dist/test",
30+
"lint": "eslint src/* test/ --ext .ts,.js",
31+
"lint:fix": "eslint --fix src/* test/ --ext .ts,js"
2932
},
3033
"files": [
31-
"src",
32-
"dist",
33-
"index.d.ts"
34+
"dist/src"
3435
],
3536
"license": "MIT",
3637
"devDependencies": {
37-
"@babel/core": "^7.3.3",
38-
"@babel/preset-env": "^7.3.1",
38+
"@babel/core": "^7.24",
39+
"@babel/preset-env": "^7.24",
3940
"@types/jest": "^29",
41+
"@types/ramda": "^0.27.34",
4042
"@types/moment-range": "^4.0.0",
43+
"@types/uuid": "^8.3.0",
4144
"babel-jest": "^29",
42-
"eslint": "^7.21.0",
43-
"eslint-config-airbnb-base": "^13.1.0",
44-
"eslint-plugin-import": "^2.16.0",
45-
"eslint-plugin-node": "^10.0.0",
46-
"jest": "^29"
45+
"@cubejs-backend/linter": "1.3.12",
46+
"jest": "^29",
47+
"typescript": "~5.2.2"
48+
},
49+
"eslintConfig": {
50+
"extends": "../cubejs-linter"
4751
}
4852
}
Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
11
{
2+
"extends": "../../tsconfig.base.json",
3+
"include": [
4+
"src/**/*",
5+
"test/**/*",
6+
"test/fixtures/datablending/load-responses.json"
7+
],
28
"compilerOptions": {
3-
"lib": ["es2017"],
4-
"target": "es2017", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
5-
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
6-
"declaration": true,
7-
"declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
8-
"declarationDir": "./dist", /* Generates a sourcemap for each corresponding '.d.ts' file. */
9-
"sourceMap": false, /* Generates corresponding '.map' file. */
10-
"outDir": "./temp", /* Redirect output structure to the directory. */
11-
"strict": true, /* Enable all strict type-checking options. */
12-
"noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
13-
"strictNullChecks": true, /* Enable strict null checks. */
14-
"strictFunctionTypes": true, /* Enable strict checking of function types. */
15-
"strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
16-
"strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
17-
"noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
18-
"alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
19-
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
20-
"allowSyntheticDefaultImports": true,
21-
"skipLibCheck": true, /* Skip type checking of declaration files. */
22-
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
9+
"outDir": "dist",
10+
"rootDir": ".",
11+
"baseUrl": ".",
12+
"resolveJsonModule": true,
13+
"esModuleInterop": true
2314
}
2415
}

tsconfig.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
{
2929
"path": "packages/cubejs-cubestore-driver"
3030
},
31+
{
32+
"path": "packages/cubejs-client-core"
33+
},
3134
{
3235
"path": "packages/cubejs-query-orchestrator"
3336
},

0 commit comments

Comments
 (0)