add webpack alias for build

Author: mark-prins

client/packages/common/src/hooks/useNativeClient/useNativeClient.ts

@@ -1,6 +1,10 @@
-import { uniqWith } from 'lodash';
 import { useState, useEffect } from 'react';
+import { useMutation } from 'react-query';
+import { uniqWith } from 'lodash';
+import { useNavigate } from '@openmsupply-client/common';
 import { KeepAwake } from '@capacitor-community/keep-awake';
+import { Capacitor } from '@capacitor/core';
+import { App } from '@capacitor/app';
 import {
   getNativeAPI,
   getPreference,
@@ -17,10 +21,6 @@ import {
   NativeAPI,
   NativeMode,
 } from './types';
-import { Capacitor } from '@capacitor/core';
-import { App } from '@capacitor/app';
-import { useMutation } from 'react-query';
-import { useNavigate } from 'react-router-dom';
 import { useAuthContext } from '../../authentication';
 
 declare global {

client/packages/electron/package.json

@@ -2,7 +2,7 @@
   "name": "@openmsupply-client/electron",
   "productName": "open mSupply",
   "//": "Version is updated from the root package.json when electron is built, see the 'make' script below",
-  "version": "1.1.16",
+  "version": "1.2.00",
   "description": "Client for omSupply running on local network",
   "main": "./.webpack/main",
   "scripts": {

client/packages/electron/webpack.main.config.ts

@@ -3,7 +3,7 @@ import type { Configuration } from 'webpack';
 import { rules } from './webpack.rules';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
+const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 
 export const mainConfig: Configuration = {
   /**
@@ -17,8 +17,6 @@ export const mainConfig: Configuration = {
   },
   resolve: {
     extensions: ['.js', '.ts', '.jsx', '.tsx', '.css', '.json'],
-    alias: {
-      '@common/utils': path.resolve(__dirname, '../common/src/utils'),
-    },
+    plugins: [new TsconfigPathsPlugin()], // creates alias entries for the paths in tsconfig.json
   },
 };

client/packages/host/package.json

@@ -37,7 +37,6 @@
     "history": "^5.1.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "react-router-dom": "^6.0.2",
     "swc-loader": "^0.2.0",
     "webpack-bundle-analyzer": "^4.4.2"
   },

client/packages/host/src/components/AuthenticationAlert.tsx

@@ -3,9 +3,9 @@ import { AppRoute } from '@openmsupply-client/config';
 import React, { useEffect } from 'react';
 import {
   AuthError,
-  matchPath,
   Location,
   RouteBuilder,
+  matchPath,
   useLocalStorage,
   useLocation,
   useNavigate,

client/packages/requisitions/src/RequestRequisition/api/operations.generated.ts

@@ -1,5 +1,4 @@
 import React, { FC } from 'react';
-import { useNavigate } from 'react-router-dom';
 import {
   TableProvider,
   DataTable,
@@ -12,6 +11,7 @@ import {
   ReadOnlyCheckboxCell,
   ColumnDataAccessor,
   useAuthContext,
+  useNavigate,
   ColumnDescription,
 } from '@openmsupply-client/common';
 import { usePatient, PatientRowFragment } from '../api';

client/packages/system/src/Patient/ListView/ListView.tsx

@@ -1,7 +1,7 @@
 import * as Types from '@openmsupply-client/common';
 
 import { GraphQLClient } from 'graphql-request';
-import * as Dom from 'graphql-request/src/types.dom';
+import * as Dom from 'graphql-request/dist/types.dom';
 import gql from 'graphql-tag';
 import { graphql, ResponseResolver, GraphQLRequest, GraphQLContext } from 'msw'
 export type SyncSettingsFragment = { __typename: 'SyncSettingsNode', intervalSeconds: number, url: string, username: string };

client/packages/system/src/Sync/api/operations.generated.ts

@@ -14933,7 +14933,7 @@ react-resize-detector@^8.0.4:
   dependencies:
     lodash "^4.17.21"
 
-react-router-dom@^6.0.2, react-router-dom@^6.1.1:
+react-router-dom@^6.1.1:
   version "6.14.2"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.14.2.tgz#88f520118b91aa60233bd08dbd3fdcaea3a68488"
   integrity sha512-5pWX0jdKR48XFZBuJqHosX3AAHjRAzygouMTyimnBPOLdY3WjzUSKhus2FVMihUFWzeLebDgr4r8UeQFAct7Bg==
@@ -16866,7 +16866,7 @@ ts-log@^2.2.3:
   resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.5.tgz#aef3252f1143d11047e2cb6f7cfaac7408d96623"
   integrity sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA==
 
-tsconfig-paths-webpack-plugin@^4.0.1:
+tsconfig-paths-webpack-plugin@4.1.0, tsconfig-paths-webpack-plugin@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.1.0.tgz#3c6892c5e7319c146eee1e7302ed9e6f2be4f763"
   integrity sha512-xWFISjviPydmtmgeUAuXp4N1fky+VCtfhOkDUFIv5ea7p4wuTomI4QTrXvFBX2S4jZsmyTSrStQl+E+4w+RzxA==