@atlaspack/resolver-tesseract 2.15.3-canary.3963 → 2.15.3-canary.3965

package/lib/TesseractResolver.js

@@ -38,7 +38,7 @@ const STATIC_FALLBACK_MODULES = ['buffer', 'stream', 'events', 'util'];
 const STATIC_FALLBACK_ALIAS = {};
 const getIgnoreModules = (env, ignoreModules) => {
   if (env.PILLAR_LOCAL_DEVELOPMENT === 'true') {
-    ignoreModules.push('@atlassiansox/analytics-web-client');
+    return [...ignoreModules, '@atlassiansox/analytics-web-client'];
   }
   return ignoreModules;
 };
@@ -76,7 +76,7 @@ var _default = exports.default = new (_plugin().Resolver)({
       packageKey: '@atlaspack/resolver-tesseract'
     });
     const userConfig = (conf === null || conf === void 0 ? void 0 : conf.contents) || {};
-    const preResolved = userConfig.preResolved || new Map();
+    const preResolved = userConfig.preResolved ? new Map(Object.entries(userConfig.preResolved)) : new Map();
     const builtinAliases = userConfig.builtinAliases || {};
     const serverSuffixes = userConfig.serverSuffixes || [];
     const ignoreModules = userConfig.ignoreModules || [];
@@ -115,10 +115,6 @@ var _default = exports.default = new (_plugin().Resolver)({
     config,
     options
   }) {
-    // Only resolve for Tesseract environment
-    if (!dependency.env.isTesseract()) {
-      return null;
-    }
     const {
       nodeResolver,
       browserResolver,
@@ -153,8 +149,11 @@ var _default = exports.default = new (_plugin().Resolver)({
     }
     let preResolvedValue = preResolved.get(specifier);
     if (preResolvedValue) {
+      const resolvedPath = preResolvedValue.startsWith('./') || preResolvedValue.startsWith('../') ? require.resolve((0, _path().join)(options.projectRoot, preResolvedValue)) : require.resolve(preResolvedValue, {
+        paths: [options.projectRoot]
+      });
       return {
-        filePath: require.resolve(preResolvedValue),
+        filePath: resolvedPath,
         code: undefined,
         sideEffects: false
       };
@@ -166,7 +165,19 @@ var _default = exports.default = new (_plugin().Resolver)({
       parent: dependency.resolveFrom,
       filename: aliasSpecifier || specifier,
       specifierType: dependency.specifierType,
-      env: dependency.env,
+      env: new Proxy(dependency.env, {
+        get(target, property) {
+          if (property === 'isLibrary') {
+            return false;
+          }
+          if (typeof property === 'string') {
+            const value = target[property];
+            const ret = typeof value === 'function' ? value.bind(target) : value;
+            return ret;
+          }
+          return Reflect.get(target, property);
+        }
+      }),
       packageConditions: ['ssr', 'require']
     }) : nodeResolver.resolve({
       sourcePath: dependency.sourcePath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/resolver-tesseract",
-  "version": "2.15.3-canary.3963+038e87a78",
+  "version": "2.15.3-canary.3965+f6532d7a4",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -16,14 +16,14 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/node-resolver-core": "3.5.5-canary.184+038e87a78",
-    "@atlaspack/plugin": "2.14.5-canary.184+038e87a78",
-    "@atlaspack/types-internal": "2.14.1-canary.252+038e87a78"
+    "@atlaspack/node-resolver-core": "3.5.5-canary.186+f6532d7a4",
+    "@atlaspack/plugin": "2.14.5-canary.186+f6532d7a4",
+    "@atlaspack/types-internal": "2.14.1-canary.254+f6532d7a4"
   },
   "type": "commonjs",
   "scripts": {
     "check-ts": "tsc --emitDeclarationOnly --rootDir src",
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
-  "gitHead": "038e87a7858d39556d59d3a2d17db534d45f62c6"
+  "gitHead": "f6532d7a4f7f007bd4e5e36af04dd466f0b9f572"
 }

package/src/TesseractResolver.ts

@@ -11,7 +11,7 @@ interface TesseractResolverConfig {
   browserResolvedNodeBuiltins?: Array<string>;
 
   /** Module mappings that bypass normal resolution (e.g., for SSR compatibility). */
-  preResolved?: Map<string, string>;
+  preResolved?: Record<string, string>;
 
   /** Node.js built-in aliases for Tesseract-specific implementations. */
   builtinAliases?: Record<string, string>;
@@ -37,7 +37,7 @@ const getIgnoreModules = (
   ignoreModules: Array<string>,
 ) => {
   if (env.PILLAR_LOCAL_DEVELOPMENT === 'true') {
-    ignoreModules.push('@atlassiansox/analytics-web-client');
+    return [...ignoreModules, '@atlassiansox/analytics-web-client'];
   }
 
   return ignoreModules;
@@ -91,7 +91,9 @@ export default new Resolver({
     });
     const userConfig: TesseractResolverConfig = conf?.contents || {};
 
-    const preResolved = userConfig.preResolved || new Map<string, string>();
+    const preResolved = userConfig.preResolved
+      ? new Map(Object.entries(userConfig.preResolved))
+      : new Map<string, string>();
     const builtinAliases = userConfig.builtinAliases || {};
     const serverSuffixes = userConfig.serverSuffixes || [];
     const ignoreModules = userConfig.ignoreModules || [];
@@ -129,11 +131,6 @@ export default new Resolver({
     };
   },
   resolve({dependency, specifier, config, options}) {
-    // Only resolve for Tesseract environment
-    if (!dependency.env.isTesseract()) {
-      return null;
-    }
-
     const {
       nodeResolver,
       browserResolver,
@@ -175,8 +172,12 @@ export default new Resolver({
 
     let preResolvedValue = preResolved.get(specifier);
     if (preResolvedValue) {
+      const resolvedPath =
+        preResolvedValue.startsWith('./') || preResolvedValue.startsWith('../')
+          ? require.resolve(join(options.projectRoot, preResolvedValue))
+          : require.resolve(preResolvedValue, {paths: [options.projectRoot]});
       return {
-        filePath: require.resolve(preResolvedValue),
+        filePath: resolvedPath,
         code: undefined,
         sideEffects: false,
       };
@@ -197,7 +198,22 @@ export default new Resolver({
           parent: dependency.resolveFrom,
           filename: aliasSpecifier || specifier,
           specifierType: dependency.specifierType,
-          env: dependency.env,
+          env: new Proxy(dependency.env, {
+            get(target, property) {
+              if (property === 'isLibrary') {
+                return false;
+              }
+
+              if (typeof property === 'string') {
+                const value = target[property as keyof typeof target];
+                const ret =
+                  typeof value === 'function' ? value.bind(target) : value;
+                return ret;
+              }
+
+              return Reflect.get(target, property);
+            },
+          }),
           packageConditions: ['ssr', 'require'],
         })
       : nodeResolver.resolve({