Skip to content

Commit d6b4c21

Browse files
authored
chore(server-core): Make cubestore as requirement (#10155)
1 parent 4ab1af9 commit d6b4c21

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

packages/cubejs-server-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"@cubejs-backend/native": "1.5.4",
3636
"@cubejs-backend/query-orchestrator": "1.5.4",
3737
"@cubejs-backend/schema-compiler": "1.5.4",
38+
"@cubejs-backend/cubestore-driver": "1.5.4",
3839
"@cubejs-backend/shared": "1.5.4",
3940
"@cubejs-backend/templates": "1.5.4",
4041
"codesandbox-import-utils": "^2.1.12",
@@ -59,7 +60,6 @@
5960
"ws": "^7.5.3"
6061
},
6162
"devDependencies": {
62-
"@cubejs-backend/cubestore-driver": "1.5.4",
6363
"@cubejs-backend/linter": "1.5.4",
6464
"@cubejs-client/playground": "1.5.4",
6565
"@types/cross-spawn": "^6.0.2",

packages/cubejs-server-core/src/core/OptsHandler.ts

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import {
77
isDockerImage,
88
displayCLIWarning,
99
} from '@cubejs-backend/shared';
10+
import { isCubeStoreSupported, CubeStoreHandler, CubeStoreDevDriver } from "@cubejs-backend/cubestore-driver";
11+
1012
import {
1113
CreateOptions,
1214
SystemOptions,
@@ -403,15 +405,8 @@ export class OptsHandler {
403405

404406
if (externalDbType === 'cubestore' && this.isDevMode() && !opts.serverless) {
405407
if (!definedExtDBVariables.length) {
406-
// There is no @cubejs-backend/cubestore-driver dependency in the core
407-
// package. At the same time, @cubejs-backend/cubestore-driver is already
408-
// exist at the moment, when the core server instance is up. That is the
409-
// reason why we inject it in this way.
410-
//
411-
// eslint-disable-next-line global-require,import/no-extraneous-dependencies
412-
const cubeStorePackage = require('@cubejs-backend/cubestore-driver');
413-
if (cubeStorePackage.isCubeStoreSupported()) {
414-
const cubeStoreHandler = new cubeStorePackage.CubeStoreHandler({
408+
if (isCubeStoreSupported()) {
409+
const cubeStoreHandler = new CubeStoreHandler({
415410
stdout: (data) => {
416411
console.log(data.toString().trim());
417412
},
@@ -436,7 +431,7 @@ export class OptsHandler {
436431

437432
// Lazy loading for Cube Store
438433
externalDriverFactory =
439-
() => new cubeStorePackage.CubeStoreDevDriver(cubeStoreHandler);
434+
() => new CubeStoreDevDriver(cubeStoreHandler);
440435
} else {
441436
this.core.logger('Cube Store is not supported on your system', {
442437
warning: (

0 commit comments

Comments
 (0)