build: fixme

angular · Nov 6, 2019 · f6e6ee5 · f6e6ee5
1 parent c27a90b
commit f6e6ee5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/packages/bazel/src/ng_package/rollup.config.js b/packages/bazel/src/ng_package/rollup.config.js
@@ -54,7 +54,7 @@ function resolveBazel(
     var candidate = path.join(baseDir, root, importee);
     log_verbose(`try to resolve '${importee}' at '${candidate}'`);
     try {
-      var result = resolve(candidate, {extensions: ['.mjs', '.js']});
+      var result = resolve(candidate);
       return result;
     } catch (e) {
       return undefined;
@@ -113,6 +113,13 @@ function resolveBazel(
   }
 
   if (resolved) {
+    if (path.extname(resolved) == '.js') {
+      // check for .mjs file and prioritize that
+      const resolved_mjs = resolved.substr(0, resolved.length-3) + '.mjs';
+      if (fileExists(resolved_mjs)) {
+        resolved = resolved_mjs;
+      }
+    }
     log_verbose(`resolved to ${resolved}`);
   } else {
     log_verbose(`allowing rollup to resolve '${importee}' with node module resolution`);

diff --git a/tools/ng_rollup_bundle/rollup.config.js b/tools/ng_rollup_bundle/rollup.config.js
@@ -58,7 +58,7 @@ function resolveBazel(
     var candidate = path.join(baseDir, root, importee);
     log_verbose(`try to resolve '${importee}' at '${candidate}'`);
     try {
-      var result = resolve(candidate, {extensions: ['.mjs', '.js']});
+      var result = resolve(candidate);
       return result;
     } catch (e) {
       return undefined;
@@ -117,6 +117,13 @@ function resolveBazel(
   }
 
   if (resolved) {
+    if (path.extname(resolved) == '.js') {
+      // check for .mjs file and prioritize that
+      const resolved_mjs = resolved.substr(0, resolved.length-3) + '.mjs';
+      if (fileExists(resolved_mjs)) {
+        resolved = resolved_mjs;
+      }
+    }
     log_verbose(`resolved to ${resolved}`);
   } else {
     log_verbose(`allowing rollup to resolve '${importee}' with node module resolution`);