feat: remove lodash-es to fix cjs issues

contentful · Jul 24, 2023 · fab8312 · fab8312
1 parent 9d756d6
commit fab8312
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 28 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -14,5 +14,6 @@ module.exports = {
         alphabetize: { order: 'asc', ignoreCase: true },
       },
     ],
+    'no-restricted-imports': ['warn'],
   },
 };
diff --git a/cypress/component/reference/MultipleEntryReferenceEditor.spec.tsx b/cypress/component/reference/MultipleEntryReferenceEditor.spec.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import { NavigatorSlideInfo } from '@contentful/app-sdk';
 import { Button, Card, Heading, Note, Paragraph } from '@contentful/f36-components';
 import { Entry } from '@contentful/field-editor-shared';
-import { cloneDeep, set } from 'lodash-es';
+import { cloneDeep, set } from 'lodash';
 
 import { CombinedLinkActions, MultipleEntryReferenceEditor } from '../../../packages/reference/src';
 import { Entity, Link } from '../../../packages/reference/src/types';

diff --git a/packages/_shared/package.json b/packages/_shared/package.json
@@ -42,8 +42,7 @@
     "@contentful/f36-note": "^4.2.8",
     "@contentful/f36-tokens": "^4.0.0",
     "emotion": "^10.0.17",
-    "lodash": "^4.17.15",
-    "lodash-es": "^4.17.21"
+    "lodash": "^4.17.15"
   },
   "peerDependencies": {
     "@contentful/app-sdk": "^4.2.0",

diff --git a/packages/_shared/src/FieldConnector.ts b/packages/_shared/src/FieldConnector.ts
@@ -1,8 +1,8 @@
 import * as React from 'react';
 
 import { FieldAPI, ValidationError } from '@contentful/app-sdk';
-import { throttle } from 'lodash-es';
 import isEqual from 'lodash/isEqual';
+import throttle from 'lodash/throttle';
 
 type Nullable = null | undefined;
 

diff --git a/packages/_test/package.json b/packages/_test/package.json
@@ -43,7 +43,6 @@
     "@contentful/f36-tokens": "^4.0.0",
     "emotion": "^10.0.17",
     "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15",
     "mitt": "2.1.0"
   },
   "peerDependencies": {

diff --git a/packages/boolean/package.json b/packages/boolean/package.json
@@ -40,7 +40,6 @@
     "@contentful/field-editor-shared": "^1.3.0",
     "emotion": "^10.0.17",
     "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15",
     "nanoid": "^3.1.3"
   },
   "devDependencies": {

diff --git a/packages/checkbox/package.json b/packages/checkbox/package.json
@@ -39,8 +39,7 @@
     "@contentful/f36-tokens": "^4.0.0",
     "@contentful/field-editor-shared": "^1.3.0",
     "emotion": "^10.0.17",
-    "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15"
+    "lodash": "^4.17.15"
   },
   "devDependencies": {
     "@contentful/field-editor-test-utils": "^1.4.0"

diff --git a/packages/dropdown/package.json b/packages/dropdown/package.json
@@ -40,7 +40,6 @@
     "@contentful/field-editor-shared": "^1.3.0",
     "emotion": "^10.0.0",
     "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15",
     "nanoid": "^3.1.3"
   },
   "devDependencies": {

diff --git a/packages/json/package.json b/packages/json/package.json
@@ -42,8 +42,7 @@
     "@uiw/react-codemirror": "^4.11.4",
     "deep-equal": "2.0.5",
     "emotion": "^10.0.17",
-    "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15"
+    "lodash": "^4.17.15"
   },
   "devDependencies": {
     "@contentful/field-editor-test-utils": "^1.4.0"

diff --git a/packages/list/package.json b/packages/list/package.json
@@ -39,8 +39,7 @@
     "@contentful/f36-tokens": "^4.0.0",
     "@contentful/field-editor-shared": "^1.3.0",
     "emotion": "^10.0.17",
-    "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15"
+    "lodash": "^4.17.15"
   },
   "devDependencies": {
     "@contentful/field-editor-test-utils": "^1.4.0"

diff --git a/packages/location/package.json b/packages/location/package.json
@@ -40,8 +40,7 @@
     "deep-equal": "2.0.5",
     "emotion": "^10.0.17",
     "google-map-react": "2.2.0",
-    "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15"
+    "lodash": "^4.17.15"
   },
   "devDependencies": {
     "@contentful/field-editor-test-utils": "^1.4.0"

diff --git a/packages/markdown/package.json b/packages/markdown/package.json
@@ -46,7 +46,6 @@
     "dompurify": "^2.2.9",
     "emotion": "^10.0.17",
     "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15",
     "markdown-to-jsx": "^7.1.1"
   },
   "devDependencies": {

diff --git a/packages/multiple-line/package.json b/packages/multiple-line/package.json
@@ -39,8 +39,7 @@
     "@contentful/f36-tokens": "^4.0.0",
     "@contentful/field-editor-shared": "^1.3.0",
     "emotion": "^10.0.17",
-    "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15"
+    "lodash": "^4.17.15"
   },
   "devDependencies": {
     "@contentful/field-editor-test-utils": "^1.4.0"

diff --git a/packages/radio/package.json b/packages/radio/package.json
@@ -41,7 +41,6 @@
     "@contentful/field-editor-shared": "^1.3.0",
     "emotion": "^10.0.17",
     "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15",
     "nanoid": "^3.1.3"
   },
   "devDependencies": {

diff --git a/packages/rating/package.json b/packages/rating/package.json
@@ -39,8 +39,7 @@
     "@contentful/f36-tokens": "^4.0.0",
     "@contentful/field-editor-shared": "^1.3.0",
     "emotion": "^10.0.17",
-    "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15"
+    "lodash": "^4.17.15"
   },
   "devDependencies": {
     "@contentful/field-editor-test-utils": "^1.4.0"

diff --git a/packages/reference/package.json b/packages/reference/package.json
@@ -48,7 +48,6 @@
     "deep-equal": "2.0.5",
     "emotion": "^10.0.17",
     "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15",
     "moment": "^2.20.0",
     "p-queue": "^4.0.0",
     "react-intersection-observer": "9.4.0",

diff --git a/packages/single-line/package.json b/packages/single-line/package.json
@@ -39,8 +39,7 @@
     "@contentful/f36-tokens": "^4.0.0",
     "@contentful/field-editor-shared": "^1.3.0",
     "emotion": "^10.0.17",
-    "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15"
+    "lodash": "^4.17.15"
   },
   "devDependencies": {
     "@contentful/field-editor-test-utils": "^1.4.0"

diff --git a/packages/slug/package.json b/packages/slug/package.json
@@ -42,7 +42,6 @@
     "@types/speakingurl": "^13.0.2",
     "emotion": "^10.0.17",
     "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15",
     "speakingurl": "^13.0.0",
     "use-debounce": "^7.0.0"
   },

diff --git a/packages/tags/package.json b/packages/tags/package.json
@@ -42,7 +42,6 @@
     "array-move": "^3.0.0",
     "emotion": "^10.0.0",
     "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15",
     "react-sortable-hoc": "^2.0.0"
   },
   "devDependencies": {

diff --git a/packages/url/package.json b/packages/url/package.json
@@ -39,8 +39,7 @@
     "@contentful/f36-tokens": "^4.0.0",
     "@contentful/field-editor-shared": "^1.3.0",
     "emotion": "^10.0.17",
-    "lodash": "^4.17.15",
-    "lodash-es": "^4.17.15"
+    "lodash": "^4.17.15"
   },
   "devDependencies": {
     "@contentful/field-editor-test-utils": "^1.4.0"