diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json index 3091996034..a7cd5f6b84 100644 --- a/plugins/circleci/package.json +++ b/plugins/circleci/package.json @@ -41,7 +41,6 @@ "circleci-api": "^4.0.0", "dayjs": "^1.9.4", "lodash": "^4.17.15", - "moment": "^2.25.3", "react": "^16.13.1", "react-dom": "^16.13.1", "react-lazylog": "^4.5.2", diff --git a/plugins/circleci/src/components/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx b/plugins/circleci/src/components/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx index e446c002f6..dcc5e36e94 100644 --- a/plugins/circleci/src/components/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx +++ b/plugins/circleci/src/components/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx @@ -24,11 +24,10 @@ import { import { makeStyles } from '@material-ui/core/styles'; import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; import { BuildStepAction } from 'circleci-api'; -import moment from 'moment'; import React, { Suspense, useEffect, useState } from 'react'; +import { durationHumanized } from '../../../../util'; const LazyLog = React.lazy(() => import('react-lazylog/build/LazyLog')); -moment.relativeTimeThreshold('ss', 0); const useStyles = makeStyles({ accordionDetails: { padding: 0, @@ -66,11 +65,8 @@ export const ActionOutput = ({ }); }, [url]); - const timeElapsed = moment - .duration( - moment(action.end_time || moment()).diff(moment(action.start_time)), - ) - .humanize(); + const timeElapsed = durationHumanized(action.start_time, action.end_time); + return (