switching to lodash-es; alpha release

ChenYong · ChenYong · commit 578b1e209db9 · 2019-12-20T11:24:03.000+08:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jimengio/code-rule-editor",
-  "version": "0.1.0",
+  "version": "0.1.1-a1",
   "description": "Code rule editor of JimengIO",
   "main": "lib/index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "@jimengio/safe-property": "^0.0.2",
     "@jimengio/shared-utils": "^0.1.5",
     "@types/antd": "^1.0.0",
-    "@types/lodash": "^4.14.149",
+    "@types/lodash-es": "^4.17.3",
     "@types/node": "^12.12.21",
     "@types/prettier": "^1.19.0",
     "@types/query-string": "^6.3.0",
@@ -69,7 +69,6 @@
     "decimal.js": "^10.2.0",
     "emotion": "^10.0.23",
     "immer": "^5.0.2",
-    "lodash": "^4.17.15",
     "lodash-es": "^4.17.15",
     "query-string": "^6.9.0",
     "react": "^16.12.0",
diff --git a/src/code-rule-view.tsx b/src/code-rule-view.tsx
@@ -1,5 +1,4 @@
 import React, { Component } from "react";
-import _ from "lodash";
 import { css, cx } from "emotion";
 import produce from "immer";
 
diff --git a/src/editor.tsx b/src/editor.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import _ from "lodash";
+import { map, merge, fromPairs, isEmpty, isNil, every, toPairs } from "lodash-es";
 import { css, cx } from "emotion";
 import produce from "immer";
 
@@ -64,7 +64,7 @@ export default class CodeRuleEditor extends React.Component<IProps, IState> {
   }
 
   getFormsFromSegments(segments: ICodeRule[]) {
-    return _.map(segments, (segment) => _.merge({ type: segment.type }, _.fromPairs(_.map(segment.settings, (setting) => [setting.name, setting.value]))));
+    return map(segments, (segment) => merge({ type: segment.type }, fromPairs(map(segment.settings, (setting) => [setting.name, setting.value]))));
   }
 
   setImmerState = immerHelpers.immerState as ImmerStateFunc<IState>;
@@ -83,7 +83,7 @@ export default class CodeRuleEditor extends React.Component<IProps, IState> {
                   isFocused={idx === this.state.focusedPosition}
                   movingPosition={this.state.movingPosition}
                   droppingPosition={this.state.droppingPosition}
-                  failuresHighlighted={!_.isEmpty(this.state.listedFailures[idx])}
+                  failuresHighlighted={!isEmpty(this.state.listedFailures[idx])}
                   onClick={() => {
                     this.setImmerState((state) => {
                       state.focusedPosition = idx;
@@ -149,7 +149,7 @@ export default class CodeRuleEditor extends React.Component<IProps, IState> {
   }
 
   renderForm(form, failures: any[]) {
-    if (_.isNil(form)) {
+    if (isNil(form)) {
       return null;
     }
     switch (form.type) {
@@ -374,11 +374,11 @@ export default class CodeRuleEditor extends React.Component<IProps, IState> {
   onConfirm = () => {
     let listedFailures = this.getValidationResults(this.state.formList);
 
-    if (_.every(listedFailures, _.isEmpty)) {
+    if (every(listedFailures, isEmpty)) {
       let newSegments = this.state.formList.map((form) => {
         return {
           type: form.type,
-          settings: _.map(_.toPairs(form), (pair) => {
+          settings: map(toPairs(form), (pair) => {
             return { name: pair[0], value: `${pair[1]}` };
           }).filter((pair) => pair.name !== "type"),
         };
diff --git a/src/forms/auto-increment-form.tsx b/src/forms/auto-increment-form.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import _ from "lodash";
+import { last, isEmpty } from "lodash-es";
 import produce from "immer";
 import InputNumber from "antd/lib/input-number";
 import Select from "antd/lib/select";
@@ -117,7 +117,7 @@ export default class AutoIncrementImmerForm extends React.Component<IProps, ISta
             onChange={(value: string) => {
               this.props.onSubmit(
                 produce(form, (draft) => {
-                  draft.paddingCharactor = _.last((value as string) || "0");
+                  draft.paddingCharactor = last((value as string) || "0");
                 })
               );
             }}
@@ -151,19 +151,19 @@ export default class AutoIncrementImmerForm extends React.Component<IProps, ISta
 export let validateAutoIncrementForm = (form: ICodeRuleFormAutoIncrement) => {
   let result: any = {};
 
-  // if (_.isEmpty(form.scope)) {
+  // if (isEmpty(form.scope)) {
   //   result.scope = lang.dataIsRequired;
   // }
 
   if (form.length == null) {
     result.length = lang.invalidInput;
   }
 
-  if (_.isEmpty(form.period)) {
+  if (isEmpty(form.period)) {
     result.period = lang.dataIsRequired;
   }
 
-  if (_.isEmpty(form.paddingCharactor)) {
+  if (isEmpty(form.paddingCharactor)) {
     result.paddingCharactor = lang.dataIsRequired;
   }
 
diff --git a/src/forms/checksum-form.tsx b/src/forms/checksum-form.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import _ from "lodash";
+import { last, isEmpty } from "lodash-es";
 import produce from "immer";
 import InputNumber from "antd/lib/input-number";
 import Select from "antd/lib/select";
@@ -101,7 +101,7 @@ export default class ChecksumImmerForm extends React.Component<IProps, IState> {
             onChange={(value: string) => {
               this.props.onSubmit(
                 produce(form, (draft) => {
-                  draft.paddingCharactor = _.last((value as string) || "0");
+                  draft.paddingCharactor = last((value as string) || "0");
                 })
               );
             }}
@@ -119,11 +119,11 @@ export const validateChecksumForm = (form: ICodeRuleFormChecksum) => {
     result.length = lang.invalidInput;
   }
 
-  if (_.isEmpty(form.paddingCharactor)) {
+  if (isEmpty(form.paddingCharactor)) {
     result.paddingCharactor = lang.dataIsRequired;
   }
 
-  if (_.isEmpty(form.algorithm)) {
+  if (isEmpty(form.algorithm)) {
     result.algorithm = lang.dataIsRequired;
   }
 
diff --git a/src/forms/literal-form.tsx b/src/forms/literal-form.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import _ from "lodash";
+import { isEmpty } from "lodash-es";
 import produce from "immer";
 
 import { styleFormContainer, styleFormRowsList, LabeledField, LabeledFieldInput } from "../immer-form";
@@ -73,7 +73,7 @@ export default class LiteralImmerForm extends React.Component<IProps, IState> {
 export const validateLiteralForm = (form: ICodeRuleFormLiteral) => {
   let result: any = {};
 
-  if (_.isEmpty(form.content)) {
+  if (isEmpty(form.content)) {
     result.content = lang.contentRequired;
   }
 
diff --git a/src/forms/parameter-value-form.tsx b/src/forms/parameter-value-form.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import _ from "lodash";
+import { isEmpty } from "lodash-es";
 import produce from "immer";
 
 import { styleFormContainer, styleFormRowsList, LabeledField, LabeledFieldInput } from "../immer-form";
@@ -73,7 +73,7 @@ export default class ParameterValueImmerForm extends React.Component<IProps, ISt
 export const validateParameterValueForm = (form: ICodeRuleFormParameterValue) => {
   let result: any = {};
 
-  if (_.isEmpty(form.parameterName)) {
+  if (isEmpty(form.parameterName)) {
     result.parameterName = lang.parameterNameRequired;
   }
 
diff --git a/src/forms/user-input-form.tsx b/src/forms/user-input-form.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import _ from "lodash";
+import { isEmpty } from "lodash-es";
 import produce from "immer";
 
 import { styleFormContainer, styleFormRowsList, LabeledField, LabeledFieldInput } from "../immer-form";
@@ -98,7 +98,7 @@ export const validateUserInputForm = (form: ICodeRuleFormUserInput) => {
     result.length = lang.invalidInput;
   }
 
-  if (_.isEmpty(form.parameterName)) {
+  if (isEmpty(form.parameterName)) {
     result.parameterName = lang.parameterNameRequired;
   }
 
diff --git a/src/forms/year-form.tsx b/src/forms/year-form.tsx
@@ -1,5 +1,4 @@
 import React from "react";
-import _ from "lodash";
 import produce from "immer";
 import Select from "antd/lib/select";
 
diff --git a/src/immer-form.tsx b/src/immer-form.tsx
@@ -4,7 +4,7 @@
 
 import * as React from "react";
 import { CSSProperties, ReactNode } from "react";
-import _ from "lodash";
+import { isString, values, isNil, isObject } from "lodash-es";
 import { css, cx } from "emotion";
 import { inlineRow, column, row, flex } from "@jimengio/flex-styles";
 import { lang, formatString } from "./lingual";
@@ -50,7 +50,7 @@ export const validationMethods = {
 
     if (data == null) {
       return defaultFailed;
-    } else if (_.isString(data)) {
+    } else if (isString(data)) {
       if (data.length === 0) {
         return defaultFailed;
       }
@@ -104,7 +104,7 @@ export const validationMethods = {
 
 // function outdated, see https://github.com/beego/fi/pull/1247
 export function isFailuresEmpty(failures: object): boolean {
-  return _.values(failures).every(_.isNil);
+  return values(failures).every(isNil);
 }
 
 // form rows
@@ -135,10 +135,10 @@ let renderFailure = (failure) => {
   if (failure == null) {
     return null;
   }
-  if (_.isString(failure)) {
+  if (isString(failure)) {
     return <div className={styleFormInvalid}>{failure}</div>;
   }
-  if (_.isObject(failure)) {
+  if (isObject(failure)) {
     let failureInfo = failure as IFailureInfo;
     switch (failureInfo.type) {
       case "warning":
diff --git a/src/segment-preview.tsx b/src/segment-preview.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import _ from "lodash";
+import { isNumber, padStart } from "lodash-es";
 import moment from "moment";
 import dayjs from "dayjs";
 import { css, cx } from "emotion";
@@ -95,7 +95,7 @@ export default class CodeRuleSegmentPreview extends React.Component<IProps, ISta
         </div>
         <div className={cx(styleLabel, this.props.isFocused ? styleFocused : null)}>{this.renderPreview(this.props.form)}</div>
 
-        {_.isNumber(from) && _.isNumber(to) && to === this.props.index ? this.renderDropHint(from, to) : null}
+        {isNumber(from) && isNumber(to) && to === this.props.index ? this.renderDropHint(from, to) : null}
       </div>
     );
   }
@@ -156,7 +156,7 @@ export default class CodeRuleSegmentPreview extends React.Component<IProps, ISta
   }
 
   renderWeekOfYear(form: ICodeRuleFormWeekOfYear) {
-    return _.padStart(
+    return padStart(
       dayjs()
         .week()
         .toString(),
@@ -170,15 +170,15 @@ export default class CodeRuleSegmentPreview extends React.Component<IProps, ISta
   }
 
   renderAutoIncrement(form: ICodeRuleFormAutoIncrement) {
-    return _.padStart("1", form.length, form.paddingCharactor || "0");
+    return padStart("1", form.length, form.paddingCharactor || "0");
   }
 
   renderChecksum(form: ICodeRuleFormChecksum) {
-    return _.padStart("", form.length, form.paddingCharactor);
+    return padStart("", form.length, form.paddingCharactor);
   }
 
   renderDayOfYear(form: ICodeRuleFormDayOfYear) {
-    return _.padStart(
+    return padStart(
       "0",
       3,
       moment()
diff --git a/src/single-editor.tsx b/src/single-editor.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import _ from "lodash";
+import { map, merge, toPairs, isNil, isEmpty, fromPairs } from "lodash-es";
 import produce from "immer";
 import { cx, css } from "emotion";
 
@@ -60,7 +60,7 @@ export function parseSegmentFromForm(form) {
   return {
     type: form.type,
     note: form.note,
-    settings: _.map(_.toPairs(form), (pair) => {
+    settings: map(toPairs(form), (pair) => {
       return { name: pair[0], value: `${pair[1]}` };
     }).filter((pair) => pair.name !== "type" && pair.name !== "note"),
   };
@@ -71,7 +71,7 @@ export function parseFormFromSegment(segment: ICodeRule) {
     segment = {} as ICodeRule;
   }
 
-  let form = _.merge({ type: segment.type, note: segment.note }, _.fromPairs(_.map(segment.settings, (setting) => [setting.name, setting.value])));
+  let form = merge({ type: segment.type, note: segment.note }, fromPairs(map(segment.settings, (setting) => [setting.name, setting.value])));
   if (!form || !form.type) {
     form = {
       type: ECodeRuleType.Literal,
@@ -139,7 +139,7 @@ export default class SingleCodeRuleEditor extends ImmerComponent<IProps, IState>
   }
 
   renderForm(form, failures: any) {
-    if (_.isNil(form)) {
+    if (isNil(form)) {
       return null;
     }
     switch (form.type) {
@@ -348,7 +348,7 @@ export default class SingleCodeRuleEditor extends ImmerComponent<IProps, IState>
     const form = parseFormFromSegment(this.props.codeRule);
     let failures = getValidationResults(form);
 
-    if (_.isEmpty(failures)) {
+    if (isEmpty(failures)) {
       const newSegment = parseSegmentFromForm(form);
 
       this.props.onSubmit(newSegment);
diff --git a/src/utils/sequence-rule.ts b/src/utils/sequence-rule.ts
@@ -1,4 +1,4 @@
-import _ from "lodash";
+import { padStart, padEnd } from "lodash-es";
 import produce from "immer";
 import dayjs from "dayjs";
 import dayOfYear from "dayjs/plugin/dayOfYear";
@@ -171,10 +171,10 @@ export function renderLiteral(form: ICodeRuleFormLiteral) {
 
 export function renderUserInput(form: ICodeRuleFormUserInput, editable?: boolean) {
   if (editable) {
-    return _.padEnd(form.userInputValue != null ? form.userInputValue : "", form.length, "_");
+    return padEnd(form.userInputValue != null ? form.userInputValue : "", form.length, "_");
   }
 
-  return _.padStart("", form.length, "X");
+  return padStart("", form.length, "X");
 }
 
 export function renderParamaterValue(form: ICodeRuleFormParameterValue) {
@@ -194,7 +194,7 @@ export function renderDayOfMonth(form: ICodeRuleFormDayOfMonth) {
 }
 
 export function renderWeekOfYear(form: ICodeRuleFormWeekOfYear) {
-  return _.padStart(
+  return padStart(
     dayjs()
       .week()
       .toString(),
@@ -213,15 +213,15 @@ export function renderAutoIncrement(form: ICodeRuleFormAutoIncrement, offset: nu
   const current = form.currentAutoNumber || 1;
   const previewStart = start > current ? start : current;
 
-  return _.padStart(`${decimalSum(previewStart as number, offset)}`, form.length, form.paddingCharactor || "0");
+  return padStart(`${decimalSum(previewStart as number, offset)}`, form.length, form.paddingCharactor || "0");
 }
 
 export function renderChecksum(form: ICodeRuleFormChecksum) {
-  return _.padStart("", form.length, form.paddingCharactor);
+  return padStart("", form.length, form.paddingCharactor);
 }
 
 export function renderDayOfYear(form: ICodeRuleFormDayOfYear) {
-  return _.padStart(
+  return padStart(
     dayjs()
       .dayOfYear()
       .toString(),
diff --git a/webpack/dev.js b/webpack/dev.js
@@ -49,6 +49,7 @@ module.exports = {
   },
   plugins: [
     new ForkTsCheckerWebpackPlugin({ checkSyntacticErrors: true, async: false }),
+    new webpack.ContextReplacementPlugin(/moment[/\\]locale$/, /zh-cn/),
     new webpack.DllReferencePlugin({
       manifest: path.resolve(__dirname, "dll/manifest.json"),
     }),
diff --git a/webpack/dll-dev.js b/webpack/dll-dev.js
@@ -6,7 +6,7 @@ let { matchCssRule, matchFontsRule } = require("./shared");
 
 module.exports = {
   mode: "development",
-  entry: ["react", "react-dom", "emotion", "immer", "dayjs", "lodash", "@jimengio/ruled-router"],
+  entry: ["react", "react-dom", "emotion", "immer", "dayjs"],
   output: {
     filename: "dll_vendors_[hash:8].js",
     path: path.join(__dirname, "dll"),
diff --git a/webpack/dll-release.js b/webpack/dll-release.js
diff --git a/webpack/release.js b/webpack/release.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import React, { Component } from "react";`
`2`		`-import _ from "lodash";`
`3`	`2`	`import { css, cx } from "emotion";`
`4`	`3`	`import produce from "immer";`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import React from "react";`
`2`		`-import _ from "lodash";`
	`2`	`+import { isEmpty } from "lodash-es";`
`3`	`3`	`import produce from "immer";`
`4`	`4`
`5`	`5`	`import { styleFormContainer, styleFormRowsList, LabeledField, LabeledFieldInput } from "../immer-form";`
`@@ -98,7 +98,7 @@ export const validateUserInputForm = (form: ICodeRuleFormUserInput) => {`
`98`	`98`	`result.length = lang.invalidInput;`
`99`	`99`	`}`
`100`	`100`
`101`		`- if (_.isEmpty(form.parameterName)) {`
	`101`	`+ if (isEmpty(form.parameterName)) {`
`102`	`102`	`result.parameterName = lang.parameterNameRequired;`
`103`	`103`	`}`
`104`	`104`