get prioritized dependencies dynamically

Author: donaldpipowitch

lib/detect-dependencies.js

@@ -104,9 +104,7 @@ var gatherInfo = function (config) {
     var warnings = config.get('warnings');
 
     var mains = findMainFiles(config, component, componentConfigFile);
-    var fileTypes = _.chain(mains).map(function (main) {
-      return path.extname(main);
-    }).unique().value();
+    var fileTypes = _.chain(mains).map(path.extname).unique().value();
 
     dep.main = mains;
     dep.type = fileTypes;
@@ -308,11 +306,16 @@ module.exports = function detect(config) {
 
   _.each(allDependencies, gatherInfo(config));
 
-  config.set('global-dependencies-sorted', filterExcludedDependencies({
-    js: prioritizeDependencies(config, '.js'),
-    css: prioritizeDependencies(config, '.css'),
-    scss: prioritizeDependencies(config, '.scss')
-  }, config.get('exclude')));
+  config.set('global-dependencies-sorted', filterExcludedDependencies(
+    config.get('detectable-file-types').
+      reduce(function (acc, fileType) {
+        if (!acc[fileType]) {
+          acc[fileType] = prioritizeDependencies(config, '.' + fileType);
+        }
+        return acc;
+      }, {}),
+    config.get('exclude')
+  ));
 
   return config;
 };

lib/inject-dependencies.js

@@ -10,82 +10,12 @@
 
 var fs = require('fs');
 var path = require('path');
-var _ = require('lodash');
 var chalk = require('chalk');
 
 var globalDependenciesSorted;
 var ignorePath;
 var fileTypes;
 
-var fileTypesDefault = {
-  html: {
-    block: /(([ \t]*)<!--\s*bower:*(\S*)\s*-->)(\n|\r|.)*?(<!--\s*endbower\s*-->)/gi,
-    detect: {
-      js: /<script.*src=['"](.+)['"]>/gi,
-      css: /<link.*href=['"](.+)['"]/gi
-    },
-    replace: {
-      js: '<script src="{{filePath}}"></script>',
-      css: '<link rel="stylesheet" href="{{filePath}}" />'
-    }
-  },
-
-  jade: {
-    block: /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi,
-    detect: {
-      js: /script\(.*src=['"](.+)['"]>/gi,
-      css: /link\(href=['"](.+)['"]/gi
-    },
-    replace: {
-      js: 'script(src=\'{{filePath}}\')',
-      css: 'link(rel=\'stylesheet\', href=\'{{filePath}}\')'
-    }
-  },
-
-  sass: {
-    block: /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi,
-    detect: {
-      css: /@import\s['"](.+)['"]/gi,
-      sass: /@import\s['"](.+)['"]/gi,
-      scss: /@import\s['"](.+)['"]/gi
-    },
-    replace: {
-      css: '@import {{filePath}}',
-      sass: '@import {{filePath}}',
-      scss: '@import {{filePath}}'
-    }
-  },
-
-  scss: {
-    block: /(([ \t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi,
-    detect: {
-      css: /@import\s['"](.+)['"]/gi,
-      sass: /@import\s['"](.+)['"]/gi,
-      scss: /@import\s['"](.+)['"]/gi
-    },
-    replace: {
-      css: '@import "{{filePath}}";',
-      sass: '@import "{{filePath}}";',
-      scss: '@import "{{filePath}}";'
-    }
-  },
-
-  yaml: {
-    block: /(([ \t]*)#\s*bower:*(\S*))(\n|\r|.)*?(#\s*endbower)/gi,
-    detect: {
-      js: /-\s(.+)/gi,
-      css: /-\s(.+)/gi
-    },
-    replace: {
-      js: '- {{filePath}}',
-      css: '- {{filePath}}'
-    }
-  }
-};
-
-fileTypesDefault.yml = fileTypesDefault.yaml;
-fileTypesDefault.htm = fileTypesDefault.html;
-fileTypesDefault['default'] = fileTypesDefault.html;
 
 /**
  * Find references already on the page, not in a Bower block.
@@ -154,11 +84,16 @@ var injectScripts = function (filePath) {
   var fileType = fileTypes[fileExt] || fileTypes['default'];
   var returnType = /\r\n/.test(contents) ? '\r\n' : '\n';
 
-  fs.writeFileSync(filePath, contents.replace(
+  var newContents = contents.replace(
     fileType.block,
     replaceIncludes(filePath, fileType, returnType)
-  ));
-  console.log('File ' + chalk.cyan(filePath) + ' modified.');
+  );
+
+  if (contents !== newContents) {
+    fs.writeFileSync(filePath, newContents);
+
+    console.log(chalk.cyan(filePath) + ' modified.');
+  }
 };
 
 
@@ -184,19 +119,7 @@ module.exports = function inject(config) {
 
   globalDependenciesSorted = config.get('global-dependencies-sorted');
   ignorePath = config.get('ignore-path');
-  fileTypes = _.clone(fileTypesDefault, true);
-
-  _(config.get('file-types')).each(function (fileTypeConfig, fileType) {
-    fileTypes[fileType] = fileTypes[fileType] || {};
-    _.each(fileTypeConfig, function (config, configKey) {
-      if (_.isPlainObject(fileTypes[fileType][configKey])) {
-        fileTypes[fileType][configKey] =
-          _.assign(fileTypes[fileType][configKey], config);
-      } else {
-        fileTypes[fileType][configKey] = config;
-      }
-    });
-  });
+  fileTypes = config.get('file-types');
 
   if (stream.src) {
     config.set('stream', {

test/fixture/bower.json

@@ -5,7 +5,8 @@
     "modernizr": "2.6.2",
     "codecode": "0.0.3",
     "bootstrap": "3.0.0",
-    "modular-scale": "2.0.3"
+    "modular-scale": "2.0.3",
+    "3l": "1.4.4"
   },
   "devDependencies": {
     "things": "0.1.1"