Merge remote-tracking branch 'origin/develop' into develop

Author: benholloway

lib/build/browserify.js

@@ -286,44 +286,47 @@ module.exports = create;
  */
 function requireTransform(allowBowerRelative, allowProjectRelative) {
   var BOWER = path.relative(process.cwd(), bowerDir.sync());
-  return transformTools.makeRequireTransform('requireTransform', null, function transform(args, opts, done) {
+  var transformOpts = {
+    excludeExtensions: ['json']  // must exclude any extension that is not javascript once all transforms have run
+  };
+  return transformTools.makeRequireTransform('requireTransform', transformOpts, function transform(args, opts, done) {
 
     // find the original path and transform it so log as it is not relative
     var original    = args[0];
-    var split       = original.split(/[\\\/]/g);    // keep delimiters
-    var firstTerm   = split.splice(0, 1).shift();   // remove the first term from the split
-    var isTransform = (firstTerm.length) && !(/^\.{1,2}$/.test(firstTerm));
+    var split       = original.split(/[\\\/]/g);                            // keep delimiters
+    var firstTerm   = split.splice(0, 1).shift();                           // remove the first term from the split
+    var isTransform = (firstTerm.length) && !(/^\.{1,2}$/.test(firstTerm)); // must not be relative
 
     // first valid result wins
     //  if we are not transforming then we fall back to the original value
     var transformed = [
 
-        // current project
-        isTransform && allowProjectRelative && function resolveProjectRelative() {
-          var packageJson = require(path.resolve('package.json'));
-          if ((typeof packageJson.name === 'string') && (packageJson.name === firstTerm)) {
-            return slash(path.resolve(path.join.apply(path, split)));  // full path to second term onwards
-          }
-        },
-
-        // bower project
-        isTransform && allowBowerRelative && function resolveBowerRelative() {
-          var partial   = path.dirname(original);
-          var directory = (partial !== '.') && path.resolve(path.join(BOWER, partial));
-          var isFound   = directory && fs.existsSync(directory) && fs.statSync(directory).isDirectory();
-          if (isFound) {
-            return slash(path.resolve(path.join(BOWER, original)));  // path is within the bower directory
-          }
-        },
-
-        // fall back value
-        original
-      ]
-        .map(function (candidate) {
-          return (typeof candidate === 'function') ? candidate() : candidate;
-        })
-        .filter(Boolean)
-        .shift();
+      // current project
+      isTransform && allowProjectRelative && function resolveProjectRelative() {
+        var packageJson = require(path.resolve('package.json'));
+        if ((typeof packageJson.name === 'string') && (packageJson.name === firstTerm)) {
+          return slash(path.resolve(path.join.apply(path, split)));  // full path to second term onwards
+        }
+      },
+
+      // bower project
+      isTransform && allowBowerRelative && function resolveBowerRelative() {
+        var partial   = path.dirname(original);
+        var directory = (partial !== '.') && path.resolve(path.join(BOWER, partial));
+        var isFound   = directory && fs.existsSync(directory) && fs.statSync(directory).isDirectory();
+        if (isFound) {
+          return slash(path.resolve(path.join(BOWER, original)));  // path is within the bower directory
+        }
+      },
+
+      // fallback value
+      original
+    ]
+      .map(function (candidate) {
+        return (typeof candidate === 'function') ? candidate() : candidate;
+      })
+      .filter(Boolean)
+      .shift();
 
     // update
     done(null, 'require("' + transformed + '")');

npm-shrinkwrap.json

@@ -111,9 +111,9 @@
     "yargs": "latest"
   },
   "devDependencies": {
-    "angularity-helloworld-es5": "angularity/angularity-helloworld-es5#ci-build-0.2.0-D",
-    "angularity-todo-es5": "angularity/angularity-todo-es5#ci-build-0.2.0-D",
-    "autodocs": "^0.6.5",
+    "angularity-helloworld-es5": "angularity/angularity-helloworld-es5#ci-build-0.2.0-E",
+    "angularity-todo-es5": "angularity/angularity-todo-es5#ci-build-0.2.0-E",
+    "autodocs": "^0.6.8",
     "jasmine-diff-matchers": "~2.0.0",
     "jasmine-node": "2.0.0-beta4",
     "jshint-stylish": "^1.0.1",

package.json

@@ -221,7 +221,7 @@ function setUpTaskJavascript(context) {
         return [
           babelify.configure({ignore: /(?!)/}),   // convert any es6 to es5 (degenerate regex)
           stringify({minify: false}),             // allow import of html to a string
-          ngInject(),                             // annotate dependencies for angular
+          ngInject({filter: /\.(?!json)\w+$/}),   // annotate dependencies for angular (everything except .json)
           isMinify && esmangleify()               // minify
         ].filter(Boolean);
         // TODO @bholloway fix stringify({ minify: true }) throwing error on badly formed html so that we can minify