Skip to content

Commit 3e1a075

Browse files
authored
chore(playground): Use vitest (remove react-scripts) (#6265)
1 parent 1ed327d commit 3e1a075

File tree

8 files changed

+727
-1933
lines changed

8 files changed

+727
-1933
lines changed

packages/cubejs-backend-shared/test/promises.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ describe('asyncMemoizeBackground', () => {
494494

495495
// Wait for promises running in the non-async timer callback to complete.
496496
// From https://stackoverflow.com/a/58716087/308237
497-
const flushPromises = () => new Promise(resolve => setImmediate(resolve));
497+
const flushPromises = () => new Promise(jest.requireActual('timers').setImmediate);
498498

499499
test('asyncMemoizeBackground cache', async () => {
500500
let called = 0;

packages/cubejs-playground/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SKIP_PREFLIGHT_CHECK=true
1+
SKIP_PREFLIGHT_CHECK=true

packages/cubejs-playground/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"module": "lib/playground/index.js",
1212
"types": "lib/playground/index.d.ts",
1313
"scripts": {
14-
"unit": "react-scripts test",
14+
"unit": "vitest run",
1515
"dev": "vite",
1616
"watch": "tsc --noEmit false --watch",
1717
"build": "tsc && yarn build:playground && yarn build:lib",
@@ -60,8 +60,6 @@
6060
"devDependencies": {
6161
"@ant-design/compatible": "^1.0.2",
6262
"@ant-design/icons": "^4.7.0",
63-
"@babel/cli": "^7.5.5",
64-
"@babel/plugin-proposal-optional-chaining": "^7.11.0",
6563
"@cubejs-client/core": "^0.34.19",
6664
"@cubejs-client/react": "^0.34.19",
6765
"@types/flexsearch": "^0.7.3",
@@ -81,15 +79,16 @@
8179
"eslint-plugin-react": "^7.20.0",
8280
"fs-extra": "^8.1.0",
8381
"graphql": "^15.8.0",
82+
"jsdom": "^16.7.0",
8483
"prismjs": "^1.25.0",
8584
"react": "^17.0.1",
8685
"react-dom": "^17.0.1",
87-
"react-scripts": "4.0.3",
8886
"recursive-readdir": "^2.2.2",
8987
"styled-components": "5.2.0",
9088
"tslib": "^2.3.0",
9189
"typescript": "~5.2.2",
92-
"vite": "^3.1.0"
90+
"vite": "^4.5.0",
91+
"vitest": "^0.34.6"
9392
},
9493
"peerDependencies": {
9594
"@ant-design/icons": ">=4.7.0",

packages/cubejs-playground/src/__tests__/__snapshots__/cube-graphql-converter.test.ts.snap

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
22

3-
exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Orders.status","Users.country","Orders.createdAt"],"order":[["Orders.count","desc"],["Orders.status","asc"],["Users.country","desc"]]} 1`] = `
3+
exports[`Cube GraphQL converter > {"measures":["Orders.count"],"dimensions":["Orders.status","Users.country","Orders.createdAt"],"order":[["Orders.count","desc"],["Orders.status","asc"],["Users.country","desc"]]} 1`] = `
44
"query CubeQuery {
55
cube {
66
orders(orderBy: {count: desc, status: asc}) {
@@ -18,7 +18,7 @@ exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Ord
1818
"
1919
`;
2020

21-
exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Orders.status","Users.country","Orders.createdAt"],"order":{"Orders.count":"desc","Orders.status":"asc","Users.country":"desc"}} 1`] = `
21+
exports[`Cube GraphQL converter > {"measures":["Orders.count"],"dimensions":["Orders.status","Users.country","Orders.createdAt"],"order":{"Orders.count":"desc","Orders.status":"asc","Users.country":"desc"}} 1`] = `
2222
"query CubeQuery {
2323
cube {
2424
orders(orderBy: {count: desc, status: asc}) {
@@ -36,7 +36,7 @@ exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Ord
3636
"
3737
`;
3838

39-
exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Orders.status","Users.country","Orders.createdAt"]} 1`] = `
39+
exports[`Cube GraphQL converter > {"measures":["Orders.count"],"dimensions":["Orders.status","Users.country","Orders.createdAt"]} 1`] = `
4040
"query CubeQuery {
4141
cube {
4242
orders {
@@ -54,7 +54,7 @@ exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Ord
5454
"
5555
`;
5656

57-
exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Orders.status","Users.country"],"filters":[{"member":"Orders.amount","operator":"equals","values":["5","10"]},{"or":[{"member":"Users.country","operator":"equals","values":["US"]},{"and":[{"member":"Orders.status","operator":"equals","values":["canceled","active"]},{"member":"Users.country","operator":"equals","values":["US"]}]}]}]} 1`] = `
57+
exports[`Cube GraphQL converter > {"measures":["Orders.count"],"dimensions":["Orders.status","Users.country"],"filters":[{"member":"Orders.amount","operator":"equals","values":["5","10"]},{"or":[{"member":"Users.country","operator":"equals","values":["US"]},{"and":[{"member":"Orders.status","operator":"equals","values":["canceled","active"]},{"member":"Users.country","operator":"equals","values":["US"]}]}]}]} 1`] = `
5858
"query CubeQuery {
5959
cube(
6060
where: {orders: {amount: {in: [5, 10]}}, OR: [{users: {country: {equals: \\"US\\"}}}, {AND: [{orders: {status: {in: [\\"canceled\\", \\"active\\"]}}}, {users: {country: {equals: \\"US\\"}}}]}]}
@@ -71,7 +71,7 @@ exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Ord
7171
"
7272
`;
7373

74-
exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Orders.status","Users.country"],"filters":[{"member":"Users.country","operator":"equals","values":["US"]},{"member":"Orders.status","operator":"equals","values":["canceled","active"]}]} 1`] = `
74+
exports[`Cube GraphQL converter > {"measures":["Orders.count"],"dimensions":["Orders.status","Users.country"],"filters":[{"member":"Users.country","operator":"equals","values":["US"]},{"member":"Orders.status","operator":"equals","values":["canceled","active"]}]} 1`] = `
7575
"query CubeQuery {
7676
cube(
7777
where: {users: {country: {equals: \\"US\\"}}, orders: {status: {in: [\\"canceled\\", \\"active\\"]}}}
@@ -88,7 +88,7 @@ exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Ord
8888
"
8989
`;
9090

91-
exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Orders.status","Users.country"],"filters":[{"member":"Users.country","operator":"equals","values":["US"]},{"member":"Users.country","operator":"equals","values":["Canada"]}]} 1`] = `
91+
exports[`Cube GraphQL converter > {"measures":["Orders.count"],"dimensions":["Orders.status","Users.country"],"filters":[{"member":"Users.country","operator":"equals","values":["US"]},{"member":"Users.country","operator":"equals","values":["Canada"]}]} 1`] = `
9292
"query CubeQuery {
9393
cube(
9494
where: {users: {AND: [{country: {equals: \\"US\\"}}, {country: {equals: \\"Canada\\"}}]}}
@@ -105,7 +105,7 @@ exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Ord
105105
"
106106
`;
107107

108-
exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Orders.status"],"filters":[{"member":"Orders.status","operator":"equals","values":["canceled","active"]},{"or":[{"member":"Users.country","operator":"notSet"},{"member":"Users.country","operator":"equals","values":["US"]}]}]} 1`] = `
108+
exports[`Cube GraphQL converter > {"measures":["Orders.count"],"dimensions":["Orders.status"],"filters":[{"member":"Orders.status","operator":"equals","values":["canceled","active"]},{"or":[{"member":"Users.country","operator":"notSet"},{"member":"Users.country","operator":"equals","values":["US"]}]}]} 1`] = `
109109
"query CubeQuery {
110110
cube(
111111
where: {orders: {status: {in: [\\"canceled\\", \\"active\\"]}}, OR: [users: {OR: [{country: {set: false}}, {country: {equals: \\"US\\"}}]}]}
@@ -119,7 +119,7 @@ exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Ord
119119
"
120120
`;
121121

122-
exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Orders.status"],"timeDimensions":[{"dimension":"Orders.createdAt","granularity":"day","dateRange":["2020-01-01","2021-01-01"]}]} 1`] = `
122+
exports[`Cube GraphQL converter > {"measures":["Orders.count"],"dimensions":["Orders.status"],"timeDimensions":[{"dimension":"Orders.createdAt","granularity":"day","dateRange":["2020-01-01","2021-01-01"]}]} 1`] = `
123123
"query CubeQuery {
124124
cube(where: {orders: {createdAt: {inDateRange: [\\"2020-01-01\\", \\"2021-01-01\\"]}}}) {
125125
orders {
@@ -134,7 +134,7 @@ exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Ord
134134
"
135135
`;
136136

137-
exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Orders.status"],"timezone":"America/Los_Angeles","limit":100} 1`] = `
137+
exports[`Cube GraphQL converter > {"measures":["Orders.count"],"dimensions":["Orders.status"],"timezone":"America/Los_Angeles","limit":100} 1`] = `
138138
"query CubeQuery {
139139
cube(timezone: \\"America/Los_Angeles\\", limit: 100) {
140140
orders {
@@ -146,7 +146,7 @@ exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Ord
146146
"
147147
`;
148148

149-
exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Orders.status"],"timezone":"America/Los_Angeles","limit":100} 2`] = `
149+
exports[`Cube GraphQL converter > {"measures":["Orders.count"],"dimensions":["Orders.status"],"timezone":"America/Los_Angeles","limit":100} 2`] = `
150150
"query CubeQuery {
151151
cube(timezone: \\"America/Los_Angeles\\", limit: 100) {
152152
orders {
@@ -158,7 +158,7 @@ exports[`Cube GraphQL converter: {"measures":["Orders.count"],"dimensions":["Ord
158158
"
159159
`;
160160

161-
exports[`Cube GraphQL converter: {"measures":["Orders.count"],"timeDimensions":[{"dimension":"Orders.createdAt","granularity":"quarter"}],"order":[["Orders.count","asc"],["Users.country","asc"]],"dimensions":["Users.country","Orders.createdAt"]} 1`] = `
161+
exports[`Cube GraphQL converter > {"measures":["Orders.count"],"timeDimensions":[{"dimension":"Orders.createdAt","granularity":"quarter"}],"order":[["Orders.count","asc"],["Users.country","asc"]],"dimensions":["Users.country","Orders.createdAt"]} 1`] = `
162162
"query CubeQuery {
163163
cube {
164164
orders(orderBy: {count: asc}) {

packages/cubejs-playground/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"dom",
77
"esnext"
88
],
9+
"types": ["vitest/globals"],
910
"declaration": true,
1011
"rootDir": "src",
1112
"outDir": "./lib",

packages/cubejs-playground/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/// <reference types="vitest" />
12
import { defineConfig } from 'vite';
23
import react from '@vitejs/plugin-react';
34

@@ -22,7 +23,6 @@ export default defineConfig(({ mode }) => ({
2223
},
2324
},
2425
},
25-
2626
define:
2727
mode === 'development'
2828
? {
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/// <reference types="vitest" />
2+
3+
import { defineConfig } from 'vite'
4+
5+
export default defineConfig({
6+
test: {
7+
globals: true,
8+
environment: 'jsdom',
9+
},
10+
})

0 commit comments

Comments
 (0)