Merge branch 'chalkedgoose/js-joda-upgrade' into 'main'

Upgrading js-joda

See merge request bloodyhealth/drip!406

components/Home.js

@@ -18,7 +18,7 @@ import {
 } from './helpers/home'
 
 import { Colors, Fonts, Sizes, Spacing } from '../styles'
-import { LocalDate } from 'js-joda'
+import { LocalDate } from '@js-joda/core'
 import { useTranslation } from 'react-i18next'
 
 const Home = ({ navigate, setDate }) => {

components/helpers/calendar.js

@@ -1,4 +1,4 @@
-import { LocalDate } from 'js-joda'
+import { LocalDate } from '@js-joda/core'
 import { verticalScale } from 'react-native-size-matters'
 
 import { Colors, Fonts, Sizes } from '../../styles'
@@ -65,7 +65,7 @@ const styles = {
   calendarToday: {
     fontFamily: 'Jost-Bold',
     fontWeight: 'bold',
-    color: Colors.purple
+    color: Colors.purple,
   },
 }
 

components/helpers/chart.js

@@ -1,4 +1,4 @@
-import { LocalDate } from 'js-joda'
+import { LocalDate } from '@js-joda/core'
 
 import { scaleObservable, unitObservable } from '../../local-storage'
 import { getCycleStatusForDay } from '../../lib/sympto-adapter'

components/helpers/cycle-day.js

@@ -1,4 +1,4 @@
-import { ChronoUnit, LocalDate, LocalTime } from 'js-joda'
+import { ChronoUnit, LocalDate, LocalTime } from '@js-joda/core'
 
 import {
   getPreviousTemperatureForDate,

components/helpers/format-date.js

@@ -1,4 +1,4 @@
-import { LocalDate } from 'js-joda'
+import { LocalDate } from '@js-joda/core'
 import moment from 'moment'
 
 import { general as labels } from '../../i18n/en/cycle-day'

components/helpers/home.js

@@ -1,4 +1,4 @@
-import { ChronoUnit, LocalDate } from 'js-joda'
+import { ChronoUnit, LocalDate } from '@js-joda/core'
 
 import { formatDateForShortText } from './format-date'
 

db/index.js

@@ -1,5 +1,5 @@
 import Realm from 'realm'
-import { LocalDate, ChronoUnit } from 'js-joda'
+import { LocalDate, ChronoUnit } from '@js-joda/core'
 import nodejs from 'nodejs-mobile-react-native'
 import fs from 'react-native-fs'
 import { restartApp } from './restart-app'

lib/cycle.js

@@ -1,4 +1,4 @@
-import * as joda from 'js-joda'
+import * as joda from '@js-joda/core'
 import { getCycleLengthStats } from './cycle-length'
 const LocalDate = joda.LocalDate
 const DAYS = joda.ChronoUnit.DAYS

lib/import-export/import-from-csv.js

@@ -7,7 +7,7 @@ import {
   updateCycleStartsForAllCycleDays,
 } from '../../db'
 import getColumnNamesForCsv from './get-csv-column-names'
-import { LocalDate } from 'js-joda'
+import { LocalDate } from '@js-joda/core'
 import labels from '../../i18n/en/settings'
 
 export default async function importCsv(csv, deleteFirst) {

package-lock.json

@@ -1277,6 +1277,11 @@
         "@types/yargs": "^13.0.0"
       }
     },
+    "@js-joda/core": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@js-joda/core/-/core-5.2.0.tgz",
+      "integrity": "sha512-0OriPYIaMLB3XiLQMe0BXKVIqeriTn3H7JMOzTsHEtt7Zqq+TetCu97KnAhU3ckiQZKBxfZshft+H1OC4D1lXw=="
+    },
     "@ptomasroos/react-native-multi-slider": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/@ptomasroos/react-native-multi-slider/-/react-native-multi-slider-2.2.2.tgz",
@@ -2439,7 +2444,7 @@
     "check-error": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
       "dev": true
     },
     "chownr": {
@@ -2620,7 +2625,7 @@
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
     },
     "component-emitter": {
       "version": "1.3.0",
@@ -4346,7 +4351,7 @@
     "get-func-name": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
       "dev": true
     },
     "get-intrinsic": {
@@ -5280,7 +5285,7 @@
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q=="
     },
     "is-weakref": {
       "version": "1.0.2",
@@ -10075,7 +10080,7 @@
     "strip-bom": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
       "requires": {
         "is-utf8": "^0.2.0"
       }
@@ -10962,7 +10967,7 @@
     "void-elements": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
-      "integrity": "sha1-YU9/v42AHwu18GYfWy9XhXUOTwk="
+      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="
     },
     "w3c-hr-time": {
       "version": "1.0.2",
@@ -11258,7 +11263,7 @@
     "xdate": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/xdate/-/xdate-0.8.2.tgz",
-      "integrity": "sha1-17AzwASF0CaVuvAET06s2j/JYaM="
+      "integrity": "sha512-sNBlLfOC8S3V0vLDEUianQOXcTsc9j4lfeKU/klHe0RjHAYn0CXsSttumTot8dzalboV8gZbH38B+WcCIBjhFQ=="
     },
     "xml-name-validator": {
       "version": "3.0.0",

package.json

@@ -29,13 +29,13 @@
     "prepare": "husky install"
   },
   "dependencies": {
+    "@js-joda/core": "^5.2.0",
     "@ptomasroos/react-native-multi-slider": "^2.2.0",
     "@react-native-community/datetimepicker": "^6.2.2",
     "@react-native-community/push-notification-ios": "^1.8.0",
     "csvtojson": "^2.0.8",
     "i18next": "^21.8.14",
     "isobject": "^3.0.1",
-    "js-joda": "^1.8.2",
     "moment": "^2.29.4",
     "nodejs-mobile-react-native": "^0.6.2",
     "object-path": "^0.11.4",

slices/date.js

@@ -1,5 +1,5 @@
 import { createSlice } from 'redux-starter-kit'
-import { LocalDate } from 'js-joda'
+import { LocalDate } from '@js-joda/core'
 
 const dateSlice = createSlice({
   slice: 'date',