update: lodash-es -> lodash

examples/vue/yarn.lock

@@ -37,7 +37,7 @@
     eventemitter2 "^6.4.4"
     filesize "^6.3.0"
     is-hotkey "^0.2.0"
-    lodash-es "^4.17.21"
+    lodash "^4.17.21"
     ot-json0 "^1.1.0"
     tinycolor2 "^1.4.2"
 
@@ -82,7 +82,7 @@
     "@babel/runtime" "^7.13.10"
     ant-design-vue "^2.2.6"
     codemirror "^5.60.0"
-    lodash-es "^4.17.21"
+    lodash "^4.17.21"
     vue "^3.2.9"
 
 "@aomao/plugin-file@^2.4.19":
@@ -341,7 +341,7 @@
     "@babel/runtime" "^7.13.10"
     ant-design-vue "^2.2.6"
     keymaster "^1.6.2"
-    lodash-es "^4.17.21"
+    lodash "^4.17.21"
     tinycolor2 "^1.4.2"
     vue "^3.2.9"
 
@@ -2151,7 +2151,7 @@ ant-design-vue@^2.2.6:
     dom-align "^1.12.1"
     dom-scroll-into-view "^2.0.0"
     lodash "^4.17.21"
-    lodash-es "^4.17.15"
+    lodash "^4.17.15"
     moment "^2.27.0"
     omit.js "^2.0.0"
     resize-observer-polyfill "^1.5.1"
@@ -5691,9 +5691,9 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-lodash-es@^4.17.15, lodash-es@^4.17.21:
+lodash@^4.17.15, lodash@^4.17.21:
   version "4.17.21"
-  resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
+  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
   integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
 
 lodash.camelcase@^4.3.0:

packages/engine/package.json

@@ -28,7 +28,7 @@
     "eventemitter2": "^6.4.4",
     "filesize": "^6.3.0",
     "is-hotkey": "^0.2.0",
-    "lodash-es": "^4.17.21",
+    "lodash": "^4.17.21",
     "ot-json0": "^1.1.0",
     "tinycolor2": "^1.4.2"
   },
@@ -36,7 +36,7 @@
     "@types/blueimp-md5": "^2.7.0",
     "@types/diff-match-patch": "^1.0.32",
     "@types/is-hotkey": "^0.1.2",
-    "@types/lodash-es": "^4.17.4",
+    "@types/lodash": "^4.17.4",
     "@types/sharedb": "^1.0.14",
     "@types/tinycolor2": "^1.4.2"
   }

packages/engine/src/engine/index.ts

@@ -1,4 +1,4 @@
-import { merge } from 'lodash-es';
+import { merge } from 'lodash';
 import NodeModel, { Event, $ } from '../node';
 import language from '../locales';
 import Change from '../change';

packages/engine/src/history.ts

@@ -1,4 +1,4 @@
-import { cloneDeep, debounce } from 'lodash-es';
+import { cloneDeep, debounce } from 'lodash';
 import { Op } from 'sharedb';
 import OTJSON from 'ot-json0';
 import { Operation, TargetOp } from './types/ot';

packages/engine/src/language.ts

@@ -1,4 +1,4 @@
-import { merge } from 'lodash-es';
+import { merge } from 'lodash';
 import { LanguageInterface } from './types/language';
 
 /**

packages/engine/src/ot/index.ts

@@ -1,4 +1,4 @@
-import { debounce, cloneDeep } from 'lodash-es';
+import { debounce, cloneDeep } from 'lodash';
 import { EventEmitter2 } from 'eventemitter2';
 import { Doc, Op } from 'sharedb';
 import { EngineInterface } from '../types/engine';

packages/engine/src/ot/utils.ts

@@ -1,4 +1,4 @@
-import { isEqual } from 'lodash-es';
+import { isEqual } from 'lodash';
 import { NodeInterface } from '../types/node';
 import { FOCUS, ANCHOR, CURSOR } from '../constants/selection';
 import {

packages/engine/src/parser/conversion.ts

@@ -1,4 +1,4 @@
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep } from 'lodash';
 import { getStyleMap } from '../utils';
 import { DATA_ELEMENT } from '../constants';
 import {

packages/engine/src/request/ajax/index.ts

@@ -1,4 +1,4 @@
-import { startsWith } from 'lodash-es';
+import { startsWith } from 'lodash';
 import { getDocument } from '../../utils';
 import { AjaxInterface, AjaxOptions, SetupOptions } from '../../types/request';
 import { isFormData, toQueryString, urlAppend } from './utils';

packages/engine/src/schema.ts

@@ -1,4 +1,4 @@
-import { cloneDeep, isEqual, merge, omit } from 'lodash-es';
+import { cloneDeep, isEqual, merge, omit } from 'lodash';
 import {
 	NodeInterface,
 	SchemaAttributes,

packages/engine/src/scrollbar/index.ts

@@ -1,5 +1,5 @@
 import { EventEmitter2 } from 'eventemitter2';
-import { debounce, throttle } from 'lodash-es';
+import { debounce, throttle } from 'lodash';
 import { DATA_ELEMENT, UI } from '../constants';
 import { NodeInterface } from '../types';
 import { $ } from '../node';

packages/toolbar-vue/package.json

@@ -24,7 +24,7 @@
         "@babel/runtime": "^7.13.10",
         "ant-design-vue": "^2.2.6",
         "keymaster": "^1.6.2",
-        "lodash-es": "^4.17.21",
+        "lodash": "^4.17.21",
         "tinycolor2": "^1.4.2",
         "vue": "^3.2.9"
     },

packages/toolbar-vue/src/components/collapse/group.vue

@@ -12,7 +12,7 @@
 </template>
 <script lang="ts">
 import { defineComponent } from 'vue'
-import { omit } from 'lodash-es';
+import { omit } from 'lodash';
 import { collapseGroupProps } from '../../types'
 import AmCollapseItem from './item.vue'
 

packages/toolbar-vue/src/components/toolbar.vue

@@ -17,7 +17,7 @@
 </template>
 <script lang="ts">
 import { defineComponent, onMounted, onUnmounted, ref, reactive } from 'vue'
-import { merge, omit } from 'lodash-es';
+import { merge, omit } from 'lodash';
 import { isMobile } from '@aomao/engine'
 import { ToolbarButtonProps, CollapseItemProps, ToolbarColorProps, ToolbarDropdownProps, GroupDataProps, ToolbarCollapseGroupProps, toolbarProps } from '../types'
 import AmGroup from './group.vue'

packages/toolbar-vue/src/types.ts

@@ -1,6 +1,6 @@
 import { EngineInterface } from '@aomao/engine';
 import { ExtractPropTypes, PropType, VNode } from 'vue';
-import { omit } from 'lodash-es';
+import { omit } from 'lodash';
 
 //命令
 export type Command =

packages/toolbar/package.json

@@ -25,13 +25,13 @@
         "antd": "^4.12.3",
         "classnames-es-ts": "^2.2.7",
         "keymaster": "^1.6.2",
-        "lodash-es": "^4.17.21",
+        "lodash": "^4.17.21",
         "react": "^17.0.1",
         "react-dom": "^17.0.1",
         "tinycolor2": "^1.4.2"
     },
     "devDependencies": {
         "@types/keymaster": "^1.6.28",
-        "@types/lodash-es": "^4.17.4"
+        "@types/lodash": "^4.17.4"
     }
 }

packages/toolbar/src/Toolbar.tsx

@@ -1,4 +1,4 @@
-import { merge, omit } from 'lodash-es';
+import { merge, omit } from 'lodash';
 import React, {
 	useCallback,
 	useEffect,

plugins/codeblock-vue/package.json

@@ -32,12 +32,12 @@
     "@babel/runtime": "^7.13.10",
     "ant-design-vue": "^2.2.6",
     "codemirror": "^5.60.0",
-    "lodash-es": "^4.17.21",
+    "lodash": "^4.17.21",
     "vue": "^3.2.9"
   },
   "devDependencies": {
     "@types/codemirror": "^5.60.0",
-    "@types/lodash-es": "^4.17.4",
+    "@types/lodash": "^4.17.4",
     "@vue/compiler-sfc": "^3.2.9"
   }
 }

plugins/codeblock-vue/src/component/editor.ts

@@ -1,5 +1,5 @@
 import CodeMirror, { EditorConfiguration, Editor } from 'codemirror';
-import { debounce } from 'lodash-es';
+import { debounce } from 'lodash';
 import {
 	$,
 	EditorInterface,

plugins/codeblock/package.json

@@ -32,12 +32,12 @@
     "@babel/runtime": "^7.13.10",
     "antd": "^4.14.1",
     "codemirror": "^5.61.1",
-    "lodash-es": "^4.17.21",
+    "lodash": "^4.17.21",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
   "devDependencies": {
     "@types/codemirror": "^5.60.0",
-    "@types/lodash-es": "^4.17.4"
+    "@types/lodash": "^4.17.4"
   }
 }

plugins/codeblock/src/component/editor.ts

@@ -1,5 +1,5 @@
 import CodeMirror, { EditorConfiguration, Editor } from 'codemirror';
-import { debounce } from 'lodash-es';
+import { debounce } from 'lodash';
 import {
 	$,
 	EditorInterface,

plugins/math/package.json

@@ -25,6 +25,10 @@
   },
   "dependencies": {
     "@aomao/engine": "^2.7.3",
-    "@babel/runtime": "^7.13.10"
+    "@babel/runtime": "^7.13.10",
+    "lodash": "^4.17.21"
+  },
+  "devDependencies": {
+    "@types/lodash": "^4.17.4"
   }
 }

plugins/math/src/component/index.ts

@@ -1,4 +1,4 @@
-import debounce from 'lodash-es/debounce';
+import debounce from 'lodash/debounce';
 import {
 	$,
 	Card,

plugins/table/package.json

@@ -24,6 +24,10 @@
     "@aomao/engine": "^2.7.3",
     "@babel/runtime": "^7.13.10",
     "eventemitter2": "^6.4.4",
-    "tinycolor2": "^1.4.2"
+    "tinycolor2": "^1.4.2",
+    "lodash": "^4.17.21"
+  },
+  "devDependencies": {
+    "@types/lodash": "^4.17.4"
   }
 }

plugins/table/src/component/helper.ts

@@ -4,7 +4,7 @@ import {
 	TableModelCol,
 	TableModelEmptyCol,
 } from '../types';
-import isInteger from 'lodash-es/isInteger';
+import isInteger from 'lodash/isInteger';
 import {
 	$,
 	EDITABLE_SELECTOR,