webpack bundling

Author: raheeliftikhar5

.DS_Store

@@ -73,7 +73,7 @@
     "@testing-library/react": "^14.1.2",
     "@testing-library/user-event": "^14.5.1",
     "@types/styled-components": "^5.1.34",
-    "antd-mobile": "^5.28.0",
+    "antd-mobile": "^5.34.0",
     "chalk": "4",
     "number-precision": "^1.6.0",
     "react-player": "^2.11.0",

client/package.json

@@ -1,4 +1,4 @@
-import _ from "lodash";
+import { uniq } from "lodash";
 import { CompConstructor, CustomAction } from "lowcoder-core";
 import { evalAndReduce, isExposingMethodComp } from "lowcoder-sdk";
 import { ChartCompWithDefault } from "comps/chartComp/chartComp";
@@ -56,6 +56,6 @@ test("comp exposing method duplicate name", () => {
         }
       });
     const allMethodName = methods.flatMap((m) => m.map((methodConfig) => methodConfig.name));
-    expect(allMethodName.length).toEqual(_.uniq(allMethodName).length);
+    expect(allMethodName.length).toEqual(uniq(allMethodName).length);
   });
 });

client/packages/lowcoder-comps/src/__test__/allComp.test.tsx

@@ -8,7 +8,7 @@ import {
 import { AxisFormatterComp, EchartsAxisType } from "./chartConfigs/cartesianAxisConfig";
 import { chartChildrenMap, ChartSize, getDataKeys } from "./chartConstants";
 import { chartPropertyView } from "./chartPropertyView";
-import _ from "lodash";
+import { noop, omit, isEqual } from "lodash";
 import { useContext, useEffect, useMemo, useRef, useState } from "react";
 import ReactResizeDetector from "react-resize-detector";
 import ReactECharts from "./reactEcharts";
@@ -79,7 +79,7 @@ ChartTmpComp = withViewFn(ChartTmpComp, (comp) => {
     // bind events
     const echartsCompInstance = echartsCompRef?.current?.getEchartsInstance();
     if (!echartsCompInstance) {
-      return _.noop;
+      return noop;
     }
     echartsCompInstance?.on("selectchanged", (param: any) => {
       const option: any = echartsCompInstance?.getOption();
@@ -96,7 +96,7 @@ ChartTmpComp = withViewFn(ChartTmpComp, (comp) => {
     return () => echartsCompInstance?.off("selectchanged");
   }, [mode, onUIEvent]);
 
-  const echartsConfigChildren = _.omit(comp.children, echartsConfigOmitChildren);
+  const echartsConfigChildren = omit(comp.children, echartsConfigOmitChildren);
   const option = useMemo(() => {
     return getEchartsConfig(
       childrenToProps(echartsConfigChildren) as ToViewReturn<typeof echartsConfigChildren>,
@@ -111,7 +111,7 @@ ChartTmpComp = withViewFn(ChartTmpComp, (comp) => {
   const loadGoogleMapData = () => {
     const echartsCompInstance = echartsCompRef?.current?.getEchartsInstance();
     if (!echartsCompInstance) {
-      return _.noop;
+      return noop;
     }
 
     comp.children.mapInstance.dispatch(changeValueAction(echartsCompInstance))
@@ -231,7 +231,7 @@ ChartTmpComp = class extends ChartTmpComp {
     };
     if (
       comp.children.chartConfig.children.comp.children.hasOwnProperty("itemColor") &&
-      !_.isEqual(colorContextVal, comp.lastColorContext)
+      !isEqual(colorContextVal, comp.lastColorContext)
     ) {
       comp.lastColorContext = colorContextVal;
       resultComp = resultComp.setChild(

client/packages/lowcoder-comps/src/comps/chartComp/chartComp.tsx

@@ -11,7 +11,7 @@ import {
   isNumeric,
 } from "lowcoder-sdk";
 import { i18nObjs, trans } from "i18n/comps";
-import _, { isNil } from "lodash";
+import { min, max, isNil } from "lodash";
 import { xAxisTypeUrl } from "./chartUrls";
 
 const XAxisTypeOptions = [
@@ -222,7 +222,7 @@ function calcTimeInterval(xAxisData: Array<JSONValue | undefined>) {
       return 1;
     }
   });
-  return _.min(minIntervals);
+  return min(minIntervals);
 }
 
 let measureCanvas: HTMLCanvasElement;
@@ -257,7 +257,7 @@ export function calcXYConfig(
   if (resXConfig.type === "category" && chartSize) {
     const xAxisDataLenList = getXAxisDataLength(xAxisData);
     // get x-axis single data's max width
-    const maxDataWidth = _.max(xAxisDataLenList);
+    const maxDataWidth = max(xAxisDataLenList);
     const lastDataWidth = xAxisDataLenList[xAxisDataLenList.length - 1];
     // grid width
     let eachDataWidth = chartSize.w / xAxisData.length;

client/packages/lowcoder-comps/src/comps/chartComp/chartConfigs/cartesianAxisConfig.tsx

@@ -7,7 +7,7 @@ import {
 } from "comps/chartComp/chartConstants";
 import { getPieRadiusAndCenter } from "comps/chartComp/chartConfigs/pieChartConfig";
 import { EChartsOptionWithMap } from "./reactEcharts/types";
-import _ from "lodash";
+import { isArray, findIndex } from "lodash";
 import { chartColorPalette, isNumeric, JSONObject, loadScript } from "lowcoder-sdk";
 import { calcXYConfig } from "comps/chartComp/chartConfigs/cartesianAxisConfig";
 import Big from "big.js";
@@ -236,7 +236,7 @@ export function getEchartsConfig(props: EchartsConfigProps, chartSize?: ChartSiz
 
 export function getSelectedPoints(param: any, option: any) {
   const series = option.series;
-  const dataSource = _.isArray(option.dataset) && option.dataset[0]?.source;
+  const dataSource = isArray(option.dataset) && option.dataset[0]?.source;
   if (series && dataSource) {
     return param.selected.flatMap((selectInfo: any) => {
       const seriesInfo = series[selectInfo.seriesIndex];
@@ -270,12 +270,12 @@ export function loadGoogleMapsScript(apiKey: string) {
   const mapsUrl = `${googleMapsApiUrl}?key=${apiKey}`;
   const scripts = document.getElementsByTagName('script');
   // is script already loaded
-  let scriptIndex = _.findIndex(scripts, (script) => script.src.endsWith(mapsUrl));
+  let scriptIndex = findIndex(scripts, (script) => script.src.endsWith(mapsUrl));
   if(scriptIndex > -1) {
     return scripts[scriptIndex];
   }
   // is script loaded with diff api_key, remove the script and load again
-  scriptIndex = _.findIndex(scripts, (script) => script.src.startsWith(googleMapsApiUrl));
+  scriptIndex = findIndex(scripts, (script) => script.src.startsWith(googleMapsApiUrl));
   if(scriptIndex > -1) {
     scripts[scriptIndex].remove();
   }

client/packages/lowcoder-comps/src/comps/chartComp/chartUtils.ts

@@ -2,7 +2,7 @@ import type { ECharts } from "echarts";
 import { PureComponent } from "react";
 import isEqual from "fast-deep-equal";
 import { EChartsReactProps, EChartsInstance } from "./types";
-import _ from "lodash";
+import { pick } from "lodash";
 import log from "loglevel";
 
 function isString(v: any): boolean {
@@ -75,7 +75,7 @@ export default class EChartsReactCore extends PureComponent<EChartsReactProps> {
 
     // when these props are not isEqual, update echarts
     const pickKeys = ["option", "notMerge", "lazyUpdate", "showLoading", "loadingOption"];
-    if (!isEqual(_.pick(this.props, pickKeys), _.pick(prevProps, pickKeys))) {
+    if (!isEqual(pick(this.props, pickKeys), pick(prevProps, pickKeys))) {
       this.updateEChartsOption();
     }
   }

client/packages/lowcoder-comps/src/comps/chartComp/reactEcharts/core.tsx

@@ -14,7 +14,6 @@ import {
 } from "lowcoder-sdk";
 import { useRef } from "react";
 import ReactResizeDetector from "react-resize-detector";
-import _ from "lodash";
 import { RecordConstructorToView } from "lowcoder-core";
 import { Container, customTheme, EmbeddedButton, saveEvent } from "./imageEditorConstants";
 import { ImageEditor } from "./imageEditorClass";

client/packages/lowcoder-comps/src/comps/imageEditorComp/index.tsx

@@ -1,5 +1,5 @@
 import { CompConstructor } from "baseComps/comp";
-import _ from "lodash";
+import { get, isNil } from "lodash";
 import { JSONValue } from "util/jsonTypes";
 import {
   ActionContextType,
@@ -55,7 +55,7 @@ export function isMyCustomAction<T>(action: CompAction, type: string): action is
 }
 
 export function isCustomAction<T>(action: CompAction, type: string): action is CustomAction<T> {
-  return action.type === CompActionTypes.CUSTOM && _.get(action.value, "type") === type;
+  return action.type === CompActionTypes.CUSTOM && get(action.value, "type") === type;
 }
 
 /**
@@ -100,7 +100,7 @@ export function isBroadcastAction<T extends CompAction>(
   action: CompAction,
   type: T["type"]
 ): action is BroadcastAction<T> {
-  return action.type === CompActionTypes.BROADCAST && _.get(action.action, "type") === type;
+  return action.type === CompActionTypes.BROADCAST && get(action.action, "type") === type;
 }
 
 export function renameAction(oldName: string, name: string): BroadcastAction<RenameAction> {
@@ -133,7 +133,7 @@ export function multiChangeAction(changes: Record<string, CompAction>): MultiCha
   const editDSL = Object.values(changes).some((action) => !!action.editDSL);
   console.assert(
     Object.values(changes).every(
-      (action) => !_.isNil(action.editDSL) && action.editDSL === editDSL
+      (action) => !isNil(action.editDSL) && action.editDSL === editDSL
     ),
     `multiChangeAction should wrap actions with the same editDSL value in property. editDSL: ${editDSL}\nchanges:`,
     changes

client/packages/lowcoder-core/src/actions/actions.tsx

@@ -7,7 +7,7 @@ import {
   wrapChildAction,
 } from "actions";
 import { fromRecord, Node } from "eval";
-import _ from "lodash";
+import { mapValues, isEqual, omit, omitBy } from "lodash";
 import log from "loglevel";
 import { CACHE_PREFIX } from "util/cacheUtils";
 import { JSONValue } from "util/jsonTypes";
@@ -86,7 +86,7 @@ export abstract class MultiBaseComp<
     // log.debug("reduceOrUndefined. action: ", action, " this: ", this);
     // must handle DELETE in the parent level
     if (action.type === CompActionTypes.DELETE_COMP && action.path.length === 1) {
-      return this.setChildren(_.omit(this.children, action.path[0]));
+      return this.setChildren(omit(this.children, action.path[0]));
     }
     if (action.type === CompActionTypes.REPLACE_COMP && action.path.length === 1) {
       const NextComp = action.compFactory;
@@ -121,7 +121,7 @@ export abstract class MultiBaseComp<
       case CompActionTypes.MULTI_CHANGE: {
         const { changes } = action;
         // handle DELETE in the parent level
-        let mcChildren = _.omitBy(this.children, (comp, childName) => {
+        let mcChildren = omitBy(this.children, (comp, childName) => {
           const innerAction = changes[childName];
           return (
             innerAction &&
@@ -130,7 +130,7 @@ export abstract class MultiBaseComp<
           );
         });
         // CHANGE
-        mcChildren = _.mapValues(mcChildren, (comp, childName) => {
+        mcChildren = mapValues(mcChildren, (comp, childName) => {
           const innerAction = changes[childName];
           if (innerAction) {
             return comp.reduce(innerAction);
@@ -150,7 +150,7 @@ export abstract class MultiBaseComp<
           // console.info("inside: UPDATE_NODE_V2 cache hit. action: ", action, "\nvalue: ", value, "\nthis: ", this);
           return this;
         }
-        const children = _.mapValues(this.children, (comp, childName) => {
+        const children = mapValues(this.children, (comp, childName) => {
           if (value.hasOwnProperty(childName)) {
             return comp.reduce(updateNodesV2Action(value[childName]));
           }
@@ -180,7 +180,7 @@ export abstract class MultiBaseComp<
       }
       case CompActionTypes.BROADCAST: {
         return this.setChildren(
-          _.mapValues(this.children, (comp) => {
+          mapValues(this.children, (comp) => {
             return comp.reduce(action);
           })
         );
@@ -240,7 +240,7 @@ export abstract class MultiBaseComp<
   }
 
   override changeDispatch(dispatch: DispatchType): this {
-    const newChildren = _.mapValues(this.children, (comp, childName) => {
+    const newChildren = mapValues(this.children, (comp, childName) => {
       return comp.changeDispatch(wrapDispatch(dispatch, childName));
     });
     return super.changeDispatch(dispatch).setChildren(newChildren, { keepCacheKeys: ["node"] });
@@ -261,7 +261,7 @@ export abstract class MultiBaseComp<
         return;
       }
       const value = comp.toJsonValue();
-      if (ignore && _.isEqual(value, (comp as any)["IGNORABLE_DEFAULT_VALUE"])) {
+      if (ignore && isEqual(value, (comp as any)["IGNORABLE_DEFAULT_VALUE"])) {
         return;
       }
       result[key] = value;