Skip to content

Convert root to array if root is a string #152 #153

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.

Sign up for GitHub

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

Merged
fatfisz merged 2 commits into from
Apr 8, 2017
+18 −24
Merged

Convert root to array if root is a string #152 #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
432077b
Convert root to array if root is a string #152
rohmanhm Apr 2, 2017
38c11c7
Replace root array to a string
rohmanhm Apr 6, 2017
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
3 changes: 3 additions & 0 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ function isRegExp(string) {
// So we need to offer a way to customize the cwd for the eslint plugin
export function manipulatePluginOptions(pluginOpts, cwd = process.cwd()) {
if (pluginOpts.root) {
if (typeof pluginOpts.root === 'string') {
pluginOpts.root = [pluginOpts.root]; // eslint-disable-line no-param-reassign
}
// eslint-disable-next-line no-param-reassign
pluginOpts.root = pluginOpts.root.reduce((resolvedDirs, dirPath) => {
if (glob.hasMagic(dirPath)) {
Expand Down
31 changes: 13 additions & 18 deletions test/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,18 @@ describe('module-resolver', () => {
babelrc: false,
plugins: [
[plugin, {
root: [
'./test/testproject/src',
],
root: './test/testproject/src',
}],
],
};

it('should convert root to array if root is a string', () => {
const code = 'var something = require();';
const result = transform(code, rootTransformerOpts);

expect(result.code).toBe('var something = require();');
});

it('should handle no arguments', () => {
const code = 'var something = require();';
const result = transform(code, rootTransformerOpts);
Expand Down Expand Up @@ -213,9 +218,7 @@ describe('module-resolver', () => {
babelrc: false,
plugins: [
[plugin, {
root: [
'./test/testproject/src/**',
],
root: './test/testproject/src/**',
}],
],
};
Expand Down Expand Up @@ -464,9 +467,7 @@ describe('module-resolver', () => {
babelrc: false,
plugins: [
[plugin, {
root: [
'./testproject/src',
],
root: './testproject/src',
alias: {
test: './testproject/test',
},
Expand Down Expand Up @@ -498,9 +499,7 @@ describe('module-resolver', () => {
babelrc: false,
plugins: [
[plugin, {
root: [
'./src',
],
root: './src',
alias: {
test: './test',
},
Expand Down Expand Up @@ -531,9 +530,7 @@ describe('module-resolver', () => {
babelrc: false,
plugins: [
[plugin, {
root: [
'./src',
],
root: './src',
cwd: 'babelrc',
}],
],
Expand Down Expand Up @@ -571,9 +568,7 @@ describe('module-resolver', () => {
babelrc: false,
plugins: [
[pluginWithMock, {
root: [
'.',
],
root: '.',
cwd: 'babelrc',
}],
],
Expand Down
4 changes: 1 addition & 3 deletions test/jest.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ describe('jest functions', () => {
babelrc: false,
plugins: [
[plugin, {
root: [
'./test/testproject/src',
],
root: './test/testproject/src',
alias: {
test: './test/testproject/test',
},
Expand Down
4 changes: 1 addition & 3 deletions test/system.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ describe('System.import', () => {
babelrc: false,
plugins: [
[plugin, {
root: [
'./test/testproject/src',
],
root: './test/testproject/src',
alias: {
test: './test/testproject/test',
},
Expand Down