chore(@cubejs-client/vue2/3): Bump tooling (to remove deasync for dev) (#7369)

ovr · web-flow · commit 9f30775c0abd · 2023-12-06T15:15:42.000+01:00
diff --git a/package.json b/package.json
@@ -28,13 +28,9 @@
   },
   "author": "Cube Dev, Inc.",
   "dependencies": {
-    "@babel/runtime-corejs2": "^7.0.0",
     "@typescript-eslint/eslint-plugin": "^4.17.0",
-    "core-js": "^3.6.5",
-    "lerna": "^4.0.0",
-    "ramda": "^0.27.0",
-    "rollup-plugin-dts": "^1.1.8",
-    "whatwg-fetch": "^3.0.0"
+    "core-js": "^3.34.0",
+    "lerna": "^4.0.0"
   },
   "files": [
     "src",
@@ -53,7 +49,6 @@
     "@rollup/plugin-node-resolve": "^11.2.0",
     "@types/fs-extra": "^9.0.1",
     "@types/jest": "^26.0.3",
-    "babel-runtime": "^6.26.0",
     "flush-promises": "^1.0.2",
     "husky": "^5.0.4",
     "is-ci": "^2.0.0",
diff --git a/packages/cubejs-athena-driver/package.json b/packages/cubejs-athena-driver/package.json
@@ -47,5 +47,8 @@
   "eslintConfig": {
     "extends": "../cubejs-linter"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "license": "Apache-2.0"
 }
diff --git a/packages/cubejs-base-driver/package.json b/packages/cubejs-base-driver/package.json
@@ -53,7 +53,8 @@
     ],
     "coveragePathIgnorePatterns": [
       ".*\\.d\\.ts"
-    ]
+    ],
+    "testEnvironment": "node"
   },
   "resolutions": {
     "es5-ext": "0.10.53",
diff --git a/packages/cubejs-bigquery-driver/package.json b/packages/cubejs-bigquery-driver/package.json
@@ -45,6 +45,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "eslintConfig": {
     "extends": "../cubejs-linter"
   }
diff --git a/packages/cubejs-cli/package.json b/packages/cubejs-cli/package.json
@@ -65,6 +65,9 @@
     "jest": "^26.6.3",
     "typescript": "~5.2.2"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "license": "Apache-2.0",
   "eslintConfig": {
     "extends": "../cubejs-linter"
diff --git a/packages/cubejs-client-dx/package.json b/packages/cubejs-client-dx/package.json
@@ -36,6 +36,9 @@
     "eslint-plugin-node": "^5.2.1",
     "jest": "^26.0.1"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "publishConfig": {
     "access": "public"
   }
diff --git a/packages/cubejs-client-vue/jest.config.js b/packages/cubejs-client-vue/jest.config.js
@@ -6,7 +6,7 @@ module.exports = {
     'vue'
   ],
   transform: {
-    '^.+\\.vue$': 'vue-jest',
+    '^.+\\.vue$': '@vue/vue2-jest',
     '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
     '^.+\\.jsx?$': 'babel-jest'
   },
@@ -22,6 +22,7 @@ module.exports = {
   testMatch: [
     '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
   ],
+  testEnvironment: 'jsdom',
   testURL: 'http://localhost/',
   watchPlugins: [
     'jest-watch-typeahead/filename',
diff --git a/packages/cubejs-client-vue/package.json b/packages/cubejs-client-vue/package.json
@@ -33,18 +33,17 @@
     "ramda": "^0.27.2"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.5.0",
-    "@vue/cli-plugin-eslint": "^4.2.3",
-    "@vue/cli-plugin-unit-jest": "^4.2.3",
-    "@vue/cli-service": "^4.2.3",
-    "@vue/test-utils": "^1.2.0",
-    "babel-core": "7.0.0-bridge.0",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^23.6.0",
+    "@vue/cli-plugin-babel": "^5",
+    "@vue/cli-plugin-eslint": "^5",
+    "@vue/cli-plugin-unit-jest": "^5",
+    "@vue/cli-service": "^5",
+    "@vue/test-utils": "^1.3",
+    "@vue/babel-preset-app": "^5",
+    "@vue/vue2-jest": "^26",
     "eslint": "^7.21.0",
     "eslint-plugin-vue": "^6.2.1",
-    "vue": "^2.6.6",
-    "vue-template-compiler": "^2.6.12"
+    "vue": "^2.7",
+    "vue-template-compiler": "^2.7"
   },
   "peerDependencies": {
     "vue": "^2.6.6"
diff --git a/packages/cubejs-client-vue3/jest.config.js b/packages/cubejs-client-vue3/jest.config.js
@@ -2,7 +2,7 @@ module.exports = {
   moduleFileExtensions: ['js', 'jsx', 'json', 'vue'],
   preset: '@vue/cli-plugin-unit-jest',
   transform: {
-    '^.+\\.vue$': 'vue-jest',
+    '^.+\\.vue$': '@vue/vue3-jest',
     '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
     '^.+\\.jsx?$': 'babel-jest',
   },
@@ -12,6 +12,7 @@ module.exports = {
   },
   snapshotSerializers: ['jest-serializer-vue'],
   testMatch: ['**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'],
+  testEnvironment: 'jsdom',
   testURL: 'http://localhost/',
   watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
 };
diff --git a/packages/cubejs-client-vue3/package.json b/packages/cubejs-client-vue3/package.json
@@ -36,18 +36,20 @@
     "vue-loader": "^16.2.0"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-eslint": "~4.5.0",
-    "@vue/cli-plugin-unit-jest": "^4.2.3",
-    "@vue/cli-service": "~4.5.0",
-    "@vue/test-utils": "^2.0.0-rc.6",
+    "@vue/cli-plugin-babel": "^5.0",
+    "@vue/cli-plugin-eslint": "^5.0",
+    "@vue/cli-plugin-unit-jest": "^5.0",
+    "@vue/cli-service": "^5.0",
+    "@vue/test-utils": "^2.4",
+    "@vue/babel-preset-app": "^5",
+    "@vue/vue2-jest": "^26",
+    "@vue/vue3-jest": "^26",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^23.6.0",
     "eslint": "^7.21.0",
     "eslint-plugin-vue": "^6.2.1",
-    "vue": "^3.0.0",
-    "vue-jest": "^5.0.0-0"
+    "vue": "^3.0"
   },
   "peerDependencies": {
     "vue": "^3.0.0"
diff --git a/packages/cubejs-crate-driver/package.json b/packages/cubejs-crate-driver/package.json
@@ -42,6 +42,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "eslintConfig": {
     "extends": "../cubejs-linter"
   }
diff --git a/packages/cubejs-dremio-driver/package.json b/packages/cubejs-dremio-driver/package.json
@@ -32,6 +32,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "eslintConfig": {
     "extends": "../cubejs-linter"
   }
diff --git a/packages/cubejs-duckdb-driver/package.json b/packages/cubejs-duckdb-driver/package.json
@@ -44,6 +44,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "eslintConfig": {
     "extends": "../cubejs-linter"
   }
diff --git a/packages/cubejs-firebolt-driver/package.json b/packages/cubejs-firebolt-driver/package.json
@@ -42,6 +42,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "eslintConfig": {
     "extends": "../cubejs-linter"
   }
diff --git a/packages/cubejs-hive-driver/package.json b/packages/cubejs-hive-driver/package.json
@@ -33,6 +33,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "eslintConfig": {
     "extends": "../cubejs-linter"
   }
diff --git a/packages/cubejs-ksql-driver/package.json b/packages/cubejs-ksql-driver/package.json
@@ -40,6 +40,9 @@
   "eslintConfig": {
     "extends": "../cubejs-linter"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "devDependencies": {
     "@cubejs-backend/linter": "^0.34.25",
     "typescript": "~5.2.2"
diff --git a/packages/cubejs-materialize-driver/package.json b/packages/cubejs-materialize-driver/package.json
@@ -44,6 +44,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "eslintConfig": {
     "extends": "../cubejs-linter"
   }
diff --git a/packages/cubejs-mongobi-driver/package.json b/packages/cubejs-mongobi-driver/package.json
@@ -44,6 +44,9 @@
     "testcontainers": "^9.8.0",
     "typescript": "~5.2.2"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "eslintConfig": {
     "extends": "../cubejs-linter"
   }
diff --git a/packages/cubejs-mssql-driver/package.json b/packages/cubejs-mssql-driver/package.json
@@ -16,6 +16,9 @@
     "@cubejs-backend/base-driver": "^0.34.26",
     "mssql": "^6.1.0"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
diff --git a/packages/cubejs-mysql-aurora-serverless-driver/package.json b/packages/cubejs-mysql-aurora-serverless-driver/package.json
@@ -41,6 +41,7 @@
     "extends": "../cubejs-linter"
   },
   "jest": {
+    "testEnvironment": "node",
     "testMatch": [
       "**/__tests__/**/*.js?(x)",
       "**/?(*.)+(spec|test|integration).js?(x)"
diff --git a/packages/cubejs-oracle-driver/package.json b/packages/cubejs-oracle-driver/package.json
@@ -19,6 +19,9 @@
   "optionalDependencies": {
     "oracledb": "^6.2.0"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
diff --git a/packages/cubejs-postgres-driver/package.json b/packages/cubejs-postgres-driver/package.json
@@ -45,6 +45,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "eslintConfig": {
     "extends": "../cubejs-linter"
   }
diff --git a/packages/cubejs-prestodb-driver/package.json b/packages/cubejs-prestodb-driver/package.json
@@ -44,6 +44,9 @@
     "testcontainers": "^8.12",
     "typescript": "~5.2.2"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "eslintConfig": {
     "extends": "../cubejs-linter"
   }
diff --git a/packages/cubejs-query-orchestrator/package.json b/packages/cubejs-query-orchestrator/package.json
@@ -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 --forceExit --coverage --verbose dist/test/unit",
     "integration": "npm run integration:redis dist/test/integration",
     "integration:redis": "jest --runInBand --verbose dist/test/integration/redis",
     "integration:cubestore": "jest --runInBand --verbose dist/test/integration/cubestore",
@@ -60,6 +60,7 @@
     "extends": "../cubejs-linter"
   },
   "jest": {
+    "testEnvironment": "node",
     "collectCoverage": false,
     "coverageDirectory": "coverage/",
     "collectCoverageFrom": [
diff --git a/packages/cubejs-query-orchestrator/test/unit/QueryQueue.abstract.ts b/packages/cubejs-query-orchestrator/test/unit/QueryQueue.abstract.ts
@@ -90,16 +90,19 @@ export const QueryQueueTest = (name: string, options: QueryQueueTestOptions = {}
     afterAll(async () => {
       await awaitProcessing();
       // stdout conflict with console.log
-      await pausePromise(100);
+      // TODO: find out why awaitProcessing doesnt work
+      await pausePromise(1 * 1000);
 
-      if (options?.afterAll) {
-        await options?.afterAll();
+      if (options.redisPool) {
+        await options.redisPool.cleanup();
       }
 
-      await options?.redisPool.cleanup();
+      if (options.afterAll) {
+        await options.afterAll();
+      }
     });
 
-    if (options?.beforeAll) {
+    if (options.beforeAll) {
       beforeAll(async () => {
         await options.beforeAll();
       });
diff --git a/packages/cubejs-questdb-driver/package.json b/packages/cubejs-questdb-driver/package.json
@@ -45,6 +45,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "eslintConfig": {
     "extends": "../cubejs-linter"
   }
diff --git a/packages/cubejs-redshift-driver/package.json b/packages/cubejs-redshift-driver/package.json
@@ -39,6 +39,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "eslintConfig": {
     "extends": "../cubejs-linter"
   }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,8 @@`
`47`	`47`	`"eslintConfig": {`
`48`	`48`	`"extends": "../cubejs-linter"`
`49`	`49`	`},`
	`50`	`+ "jest": {`
	`51`	`+ "testEnvironment": "node"`
	`52`	`+ },`
`50`	`53`	`"license": "Apache-2.0"`
`51`	`54`	`}`