Allow the use of separate files for configuration

bootstrap.js

@@ -9,6 +9,26 @@ module.exports = function(grunt) {
     grunt.config.set('config', config);
   }
 
+  var configDir = grunt.config.get('config.srcPaths.configDir');
+  if (configDir && grunt.file.isDir(configDir)) {
+    var options = {
+      config: {
+        src: [
+          configDir + '/*.js*',
+          configDir + '/*.coffee',
+          configDir + '/*.y*ml',
+          configDir + '/*.cson'
+        ]
+      }
+    };
+    var configs = require('load-grunt-configs')(grunt, options);
+    for (var configName in configs) {
+      if (configName !== 'config') {
+        grunt.config.set('config.' + configName, configs[configName]);
+      }
+    }
+  }
+
   var GDT = require('./lib/init')(grunt);
   GDT.init();
 

docs/10_BUILD.md

@@ -154,6 +154,11 @@ The following build output paths are optional to specify in the project's
 **srcPaths.make**: The Drush make file used to assemble the Drupal project.
 This is only used for Drupal 7.x projects.  Example is `src/project.make`.
 
+**srcPaths.configDir**: The directory that should be used for loading
+configurations. The files inside this directory will be loaded using
+[load-grunt-configs](https://www.npmjs.com/package/load-grunt-configs)
+and merged with the *Gruntconfig.json*.
+
 **buildPaths.build**: The directory that should be used for miscellaneous build
 artifacts. This can be the parent directory of the following build paths.
 

example/Gruntconfig.json

@@ -1,20 +1,13 @@
 {
   "srcPaths": {
+    "configDir": "config",
     "make": "src/project.make",
     "drupal": "src"
   },
   "domain": "project.vm",
   "buildPaths": {
     "packages": "build/packages"
   },
-  "packages": {
-    "srcFiles": ["!sites/*/files/**", "!xmlrpc.php", "!modules/php/*"],
-    "projFiles": ["README*", "bin/**", "hooks/**", "src/*.make", "vendor/**"],
-    "dest": {
-      "docroot": "html",
-      "devResources": ""
-    }
-  },
   "phpcs": true,
   "phpmd": true,
   "behat": {

example/config/packages.yml

@@ -0,0 +1,14 @@
+---
+srcFiles:
+  - "!sites/*/files/**"
+  - "!xmlrpc.php"
+  - "!modules/php/*"
+projFiles:
+  - "README*"
+  - "bin/**"
+  - "hooks/**"
+  - "src/*.make"
+  - "vendor/**"
+dest:
+  docroot: "html"
+  devResources: ""

lib/drupal.js

@@ -58,6 +58,7 @@ module.exports = function(grunt) {
   module.drupalPath = function(type) {
     switch (module.majorVersion()) {
       case 8:
+      case 9:
         return path.join(grunt.config('config.buildPaths.html'), type);
       case 7:
       default:

package.json

@@ -7,6 +7,7 @@
     "fs-extra": "~3.0.1",
     "grunt": "^1.0.1",
     "grunt-available-tasks": "~0.6.2",
+    "load-grunt-configs": "~1.0.0",
     "grunt-composer": "~0.4.4",
     "grunt-concurrent": "^2.1.0",
     "grunt-contrib-clean": "^1.0.0",

tasks/package.js

@@ -113,8 +113,13 @@ module.exports = function(grunt) {
         }
       });
       tasks.push('composer:install');
-      grunt.config(['composer', 'drupal-scaffold'], {});
-      tasks.push('composer:drupal-scaffold');
+
+      // Add the drupal-scaffold task if it is defined in the `composer.json`.
+      var composer = JSON.parse(require('fs').readFileSync('./composer.json', 'utf8'));
+      if (typeof composer.scripts !== 'undefined' && 'drupal-scaffold' in composer.scripts) {
+        grunt.config(['composer', 'drupal-scaffold'], {});
+        tasks.push('composer:drupal-scaffold');
+      }
     }
 
     if (this.args[0] && this.args[0] === 'compress') {

test/test_assets/Gruntconfig.json

@@ -1,15 +1,12 @@
 {
   "srcPaths": {
+    "configDir": "config",
     "make": "src/project.make",
     "drupal": "src"
   },
   "siteUrls": {
     "default": "http://project.local"
   },
-  "packages": {
-    "srcFiles": ["!sites/*/files/**", "!xmlrpc.php", "!modules/php/*"],
-    "projFiles": ["README*", "bin/**"]
-  },
   "phpcs": true,
   "phpmd": true,
   "behat": {

test/test_assets/config/packages.yml

@@ -0,0 +1,8 @@
+---
+srcFiles:
+  - "!sites/*/files/**"
+  - "!xmlrpc.php"
+  - "!modules/php/*"
+projFiles:
+  - "README*"
+  - "bin/**"

test/test_assets_d8/Gruntconfig.json

@@ -1,19 +1,12 @@
 {
   "domain": "http://127.0.0.1:8080",
   "srcPaths": {
+    "configDir": "config",
     "drupal": "src"
   },
   "siteUrls": {
     "default": "http://project.local"
   },
-  "packages": {
-    "srcFiles": ["!sites/*/files/**", "!xmlrpc.php", "!modules/php/*"],
-    "projFiles": ["README*", "bin/**", "hooks/**", "src/*.make", "vendor/**", "composer.*"],
-    "dest": {
-      "docroot": "html",
-      "devResources": ""
-    }
-  },
   "phpcs": true,
   "phpmd": true,
   "behat": {