From 0131080c22d052216610b0b7bb70ec8b0418971c Mon Sep 17 00:00:00 2001
From: shivam <shivammadlani5@gmail.com>
Date: Wed, 22 Nov 2023 02:34:23 +0530
Subject: [PATCH 1/4] Resolves #1985

This commit fixes the CJS deprication warning.

Signed-off-by: shivam <shivammadlani5@gmail.com>
---
 packages/jaeger-ui/{vite.config.ts => vite.config.mts} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename packages/jaeger-ui/{vite.config.ts => vite.config.mts} (94%)

diff --git a/packages/jaeger-ui/vite.config.ts b/packages/jaeger-ui/vite.config.mts
similarity index 94%
rename from packages/jaeger-ui/vite.config.ts
rename to packages/jaeger-ui/vite.config.mts
index e8ef11c12a..32b7c3402f 100644
--- a/packages/jaeger-ui/vite.config.ts
+++ b/packages/jaeger-ui/vite.config.mts
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /* eslint-disable import/no-extraneous-dependencies */
-import { defineConfig } from 'vite';
+import { PluginOption, defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
 import legacy from '@vitejs/plugin-legacy';
 import vitePluginImp from 'vite-plugin-imp';
-import visualizer from 'rollup-plugin-visualizer';
+import {visualizer} from 'rollup-plugin-visualizer';
 
 const proxyConfig = {
   target: 'http://localhost:16686',
@@ -57,7 +57,7 @@ export default defineConfig({
       exclude: ['lodash'],
     }),
     // Generate a bundle size breakdown.
-    visualizer(),
+    visualizer() as PluginOption,
   ],
   css: {
     preprocessorOptions: {

From 5559770aeec8d1a586bcf039bf211d0b4aef718c Mon Sep 17 00:00:00 2001
From: shivam <shivammadlani5@gmail.com>
Date: Wed, 22 Nov 2023 12:13:14 +0530
Subject: [PATCH 2/4] Resolves #1985

This commit fixes the CJS deprication warning

Signed-off-by: shivam <shivammadlani5@gmail.com>
---
 packages/jaeger-ui/package.json                        | 1 +
 packages/jaeger-ui/{vite.config.mts => vite.config.ts} | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename packages/jaeger-ui/{vite.config.mts => vite.config.ts} (97%)

diff --git a/packages/jaeger-ui/package.json b/packages/jaeger-ui/package.json
index 2c49418670..31b52bea41 100644
--- a/packages/jaeger-ui/package.json
+++ b/packages/jaeger-ui/package.json
@@ -2,6 +2,7 @@
   "private": true,
   "name": "jaeger-ui",
   "version": "1.35.0",
+  "type": "module",
   "main": "src/index.tsx",
   "license": "Apache-2.0",
   "homepage": ".",
diff --git a/packages/jaeger-ui/vite.config.mts b/packages/jaeger-ui/vite.config.ts
similarity index 97%
rename from packages/jaeger-ui/vite.config.mts
rename to packages/jaeger-ui/vite.config.ts
index 32b7c3402f..9f723370e2 100644
--- a/packages/jaeger-ui/vite.config.mts
+++ b/packages/jaeger-ui/vite.config.ts
@@ -17,7 +17,7 @@ import { PluginOption, defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
 import legacy from '@vitejs/plugin-legacy';
 import vitePluginImp from 'vite-plugin-imp';
-import {visualizer} from 'rollup-plugin-visualizer';
+import { visualizer } from 'rollup-plugin-visualizer';
 
 const proxyConfig = {
   target: 'http://localhost:16686',

From d774447bd88d29abf0c5d15e8e5a4b2a1b10e603 Mon Sep 17 00:00:00 2001
From: shivam <shivammadlani5@gmail.com>
Date: Thu, 23 Nov 2023 12:58:50 +0530
Subject: [PATCH 3/4] Resolves #1985

The previous commit changed the config from CJS to ESM which caused
2 tests to fail.
This commit fixes the above issue by replacing 'require' with 'import'
throughout the project

Signed-off-by: shivam <shivammadlani5@gmail.com>
---
 packages/jaeger-ui/test/babel-transform.js        | 2 +-
 packages/jaeger-ui/test/generic-file-transform.js | 2 +-
 packages/jaeger-ui/test/jest-per-test-setup.js    | 6 +++---
 packages/plexus/webpack-factory.js                | 9 ++++-----
 packages/plexus/webpack.dev.config.js             | 2 +-
 packages/plexus/webpack.layout-worker.config.js   | 2 +-
 packages/plexus/webpack.umd.config.js             | 2 +-
 scripts/generateDepcheckrcJaegerUI.js             | 6 +++---
 scripts/generateDepcheckrcPlexus.js               | 6 +++---
 9 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/packages/jaeger-ui/test/babel-transform.js b/packages/jaeger-ui/test/babel-transform.js
index 3b407ecab5..fdd8d51b70 100644
--- a/packages/jaeger-ui/test/babel-transform.js
+++ b/packages/jaeger-ui/test/babel-transform.js
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-const babelJest = require('babel-jest').default;
+import babelJest from 'babel-jest';
 
 const babelConfiguration = {
   presets: [
diff --git a/packages/jaeger-ui/test/generic-file-transform.js b/packages/jaeger-ui/test/generic-file-transform.js
index 2ce5519e11..0b6ac0d862 100644
--- a/packages/jaeger-ui/test/generic-file-transform.js
+++ b/packages/jaeger-ui/test/generic-file-transform.js
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-const path = require('path');
+import path from 'path';
 
 // Simple Jest transform that stubs out CSS files and returns the file name as the mock content for other file types.
 module.exports = {
diff --git a/packages/jaeger-ui/test/jest-per-test-setup.js b/packages/jaeger-ui/test/jest-per-test-setup.js
index 30793654eb..1097e656bf 100644
--- a/packages/jaeger-ui/test/jest-per-test-setup.js
+++ b/packages/jaeger-ui/test/jest-per-test-setup.js
@@ -22,9 +22,9 @@ rafPolyfill();
 global.TextEncoder = TextEncoder;
 
 /* eslint-disable import/no-extraneous-dependencies */
-const Enzyme = require('enzyme');
-const EnzymeAdapter = require('@wojtekmaj/enzyme-adapter-react-17');
-const createSerializer = require('enzyme-to-json').createSerializer;
+import Enzyme from 'enzyme';
+import EnzymeAdapter from '@wojtekmaj/enzyme-adapter-react-17';
+import { createSerializer } from 'enzyme-to-json';
 
 Enzyme.configure({ adapter: new EnzymeAdapter() });
 expect.addSnapshotSerializer(createSerializer({ mode: 'deep' }));
diff --git a/packages/plexus/webpack-factory.js b/packages/plexus/webpack-factory.js
index a95cbbd3a6..2839723ca2 100644
--- a/packages/plexus/webpack-factory.js
+++ b/packages/plexus/webpack-factory.js
@@ -14,11 +14,10 @@
 
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable @typescript-eslint/no-var-requires */
-
-const { join } = require('path');
-const { CleanWebpackPlugin } = require('clean-webpack-plugin');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const nodeExternals = require('webpack-node-externals');
+import { join } from 'path';
+import { CleanWebpackPlugin } from 'clean-webpack-plugin';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+import nodeExternals from 'webpack-node-externals';
 
 const babelConfigPath = require.resolve('./babel.config');
 
diff --git a/packages/plexus/webpack.dev.config.js b/packages/plexus/webpack.dev.config.js
index 14d43d8698..9f16604ee9 100644
--- a/packages/plexus/webpack.dev.config.js
+++ b/packages/plexus/webpack.dev.config.js
@@ -13,6 +13,6 @@
 // limitations under the License.
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const factory = require('./webpack-factory');
+import factory from './webpack-factory';
 
 module.exports = factory('development');
diff --git a/packages/plexus/webpack.layout-worker.config.js b/packages/plexus/webpack.layout-worker.config.js
index 6c58452cff..4ef52b79fb 100644
--- a/packages/plexus/webpack.layout-worker.config.js
+++ b/packages/plexus/webpack.layout-worker.config.js
@@ -13,6 +13,6 @@
 // limitations under the License.
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const factory = require('./webpack-factory');
+import factory from './webpack-factory';
 
 module.exports = factory('layout-worker');
diff --git a/packages/plexus/webpack.umd.config.js b/packages/plexus/webpack.umd.config.js
index a0544feddc..58b2cf83f0 100644
--- a/packages/plexus/webpack.umd.config.js
+++ b/packages/plexus/webpack.umd.config.js
@@ -13,6 +13,6 @@
 // limitations under the License.
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const factory = require('./webpack-factory');
+import factory from './webpack-factory';
 
 module.exports = factory('umd');
diff --git a/scripts/generateDepcheckrcJaegerUI.js b/scripts/generateDepcheckrcJaegerUI.js
index 14b6817185..1bb1ae954d 100644
--- a/scripts/generateDepcheckrcJaegerUI.js
+++ b/scripts/generateDepcheckrcJaegerUI.js
@@ -14,9 +14,9 @@
 
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable @typescript-eslint/no-var-requires */
-const fs = require('fs');
-const path = require('path');
-const { babelConfiguration } = require('../packages/jaeger-ui/test/babel-transform');
+import fs from 'fs';
+import path from 'path';
+import { babelConfiguration } from '../packages/jaeger-ui/test/babel-transform';
 
 const packageNames = [
   ...babelConfiguration.presets.flatMap(preset => {
diff --git a/scripts/generateDepcheckrcPlexus.js b/scripts/generateDepcheckrcPlexus.js
index 268f46713d..9dc4ef6416 100644
--- a/scripts/generateDepcheckrcPlexus.js
+++ b/scripts/generateDepcheckrcPlexus.js
@@ -14,9 +14,9 @@
 
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable @typescript-eslint/no-var-requires */
-const fs = require('fs');
-const path = require('path');
-const getBabelConfig = require('../packages/plexus/babel.config');
+import fs from 'fs';
+import path from 'path';
+import getBabelConfig from '../packages/plexus/babel.config';
 
 const babelConfiguration = getBabelConfig({
   env: () => {

From e28f2978302677fbdc0281c159bd2a1518c1bbea Mon Sep 17 00:00:00 2001
From: shivam <shivammadlani5@gmail.com>
Date: Sat, 25 Nov 2023 16:42:36 +0530
Subject: [PATCH 4/4] Resolves #1985

This commit fixes the CJS deprication warning by renaming vite.config.ts
to vite.config.mts.

Signed-off-by: shivam <shivammadlani5@gmail.com>
---
 package.json                                           | 6 +++---
 packages/jaeger-ui/package.json                        | 1 -
 packages/jaeger-ui/test/babel-transform.js             | 2 +-
 packages/jaeger-ui/test/generic-file-transform.js      | 2 +-
 packages/jaeger-ui/test/jest-per-test-setup.js         | 6 +++---
 packages/jaeger-ui/{vite.config.ts => vite.config.mts} | 0
 packages/plexus/webpack-factory.js                     | 8 ++++----
 packages/plexus/webpack.dev.config.js                  | 2 +-
 packages/plexus/webpack.layout-worker.config.js        | 2 +-
 packages/plexus/webpack.umd.config.js                  | 2 +-
 scripts/generateDepcheckrcJaegerUI.js                  | 6 +++---
 scripts/generateDepcheckrcPlexus.js                    | 6 +++---
 12 files changed, 21 insertions(+), 22 deletions(-)
 rename packages/jaeger-ui/{vite.config.ts => vite.config.mts} (100%)

diff --git a/package.json b/package.json
index 03fad90017..404d8850ff 100644
--- a/package.json
+++ b/package.json
@@ -40,12 +40,12 @@
     "check-license": "./scripts/check-license.sh",
     "coverage": "yarn workspaces run coverage",
     "depcheck": "./scripts/run-depcheck.sh",
-    "eslint": "eslint --cache 'scripts/*.{js,jsx,ts,tsx}' 'packages/*/src/**/*.{js,jsx,ts,tsx}' 'packages/*/*.{js,jsx,ts,tsx}'",
+    "eslint": "eslint --cache 'scripts/*.{js,jsx,ts,tsx}' 'packages/*/src/**/*.{js,jsx,ts,tsx}' 'packages/*/*.{js,jsx,ts,tsx,mts}'",
     "fmt": "yarn prettier",
     "lint": "npm-run-all -ln --parallel prettier-lint tsc-lint eslint check-license",
     "prepare": "yarn workspace @jaegertracing/plexus prepublishOnly",
-    "prettier": "prettier --write '{.,scripts}/*.{js,jsx,json,md,ts,tsx}' 'packages/*/{src,demo/src}/**/!(layout.worker.bundled|react-vis).{css,js,jsx,json,md,ts,tsx}' 'packages/*/*.{css,js,jsx,json,md,ts,tsx}'",
-    "prettier-lint": "prettier --list-different '{.,scripts}/*.{js,jsx,json,md,ts,tsx}' 'packages/*/{src,demo/src}/**/!(layout.worker.bundled|react-vis).{css,js,jsx,json,md,ts,tsx}' 'packages/*/*.{css,js,jsx,json,md,ts,tsx}' || (echo '*** PLEASE RUN yarn prettier AND RESUBMIT ***' && false)",
+    "prettier": "prettier --write '{.,scripts}/*.{js,jsx,json,md,ts,tsx,mts}' 'packages/*/{src,demo/src}/**/!(layout.worker.bundled|react-vis).{css,js,jsx,json,md,ts,tsx}' 'packages/*/*.{css,js,jsx,json,md,ts,tsx,mts}'",
+    "prettier-lint": "prettier --list-different '{.,scripts}/*.{js,jsx,json,md,ts,tsx,mts}' 'packages/*/{src,demo/src}/**/!(layout.worker.bundled|react-vis).{css,js,jsx,json,md,ts,tsx}' 'packages/*/*.{css,js,jsx,json,md,ts,tsx,mts}' || (echo '*** PLEASE RUN yarn prettier AND RESUBMIT ***' && false)",
     "test": "yarn workspaces run test",
     "tsc-lint": "tsc --build",
     "tsc-lint-debug": "tsc --listFiles",
diff --git a/packages/jaeger-ui/package.json b/packages/jaeger-ui/package.json
index 31b52bea41..2c49418670 100644
--- a/packages/jaeger-ui/package.json
+++ b/packages/jaeger-ui/package.json
@@ -2,7 +2,6 @@
   "private": true,
   "name": "jaeger-ui",
   "version": "1.35.0",
-  "type": "module",
   "main": "src/index.tsx",
   "license": "Apache-2.0",
   "homepage": ".",
diff --git a/packages/jaeger-ui/test/babel-transform.js b/packages/jaeger-ui/test/babel-transform.js
index fdd8d51b70..3b407ecab5 100644
--- a/packages/jaeger-ui/test/babel-transform.js
+++ b/packages/jaeger-ui/test/babel-transform.js
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import babelJest from 'babel-jest';
+const babelJest = require('babel-jest').default;
 
 const babelConfiguration = {
   presets: [
diff --git a/packages/jaeger-ui/test/generic-file-transform.js b/packages/jaeger-ui/test/generic-file-transform.js
index 0b6ac0d862..2ce5519e11 100644
--- a/packages/jaeger-ui/test/generic-file-transform.js
+++ b/packages/jaeger-ui/test/generic-file-transform.js
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import path from 'path';
+const path = require('path');
 
 // Simple Jest transform that stubs out CSS files and returns the file name as the mock content for other file types.
 module.exports = {
diff --git a/packages/jaeger-ui/test/jest-per-test-setup.js b/packages/jaeger-ui/test/jest-per-test-setup.js
index 1097e656bf..30793654eb 100644
--- a/packages/jaeger-ui/test/jest-per-test-setup.js
+++ b/packages/jaeger-ui/test/jest-per-test-setup.js
@@ -22,9 +22,9 @@ rafPolyfill();
 global.TextEncoder = TextEncoder;
 
 /* eslint-disable import/no-extraneous-dependencies */
-import Enzyme from 'enzyme';
-import EnzymeAdapter from '@wojtekmaj/enzyme-adapter-react-17';
-import { createSerializer } from 'enzyme-to-json';
+const Enzyme = require('enzyme');
+const EnzymeAdapter = require('@wojtekmaj/enzyme-adapter-react-17');
+const createSerializer = require('enzyme-to-json').createSerializer;
 
 Enzyme.configure({ adapter: new EnzymeAdapter() });
 expect.addSnapshotSerializer(createSerializer({ mode: 'deep' }));
diff --git a/packages/jaeger-ui/vite.config.ts b/packages/jaeger-ui/vite.config.mts
similarity index 100%
rename from packages/jaeger-ui/vite.config.ts
rename to packages/jaeger-ui/vite.config.mts
diff --git a/packages/plexus/webpack-factory.js b/packages/plexus/webpack-factory.js
index 2839723ca2..89538c5f5c 100644
--- a/packages/plexus/webpack-factory.js
+++ b/packages/plexus/webpack-factory.js
@@ -14,10 +14,10 @@
 
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable @typescript-eslint/no-var-requires */
-import { join } from 'path';
-import { CleanWebpackPlugin } from 'clean-webpack-plugin';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
-import nodeExternals from 'webpack-node-externals';
+const { join } = require('path');
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const nodeExternals = require('webpack-node-externals');
 
 const babelConfigPath = require.resolve('./babel.config');
 
diff --git a/packages/plexus/webpack.dev.config.js b/packages/plexus/webpack.dev.config.js
index 9f16604ee9..14d43d8698 100644
--- a/packages/plexus/webpack.dev.config.js
+++ b/packages/plexus/webpack.dev.config.js
@@ -13,6 +13,6 @@
 // limitations under the License.
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-import factory from './webpack-factory';
+const factory = require('./webpack-factory');
 
 module.exports = factory('development');
diff --git a/packages/plexus/webpack.layout-worker.config.js b/packages/plexus/webpack.layout-worker.config.js
index 4ef52b79fb..6c58452cff 100644
--- a/packages/plexus/webpack.layout-worker.config.js
+++ b/packages/plexus/webpack.layout-worker.config.js
@@ -13,6 +13,6 @@
 // limitations under the License.
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-import factory from './webpack-factory';
+const factory = require('./webpack-factory');
 
 module.exports = factory('layout-worker');
diff --git a/packages/plexus/webpack.umd.config.js b/packages/plexus/webpack.umd.config.js
index 58b2cf83f0..a0544feddc 100644
--- a/packages/plexus/webpack.umd.config.js
+++ b/packages/plexus/webpack.umd.config.js
@@ -13,6 +13,6 @@
 // limitations under the License.
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-import factory from './webpack-factory';
+const factory = require('./webpack-factory');
 
 module.exports = factory('umd');
diff --git a/scripts/generateDepcheckrcJaegerUI.js b/scripts/generateDepcheckrcJaegerUI.js
index 1bb1ae954d..14b6817185 100644
--- a/scripts/generateDepcheckrcJaegerUI.js
+++ b/scripts/generateDepcheckrcJaegerUI.js
@@ -14,9 +14,9 @@
 
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable @typescript-eslint/no-var-requires */
-import fs from 'fs';
-import path from 'path';
-import { babelConfiguration } from '../packages/jaeger-ui/test/babel-transform';
+const fs = require('fs');
+const path = require('path');
+const { babelConfiguration } = require('../packages/jaeger-ui/test/babel-transform');
 
 const packageNames = [
   ...babelConfiguration.presets.flatMap(preset => {
diff --git a/scripts/generateDepcheckrcPlexus.js b/scripts/generateDepcheckrcPlexus.js
index 9dc4ef6416..268f46713d 100644
--- a/scripts/generateDepcheckrcPlexus.js
+++ b/scripts/generateDepcheckrcPlexus.js
@@ -14,9 +14,9 @@
 
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable @typescript-eslint/no-var-requires */
-import fs from 'fs';
-import path from 'path';
-import getBabelConfig from '../packages/plexus/babel.config';
+const fs = require('fs');
+const path = require('path');
+const getBabelConfig = require('../packages/plexus/babel.config');
 
 const babelConfiguration = getBabelConfig({
   env: () => {