Commit a5e658a

committed

fix: ensure node4 compat

1 parent 94437e8 commit a5e658aCopy full SHA for a5e658a

File tree

+18

-14

lines changed

+18

-14

lines changed

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ const help = require('./help');`
`16`	`16`	`*/`
`17`	`17`	`const rules = {`
`18`	`18`	`fromStdin: (input, flags) => input.length === 0 &&`
`19`		`- flags.from === null &&`
`20`		`- flags.to === null &&`
	`19`	`+ typeof flags.from !== 'string' &&`
	`20`	`+ typeof flags.to !== 'string' &&`
`21`	`21`	`!flags.edit`
`22`	`22`	`};`
`23`	`23`
`@@ -62,7 +62,8 @@ const cli = meow({`
`62`	`62`	`const load = seed => core.load(seed);`
`63`	`63`
`64`	`64`	`function main(options) {`
`65`		`- const {input: raw, flags} = options;`
	`65`	`+ const raw = options.input;`
	`66`	`+ const flags = options.flags;`
`66`	`67`	`const fromStdin = rules.fromStdin(raw, flags);`
`67`	`68`
`68`	`69`	`const range = pick(flags, 'edit', 'from', 'to');`
`@@ -93,8 +94,10 @@ function main(options) {`
`93`	`94`	`));`
`94`	`95`	`}`
`95`	`96`
`96`		`-function getSeed({extends: e}) {`
`97`		`- return e ? {extends: e.split(', ')} : {};`
	`97`	`+function getSeed(seed) {`
	`98`	`+ const e = Array.isArray(seed.extends) ? seed.extends : [seed.extends];`
	`99`	`+ const n = e.filter(i => typeof i === 'string');`
	`100`	`+ return n.length > 0 ? {extends: n} : {};`
`98`	`101`	`}`
`99`	`102`
`100`	`103`	`// Start the engine`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`module.exports = configuration => {`
`2`	`2`	`const lines = Object.entries(configuration.description)`
`3`	`3`	`.map(entry => {`
`4`		`- const [name, desc] = entry;`
	`4`	`+ const name = entry[0];`
	`5`	`+ const desc = entry[1];`
`5`	`6`	`const alias = Object.entries(configuration.alias)`
`6`	`7`	`.find(entry => entry[1] === name)`
`7`	`8`	`.map(entry => entry[0])[0];`
`@@ -11,14 +12,16 @@ module.exports = configuration => {`
`11`	`12`
`12`	`13`	`const longest = lines`
`13`	`14`	`.map(line => {`
`14`		`- const [flags] = line;`
	`15`	`+ const flags = line[0];`
`15`	`16`	`return flags.reduce((sum, flag) => sum + flag.length, 0);`
`16`	`17`	`})`
`17`	`18`	`.sort(Number)[0];`
`18`	`19`
`19`	`20`	`return lines`
`20`	`21`	`.map(line => {`
`21`		`- const [flags, desc, defaults] = line;`
	`22`	`+ const flags = line[0];`
	`23`	`+ const desc = line[1];`
	`24`	`+ const defaults = line[2];`
`22`	`25`	const fs = flags.map(flag => flag.length > 1 ? `--${flag}` : `-${flag}`);
`23`	`26`	const ds = defaults ? `, defaults to: ${defaults}` : '';
`24`	`27`	`const length = flags.reduce((sum, flag) => sum + flag.length, 0);`

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import path from 'path';`
`2`	`2`	`import from from 'resolve-from';`
`3`		`-import {merge, omit, values} from 'lodash';`
	`3`	`+import {merge, omit} from 'lodash';`
`4`	`4`
`5`	`5`	`// Resolve extend configs`
`6`	`6`	`export default function resolveExtends(config = {}, context = {}) {`
`@@ -18,8 +18,7 @@ export default function resolveExtends(config = {}, context = {}) {`
`18`	`18`
`19`	`19`	`// (any, string, string, Function) => any[];`
`20`	`20`	`function loadExtends(config = {}, context = {}) {`
`21`		`- const toExtend = values(config.extends \|\| []);`
`22`		`- return toExtend.reduce((configs, raw) => {`
	`21`	`+ return (config.extends \|\| []).reduce((configs, raw) => {`
`23`	`22`	`const id = getId(raw, context.prefix);`
`24`	`23`	`const resolve = context.resolve \|\| resolveId;`
`25`	`24`	`const resolved = resolve(id, context);`
`@@ -46,7 +45,6 @@ function getId(raw = '', prefix = '') {`
`46`	`45`	`return (scoped \|\| relative) ? raw : [prefix, raw].filter(String).join('-');`
`47`	`46`	`}`
`48`	`47`
`49`		`-function resolveId(id, context) {`
`50`		`- const cwd = context.cwd \|\| process.cwd();`
`51`		`- return from(cwd, id);`
	`48`	`+function resolveId(id, context = {}) {`
	`49`	`+ return from(context.cwd \|\| process.cwd(), id);`
`52`	`50`	`}`

Comments

(0)