[filenames] allow rule-breaking in docs, tasks/config, and webpackShims

elastic · Mar 11, 2016 · caf7331 · caf7331
1 parent f724032
commit caf7331
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -82,17 +82,6 @@ module.exports = function (grunt) {
     config: config,
     loadGruntTasks: {
       pattern: ['grunt-*', '@*/grunt-*', 'gruntify-*', '@*/gruntify-*', 'intern']
-    },
-    preMerge(config, data) {
-      Object.keys(config).forEach(key => {
-        const taskConfig = config[key];
-        if (taskConfig.__taskName__) {
-          config[taskConfig.__taskName__] = taskConfig;
-
-          delete config[key];
-          delete taskConfig.__taskName__;
-        }
-      });
     }
   });
 

diff --git a/tasks/check_added_filenames.js b/tasks/check_added_filenames.js
@@ -6,8 +6,9 @@ export default function registerCheckAddedFilenames(grunt) {
 
     const invalid = grunt.config
     .get('filesToCommit')
-    .filter(isAdded)
     .map(getFilename)
+    .filter(isAdded)
+    .filter(name => !name.match(/([\/\\]|^)(docs|tasks[\/\\]config|webpackShims)([\/\\]|$)/))
     .filter(name => name.match(/[A-Z \-]/))
     .reduce((all, name) => `${all}  ${name}\n`, '');
 

diff --git a/tasks/config/download_selenium.js → tasks/config/downloadSelenium.js b/tasks/config/download_selenium.js → tasks/config/downloadSelenium.js
@@ -3,8 +3,6 @@ var path = require('path');
 
 module.exports = function (grunt) {
   return {
-    __taskName__: 'downloadSelenium',
-
     options: {
       selenium: {
         filename: 'selenium-server-standalone-2.48.2.jar',