Removed file filters for now and fixed problem with Webpack loader order

Author: Marc Eickhoff

README.md

@@ -31,19 +31,6 @@ mix
     level: 2,
     format: mix.inProduction() ? false : 'beautify' // Beautify only in dev mode
   })
-
-  // Run clean-css only on one specific stylesheet
-  .cleanCss({
-    // ...
-  }, 'src/app.scss')
-
-  // Run clean-css only on multiple specific stylesheets
-  .cleanCss({
-    // ...
-  }, [
-    'src/app.scss',
-    'src/app.sass',
-  ])
 ```
 
 For more information about clean-css configurations please refer to their [documentation](https://github.com/jakubpawlowicz/clean-css/blob/master/README.md).

index.js

@@ -1,6 +1,4 @@
 const mix = require('laravel-mix');
-const path = require('path');
-const escapeStringRegexp = require('escape-string-regexp');
 
 class CleanCss {
 
@@ -17,49 +15,44 @@ class CleanCss {
 	 * Register the component.
 	 *
 	 * @param  {Object} options CleanCSS configuration object
-	 * @param  {String|Array} filter One or more source stylesheet files
 	 * @return {void}
 	 */
-	register(options, filter) {
+	register(options) {
 		this.options = options;
-		this.filter = filter;
 	}
 
 	/**
-	 * Rules to be merged with the master webpack loaders.
+	 * Insert the clean-css-loader into the generated webpack configuration.
 	 *
-	 * @return {Object}
+	 * @param  {Object} webpackConfig
+	 * @return {void}
 	 */
-	webpackRules() {
-		// Create regular expression for file test
-		let test = /\.(s[ac]|le)ss|styl(us)?$/; // All source stylesheets by default
-		if (typeof this.filter !== 'undefined') { // File filter is given
-			if (typeof this.filter === 'string') { // Only one file path given
-				this.filter = [this.filter]; // Cast to array
-			}
-			if (Array.isArray(this.filter)) {
-				let filters = [];
-				this.filter.forEach((filter) => { // Iterate over given file filters
-					if (!path.isAbsolute(filter)) {
-						filter = path.resolve(filter);
-					}
-					filters.push(escapeStringRegexp(filter));
-				});
-				test = new RegExp(filters.join('|')); // Create regular expression from string
-			}
-			else {
-				console.log(`laravel-mix-clean-css: Filter must be array or string, was ${typeof this.filter}, skipping`);
-			}
-		}
+	webpackConfig(webpackConfig) {
+		let options = this.options;
+
+		// Where to insert the clean-css-loader
+		const insertBefore = "postcss-loader";
+
+		// Go through all rules
+		webpackConfig.module.rules.forEach(function (rule) {
+
+			// Skip rules without loaders
+			if (typeof rule.loaders === "undefined") return;
+
+			// Go through all loaders of a rule
+			rule.loaders.forEach(function (loader) {
+
+				// Search for postcss-loader
+				if (typeof loader === "object" && loader.loader === insertBefore) {
 
-		// Return clean-css rule
-		return {
-			test: test,
-			use: [{
-				loader: "clean-css-loader",
-				options: this.options
-			}]
-		}
+					// Insert clean-css right before
+					rule.loaders.splice(rule.loaders.indexOf(insertBefore) - 1, 0, {
+						loader: "clean-css-loader",
+						options: options
+					});
+				}
+			});
+		});
 	}
 }