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

Author: lukastaegert

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 ||