fix(node-resolve): handle nested entry modules with the resolveOnly o…

…ption (#430)

packages/node-resolve/package.json

@@ -61,7 +61,7 @@
     "@babel/preset-env": "^7.9.0",
     "@rollup/plugin-json": "^4.0.1",
     "es5-ext": "^0.10.53",
-    "rollup": "^2.0.0",
+    "rollup": "^2.12.0",
     "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-commonjs": "^10.1.0",
     "source-map": "^0.7.3",

packages/node-resolve/src/index.js

@@ -122,13 +122,12 @@ export function nodeResolve(opts = {}) {
         isRelativeImport = true;
       }
 
-      const input = normalizeInput(rollupOptions.input);
       if (
         !isRelativeImport &&
         resolveOnly.length &&
         !resolveOnly.some((pattern) => pattern.test(id))
       ) {
-        if (input.includes(id)) {
+        if (normalizeInput(rollupOptions.input).includes(importee)) {
           return null;
         }
         return false;

packages/node-resolve/src/util.js

@@ -156,7 +156,7 @@ export function normalizeInput(input) {
   }
 
   // otherwise it's a string
-  return input;
+  return [input];
 }
 
 // Resolve module specifiers in order. Promise resolves to the first module that resolves

packages/node-resolve/test/fixtures/nested/only.js

@@ -0,0 +1,10 @@
+import foo from '@scoped/foo';
+import bar from '@scoped/bar';
+import test from 'test';
+
+import local from '../only-local';
+
+console.log(foo);
+console.log(bar);
+console.log(test);
+console.log(local);

packages/node-resolve/test/only.js

@@ -29,6 +29,26 @@ test('specify the only packages to resolve', async (t) => {
   t.assert(Object.keys(modules).includes(resolve('only-local.js')));
 });
 
+test('handles nested entry modules', async (t) => {
+  const warnings = [];
+  const bundle = await rollup({
+    input: ['nested/only.js'],
+    onwarn: (warning) => warnings.push(warning),
+    plugins: [
+      nodeResolve({
+        resolveOnly: ['test']
+      })
+    ]
+  });
+  const imports = await getImports(bundle);
+  const modules = await getResolvedModules(bundle);
+
+  t.is(warnings.length, 0);
+  t.snapshot(warnings);
+  t.deepEqual(imports, ['@scoped/foo', '@scoped/bar']);
+  t.assert(Object.keys(modules).includes(resolve('only-local.js')));
+});
+
 test('regex', async (t) => {
   const warnings = [];
   const bundle = await rollup({

packages/node-resolve/test/snapshots/only.js.md

@@ -41,3 +41,9 @@ Generated by [AVA](https://ava.li).
 > Snapshot 1
 
     []
+
+## handles nested entry modules
+
+> Snapshot 1
+
+    []