Skip to content
Merged
Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
030bada
upgrade url-parse
KSDaemon Jan 23, 2025
7bcf9d5
upgrade semver
KSDaemon Jan 23, 2025
1530013
upgrade json5
KSDaemon Jan 23, 2025
b7e3da8
upgrade cross-spawn
KSDaemon Jan 23, 2025
fc30b54
update loader-utils
KSDaemon Jan 23, 2025
c60584c
update mssql
KSDaemon Jan 23, 2025
6c7f170
update postcss
KSDaemon Jan 23, 2025
3e238d3
update nanoid
KSDaemon Jan 23, 2025
f3981fa
update engine.io
KSDaemon Jan 23, 2025
e546542
update rollup
KSDaemon Jan 23, 2025
77b1610
update ua-parser-js
KSDaemon Jan 23, 2025
1802cfa
update semver
KSDaemon Jan 23, 2025
c07d3ed
update webpack
KSDaemon Jan 23, 2025
da5b773
update tough-cookie
KSDaemon Jan 24, 2025
d31870f
update tar
KSDaemon Jan 24, 2025
e6d8775
update minimatch
KSDaemon Jan 24, 2025
3f6817a
update axios
KSDaemon Jan 24, 2025
fb31fad
update decode-uri-component
KSDaemon Jan 24, 2025
c48c101
update cookiejar
KSDaemon Jan 24, 2025
da2ba9e
update ansi-regex
KSDaemon Jan 24, 2025
876a2f5
update ws
KSDaemon Jan 24, 2025
63d881c
update serve-static + send
KSDaemon Jan 24, 2025
5595641
update xml2js + aws-sdk
KSDaemon Jan 24, 2025
caf4a81
update markdown-it
KSDaemon Jan 24, 2025
7d795f5
update plist
KSDaemon Jan 24, 2025
d974f48
update micromatch
KSDaemon Jan 24, 2025
5f3f237
update node-fetch
KSDaemon Jan 24, 2025
988a289
update path-to-regexp + express
KSDaemon Jan 24, 2025
eb89e8b
update engine.io + socket.io
KSDaemon Jan 24, 2025
b4af94c
update undici
KSDaemon Jan 24, 2025
dbf2d3c
update @babel/traverse
KSDaemon Jan 24, 2025
33ec14e
update async
KSDaemon Jan 24, 2025
f1cad1c
update eslint-plugin-node
KSDaemon Jan 24, 2025
12a2845
update vite
KSDaemon Jan 24, 2025
b246a71
update elliptic
KSDaemon Jan 24, 2025
26d0f00
update debug
KSDaemon Jan 24, 2025
c3c14dd
update es5-ext
KSDaemon Jan 24, 2025
cecb379
update @babel/generator
KSDaemon Jan 24, 2025
cc0bc96
upgrade @angular v13→v16
KSDaemon Jan 24, 2025
09baa28
update terser
KSDaemon Feb 7, 2025
6a2a87e
update follow-redirects
KSDaemon Feb 7, 2025
a426729
update axios
KSDaemon Feb 7, 2025
e505ee0
fix tsc type warn
KSDaemon Feb 7, 2025
5e1eaa6
sync pkgs versions
KSDaemon Feb 17, 2025
ddac42b
Fix Jest versions refs
KSDaemon Feb 17, 2025
57748f9
trying to fix the testing-drivers build
KSDaemon Feb 17, 2025
67c9c34
attempt to fix docker build
KSDaemon Feb 18, 2025
8c81d37
fix lru-cache
KSDaemon Feb 18, 2025
187858c
update serialize-javascript
KSDaemon Feb 18, 2025
1d38f5d
update @octokit/request
KSDaemon Feb 18, 2025
2ed6259
fix druid client
KSDaemon Feb 18, 2025
1d98a3d
pin es5-ext and update moment-range
KSDaemon Feb 18, 2025
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-clickhouse-driver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@cubejs-backend/linter": "1.2.5",
"@cubejs-backend/testing-shared": "1.2.5",
"@types/jest": "^27",
"jest": "27",
"jest": "^27",
"typescript": "~5.2.2"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cubejs-client-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"eslint": "^7.21.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-node": "^5.2.1",
"eslint-plugin-node": "^10.0.0",
"jest": "^27"
}
}
2 changes: 1 addition & 1 deletion packages/cubejs-client-dx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"eslint": "^7.21.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-node": "^5.2.1",
"eslint-plugin-node": "^10.0.0",
"jest": "^27"
},
"jest": {
Expand Down
23 changes: 13 additions & 10 deletions packages/cubejs-docker/testing-drivers.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ COPY yarn.lock .
COPY tsconfig.base.json .
COPY rollup.config.js .
COPY packages/cubejs-linter packages/cubejs-linter

# Backend
COPY rust/cubesql/package.json rust/cubesql/package.json
COPY rust/cubestore/package.json rust/cubestore/package.json
COPY rust/cubestore/bin rust/cubestore/bin
Expand All @@ -43,6 +45,7 @@ COPY packages/cubejs-clickhouse-driver/package.json packages/cubejs-clickhouse-d
COPY packages/cubejs-crate-driver/package.json packages/cubejs-crate-driver/package.json
COPY packages/cubejs-dremio-driver/package.json packages/cubejs-dremio-driver/package.json
COPY packages/cubejs-druid-driver/package.json packages/cubejs-druid-driver/package.json
COPY packages/cubejs-duckdb-driver/package.json packages/cubejs-duckdb-driver/package.json
COPY packages/cubejs-elasticsearch-driver/package.json packages/cubejs-elasticsearch-driver/package.json
COPY packages/cubejs-firebolt-driver/package.json packages/cubejs-firebolt-driver/package.json
COPY packages/cubejs-hive-driver/package.json packages/cubejs-hive-driver/package.json
Expand All @@ -67,6 +70,7 @@ COPY packages/cubejs-sqlite-driver/package.json packages/cubejs-sqlite-driver/pa
COPY packages/cubejs-ksql-driver/package.json packages/cubejs-ksql-driver/package.json
COPY packages/cubejs-dbt-schema-extension/package.json packages/cubejs-dbt-schema-extension/package.json
COPY packages/cubejs-jdbc-driver/package.json packages/cubejs-jdbc-driver/package.json
COPY packages/cubejs-vertica-driver/package.json packages/cubejs-vertica-driver/package.json

# We dont need client libraries
#COPY packages/cubejs-templates/package.json packages/cubejs-templates/package.json
Expand All @@ -84,28 +88,24 @@ RUN yarn config set network-timeout 120000 -g
######################################################################
# Databricks driver dependencies #
######################################################################
FROM base AS prod_base_dependencies
FROM base as prod_base_dependencies
COPY packages/cubejs-databricks-jdbc-driver/package.json packages/cubejs-databricks-jdbc-driver/package.json
RUN mkdir packages/cubejs-databricks-jdbc-driver/bin
RUN echo '#!/usr/bin/env node' > packages/cubejs-databricks-jdbc-driver/bin/post-install
RUN yarn install --prod

FROM prod_base_dependencies AS prod_dependencies
FROM prod_base_dependencies as prod_dependencies
COPY packages/cubejs-databricks-jdbc-driver/bin packages/cubejs-databricks-jdbc-driver/bin
RUN yarn install --prod --ignore-scripts

######################################################################
# Build dependencies #
######################################################################
FROM base AS build_dependencies
FROM base AS build

RUN yarn install

######################################################################
# Build layer #
######################################################################
FROM build_dependencies AS build

# Backend
COPY rust/cubestore/ rust/cubestore/
COPY rust/cubesql/ rust/cubesql/
COPY packages/cubejs-backend-shared/ packages/cubejs-backend-shared/
Expand All @@ -121,6 +121,7 @@ COPY packages/cubejs-clickhouse-driver/ packages/cubejs-clickhouse-driver/
COPY packages/cubejs-crate-driver/ packages/cubejs-crate-driver/
COPY packages/cubejs-dremio-driver/ packages/cubejs-dremio-driver/
COPY packages/cubejs-druid-driver/ packages/cubejs-druid-driver/
COPY packages/cubejs-duckdb-driver/ packages/cubejs-duckdb-driver/
COPY packages/cubejs-elasticsearch-driver/ packages/cubejs-elasticsearch-driver/
COPY packages/cubejs-firebolt-driver/ packages/cubejs-firebolt-driver/
COPY packages/cubejs-hive-driver/ packages/cubejs-hive-driver/
Expand All @@ -146,6 +147,7 @@ COPY packages/cubejs-ksql-driver/ packages/cubejs-ksql-driver/
COPY packages/cubejs-dbt-schema-extension/ packages/cubejs-dbt-schema-extension/
COPY packages/cubejs-jdbc-driver/ packages/cubejs-jdbc-driver/
COPY packages/cubejs-databricks-jdbc-driver/ packages/cubejs-databricks-jdbc-driver/
COPY packages/cubejs-vertica-driver/ packages/cubejs-vertica-driver/

# We dont need client libraries
#COPY packages/cubejs-templates/ packages/cubejs-templates/
Expand All @@ -158,7 +160,8 @@ COPY packages/cubejs-databricks-jdbc-driver/ packages/cubejs-databricks-jdbc-dri
#COPY packages/cubejs-playground/ packages/cubejs-playground/

# As we don't need any UI to test drivers, it's enough to transpile ts only.
RUN yarn lerna run tsc
RUN yarn lerna run build

RUN find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +

######################################################################
Expand All @@ -177,7 +180,7 @@ COPY --from=prod_dependencies /cubejs .
COPY packages/cubejs-docker/bin/cubejs-dev /usr/local/bin/cubejs

# By default Node dont search in parent directory from /cube/conf, @todo Reaserch a little bit more
ENV NODE_PATH=/cube/conf/node_modules:/cube/node_modules
ENV NODE_PATH /cube/conf/node_modules:/cube/node_modules
RUN ln -s /cubejs/packages/cubejs-docker /cube
RUN ln -s /cubejs/rust/cubestore/bin/cubestore-dev /usr/local/bin/cubestore-dev

Expand Down
2 changes: 1 addition & 1 deletion packages/cubejs-dremio-driver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@cubejs-backend/base-driver": "1.2.5",
"@cubejs-backend/schema-compiler": "1.2.5",
"@cubejs-backend/shared": "1.2.5",
"axios": "^0.21.1",
"axios": "^0.28.0",
"sqlstring": "^2.3.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cubejs-druid-driver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@cubejs-backend/base-driver": "1.2.5",
"@cubejs-backend/schema-compiler": "1.2.5",
"@cubejs-backend/shared": "1.2.5",
"axios": "^0.21.1"
"axios": "^0.28.0"
},
"devDependencies": {
"@cubejs-backend/linter": "1.2.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/cubejs-druid-driver/src/DruidClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export class DruidClient {
});

if (cancelled) {
await this.cancel(response.headers['x-druid-sql-query-id']);
await this.cancel(response.headers['x-druid-sql-query-id'] || '');

throw new Error('Query cancelled');
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cubejs-ksql-driver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@cubejs-backend/schema-compiler": "1.2.5",
"@cubejs-backend/shared": "1.2.5",
"async-mutex": "0.3.2",
"axios": "^0.21.1",
"axios": "^0.28.0",
"kafkajs": "^2.2.3",
"sqlstring": "^2.3.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cubejs-linter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"eslint": "^8.54.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-node": "^9.2.0"
"eslint-plugin-node": "^10.0.0"
},
"files": [
"index.js"
Expand Down
2 changes: 1 addition & 1 deletion packages/cubejs-query-orchestrator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"csv-write-stream": "^2.0.0",
"es5-ext": "0.10.53",
"generic-pool": "^3.7.1",
"lru-cache": "^6.0.0",
"lru-cache": "^5.1.1",
"ramda": "^0.27.2"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"devDependencies": {
"eslint": "^4.14.0",
"eslint-plugin-node": "^5.2.1",
"eslint-plugin-node": "^10.0.0",
"mocha": "^5.2.0",
"should": "^13.2.3"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"devDependencies": {
"eslint": "^4.14.0",
"eslint-plugin-node": "^5.2.1",
"eslint-plugin-node": "^10.0.0",
"mocha": "^5.2.0",
"should": "^13.2.3"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cubejs-vertica-driver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"devDependencies": {
"@cubejs-backend/linter": "1.2.5",
"@cubejs-backend/testing-shared": "1.2.5",
"jest": "^27.5.1",
"jest": "^27",
"testcontainers": "^10.13.0"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion rust/cubestore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"devDependencies": {
"@cubejs-backend/linter": "1.2.5",
"@types/jest": "^27",
"@types/node": "^12",
"@types/node": "^18",
"jest": "^27",
"typescript": "~5.2.2"
},
Expand Down
Loading
Loading