continued plugin refactoring

Author: benkeen

apps/client/tests/testHelpers.tsx

@@ -16,8 +16,8 @@ import mainReducer, { initialState as initialMainState } from '~store/main/main.
 import packetsReducer, { initialState as initialPacketState } from '~store/packets/packets.reducer';
 import { ETSettings } from '~types/exportTypes';
 
+import i18n from '@generatedata/i18n';
 import jsonI18n from '@generatedata/plugins/dist/exportTypes/JSON/i18n/en.json';
-import i18n from '../src/i18n/en.json';
 
 export const rootReducer = combineReducers({
   generator: generatorReducer,

packages/cli/src/index.ts

@@ -6,19 +6,19 @@
  * functionality to show a progress indicator, allow for arguments + error handling etc.
  */
 
-import path from 'path';
+import { getCountryData } from '@generatedata/plugins';
+import { setLocale } from '@generatedata/utils/lang';
 import fs from 'fs';
+import path from 'path';
+import { convertRowsToGenerationTemplate } from '~store/generator/generator.selectors';
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+import { GDLocale, GenerationTemplate } from '~types/general';
 import { DataTemplateRow, DataTypeWorkerInterface, ExportType, GDTemplate } from '~types/generator';
-import { DataType } from '../../../client/_plugins';
-import { dataTypeNodeData, exportTypeNodeData } from './_cliTypes';
 import countryNames from '../../../client/_namePlugins';
-import { generate as generateUtils } from '../../../client/src/utils/generatorUtils';
+import { DataType } from '../../../client/_plugins';
 import workerUtils from '../../../client/src/utils';
-import { GDLocale, GenerationTemplate } from '~types/general';
-import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
-import { convertRowsToGenerationTemplate } from '~store/generator/generator.selectors';
-import { getCountryData } from '@generatedata/plugins';
-import { setLocale } from '~utils/langUtils';
+import { generate as generateUtils } from '../../../client/src/utils/generatorUtils';
+import { dataTypeNodeData, exportTypeNodeData } from './_cliTypes';
 
 export { availableLocales } from '../../../client/_env';
 export { DataType, ExportType, GDTemplate };

packages/core/src/components/dialogs/index.tsx

@@ -21,7 +21,7 @@ const dialogStyles = (theme: any): any => ({
   }
 });
 
-export const DialogTitle = withStyles(dialogStyles)((props: any): any => {
+export const DialogTitle = withStyles(dialogStyles)((props: any) => {
   const { children, classes, onClose, customCloseIcon, ...other } = props;
   const Close = customCloseIcon ? customCloseIcon : CloseIcon;
 

packages/core/src/components/dropdown/Dropdown.tsx

@@ -26,7 +26,7 @@ const selectStyles = {
   menuPortal: (base: any): any => ({ ...base, zIndex: C.ZINDEXES.DIALOG })
 };
 
-export const Dropdown: FC<any> = ({ value, isGrouped, options, hasError, placeholder, ...props }) => {
+export const Dropdown: FC<any> = ({ value, isGrouped, options, hasError, placeholder, ...props }): React.ReactElement<any, any> => {
   const i18n = getStrings();
   const classNames = useStyles();
 

packages/core/src/components/textField/TextField.tsx

@@ -27,6 +27,7 @@ type TextFieldProps = {
   autoComplete?: string;
   min?: number | string;
   max?: number | string;
+  step?: number | string;
 };
 
 export const TextField = ({ throttle, error, value, onChange, tooltipPlacement, className, ref, ...props }: TextFieldProps) => {

packages/core/src/components/tooltips/index.tsx

@@ -1,4 +1,3 @@
-import { StyledComponent } from '@emotion/styled';
 import MuiTooltip from '@mui/material/Tooltip';
 import { styled } from '@mui/material/styles';
 

packages/plugins/src/dataTypes/City/City.generate.ts

@@ -1,6 +1,5 @@
 import { CountryType, Region } from '~types/countries';
-import { DTGenerateResult, DTGenerationData, DTGenerationExistingRowData, WorkerUtils } from '../../';
-import { countryList } from '../../../../_plugins';
+import { countryList, DTGenerateResult, DTGenerationData, DTGenerationExistingRowData, WorkerUtils } from '../../';
 import { CityState, RegionSourceEnum } from './City.state';
 
 export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {

packages/plugins/src/dataTypes/City/City.tsx

@@ -8,11 +8,10 @@ import {
   RadioPillRow,
   type DropdownOption
 } from '@generatedata/core';
+import { getI18nString } from '@generatedata/utils/lang';
 import Button from '@mui/material/Button';
 import * as React from 'react';
-import { getI18nString } from '~utils/langUtils';
-import { DTHelpProps, DTMetadata, DTOptionsProps } from '../../';
-import { countryList } from '../../../../_plugins';
+import { countryList, DTHelpProps, DTMetadata, DTOptionsProps } from '../../';
 import styles from './City.scss';
 import { RegionSource, RegionSourceEnum } from './City.state';