Skip to content

Commit

Permalink
fix: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
gajus committed May 18, 2020
1 parent 017b834 commit 76c6d4b
Show file tree
Hide file tree
Showing 24 changed files with 110 additions and 93 deletions.
9 changes: 5 additions & 4 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"plugins": [
"transform-es2015-modules-commonjs",
"transform-export-extensions",
"transform-es2015-destructuring",
"transform-es2015-parameters"
"@babel/plugin-transform-modules-commonjs",
"@babel/plugin-proposal-export-default-from",
"@babel/plugin-proposal-export-namespace-from",
"@babel/plugin-transform-destructuring",
"@babel/plugin-transform-parameters"
]
}
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
./test/fixtures
test/fixtures
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ node_js:
- 7
- 6
- 5
script:
- npm run lint
- npm run test
- npm run build
after_success:
- semantic-release pre && npm publish && semantic-release post
- semantic-release
notifications:
email: false
sudo: false
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2016, Gajus Kuizinas (http://gajus.com/)
Copyright (c) 2020, Gajus Kuizinas (http://gajus.com/)
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
51 changes: 28 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,28 @@
},
"bin": "./dist/bin/create-index.js",
"dependencies": {
"chalk": "^1.1.3",
"glob": "^7.1.1",
"lodash": "^4.16.6",
"moment": "^2.15.2",
"yargs": "^6.3.0"
"chalk": "^4.0.0",
"glob": "^7.1.6",
"lodash": "^4.17.15",
"moment": "^2.25.3",
"yargs": "^15.3.1"
},
"description": "Creates ES6 ./index.js file in target directories that imports and exports all sibling files and directories.",
"devDependencies": {
"babel-cli": "^6.18.0",
"babel-plugin-transform-es2015-destructuring": "^6.18.0",
"babel-plugin-transform-es2015-modules-commonjs": "^6.18.0",
"babel-plugin-transform-es2015-parameters": "^6.18.0",
"babel-plugin-transform-export-extensions": "^6.8.0",
"babel-register": "^6.18.0",
"chai": "^3.5.0",
"cross-env": "^3.1.3",
"eslint": "^3.9.1",
"eslint-config-canonical": "^4.0.0",
"husky": "^0.11.9",
"mocha": "^3.1.2",
"semantic-release": "^6.3.2"
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-export-default-from": "^7.0.0",
"@babel/plugin-proposal-export-namespace-from": "^7.0.0",
"@babel/plugin-transform-destructuring": "^7.0.0",
"@babel/plugin-transform-modules-commonjs": "^7.0.0",
"@babel/plugin-transform-parameters": "^7.0.0",
"@babel/register": "^7.0.0",
"chai": "^4.2.0",
"eslint": "^7.0.0",
"eslint-config-canonical": "^20.0.4",
"husky": "^4.2.5",
"mocha": "^7.1.2",
"semantic-release": "^17.0.7"
},
"engines": {
"node": ">=5"
Expand All @@ -43,12 +44,16 @@
"type": "git",
"url": "https://github.com/gajus/create-index"
},
"husky": {
"hooks": {
"pre-commit": "npm run test"
}
},
"scripts": {
"build": "cross-env NODE_ENV=production babel --source-maps --copy-files ./src --out-dir ./dist",
"build": "rm -fr ./dist && NODE_ENV=production babel --source-maps --copy-files ./src --out-dir ./dist",
"create-index": "node ./dist/bin/create-index ./src/utilities",
"lint": "cross-env NODE_ENV=development eslint ./src ./tests",
"precommit": "npm run test",
"test": "npm run build && npm run lint && cross-env NODE_ENV=development mocha --compilers js:babel-register"
"lint": "NODE_ENV=development eslint ./src ./test",
"test": "NODE_ENV=development mocha --require @babel/register"
},
"version": "1.1.0"
"version": "0.0.0-development"
}
42 changes: 22 additions & 20 deletions src/bin/create-index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#!/usr/bin/env node

/* eslint-disable filenames/match-regex */

import yargs from 'yargs';
import {
writeIndexCli
writeIndexCli,
} from '../utilities';

const argv = yargs
Expand All @@ -12,66 +14,66 @@ const argv = yargs
alias: 'r',
default: false,
description: 'Create/update index files recursively. Halts on any unsafe "index.js" files.',
type: 'boolean'
}
type: 'boolean',
},
})
.options({
ignoreUnsafe: {
alias: 'i',
default: false,
description: 'Ignores unsafe "index.js" files instead of halting.',
type: 'boolean'
}
type: 'boolean',
},
})
.options({
ignoreDirectories: {
alias: 'd',
default: false,
description: 'Ignores importing directories into the index file, even if they have a safe "index.js".',
type: 'boolean'
}
type: 'boolean',
},
})
.options({
update: {
alias: 'u',
default: false,
description: 'Updates only previously created index files (recursively).',
type: 'boolean'
}
type: 'boolean',
},
})
.options({
banner: {
description: 'Add a custom banner at the top of the index file',
type: 'string'
}
type: 'string',
},
})
.options({
extensions: {
alias: 'x',
default: ['js'],
description: 'Allows some extensions to be parsed as valid source. First extension will always be preferred to homonyms with another allowed extension.',
type: 'array'
}
type: 'array',
},
})
.options({
outputFile: {
alias: 'o',
default: 'index.js',
description: 'Output file',
type: 'string'
}
type: 'string',
},
})
.example(
'create-index ./src ./src/utilities',
'Creates or updates an existing create-index index file in the target (./src, ./src/utilities) directories.'
'Creates or updates an existing create-index index file in the target (./src, ./src/utilities) directories.',
)
.example(
'create-index --update ./src ./tests',
'Finds all create-index index files in the target directories and descending directories. Updates found index files.'
'Finds all create-index index files in the target directories and descending directories. Updates found index files.',
)
.example(
'create-index ./src --extensions js jsx',
'Creates or updates an existing create-index index file in the target (./src) directory for both .js and .jsx extensions.'
'Creates or updates an existing create-index index file in the target (./src) directory for both .js and .jsx extensions.',
)
.argv;

Expand All @@ -80,7 +82,7 @@ writeIndexCli(argv._, {
extensions: argv.extensions,
ignoreDirectories: argv.ignoreDirectories,
ignoreUnsafe: argv.ignoreUnsafe,
recursive: argv.recursive,
outputFile: argv.outputFile,
updateIndex: argv.update
recursive: argv.recursive,
updateIndex: argv.update,
});
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export {
findIndexFiles,
writeIndex
writeIndex,
} from './utilities';
1 change: 0 additions & 1 deletion src/utilities/constants.js
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
// eslint-disable-next-line
export const CREATE_INDEX_PATTERN = /(?:^|[\n\r]+)\/\/ @create-index\s?({.*})?[\n\r]+/;
5 changes: 3 additions & 2 deletions src/utilities/findIndexFiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import glob from 'glob';
import validateTargetDirectory from './validateTargetDirectory';

export default (directoryPath, options = {}) => {
let fileName, targetDirectories;
let fileName;
let targetDirectories;

fileName = options.fileName || 'index.js';
fileName = './**/' + fileName;
Expand All @@ -13,8 +14,8 @@ export default (directoryPath, options = {}) => {

targetDirectories = _.filter(targetDirectories, (targetDirectoryPath) => {
return validateTargetDirectory(path.dirname(targetDirectoryPath), {
outputFile: options.fileName,
silent: options.silent,
outputFile: options.fileName
});
});

Expand Down
2 changes: 1 addition & 1 deletion src/utilities/hasIndex.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default (directoryPath, options = {}) => {
fs.statSync(indexPath);

return true;
} catch (error) {
} catch {
return false;
}
};
2 changes: 1 addition & 1 deletion src/utilities/log.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ import chalk from 'chalk';
import moment from 'moment';

export default (...append) => {
// eslint-disable-next-line
// eslint-disable-next-line no-console
console.log(chalk.dim('[' + moment().format('HH:mm:ss') + ']'), ...append);
};
10 changes: 5 additions & 5 deletions src/utilities/readDirectory.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const hasMultipleExtensions = (fileName) => {
};

const isSafeName = (fileName) => {
return /^[a-z_][a-z0-9._]*$/i.test(fileName);
return /^[_a-z][\w.]*$/i.test(fileName);
};

const stripExtension = (fileName) => {
Expand All @@ -27,7 +27,7 @@ const stripExtension = (fileName) => {
return fileName;
}

return fileName.substr(0, pos);
return fileName.slice(0, Math.max(0, pos));
};

const removeDuplicates = (files, preferredExtension) => {
Expand Down Expand Up @@ -79,7 +79,7 @@ export default (directoryPath, options = {}) => {
const {
extensions = ['js'],
config = {},
ignoreDirectories = false
ignoreDirectories = false,
} = options;

let children;
Expand All @@ -106,8 +106,8 @@ export default (directoryPath, options = {}) => {
return false;
}

if (!isDirectory && !extensions.some((ext) => {
return _.endsWith(fileName, '.' + ext);
if (!isDirectory && !extensions.some((extension) => {
return _.endsWith(fileName, '.' + extension);
})) {
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions src/utilities/readIndexConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ export default (directoryPath, options = {}) => {

try {
config = JSON.parse(configLine);
} catch (error) {
} catch {
throw new Error(
'"' + indexPath + '" contains invalid configuration object.\n' +
'Configuration object must be a valid JSON.'
'Configuration object must be a valid JSON.',
);
}

Expand Down
4 changes: 2 additions & 2 deletions src/utilities/validateTargetDirectory.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default (targetDirectory, options = {}) => {

try {
stats = fs.statSync(targetDirectory);
} catch (error) {
} catch {
if (silent) {
return false;
} else {
Expand All @@ -28,7 +28,7 @@ export default (targetDirectory, options = {}) => {

try {
fs.statSync(indexFilePath);
} catch (error) {
} catch {
return true;
}

Expand Down
3 changes: 2 additions & 1 deletion src/utilities/writeIndex.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import sortByDepth from './sortByDepth';
export default (directoryPaths, options = {}) => {
const sortedDirectoryPaths = sortByDepth(directoryPaths)
.filter((directoryPath) => {
return validateTargetDirectory(directoryPath, {silent: options.ignoreUnsafe, outputFile: options.outputFile});
return validateTargetDirectory(directoryPath, {outputFile: options.outputFile,
silent: options.ignoreUnsafe});
});

_.forEach(sortedDirectoryPaths, (directoryPath) => {
Expand Down
19 changes: 10 additions & 9 deletions src/utilities/writeIndexCli.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ export default (directoryPaths, options = {}) => {
}

if (options.updateIndex || options.recursive) {
sortedDirectoryPaths = _.map(sortedDirectoryPaths, (dir) => {
return findIndexFiles(dir, {
sortedDirectoryPaths = _.map(sortedDirectoryPaths, (directory) => {
return findIndexFiles(directory, {
fileName: options.updateIndex ? options.outputFile || 'index.js' : '*',
silent: options.updateIndex || options.ignoreUnsafe
silent: options.updateIndex || options.ignoreUnsafe,
});
});
sortedDirectoryPaths = _.flatten(sortedDirectoryPaths);
Expand All @@ -40,7 +40,8 @@ export default (directoryPaths, options = {}) => {
}

sortedDirectoryPaths = sortedDirectoryPaths.filter((directoryPath) => {
return validateTargetDirectory(directoryPath, {silent: options.ignoreUnsafe, outputFile: options.outputFile});
return validateTargetDirectory(directoryPath, {outputFile: options.outputFile,
silent: options.ignoreUnsafe});
});

_.forEach(sortedDirectoryPaths, (directoryPath) => {
Expand All @@ -52,25 +53,25 @@ export default (directoryPaths, options = {}) => {
config,
extensions: options.extensions,
ignoreDirectories: options.ignoreDirectories,
silent: options.ignoreUnsafe
silent: options.ignoreUnsafe,
});

const indexCode = createIndexCode(siblings, {
banner: options.banner,
config
config,
});

const indexFilePath = path.resolve(directoryPath, options.outputFile || 'index.js');

try {
existingIndexCode = fs.readFileSync(indexFilePath, 'utf8');

/* eslint-disable no-empty */
} catch (error) {
/* eslint-disable no-empty */
} catch {

}

/* eslint-enable no-empty */
/* eslint-enable no-empty */

fs.writeFileSync(indexFilePath, indexCode);

Expand Down
3 changes: 3 additions & 0 deletions test/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "canonical/mocha"
}
Loading

0 comments on commit 76c6d4b

Please sign in to comment.