- Update vite build

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/package.json

@@ -132,7 +132,6 @@
     "@babel/preset-react": "^7.23.3",
     "@emotion/babel-plugin": "^11.11.0",
     "@emotion/react": "^11.11.3",
-    "@sentry/webpack-plugin": "^2.10.2",
     "@swc/core": "^1.3.104",
     "@swc/plugin-styled-components": "^1.5.108",
     "@testing-library/cypress": "^10.0.1",

client/src/App/themeProvider.js

@@ -50,7 +50,7 @@ const devTheme = {
  */
 const prodTheme = {};
 
-const currentTheme = process.env.NODE_ENV === "development" ? devTheme
+const currentTheme = import.meta.env.DEV ? devTheme
     : prodTheme;
 
 const finaltheme = {

client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx

@@ -21,6 +21,8 @@ export default function DashboardMonthlyJobCosting({ data, ...cardProps }) {
     async function getCostingData() {
       if (data && data.monthly_sales) {
         setLoading(true);
+        console.log('defaults:')
+        console.dir(axios.defaults);
         const response = await axios.post("/job/costingmulti", {
           jobids: data.monthly_sales.map((x) => x.id),
         });

client/src/index.js

@@ -21,7 +21,7 @@ import { ConfigProvider } from "antd";
 // Dinero.globalLocale = "en-CA";
 Dinero.globalRoundingMode = "HALF_EVEN";
 
-if (process.env.NODE_ENV !== "development") {
+if (import.meta.env.PROD) {
   Sentry.init({
     dsn: "https://fd7e89369b6b4bdc9c6c4c9f22fa4ee4@o492140.ingest.sentry.io/5651027",
     ignoreErrors: [
@@ -38,7 +38,7 @@ if (process.env.NODE_ENV !== "development") {
     // // If the entire session is not sampled, use the below sample rate to sample
     // // sessions when an error occurs.
     // replaysOnErrorSampleRate: 1.0,
-    environment: process.env.NODE_ENV,
+    environment: import.meta.env.MODE,
     // tracesSampleRate: 0.2,
     // We recommend adjusting this value in production, or using tracesSampler
     // for finer control

client/src/pages/disclaimer/disclaimer.page.jsx

@@ -6,7 +6,7 @@ export default function AboutPage() {
     <div style={{ textAlign: "center", margin: "1rem 0rem" }}>
       <Typography.Title
         level={2}
-      >{`ImEX Online V.${process.env.NODE_ENV}-${import.meta.env.VITE_APP_GIT_SHA}`}</Typography.Title>
+      >{`ImEX Online V.${import.meta.env.MODE}-${import.meta.env.VITE_APP_GIT_SHA}`}</Typography.Title>
       <Typography.Title level={4}>
         &copy; 2019 - {new Date().getFullYear()} Snapt Software Inc. used under
         license to ImEX Systems Inc.

client/src/pages/dms-payables/dms-payables.container.jsx

@@ -26,7 +26,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
 
 export const socket = SocketIO(
-  process.env.NODE_ENV === "production"
+  import.meta.env.PROD
     ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL
     : window.location.origin,
   {

client/src/pages/dms/dms.container.jsx

@@ -43,7 +43,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
 
 export const socket = SocketIO(
-  process.env.NODE_ENV === "production"
+  import.meta.env.PROD
     ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL
     : window.location.origin,
     // "http://localhost:4000",  // for dev testing,

client/src/redux/store.js

@@ -29,7 +29,7 @@ const middlewares = [
   createStateSyncMiddleware(reduxSyncConfig),
 ];
 
-if (process.env.NODE_ENV === "development") {
+if (import.meta.env.DEV) {
   middlewares.push(createLogger({ collapsed: true, diff: true }));
 }
 
@@ -39,7 +39,7 @@ export const store = configureStore({
     serializableCheck: false,
   }).concat(middlewares),
   // middleware: middlewares,
-  devTools: process.env.NODE_ENV !== 'production',
+  devTools: import.meta.env.DEV,
   enhancers: (getDefaultEnhancers) => getDefaultEnhancers().concat(sentryReduxEnhancer)
 });
 

client/src/redux/user/user.sagas.js

@@ -177,7 +177,7 @@ export function* setInstanceIdSaga({ payload: uid }) {
 
     yield put(setLocalFingerprint(result.visitorId));
     yield delay(5 * 60 * 1000);
-    if (process.env.NODE_ENV === "production") yield put(checkInstanceId(uid));
+    if (import.meta.env.PROD) yield put(checkInstanceId(uid));
   } catch (error) {
     console.log("error", error);
   }

client/src/serviceWorkerRegistration.js

@@ -19,7 +19,7 @@ const isLocalhost = Boolean(
 );
 
 export function register(config) {
-  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+  if (import.meta.env.PROD && 'serviceWorker' in navigator) {
     // The URL constructor is available in all browsers that support SW.
     const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
     if (publicUrl.origin !== window.location.origin) {

client/src/translations/i18n.js

@@ -20,7 +20,7 @@ i18n
     //lng: "en",
     detection: {},
     fallbackLng: "en-US",
-    debug: process.env.NODE_ENV === "production" ? false : true,
+    debug: import.meta.env.PROD ? false : true,
 
     //keySeparator: false, // we do not use keys in form messages.welcome
 

client/src/utils/CleanAxios.js

@@ -1,23 +1,26 @@
 import axios from "axios";
-import { auth } from "../firebase/firebase.utils";
+import {auth} from "../firebase/firebase.utils";
 
-if (process.env.NODE_ENV === "production") {
+axios.defaults.baseURL =
-  axios.defaults.baseURL =
+    import.meta.env.VITE_APP_AXIOS_BASE_API_URL ||
-    import.meta.env.VITE_APP_AXIOS_BASE_API_URL || "https://api.imex.online/";
+    (
-}
+        import.meta.env.MODE === "production" ?
+            "https://api.imex.online/" :
+            "http://localhost:4000/"
+    );
 
 export const axiosAuthInterceptorId = axios.interceptors.request.use(
-  async (config) => {
+    async (config) => {
-    if (!config.headers.Authorization) {
+        if (!config.headers.Authorization) {
-      const token = auth.currentUser && (await auth.currentUser.getIdToken());
+            const token = auth.currentUser && (await auth.currentUser.getIdToken());
-      if (token) {
+            if (token) {
-        config.headers.Authorization = `Bearer ${token}`;
+                config.headers.Authorization = `Bearer ${token}`;
-      }
+            }
-    }
+        }
 
-    return config;
+        return config;
-  },
+    },
-  (error) => Promise.reject(error)
+    (error) => Promise.reject(error)
 );
 
 const cleanAxios = axios.create();

client/src/utils/GraphQLClient.js

@@ -133,7 +133,7 @@ const retryLink = new RetryLink({
 });
 
 const middlewares = [];
-if (process.env.NODE_ENV === "development") {
+if (import.meta.env.DEV) {
   middlewares.push(apolloLogger);
 }
 
@@ -156,7 +156,7 @@ const cache = new InMemoryCache({
 const client = new ApolloClient({
   link: ApolloLink.from(middlewares),
   cache,
-  connectToDevTools: process.env.NODE_ENV !== "production",
+  connectToDevTools: import.meta.env.DEV,
   defaultOptions: {
     watchQuery: {
       fetchPolicy: "network-only",