moved 'use strict' from function to top of files and tweaked imports for consistency

Author: benholloway

lib/build/browserify.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var fs              = require('fs'),
     path            = require('path'),
     through         = require('through2'),
@@ -18,7 +20,6 @@ var fs              = require('fs'),
  * @returns {boolean} True on valid node and valid match, else false
  */
 function isLiteralAST(node) {
-  'use strict';
   var candidates = Array.prototype.slice.call(arguments, 1);
   return (node) && (node.type === 'Literal') && candidates.some(function (candidate) {
     return (node.value === candidate)
@@ -33,7 +34,6 @@ function isLiteralAST(node) {
  * @returns {boolean} True on valid node and valid match, else false
  */
 function isMethodAST(node) {
-  'use strict';
   var candidates = Array.prototype.slice.call(arguments, 1);
   var result = (node) && (node.type === 'CallExpression') && (node.callee) && candidates.some(function (candidate) {
     var callee = node.callee;
@@ -49,7 +49,6 @@ function isMethodAST(node) {
  * @return A jasmine transform
  */
 function jasmineTransform(symbol) {
-  'use strict';
   return transformTools.makeFalafelTransform('jasmineTransform', null, function (node, options, done) {
     var isValid = isLiteralAST(node, symbol) && isMethodAST(node.parent, 'describe', 'module');
     if (isValid) {
@@ -67,7 +66,6 @@ function jasmineTransform(symbol) {
  * @returns {stream.Through} A through stream that performs the operation of a gulp stream
  */
 function compile(bannerWidth, transforms) {
-  'use strict';
   var output = [];
 
   /**
@@ -128,7 +126,6 @@ function compile(bannerWidth, transforms) {
     // Simulate bower components (and optionally current project) as node modules that may be require()'d
     var anonymised = trackFilenames().create();
     function requireTransform(allowProjectRelative) {
-      'use strict';
       var BOWER = path.relative(process.cwd(), bowerDir.sync());
       return transformTools.makeRequireTransform('requireTransform', null, function (args, opts, done) {
 

lib/build/node-sass.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var path              = require('path'),
     fs                = require('fs'),
     through           = require('through2'),
@@ -18,7 +20,6 @@ var path              = require('path'),
  * @returns {string} dataURI of the file where found or <code>undefined</code> otherwise
  */
 function encodeRelativeURL(startPath, uri) {
-  'use strict';
 
   /**
    * Test whether the given directory is the root of its own package
@@ -93,7 +94,6 @@ function encodeRelativeURL(startPath, uri) {
  * @returns {stream.Through} A through stream that performs the operation of a gulp stream
  */
 module.exports = function (bannerWidth, libraryPaths) {
-  'use strict';
   var output  = [ ];
   var libList = (libraryPaths || [ ]).filter(function isString(value) {
     return (typeof value === 'string');

lib/inject/adjacent-files.js

@@ -1,10 +1,12 @@
-var path         = require('path');
-var through      = require('through2');
-var throughPipes = require('through-pipes');
-var gulp         = require('gulp');
-var inject       = require('gulp-inject');
-var slash        = require('gulp-slash');
-var semiflat     = require('gulp-semiflat');
+'use strict';
+
+var path         = require('path'),
+    through      = require('through2'),
+    throughPipes = require('through-pipes'),
+    gulp         = require('gulp'),
+    inject       = require('gulp-inject'),
+    slash        = require('gulp-slash'),
+    semiflat     = require('gulp-semiflat');
 
 /**
  * Inject all files found in the same relative directory as the HTML file of the stream.
@@ -17,7 +19,6 @@ var semiflat     = require('gulp-semiflat');
  * @returns {stream.Through} A through stream that performs the operation of a gulp stream
  */
 module.exports = function (extension, opts, recurse) {
-  'use strict';
   var extensions = extension ? extension.split('|') : [ '*' ];
   return through.obj(function (file, encoding, done) {
     var stream = this;

lib/inject/bower-files.js

@@ -1,12 +1,14 @@
-var combined = require('combined-stream');
-var gulp     = require('gulp');
-var gutil    = require('gulp-util');
-var spigot   = require('stream-spigot');
-var defaults = require('lodash.defaults');
-var flatten  = require("lodash.flatten");
-var through  = require('through2');
-var path     = require('path');
-var fs       = require('fs');
+'use strict';
+
+var combined = require('combined-stream'),
+    gulp     = require('gulp'),
+    gutil    = require('gulp-util'),
+    spigot   = require('stream-spigot'),
+    defaults = require('lodash.defaults'),
+    flatten  = require("lodash.flatten"),
+    through  = require('through2'),
+    path     = require('path'),
+    fs       = require('fs');
 
 /**
  * Retrieve version details of bower files as a stream
@@ -15,7 +17,6 @@ var fs       = require('fs');
  * @returns {stream.Readable} A readable stream containing only the manifest file
  */
 function json(includeDev) {
-  'use strict';
   function read(filename) {
     try {
       return fs.existsSync(filename) && require(path.resolve(filename));
@@ -39,7 +40,6 @@ function json(includeDev) {
  * @returns {stream.Readable} A readable stream containing only the manifest file
  */
 function manifest(useComment, includeDev) {
-  'use strict';
   var bower    = json(includeDev);
   var versions = { };
   for (var key in bower) {
@@ -59,7 +59,6 @@ function manifest(useComment, includeDev) {
 }
 
 module.exports = function () {
-  'use strict';
   var before  = [ ];
   var after   = [ ];
 

lib/inject/relative-transform.js

@@ -1,11 +1,12 @@
-var path  = require('path');
-var slash = require('gulp-slash');
+'use strict';
+
+var path  = require('path'),
+    slash = require('gulp-slash');
 
 /**
  * An inject transform that constructs html using relative file locations.
  */
 module.exports = function relativeTransform(filepath, file, index, length, targetFile) {
-  'use strict';
   var relative = slash(path.relative(path.dirname(targetFile.path), file.path));
   switch(path.extname(relative)) {
     case '.css':

lib/release/version-directory.js

@@ -1,8 +1,10 @@
-var fs      = require('fs');
-var path    = require('path');
-var crypto  = require('crypto');
-var through = require('through2');
-var gutil   = require('gulp-util');
+'use strict';
+
+var fs      = require('fs'),
+    path    = require('path'),
+    crypto  = require('crypto'),
+    through = require('through2'),
+    gutil   = require('gulp-util');
 
 /**
  * Rename the base directory of the given file stream with a hash of its content.
@@ -11,7 +13,6 @@ var gutil   = require('gulp-util');
  * @returns {stream.Through} A through stream that performs the operation of a gulp stream
  */
 module.exports = function (hashKeyword, isVerbose) {
-  'use strict';
   var baseDirectory;
   var hash         = crypto.createHash('md5');
   var pathList     = [ ];

lib/util/hr.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * Create a text banner with a title that is centred and double spaced
  * @param {string} char The character that makes up the banner

lib/util/jshint-reporter.js

@@ -1,8 +1,7 @@
 'use strict';
 
-var path = require('path');
-
-var gulpJshint = require('gulp-jshint');
+var path       = require('path'),
+    gulpJshint = require('gulp-jshint');
 
 var yargs = require('./yargs');
 

tasks/webstorm.js

@@ -18,6 +18,7 @@ var defaults = require('../lib/config/defaults'),
 var TEMPLATE_PATH = path.join(__dirname, '..', 'templates', 'webstorm');
 
 var cliArgs;
+
 // Load the global config for defaults
 var config = defaults.getInstance('webstorm')
   .file(platform.userHomeDirectory(), '.angularity')
@@ -118,9 +119,6 @@ gulp.task('webstorm', function (done) {
 
   // Find the yargs instance that is most appropriate for the given command line parameters
   cliArgs = validateLaunchPath(yargs.resolveArgv());
-
-  cliArgs = yargs.resolveArgv();
-
   if (cliArgs.taskName === 'init') {
     cliArgs = config.get(); // default arguments when called by the "init" task
   }