[FORK] Support Webpack 5 only.

- renaming of plugin
- update all packages for Webpack 5
- fix deprecation messages in Webpack 5
- fix integration tests for Webpack 5
- some improvements

Author: webdiscus

.gitignore

@@ -1,3 +1,3 @@
 .idea
-_ignored
-node_modules
+node_modules
+test/outputs

CHANGELOG.md

@@ -1,22 +1,39 @@
+## 0.6.1 (Oct 20, 2020)
+The fork of original `https://github.com/fqborges/webpack-fix-style-only-entries` (ver. 0.6.0) for support only Webpack 5 and above. 
+The Webpack 4 is no longer supported.
+
+The changes from original version 0.6.0: 
+ 
+- Added the feature: considers the use hash after the  .js and .mjs extension in file format like `.js?[hash]` or `.mjs?[hash]`. 
+The idea and requirement belong to https://github.com/MatiasMorici from PR https://github.com/fqborges/webpack-fix-style-only-entries/pull/27/commits/57eeecbcb85926578770c3845465e4012b02a196
+- In Webpack 5 fixed deprecation messages:
+    - DEP_WEBPACK_CHUNK_HAS_ENTRY_MODULE
+    - DEP_WEBPACK_CHUNK_ENTRY_MODULE
+    - DEP_WEBPACK_DEPRECATION_ARRAY_TO_SET
+    - DEP_WEBPACK_MODULE_INDEX
+ 
+- Update all packages for Webpack 5.
+- Fix integration test script for using with Webpack 5.
+- Fix a BUG of `terser-webpack-plugin` (generate the futile file `vendor.js.LICENSE.txt`) in the production test `vendor+multi-js-entry-css-entry`.
+- Fix module structure in README.md.
+
 ## 0.6.0 (Oct 13, 2020)
- Being overly careful here, this version is not breaking for almost all the existing users. It could possibly break in some edge cases, since it changes how modules are collected (from global to one each compilation) or if you have a workaround for a working webpack multi configuration.
- * BREAKING (POSSIBLY): Use a dedicated cache for every compilation (Prevent arbitrary files deletion when using Webpack with multi configurations) (PR [#39](https://github.com/fqborges/webpack-fix-style-only-entries/pull/39))
+Being overly careful here, this version is not breaking for almost all the existing users. It could possibly break in some edge cases, since it changes how modules are collected (from global to one each compilation) or if you have a workaround for a working webpack multi configuration.
+- BREAKING (POSSIBLY): Use a dedicated cache for every compilation (Prevent arbitrary files deletion when using Webpack with multi configurations) (PR [#39](https://github.com/fqborges/webpack-fix-style-only-entries/pull/39))
 
 ## 0.5.2 (Oct 07, 2020)
- * Webpack 5 support using ModuleGraph API (PR [#38](https://github.com/fqborges/webpack-fix-style-only-entries/pull/38))
- * npm audit fix: ([ea9dd7](https://github.com/fqborges/webpack-fix-style-only-entries/commit/ea9dd7bd7ade5b16623064a4850de39545e1e18e))
+ - Webpack 5 support using ModuleGraph API (PR [#38](https://github.com/fqborges/webpack-fix-style-only-entries/pull/38))
+ - npm audit fix: ([ea9dd7](https://github.com/fqborges/webpack-fix-style-only-entries/commit/ea9dd7bd7ade5b16623064a4850de39545e1e18e))
 
 ## 0.5.1 (Jun 13, 2020)
- * Fix Maximum call stack size exceeded (PR [#34](https://github.com/fqborges/webpack-fix-style-only-entries/pull/34))
- * Added CHANGELOG ([3e3767](https://github.com/fqborges/webpack-fix-style-only-entries/commit/3e3767d8998a53d807b5d5b10643d05b800aa79a))
+ - Fix Maximum call stack size exceeded (PR [#34](https://github.com/fqborges/webpack-fix-style-only-entries/pull/34))
+ - Added CHANGELOG ([3e3767](https://github.com/fqborges/webpack-fix-style-only-entries/commit/3e3767d8998a53d807b5d5b10643d05b800aa79a))
 
 ## 0.5.0 (May 18, 2020)
-
- * fix for [#23](https://github.com/fqborges/webpack-fix-style-only-entries/issues/23) ([37d350](https://github.com/fqborges/webpack-fix-style-only-entries/commit/37d350eec83f49c0b12729a93aa6cf2f96d92d0b))
- * fix for [#24](https://github.com/fqborges/webpack-fix-style-only-entries/issues/24) ([d92bec](https://github.com/fqborges/webpack-fix-style-only-entries/commit/d92bec4be5fe4b97a8651a9206fa2281ce1424be))
- * BREAKING: added styl and sass to default extensions ([247a5c](https://github.com/fqborges/webpack-fix-style-only-entries/commit/247a5c9f963e4d7598539056ab3f709b0558b4ec))
- * added LICENSE.txt ([220e20](https://github.com/fqborges/webpack-fix-style-only-entries/commit/220e20eeb9bc95652a942812a424aadd92ec7d1f))
+ - fix for [#23](https://github.com/fqborges/webpack-fix-style-only-entries/issues/23) ([37d350](https://github.com/fqborges/webpack-fix-style-only-entries/commit/37d350eec83f49c0b12729a93aa6cf2f96d92d0b))
+ - fix for [#24](https://github.com/fqborges/webpack-fix-style-only-entries/issues/24) ([d92bec](https://github.com/fqborges/webpack-fix-style-only-entries/commit/d92bec4be5fe4b97a8651a9206fa2281ce1424be))
+ - BREAKING: added styl and sass to default extensions ([247a5c](https://github.com/fqborges/webpack-fix-style-only-entries/commit/247a5c9f963e4d7598539056ab3f709b0558b4ec))
+ - added LICENSE.txt ([220e20](https://github.com/fqborges/webpack-fix-style-only-entries/commit/220e20eeb9bc95652a942812a424aadd92ec7d1f))
 
 ## 0.4.0 (Sep 8, 2019)
- * feat: add support for module js files (PR [#21](https://github.com/fqborges/webpack-fix-style-only-entries/pull/21))
-
+ - feat: add support for module js files (PR [#21](https://github.com/fqborges/webpack-fix-style-only-entries/pull/21))

LICENSE.txt

@@ -1,6 +1,7 @@
 ISC License
 
-Copyright (c) 2020, fqborges
+Copyright (c) 20218-2020, fqborges
+Copyright (c) 2020, webdiscus
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

README.md

@@ -70,4 +70,4 @@ module.exports = {
 Give an especial extension to your file (`.css.js` for example) and configure `new FixStyleOnlyEntriesPlugin({ extensions:['css.js'] })`. See: https://github.com/fqborges/webpack-fix-style-only-entries/issues/8.
 
 ### I use webpack-hot-middleware:
-Configure this plugin as `new FixStyleOnlyEntriesPlugin({ ignore: 'webpack-hot-middleware' })`. See: https://github.com/fqborges/webpack-fix-style-only-entries/issues/12 and https://github.com/fqborges/webpack-fix-style-only-entries/blob/master/test/cases/css-entry-with-ignored-hmr/webpack.config.js.
+Configure this plugin as `new FixStyleOnlyEntriesPlugin({ ignore: 'webpack-hot-middleware' })`. See: https://github.com/fqborges/webpack-fix-style-only-entries/issues/12 and https://github.com/fqborges/webpack-fix-style-only-entries/blob/master/test/cases/css-entry-with-ignored-hmr/webpack.config.js.

index.js

@@ -1,53 +1,64 @@
-const NAME = "webpack-fix-style-only-entries";
+/**
+ * Webpack 5 plugin to remove empty scripts generated by usage only style in entries.
+ */
+
+const NAME = 'webpack-remove-empty-scripts';
 
 const defaultOptions = {
-  extensions: ["less", "scss", "css", "sass", "styl"],
+  extensions: ['css', 'scss', 'sass', 'less', 'styl'],
+  scriptExtensions: ['js', 'mjs'],
   silent: false,
   ignore: undefined,
 };
 
-class WebpackFixStyleOnlyEntriesPlugin {
+class WebpackRemoveEmptyScriptsPlugin {
   constructor(options) {
     this.apply = this.apply.bind(this);
-
     this.options = Object.assign({}, defaultOptions, options);
   }
 
   apply(compiler) {
     const extensionsWithoutDots = this.options.extensions.map(e =>
-      e[0] === "." ? e.substring(1) : e
+        e[0] === '.' ? e.substring(1) : e
     );
 
     const patternOneOfExtensions = extensionsWithoutDots
-      .map(ext => escapeRegExp(ext))
-      .join("|");
+        .map(ext => escapeRegExp(ext))
+        .join('|');
 
     const reStylesResource = new RegExp(
-      `[.](${patternOneOfExtensions})([?].*)?$`
+        `[.](${patternOneOfExtensions})([?].*)?$`
     );
 
     compiler.hooks.compilation.tap(NAME, compilation => {
       const resourcesCache = [];
+
       compilation.hooks.chunkAsset.tap(NAME, (chunk, file) => {
-        if (!file.endsWith(".js") && !file.endsWith(".mjs")) return;
-        if (!chunk.hasEntryModule()) return;
+        const isNotScript = defaultOptions.scriptExtensions.every((ext) => file.lastIndexOf('.' + ext) < 0);
+        if (isNotScript) return;
+
+        // has entry modules
+        if (compilation.chunkGraph.getNumberOfEntryModules(chunk) < 1) return;
+        const entryModules = Array.from(compilation.chunkGraph.getChunkEntryModulesIterable(chunk));
+        if (entryModules.length < 1) return;
+
+        const entryModule = entryModules[0];
+        const entryResources = collectEntryResources(compilation, entryModule, resourcesCache);
 
-        const rawResources = collectEntryResources(compilation, chunk.entryModule, resourcesCache);
         const resources = this.options.ignore
-          ? rawResources.filter(r => !r.match(this.options.ignore))
-          : rawResources;
+            ? entryResources.filter(res => !res.match(this.options.ignore))
+            : entryResources;
 
         const isStyleOnly =
-          resources.length &&
-          resources.every(resource => reStylesResource.test(resource));
+            resources.length &&
+            resources.every(resource => reStylesResource.test(resource));
+
         if (isStyleOnly) {
           if (!this.options.silent) {
-            console.error(
-              "webpack-fix-style-only-entries: removing js from style only module: " +
-                file
-            );
+            console.log('[remove-empty-scripts] remove empty js from style only entry: ' + file);
           }
-          chunk.files = chunk.files.filter(f => f != file);
+          
+          chunk.files.delete(file);
           delete compilation.assets[file];
         }
       });
@@ -56,48 +67,55 @@ class WebpackFixStyleOnlyEntriesPlugin {
 }
 
 function collectEntryResources(compilation, module, cache) {
-  // module.index is unique per compilation
+  const index = compilation.moduleGraph.getPreOrderIndex(module),
+      resources = [];
+
+  // index of module is unique per compilation
   // module.id can be null, not used here
-  if (cache[module.index] !== undefined) {
-    return cache[module.index];
+  if (cache[index] !== undefined) {
+
+    return cache[index];
   }
 
-  if (typeof module.resource == "string") {
+  if (typeof module.resource == 'string') {
     const resources = [module.resource];
-    cache[module.index] = resources;
+    cache[index] = resources;
+
     return resources;
   }
 
-  const resources = [];
   if (module.dependencies) {
-    const hasModuleGraphSupport = compilation.hasOwnProperty('moduleGraph');
     module.dependencies.forEach(dep => {
       if(dep) {
-        const module = hasModuleGraphSupport ? compilation.moduleGraph.getModule(dep) : dep.module;
-        const originModule = hasModuleGraphSupport ? compilation.moduleGraph.getParentModule(dep) : dep.originModule;
-        const nextModule = module || originModule;
+        const module = compilation.moduleGraph.getModule(dep),
+            originModule = compilation.moduleGraph.getParentModule(dep),
+            nextModule = module || originModule;
+
         if (nextModule) {
           const depResources = collectEntryResources(compilation, nextModule, cache);
+
           for (let index = 0, length = depResources.length; index !== length; index++) {
             resources.push(depResources[index]);
           }
         }
       }
     });
   }
+  cache[index] = resources;
 
-  cache[module.index] = resources;
   return resources;
 }
 
 // https://github.com/lodash/lodash/blob/4.17.11/lodash.js#L14274
 const reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
 const reHasRegExpChar = RegExp(reRegExpChar.source);
+
 function escapeRegExp(string) {
   string = String(string);
+
   return string && reHasRegExpChar.test(string)
-    ? string.replace(reRegExpChar, "\\$&")
-    : string;
+      ? string.replace(reRegExpChar, '\\$&')
+      : string;
 }
 
-module.exports = WebpackFixStyleOnlyEntriesPlugin;
+module.exports = WebpackRemoveEmptyScriptsPlugin;