Configure module directory in bare module specifier rewrite

packages/analyzer/src/javascript/resolve-specifier-node.ts

@@ -35,7 +35,7 @@ const isPathSpecifier = (s: string) => /^\.{0,2}\//.test(s);
  *   this parameter causes relative paths to be returns for this style.
  */
 export const resolve =
-    (specifier: string, documentPath: string, componentInfo?: {
+    (specifier: string, documentPath: string, moduleDirectory = 'node_modules', componentInfo?: {
       packageName: string,
       rootDir: string,
       componentDir: string
@@ -48,7 +48,7 @@ export const resolve =
 
       const dependencyFilepath = nodeResolve.sync(specifier, {
         basedir: dirname(importerFilepath),
-
+        moduleDirectory,
         // It's invalid to load a .json or .node file as a module on the web,
         // but this is what Node's resolution algorithm does
         // (https://nodejs.org/api/modules.html#modules_all_together), so we

packages/analyzer/src/test/javascript/resolve-specifier-node_test.ts

@@ -61,44 +61,49 @@ suite('resolve', () => {
         './node_modules/@scope/scoped/scoped.js');
   });
 
+  test('non-component root to bower_components', async () => {
+    assert.equal(
+        resolve('bower_dep', rootMain, 'bower_components'), './bower_components/bower_dep/bower_dep.js');
+  });
+
   test('shallow dep to scoped dep', async () => {
     assert.equal(
-        resolve('@scope/scoped', shallowDepMain, shallowRootComponentInfo),
+        resolve('@scope/scoped', shallowDepMain, 'node_modules', shallowRootComponentInfo),
         '../@scope/scoped/scoped.js');
   });
 
   test('scoped dep to shallow dep', async () => {
     assert.equal(
-        resolve('shallow', scopedDepMain, shallowRootComponentInfo),
+        resolve('shallow', scopedDepMain, 'node_modules', shallowRootComponentInfo),
         '../../shallow/shallow.js');
   });
 
   test('component-root to path', async () => {
     assert.equal(
-        resolve('./root.js', rootMain, shallowRootComponentInfo), './root.js');
+        resolve('./root.js', rootMain, 'node_modules', shallowRootComponentInfo), './root.js');
   });
 
   test('component-root to shallow dep', async () => {
     assert.equal(
-        resolve('shallow', rootMain, shallowRootComponentInfo),
+        resolve('shallow', rootMain, 'node_modules', shallowRootComponentInfo),
         '../shallow/shallow.js');
   });
 
   test('component-root to scoped dep', async () => {
     assert.equal(
-        resolve('@scope/scoped', rootMain, shallowRootComponentInfo),
+        resolve('@scope/scoped', rootMain, 'node_modules', shallowRootComponentInfo),
         '../@scope/scoped/scoped.js');
   });
 
   test('scoped-component-root to shallow dep', async () => {
     assert.equal(
-        resolve('shallow', rootMain, scopedRootComponentInfo),
+        resolve('shallow', rootMain, 'node_modules', scopedRootComponentInfo),
         '../../shallow/shallow.js');
   });
 
   test('scoped-component-root to scoped dep', async () => {
     assert.equal(
-        resolve('@scope/scoped', rootMain, scopedRootComponentInfo),
+        resolve('@scope/scoped', rootMain, 'node_modules', scopedRootComponentInfo),
         '../scoped/scoped.js');
   });
 });

packages/analyzer/src/test/static/javascript/resolve-specifier-node/bower_components/bower_dep/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "bower_dep",
+  "version": "1.0.0",
+  "main": "bower_dep.js"
+}

packages/build/src/babel-plugin-bare-specifiers.ts

@@ -91,7 +91,12 @@ const maybeResolve = (
         rootDir: rootDir!,
       };
     }
-    return resolve(specifier, filePath, componentInfo);
+
+    let moduleDirectory = 'node_modules';
+    if (componentDir) {
+      moduleDirectory = componentDir.substring(componentDir.lastIndexOf('/'), componentDir.length);
+    }
+    return resolve(specifier, filePath, moduleDirectory, componentInfo);
   } catch (e) {
     // `require` and `meta` are fake imports that our other build tooling
     // injects, so we should not warn for them.