Merge pull request #41 from waysact/eslint-config-airbnb/legacy

Upgrade to eslint-config-airbnb/legacy

Author: bruno

.codeclimate.yml

@@ -1,4 +1,3 @@
 engines:
    eslint:
      enabled: true
-     channel: "eslint-2"

.eslintrc

@@ -1,3 +1,3 @@
 {
-    "extends": "eslint-config-airbnb-es5",
+    "extends": "eslint-config-airbnb/legacy",
 }

README.md

@@ -1,6 +1,6 @@
 # webpack-subresource-integrity
 
-[![npm version](https://badge.fury.io/js/webpack-subresource-integrity.svg)](https://badge.fury.io/js/webpack-subresource-integrity) [![Travis Build Status](https://travis-ci.org/waysact/webpack-subresource-integrity.svg?branch=master)](https://travis-ci.org/waysact/webpack-subresource-integrity) [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/63bydfph00sghg18/branch/master?svg=true)](https://ci.appveyor.com/project/jscheid/webpack-subresource-integrity) [![Coverage Status](https://coveralls.io/repos/github/waysact/webpack-subresource-integrity/badge.svg)](https://coveralls.io/github/waysact/webpack-subresource-integrity) [![Dependency Status](https://www.versioneye.com/user/projects/587755bd3c8039003a1c358f/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/587755bd3c8039003a1c358f) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/waysact/webpack-subresource-integrity/master/LICENSE)
+[![npm version](https://badge.fury.io/js/webpack-subresource-integrity.svg)](https://badge.fury.io/js/webpack-subresource-integrity) [![Travis Build Status](https://travis-ci.org/waysact/webpack-subresource-integrity.svg?branch=master)](https://travis-ci.org/waysact/webpack-subresource-integrity) [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/63bydfph00sghg18/branch/master?svg=true)](https://ci.appveyor.com/project/jscheid/webpack-subresource-integrity) [![Coverage Status](https://coveralls.io/repos/github/waysact/webpack-subresource-integrity/badge.svg)](https://coveralls.io/github/waysact/webpack-subresource-integrity) [![Code Climate](https://codeclimate.com/github/waysact/webpack-subresource-integrity/badges/gpa.svg)](https://codeclimate.com/github/waysact/webpack-subresource-integrity) [![Dependency Status](https://www.versioneye.com/user/projects/587755bd3c8039003a1c358f/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/587755bd3c8039003a1c358f) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/waysact/webpack-subresource-integrity/master/LICENSE)
 
 Webpack plugin for enabling Subresource Integrity.
 

index.js

@@ -12,22 +12,23 @@ function makePlaceholder(id) {
   return '*-*-*-CHUNK-SRI-HASH-' + id + '-*-*-*';
 }
 
-function findDepChunks(chunk, allDepChunkIds) {
-  chunk.chunks.forEach(function forEachChunk(depChunk) {
-    if (!allDepChunkIds[depChunk.id]) {
-      allDepChunkIds[depChunk.id] = true;
-      findDepChunks(depChunk, allDepChunkIds);
-    }
-  });
-}
-
 function WebIntegrityJsonpMainTemplatePlugin(sriPlugin, compilation) {
   this.sriPlugin = sriPlugin;
   this.compilation = compilation;
 }
 
 WebIntegrityJsonpMainTemplatePlugin.prototype.apply = function apply(mainTemplate) {
   var self = this;
+  var allDepChunkIds = {};
+
+  function findDepChunks(chunk) {
+    chunk.chunks.forEach(function forEachChunk(depChunk) {
+      if (!allDepChunkIds[depChunk.id]) {
+        allDepChunkIds[depChunk.id] = true;
+        findDepChunks(depChunk);
+      }
+    });
+  }
 
   /*
    *  Patch jsonp-script code to add the integrity attribute.
@@ -53,8 +54,7 @@ WebIntegrityJsonpMainTemplatePlugin.prototype.apply = function apply(mainTemplat
    */
   mainTemplate.plugin('local-vars', function localVarsPlugin(source, chunk) {
     if (chunk.chunks.length > 0) {
-      var allDepChunkIds = {};
-      findDepChunks(chunk, allDepChunkIds);
+      findDepChunks(chunk);
 
       return this.asString([
         source,
@@ -95,11 +95,7 @@ function SubresourceIntegrityPlugin(options) {
     enabled: true
   };
 
-  for (var key in useOptions) {
-    if (useOptions.hasOwnProperty(key)) {
-      this.options[key] = useOptions[key];
-    }
-  }
+  Object.assign(this.options, useOptions);
 
   this.emittedWarnings = {};
 }
@@ -120,6 +116,10 @@ SubresourceIntegrityPlugin.prototype.error = function error(compilation, message
 };
 
 SubresourceIntegrityPlugin.prototype.validateOptions = function validateOptions(compilation) {
+  var foundStandardHashFunc = false;
+  var hashFuncName;
+  var i;
+
   if (this.optionsValidated) {
     return;
   }
@@ -144,9 +144,8 @@ SubresourceIntegrityPlugin.prototype.validateOptions = function validateOptions(
         'instead got \'' + this.options.hashFuncNames + '\'.');
     this.options.enabled = false;
   } else {
-    var foundStandardHashFunc = false;
-    for (var i = 0; i < this.options.hashFuncNames.length; i++) {
-      var hashFuncName = this.options.hashFuncNames[i];
+    for (i = 0; i < this.options.hashFuncNames.length; i += 1) {
+      hashFuncName = this.options.hashFuncNames[i];
       if (typeof hashFuncName !== 'string' &&
           !(hashFuncName instanceof String)) {
         this.error(
@@ -246,6 +245,14 @@ SubresourceIntegrityPlugin.prototype.apply = function apply(compiler) {
       compilation.plugin('after-optimize-assets', function optimizeAssetsPlugin(assets) {
         var hashByChunkId = {};
         var visitedByChunkId = {};
+        var chunkFile;
+        var oldSource;
+        var magicMarker;
+        var magicMarkerPos;
+        var newAsset;
+        var asset;
+        var newSource;
+
         function processChunkRecursive(chunk) {
           var depChunkIds = [];
 
@@ -259,9 +266,9 @@ SubresourceIntegrityPlugin.prototype.apply = function apply(compiler) {
           });
 
           if (chunk.files.length > 0) {
-            var chunkFile = chunk.files[0];
+            chunkFile = chunk.files[0];
 
-            var oldSource = assets[chunkFile].source();
+            oldSource = assets[chunkFile].source();
 
             if (oldSource.indexOf('webpackHotUpdate') >= 0) {
               self.warnOnce(
@@ -271,42 +278,43 @@ SubresourceIntegrityPlugin.prototype.apply = function apply(compiler) {
               );
             }
 
-            var newAsset = new ReplaceSource(assets[chunkFile]);
+            newAsset = new ReplaceSource(assets[chunkFile]);
 
             depChunkIds.forEach(function forEachChunk(depChunkId) {
-              var magicMarker = makePlaceholder(depChunkId);
-              var magicMarkerPos = oldSource.indexOf(magicMarker);
+              magicMarker = makePlaceholder(depChunkId);
+              magicMarkerPos = oldSource.indexOf(magicMarker);
               if (magicMarkerPos >= 0) {
                 newAsset.replace(
                   magicMarkerPos,
-                  magicMarkerPos + magicMarker.length - 1,
+                  (magicMarkerPos + magicMarker.length) - 1,
                   hashByChunkId[depChunkId]);
               }
             });
 
+            // eslint-disable-next-line no-param-reassign
             assets[chunkFile] = newAsset;
 
-            var newSource = newAsset.source();
-            hashByChunkId[chunk.id] = newAsset.integrity = computeIntegrity(newSource);
+            newSource = newAsset.source();
+            newAsset.integrity = computeIntegrity(newSource);
+            hashByChunkId[chunk.id] = newAsset.integrity;
           }
-          return [ chunk.id ].concat(depChunkIds);
+          return [chunk.id].concat(depChunkIds);
         }
 
         compilation.chunks.forEach(function forEachChunk(chunk) {
-          // chunk.entry was removed in Webpack 2. Use hasRuntime() for this check instead (if it exists)
+          // chunk.entry was removed in Webpack 2. Use hasRuntime()
+          // for this check instead (if it exists)
           if (('hasRuntime' in chunk) ? chunk.hasRuntime() : chunk.entry) {
             processChunkRecursive(chunk);
           }
         });
 
-        for (var key in assets) {
-          if (assets.hasOwnProperty(key)) {
-            var asset = assets[key];
-            if (!asset.integrity) {
-              asset.integrity = computeIntegrity(asset.source());
-            }
+        Object.keys(assets).forEach(function loop(assetKey) {
+          asset = assets[assetKey];
+          if (!asset.integrity) {
+            asset.integrity = computeIntegrity(asset.source());
           }
-        }
+        });
       });
 
       function getTagSrc(tag) {
@@ -339,8 +347,11 @@ SubresourceIntegrityPlugin.prototype.apply = function apply(compiler) {
             return;
           }
           // Add integrity check sums
+
+          /* eslint-disable no-param-reassign */
           tag.attributes.integrity = checksum;
           tag.attributes.crossorigin = self.options.crossorigin;
+          /* eslint-enable no-param-reassign */
         }
 
         pluginArgs.head.filter(filterTag).forEach(processTag);
@@ -355,6 +366,7 @@ SubresourceIntegrityPlugin.prototype.apply = function apply(compiler) {
       function beforeHtmlGeneration(pluginArgs, callback) {
         self.hwpPublicPath = pluginArgs.assets.publicPath;
         ['js', 'css'].forEach(function addIntegrity(fileType) {
+          // eslint-disable-next-line no-param-reassign
           pluginArgs.assets[fileType + 'Integrity'] =
             pluginArgs.assets[fileType].map(function assetIntegrity(filePath) {
               var src = self.hwpAssetPath(filePath);

karma.conf.js

@@ -4,6 +4,8 @@ var karmaMiddleware = require('karma/lib/middleware/karma');
 var toplevelScriptIntegrity;
 var stylesheetIntegrity;
 
+var prevCreate = karmaMiddleware.create;
+
 /*
  *  Simple webpack plugin that records the top-level chunk's integrity
  *  attribute value.
@@ -27,18 +29,35 @@ GetIntegrityPlugin.prototype.apply = function apply(compiler) {
  *  Hack Karma to add the integrity attribute to the script tag
  *  loading the top-level chunk.
  */
-var prevCreate = karmaMiddleware.create;
-function nextCreate(filesPromise, serveStaticFile, serveFile, injector, basePath, urlRoot, upstreamProxy) {
-  var prevMiddleware = prevCreate(filesPromise, serveStaticFile, serveFile, injector, basePath, urlRoot, upstreamProxy);
+function nextCreate(
+  filesPromise,
+  serveStaticFile,
+  serveFile,
+  injector,
+  basePath,
+  urlRoot,
+  upstreamProxy
+) {
+  var prevMiddleware = prevCreate(
+    filesPromise,
+    serveStaticFile,
+    serveFile,
+    injector,
+    basePath,
+    urlRoot,
+    upstreamProxy
+  );
   return function nextMiddleware(request, response, next) {
     var requestUrl = request.normalizedUrl.replace(/\?.*/, '');
+    var prevWrite;
     requestUrl = requestUrl.substr(urlRoot.length - 1);
     if (requestUrl === '/context.html' &&
         toplevelScriptIntegrity &&
         toplevelScriptIntegrity.startsWith('sha') &&
         stylesheetIntegrity &&
         stylesheetIntegrity.startsWith('sha')) {
-      var prevWrite = response.write;
+      prevWrite = response.write;
+      // eslint-disable-next-line no-param-reassign
       response.write = function nextWrite(chunk, encoding) {
         var nextChunk = chunk.replace(
           'src="/base/test/test.js',

package.json

@@ -37,7 +37,7 @@
     "coveralls": "^2.11.15",
     "css-loader": "^0.26.0",
     "eslint": "^3.10.0",
-    "eslint-config-airbnb-es5": "^1.0.9",
+    "eslint-config-airbnb": "^14.1.0",
     "eslint-plugin-react": "^6.6.0",
     "expect": "^1.13.4",
     "extract-text-webpack-plugin": "^1.0.1",

test/chunk2.js

@@ -1,24 +1,28 @@
 var expect = require('expect');
 
 module.exports = function chunk2(callback) {
+  var resourcesWithIntegrity;
   function forEachElement(el) {
     var src = el.getAttribute('src') || el.getAttribute('href');
     var integrity = el.getAttribute('integrity');
     var crossorigin = el.getAttribute('crossOrigin');
+    var match;
     if (src) {
-      var match = src.match(/[^\/]+\.(js|css)/);
+      match = src.match(/[^/]+\.(js|css)/);
       if (match && crossorigin && integrity && integrity.match(/^sha\d+-/)) {
         resourcesWithIntegrity.push(match[0].toString());
       }
     }
   }
   try {
-    var resourcesWithIntegrity = [];
+    resourcesWithIntegrity = [];
     Array.prototype.slice.call(document.getElementsByTagName('script')).forEach(forEachElement);
     Array.prototype.slice.call(document.getElementsByTagName('link')).forEach(forEachElement);
     expect(resourcesWithIntegrity).toInclude('stylesheet.css');
     expect(resourcesWithIntegrity).toInclude('test.js');
-    expect(resourcesWithIntegrity.filter(function filter(item) { return item.match(/^\d+\.(chunk|bundle).js$/); }).length).toBe(2);
+    expect(resourcesWithIntegrity.filter(function filter(item) {
+      return item.match(/^\d+\.(chunk|bundle).js$/);
+    }).length).toBe(2);
     expect(window.getComputedStyle(document.getElementsByTagName('body')[0]).backgroundColor).toEqual('rgb(200, 201, 202)');
     callback();
   } catch (e) {