Skip to content

Commit

Permalink
fix(cli): Stop mixing import & require()
Browse files Browse the repository at this point in the history
  • Loading branch information
eemeli committed Aug 20, 2019
1 parent f538772 commit ec8028b
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions packages/cli/src/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,18 @@
* ./bin/make-plural [lc] [n] [ord] // prints the (ORD ? ordinal : plural) category for N in locale LC
*/

import aliases from 'cldr-core/supplemental/aliases.json'
import pluralData from 'cldr-core/supplemental/plurals.json'
import ordinalData from 'cldr-core/supplemental/ordinals.json'
import { source } from 'common-tags'
import { identifier, property } from 'safe-identifier'
import MakePluralCompiler from 'make-plural-compiler'
import minimist from 'minimist'
import { identifier } from 'safe-identifier'
import * as common from './common'

var argv = require('minimist')(process.argv.slice(2), {
const MakePlural = MakePluralCompiler.load(pluralData, ordinalData)

var argv = minimist(process.argv.slice(2), {
default: {
locale: null,
value: null,
Expand All @@ -34,11 +41,6 @@ var argv = require('minimist')(process.argv.slice(2), {
boolean: ['categories', 'es6']
})

const aliases = require('cldr-core/supplemental/aliases.json')
const pluralData = require('cldr-core/supplemental/plurals.json')
const ordinalData = require('cldr-core/supplemental/ordinals.json')
const MakePlural = require('make-plural-compiler').load(pluralData, ordinalData)

function write(str, end) {
process.stdout.write(str)
if (end) process.stdout.write(end)
Expand Down Expand Up @@ -169,11 +171,11 @@ if (argv.locale) {
const cats = mpc.categories.cardinal
.concat(mpc.categories.ordinal)
.filter((v, i, self) => self.indexOf(v) === i)
console.log(cats.join(', '))
write(cats.join(', '))
} else if (argv.value !== null) {
console.log(mp(argv.value, truthy(argv.ordinal)))
write(mp(argv.value, truthy(argv.ordinal)))
} else {
console.log(mp.toString(argv.locale))
write(mp.toString(argv.locale))
}
} else {
if (argv.categories) {
Expand Down

0 comments on commit ec8028b

Please sign in to comment.