Skip to content

Commit 27bc489

Browse files
Migrate to Vite 6 (#2696)
* Upgrade to Vite 6 * fix imports dist
1 parent 52ccb5f commit 27bc489

File tree

10 files changed

+225
-149
lines changed

10 files changed

+225
-149
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
# vscode
1111
/.vscode
1212

13+
# vite
14+
/vite.config.ts-timestamp-*
15+
1316
# misc
1417
.env.local
1518
.env.development.local

package-lock.json

Lines changed: 200 additions & 137 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@
123123
"ts-node": "^10.9.2",
124124
"type-fest": "^4.34.1",
125125
"typescript": "~5.5.4",
126-
"vite": "^5.4.14",
126+
"vite": "^6.2.2",
127127
"vite-plugin-eslint": "^1.8.1",
128128
"vite-plugin-svgr": "^4.3.0",
129-
"vite-tsconfig-paths": "^4.3.2"
129+
"vite-tsconfig-paths": "^5.1.4"
130130
}
131131
}

src/components/dialogs/commons/use-form-search-copy.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@
77

88
import { useIntl } from 'react-intl';
99
import { useCallback, useState } from 'react';
10-
import { EquipmentType, ExtendedEquipmentType, useSnackMessage } from '@gridsuite/commons-ui';
11-
import { EQUIPMENT_INFOS_TYPES, EQUIPMENT_TYPES } from '../../utils/equipment-types';
10+
import {
11+
type EquipmentInfos,
12+
type EquipmentType,
13+
type ExtendedEquipmentType,
14+
useSnackMessage,
15+
} from '@gridsuite/commons-ui';
16+
import { EQUIPMENT_INFOS_TYPES, type EQUIPMENT_TYPES } from '../../utils/equipment-types';
1217
import { fetchNetworkElementInfos } from '../../../services/study/network';
1318
import { useSelector } from 'react-redux';
1419
import { AppState } from '../../../redux/reducer';
15-
import { EquipmentInfos } from '@gridsuite/commons-ui/dist/utils/types/equipmentType';
1620

1721
// TODO fetchNetworkElementInfos has no type
1822
type FetchResponse = Awaited<ReturnType<typeof fetchNetworkElementInfos>>;

src/components/dialogs/network-modifications/common/measurements/measurement.type.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77

8-
import { FieldType } from '@gridsuite/commons-ui/dist/utils/types/fieldType';
8+
import { type FieldType } from '@gridsuite/commons-ui';
99

1010
export interface BranchActiveReactivePowerMeasurementsFormProps {
1111
equipmentToModify: any;

src/components/dialogs/network-modifications/generator-scaling/generator-scaling-dialog.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import { useForm } from 'react-hook-form';
9-
import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
9+
import { yupResolver } from '@hookform/resolvers/yup';
1010
import yup from 'components/utils/yup-config';
1111
import { ModificationDialog } from '../../commons/modificationDialog';
1212
import GeneratorScalingForm from './generator-scaling-form';

src/components/dialogs/network-modifications/load-scaling/load-scaling-dialog.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import { useForm } from 'react-hook-form';
9-
import { yupResolver } from '@hookform/resolvers/yup/dist/yup';
9+
import { yupResolver } from '@hookform/resolvers/yup';
1010
import yup from 'components/utils/yup-config';
1111
import { ModificationDialog } from '../../commons/modificationDialog';
1212
import LoadScalingForm from './load-scaling-form';

src/components/results/sensitivity-analysis/sensitivity-analysis-result.tsx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,14 @@ import { CustomAggridAutocompleteFilter } from '../../custom-aggrid/custom-aggri
2424
import { makeAgGridCustomHeaderColumn } from '../../custom-aggrid/custom-aggrid-header-utils';
2525
import { SensiKind, SENSITIVITY_AT_NODE, SENSITIVITY_IN_DELTA_MW } from './sensitivity-analysis-result.type';
2626
import { AppState } from '../../../redux/reducer';
27-
import type { GridReadyEvent } from 'ag-grid-community/dist/types/src/events';
28-
import { ColDef, ColGroupDef, GridApi, GridColumnsChangedEvent, RowDataUpdatedEvent } from 'ag-grid-community';
29-
27+
import type {
28+
ColDef,
29+
ColGroupDef,
30+
GridApi,
31+
GridColumnsChangedEvent,
32+
GridReadyEvent,
33+
RowDataUpdatedEvent,
34+
} from 'ag-grid-community';
3035
import { Sensitivity } from '../../../services/study/sensitivity-analysis.type';
3136

3237
function isColDef(col: ColDef | ColGroupDef): col is ColDef {

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"forceConsistentCasingInFileNames": true,
1212
"noFallthroughCasesInSwitch": true,
1313
"module": "esnext",
14-
"moduleResolution": "node",
14+
"moduleResolution": "bundler",
1515
"resolveJsonModule": true,
1616
"isolatedModules": true,
1717
"noEmit": true,

vite.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import react from '@vitejs/plugin-react';
99
import { CommonServerOptions, defineConfig } from 'vite';
10+
// @ts-expect-error See https://github.com/gxmari007/vite-plugin-eslint/issues/79
1011
import eslint from 'vite-plugin-eslint';
1112
import svgr from 'vite-plugin-svgr';
1213
import tsconfigPaths from 'vite-tsconfig-paths';

0 commit comments

Comments
 (0)