You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ha...@apache.org on 2026/07/08 18:14:51 UTC
(superset) branch master updated: build(websocket): migrate to ESM (#41680)
This is an automated email from the ASF dual-hosted git repository.
hainenber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new 83716cb8c0d build(websocket): migrate to ESM (#41680)
83716cb8c0d is described below
commit 83716cb8c0d3cb280fee3e92fab9a3a4c1599729
Author: Đỗ Trọng Hải <41...@users.noreply.github.com>
AuthorDate: Thu Jul 9 01:14:44 2026 +0700
build(websocket): migrate to ESM (#41680)
---
.../{eslint.config.js => eslint.config.mjs} | 17 +-
superset-websocket/package-lock.json | 205 ++-------------------
superset-websocket/package.json | 9 +-
superset-websocket/src/config.ts | 7 +-
superset-websocket/src/index.ts | 4 +-
superset-websocket/tsconfig.json | 5 +-
6 files changed, 36 insertions(+), 211 deletions(-)
diff --git a/superset-websocket/eslint.config.js b/superset-websocket/eslint.config.mjs
similarity index 75%
rename from superset-websocket/eslint.config.js
rename to superset-websocket/eslint.config.mjs
index 8249fe0e84e..df8daf23c74 100644
--- a/superset-websocket/eslint.config.js
+++ b/superset-websocket/eslint.config.mjs
@@ -17,15 +17,14 @@
* under the License.
*/
-const typescriptEslintParser = require('@typescript-eslint/parser');
-const typescriptEslintPlugin = require('@typescript-eslint/eslint-plugin');
-const typescriptEslint = require('typescript-eslint');
-const lodashEslintPlugin = require('eslint-plugin-lodash');
-const eslintConfigPrettier = require('eslint-config-prettier');
-const js = require('@eslint/js');
-const globals = require('globals');
+import typescriptEslintParser from '@typescript-eslint/parser';
+import typescriptEslintPlugin from '@typescript-eslint/eslint-plugin';
+import typescriptEslint from 'typescript-eslint';
+import eslintConfigPrettier from 'eslint-config-prettier';
+import js from '@eslint/js';
+import globals from 'globals';
-module.exports = [
+export default [
js.configs.recommended,
...typescriptEslint.configs.recommended,
eslintConfigPrettier,
@@ -41,10 +40,8 @@ module.exports = [
},
plugins: {
typescript: typescriptEslintPlugin,
- lodash: lodashEslintPlugin,
},
rules: {
- 'lodash/import-scope': [2, 'member'],
'@typescript-eslint/explicit-module-boundary-types': 0,
'@typescript-eslint/no-var-requires': 0,
'@typescript-eslint/no-require-imports': 0, // Re-enable once superset-websocket is converted to ESM
diff --git a/superset-websocket/package-lock.json b/superset-websocket/package-lock.json
index c3aeb213748..d2e1e1baba1 100644
--- a/superset-websocket/package-lock.json
+++ b/superset-websocket/package-lock.json
@@ -13,7 +13,7 @@
"hot-shots": "^16.0.0",
"ioredis": "^5.11.1",
"jsonwebtoken": "^9.0.3",
- "lodash": "^4.18.1",
+ "lodash-es": "^4.18.1",
"winston": "^3.19.0",
"ws": "^8.21.0"
},
@@ -21,17 +21,15 @@
"@eslint/js": "^9.25.1",
"@types/eslint__js": "^8.42.3",
"@types/jsonwebtoken": "^9.0.10",
- "@types/lodash": "^4.17.24",
+ "@types/lodash-es": "^4.17.12",
"@types/node": "^26.0.1",
"@types/ws": "^8.18.1",
"@typescript-eslint/eslint-plugin": "^8.62.0",
"@typescript-eslint/parser": "^8.62.0",
"eslint": "^10.5.0",
"eslint-config-prettier": "^10.1.8",
- "eslint-plugin-lodash": "^8.0.0",
"globals": "^17.6.0",
"prettier": "^3.9.4",
- "ts-node": "^10.9.2",
"tscw-config": "^1.1.2",
"typescript": "^6.0.3",
"typescript-eslint": "^8.62.1",
@@ -51,19 +49,6 @@
"node": ">=0.1.90"
}
},
- "node_modules/@cspotcode/source-map-support": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
- "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@jridgewell/trace-mapping": "0.3.9"
- },
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/@dabh/diagnostics": {
"version": "2.0.8",
"resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.8.tgz",
@@ -288,16 +273,6 @@
"integrity": "sha512-UmeW7z4LfctwoQ5wkhVzgq8tXkreED2xZGpX+Bg+zA+WJFZCT6c062AfCK/Dfk81xZnnwdhJCUMkitihRaoC2Q==",
"license": "MIT"
},
- "node_modules/@jridgewell/resolve-uri": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
- "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6.0.0"
- }
- },
"node_modules/@jridgewell/sourcemap-codec": {
"version": "1.5.5",
"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
@@ -305,17 +280,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/@jridgewell/trace-mapping": {
- "version": "0.3.9",
- "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
- "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@jridgewell/resolve-uri": "^3.0.3",
- "@jridgewell/sourcemap-codec": "^1.4.10"
- }
- },
"node_modules/@napi-rs/wasm-runtime": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz",
@@ -644,34 +608,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/@tsconfig/node10": {
- "version": "1.0.12",
- "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.12.tgz",
- "integrity": "sha512-UCYBaeFvM11aU2y3YPZ//O5Rhj+xKyzy7mvcIoAjASbigy8mHMryP5cK7dgjlz2hWxh1g5pLw084E0a/wlUSFQ==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@tsconfig/node12": {
- "version": "1.0.11",
- "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
- "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@tsconfig/node14": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
- "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/@tsconfig/node16": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
- "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
- "dev": true,
- "license": "MIT"
- },
"node_modules/@tybys/wasm-util": {
"version": "0.10.3",
"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz",
@@ -761,6 +697,16 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/@types/lodash-es": {
+ "version": "4.17.12",
+ "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
+ "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/lodash": "*"
+ }
+ },
"node_modules/@types/ms": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz",
@@ -1163,19 +1109,6 @@
"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
}
},
- "node_modules/acorn-walk": {
- "version": "8.3.5",
- "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz",
- "integrity": "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "acorn": "^8.11.0"
- },
- "engines": {
- "node": ">=0.4.0"
- }
- },
"node_modules/ajv": {
"version": "6.15.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz",
@@ -1193,13 +1126,6 @@
"url": "https://github.com/sponsors/epoberezkin"
}
},
- "node_modules/arg": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
- "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
- "dev": true,
- "license": "MIT"
- },
"node_modules/assertion-error": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
@@ -1340,13 +1266,6 @@
"url": "https://opencollective.com/express"
}
},
- "node_modules/create-require": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
- "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
- "dev": true,
- "license": "MIT"
- },
"node_modules/cross-spawn": {
"version": "7.0.6",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -1405,16 +1324,6 @@
"node": ">=8"
}
},
- "node_modules/diff": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.4.tgz",
- "integrity": "sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==",
- "dev": true,
- "license": "BSD-3-Clause",
- "engines": {
- "node": ">=0.3.1"
- }
- },
"node_modules/ecdsa-sig-formatter": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
@@ -1525,22 +1434,6 @@
"eslint": ">=7.0.0"
}
},
- "node_modules/eslint-plugin-lodash": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-lodash/-/eslint-plugin-lodash-8.0.0.tgz",
- "integrity": "sha512-7DA8485FolmWRzh+8t4S8Pzin2TTuWfb0ZW3j/2fYElgk82ZanFz8vDcvc4BBPceYdX1p/za+tkbO68maDBGGw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "lodash": "^4.17.21"
- },
- "engines": {
- "node": ">=10"
- },
- "peerDependencies": {
- "eslint": ">=9.0.0"
- }
- },
"node_modules/eslint-scope": {
"version": "9.1.2",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.2.tgz",
@@ -2328,10 +2221,10 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/lodash": {
+ "node_modules/lodash-es": {
"version": "4.18.1",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
- "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
+ "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz",
+ "integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==",
"license": "MIT"
},
"node_modules/lodash.includes": {
@@ -2403,13 +2296,6 @@
"@jridgewell/sourcemap-codec": "^1.5.5"
}
},
- "node_modules/make-error": {
- "version": "1.3.6",
- "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
- "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
- "dev": true,
- "license": "ISC"
- },
"node_modules/minimatch": {
"version": "10.2.5",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
@@ -2923,50 +2809,6 @@
"typescript": ">=4.8.4"
}
},
- "node_modules/ts-node": {
- "version": "10.9.2",
- "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
- "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@cspotcode/source-map-support": "^0.8.0",
- "@tsconfig/node10": "^1.0.7",
- "@tsconfig/node12": "^1.0.7",
- "@tsconfig/node14": "^1.0.0",
- "@tsconfig/node16": "^1.0.2",
- "acorn": "^8.4.1",
- "acorn-walk": "^8.1.1",
- "arg": "^4.1.0",
- "create-require": "^1.1.0",
- "diff": "^4.0.1",
- "make-error": "^1.1.1",
- "v8-compile-cache-lib": "^3.0.1",
- "yn": "3.1.1"
- },
- "bin": {
- "ts-node": "dist/bin.js",
- "ts-node-cwd": "dist/bin-cwd.js",
- "ts-node-esm": "dist/bin-esm.js",
- "ts-node-script": "dist/bin-script.js",
- "ts-node-transpile-only": "dist/bin-transpile.js",
- "ts-script": "dist/bin-script-deprecated.js"
- },
- "peerDependencies": {
- "@swc/core": ">=1.2.50",
- "@swc/wasm": ">=1.2.50",
- "@types/node": "*",
- "typescript": ">=2.7"
- },
- "peerDependenciesMeta": {
- "@swc/core": {
- "optional": true
- },
- "@swc/wasm": {
- "optional": true
- }
- }
- },
"node_modules/tscw-config": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/tscw-config/-/tscw-config-1.1.2.tgz",
@@ -3080,13 +2922,6 @@
"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
"license": "MIT"
},
- "node_modules/v8-compile-cache-lib": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
- "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
- "dev": true,
- "license": "MIT"
- },
"node_modules/vite": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/vite/-/vite-8.1.0.tgz",
@@ -3355,16 +3190,6 @@
}
}
},
- "node_modules/yn": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
- "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
"node_modules/yocto-queue": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/superset-websocket/package.json b/superset-websocket/package.json
index 5aea6b0d3f0..41aafb06928 100644
--- a/superset-websocket/package.json
+++ b/superset-websocket/package.json
@@ -2,6 +2,7 @@
"name": "superset-websocket",
"version": "0.0.1",
"description": "Websocket sidecar application for Superset",
+ "type": "module",
"main": "index.js",
"scripts": {
"start": "node dist/index.js start",
@@ -9,7 +10,7 @@
"type": "tsc --noEmit",
"eslint": "eslint",
"lint": "npm run eslint -- . && npm run type",
- "dev-server": "ts-node src/index.ts start",
+ "dev-server": "npm run build && npm run start",
"build": "tsc",
"prettier-check": "prettier --check .",
"prettier-write": "prettier --write .",
@@ -21,7 +22,7 @@
"hot-shots": "^16.0.0",
"ioredis": "^5.11.1",
"jsonwebtoken": "^9.0.3",
- "lodash": "^4.18.1",
+ "lodash-es": "^4.18.1",
"winston": "^3.19.0",
"ws": "^8.21.0"
},
@@ -29,17 +30,15 @@
"@eslint/js": "^9.25.1",
"@types/eslint__js": "^8.42.3",
"@types/jsonwebtoken": "^9.0.10",
- "@types/lodash": "^4.17.24",
+ "@types/lodash-es": "^4.17.12",
"@types/node": "^26.0.1",
"@types/ws": "^8.18.1",
"@typescript-eslint/eslint-plugin": "^8.62.0",
"@typescript-eslint/parser": "^8.62.0",
"eslint": "^10.5.0",
"eslint-config-prettier": "^10.1.8",
- "eslint-plugin-lodash": "^8.0.0",
"globals": "^17.6.0",
"prettier": "^3.9.4",
- "ts-node": "^10.9.2",
"tscw-config": "^1.1.2",
"typescript": "^6.0.3",
"typescript-eslint": "^8.62.1",
diff --git a/superset-websocket/src/config.ts b/superset-websocket/src/config.ts
index 72f7a40fcb8..54a014c70e0 100644
--- a/superset-websocket/src/config.ts
+++ b/superset-websocket/src/config.ts
@@ -17,7 +17,9 @@
* under the License.
*/
-import { merge as _merge } from 'lodash';
+import { readFileSync } from 'fs';
+import { merge as _merge } from 'lodash-es';
+import { resolve } from 'path';
export interface RedisConfig {
port: number;
@@ -103,8 +105,9 @@ function defaultConfig(): ConfigType {
function configFromFile(): Partial<ConfigType> {
const isTest = process.env.NODE_ENV === 'test';
const configFile = isTest ? '../config.test.json' : '../config.json';
+ const configFilePath = resolve(import.meta.dirname, configFile);
try {
- return require(configFile);
+ return JSON.parse(readFileSync(configFilePath, 'utf8')) as ConfigType;
} catch {
console.warn('config.json file not found');
return {};
diff --git a/superset-websocket/src/index.ts b/superset-websocket/src/index.ts
index 9550bfa46f6..c08622147ef 100644
--- a/superset-websocket/src/index.ts
+++ b/superset-websocket/src/index.ts
@@ -26,8 +26,8 @@ import { parse } from 'cookie';
import { Redis, RedisOptions } from 'ioredis';
import StatsD from 'hot-shots';
-import { createLogger } from './logger';
-import { buildConfig, RedisConfig } from './config';
+import { createLogger } from './logger.js';
+import { buildConfig, RedisConfig } from './config.js';
import { checkServerIdentity, PeerCertificate } from 'tls';
export type StreamResult = [
diff --git a/superset-websocket/tsconfig.json b/superset-websocket/tsconfig.json
index df47ee8496a..48791e276d4 100644
--- a/superset-websocket/tsconfig.json
+++ b/superset-websocket/tsconfig.json
@@ -2,8 +2,9 @@
"compilerOptions": {
"rootDir": "src",
"outDir": "dist",
- "target": "es2019",
- "module": "commonjs",
+ "target": "esnext",
+ "module": "nodenext",
+ "moduleResolution": "nodenext",
"esModuleInterop": true,
"strict": true,
"skipLibCheck": true,