fix: Replace too broad regexp in babel-loader config in webpack confi…

…g templates (#362) * fix: Replace too broad regexp in babel-loader config in webpack config templates * fix: Transpile all react-native related libraries with babel-loader
callstack · May 22, 2023 · 0c43fe6 · 0c43fe6
1 parent 47dfe0a
commit 0c43fe6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/packages/TesterApp/webpack.config.mjs b/packages/TesterApp/webpack.config.mjs
@@ -138,7 +138,8 @@ export default (env) => {
         {
           test: /\.[jt]sx?$/,
           include: [
-            /node_modules(.*[/\\])+react/,
+            /node_modules(.*[/\\])+react\//,
+            /node_modules(.*[/\\])+react-native/,
             /node_modules(.*[/\\])+@react-native/,
             /node_modules(.*[/\\])+@react-navigation/,
             /node_modules(.*[/\\])+@react-native-community/,

diff --git a/templates/webpack.config.cjs b/templates/webpack.config.cjs
@@ -148,7 +148,8 @@ module.exports = (env) => {
         {
           test: /\.[jt]sx?$/,
           include: [
-            /node_modules(.*[/\\])+react/,
+            /node_modules(.*[/\\])+react\//,
+            /node_modules(.*[/\\])+react-native/,
             /node_modules(.*[/\\])+@react-native/,
             /node_modules(.*[/\\])+@react-navigation/,
             /node_modules(.*[/\\])+@react-native-community/,

diff --git a/templates/webpack.config.mjs b/templates/webpack.config.mjs
@@ -49,7 +49,7 @@ export default (env) => {
   // if (devServer) {
   //   devServer.hmr = false;
   // }
-  
+
   /**
    * Depending on your Babel configuration you might want to keep it.
    * If you don't use `env` in your Babel config, you can remove it.
@@ -150,7 +150,8 @@ export default (env) => {
         {
           test: /\.[jt]sx?$/,
           include: [
-            /node_modules(.*[/\\])+react/,
+            /node_modules(.*[/\\])+react\//,
+            /node_modules(.*[/\\])+react-native/,
             /node_modules(.*[/\\])+@react-native/,
             /node_modules(.*[/\\])+@react-navigation/,
             /node_modules(.*[/\\])+@react-native-community/,

diff --git a/website/static/diffs/repack_v2-v3.diff b/website/static/diffs/repack_v2-v3.diff
@@ -8,12 +8,12 @@ index 6ff525d..af917c4 100644
  const TerserPlugin = require('terser-webpack-plugin');
 -const ReactNative = require('@callstack/repack');
 +const Repack = require('@callstack/repack');
- 
+
  /**
   * More documentation, installation, usage, motivation and differences with Metro is available at:
 @@ -12,292 +11,223 @@ const ReactNative = require('@callstack/repack');
   */
- 
+
  /**
 - * This is the Webpack configuration file for your React Native project.
 - * It can be used in 2 ways:
@@ -50,7 +50,7 @@ index 6ff525d..af917c4 100644
 +    assetsPath = undefined,
 +    reactNativePath = require.resolve('react-native'),
 +  } = env;
- 
+
 -const mode = ReactNative.getMode({ fallback: 'development' });
 -const dev = mode === 'development';
 -const context = ReactNative.getContext();
@@ -72,7 +72,7 @@ index 6ff525d..af917c4 100644
 +  if (!platform) {
 +    throw new Error('Missing platform');
 +  }
- 
+
 -/**
 - * Webpack configuration.
 - */
@@ -229,7 +229,8 @@ index 6ff525d..af917c4 100644
 -      {
 -        test: /\.[jt]sx?$/,
 -        include: [
--          /node_modules(.*[/\\])+react/,
+-          /node_modules(.*[/\\])+react\//,
+-          /node_modules(.*[/\\])+react-native/,
 -          /node_modules(.*[/\\])+@react-native/,
 -          /node_modules(.*[/\\])+@react-navigation/,
 -          /node_modules(.*[/\\])+@react-native-community/,
@@ -285,7 +286,8 @@ index 6ff525d..af917c4 100644
 +        {
 +          test: /\.[jt]sx?$/,
 +          include: [
-+            /node_modules(.*[/\\])+react/,
++            /node_modules(.*[/\\])+react\//,
++            /node_modules(.*[/\\])+react-native/,
 +            /node_modules(.*[/\\])+@react-native/,
 +            /node_modules(.*[/\\])+@react-navigation/,
 +            /node_modules(.*[/\\])+@react-native-community/,