Feat: Using @dual-bundle/import-meta-resolve replace esm-resolve (#…

…824) * chore: using dual import-meta-resolve replace esm-resolve * chore: update build deps
facebook · Dec 27, 2024 · edc9b2a · edc9b2a
1 parent 347ebef
commit edc9b2a
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 111 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/babel-plugin/package.json b/packages/babel-plugin/package.json
@@ -19,7 +19,7 @@
     "@babel/core": "^7.25.8",
     "@babel/traverse": "^7.25.7",
     "@babel/types": "^7.25.8",
-    "esm-resolve": "^1.0.11"
+    "@dual-bundle/import-meta-resolve": "^4.1.0"
   },
   "jest": {
     "verbose": true,

diff --git a/packages/babel-plugin/rollup.config.mjs b/packages/babel-plugin/rollup.config.mjs
@@ -7,7 +7,6 @@
  *
  */
 
-import alias from '@rollup/plugin-alias';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 import json from '@rollup/plugin-json';
@@ -42,19 +41,13 @@ const config = {
   },
   external: process.env['HASTE']
     ? external
-    : [...external, 'esm-resolve', '@stylexjs/shared', '@stylexjs/stylex'],
-  plugins: [
-    alias({
-      entries: [
-        {
-          find: 'esm-resolve',
-          replacement: path.resolve(
-            rootDir,
-            'node_modules/esm-resolve/bundle.js',
-          ),
-        },
+    : [
+        ...external,
+        '@dual-bundle/import-meta-resolve',
+        '@stylexjs/shared',
+        '@stylexjs/stylex',
       ],
-    }),
+  plugins: [
     babel({ babelHelpers: 'bundled', extensions, include: ['./src/**/*'] }),
     nodeResolve({
       preferBuiltins: false,

diff --git a/packages/babel-plugin/src/utils/state-manager.js b/packages/babel-plugin/src/utils/state-manager.js
@@ -17,12 +17,13 @@ import type {
 import { name } from '@stylexjs/stylex/package.json';
 import path from 'path';
 import fs from 'fs';
+import url from 'url';
 import type { Check } from './validate';
 import * as z from './validate';
 import { addDefault, addNamed } from '@babel/helper-module-imports';
 import type { ImportOptions } from '@babel/helper-module-imports';
 import * as pathUtils from '../babel-path-utils';
-import { buildResolver } from 'esm-resolve';
+import { moduleResolve } from '@dual-bundle/import-meta-resolve';
 
 type ImportAdditionOptions = Omit<
   Partial<ImportOptions>,
@@ -663,8 +664,6 @@ const filePathResolver = (
   sourceFilePath: string,
   aliases: StyleXStateOptions['aliases'],
 ): ?string => {
-  const esmResolve = buildResolver(sourceFilePath);
-
   // Try importing without adding any extension
   // and then every supported extension
   for (const ext of ['', ...EXTENSIONS]) {
@@ -673,41 +672,21 @@ const filePathResolver = (
     // Try to resolve relative paths as is
     if (importPathStr.startsWith('.')) {
       try {
-        return require.resolve(importPathStr, {
-          paths: [path.dirname(sourceFilePath)],
-        });
+        return moduleResolve(importPathStr, url.pathToFileURL(sourceFilePath))
+          .pathname;
       } catch {
-        const resolved = esmResolve(importPathStr, {
-          allowImportingExtraExtensions: true,
-        });
-
-        if (resolved) {
-          if (resolved.startsWith('.')) {
-            return path.resolve(path.dirname(sourceFilePath), resolved);
-          }
-          return resolved;
-        }
+        continue;
       }
     }
 
     // Otherwise, try to resolve the path with aliases
     const allAliases = possibleAliasedPaths(importPathStr, aliases);
     for (const possiblePath of allAliases) {
       try {
-        return require.resolve(possiblePath, {
-          paths: [path.dirname(sourceFilePath)],
-        });
+        return moduleResolve(possiblePath, url.pathToFileURL(sourceFilePath))
+          .pathname;
       } catch {
-        const resolved = esmResolve(importPathStr, {
-          allowImportingExtraExtensions: true,
-        });
-
-        if (resolved) {
-          if (resolved.startsWith('.')) {
-            return path.resolve(path.dirname(sourceFilePath), resolved);
-          }
-          return resolved;
-        }
+        continue;
       }
     }
   }