webpack-subresource-integrity - npm Package Compare versions

Comparing version 1.1.0-rc.5 to 1.1.0-rc.6

index.js

@@ -201,3 +201,3 @@ /**
 
-    sourcePath = util.getChunkFilename(compilation, childChunk);
+    sourcePath = compilation.sriChunkAssets[childChunk.id];
 
@@ -224,2 +224,8 @@ if (childChunk.files.indexOf(sourcePath) < 0) {
 
+SubresourceIntegrityPlugin.prototype.chunkAsset =
+  function chunkAsset(compilation, chunk, asset) {
+    // eslint-disable-next-line no-param-reassign
+    compilation.sriChunkAssets[chunk.id] = asset;
+  };
+
 /*
@@ -334,2 +340,3 @@ *  Calculate SRI values for each chunk and replace the magic
     var afterOptimizeAssets = this.afterOptimizeAssets.bind(this, compilation);
+    var chunkAsset = this.chunkAsset.bind(this, compilation);
     var alterAssetTags = this.alterAssetTags.bind(this, compilation);
@@ -346,2 +353,6 @@ var beforeHtmlGeneration = this.beforeHtmlGeneration.bind(this, compilation);
 
+    // FIXME: refactor into separate per-compilation state
+    // eslint-disable-next-line no-param-reassign
+    compilation.sriChunkAssets = {};
+
     /*
@@ -353,5 +364,7 @@ *  html-webpack support:
       compilation.hooks.afterOptimizeAssets.tap('SriPlugin', afterOptimizeAssets);
+      compilation.hooks.chunkAsset.tap('SriPlugin', chunkAsset);
       compiler.hooks.compilation.tap('HtmlWebpackPluginHooks', this.registerHwpHooks.bind(this, alterAssetTags, beforeHtmlGeneration));
     } else {
       compilation.plugin('after-optimize-assets', afterOptimizeAssets);
+      compilation.plugin('chunk-asset', chunkAsset);
       compilation.plugin('html-webpack-plugin-alter-asset-tags', alterAssetTags);
@@ -358,0 +371,0 @@ compilation.plugin('html-webpack-plugin-before-html-generation', beforeHtmlGeneration);

package.json

 {
   "name": "webpack-subresource-integrity",
-  "version": "1.1.0-rc.5",
+  "version": "1.1.0-rc.6",
   "description": "Webpack plugin for enabling Subresource Integrity",
@@ -5,0 +5,0 @@ "engines": {

util.js

@@ -105,35 +105,2 @@ var crypto = require("crypto");
 
-function isInitialChunk(chunk) {
-  if (chunk.isOnlyInitial) {
-    return chunk.isOnlyInitial();
-  }
-  if (chunk.isInitial) {
-    return chunk.isInitial();
-  }
-  return chunk.initial;
-}
-
-function getChunkFilename(compilation, chunk) {
-  var filename = compilation.mainTemplate.outputOptions.filename || "bundle.js";
-  var chunkFilename = compilation.mainTemplate.outputOptions.chunkFilename || ("[id]." + filename);
-  var args = [isInitialChunk(chunk) ? filename : chunkFilename, {
-    hash: compilation.hash.substr(0, compilation.mainTemplate.outputOptions.hashDigestLength),
-    hashWithLength: length => compilation.hash.substr(0, length),
-    contentHashType: "javascript",
-    chunk: {
-      id: chunk.id,
-      hash: chunk.hash.substr(0, compilation.mainTemplate.outputOptions.hashDigestLength),
-      hashWithLength: length => chunk.hash.substr(0, length),
-      name: chunk.name,
-      contentHash: chunk.contentHash
-    }
-  }];
-
-  if (compilation.mainTemplate.getAssetPath) {
-    return compilation.mainTemplate.getAssetPath.apply(compilation.mainTemplate, args);
-  }
-  args.unshift("asset-path");
-  return compilation.mainTemplate.applyPluginsWaterfall.apply(compilation.mainTemplate, args);
-}
-
 module.exports.computeIntegrity = computeIntegrity;
@@ -147,2 +114,1 @@ module.exports.findChunks = findChunks;
 module.exports.makePlaceholder = makePlaceholder;
-module.exports.getChunkFilename = getChunkFilename;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

39044

increased by8%

Number of package files

48

increased by9.09%

Worsened metrics

Lines of code

521

decreased by-3.52%

No dependency changes