From ca8192aafd9e6c2ea073d80a38f6f856dc389fce Mon Sep 17 00:00:00 2001
From: Ken Ho <kentsu.ho@gmail.com>
Date: Fri, 4 Dec 2020 21:10:29 +0800
Subject: [PATCH] chore: switch dayjs and lodash to esm compatible deps

---
 src/components/calendar/body/index.ts       |  2 +-
 src/components/calendar/common/helper.ts    | 14 +++++++-------
 src/components/calendar/common/plugins.ts   |  4 ++--
 src/components/calendar/controller/index.ts |  2 +-
 src/components/calendar/index.ts            |  2 +-
 src/components/grid/index.ts                |  2 +-
 src/components/input-number/index.ts        |  2 +-
 src/components/swipe-action/index.ts        |  4 ++--
 types/calendar.d.ts                         |  2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/calendar/body/index.ts b/src/components/calendar/body/index.ts
index 49c83e09..40fc8f7e 100644
--- a/src/components/calendar/body/index.ts
+++ b/src/components/calendar/body/index.ts
@@ -3,7 +3,7 @@ import { Swiper, SwiperItem, View } from '@tarojs/components'
 import { BaseEventOrig, ITouch, ITouchEvent } from '@tarojs/components/types/common'
 import { AtCalendarBodyListGroup, AtCalendarBodyProps, Calendar, AtCalendarBodyState } from 'types/calendar'
 import Taro from '@tarojs/taro'
-import dayjs from 'dayjs'
+import dayjs from 'dayjs/esm/index'
 import { delayQuerySelector } from '../../../utils/common'
 import generateCalendarGroup from '../common/helper'
 import AtCalendarDateList from '../ui/date-list/index'
diff --git a/src/components/calendar/common/helper.ts b/src/components/calendar/common/helper.ts
index 75b76f86..78ddabf6 100644
--- a/src/components/calendar/common/helper.ts
+++ b/src/components/calendar/common/helper.ts
@@ -1,5 +1,5 @@
-import dayjs, { Dayjs } from 'dayjs'
-import _flow from 'lodash/flow'
+import dayjs, { Dayjs } from 'dayjs/esm/index'
+import _flow from 'lodash-es/flow'
 import { Calendar } from 'types/calendar'
 import * as constant from './constant'
 import plugins from './plugins'
@@ -26,11 +26,11 @@ function getFullItem(
 export default function generateCalendarGroup(
   options: Calendar.GroupOptions
 ): (
-  generateDate: number,
-  selectedDate: Calendar.SelectedDate,
-  isShowStatus?: boolean
-) => Calendar.ListInfo<Calendar.Item> {
-  return function(
+    generateDate: number,
+    selectedDate: Calendar.SelectedDate,
+    isShowStatus?: boolean
+  ) => Calendar.ListInfo<Calendar.Item> {
+  return function (
     generateDate: number,
     selectedDate: Calendar.SelectedDate,
     isShowStatus?: boolean
diff --git a/src/components/calendar/common/plugins.ts b/src/components/calendar/common/plugins.ts
index 93babeef..dd8337e8 100644
--- a/src/components/calendar/common/plugins.ts
+++ b/src/components/calendar/common/plugins.ts
@@ -1,5 +1,5 @@
-import dayjs from 'dayjs'
-import _isEmpty from 'lodash/isEmpty'
+import dayjs from 'dayjs/esm/index'
+import _isEmpty from 'lodash-es/isEmpty'
 import { Calendar } from 'types/calendar'
 
 interface PluginArg {
diff --git a/src/components/calendar/controller/index.ts b/src/components/calendar/controller/index.ts
index da5d057a..bc4a80c4 100644
--- a/src/components/calendar/controller/index.ts
+++ b/src/components/calendar/controller/index.ts
@@ -2,7 +2,7 @@ import { h, defineComponent, computed, PropType } from "vue"
 import { Picker, Text, View } from '@tarojs/components'
 import { Calendar, AtCalendarControllerProps } from 'types/calendar'
 import { CommonEvent } from '@tarojs/components/types/common'
-import dayjs from 'dayjs'
+import dayjs from 'dayjs/esm/index'
 
 const AtCalendarController = defineComponent({
   name: "AtCalendarController",
diff --git a/src/components/calendar/index.ts b/src/components/calendar/index.ts
index 00f86ea3..f4bee1d1 100644
--- a/src/components/calendar/index.ts
+++ b/src/components/calendar/index.ts
@@ -1,5 +1,5 @@
 import { h, defineComponent, reactive, toRefs, watch, nextTick, mergeProps, PropType } from "vue"
-import dayjs, { Dayjs } from 'dayjs'
+import dayjs, { Dayjs } from 'dayjs/esm/index'
 
 import { View } from '@tarojs/components'
 import { CommonEvent } from '@tarojs/components/types/common'
diff --git a/src/components/grid/index.ts b/src/components/grid/index.ts
index 69a64a97..b108c779 100644
--- a/src/components/grid/index.ts
+++ b/src/components/grid/index.ts
@@ -1,5 +1,5 @@
 import { h, defineComponent, computed, mergeProps, PropType } from "vue"
-import _chunk from 'lodash/chunk'
+import _chunk from 'lodash-es/chunk'
 import { Image, View, Text } from '@tarojs/components'
 import { CommonEvent } from '@tarojs/components/types'
 import { AtGridProps, AtGridItem } from 'types/grid'
diff --git a/src/components/input-number/index.ts b/src/components/input-number/index.ts
index c9fd056a..0e2fa3d6 100644
--- a/src/components/input-number/index.ts
+++ b/src/components/input-number/index.ts
@@ -1,5 +1,5 @@
 import { h, defineComponent, computed, mergeProps, PropType } from "vue"
-import _toString from 'lodash/toString'
+import _toString from 'lodash-es/toString'
 import { pxTransform } from "../../utils/common"
 
 import { Input, Text, View } from '@tarojs/components'
diff --git a/src/components/swipe-action/index.ts b/src/components/swipe-action/index.ts
index 7f981cd7..d40a064d 100644
--- a/src/components/swipe-action/index.ts
+++ b/src/components/swipe-action/index.ts
@@ -1,6 +1,6 @@
 import { h, defineComponent, ref, reactive, watch, CSSProperties, computed, mergeProps, PropType } from 'vue'
-import _inRange from 'lodash/inRange'
-import _isEmpty from 'lodash/isEmpty'
+import _inRange from 'lodash-es/inRange'
+import _isEmpty from 'lodash-es/isEmpty'
 import { Text, View } from '@tarojs/components'
 import { CommonEvent, ITouchEvent } from '@tarojs/components/types/common'
 import {
diff --git a/types/calendar.d.ts b/types/calendar.d.ts
index c80b36ea..a9d7c45c 100644
--- a/types/calendar.d.ts
+++ b/types/calendar.d.ts
@@ -1,4 +1,4 @@
-import dayjs from 'dayjs'
+import dayjs from 'dayjs/esm/index'
 import { CommonEvent } from '@tarojs/components/types/common'
 import { Component } from '@vue/runtime-core'