Merge pull request #2669 from udecode/fix/js

Lodash ES
udecode · Oct 2, 2023 · 599cdfa · 599cdfa
2 parents 5ae2282 + 8a9172b
commit 599cdfa
Show file tree

Hide file tree

Showing 48 changed files with 97 additions and 107 deletions.
diff --git a/.changeset/silly-terms-type.md b/.changeset/silly-terms-type.md
@@ -0,0 +1,5 @@
+---
+'@udecode/slate': patch
+---
+
+Replace lodash by lodash-es
diff --git a/config/tsup.config.ts b/config/tsup.config.ts
@@ -1,9 +1,10 @@
 /* eslint-disable unicorn/prefer-module,@typescript-eslint/no-shadow */
 import fs from 'node:fs';
 import path from 'node:path';
-import { esbuildPluginImport } from '@linjiajian999/esbuild-plugin-import';
 import { defineConfig } from 'tsup';
 
+const silent = false;
+
 const PACKAGE_ROOT_PATH = process.cwd();
 const INPUT_FILE_PATH = path.join(PACKAGE_ROOT_PATH, 'src/index.ts');
 const INPUT_FILE = fs.existsSync(INPUT_FILE_PATH)
@@ -15,30 +16,22 @@ export default defineConfig((opts) => {
     ...opts,
     entry: [INPUT_FILE],
     format: ['cjs', 'esm'],
-    skipNodeModulesBundle: true,
-    dts: {
-      resolve: false,
-    },
+    dts: { resolve: false },
     sourcemap: true,
     clean: true,
-    esbuildPlugins: [
-      esbuildPluginImport([
-        {
-          libraryName: 'lodash',
-          libraryDirectory: '',
-          camel2DashComponentName: false,
-        },
-      ]) as any,
-    ],
-    onSuccess: async () => {
-      if (opts.watch) {
-        console.info('Watching for changes...');
-        return;
-      }
 
-      console.info('Build succeeded!');
-    },
-    silent: true,
-    plugins: [],
+    ...(silent
+      ? {
+          silent: true,
+          onSuccess: async () => {
+            if (opts.watch) {
+              console.info('Watching for changes...');
+              return;
+            }
+
+            console.info('Build succeeded!');
+          },
+        }
+      : {}),
   };
 });
diff --git a/jest.config.cjs b/jest.config.cjs
@@ -45,6 +45,7 @@ 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,

diff --git a/package.json b/package.json
@@ -53,6 +53,7 @@
     "p:brl": "cd $INIT_CWD && barrelsby -d $INIT_CWD/src -D -l all -q -e '.*(fixture|template|spec|__tests__).*'",
     "p:brl:below": "cd $INIT_CWD && barrelsby -d $INIT_CWD/src -D -l below -q -e '.*(fixture|template|spec|__tests__).*'",
     "p:build": "cd $INIT_CWD && yarn p:tsup",
+    "p:build:watch": "cd $INIT_CWD && yarn p:tsup --watch",
     "p:clean": "cd $INIT_CWD && rimraf dist && jest --clear-cache",
     "p:lint": "eslint $INIT_CWD/src --color",
     "p:lint:fix": "eslint $INIT_CWD/src --color --fix",
@@ -87,7 +88,6 @@
     "@changesets/types": "^5.2.1",
     "@dword-design/eslint-plugin-import-alias": "^4.0.8",
     "@ianvs/prettier-plugin-sort-imports": "^4.0.2",
-    "@linjiajian999/esbuild-plugin-import": "1.0.2",
     "@playwright/test": "1.36.0",
     "@swc/core": "1.3.90",
     "@swc/jest": "0.2.29",
@@ -99,6 +99,7 @@
     "@types/is-hotkey": "^0.1.7",
     "@types/jest": "^29.5.3",
     "@types/lodash": "^4.14.195",
+    "@types/lodash-es": "^4.17.9",
     "@types/marked": "^4.3.1",
     "@types/node": "^20.4.2",
     "@types/prismjs": "^1.26.0",

diff --git a/packages/autoformat/package.json b/packages/autoformat/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@udecode/plate-common": "24.3.2",
-    "lodash": "^4.17.21"
+    "lodash-es": "^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/castArray';
+import { castArray } from 'lodash-es';
 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/castArray';
+import { castArray } from 'lodash-es';
 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/castArray';
+import { castArray } from 'lodash-es';
 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/castArray';
+import { castArray } from 'lodash-es';
 
 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.2",
-    "lodash": "^4.17.21"
+    "lodash-es": "^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';
+import { clamp } from 'lodash-es';
 
 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": "^4.17.21",
+    "lodash-es": "^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,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { isBlock, setNodes } from '@udecode/slate';
-import { isEqual, memoize } from 'lodash';
+import { isEqual, memoize } from 'lodash-es';
 
 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/omit';
+import { omit } from 'lodash-es';
 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';
+import { isUndefined } from 'lodash-es';
 
 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/castArray';
+import { castArray } from 'lodash-es';
 
 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';
+import { cloneDeep } from 'lodash-es';
 
 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/defaultsDeep';
+import { defaultsDeep } from 'lodash-es';
 
 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';
+import { castArray } from 'lodash-es';
 
 import { PlateEditor } from '../types/PlateEditor';
 

diff --git a/packages/core/src/utils/mergeDeepPlugins.ts b/packages/core/src/utils/mergeDeepPlugins.ts
@@ -1,8 +1,5 @@
 import { Value } from '@udecode/slate';
-import defaultsDeep from 'lodash/defaultsDeep';
-import keyBy from 'lodash/keyBy';
-import merge from 'lodash/merge';
-import values from 'lodash/values';
+import { defaultsDeep, keyBy, merge, values } from 'lodash-es';
 
 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/merge';
+import { merge } from 'lodash-es';
 
 import { applyDeepToNodes, ApplyDeepToNodesOptions } from './applyDeepToNodes';
 

diff --git a/packages/core/src/utils/normalizeInitialValue.ts b/packages/core/src/utils/normalizeInitialValue.ts
@@ -1,6 +1,5 @@
 import { Value } from '@udecode/slate';
-import { cloneDeep } from 'lodash';
-import isEqual from 'lodash/isEqual';
+import { cloneDeep, isEqual } from 'lodash-es';
 
 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/defaultsDeep';
+import { defaultsDeep } from 'lodash-es';
 
 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.2",
-    "lodash": "^4.17.21",
+    "lodash-es": "^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';
+import { throttle } from 'lodash-es';
 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.2",
-    "lodash": "^4.17.21"
+    "lodash-es": "^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/debounce';
+import { debounce } from 'lodash-es';
 
 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.2",
     "@udecode/plate-reset-node": "24.3.2",
-    "lodash": "^4.17.21"
+    "lodash-es": "^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';
+import { castArray } from 'lodash-es';
 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.2",
-    "lodash": "^4.17.21"
+    "lodash-es": "^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,8 +11,7 @@ import {
   Value,
   WithPlatePlugin,
 } from '@udecode/plate-common';
-import { castArray } from 'lodash';
-import cloneDeep from 'lodash/cloneDeep';
+import { castArray, cloneDeep } from 'lodash-es';
 
 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.2",
-    "lodash": "^4.17.21"
+    "lodash-es": "^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/castArray';
+import { castArray } from 'lodash-es';
 
 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.2",
     "@udecode/utils": "24.3.0",
     "clsx": "^1.2.1",
-    "lodash": "^4.17.21"
+    "lodash-es": "^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';
+import { castArray } from 'lodash-es';
 
 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/castArray';
+import { castArray } from 'lodash-es';
 
 /**
  * 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,7 +1,6 @@
 import { FunctionComponent } from 'react';
 import { AnyObject } from '@udecode/utils';
-import { castArray } from 'lodash';
-import merge from 'lodash/merge';
+import { castArray, merge } from 'lodash-es';
 
 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/defaults';
+import { defaults } from 'lodash-es';
 
 /**
  * Recursively merge a source object to children nodes with a query.

diff --git a/packages/slate-utils/package.json b/packages/slate-utils/package.json
@@ -41,7 +41,7 @@
   "dependencies": {
     "@udecode/slate": "24.3.2",
     "@udecode/utils": "24.3.0",
-    "lodash": "^4.17.21"
+    "lodash-es": "^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,8 +6,7 @@ import {
   TEditor,
   Value,
 } from '@udecode/slate';
-import castArray from 'lodash/castArray';
-import map from 'lodash/map';
+import { castArray, map } from 'lodash-es';
 import { Location, Point } from 'slate';
 
 import { isRangeAcrossBlocks } from './isRangeAcrossBlocks';