feat(commonjs): Infer type for unidentified modules (#1038)

packages/commonjs/src/index.js

@@ -60,10 +60,11 @@ export default function commonjs(options = {}) {
       : () =>
           typeof defaultIsModuleExportsOption === 'boolean' ? defaultIsModuleExportsOption : 'auto';
 
-  const { resolveRequireSourcesAndGetMeta, getWrappedIds } = getResolveRequireSourcesAndGetMeta(
-    extensions,
-    detectCycles
-  );
+  const {
+    resolveRequireSourcesAndGetMeta,
+    getWrappedIds,
+    isRequiredId
+  } = getResolveRequireSourcesAndGetMeta(extensions, detectCycles);
   const dynamicRequireModuleSet = getDynamicRequireModuleSet(options.dynamicRequireTargets);
   const isDynamicRequireModulesEnabled = dynamicRequireModuleSet.size > 0;
   const commonDir = isDynamicRequireModulesEnabled
@@ -115,7 +116,8 @@ export default function commonjs(options = {}) {
 
     if (
       !dynamicRequireModuleSet.has(normalizePathSlashes(id)) &&
-      (!hasCjsKeywords(code, ignoreGlobal) || (isEsModule && !options.transformMixedEsModules))
+      (!(hasCjsKeywords(code, ignoreGlobal) || isRequiredId(id)) ||
+        (isEsModule && !options.transformMixedEsModules))
     ) {
       return { meta: { commonjs: { isCommonJS: false } } };
     }
@@ -140,13 +142,28 @@ export default function commonjs(options = {}) {
       ast,
       getDefaultIsModuleExports(id),
       needsRequireWrapper,
-      resolveRequireSourcesAndGetMeta(this)
+      resolveRequireSourcesAndGetMeta(this),
+      isRequiredId(id)
     );
   }
 
   return {
     name: 'commonjs',
 
+    options(options) {
+      // Always sort the node-resolve plugin after the commonjs plugin as otherwise CommonJS entries
+      // will not work with strictRequires: true
+      const { plugins } = options;
+      if (Array.isArray(plugins)) {
+        const cjsIndex = plugins.findIndex((plugin) => plugin.name === 'commonjs');
+        const nodeResolveIndex = plugins.findIndex((plugin) => plugin.name === 'node-resolve');
+        if (nodeResolveIndex >= 0 && nodeResolveIndex < cjsIndex) {
+          plugins.splice(cjsIndex + 1, 0, plugins[nodeResolveIndex]);
+          plugins.splice(nodeResolveIndex, 1);
+        }
+      }
+    },
+
     buildStart() {
       validateRollupVersion(this.meta.rollupVersion, peerDependencies.rollup);
       if (options.namedExports != null) {

packages/commonjs/src/resolve-require-sources.js

@@ -3,6 +3,7 @@ import { resolveExtensions } from './resolve-id';
 
 export function getResolveRequireSourcesAndGetMeta(extensions, detectCycles) {
   const knownCjsModuleTypes = Object.create(null);
+  const requiredIds = Object.create(null);
   const dependentModules = Object.create(null);
   const getDependentModules = (id) =>
     dependentModules[id] || (dependentModules[id] = Object.create(null));
@@ -12,6 +13,7 @@ export function getResolveRequireSourcesAndGetMeta(extensions, detectCycles) {
       Object.keys(knownCjsModuleTypes).filter(
         (id) => knownCjsModuleTypes[id] === IS_WRAPPED_COMMONJS
       ),
+    isRequiredId: (id) => requiredIds[id],
     resolveRequireSourcesAndGetMeta: (rollupContext) => async (id, isParentCommonJS, sources) => {
       knownCjsModuleTypes[id] = isParentCommonJS;
       const requireTargets = await Promise.all(
@@ -34,6 +36,7 @@ export function getResolveRequireSourcesAndGetMeta(extensions, detectCycles) {
           if (resolved.external) {
             return { id: wrapId(childId, EXTERNAL_SUFFIX), allowProxy: false };
           }
+          requiredIds[childId] = true;
           const parentDependentModules = getDependentModules(id);
           const childDependentModules = getDependentModules(childId);
           childDependentModules[id] = true;

packages/commonjs/src/transform-commonjs.js

@@ -51,7 +51,8 @@ export default async function transformCommonjs(
   astCache,
   defaultIsModuleExports,
   needsRequireWrapper,
-  resolveRequireSourcesAndGetMeta
+  resolveRequireSourcesAndGetMeta,
+  isRequired
 ) {
   const ast = astCache || tryParse(parse, code, id);
   const magicString = new MagicString(code);
@@ -418,6 +419,7 @@ export default async function transformCommonjs(
   if (
     !(
       shouldWrap ||
+      isRequired ||
       uses.module ||
       uses.exports ||
       uses.require ||

packages/commonjs/test/fixtures/function/strict-requires-entry-node-resolve/_config.js

@@ -0,0 +1,31 @@
+const assert = require('assert');
+
+const { nodeResolve } = require('@rollup/plugin-node-resolve');
+
+module.exports = {
+  description:
+    'strict require semantic modules can be entry points when the node-resolve plugin is used',
+  pluginOptions: {
+    strictRequires: true
+  },
+  options: {
+    plugins: [
+      {
+        name: 'before-node',
+        buildStart({ plugins }) {
+          assert.deepStrictEqual(
+            plugins.map((plugin) => plugin.name),
+            ['before-node', 'after-node', 'commonjs', 'node-resolve']
+          );
+        }
+      },
+      nodeResolve(),
+      {
+        name: 'after-node'
+      }
+    ]
+  },
+  exports(exports) {
+    assert.deepStrictEqual(exports, { foo: 'foo' });
+  }
+};

packages/commonjs/test/fixtures/function/strict-require-semantic-exportmode-exports/_config.js → packages/commonjs/test/fixtures/function/strict-requires-exportmode-exports/_config.js

@@ -1,6 +1,6 @@
 module.exports = {
   description: 'supports using function wrappers for modules for export mode "exports"',
   pluginOptions: {
-    strictRequires: ['fixtures/function/strict-require-semantic-exportmode-exports/*E*.js']
+    strictRequires: ['fixtures/function/strict-requires-exportmode-exports/*E*.js']
   }
 };

packages/commonjs/test/fixtures/function/strict-require-semantic-exportmode-module/_config.js → packages/commonjs/test/fixtures/function/strict-requires-exportmode-module/_config.js

@@ -1,6 +1,6 @@
 module.exports = {
   description: 'supports using function wrappers for modules for export mode "module"',
   pluginOptions: {
-    strictRequires: ['fixtures/function/strict-require-semantic-exportmode-module/*E*.js']
+    strictRequires: ['fixtures/function/strict-requires-exportmode-module/*E*.js']
   }
 };

packages/commonjs/test/fixtures/function/strict-require-semantic-exportmode-replace/_config.js → packages/commonjs/test/fixtures/function/strict-requires-exportmode-replace/_config.js

@@ -1,6 +1,6 @@
 module.exports = {
   description: 'supports using function wrappers for modules for export mode "replace"',
   pluginOptions: {
-    strictRequires: ['fixtures/function/strict-require-semantic-exportmode-replace/*E*.js']
+    strictRequires: ['fixtures/function/strict-requires-exportmode-replace/*E*.js']
   }
 };

packages/commonjs/test/fixtures/function/strict-requires-file-without-module-type/_config.js

@@ -0,0 +1,7 @@
+module.exports = {
+  description:
+    'identifies files without module features as commonjs if they are required by another file',
+  pluginOptions: {
+    strictRequires: true
+  }
+};

packages/commonjs/test/fixtures/function/strict-requires-file-without-module-type/error.js

@@ -0,0 +1 @@
+throw new Error('FAIL');

packages/commonjs/test/fixtures/function/strict-requires-file-without-module-type/main.js

@@ -0,0 +1,2 @@
+// eslint-disable-next-line global-require
+t.is(0 && require('./error.js'), 0);

packages/commonjs/test/fixtures/function/strict-require-semantic-from-esm/_config.js → packages/commonjs/test/fixtures/function/strict-requires-from-esm/_config.js

@@ -1,6 +1,6 @@
 module.exports = {
   description: 'handles importing wrapped modules from ESM',
   pluginOptions: {
-    strictRequires: ['fixtures/function/strict-require-semantic-from-esm/strict.js']
+    strictRequires: ['fixtures/function/strict-requires-from-esm/strict.js']
   }
 };

packages/commonjs/test/fixtures/function/strict-require-semantic-entry/_config.js → packages/commonjs/test/fixtures/function/strict-requires-multiple-entry/_config.js

@@ -4,15 +4,15 @@ module.exports = {
   description: 'strict require semantic modules can be entry points',
   options: {
     input: [
-      'fixtures/function/strict-require-semantic-entry/main.js',
-      'fixtures/function/strict-require-semantic-entry/other.js'
+      'fixtures/function/strict-requires-multiple-entry/main.js',
+      'fixtures/function/strict-requires-multiple-entry/other.js'
     ],
     output: {
       chunkFileNames: 'generated-[name].js'
     }
   },
   pluginOptions: {
-    strictRequires: ['fixtures/function/strict-require-semantic-entry/main.js']
+    strictRequires: ['fixtures/function/strict-requires-multiple-entry/main.js']
   },
   exports(exports) {
     assert.deepStrictEqual(exports, { foo: 'foo' });

packages/commonjs/test/fixtures/function/strict-requires-multiple-entry/main.js

@@ -0,0 +1 @@
+exports.foo = 'foo';