chore: replace moment with dayjs in driver code

cypress-io · Nov 6, 2020 · e8a6341 · e8a6341
1 parent 1c2a175
commit e8a6341
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 12 deletions.
diff --git a/packages/driver/package.json b/packages/driver/package.json
@@ -41,6 +41,7 @@
     "compression": "1.7.4",
     "cors": "2.8.5",
     "cypress-multi-reporters": "1.4.0",
+    "dayjs": "1.9.5",
     "debug": "4.1.1",
     "error-stack-parser": "2.0.6",
     "errorhandler": "1.5.1",
@@ -58,7 +59,6 @@
     "minimatch": "3.0.4",
     "minimist": "1.2.5",
     "mocha": "7.0.1",
-    "moment": "2.27.0",
     "morgan": "1.9.1",
     "ordinal": "1.0.3",
     "react-15.6.1": "npm:react@15.6.1",

diff --git a/packages/driver/src/config/moment.js → packages/driver/src/config/dayjs.js b/packages/driver/src/config/moment.js → packages/driver/src/config/dayjs.js
@@ -1,6 +1,6 @@
-const moment = require('moment')
+const dayjs = require('dayjs')
 
-moment.updateLocale('en', {
+dayjs.updateLocale('en', {
   relativeTime: {
     future: 'in %s',
     past: '%s ago',

diff --git a/packages/driver/src/cy/keyboard.ts b/packages/driver/src/cy/keyboard.ts
@@ -1,7 +1,7 @@
 import Promise from 'bluebird'
 import Debug from 'debug'
 import _ from 'lodash'
-import moment from 'moment'
+import dayjs from 'dayjs'
 import $errUtils from '../cypress/error_utils'
 import { USKeyboard } from '../cypress/UsKeyboardLayout'
 import * as $dom from '../dom'
@@ -405,7 +405,7 @@ const validateTyping = (
     if (
       _.isString(chars) &&
       dateChars &&
-      moment(dateChars[0]).isValid()
+      dayjs(dateChars[0]).isValid()
     ) {
       skipCheckUntilIndex = _getEndIndex(chars, dateChars[0])
 

diff --git a/packages/driver/src/cypress.js b/packages/driver/src/cypress.js
@@ -2,7 +2,7 @@ const _ = require('lodash')
 const $ = require('jquery')
 const blobUtil = require('blob-util')
 const minimatch = require('minimatch')
-const moment = require('moment')
+const dayjs = require('dayjs')
 const Promise = require('bluebird')
 const sinon = require('sinon')
 const lolex = require('lolex')
@@ -628,7 +628,7 @@ $Cypress.prototype.Screenshot = $Screenshot
 $Cypress.prototype.SelectorPlayground = $SelectorPlayground
 $Cypress.prototype.utils = $utils
 $Cypress.prototype._ = _
-$Cypress.prototype.moment = moment
+$Cypress.prototype.dayjs = dayjs
 $Cypress.prototype.Blob = blobUtil
 $Cypress.prototype.Promise = Promise
 $Cypress.prototype.minimatch = minimatch

diff --git a/packages/driver/src/cypress/runner.js b/packages/driver/src/cypress/runner.js
@@ -1,7 +1,7 @@
 /* eslint-disable prefer-rest-params */
 /* globals Cypress */
 const _ = require('lodash')
-const moment = require('moment')
+const dayjs = require('dayjs')
 const Promise = require('bluebird')
 const Pending = require('mocha/lib/pending')
 
@@ -1119,7 +1119,7 @@ const create = (specWindow, mocha, Cypress, cy) => {
 
     run (fn) {
       if (_startTime == null) {
-        _startTime = moment().toJSON()
+        _startTime = dayjs().toJSON()
       }
 
       _runnerListeners(_runner, Cypress, _emissions, getTestById, getTest, setTest, getHookId, getTestFromHookOrFindTest)

diff --git a/packages/driver/src/cypress/utils.js b/packages/driver/src/cypress/utils.js
@@ -1,7 +1,7 @@
 const _ = require('lodash')
 const capitalize = require('underscore.string/capitalize')
 const methods = require('methods')
-const moment = require('moment')
+const dayjs = require('dayjs')
 
 const $jquery = require('../dom/jquery')
 const $Location = require('./location')
@@ -279,7 +279,7 @@ module.exports = {
   },
 
   addTwentyYears () {
-    return moment().add(20, 'years').unix()
+    return dayjs().add(20, 'years').unix()
   },
 
   locReload (forceReload, win) {

diff --git a/packages/driver/src/main.js b/packages/driver/src/main.js
@@ -3,6 +3,6 @@ require('setimmediate')
 require('./config/bluebird')
 require('./config/jquery')
 require('./config/lodash')
-require('./config/moment')
+require('./config/dayjs')
 
 module.exports = require('./cypress')
diff --git a/yarn.lock b/yarn.lock
@@ -11942,6 +11942,11 @@ daty@^1.0.7:
     diff-dates "^1.0.0"
     formatoid "^1.0.0"
 
+dayjs@1.9.5:
+  version "1.9.5"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.9.5.tgz#fd49994ebe71639d2ce9575e97186642dfce9808"
+  integrity sha512-WULIw7UpW/E0y6VywewpbXAMH3d5cZijEhoHLwM+OMVbk/NtchKS/W+57H/0P1rqU7gHrAArjiRLHCUhgMQl6w==
+
 dayjs@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.9.3.tgz#b7f94b22ad2a136a4ca02a01ab68ae893fe1a268"