Skip to content

Commit ad5f2e1

Browse files
artemmufazalovartemmufazalov
committed
fix: fix undefined process in package
1 parent 966ff4b commit ad5f2e1

File tree

8 files changed

+33
-31
lines changed

8 files changed

+33
-31
lines changed

‎config-overrides.js

-10
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ const path = require('path');
22

33
const MiniCSSExtractPlugin = require('mini-css-extract-plugin');
44
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
5-
const webpack = require('webpack');
65
const srcRoot = path.resolve(__dirname, 'src');
76
const uiKitRoot = path.resolve(__dirname, 'node_modules/@gravity-ui/uikit');
87
const antlr4C3Root = path.resolve(__dirname, 'node_modules/antlr4-c3');
98
const websqlRoot = path.resolve(__dirname, 'node_modules/@gravity-ui/websql-autocomplete');
109
const antlr4ngRoot = path.resolve(__dirname, 'node_modules/antlr4ng');
1110
const uiKitIconsRoot = path.resolve(__dirname, 'node_modules/@gravity-ui/icons');
1211

13-
const packageJson = require('./package.json');
14-
1512
module.exports = {
1613
webpack: (config, env) => {
1714
const oneOfRule = config.module.rules.find((r) => r.oneOf);
@@ -48,13 +45,6 @@ module.exports = {
4845
}),
4946
);
5047

51-
// Add DefinePlugin to expose just the version
52-
config.plugins.push(
53-
new webpack.DefinePlugin({
54-
'process.env.UI_VERSION': JSON.stringify(packageJson.version),
55-
}),
56-
);
57-
5848
const cssExtractPlugin = config.plugins.find((p) => p instanceof MiniCSSExtractPlugin);
5949
if (cssExtractPlugin) {
6050
cssExtractPlugin.options.ignoreOrder = true;

‎package-lock.json

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,7 @@
164164
"source-map-explorer": "^2.5.3",
165165
"stylelint": "^15.11.0",
166166
"ts-jest": "^29.2.5",
167-
"typescript": "^5.7.3",
168-
"webpack": "^5.98.0"
167+
"typescript": "^5.7.3"
169168
},
170169
"peerDependencies": {
171170
"monaco-yql-languages": ">=1.3.0",

‎public/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<title>YDB Monitoring</title>
2222
<script>
2323
window.systemSettings = {};
24-
window.userSettings = {};
2524
window.web_version = !'%REACT_APP_BACKEND%';
2625
window.custom_backend = '%NODE_ENV%' === 'development' && '%REACT_APP_BACKEND%';
2726
window.meta_backend = '%REACT_APP_META_BACKEND%'
27+
window.react_app_disable_checks = '%REACT_APP_DISABLE_CHECKS%'
2828
</script>
2929
</head>
3030
<body>

‎src/components/ErrorBoundary/utils.tsx

+23-12
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,33 @@
11
import {prepareErrorMessage} from '../../utils/prepareErrorMessage';
22

33
export async function collectDiagnosticsData(error: Error) {
4-
return await getBackendVersion().then((backendVersion) => {
5-
return {
6-
location: window.location.href,
7-
userAgent: navigator.userAgent,
8-
error: {
9-
message: prepareErrorMessage(error),
10-
stack: prepareErrorStack(error.stack, {trim: true, maxLines: 10}),
11-
},
12-
uiVersion: process.env.UI_VERSION,
13-
backendVersion,
14-
};
15-
});
4+
return await Promise.all([getUiVersion(), getBackendVersion()]).then(
5+
([uiVersion, backendVersion]) => {
6+
return {
7+
location: window.location.href,
8+
userAgent: navigator.userAgent,
9+
error: {
10+
message: prepareErrorMessage(error),
11+
stack: prepareErrorStack(error.stack, {trim: true, maxLines: 10}),
12+
},
13+
uiVersion,
14+
backendVersion,
15+
};
16+
},
17+
);
1618
}
1719

1820
export type DiagnosticsData = Awaited<ReturnType<typeof collectDiagnosticsData>>;
1921

22+
async function getUiVersion() {
23+
try {
24+
const packageJson = await import('../../../package.json');
25+
return packageJson.version;
26+
} catch (error) {
27+
return {error: prepareErrorMessage(error)};
28+
}
29+
}
30+
2031
async function getBackendVersion() {
2132
try {
2233
// node_id=. returns data about node that fullfills request

‎src/containers/UserSettings/settings.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import {Lang, defaultLang} from '../../utils/i18n';
2121
import type {SettingProps, SettingsInfoFieldProps} from './Setting';
2222
import i18n from './i18n';
2323

24+
import packageJson from '../../../package.json';
25+
2426
export interface SettingsSection {
2527
id: string;
2628
title: string;
@@ -141,7 +143,7 @@ export const autocompleteOnEnterSetting: SettingProps = {
141143
export const interfaceVersionInfoField: SettingsInfoFieldProps = {
142144
title: i18n('settings.about.interfaceVersionInfoField.title'),
143145
type: 'info',
144-
content: process.env.UI_VERSION,
146+
content: packageJson.version,
145147
};
146148

147149
export const appearanceSection: SettingsSection = {

‎src/store/configureStore.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ function _configureStore<
2828
preloadedState,
2929
middleware: (getDefaultMiddleware) =>
3030
getDefaultMiddleware({
31-
immutableCheck: process.env.REACT_APP_DISABLE_CHECKS
31+
immutableCheck: window.react_app_disable_checks
3232
? false
3333
: {
3434
ignoredPaths: ['tooltip.currentHoveredRef'],
3535
},
36-
serializableCheck: process.env.REACT_APP_DISABLE_CHECKS
36+
serializableCheck: window.react_app_disable_checks
3737
? false
3838
: {
3939
ignoredPaths: ['tooltip.currentHoveredRef', 'api'],

‎src/types/window.d.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ interface Window {
3939
meta_backend?: string;
4040
code_assist_backend?: string;
4141

42-
userSettings?: import('../services/settings').SettingsObject;
42+
react_app_disable_checks?: boolean;
43+
4344
systemSettings?: import('../services/settings').SettingsObject;
4445

4546
api: import('../services/api/index').YdbEmbeddedAPI;

0 commit comments

Comments
 (0)