migrate to lodash-es

jest.config.js

@@ -13,7 +13,7 @@ module.exports = {
 
   // Transform ES modules from these packages
   transformIgnorePatterns: [
-    'node_modules/(?!(@mui|@emotion|@testing-library|@dnd-kit|@hello-pangea|@tiptap|konva|react-konva|d3-.*|internmap|@mapbox/point-geometry)(/|$))',
+    'node_modules/(?!(@mui|@emotion|@testing-library|@dnd-kit|@hello-pangea|@tiptap|lodash-es|konva|react-konva|d3-.*|internmap|@mapbox/point-geometry)(/|$))',
   ],
 
   // Custom resolver to handle node: protocol imports

old-packages/graph-lines/configure/src/index.js

@@ -11,7 +11,7 @@ import {
 import debug from 'debug';
 
 import defaultValues from './defaults';
-import defaults from 'lodash/defaults';
+import { defaults } from 'lodash-es';
 
 const log = debug('pie-elements:graph-lines:configure');
 

old-packages/graph-lines/controller/src/index.js

@@ -1,7 +1,7 @@
 import debug from 'debug';
 import { getFeedbackForCorrectness } from '@pie-lib/feedback';
 import { lineUtils as utils } from '@pie-lib/charting';
-import isEmpty from 'lodash/isEmpty';
+import { isEmpty } from 'lodash-es';
 
 const log = debug('@pie-element:graph-lines:controller');
 

old-packages/inline-choice/configure/package.json

@@ -14,7 +14,7 @@
     "@pie-lib/config-ui": "11.36.0-mui-update.0",
     "@pie-lib/scoring-config": "3.33.0-mui-update.0",
     "debug": "^3.1.0",
-    "lodash": "^4.17.15",
+    "lodash-es": "^4.17.23",
     "prop-types": "^15.8.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"

old-packages/inline-choice/configure/src/root.jsx

@@ -1,8 +1,7 @@
 import React from 'react';
 import Main from './main';
-import cloneDeep from 'lodash/cloneDeep';
+import { cloneDeep, max } from 'lodash-es';
 import PropTypes from 'prop-types';
-import max from 'lodash/max';
 
 export default class Root extends React.Component {
   static propTypes = {

old-packages/inline-choice/controller/src/index.js

@@ -1,5 +1,5 @@
 import debug from 'debug';
-import isEmpty from 'lodash/isEmpty';
+import { isEmpty } from 'lodash-es';
 
 import defaults from './defaults';
 

old-packages/point-intercept/controller/src/index.js

@@ -1,4 +1,4 @@
-import isEmpty from 'lodash/isEmpty';
+import { isEmpty } from 'lodash-es';
 import { getFeedbackForCorrectness } from '@pie-lib/feedback';
 
 const getResponseCorrectness = (correctResponseWithLabels, points, graph, partialScores) => {

old-packages/text-entry/configure/src/__test__/feedback-mapper.test.js

@@ -1,5 +1,4 @@
 import * as feedbackMapper from '../feedback-mapper';
-import _ from 'lodash';
 
 describe('feedback-mapper', () => {
   describe('modelToFeedbackConfig', () => {

old-packages/text-entry/configure/src/model-config.jsx

@@ -3,7 +3,7 @@ import Typography from '@material-ui/core/Typography';
 import { NChoice, InputCheckbox } from '@pie-lib/config-ui';
 import TextField from '@material-ui/core/TextField';
 import { withStyles } from '@material-ui/core/styles';
-import range from 'lodash/range';
+import { range } from 'lodash-es';
 import Box from './box';
 import PropTypes from 'prop-types';
 

old-packages/text-entry/controller/src/index.js

@@ -1,4 +1,4 @@
-import isEmpty from 'lodash/isEmpty';
+import { isEmpty } from 'lodash-es';
 import { getFeedbackForCorrectness } from '@pie-lib/feedback';
 
 const process = (v, ignoreCase, ignoreWhitespace) => {

packages/boilerplate-item-type/configure/package.json

@@ -15,7 +15,7 @@
     "@pie-lib/editable-html-tip-tap": "1.1.1-next.1",
     "@pie-lib/render-ui": "5.1.1-next.0",
     "debug": "^4.1.1",
-    "lodash": "^4.17.15",
+    "lodash-es": "^4.17.23",
     "prop-types": "^15.6.2",
     "react": "18.2.0",
     "react-dom": "18.2.0"

packages/boilerplate-item-type/configure/src/__tests__/design.test.jsx

@@ -15,7 +15,10 @@ jest.mock('@pie-lib/config-ui', () => ({
   },
 }));
 
-jest.mock('lodash/debounce', () => (fn) => fn);
+jest.mock('lodash-es', () => ({
+  debounce: jest.fn((fn) => fn),
+  cloneDeep: jest.fn((value) => JSON.parse(JSON.stringify(value))),
+}));
 
 const theme = createTheme();
 
@@ -43,7 +46,7 @@ describe('design', () => {
           onModelChanged={onChange}
           onConfigurationChanged={onChangeConfig}
         />
-      </ThemeProvider>
+      </ThemeProvider>,
     );
   };
 

packages/boilerplate-item-type/configure/src/design.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { styled } from '@mui/material/styles';
-import cloneDeep from 'lodash/cloneDeep';
+import { cloneDeep } from 'lodash-es';
 import { settings, layout } from '@pie-lib/config-ui';
 import { InputContainer } from '@pie-lib/render-ui'
 import EditableHtml from '@pie-lib/editable-html-tip-tap';

packages/boilerplate-item-type/controller/package.json

@@ -7,11 +7,9 @@
   "module": "src/index.js",
   "dependencies": {
     "debug": "^4.1.1",
-    "lodash": "^4.17.15"
-  },
-  "devDependencies": {
-    "lodash": "^4.17.15"
+    "lodash-es": "^4.17.23"
   },
+  "devDependencies": {},
   "author": "",
   "license": "ISC"
 }

packages/boilerplate-item-type/controller/src/index.js

@@ -1,7 +1,7 @@
-import isEmpty from 'lodash/isEmpty';
+import { isEmpty } from 'lodash-es';
 import defaults from './defaults';
 
 export const getCorrectness = (model) => {
   const correctnessCondition = 'c';
 
   switch (correctnessCondition) {
@@ -68,7 +68,7 @@
   });
 };
 
 export const validate = (model = {}, config = {}) => {
   const errors = {};
 
   return errors;

packages/boilerplate-item-type/src/print.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { createRoot } from 'react-dom/client';
-import debounce from 'lodash/debounce';
+import { debounce } from 'lodash-es';
 import Main from './main';
 import { renderMath } from '@pie-lib/math-rendering';
 import debug from 'debug';

packages/categorize/configure/package.json

@@ -23,7 +23,7 @@
     "@pie-lib/render-ui": "5.1.1-next.0",
     "@pie-lib/translator": "3.1.1-next.0",
     "debug": "^4.1.1",
-    "lodash": "^4.17.15",
+    "lodash-es": "^4.17.23",
     "prop-types": "^15.6.2",
     "react": "18.2.0",
     "react-dom": "18.2.0"

packages/categorize/configure/src/design/builder.js

@@ -1,4 +1,4 @@
-import cloneDeep from 'lodash/cloneDeep';
+import { cloneDeep } from 'lodash-es';
 
 export const buildCategories = (categories, choices, correctResponse) => {
   const clonedCategories = cloneDeep(categories);

packages/categorize/controller/package.json

@@ -6,7 +6,7 @@
     "@pie-lib/controller-utils": "1.1.1-next.0",
     "@pie-lib/feedback": "1.1.1-next.0",
     "@pie-lib/translator": "3.1.1-next.0",
-    "lodash": "^4.17.15"
+    "lodash-es": "^4.17.23"
   },
   "version": "9.0.0-beta.1",
   "description": "",

packages/categorize/controller/src/index.js

@@ -1,4 +1,4 @@
-import isEmpty from 'lodash/isEmpty';
+import { isEmpty } from 'lodash-es';
 import { buildState, score } from '@pie-lib/categorize';
 import { getFeedbackForCorrectness } from '@pie-lib/feedback';
 import { lockChoices, getShuffledChoices, partialScoring } from '@pie-lib/controller-utils';

packages/categorize/package.json

@@ -23,7 +23,7 @@
     "@pie-lib/render-ui": "5.1.1-next.0",
     "@pie-lib/translator": "3.1.1-next.0",
     "debug": "^4.1.1",
-    "lodash": "^4.17.15",
+    "lodash-es": "^4.17.23",
     "prop-types": "^15.6.1",
     "react": "18.3.1",
     "react-dom": "18.3.1"

packages/charting/configure/src/__tests__/correctResponse.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { getUpdatedCategories } from '../correct-response';
-import cloneDeep from 'lodash/cloneDeep';
+import { cloneDeep } from 'lodash-es';
 
 jest.mock('@pie-lib/charting', () => ({
   Chart: (props) => <div data-testid="chart">{props.children}</div>,

packages/charting/configure/src/correct-response.jsx

@@ -2,8 +2,7 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { styled } from '@mui/material/styles';
 import { Chart } from '@pie-lib/charting';
-import isEqual from 'lodash/isEqual';
-import cloneDeep from 'lodash/cloneDeep';
+import { cloneDeep, isEqual } from 'lodash-es';
 
 import Typography from '@mui/material/Typography';
 
@@ -205,7 +204,7 @@ export class CorrectResponse extends React.Component {
               <span>Use the tools below to define the correct answer.</span>
             </Typography>
 
-            {(identicalError || categoriesError) ? (
+            {identicalError || categoriesError ? (
               <ChartError key={`correct-response-graph-${model.correctAnswer.name}`}>
                 <Chart
                   chartType={model.chartType}

packages/charting/configure/src/utils.js

@@ -1,5 +1,5 @@
 // this file is almost duplicated from graphing/configure/src/utils.js; the same logic must be used in charting
-import isEqual from 'lodash/isEqual';
+import { isEqual } from 'lodash-es';
 
 const VALID_GRID_VALUES = [
   0.01, 0.02, 0.04, 0.05, 0.0625, 0.1, 0.125, 0.2, 0.25, 0.5, 1, 2, 3, 4, 5, 8, 10, 12, 15, 20, 40, 50, 64, 100, 500,

packages/charting/controller/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@pie-lib/controller-utils": "1.1.1-next.0",
     "debug": "^4.1.1",
-    "lodash": "^4.17.15"
+    "lodash-es": "^4.17.23"
   },
   "devDependencies": {
     "babel-jest": "^29.7.0",

packages/charting/controller/src/index.js

@@ -1,7 +1,5 @@
 import debug from 'debug';
-import isEqual from 'lodash/isEqual';
-import isEmpty from 'lodash/isEmpty';
-import pick from 'lodash/pick';
+import { isEmpty, isEqual, pick } from 'lodash-es';
 import defaults from './defaults';
 
 import { partialScoring } from '@pie-lib/controller-utils';
@@ -16,12 +14,12 @@ export const checkLabelsEquality = (givenAnswerLabel, correctAnswerLabel) =>
 export const setCorrectness = (answers, partialScoring) =>
   answers
     ? answers.map((answer) => ({
-      ...answer,
-      correctness: {
-        value: partialScoring ? 'incorrect' : 'correct',
-        label: partialScoring ? 'incorrect' : 'correct',
-      },
-    }))
+        ...answer,
+        correctness: {
+          value: partialScoring ? 'incorrect' : 'correct',
+          label: partialScoring ? 'incorrect' : 'correct',
+        },
+      }))
     : [];
 
 export const normalize = (question) => ({ ...defaults, ...question });

packages/charting/package.json

@@ -20,7 +20,7 @@
     "@pie-lib/math-rendering": "4.1.1-next.0",
     "@pie-lib/render-ui": "5.1.1-next.0",
     "debug": "^4.1.1",
-    "lodash": "^4.17.15",
+    "lodash-es": "^4.17.23",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   },

packages/charting/src/__tests__/main.test.js

@@ -3,9 +3,9 @@ import { render } from '@testing-library/react';
 import { ThemeProvider, createTheme } from '@mui/material/styles';
 import { Main } from '../main';
 
-jest.mock('lodash/uniq', () => {
-  return () => [];
-});
+jest.mock('lodash-es', () => ({
+  uniq: jest.fn(() => []),
+}));
 
 jest.mock('@pie-lib/charting', () => ({
   Chart: (props) => <div data-testid="chart">{props.children}</div>,
@@ -74,7 +74,7 @@ describe('Main', () => {
     return render(
       <ThemeProvider theme={theme}>
         <Main {...combinedProps} />
-      </ThemeProvider>
+      </ThemeProvider>,
     );
   };
 

packages/charting/src/main.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { styled } from '@mui/material/styles';
 import { color, Collapsible, hasText, PreviewPrompt, UiLayout, hasMedia } from '@pie-lib/render-ui';
 import { Chart, chartTypes, KeyLegend } from '@pie-lib/charting';
-import isEqual from 'lodash/isEqual';
+import { isEqual } from 'lodash-es';
 import CorrectAnswerToggle from '@pie-lib/correct-answer-toggle';
 
 const StyledUiLayout = styled(UiLayout)({

packages/complex-rubric/configure/package.json

@@ -18,7 +18,7 @@
     "@pie-lib/render-ui": "5.1.1-next.0",
     "@pie-lib/rubric": "1.1.1-next.0",
     "debug": "^4.1.1",
-    "lodash": "^4.17.15",
+    "lodash-es": "^4.17.23",
     "prop-types": "^15.6.2",
     "react": "18.2.0",
     "react-dom": "18.2.0"

packages/complex-rubric/configure/src/index.js

@@ -4,7 +4,7 @@ import { createRoot } from 'react-dom/client';
 import RubricConfigure from '@pie-element/rubric/configure/lib';
 import MultiTraitRubricConfigure from '@pie-element/multi-trait-rubric/configure/lib';
 import debug from 'debug';
-import defaults from 'lodash/defaults';
+import { defaults } from 'lodash-es';
 import Main from './main';
 import sensibleDefaults from './defaults';
 

packages/complex-rubric/controller/package.json

@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "lodash": "^4.17.15"
+    "lodash-es": "^4.17.23"
   },
   "author": "",
   "license": "ISC",

packages/complex-rubric/package.json

@@ -16,7 +16,7 @@
     "@pie-lib/rubric": "1.1.1-next.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
-    "lodash": "^4.17.11",
+    "lodash-es": "^4.17.23",
     "prop-types": "^15.7.2"
   },
   "gitHead": "a15dd0ea81626703eb753bc0ab4c81bb2a96d58d",

packages/drag-in-the-blank/configure/package.json

@@ -17,7 +17,7 @@
     "@pie-lib/editable-html-tip-tap": "1.1.1-next.1",
     "@pie-lib/math-rendering": "4.1.1-next.0",
     "debug": "^4.1.1",
-    "lodash": "^4.17.15",
+    "lodash-es": "^4.17.23",
     "prop-types": "^15.6.2",
     "react": "18.2.0",
     "react-dom": "18.2.0"

packages/drag-in-the-blank/configure/src/index.js

@@ -11,7 +11,7 @@ import { createRoot } from 'react-dom/client';
 import { renderMath } from '@pie-lib/math-rendering';
 import Main from './main';
 import debug from 'debug';
-import defaults from 'lodash/defaults';
+import { defaults } from 'lodash-es';
 
 import sensibleDefaults from './defaults';
 import { processMarkup, createSlateMarkup } from './markupUtils';

packages/drag-in-the-blank/configure/src/markupUtils.js

@@ -1,4 +1,4 @@
-import escape from 'lodash/escape';
+import { escape } from 'lodash-es';
 
 export const createElementFromHTML = (htmlString) => {
   const div = document.createElement('div');

packages/drag-in-the-blank/controller/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "@pie-lib/controller-utils": "1.1.1-next.0",
     "debug": "^4.1.1",
-    "lodash": "^4.17.15",
+    "lodash-es": "^4.17.23",
     "type-of": "^2.0.1"
   }
 }

packages/drag-in-the-blank/controller/src/index.js

@@ -1,4 +1,4 @@
-import isEmpty from 'lodash/isEmpty';
+import { isEmpty } from 'lodash-es';
 import { getAllCorrectResponses, choiceIsEmpty } from './utils';
 import { lockChoices, getShuffledChoices, partialScoring } from '@pie-lib/controller-utils';
 import defaults from './defaults';

packages/drag-in-the-blank/controller/src/utils.js

@@ -1,5 +1,4 @@
-import cloneDeep from 'lodash/cloneDeep';
-import reduce from 'lodash/reduce';
+import { cloneDeep, reduce } from 'lodash-es';
 
 const replaceHtmlRegex = /<(?!img)[^>]*>?/gm;
 

packages/drag-in-the-blank/package.json

@@ -20,7 +20,7 @@
     "@pie-lib/mask-markup": "2.1.1-next.1",
     "@pie-lib/math-rendering": "4.1.1-next.0",
     "@pie-lib/render-ui": "5.1.1-next.0",
-    "lodash": "^4.17.10",
+    "lodash-es": "^4.17.23",
     "prop-types": "^15.6.1",
     "react": "18.3.1",
     "react-dom": "18.3.1"

packages/drawing-response/configure/package.json

@@ -15,7 +15,7 @@
     "@pie-lib/config-ui": "12.1.1-next.1",
     "@pie-lib/editable-html-tip-tap": "1.1.1-next.1",
     "debug": "^4.1.1",
-    "lodash": "^4.17.15",
+    "lodash-es": "^4.17.23",
     "prop-types": "^15.7.2",
     "react": "18.2.0",
     "react-dom": "18.2.0"