Merge pull request #2671 from udecode/fix/dnd

Fix lodash import
udecode · Oct 3, 2023 · 5a04714 · 5a04714
2 parents 972dbfc + 9f69b97
commit 5a04714
Show file tree

Hide file tree

Showing 55 changed files with 696 additions and 695 deletions.
diff --git a/.changeset/four-hornets-decide.md b/.changeset/four-hornets-decide.md
@@ -0,0 +1,5 @@
+---
+"@udecode/slate": patch
+---
+
+Fix lodash import
diff --git a/apps/www/package.json b/apps/www/package.json
@@ -120,8 +120,8 @@
     "next-usequerystate": "1.8.0-beta.13",
     "prism-react-renderer": "^1.3.5",
     "react": "^18.2.0",
-    "react-dnd": "patch:react-dnd@npm%3A15.1.2#~/.yarn/patches/react-dnd-npm-15.1.2-0351d81431.patch",
-    "react-dnd-html5-backend": "^15.1.3",
+    "react-dnd": "16.0.1",
+    "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^18.2.0",
     "react-lite-youtube-embed": "^2.3.52",
     "react-modal-sheet": "2.0.0",
@@ -140,9 +140,7 @@
   },
   "resolutions": {
     "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-dnd": "^15.1.2",
-    "react-dnd-html5-backend": "^15.1.3"
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@types/lodash.template": "^4.5.1",

diff --git a/jest.config.cjs b/jest.config.cjs
@@ -45,7 +45,6 @@ module.exports = {
   moduleFileExtensions: ['js', 'json', 'ts', 'tsx'],
   moduleNameMapper: {
     '\\.(css|less|sass|scss)$': '<rootDir>/scripts/styleMock.cjs',
-    '^lodash-es$': 'lodash',
     ...getTsConfigBasePaths(),
     // '^@udecode/plate-core$': '<rootDir>/packages/core/src',
     ...modules,
@@ -59,7 +58,7 @@ module.exports = {
   },
   setupFilesAfterEnv: ['<rootDir>/scripts/setupTests.ts'],
   transformIgnorePatterns: [
-    '/node_modules/(?!(react-dnd|dnd-core|@react-dnd|react-tweet)/)',
+    '/node_modules/(?!(react-dnd|dnd-core|@react-dnd|react-dnd-html5-backend|react-tweet)/)',
   ],
   watchman: false,
 };
diff --git a/package.json b/package.json
@@ -153,9 +153,7 @@
     "prettier": "^3.0.0",
     "prettier-plugin-tailwindcss": "^0.4.0",
     "react": "^18.2.0",
-    "react-dnd": "patch:react-dnd@npm%3A15.1.2#~/.yarn/patches/react-dnd-npm-15.1.2-0351d81431.patch",
-    "react-dnd-html5-backend": "^15.1.3",
-    "react-dnd-test-backend": "^15.1.2",
+    "react-dnd-test-backend": "^16.0.1",
     "react-dom": "^18.2.0",
     "react-is": "18.2.0",
     "react-test-renderer": "18.2.0",

diff --git a/packages/autoformat/package.json b/packages/autoformat/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@udecode/plate-common": "24.3.5",
-    "lodash-es": "^4.17.21"
+    "lodash": "^4.17.21"
   },
   "peerDependencies": {
     "react": ">=16.8.0",

diff --git a/packages/autoformat/src/transforms/autoformatBlock.ts b/packages/autoformat/src/transforms/autoformatBlock.ts
@@ -11,7 +11,7 @@ import {
   someNode,
   Value,
 } from '@udecode/plate-common';
-import { castArray } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
 import { Range } from 'slate';
 
 import { AutoformatBlockRule } from '../types';

diff --git a/packages/autoformat/src/transforms/autoformatMark.ts b/packages/autoformat/src/transforms/autoformatMark.ts
@@ -7,7 +7,7 @@ import {
   TEditor,
   Value,
 } from '@udecode/plate-common';
-import { castArray } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
 import { Point, Range } from 'slate';
 
 import { AutoformatMarkRule } from '../types';

diff --git a/packages/autoformat/src/transforms/autoformatText.ts b/packages/autoformat/src/transforms/autoformatText.ts
@@ -4,7 +4,7 @@ import {
   PlateEditor,
   Value,
 } from '@udecode/plate-common';
-import { castArray } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
 import { Point, Range } from 'slate';
 
 import { AutoformatTextRule } from '../types';

diff --git a/packages/autoformat/src/utils/getMatchRange.ts b/packages/autoformat/src/utils/getMatchRange.ts
@@ -1,4 +1,4 @@
-import { castArray } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
 
 import { AutoformatRule, MatchRange } from '../types';
 

diff --git a/packages/comments/package.json b/packages/comments/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@udecode/plate-common": "24.3.5",
-    "lodash-es": "^4.17.21"
+    "lodash": "^4.17.21"
   },
   "peerDependencies": {
     "react": ">=16.8.0",

diff --git a/packages/comments/src/queries/getCommentPosition.ts b/packages/comments/src/queries/getCommentPosition.ts
@@ -1,5 +1,5 @@
 import { PlateEditor, toDOMNode, Value } from '@udecode/plate-common';
-import { clamp } from 'lodash-es';
+import clamp from 'lodash/clamp.js';
 
 import { TCommentText } from '../types';
 import { getElementAbsolutePosition } from '../utils/getElementAbsolutePosition';

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -47,7 +47,7 @@
     "clsx": "^1.2.1",
     "is-hotkey": "^0.2.0",
     "jotai": "1.7.2",
-    "lodash-es": "^4.17.21",
+    "lodash": "^4.17.21",
     "nanoid": "^3.3.6",
     "react-hotkeys-hook": "^4.4.1",
     "use-deep-compare": "^1.1.0",

diff --git a/packages/core/src/components/Editor.spec.tsx b/packages/core/src/components/Editor.spec.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { isBlock, setNodes } from '@udecode/slate';
-import { isEqual, memoize } from 'lodash-es';
+import isEqual from 'lodash/isEqual.js';
+import memoize from 'lodash/memoize.js';
 
 import { PlatePlugin } from '../types/index';
 import { createPlateEditor } from '../utils/index';

diff --git a/packages/core/src/hooks/useEditableProps.ts b/packages/core/src/hooks/useEditableProps.ts
@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import { isDefined } from '@udecode/utils';
-import { omit } from 'lodash-es';
+import omit from 'lodash/omit.js';
 import { useDeepCompareMemo } from 'use-deep-compare';
 
 import { usePlateSelectors } from '../stores';

diff --git a/packages/core/src/hooks/usePlateEffects.ts b/packages/core/src/hooks/usePlateEffects.ts
@@ -1,6 +1,6 @@
 import { ForwardedRef, useEffect } from 'react';
 import { Value } from '@udecode/slate';
-import { isUndefined } from 'lodash-es';
+import { isUndefined } from '@udecode/utils';
 
 import { useEditorRef, usePlateStates } from '../stores';
 import {

diff --git a/packages/core/src/plugins/html-deserializer/utils/pluginDeserializeHtml.ts b/packages/core/src/plugins/html-deserializer/utils/pluginDeserializeHtml.ts
@@ -1,6 +1,6 @@
 import { Value } from '@udecode/slate';
 import { AnyObject, isDefined } from '@udecode/utils';
-import { castArray } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
 
 import { Nullable } from '../../../types';
 import { PlateEditor } from '../../../types/PlateEditor';

diff --git a/packages/core/src/utils/createPlugins.tsx b/packages/core/src/utils/createPlugins.tsx
@@ -1,5 +1,5 @@
 import { Value } from '@udecode/slate';
-import { cloneDeep } from 'lodash-es';
+import cloneDeep from 'lodash/cloneDeep.js';
 
 import { OverrideByKey } from '../types/OverrideByKey';
 import { PlateEditor } from '../types/PlateEditor';

diff --git a/packages/core/src/utils/flattenDeepPlugins.ts b/packages/core/src/utils/flattenDeepPlugins.ts
@@ -1,5 +1,5 @@
 import { Value } from '@udecode/slate';
-import { defaultsDeep } from 'lodash-es';
+import defaultsDeep from 'lodash/defaultsDeep.js';
 
 import { PlateEditor } from '../types/PlateEditor';
 import { PlatePlugin } from '../types/plugin/PlatePlugin';

diff --git a/packages/core/src/utils/getKeysByTypes.ts b/packages/core/src/utils/getKeysByTypes.ts
@@ -1,5 +1,5 @@
 import { Value } from '@udecode/slate';
-import { castArray } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
 
 import { PlateEditor } from '../types/PlateEditor';
 

diff --git a/packages/core/src/utils/mergeDeepPlugins.ts b/packages/core/src/utils/mergeDeepPlugins.ts
@@ -1,5 +1,8 @@
 import { Value } from '@udecode/slate';
-import { defaultsDeep, keyBy, merge, values } from 'lodash-es';
+import defaultsDeep from 'lodash/defaultsDeep.js';
+import keyBy from 'lodash/keyBy.js';
+import merge from 'lodash/merge.js';
+import values from 'lodash/values.js';
 
 import { PlateEditor } from '../types/PlateEditor';
 import { WithPlatePlugin } from '../types/plugin/PlatePlugin';

diff --git a/packages/core/src/utils/mergeDeepToNodes.ts b/packages/core/src/utils/mergeDeepToNodes.ts
@@ -1,5 +1,5 @@
 import { TNode } from '@udecode/slate';
-import { merge } from 'lodash-es';
+import merge from 'lodash/merge.js';
 
 import { applyDeepToNodes, ApplyDeepToNodesOptions } from './applyDeepToNodes';
 

diff --git a/packages/core/src/utils/normalizeInitialValue.ts b/packages/core/src/utils/normalizeInitialValue.ts
@@ -1,5 +1,6 @@
 import { Value } from '@udecode/slate';
-import { cloneDeep, isEqual } from 'lodash-es';
+import cloneDeep from 'lodash/cloneDeep.js';
+import isEqual from 'lodash/isEqual.js';
 
 import { PlateEditor } from '../types';
 

diff --git a/packages/core/src/utils/overridePluginsByKey.ts b/packages/core/src/utils/overridePluginsByKey.ts
@@ -1,5 +1,5 @@
 import { Value } from '@udecode/slate';
-import { defaultsDeep } from 'lodash-es';
+import defaultsDeep from 'lodash/defaultsDeep.js';
 
 import { NoInfer } from '../types/misc/NoInfer';
 import { OverrideByKey } from '../types/OverrideByKey';

diff --git a/packages/dnd/package.json b/packages/dnd/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@udecode/plate-common": "24.3.5",
-    "lodash-es": "^4.17.21",
+    "lodash": "^4.17.21",
     "raf": "^3.4.1"
   },
   "peerDependencies": {

diff --git a/packages/dnd/src/components/Scroller/ScrollArea.tsx b/packages/dnd/src/components/Scroller/ScrollArea.tsx
@@ -5,7 +5,7 @@ import React, {
   useEffect,
   useRef,
 } from 'react';
-import { throttle } from 'lodash-es';
+import throttle from 'lodash/throttle.js';
 import raf from 'raf';
 
 const getCoords = (e: any) => {

diff --git a/packages/font/package.json b/packages/font/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@udecode/plate-common": "24.3.5",
-    "lodash-es": "^4.17.21"
+    "lodash": "^4.17.21"
   },
   "peerDependencies": {
     "react": ">=16.8.0",

diff --git a/packages/font/src/hooks/useColorsCustom.ts b/packages/font/src/hooks/useColorsCustom.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { debounce } from 'lodash-es';
+import debounce from 'lodash/debounce.js';
 
 export const useColorsCustomState = ({
   color,

diff --git a/packages/list/package.json b/packages/list/package.json
@@ -41,7 +41,7 @@
   "dependencies": {
     "@udecode/plate-common": "24.3.5",
     "@udecode/plate-reset-node": "24.3.5",
-    "lodash-es": "^4.17.21"
+    "lodash": "^4.17.21"
   },
   "peerDependencies": {
     "react": ">=16.8.0",

diff --git a/packages/list/src/onKeyDownList.ts b/packages/list/src/onKeyDownList.ts
@@ -11,7 +11,7 @@ import {
   Value,
   WithPlatePlugin,
 } from '@udecode/plate-common';
-import { castArray } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
 import { Range } from 'slate';
 
 import { ELEMENT_LI } from './createListPlugin';

diff --git a/packages/node-id/package.json b/packages/node-id/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@udecode/plate-common": "24.3.5",
-    "lodash-es": "^4.17.21"
+    "lodash": "^4.17.21"
   },
   "peerDependencies": {
     "react": ">=16.8.0",

diff --git a/packages/node-id/src/withNodeId.ts b/packages/node-id/src/withNodeId.ts
@@ -11,7 +11,8 @@ import {
   Value,
   WithPlatePlugin,
 } from '@udecode/plate-common';
-import { castArray, cloneDeep } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
+import cloneDeep from 'lodash/cloneDeep.js';
 
 import { NodeIdPlugin } from './createNodeIdPlugin';
 

diff --git a/packages/normalizers/package.json b/packages/normalizers/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@udecode/plate-common": "24.3.5",
-    "lodash-es": "^4.17.21"
+    "lodash": "^4.17.21"
   },
   "peerDependencies": {
     "react": ">=16.8.0",

diff --git a/packages/normalizers/src/withRemoveEmptyNodes.ts b/packages/normalizers/src/withRemoveEmptyNodes.ts
@@ -6,7 +6,7 @@ import {
   Value,
   WithPlatePlugin,
 } from '@udecode/plate-common';
-import { castArray } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
 
 import { RemoveEmptyNodesPlugin } from './createRemoveEmptyNodesPlugin';
 

diff --git a/packages/plate-utils/package.json b/packages/plate-utils/package.json
@@ -46,7 +46,7 @@
     "@udecode/slate-utils": "24.3.5",
     "@udecode/utils": "24.3.0",
     "clsx": "^1.2.1",
-    "lodash-es": "^4.17.21"
+    "lodash": "^4.17.21"
   },
   "peerDependencies": {
     "react": ">=16.8.0",

diff --git a/packages/plate-utils/src/plate/onKeyDownToggleElement.ts b/packages/plate-utils/src/plate/onKeyDownToggleElement.ts
@@ -9,7 +9,7 @@ import {
   WithPlatePlugin,
 } from '@udecode/plate-core';
 import { Value } from '@udecode/slate';
-import { castArray } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
 
 export const onKeyDownToggleElement =
   <V extends Value = Value, E extends PlateEditor<V> = PlateEditor<V>>(

diff --git a/packages/plate-utils/src/queries/isType.ts b/packages/plate-utils/src/queries/isType.ts
@@ -1,6 +1,6 @@
 import { getPluginType, PlateEditor } from '@udecode/plate-core';
 import { Value } from '@udecode/slate';
-import { castArray } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
 
 /**
  * Does the node match the type provided.

diff --git a/packages/plate-utils/src/utils/createNodesHOC.tsx b/packages/plate-utils/src/utils/createNodesHOC.tsx
@@ -1,6 +1,7 @@
 import { FunctionComponent } from 'react';
 import { AnyObject } from '@udecode/utils';
-import { castArray, merge } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
+import merge from 'lodash/merge.js';
 
 import { createNodeHOC } from './createNodeHOC';
 

diff --git a/packages/plate-utils/src/utils/defaultsDeepToNodes.ts b/packages/plate-utils/src/utils/defaultsDeepToNodes.ts
@@ -1,6 +1,6 @@
 import { applyDeepToNodes, ApplyDeepToNodesOptions } from '@udecode/plate-core';
 import { TNode } from '@udecode/slate';
-import { defaults } from 'lodash-es';
+import defaults from 'lodash/defaults.js';
 
 /**
  * Recursively merge a source object to children nodes with a query.

diff --git a/packages/serializer-html/src/__tests__/serializeHtml/plain-text.spec.ts b/packages/serializer-html/src/__tests__/serializeHtml/plain-text.spec.ts
@@ -1,4 +1,4 @@
-import { deserializeHtml, htmlStringToDOMNode } from '@udecode/plate-core';
+import { deserializeHtml, htmlStringToDOMNode } from '@udecode/plate-common';
 import { createPlateUIEditor } from 'www/src/lib/plate/create-plate-ui-editor';
 
 import { serializeHtml } from '../../serializeHtml';

diff --git a/packages/slate-utils/package.json b/packages/slate-utils/package.json
@@ -41,7 +41,7 @@
   "dependencies": {
     "@udecode/slate": "24.3.5",
     "@udecode/utils": "24.3.0",
-    "lodash-es": "^4.17.21"
+    "lodash": "^4.17.21"
   },
   "peerDependencies": {
     "slate": ">=0.94.0",

diff --git a/packages/slate-utils/src/queries/getPointBeforeLocation.ts b/packages/slate-utils/src/queries/getPointBeforeLocation.ts
@@ -6,7 +6,8 @@ import {
   TEditor,
   Value,
 } from '@udecode/slate';
-import { castArray, map } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
+import map from 'lodash/map.js';
 import { Location, Point } from 'slate';
 
 import { isRangeAcrossBlocks } from './isRangeAcrossBlocks';

diff --git a/packages/slate-utils/src/queries/getPreviousSiblingNode.ts b/packages/slate-utils/src/queries/getPreviousSiblingNode.ts
@@ -1,5 +1,5 @@
 import { getNode, TEditor, Value } from '@udecode/slate';
-import { last } from 'lodash-es';
+import last from 'lodash/last.js';
 import { Path } from 'slate';
 
 export const getPreviousSiblingNode = <V extends Value = Value>(

diff --git a/packages/slate-utils/src/queries/queryEditor.ts b/packages/slate-utils/src/queries/queryEditor.ts
@@ -1,5 +1,5 @@
 import { QueryEditorOptions, someNode, TEditor, Value } from '@udecode/slate';
-import { castArray } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
 
 import { isSelectionAtBlockEnd } from './isSelectionAtBlockEnd';
 import { isSelectionAtBlockStart } from './isSelectionAtBlockStart';

diff --git a/packages/slate-utils/src/transforms/removeMark.ts b/packages/slate-utils/src/transforms/removeMark.ts
@@ -6,7 +6,7 @@ import {
   unsetNodes,
   Value,
 } from '@udecode/slate';
-import { castArray } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
 import { Range } from 'slate';
 
 export interface RemoveMarkOptions<V extends Value = Value>

diff --git a/packages/slate-utils/src/transforms/setMarks.ts b/packages/slate-utils/src/transforms/setMarks.ts
@@ -1,5 +1,5 @@
 import { EMarks, TEditor, Value, withoutNormalizing } from '@udecode/slate';
-import { castArray } from 'lodash-es';
+import castArray from 'lodash/castArray.js';
 
 import { removeMark } from './removeMark';