balena-settings-client
Advanced tools
Comparing version 4.0.1 to 4.0.2-update-dependencies-17371a1773c43769c0428918e3a68806c18c3ad3
@@ -46,5 +46,5 @@ "use strict"; | ||
*/ | ||
projectLegacy: path_1.join(process.cwd(), 'resinrc.yml') | ||
} | ||
projectLegacy: path_1.join(process.cwd(), 'resinrc.yml'), | ||
}, | ||
}; | ||
//# sourceMappingURL=config.js.map |
@@ -129,4 +129,4 @@ "use strict"; | ||
*/ | ||
apiKeyVariable: 'BALENA_API_KEY' | ||
apiKeyVariable: 'BALENA_API_KEY', | ||
}; | ||
//# sourceMappingURL=defaults.js.map |
@@ -7,2 +7,6 @@ # Change Log | ||
## 4.0.2 - 2019-09-09 | ||
* Dependencies: Update dependencies and build rules [Heds Simons] | ||
## v4.0.1 - 2018-10-24 | ||
@@ -9,0 +13,0 @@ |
@@ -55,4 +55,4 @@ /* | ||
*/ | ||
projectLegacy: joinPath(process.cwd(), 'resinrc.yml') | ||
} | ||
projectLegacy: joinPath(process.cwd(), 'resinrc.yml'), | ||
}, | ||
}; |
@@ -148,3 +148,3 @@ /* | ||
*/ | ||
apiKeyVariable: 'BALENA_API_KEY' | ||
apiKeyVariable: 'BALENA_API_KEY', | ||
}; |
@@ -41,3 +41,3 @@ /* | ||
.replace(/^(BALENARC|RESINRC)_/i, '') | ||
.replace(/(^|_)RESIN(_|$)/, '$1BALENA$2') | ||
.replace(/(^|_)RESIN(_|$)/, '$1BALENA$2'), | ||
); | ||
@@ -44,0 +44,0 @@ }; |
@@ -96,13 +96,12 @@ /* | ||
const getSettings = _.once( | ||
(): { [k: string]: string | undefined } => | ||
utils.mergeObjects( | ||
{}, | ||
defaults, | ||
replaceResinKeys(readConfigFile(config.paths.userLegacy)), | ||
readConfigFile(config.paths.user), | ||
replaceResinKeys(readConfigFile(config.paths.projectLegacy)), | ||
readConfigFile(config.paths.project), | ||
environment.parse(process.env) | ||
) | ||
const getSettings = _.once((): { [k: string]: string | undefined } => | ||
utils.mergeObjects( | ||
{}, | ||
defaults, | ||
replaceResinKeys(readConfigFile(config.paths.userLegacy)), | ||
readConfigFile(config.paths.user), | ||
replaceResinKeys(readConfigFile(config.paths.projectLegacy)), | ||
readConfigFile(config.paths.project), | ||
environment.parse(process.env), | ||
), | ||
); | ||
@@ -109,0 +108,0 @@ |
@@ -80,3 +80,3 @@ /* | ||
settings: object | undefined | null = {}, | ||
property: string | ||
property: string, | ||
): T => { | ||
@@ -83,0 +83,0 @@ let value = _.get(settings, property); |
{ | ||
"name": "balena-settings-client", | ||
"version": "4.0.1", | ||
"version": "4.0.2-update-dependencies-17371a1773c43769c0428918e3a68806c18c3ad3", | ||
"description": "Balena client application shared settings", | ||
@@ -23,3 +23,3 @@ "main": "build/settings.js", | ||
"test:e2e": "ts-node tests/e2e/test.ts", | ||
"lint": "tslint lib/**/*.ts", | ||
"lint": "resin-lint --typescript lib/ && tsc --noEmit", | ||
"test": "npm run build && npm run lint && npm run test:unit && npm run test:e2e", | ||
@@ -29,3 +29,3 @@ "build": "rimraf ./build && npm run prettify && tsc && npm run readme", | ||
"prepublishOnly": "npm test", | ||
"prettify": "prettier --use-tabs --single-quote --write \"lib/*.ts\" \"tests/**/*.ts\"", | ||
"prettify": "prettier --config ./node_modules/resin-lint/config/.prettierrc --write \"lib/**/*.ts\" \"tests/**/*.ts\"", | ||
"readme": "jsdoc2md --template doc/README.hbs build/settings.js > README.md" | ||
@@ -44,11 +44,13 @@ }, | ||
"common-tags": "^1.4.0", | ||
"jsdoc-to-markdown": "^3.0.0", | ||
"mocha": "^3.5.0", | ||
"husky": "^3.0.5", | ||
"jsdoc-to-markdown": "^5.0.1", | ||
"mocha": "^6.2.0", | ||
"mochainon": "^2.0.0", | ||
"prettier": "^1.5.3", | ||
"require-npm4-to-publish": "^1.0.0", | ||
"resin-lint": "^3.1.0", | ||
"rimraf": "^2.6.1", | ||
"ts-node": "^3.3.0", | ||
"ts-node": "^8.3.0", | ||
"tslint": "^5.5.0", | ||
"typescript": "2.4.2", | ||
"typescript": "^3.6.2", | ||
"wary": "^1.1.0" | ||
@@ -60,8 +62,8 @@ }, | ||
"@types/js-yaml": "3.11.1", | ||
"@types/lodash": "4.14.108", | ||
"@types/lodash": "^4.14.138", | ||
"hidepath": "^1.0.0", | ||
"home-or-tmp": "^2.0.0", | ||
"js-yaml": "^3.4.0", | ||
"lodash": "^4.15.0" | ||
"lodash": "^4.17.15" | ||
} | ||
} |
@@ -129,3 +129,3 @@ import * as m from 'mochainon'; | ||
defaults, | ||
'projectsDirectory' | ||
'projectsDirectory', | ||
); | ||
@@ -157,3 +157,3 @@ m.chai.expect(setting).to.be.equal(path.resolve(setting)); | ||
defaults, | ||
'tokenRefreshInterval' | ||
'tokenRefreshInterval', | ||
); | ||
@@ -166,3 +166,3 @@ m.chai.expect(setting).to.be.a('number'); | ||
defaults, | ||
'tokenRefreshInterval' | ||
'tokenRefreshInterval', | ||
); | ||
@@ -175,3 +175,3 @@ m.chai.expect(setting).to.be.greaterThan(0); | ||
defaults, | ||
'tokenRefreshInterval' | ||
'tokenRefreshInterval', | ||
); | ||
@@ -178,0 +178,0 @@ m.chai.expect(setting % 1).to.equal(0); |
@@ -14,3 +14,3 @@ import * as Promise from 'bluebird'; | ||
childProcess.exec, | ||
{ multiArgs: true } | ||
{ multiArgs: true }, | ||
); | ||
@@ -28,3 +28,3 @@ | ||
return execAsync(`ts-node ${script} ${setting}`, { encoding: 'utf8' }).spread( | ||
handleExecResult | ||
handleExecResult, | ||
); | ||
@@ -48,3 +48,3 @@ }; | ||
resinUrl: resin.io | ||
` | ||
`, | ||
); | ||
@@ -58,3 +58,3 @@ return Promise.props({ | ||
registry2Url: getSetting('registry2Url'), | ||
proxyUrl: getSetting('proxyUrl') | ||
proxyUrl: getSetting('proxyUrl'), | ||
}).then(settings => { | ||
@@ -71,3 +71,3 @@ m.chai.expect(settings.balenaUrl).to.equal('resin.io'); | ||
}); | ||
} | ||
}, | ||
); | ||
@@ -83,3 +83,3 @@ | ||
balenaUrl: balena-staging.com | ||
` | ||
`, | ||
); | ||
@@ -93,3 +93,3 @@ return Promise.props({ | ||
registry2Url: getSetting('registry2Url'), | ||
proxyUrl: getSetting('proxyUrl') | ||
proxyUrl: getSetting('proxyUrl'), | ||
}).then(settings => { | ||
@@ -110,3 +110,3 @@ m.chai.expect(settings.balenaUrl).to.equal('balena-staging.com'); | ||
}); | ||
} | ||
}, | ||
); | ||
@@ -119,3 +119,3 @@ | ||
balenaUrl: balena-staging.com/ | ||
` | ||
`, | ||
); | ||
@@ -126,3 +126,3 @@ fs.writeFileSync( | ||
balenaUrl: balena.custom.com/ | ||
` | ||
`, | ||
); | ||
@@ -136,3 +136,3 @@ return Promise.props({ | ||
registry2Url: getSetting('registry2Url'), | ||
proxyUrl: getSetting('proxyUrl') | ||
proxyUrl: getSetting('proxyUrl'), | ||
}).then(settings => { | ||
@@ -161,3 +161,3 @@ m.chai.expect(settings.balenaUrl).to.equal('balena.custom.com/'); | ||
balenaUrl: balena-staging.com/ | ||
` | ||
`, | ||
); | ||
@@ -168,3 +168,3 @@ fs.writeFileSync( | ||
balenaUrl: balena.custom.com/ | ||
` | ||
`, | ||
); | ||
@@ -176,3 +176,3 @@ process.env.BALENARC_BALENA_URL = 'balenadev.custom.com/'; | ||
.to.eventually.equal('balenadev.custom.com/'); | ||
} | ||
}, | ||
); | ||
@@ -200,3 +200,3 @@ | ||
tokenRefreshInterval: 3600000, | ||
apiKeyVariable: 'BALENA_API_KEY' | ||
apiKeyVariable: 'BALENA_API_KEY', | ||
}); | ||
@@ -210,3 +210,3 @@ }); | ||
balenaUrl=balena.custom.com/ | ||
` | ||
`, | ||
); | ||
@@ -213,0 +213,0 @@ |
@@ -99,7 +99,7 @@ import * as m from 'mochainon'; | ||
const result = environment.parse({ | ||
BALENARC_HELLO_WORLD: 'foo' | ||
BALENARC_HELLO_WORLD: 'foo', | ||
}); | ||
m.chai.expect(result).to.deep.equal({ | ||
helloWorld: 'foo' | ||
helloWorld: 'foo', | ||
}); | ||
@@ -110,7 +110,7 @@ }); | ||
const result = environment.parse({ | ||
balenarc_hello_world: 'foo' | ||
balenarc_hello_world: 'foo', | ||
}); | ||
m.chai.expect(result).to.deep.equal({ | ||
helloWorld: 'foo' | ||
helloWorld: 'foo', | ||
}); | ||
@@ -122,3 +122,3 @@ }); | ||
BALENARC_HELLO_WORLD: 'foo', | ||
BALENARC_BAR: 'baz' | ||
BALENARC_BAR: 'baz', | ||
}); | ||
@@ -128,3 +128,3 @@ | ||
helloWorld: 'foo', | ||
bar: 'baz' | ||
bar: 'baz', | ||
}); | ||
@@ -139,3 +139,3 @@ }); | ||
EDITOR: 'vim', | ||
SHELL: 'zsh' | ||
SHELL: 'zsh', | ||
}); | ||
@@ -150,7 +150,7 @@ | ||
EDITOR: 'vim', | ||
SHELL: 'zsh' | ||
SHELL: 'zsh', | ||
}); | ||
m.chai.expect(result).to.deep.equal({ | ||
hello: 'world' | ||
hello: 'world', | ||
}); | ||
@@ -157,0 +157,0 @@ }); |
@@ -9,3 +9,3 @@ import * as m from 'mochainon'; | ||
hello: 'world', | ||
foo: 'bar' | ||
foo: 'bar', | ||
}; | ||
@@ -15,3 +15,3 @@ | ||
hello: 'world!', | ||
foo: 'baz' | ||
foo: 'baz', | ||
}; | ||
@@ -24,3 +24,3 @@ | ||
hello: 'world', | ||
foo: 'baz' | ||
foo: 'baz', | ||
}); | ||
@@ -33,3 +33,3 @@ }); | ||
return 'first'; | ||
} | ||
}, | ||
}; | ||
@@ -40,3 +40,3 @@ | ||
return 'second'; | ||
} | ||
}, | ||
}; | ||
@@ -47,3 +47,3 @@ | ||
return 'third'; | ||
} | ||
}, | ||
}; | ||
@@ -88,3 +88,3 @@ | ||
{ foo: { bar: { baz: 'qux' } } }, | ||
'foo.bar.baz' | ||
'foo.bar.baz', | ||
); | ||
@@ -100,5 +100,5 @@ | ||
return 'bar'; | ||
} | ||
}, | ||
}, | ||
'foo' | ||
'foo', | ||
); | ||
@@ -115,5 +115,5 @@ | ||
return `${this.greeting} from balena!`; | ||
} | ||
}, | ||
}, | ||
'foo' | ||
'foo', | ||
); | ||
@@ -120,0 +120,0 @@ |
@@ -21,3 +21,3 @@ import { stripIndent } from 'common-tags'; | ||
hello: 'world', | ||
foo: 'bar' | ||
foo: 'bar', | ||
}); | ||
@@ -32,3 +32,3 @@ }); | ||
m.chai.expect(result).to.deep.equal({ | ||
phone: 12345 | ||
phone: 12345, | ||
}); | ||
@@ -46,3 +46,3 @@ }); | ||
m.chai.expect(result).to.deep.equal({ | ||
list: ['foo', 'bar', 'baz'] | ||
list: ['foo', 'bar', 'baz'], | ||
}); | ||
@@ -49,0 +49,0 @@ }); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
No v1
QualityPackage is not semver >=1. This means it is not stable and does not support ^ ranges.
Found 1 instance in 1 package
77847
20
1707
1
+ Added@types/lodash@4.17.16(transitive)
- Removed@types/lodash@4.14.108(transitive)
Updated@types/lodash@^4.14.138
Updatedlodash@^4.17.15