Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: don't swallow require error #265

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions lib/config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path')
const Joi = require('joi')
const micromatch = require('micromatch')
const {makeRe} = require('micromatch')
const union = require('lodash.union')
const merge = require('lodash.merge')
const {accessSync} = require('fs')
Expand Down Expand Up @@ -214,7 +214,7 @@ module.exports = class Config {
this.resolveLoader = merge(opts.resolveLoader, this.resolveLoader)
}

const reIgnores = opts.ignore.map(mmToRe)
const reIgnores = opts.ignore.map(makeRe)
const spikeLoaders = [
{
exclude: reIgnores,
Expand Down Expand Up @@ -289,15 +289,15 @@ module.exports = class Config {
function loadFile (f) {
try {
accessSync(f)
return require(f)
} catch (err) {
if (err.code !== 'ENOENT') { throw new Error(err) }
return {}
throw err
}
}

function mmToRe (mm) {
return micromatch.makeRe(mm)
try {
return require(f)
} catch (err) {
throw err
}
}

function removeKeys (obj, keys) {
Expand Down