@codemoreira/esad 1.4.6-7 → 1.4.6-9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemoreira/esad",
-  "version": "1.4.6-7",
+  "version": "1.4.6-9",
   "description": "Easy Super App Development - Zero-Config CLI and DevTools for React Native Module Federation",
   "main": "src/plugin/index.js",
   "types": "./src/plugin/index.d.ts",

package/src/plugin/index.js

@@ -39,56 +39,28 @@ function withESAD(env, options) {
       clean: true,
     },
     resolve: {
-      ...Repack.getResolveOptions(),
+      ...Repack.getResolveOptions(platform),
       alias: {
-        ...Repack.getResolveOptions().alias,
+        '~': dirname,
         '@': dirname,
-        'expo-router': path.resolve(dirname, 'node_modules/expo-router'),
-        'react-native': path.resolve(dirname, 'node_modules/react-native'),
+        ...Repack.getResolveOptions(platform).alias,
       },
-      extensions: [
-        '.expo.ts', '.expo.tsx', '.expo.js', '.expo.jsx',
-        '.native.ts', '.native.tsx', '.native.js', '.native.jsx',
-        ...Repack.getResolveOptions().extensions,
-      ],
+      conditionNames: ['react-native', 'require', 'import', 'default'],
     },
     module: {
       rules: [
         {
-          oneOf: [
-            {
-              test: /\.[jt]sx?$/,
-              include: [
-                path.resolve(dirname, 'app'),
-                path.resolve(dirname, 'index.js'),
-                /[\\/]node_modules[\\/](expo-router|react-native|@react-native|expo-modules-core|@module-federation|@react-navigation|react-native-safe-area-context|react-native-screens)[\\/]/
-              ],
-              use: {
-                loader: require.resolve('babel-loader'),
-                options: {
-                  presets: [
-                    [
-                      require.resolve('babel-preset-expo'),
-                      {
-                        jsxRuntime: 'automatic',
-                      },
-                    ],
-                  ],
-                  plugins: [
-                    require.resolve('@babel/plugin-transform-flow-strip-types'),
-                    [require.resolve('@babel/plugin-transform-private-methods'), { loose: true }],
-                    [require.resolve('@babel/plugin-transform-private-property-in-object'), { loose: true }],
-                    [require.resolve('@babel/plugin-transform-class-properties'), { loose: true }]
-                  ],
-                  babelrc: false,
-                  configFile: false,
-                },
-              },
-              type: 'javascript/auto',
-            },
-            ...Repack.getJsTransformRules(),
-          ]
+          test: /\.[jt]sx?$/,
+          include: [
+            path.resolve(dirname, 'app'),
+            path.resolve(dirname, 'index.js'),
+            /[\\/]node_modules[\\/](expo-router|react-native|@react-native|expo-modules-core|@module-federation|@react-navigation)[\\/]/
+          ],
+          resolve: {
+            fullySpecified: false,
+          }
         },
+        ...Repack.getJsTransformRules(),
         ...Repack.getAssetTransformRules(),
       ],
     },
@@ -103,7 +75,7 @@ function withESAD(env, options) {
         'process.env.EXPO_OS': JSON.stringify(platform),
         'process.env.EXPO_PROJECT_ROOT': JSON.stringify(dirname),
         'process.env.EXPO_ROUTER_ABS_APP_ROOT': JSON.stringify(path.resolve(dirname, 'app')),
-        'process.env.EXPO_ROUTER_APP_ROOT': JSON.stringify('../../app'), // Relative from node_modules/expo-router/_ctx.js
+        'process.env.EXPO_ROUTER_APP_ROOT': JSON.stringify('~/app'),
         'process.env.EXPO_ROUTER_IMPORT_MODE': JSON.stringify('sync'),
       }),
       new ExpoModulesPlugin(),
@@ -123,13 +95,11 @@ function withESAD(env, options) {
           'react-native-safe-area-context': { singleton: true, eager: true, requiredVersion: pkg.dependencies['react-native-safe-area-context'] },
           'expo-router': { singleton: true, eager: true, requiredVersion: pkg.dependencies['expo-router'] },
           'react-native-screens': { singleton: true, eager: true, requiredVersion: pkg.dependencies['react-native-screens'] },
-          'expo-constants': { singleton: true, eager: true, requiredVersion: pkg.dependencies['expo-constants'] },
-          'expo-linking': { singleton: true, eager: true, requiredVersion: pkg.dependencies['expo-linking'] },
           '@module-federation/runtime': { singleton: true, eager: true },
           '@module-federation/sdk': { singleton: true, eager: true },
           '@codemoreira/esad/client': {
             singleton: true,
-            eager: options.type === 'host', // Only eager in host to ensure it's available
+            eager: options.type === 'host',
             import: clientPath
           },
           ...(options.shared || {})
@@ -138,24 +108,14 @@ function withESAD(env, options) {
     ],
   };
 
-  // Add Host-specific DevServer magic for Expo
   if (options.type === 'host') {
     config.devServer = {
-      setupMiddlewares: (middlewares) => {
-        middlewares.unshift((req, res, next) => {
-          if (req.url.startsWith('/.expo/.virtual-metro-entry.bundle')) {
-            const query = req.url.split('?')[1];
-            const isMap = req.url.includes('.map');
-            const target = isMap ? '/index.bundle.map' : '/index.bundle';
-            const location = query ? `${target}?${query}` : target;
-            res.writeHead(302, { Location: location });
-            res.end();
-            return;
-          }
-          next();
-        });
-        return middlewares;
-      },
+      proxy: [
+        {
+          context: ['/.expo/.virtual-metro-entry'],
+          pathRewrite: { '^/.expo/.virtual-metro-entry': '/index.bundle' },
+        },
+      ],
     };
   }