issue #773 handle relative path exports from dependency entry points

ProjectEvergreen · Oct 17, 2021 · ff79b78 · ff79b78
1 parent e242b87
commit ff79b78
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/packages/cli/src/plugins/resource/plugin-node-modules.js b/packages/cli/src/plugins/resource/plugin-node-modules.js
@@ -76,15 +76,23 @@ const walkModule = (module, dependency) => {
     ExportNamedDeclaration(node) {
       const sourceValue = node && node.source ? node.source.value : '';
 
-      if (sourceValue !== '' && sourceValue.indexOf('.') !== 0 && sourceValue.indexOf('http') !== 0) {
-        updateImportMap(sourceValue, `/node_modules/${sourceValue}`);
+      if (sourceValue !== '' && sourceValue.indexOf('http') !== 0) {
+        if (sourceValue.indexOf('.') === 0) {
+          updateImportMap(`${dependency}/${sourceValue.replace('./', '')}`, `/node_modules/${dependency}/${sourceValue.replace('./', '')}`);
+        } else {
+          updateImportMap(sourceValue, `/node_modules/${sourceValue}`);
+        }
       }
     },
     ExportAllDeclaration(node) {
       const sourceValue = node && node.source ? node.source.value : '';
 
-      if (sourceValue !== '' && sourceValue.indexOf('.') !== 0 && sourceValue.indexOf('http') !== 0) {
-        updateImportMap(sourceValue, `/node_modules/${sourceValue}`);
+      if (sourceValue !== '' && sourceValue.indexOf('http') !== 0) {
+        if (sourceValue.indexOf('.') === 0) {
+          updateImportMap(`${dependency}/${sourceValue.replace('./', '')}`, `/node_modules/${dependency}/${sourceValue.replace('./', '')}`);
+        } else {
+          updateImportMap(sourceValue, `/node_modules/${sourceValue}`);
+        }
       }
     }
   });

diff --git a/packages/cli/test/cases/develop.default/develop.default.spec.js b/packages/cli/test/cases/develop.default/develop.default.spec.js
@@ -508,6 +508,11 @@ describe('Develop Greenwood With: ', function() {
         expect(importMap['@material/mwc-ripple/mwc-ripple']).to.equal('/node_modules/@material/mwc-ripple/mwc-ripple.js');
         expect(importMap['@material/mwc-ripple/mwc-ripple/@material/mwc-ripple/mwc-ripple.js']).to.be.undefined;
 
+        // https://github.com/ProjectEvergreen/greenwood/issues/773
+        expect(importMap['@material/base/component']).to.equal('/node_modules/@material/base/component.js');
+        expect(importMap['@material/base/foundation']).to.equal('/node_modules/@material/base/foundation.js');
+        expect(importMap['@material/base/types']).to.equal('/node_modules/@material/base/types.js');
+
         done();
       });