Merge pull request #1 from vseventer/resolve-alias

Support aliases peerigon#81
LeadingReach · May 20, 2021 · f3f4c15 · f3f4c15
2 parents 8500840 + 6be80bc
commit f3f4c15
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/extractLoader.js b/src/extractLoader.js
@@ -124,7 +124,7 @@ function evalDependencyGraph({loaderContext, src, filename, publicPath = ""}) {
                 const indexOfLastExclMark = relativePathWithoutQuery.lastIndexOf("!");
                 const loaders = givenRelativePath.slice(0, indexOfLastExclMark + 1);
                 const relativePath = relativePathWithoutQuery.slice(indexOfLastExclMark + 1);
-                const absolutePath = resolve.sync(relativePath, {
+                const absolutePath = tryResolve(relativePath, {
                     basedir: path.dirname(filename),
                 });
                 const ext = path.extname(absolutePath);
@@ -135,7 +135,7 @@ function evalDependencyGraph({loaderContext, src, filename, publicPath = ""}) {
 
                 // If the required file is a js file, we just require it with node's require.
                 // If the required file should be processed by a loader we do not touch it (even if it is a .js file).
-                if (loaders === "" && ext === ".js") {
+                if (loaders === "" && absolutePath.indexOf("node_modules/") !== -1 && ext === ".js") {
                     // Mark the file as dependency so webpack's watcher is working for the css-loader helper.
                     // Other dependencies are automatically added by loadModule() below
                     loaderContext.addDependency(absolutePath);
@@ -222,6 +222,14 @@ function getPublicPath(options, context) {
 }
 /* eslint-enable complexity */
 
+function tryResolve(filename, options) {
+    try {
+        return resolve.sync(filename, options);
+    } catch (e) { // Return original.
+        return filename;
+    }
+}
+
 // For CommonJS interoperability
 module.exports = extractLoader;
 export default extractLoader;
diff --git a/test/extractLoader.test.js b/test/extractLoader.test.js
@@ -209,7 +209,7 @@ describe("extractLoader", () => {
                 throw new Error("Did not throw expected error");
             },
             message => {
-                expect(message).to.match(/Error: Cannot find module '\.\/does-not-exist\.jpg'/);
+                expect(message).to.match(/Error: Can't resolve '\.\/does-not-exist\.jpg'/);
             }
         ));
     it("should report resolve loader errors", () =>