Add support for explicit loader chains in extracted files

peerigon · May 23, 2017 · e7e361e · e7e361e
1 parent a753af0
commit e7e361e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/src/extractLoader.js b/src/extractLoader.js
@@ -42,8 +42,9 @@ function extractLoader(content) {
             this.addDependency(absPath);
 
             // If the required file is a JS-file, we just evaluate it with node's require
-            // This is necessary because of the css-loader which uses a helper module (css-base.js) to export stuff
-            if (/css-base\.js$/i.test(resourcePath)) {
+            // This is necessary because of the css-loader which uses a helper module (css-base.js) to export stuff.
+            // If the required file should be processed by a loader we do not touch it (even if it is a .js file).
+            if (/^[^!]*css-base\.js$/i.test(resourcePath)) {
                 return require(absPath);
             }
 

diff --git a/test/extractLoader.test.js b/test/extractLoader.test.js
@@ -119,6 +119,15 @@ describe("extractLoader", () => {
             expect(imgHtml).to.have.content.that.match(/<img src="\/other\/hi-dist\.jpg">/);
         })
     );
+    it("should support explicit loader chains", () => {
+        return compile({ testModule: "loader.html" }).then(() => {
+            const loaderHtml = path.resolve(__dirname, "dist/loader-dist.html");
+            const errJs = path.resolve(__dirname, "dist/err.js");
+
+            expect(loaderHtml).to.be.a.file();
+            expect(errJs).to.have.content("this is a syntax error\n");
+        });
+    });
     it("should report syntax errors", () =>
         compile({ testModule: "error.js" }).then(
             () => { throw new Error("Did not throw expected error"); },

diff --git a/test/modules/loader.html b/test/modules/loader.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Hello World</title>
+</head>
+<body>
+    <script src="${require('!!file?name=err.js!./error.js')}"></script>
+</body>
+</html>
diff --git a/test/support/compile.js b/test/support/compile.js
@@ -29,7 +29,8 @@ export default function ({ testModule, publicPath, query = "" }) {
                             "file?name=[name]-dist.[ext]",
                             path.resolve(__dirname, "../../lib/extractLoader.js") + query,
                             "html?" + JSON.stringify({
-                                attrs: ["img:src", "link:href"]
+                                attrs: ["img:src", "link:href"],
+                                interpolate: true
                             })
                         ]
                     },