JavaScriptExpert
diff --git a/‎example-project/src/utils/register-service-worker.js‎
Lines changed: 10 additions & 21 deletions b/‎example-project/src/utils/register-service-worker.js‎
Lines changed: 10 additions & 21 deletions
diff --git a/‎src/public/dist/bundle.js‎
Lines changed: 12 additions & 5 deletions b/‎src/public/dist/bundle.js‎
Lines changed: 12 additions & 5 deletions
diff --git a/‎src/public/dist/bundle.js.map‎
Lines changed: 1 addition & 1 deletion b/‎src/public/dist/bundle.js.map‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/public/js/components/sideBar/component/DependenciesTab/index.js‎
Lines changed: 5 additions & 4 deletions b/‎src/public/js/components/sideBar/component/DependenciesTab/index.js‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎src/public/js/components/sideBar/component/shared/utils.js‎
Lines changed: 6 additions & 2 deletions b/‎src/public/js/components/sideBar/component/shared/utils.js‎
Lines changed: 6 additions & 2 deletions
@@ -19,28 +19,17 @@ const isLocalhost = Boolean(
 );
 
 export default function register() {
-  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
-    // The URL constructor is available in all browsers that support SW.
-    const publicUrl = new URL(process.env.PUBLIC_URL, window.location);
-    if (publicUrl.origin !== window.location.origin) {
-      // Our service worker won't work if PUBLIC_URL is on a different origin
-      // from what our page is served on. This might happen if a CDN is used to
-      // serve assets; see https://github.com/facebookincubator/create-react-app/issues/2374
-      return;
-    }
-
-    window.addEventListener('load', () => {
-      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
+  const publicUrl = new URL(process.env.PUBLIC_URL, window.location);
+  if (publicUrl.origin !== window.location.origin) return;
 
-      if (!isLocalhost) {
-        // Is not local host. Just register service worker
-        registerValidSW(swUrl);
-      } else {
-        // This is running on localhost. Lets check if a service worker still exists or not.
-        checkValidServiceWorker(swUrl);
-      }
-    });
-  }
+  window.addEventListener('load', () => {
+    const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
+    if (!isLocalhost) {
+      registerValidSW(swUrl);
+    } else {
+      checkValidServiceWorker(swUrl);
+    }
+  });
 }
 
 function registerValidSW(swUrl) {
 
@@ -15,7 +15,7 @@ import './index.scss';
 const Panel = Collapse.Panel;
 
 const DependenciesTab = props => {
-  const { selectedNode, filesMap, selectedDependencyEdgeNodes } = props;
+  const { selectedNode, filesMap, foldersMap, selectedDependencyEdgeNodes } = props;
 
   const importedDependencies = filterImportedDependencies(
     selectedNode.importedDependencies,
@@ -35,7 +35,7 @@ const DependenciesTab = props => {
           </Panel>
           {importedDependencies.map((file, i) => {
             const filePath = convertRelativeToAbsolutePath(selectedNode.path, file.sourceFile);
-            const fileNode = findFileNode(filePath, filesMap);
+            const fileNode = findFileNode(filePath, filesMap, foldersMap);
 
             if (!fileNode) {
               return null;
@@ -69,12 +69,13 @@ const DependenciesTab = props => {
 };
 
 const mapStateToProps = state => {
-  const { selectedNode, selectedDependencyEdgeNodes, filesMap } = state.dataBus;
+  const { selectedNode, selectedDependencyEdgeNodes, filesMap, foldersMap } = state.dataBus;
 
   return {
     selectedNode,
     selectedDependencyEdgeNodes,
-    filesMap
+    filesMap,
+    foldersMap
   };
 };
 
 
@@ -21,7 +21,11 @@ export const filterImportedDependencies = (
   });
 };
 
-export const findFileNode = (path, filesMap) => {
+export const findFileNode = (path, filesMap, foldersMap) => {
+  if (foldersMap[path]) {
+    path += '/index';
+  }
+
   if (filesMap[path]) {
     return filesMap[path];
   }
@@ -51,7 +55,7 @@ export const extractExportsForImports = (fileCode, specifiers, path) => {
         if (isDefaultImported && node.type === 'ExportDefaultDeclaration') {
           exports.push(node);
         } else if (node.type === 'ExportNamedDeclaration') {
-          const declaration = node.declaration.declarations.find(d =>
+          const declaration = node.declaration && node.declaration.declarations.find(d =>
             namedImportsNames.includes(d.id.name)
           );
           if (declaration) {