Skip to content

Commit

Permalink
chore: bump dependency-versions and node 10
Browse files Browse the repository at this point in the history
- NodeJS versions below 10 are not tested anymore
  • Loading branch information
nknapp committed Feb 14, 2019
1 parent 488d9d8 commit 629e43b
Show file tree
Hide file tree
Showing 11 changed files with 3,578 additions and 106 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
sudo: false
language: "node_js"
node_js:
- "6"
- "7"
- "10"
script:
- npm install
- npm run coverage
Expand Down
29 changes: 29 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Mocha Tests",
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
"args": [
"-u",
"tdd",
"--timeout",
"999999",
"--colors",
"${workspaceFolder}/test"
],
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "node",
"request": "launch",
"name": "Launch Program",
"program": "${workspaceFolder}/index.js"
}
]
}
6 changes: 3 additions & 3 deletions helpers-io.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function readFiles (directoryPath, options) {
}
var _options = options || {}
// Collect all files
var result = util.asPromise((cb) => glob(_options.glob || '**', {cwd: directoryPath, mark: true}, cb))
var result = util.asPromise((cb) => glob(_options.glob || '**', { cwd: directoryPath, mark: true }, cb))
.then(function (relativePaths) {
var set = relativePaths
// Ignore directories
Expand All @@ -59,8 +59,8 @@ function readFiles (directoryPath, options) {
return {
path: path.relative(process.cwd(), fullPath),
contents: _options.stream
? fs.createReadStream(fullPath, {encoding: _options.encoding})
: util.asPromise((cb) => fs.readFile(fullPath, {encoding: _options.encoding}, cb))
? fs.createReadStream(fullPath, { encoding: _options.encoding })
: util.asPromise((cb) => fs.readFile(fullPath, { encoding: _options.encoding }, cb))
}
}))
})
Expand Down
10 changes: 5 additions & 5 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ function Customize (config, parentConfig, engines) {
deep(_config).then(function (config) {
debugState('New configuration', config)
}, /* istanbul ignore next */
function (e) {
console.error('Error while debug-logging the built configuration ' + e.stack) // eslint-disable-line no-console
})
function (e) {
console.error('Error while debug-logging the built configuration ' + e.stack) // eslint-disable-line no-console
})
}

/**
Expand Down Expand Up @@ -245,7 +245,7 @@ function Customize (config, parentConfig, engines) {
_metadata.config.modules.push(customizeModule.package)
}

return customizeModule(new Customize({_metadata: _metadata}, _config, engines))
return customizeModule(new Customize({ _metadata: _metadata }, _config, engines))
}

/**
Expand Down Expand Up @@ -364,7 +364,7 @@ function customOverrider (a, b, propertyName) {
if (isPromiseAlike(a) || isPromiseAlike(b)) {
return Promise.all([a, b]).then(function ([_a, _b]) {
// Merge the promise results
return mergeWith({}, {x: _a}, {x: _b}, customOverrider).x
return mergeWith({}, { x: _a }, { x: _b }, customOverrider).x
})
}
// None of these options apply. Implicit "undefined" return value to invoke default overrider.
Expand Down
Loading

0 comments on commit 629e43b

Please sign in to comment.