@atlaspack/resolver-tesseract 2.15.9-dev-yarn-8750a7d2e.0 → 2.15.9

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 2.15.9
+
+### Patch Changes
+
+- [#848](https://github.com/atlassian-labs/atlaspack/pull/848) [`26fcd0c`](https://github.com/atlassian-labs/atlaspack/commit/26fcd0ca1ede7c9e178cda01aa68d10fbeb8b405) Thanks [@vykimnguyen](https://github.com/vykimnguyen)! - add react-dom/server handling
+
+- Updated dependencies []:
+  - @atlaspack/node-resolver-core@3.7.7
+  - @atlaspack/types-internal@2.20.6
+  - @atlaspack/plugin@2.14.36
+
 ## 2.15.8
 
 ### Patch Changes

package/dist/TesseractResolver.js

@@ -63,6 +63,7 @@ exports.default = new plugin_1.Resolver({
         const serverSuffixes = userConfig.serverSuffixes || [];
         const ignoreModules = userConfig.ignoreModules || [];
         const browserResolvedNodeBuiltins = userConfig.browserResolvedNodeBuiltins || [];
+        const handleReactDomServer = userConfig.handleReactDomServer || false;
         const nodeResolver = new node_resolver_core_1.default({
             fs: options.inputFS,
             projectRoot: options.projectRoot,
@@ -89,10 +90,11 @@ exports.default = new plugin_1.Resolver({
             builtinAliases,
             ignoreModules,
             browserResolvedNodeBuiltins,
+            handleReactDomServer,
         };
     },
     resolve({ dependency, specifier, config, options }) {
-        const { nodeResolver, browserResolver, ignoreModules, browserResolvedNodeBuiltins, preResolved, builtinAliases, serverSuffixes, } = config;
+        const { nodeResolver, browserResolver, ignoreModules, browserResolvedNodeBuiltins, preResolved, builtinAliases, serverSuffixes, handleReactDomServer, } = config;
         if ((0, path_1.isAbsolute)(specifier)) {
             return {
                 filePath: specifier,
@@ -132,34 +134,49 @@ exports.default = new plugin_1.Resolver({
         const useBrowser = browserResolvedNodeBuiltins.includes(specifier) ||
             (options.env.STATIC_FALLBACK === 'true' &&
                 STATIC_FALLBACK_MODULES.includes(specifier));
+        const snapvmEnv = new Proxy(dependency.env, {
+            get(target, property) {
+                if (handleReactDomServer && specifier.includes('react-dom/server')) {
+                    if (property === 'isNode') {
+                        return () => true;
+                    }
+                    if (property === 'isBrowser') {
+                        return () => false;
+                    }
+                    if (property === 'isWorker') {
+                        return () => false;
+                    }
+                }
+                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);
+            },
+        });
+        const packageConditions = handleReactDomServer && specifier.includes('react-dom/server')
+            ? ['default']
+            : ['ssr', 'require'];
         const promise = useBrowser
             ? browserResolver.resolve({
                 sourcePath: dependency.sourcePath,
                 parent: dependency.resolveFrom,
                 filename: aliasSpecifier || specifier,
                 specifierType: dependency.specifierType,
-                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'],
+                env: snapvmEnv,
+                packageConditions,
             })
             : nodeResolver.resolve({
                 sourcePath: dependency.sourcePath,
                 parent: dependency.resolveFrom,
                 filename: aliasSpecifier || specifier,
                 specifierType: dependency.specifierType,
-                env: dependency.env,
-                packageConditions: ['ssr', 'require'],
+                env: handleReactDomServer ? snapvmEnv : dependency.env,
+                packageConditions,
             });
         return promise
             .then(async (result) => {

package/lib/TesseractResolver.js

@@ -82,6 +82,7 @@ var _default = exports.default = new (_plugin().Resolver)({
     const serverSuffixes = userConfig.serverSuffixes || [];
     const ignoreModules = userConfig.ignoreModules || [];
     const browserResolvedNodeBuiltins = userConfig.browserResolvedNodeBuiltins || [];
+    const handleReactDomServer = userConfig.handleReactDomServer || false;
     const nodeResolver = new (_nodeResolverCore().default)({
       fs: options.inputFS,
       projectRoot: options.projectRoot,
@@ -107,7 +108,8 @@ var _default = exports.default = new (_plugin().Resolver)({
       preResolved,
       builtinAliases,
       ignoreModules,
-      browserResolvedNodeBuiltins
+      browserResolvedNodeBuiltins,
+      handleReactDomServer
     };
   },
   resolve({
@@ -123,7 +125,8 @@ var _default = exports.default = new (_plugin().Resolver)({
       browserResolvedNodeBuiltins,
       preResolved,
       builtinAliases,
-      serverSuffixes
+      serverSuffixes,
+      handleReactDomServer
     } = config;
     if ((0, _path().isAbsolute)(specifier)) {
       return {
@@ -161,32 +164,45 @@ var _default = exports.default = new (_plugin().Resolver)({
     }
     const aliasSpecifier = options.env.STATIC_FALLBACK === 'true' ? STATIC_FALLBACK_ALIAS[specifier] : builtinAliases[specifier];
     const useBrowser = browserResolvedNodeBuiltins.includes(specifier) || options.env.STATIC_FALLBACK === 'true' && STATIC_FALLBACK_MODULES.includes(specifier);
+    const snapvmEnv = new Proxy(dependency.env, {
+      get(target, property) {
+        if (handleReactDomServer && specifier.includes('react-dom/server')) {
+          if (property === 'isNode') {
+            return () => true;
+          }
+          if (property === 'isBrowser') {
+            return () => false;
+          }
+          if (property === 'isWorker') {
+            return () => false;
+          }
+        }
+        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);
+      }
+    });
+    const packageConditions = handleReactDomServer && specifier.includes('react-dom/server') ? ['default'] : ['ssr', 'require'];
     const promise = useBrowser ? browserResolver.resolve({
       sourcePath: dependency.sourcePath,
       parent: dependency.resolveFrom,
       filename: aliasSpecifier || specifier,
       specifierType: dependency.specifierType,
-      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']
+      env: snapvmEnv,
+      packageConditions
     }) : nodeResolver.resolve({
       sourcePath: dependency.sourcePath,
       parent: dependency.resolveFrom,
       filename: aliasSpecifier || specifier,
       specifierType: dependency.specifierType,
-      env: dependency.env,
-      packageConditions: ['ssr', 'require']
+      env: handleReactDomServer ? snapvmEnv : dependency.env,
+      packageConditions
     });
     return promise.then(async result => {
       const resolvedPath = result === null || result === void 0 ? void 0 : result.filePath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/resolver-tesseract",
-  "version": "2.15.9-dev-yarn-8750a7d2e.0",
+  "version": "2.15.9",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -16,13 +16,12 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/node-resolver-core": "3.7.7-dev-yarn-8750a7d2e.0",
-    "@atlaspack/plugin": "2.14.36-dev-yarn-8750a7d2e.0",
-    "@atlaspack/types-internal": "2.20.6-dev-yarn-8750a7d2e.0"
+    "@atlaspack/node-resolver-core": "3.7.7",
+    "@atlaspack/plugin": "2.14.36",
+    "@atlaspack/types-internal": "2.20.6"
   },
   "type": "commonjs",
   "scripts": {
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
-  },
-  "gitHead": "8750a7d2e6330244dd618c28a20d5a391080e4a3"
+  }
 }

package/src/TesseractResolver.ts

@@ -18,6 +18,9 @@ interface TesseractResolverConfig {
 
   /** Server file suffixes checked in priority order. */
   serverSuffixes?: Array<string>;
+
+  /** Enable React DOM Server specific behavior. */
+  handleReactDomServer?: boolean;
 }
 
 const IGNORE_MODULES_REGEX = /(mock|mocks|\.woff|\.woff2|\.mp3|\.ogg)$/;
@@ -101,7 +104,7 @@ export default new Resolver({
     const ignoreModules = userConfig.ignoreModules || [];
     const browserResolvedNodeBuiltins =
       userConfig.browserResolvedNodeBuiltins || [];
-
+    const handleReactDomServer = userConfig.handleReactDomServer || false;
     const nodeResolver = new NodeResolver({
       fs: options.inputFS,
       projectRoot: options.projectRoot,
@@ -130,6 +133,7 @@ export default new Resolver({
       builtinAliases,
       ignoreModules,
       browserResolvedNodeBuiltins,
+      handleReactDomServer,
     };
   },
   resolve({dependency, specifier, config, options}) {
@@ -141,6 +145,7 @@ export default new Resolver({
       preResolved,
       builtinAliases,
       serverSuffixes,
+      handleReactDomServer,
     } = config;
 
     if (isAbsolute(specifier)) {
@@ -194,37 +199,55 @@ export default new Resolver({
       (options.env.STATIC_FALLBACK === 'true' &&
         STATIC_FALLBACK_MODULES.includes(specifier));
 
+    const snapvmEnv = new Proxy(dependency.env, {
+      get(target, property) {
+        if (handleReactDomServer && specifier.includes('react-dom/server')) {
+          if (property === 'isNode') {
+            return () => true;
+          }
+          if (property === 'isBrowser') {
+            return () => false;
+          }
+          if (property === 'isWorker') {
+            return () => false;
+          }
+        }
+
+        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);
+      },
+    });
+
+    const packageConditions =
+      handleReactDomServer && specifier.includes('react-dom/server')
+        ? ['default']
+        : ['ssr', 'require'];
+
     const promise = useBrowser
       ? browserResolver.resolve({
           sourcePath: dependency.sourcePath,
           parent: dependency.resolveFrom,
           filename: aliasSpecifier || specifier,
           specifierType: dependency.specifierType,
-          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'],
+          env: snapvmEnv,
+          packageConditions,
         })
       : nodeResolver.resolve({
           sourcePath: dependency.sourcePath,
           parent: dependency.resolveFrom,
           filename: aliasSpecifier || specifier,
           specifierType: dependency.specifierType,
-          env: dependency.env,
-          packageConditions: ['ssr', 'require'],
+          env: handleReactDomServer ? snapvmEnv : dependency.env,
+          packageConditions,
         });
 
     return promise