feat: improve build & test performance

dbeaver · May 30, 2024 · 4261083 · 4261083
1 parent 571ca34
commit 4261083
Show file tree

Hide file tree

Showing 109 changed files with 374 additions and 455 deletions.
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
@@ -48,4 +48,4 @@ jobs:
         uses: borales/actions-yarn@v5
         with:
           dir: webapp
-          cmd: lerna run test
+          cmd: test
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -17,7 +17,7 @@
       "type": "shell",
       "command": "yarn",
       "group": "test",
-      "args": ["lerna", "run", "test", "--no-bail", "--stream", "--"]
+      "args": ["test"]
     },
     {
       "label": "Run DevServer CE",
@@ -110,6 +110,14 @@
       "options": {
         "cwd": "${workspaceFolder}/webapp"
       }
+    },
+    {
+      "label": "Clean CE",
+      "type": "shell",
+      "command": "yarn lerna run clean --parallel --stream",
+      "options": {
+        "cwd": "${workspaceFolder}/webapp"
+      }
     }
   ],
   "inputs": [

diff --git a/webapp/package.json b/webapp/package.json
@@ -19,8 +19,8 @@
     "mobx-react-lite": "^4.0.5"
   },
   "scripts": {
+    "test": "core-cli-test",
     "prebuild": "lerna run gql:gen --stream --parallel",
-    "pretest": "lerna run gql:gen --stream --parallel && yarn lerna run test --scope @cloudbeaver/tests-runner",
     "prepare": "cd .. && husky ./webapp/.husky",
     "postinstall": "husky"
   },

diff --git a/webapp/packages/core-administration/package.json b/webapp/packages/core-administration/package.json
@@ -11,11 +11,12 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -b",
+    "clean": "rimraf --glob dist",
     "lint": "eslint ./src/ --ext .ts,.tsx",
     "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
-    "test": "yarn build && core-cli-test",
+    "test": "core-cli-test",
     "validate-dependencies": "core-cli-validate-dependencies",
-    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+    "update-ts-references": "yarn run clean && typescript-resolve-references"
   },
   "dependencies": {
     "@cloudbeaver/core-data-context": "~0.1.0",

diff --git a/webapp/packages/core-app/package.json b/webapp/packages/core-app/package.json
@@ -11,10 +11,11 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -b",
+    "clean": "rimraf --glob dist",
     "lint": "eslint ./src/ --ext .ts,.tsx",
     "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
     "validate-dependencies": "core-cli-validate-dependencies",
-    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+    "update-ts-references": "yarn run clean && typescript-resolve-references"
   },
   "dependencies": {
     "@cloudbeaver/core-blocks": "~0.1.0",

diff --git a/webapp/packages/core-authentication/package.json b/webapp/packages/core-authentication/package.json
@@ -11,11 +11,12 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -b",
+    "clean": "rimraf --glob dist",
     "lint": "eslint ./src/ --ext .ts,.tsx",
     "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
-    "test": "yarn build && core-cli-test",
+    "test": "core-cli-test",
     "validate-dependencies": "core-cli-validate-dependencies",
-    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+    "update-ts-references": "yarn run clean && typescript-resolve-references"
   },
   "dependencies": {
     "@cloudbeaver/core-data-context": "~0.1.0",

diff --git a/webapp/packages/core-blocks/package.json b/webapp/packages/core-blocks/package.json
@@ -11,11 +11,12 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -b",
+    "clean": "rimraf --glob dist",
     "lint": "eslint ./src/ --ext .ts,.tsx",
     "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
-    "test": "yarn build && core-cli-test",
+    "test": "core-cli-test",
     "validate-dependencies": "core-cli-validate-dependencies",
-    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+    "update-ts-references": "yarn run clean && typescript-resolve-references"
   },
   "dependencies": {
     "@cloudbeaver/core-authentication": "~0.1.0",

diff --git a/webapp/packages/core-bootstrap/package.json b/webapp/packages/core-bootstrap/package.json
@@ -11,10 +11,11 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -b",
+    "clean": "rimraf --glob dist",
     "lint": "eslint ./src/ --ext .ts,.tsx",
     "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
     "validate-dependencies": "core-cli-validate-dependencies",
-    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+    "update-ts-references": "yarn run clean && typescript-resolve-references"
   },
   "dependencies": {
     "@cloudbeaver/core-administration": "~0.1.0",

diff --git a/webapp/packages/core-browser-cookies/package.json b/webapp/packages/core-browser-cookies/package.json
@@ -11,11 +11,12 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -b",
+    "clean": "rimraf --glob dist",
     "lint": "eslint ./src/ --ext .ts,.tsx",
     "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
-    "test": "yarn build && core-cli-test",
+    "test": "core-cli-test",
     "validate-dependencies": "core-cli-validate-dependencies",
-    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+    "update-ts-references": "yarn run clean && typescript-resolve-references"
   },
   "dependencies": {
     "@cloudbeaver/core-browser-settings": "~0.1.0",

diff --git a/webapp/packages/core-browser-settings/package.json b/webapp/packages/core-browser-settings/package.json
@@ -11,11 +11,12 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -b",
+    "clean": "rimraf --glob dist",
     "lint": "eslint ./src/ --ext .ts,.tsx",
     "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
-    "test": "yarn build && core-cli-test",
+    "test": "core-cli-test",
     "validate-dependencies": "core-cli-validate-dependencies",
-    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+    "update-ts-references": "yarn run clean && typescript-resolve-references"
   },
   "dependencies": {
     "@cloudbeaver/core-di": "~0.1.0",

diff --git a/webapp/packages/core-browser/package.json b/webapp/packages/core-browser/package.json
@@ -11,11 +11,12 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -b",
+    "clean": "rimraf --glob dist",
     "lint": "eslint ./src/ --ext .ts,.tsx",
     "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
-    "test": "yarn build && core-cli-test",
+    "test": "core-cli-test",
     "validate-dependencies": "core-cli-validate-dependencies",
-    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+    "update-ts-references": "yarn run clean && typescript-resolve-references"
   },
   "dependencies": {
     "@cloudbeaver/core-di": "~0.1.0",

diff --git a/webapp/packages/core-cli/configs/babel.config.js b/webapp/packages/core-cli/configs/babel.config.js
diff --git a/webapp/packages/core-cli/configs/jest.babel.config.js b/webapp/packages/core-cli/configs/jest.babel.config.js
diff --git a/webapp/packages/core-cli/configs/jest.config.js b/webapp/packages/core-cli/configs/jest.config.js
@@ -11,9 +11,9 @@ const path = require('path');
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
   testEnvironment: require.resolve('../tests/test.environment.js'),
-  rootDir: path.resolve('./dist'),
+  rootDir: path.resolve('./'),
   moduleFileExtensions: ['js', 'jsx', 'json'],
-  testMatch: ['**/?(*.)+(spec|test).js?(x)'],
+  testMatch: ['<rootDir>/(packages/*/|)dist/?(*.)+(spec|test).js?(x)'],
   transformIgnorePatterns: [
     '\\.pnp\\.[^\\/]+$',
     'node_modules/(?!@ngrx|(?!deck.gl)|ng-dynamic)',
@@ -25,11 +25,11 @@ module.exports = {
     '\\.(css|scss|less)$': require.resolve('./__mocks__/styleMock.js'),
     '^dexie$': require.resolve('dexie'),
   },
-  passWithNoTests: true,
+  // passWithNoTests: true,
   setupFiles: [require.resolve('fake-indexeddb/auto'), require.resolve('../tests/setup.js')],
   setupFilesAfterEnv: ['@testing-library/jest-dom'],
   transform: {
-    '\\.jsx?$': ['babel-jest', { configFile: require.resolve('./jest.babel.config.js') }],
+    '\\.jsx?$': [require.resolve('@swc/jest')],
   },
   testEnvironmentOptions: {
     // This will force JSDOM to use the default export condition when importing msw/node, resulting in correct imports.

diff --git a/webapp/packages/core-cli/configs/webpack.config.js b/webapp/packages/core-cli/configs/webpack.config.js
@@ -119,15 +119,6 @@ module.exports = (env, argv) => {
     ];
   }
 
-  var babelLoader = {
-    loader: require.resolve('babel-loader'),
-    options: {
-      root: __dirname,
-      // cacheDirectory: true,
-      envName: argv.mode,
-    },
-  };
-
   let entry = {};
 
   if (devMode) {
@@ -295,10 +286,10 @@ module.exports = (env, argv) => {
           exclude: /node_modules/,
           use: ['source-map-loader'],
         },
-        {
+        devMode && {
           test: /\.jsx?$/,
           exclude: /node_modules/,
-          use: ['thread-loader', babelLoader],
+          use: ['thread-loader', 'swc-loader'],
         },
         {
           test: /\.(css|s[ac]ss)$/,

diff --git a/webapp/packages/core-cli/package.json b/webapp/packages/core-cli/package.json
@@ -25,18 +25,6 @@
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@babel/cli": "^7.23.9",
-    "@babel/core": "^7.24.0",
-    "@babel/plugin-proposal-decorators": "^7.24.0",
-    "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
-    "@babel/plugin-transform-optional-chaining": "^7.23.4",
-    "@babel/plugin-transform-runtime": "^7.24.0",
-    "@babel/preset-env": "^7.24.0",
-    "@babel/preset-react": "^7.23.3",
-    "@babel/preset-typescript": "^7.23.3",
-    "babel-loader": "^9.1.3",
-    "babel-plugin-module-resolver": "^5.0.0",
-    "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "copy-webpack-plugin": "^12.0.2",
     "css-loader": "^6.10.0",
     "css-minimizer-webpack-plugin": "^7.0.0",
@@ -67,10 +55,11 @@
   },
   "devDependencies": {
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
+    "@swc/core": "^1.5.24",
+    "@swc/jest": "^0",
     "@types/jest": "^29.5.12",
     "@types/madge": "^5.0.3",
     "allure-commandline": "^2.27.0",
-    "babel-jest": "^29.7.0",
     "fake-indexeddb": "^5.0.2",
     "glob": "^10.3.10",
     "http-proxy": "^1.18.1",
@@ -80,6 +69,7 @@
     "jest-jasmine2": "^29.7.0",
     "madge": "^6.1.0",
     "react-refresh": "^0.14.0",
+    "swc-loader": "^0.2.6",
     "tsconfig-paths-webpack-plugin": "^4.1.0",
     "upath": "^2.0.1",
     "workbox-webpack-plugin": "^7.0.0"

diff --git a/webapp/packages/core-client-activity/package.json b/webapp/packages/core-client-activity/package.json
@@ -11,10 +11,11 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -b",
+    "clean": "rimraf --glob dist",
     "lint": "eslint ./src/ --ext .ts,.tsx",
     "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
     "validate-dependencies": "core-cli-validate-dependencies",
-    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+    "update-ts-references": "yarn run clean && typescript-resolve-references"
   },
   "dependencies": {
     "@cloudbeaver/core-di": "~0.1.0",

diff --git a/webapp/packages/core-connections/package.json b/webapp/packages/core-connections/package.json
@@ -11,10 +11,11 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -b",
+    "clean": "rimraf --glob dist",
     "lint": "eslint ./src/ --ext .ts,.tsx",
     "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
     "validate-dependencies": "core-cli-validate-dependencies",
-    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+    "update-ts-references": "yarn run clean && typescript-resolve-references"
   },
   "dependencies": {
     "@cloudbeaver/core-authentication": "~0.1.0",

diff --git a/webapp/packages/core-data-context/package.json b/webapp/packages/core-data-context/package.json
@@ -11,10 +11,11 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -b",
+    "clean": "rimraf --glob dist",
     "lint": "eslint ./src/ --ext .ts,.tsx",
     "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
     "validate-dependencies": "core-cli-validate-dependencies",
-    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+    "update-ts-references": "yarn run clean && typescript-resolve-references"
   },
   "dependencies": {
     "@cloudbeaver/core-di": "~0.1.0",

diff --git a/webapp/packages/core-di/package.json b/webapp/packages/core-di/package.json
@@ -11,11 +11,12 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -b",
+    "clean": "rimraf --glob dist",
     "lint": "eslint ./src/ --ext .ts,.tsx",
     "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
-    "test": "yarn build && core-cli-test",
+    "test": "core-cli-test",
     "validate-dependencies": "core-cli-validate-dependencies",
-    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+    "update-ts-references": "yarn run clean && typescript-resolve-references"
   },
   "dependencies": {
     "@cloudbeaver/core-executor": "~0.1.0",

diff --git a/webapp/packages/core-dialogs/package.json b/webapp/packages/core-dialogs/package.json
@@ -11,10 +11,11 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -b",
+    "clean": "rimraf --glob dist",
     "lint": "eslint ./src/ --ext .ts,.tsx",
     "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
     "validate-dependencies": "core-cli-validate-dependencies",
-    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+    "update-ts-references": "yarn run clean && typescript-resolve-references"
   },
   "dependencies": {
     "@cloudbeaver/core-di": "~0.1.0",

diff --git a/webapp/packages/core-events/package.json b/webapp/packages/core-events/package.json
@@ -11,11 +11,12 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -b",
+    "clean": "rimraf --glob dist",
     "lint": "eslint ./src/ --ext .ts,.tsx",
     "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
-    "test": "yarn build && core-cli-test",
+    "test": "core-cli-test",
     "validate-dependencies": "core-cli-validate-dependencies",
-    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+    "update-ts-references": "yarn run clean && typescript-resolve-references"
   },
   "dependencies": {
     "@cloudbeaver/core-di": "~0.1.0",

diff --git a/webapp/packages/core-executor/package.json b/webapp/packages/core-executor/package.json
@@ -11,11 +11,12 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc -b",
+    "clean": "rimraf --glob dist",
     "lint": "eslint ./src/ --ext .ts,.tsx",
     "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
-    "test": "yarn build && core-cli-test",
+    "test": "core-cli-test",
     "validate-dependencies": "core-cli-validate-dependencies",
-    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+    "update-ts-references": "yarn run clean && typescript-resolve-references"
   },
   "dependencies": {
     "mobx": "^6.12.0"