Skip to content

Commit 9b1260a

Browse files
authored
fix: TypeError: CubejsServer.driverDependencies is not a function (#1264)
* feat(cubejs-cli): Use source maps to original TS files * misc(cubejs-cli): Remove prompt for selection template * fix(@cubejs-backend/server): Revert exports as it was before (commonjs issue...)
1 parent 1c8069e commit 9b1260a

File tree

7 files changed

+20
-27
lines changed

7 files changed

+20
-27
lines changed

packages/cubejs-cli/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
"node-machine-id": "^1.1.10",
4343
"request": "^2.88.2",
4444
"request-promise": "^4.2.5",
45-
"semver": "^7.3.2"
45+
"semver": "^7.3.2",
46+
"source-map-support": "^0.5.19"
4647
},
4748
"devDependencies": {
4849
"@cubejs-backend/linter": "^0.22.0",

packages/cubejs-cli/src/command/create.ts

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,7 @@ const logStage = (stage) => {
1313
};
1414

1515
const create = async (projectName, options) => {
16-
if (!options.template) {
17-
const prompt = await inquirer.prompt([{
18-
type: 'list',
19-
name: 'template',
20-
message: 'Select template',
21-
choices: [
22-
'docker',
23-
'express',
24-
'serverless',
25-
'serverless-google',
26-
]
27-
}]);
28-
29-
options.template = prompt.template;
30-
}
31-
16+
options.template = options.template || 'docker';
3217
const createAppOptions = { projectName, dbType: options.dbType, template: options.template };
3318

3419
event('Create App', createAppOptions);

packages/cubejs-cli/src/index.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
#!/usr/bin/env node
2-
/*
3-
eslint no-var: 0
4-
*/
5-
/*
6-
eslint prefer-template: 0
7-
*/
2+
3+
import 'source-map-support/register';
84
import chalk from 'chalk';
95

106
const currentNodeVersion = process.versions.node;
@@ -14,7 +10,7 @@ const major = parseInt(<string> semver[0], 10);
1410
if (major < 8) {
1511
console.error(
1612
chalk.red(
17-
'You are running Node.js ' + currentNodeVersion + '.\n' +
13+
`You are running Node.js ${currentNodeVersion}.\n` +
1814
'Cube.js CLI requires Node.js 8 or higher. \n' +
1915
'Please update your version of Node.js.'
2016
)
@@ -25,7 +21,7 @@ if (major < 8) {
2521
if (major < 10) {
2622
process.emitWarning(
2723
chalk.red(
28-
'You are running Node.js ' + currentNodeVersion + '.\n' +
24+
`You are running Node.js ${currentNodeVersion}.\n` +
2925
'Support for Node.js 8 will be removed soon. Please upgrade to Node.js 10 or higher.'
3026
)
3127
);

packages/cubejs-cli/yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4470,7 +4470,7 @@ source-map-resolve@^0.5.0:
44704470
source-map-url "^0.4.0"
44714471
urix "^0.1.0"
44724472

4473-
source-map-support@^0.5.6:
4473+
source-map-support@^0.5.19, source-map-support@^0.5.6:
44744474
version "0.5.19"
44754475
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
44764476
integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==

packages/cubejs-server/index.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
const { run } = require('@oclif/command');
2+
const { CubejsServer } = require('./dist/server');
3+
4+
/**
5+
* After 5 years working with TypeScript, now I know
6+
* that commonjs and nodejs require is not compatibility with using export default
7+
*/
8+
module.exports = CubejsServer;
9+
// It's needed to move our CLI to destructing style on import
10+
module.exports.CubejsServer = CubejsServer;
11+
module.exports.run = run;

packages/cubejs-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"engines": {
1313
"node": ">=8.11.1"
1414
},
15-
"main": "dist/index.js",
15+
"main": "index.js",
1616
"typings": "dist/index.d.ts",
1717
"files": [
1818
"dist",

packages/test/test.js

Whitespace-only changes.

0 commit comments

Comments
 (0)