diff options
author | Lukas Eipert <git@leipert.io> | 2018-03-26 07:39:14 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-03-26 07:39:14 +0000 |
commit | d023244aa5a71c9cf0e68f196c0a402a8ccc951f (patch) | |
tree | e49b6311e720191c1fbf4113bfb144f54cceca55 /scripts | |
parent | 391732a2c1b04baf565c77f2788a1ec035b1d85e (diff) | |
download | gitlab-ce-d023244aa5a71c9cf0e68f196c0a402a8ccc951f.tar.gz |
Make use of the prettier ignore file during our save script
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/frontend/prettier.js | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/scripts/frontend/prettier.js b/scripts/frontend/prettier.js index 2708340b48e..39de77bc333 100644 --- a/scripts/frontend/prettier.js +++ b/scripts/frontend/prettier.js @@ -1,6 +1,8 @@ const glob = require('glob'); const prettier = require('prettier'); const fs = require('fs'); +const path = require('path'); +const prettierIgnore = require('ignore')(); const getStagedFiles = require('./frontend_script_utils').getStagedFiles; @@ -10,6 +12,10 @@ const allFiles = mode === 'check-all' || mode === 'save-all'; const config = { patterns: ['**/*.js', '**/*.vue', '**/*.scss'], + /* + * The ignore patterns below are just to reduce search time with glob, as it includes the + * folders with the most ignored assets, the actual `.prettierignore` will be used later on + */ ignore: ['**/node_modules/**', '**/vendor/**', '**/public/**'], parsers: { js: 'babylon', @@ -17,6 +23,20 @@ const config = { scss: 'css', }, }; + +/* + * Unfortunately the prettier API does not expose support for `.prettierignore` files, they however + * use the ignore package, so we do the same. We simply cannot use the glob package, because + * gitignore style is not compatible with globs ignore style. + */ +prettierIgnore.add( + fs + .readFileSync(path.join(__dirname, '../../', '.prettierignore')) + .toString() + .trim() + .split(/\r?\n/) +); + const availableExtensions = Object.keys(config.parsers); console.log(`Loading ${allFiles ? 'All' : 'Staged'} Files ...`); @@ -44,6 +64,8 @@ if (allFiles) { files = stagedFiles.filter(f => availableExtensions.includes(f.split('.').pop())); } +files = prettierIgnore.filter(files); + if (!files.length) { console.log('No Files found to process with Prettier'); return; |