@teambit/react 0.0.733 → 0.0.734

package/webpack/transformers.ts

@@ -1,46 +1,37 @@
-import findRoot from 'find-root';
+import { WebpackConfigTransformContext } from '@teambit/webpack';
 import { WebpackConfigMutator } from '@teambit/webpack.modules.config-mutator';
 import { Logger } from '@teambit/logger';
+import { getExposedRules } from './get-exposed-rules';
+import { resolvePeerToDirOrFile } from './resolve-peer';
 
 export function generateAddAliasesFromPeersTransformer(peers: string[], logger: Logger) {
-  const peerAliases = peers.reduce((acc, peerName) => {
-    // gets the correct module folder of the package.
-    // this allows us to resolve internal files, for example:
-    // node_modules/react-dom/test-utils
-    //
-    // we can't use require.resolve() because it resolves to a specific file.
-    // for example, if we used "react-dom": require.resolve("react-dom"),
-    // it would try to resolve "react-dom/test-utils" as:
-    // node_modules/react-dom/index.js/test-utils
-    const resolved = getResolvedDirOrFile(peerName, logger);
-    if (resolved) {
-      acc[peerName] = resolved;
-    }
-    return acc;
-  }, {});
-  return (config: WebpackConfigMutator): WebpackConfigMutator => {
+  return (config: WebpackConfigMutator, context: WebpackConfigTransformContext): WebpackConfigMutator => {
+    const peerAliases = peers.reduce((acc, peerName) => {
+      // gets the correct module folder of the package.
+      // this allows us to resolve internal files, for example:
+      // node_modules/react-dom/test-utils
+      //
+      // we can't use require.resolve() because it resolves to a specific file.
+      // for example, if we used "react-dom": require.resolve("react-dom"),
+      // it would try to resolve "react-dom/test-utils" as:
+      // node_modules/react-dom/index.js/test-utils
+      acc[peerName] = resolvePeerToDirOrFile(peerName, logger, context.target.hostRootDir);
+      return acc;
+    }, {});
     config.addAliases(peerAliases);
     return config;
   };
 }
 
 /**
- * Get the package folder, and in case it's not found get the require.resolve path
- * @param peerName
+ * Generate a transformer that expose all the peers as global via the expose loader
+ * @param peers
  * @returns
  */
-function getResolvedDirOrFile(peerName: string, logger: Logger): string | undefined {
-  let resolved;
-  try {
-    resolved = require.resolve(peerName);
-    const folder = findRoot(resolved);
-    return folder;
-  } catch (e) {
-    if (resolved) {
-      logger.warn(`Couldn't find root dir for "${peerName}" from path "${resolved}" to add it as webpack alias`);
-    } else {
-      logger.warn(`Couldn't resolve "${peerName}" to add it as webpack alias`);
-    }
-    return resolved;
-  }
+export function generateExposePeersTransformer(peers: string[], logger: Logger) {
+  return (config: WebpackConfigMutator, context: WebpackConfigTransformContext): WebpackConfigMutator => {
+    const exposedRules = getExposedRules(peers, logger, context.target.hostRootDir);
+    config.addModuleRules(exposedRules);
+    return config;
+  };
 }

package/webpack/webpack.config.base.prod.ts

@@ -3,7 +3,6 @@ import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
 import TerserPlugin from 'terser-webpack-plugin';
 import { Configuration } from 'webpack';
 import { getExternals } from './get-externals';
-import { getExposedRules } from './get-exposed-rules';
 // import { WebpackManifestPlugin } from 'webpack-manifest-plugin';
 
 // This is the production and development configuration.
@@ -11,13 +10,6 @@ import { getExposedRules } from './get-exposed-rules';
 // eslint-disable-next-line complexity
 export default function (externalizePeer: boolean, peers: string[], dev?: boolean): Configuration {
   const externals = externalizePeer ? (getExternals(peers) as any) : undefined;
-  const exposedRules = externalizePeer ? undefined : getExposedRules(peers);
-
-  const module = externalizePeer
-    ? undefined
-    : {
-        rules: exposedRules,
-      };
 
   const optimization = dev
     ? undefined
@@ -105,7 +97,6 @@ export default function (externalizePeer: boolean, peers: string[], dev?: boolea
       };
 
   return {
-    module,
     externals,
     optimization,