Skip to content
This repository has been archived by the owner on Jun 4, 2024. It is now read-only.

Commit

Permalink
prettycron -> cronstrue
Browse files Browse the repository at this point in the history
  • Loading branch information
mfix22 committed Jul 12, 2018
1 parent 842ec07 commit 84c606f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 21 deletions.
4 changes: 2 additions & 2 deletions app/components/Settings/scheduler/scheduler.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {contains} from 'ramda';
import ReactDataGrid from 'react-data-grid';
import ms from 'ms';
import matchSorter from 'match-sorter';
import * as prettyCron from 'prettycron';
import cronstrue from 'cronstrue'

import CreateModal from './create-modal.jsx';
import PreviewModal from './preview-modal.jsx';
Expand Down Expand Up @@ -66,7 +66,7 @@ class IntervalFormatter extends React.Component {
}}
>
{run.cronInterval
? prettyCron.toString(run.cronInterval)
? cronstrue.toString(run.cronInterval)
: `Runs every ${ms(run.refreshInterval * 1000, {
long: true
})}`
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@
"nock": "^9.1.5",
"node-fetch": "^1.7.2",
"node-impala": "^2.0.4",
"prettycron": "^0.10.0",
"prop-types": "^15.6.0",
"query-string": "^5.0.1",
"ramda": "^0.21.0",
Expand Down Expand Up @@ -237,6 +236,7 @@
},
"dependencies": {
"alasql": "^0.4.5",
"cronstrue": "^1.31.0",
"csv-parse": "^2.0.0",
"dtrace-provider": "^0.8.6",
"font-awesome": "^4.6.1",
Expand Down
3 changes: 0 additions & 3 deletions webpack.config.web.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ const config = {

plugins: [
...baseConfig.plugins,
// This is to get `prettycron` to work in 'browser'. See this issue:
// https://github.com/bunkat/later/issues/155 for details.
new webpack.DefinePlugin({ 'process.env.LATER_COV': false }),
new webpack.DefinePlugin({
__DEV__: false,
'process.env.NODE_ENV': JSON.stringify('production')
Expand Down
19 changes: 4 additions & 15 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2579,6 +2579,10 @@ create-react-class@^15.5.1:
loose-envify "^1.3.1"
object-assign "^4.1.1"

cronstrue@^1.31.0:
version "1.31.0"
resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-1.31.0.tgz#fd3db94b52c296550a5f53efe04691a1380e294d"

cross-env@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.1.tgz#b6d8ab97f304c0f71dae7277b75fe424c08dfa74"
Expand Down Expand Up @@ -6268,10 +6272,6 @@ klaw@^1.0.0:
optionalDependencies:
graceful-fs "^4.1.9"

later@^1.1.6:
version "1.2.0"
resolved "https://registry.yarnpkg.com/later/-/later-1.2.0.tgz#f2cf6c4dd7956dd2f520adf0329836e9876bad0f"

latest-version@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
Expand Down Expand Up @@ -6805,10 +6805,6 @@ moment-timezone@^0.5.4:
version "2.18.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"

moment@^2.8.4:
version "2.22.2"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"

monotone-convex-hull-2d@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/monotone-convex-hull-2d/-/monotone-convex-hull-2d-1.0.1.tgz#47f5daeadf3c4afd37764baa1aa8787a40eee08c"
Expand Down Expand Up @@ -8144,13 +8140,6 @@ pretty-format@^22.1.0:
ansi-regex "^3.0.0"
ansi-styles "^3.2.0"

prettycron@^0.10.0:
version "0.10.0"
resolved "https://registry.yarnpkg.com/prettycron/-/prettycron-0.10.0.tgz#10af0dfa20bbd9f6596d7fb5bb8b8546cac527bb"
dependencies:
later "^1.1.6"
moment "^2.8.4"

printj@~1.1.0, printj@~1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.1.tgz#3749360215888d460a35b683ae13dcc02c620b47"
Expand Down

0 comments on commit 84c606f

Please sign in to comment.