Merge branch 'master' of github.com:react-atomic/reshow

react-atomic · Jan 28, 2020 · 8b81b31 · 8b81b31
2 parents 96d0a18 + c28b9fc
commit 8b81b31
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/reshow-app/package.json.build b/packages/reshow-app/package.json.build
@@ -1,6 +1,6 @@
 {
   "name": "reshow-app",
-  "version": "0.13.0-beta.19",
+  "version": "0.13.0-beta.20",
   "description": "Reshow App Files",
   "repository": "react-atomic/reshow",
   "keywords": [],

diff --git a/packages/reshow-app/src/webpack/getResolve.js b/packages/reshow-app/src/webpack/getResolve.js
@@ -9,13 +9,16 @@ const getResolve = ({confs, root, moduleAlias}) => {
     ...reshowRuntimeAlias(root),
     ...confs.alias,
   };
+
+  const results = {
+    extensions: ['.mjs', '.js', '.jsx'],
+  };
   if (moduleAlias) {
     moduleAlias.addAliases(alias);
+  } else {
+    results.alias = alias;
   }
-  return {
-    extensions: ['.mjs', '.js', '.jsx'],
-    alias,
-  };
+  return results;
 };
 
 const getResolveLoader = ({root}) => ({