remove old esm<>cjs support

FredKSchott · Mar 14, 2021 · 00ccca7 · 00ccca7
1 parent e9e227b
commit 00ccca7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 40 deletions.
diff --git a/esinstall/src/index.ts b/esinstall/src/index.ts
@@ -111,7 +111,7 @@ interface InstallOptions {
   polyfillNode: boolean;
   sourcemap?: boolean | 'inline';
   external: string[];
-  externalEsm: string[] | ((imp: string) => boolean);
+  externalEsm: boolean | string[] | ((imp: string) => boolean);
   packageLookupFields: string[];
   packageExportLookupFields: string[];
   // @deprecated No longer needed, all packages now have the highest fidelity named export support possible
@@ -197,7 +197,7 @@ export async function install(
   const installTargets: InstallTarget[] = _installTargets.map((t) =>
     typeof t === 'string' ? createInstallTarget(t) : t,
   );
-  
+
   // TODO: warn if import from  "firebase", since that includes so many Node-specific files
 
   const allInstallSpecifiers = new Set(
@@ -337,7 +337,7 @@ ${colors.dim(
         esmExternals: (id) =>
           Array.isArray(externalEsm)
             ? externalEsm.some((packageName) => isImportOfPackage(id, packageName))
-            : (externalEsm as Function)(id),
+            : externalEsm,
         requireReturnsDefault: 'auto',
       } as RollupCommonJSOptions),
       rollupPluginWrapInstallTargets(!!isTreeshake, installTargets, logger),

diff --git a/snowpack/src/sources/local.ts b/snowpack/src/sources/local.ts
@@ -1,17 +1,14 @@
 import crypto from 'crypto';
-import {
-  InstallOptions,
-  InstallTarget,
-  resolveDependencyManifest as _resolveDependencyManifest,
-  resolveEntrypoint,
-} from 'esinstall';
+import {InstallOptions, InstallTarget, resolveEntrypoint} from 'esinstall';
 import projectCacheDir from 'find-cache-dir';
+import findUp from 'find-up';
 import {existsSync, promises as fs} from 'fs';
-import PQueue from 'p-queue';
 import * as colors from 'kleur/colors';
-import slash from 'slash';
+import mkdirp from 'mkdirp';
+import PQueue from 'p-queue';
 import path from 'path';
 import rimraf from 'rimraf';
+import slash from 'slash';
 import {getBuiltFileUrls} from '../build/file-urls';
 import {logger} from '../logger';
 import {scanCodeImportsExports, transformFileImports} from '../rewrite-imports';
@@ -20,8 +17,8 @@ import {
   CommandOptions,
   ImportMap,
   PackageSource,
-  SnowpackConfig,
   PackageSourceLocal,
+  SnowpackConfig,
 } from '../types';
 import {
   createInstallTarget,
@@ -31,8 +28,6 @@ import {
   isRemoteUrl,
 } from '../util';
 import {installPackages} from './local-install';
-import findUp from 'find-up';
-import mkdirp from 'mkdirp';
 
 const PROJECT_CACHE_DIR =
   projectCacheDir({name: 'snowpack'}) ||
@@ -52,10 +47,6 @@ const NEVER_PEER_PACKAGES: string[] = [
   'tslib',
 ];
 
-function isPackageEsm(packageManifest: any): boolean {
-  return !!(packageManifest.module || packageManifest.exports || packageManifest.type === 'module');
-}
-
 function getRootPackageDirectory(loc: string) {
   const parts = loc.split('node_modules');
   if (parts.length === 1) {
@@ -341,17 +332,6 @@ export default {
           ...Object.keys(packageManifest.peerDependencies || {}),
         ].filter((ext) => ext !== _packageName && !NEVER_PEER_PACKAGES.includes(ext));
 
-        function getMemoizedResolveDependencyManifest() {
-          const results = {};
-          return (packageName: string) => {
-            results[packageName] =
-              results[packageName] ||
-              _resolveDependencyManifest(packageName, rootPackageDirectory!);
-            return results[packageName];
-          };
-        }
-        const resolveDependencyManifest = getMemoizedResolveDependencyManifest();
-
         const installOptions: InstallOptions = {
           dest: installDest,
           cwd: packageManifestLoc,
@@ -360,17 +340,7 @@ export default {
           sourcemap: config.buildOptions.sourcemap,
           alias: config.alias,
           external: externalPackages,
-          // ESM<>CJS Compatability: If we can detect that a dependency is common.js vs. ESM, then
-          // we can provide this hint to esinstall to improve our cross-package import support.
-          externalEsm: (imp) => {
-            const specParts = imp.split('/');
-            let _packageName: string = specParts.shift()!;
-            if (_packageName?.startsWith('@')) {
-              _packageName += '/' + specParts.shift();
-            }
-            const [, result] = resolveDependencyManifest(_packageName);
-            return !result || isPackageEsm(result);
-          },
+          externalEsm: true
         };
         if (config.packageOptions.source === 'local') {
           if (config.packageOptions.polyfillNode !== undefined) {