babel-preset-expo 12.1.0-canary-20241211-61c49bd → 12.1.0-canary-20250131-5c4e588

package/build/server-actions-plugin.js

@@ -101,13 +101,58 @@ function reactServerActionsPlugin(api) {
         const functionDeclaration = t.exportNamedDeclaration(t.variableDeclaration(bindingKind, [
             t.variableDeclarator(extractedIdentifier, extractedFunctionExpr),
         ]));
-        // TODO: this is cacheable, no need to recompute
-        const programBody = moduleScope.path.get('body');
-        const lastImportPath = findLast(Array.isArray(programBody) ? programBody : [programBody], (stmt) => stmt.isImportDeclaration());
-        const [inserted] = lastImportPath.insertAfter(functionDeclaration);
-        moduleScope.registerBinding(bindingKind, inserted);
-        inserted.addComment('leading', ' hoisted action: ' + (getFnPathName(path) ?? '<anonymous>'), true);
+        // Insert the declaration as close to the original declaration as possible.
+        const isPathFunctionInTopLevel = path.find((p) => p.isProgram()) === path;
+        const decl = isPathFunctionInTopLevel ? path : findImmediatelyEnclosingDeclaration(path);
+        let inserted;
+        const canInsertExportNextToPath = (decl) => {
+            if (!decl) {
+                return false;
+            }
+            if (decl.parentPath?.isProgram()) {
+                return true;
+            }
+            return false;
+        };
+        const findNearestPathThatSupportsInsertBefore = (decl) => {
+            let current = decl;
+            // Check if current scope is suitable for `export` insertion
+            while (current && !current.isProgram()) {
+                if (canInsertExportNextToPath(current)) {
+                    return current;
+                }
+                const parentPath = current.parentPath;
+                if (!parentPath) {
+                    return null;
+                }
+                current = parentPath;
+            }
+            if (current.isFunction()) {
+                // Don't insert exports inside functions
+                return null;
+            }
+            return current;
+        };
+        const topLevelDecl = decl ? findNearestPathThatSupportsInsertBefore(decl) : null;
+        if (topLevelDecl) {
+            // If it's a variable declaration, insert before its parent statement to avoid syntax errors
+            const targetPath = topLevelDecl.isVariableDeclarator()
+                ? topLevelDecl.parentPath
+                : topLevelDecl;
+            [inserted] = targetPath.insertBefore(functionDeclaration);
+            moduleScope.registerBinding(bindingKind, inserted);
+            inserted.addComment('leading', ' hoisted action: ' + (getFnPathName(path) ?? '<anonymous>'), true);
+        }
+        else {
+            // Fallback to inserting after the last import if no enclosing declaration is found
+            const programBody = moduleScope.path.get('body');
+            const lastImportPath = findLast(Array.isArray(programBody) ? programBody : [programBody], (stmt) => stmt.isImportDeclaration());
+            [inserted] = lastImportPath.insertAfter(functionDeclaration);
+            moduleScope.registerBinding(bindingKind, inserted);
+            inserted.addComment('leading', ' hoisted action: ' + (getFnPathName(path) ?? '<anonymous>'), true);
+        }
         return {
+            inserted,
             extractedIdentifier,
             getReplacement: () => getInlineActionReplacement({
                 id: extractedIdentifier,
@@ -211,8 +256,6 @@ function reactServerActionsPlugin(api) {
                     // so we can't just remove this node.
                     // replace the function decl with a (hopefully) equivalent var declaration
                     // `var [name] = $$INLINE_ACTION_{N}`
-                    // TODO: this'll almost certainly break when using default exports,
-                    // but tangle's build doesn't support those anyway
                     const bindingKind = 'var';
                     const [inserted] = path.replaceWith(t.variableDeclaration(bindingKind, [t.variableDeclarator(fnId, extractedIdentifier)]));
                     tlb.scope.registerBinding(bindingKind, inserted);
@@ -510,7 +553,7 @@ const getFreeVariables = (path) => {
     return [...freeVariablesSet].sort();
 };
 const getFnPathName = (path) => {
-    return path.isArrowFunctionExpression() ? undefined : path.node.id.name;
+    return path.isArrowFunctionExpression() ? undefined : path.node?.id?.name;
 };
 const isChildScope = ({ root, parent, child, }) => {
     let curScope = child;

package/build/web-preset.js

@@ -13,15 +13,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // use `this.foo = bar` instead of `this.defineProperty('foo', ...)`
 const loose = true;
 const defaultPlugins = [
-    [require('@babel/plugin-syntax-flow')],
+    // This is required for parsing React Native with RSC enabled :/
+    [require('babel-plugin-syntax-hermes-parser'), { parseLangTypes: 'flow' }],
+    //
     [require('babel-plugin-transform-flow-enums')],
     [require('@babel/plugin-transform-private-methods'), { loose }],
     [require('@babel/plugin-transform-private-property-in-object'), { loose }],
-    // [require('@babel/plugin-syntax-dynamic-import')],
     [require('@babel/plugin-syntax-export-default-from')],
-    // [require('@babel/plugin-syntax-nullish-coalescing-operator')],
-    // [require('@babel/plugin-syntax-optional-chaining')],
-    // [require('@babel/plugin-transform-unicode-regex')],
 ];
 module.exports = function (babel, options) {
     const extraPlugins = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-expo",
-  "version": "12.1.0-canary-20241211-61c49bd",
+  "version": "12.1.0-canary-20250131-5c4e588",
   "description": "The Babel preset for Expo projects",
   "main": "build/index.js",
   "files": [
@@ -49,6 +49,7 @@
     "@babel/preset-typescript": "^7.23.0",
     "@react-native/babel-preset": "0.76.3",
     "babel-plugin-react-native-web": "~0.19.13",
+    "babel-plugin-syntax-hermes-parser": "0.25.1",
     "react-refresh": "^0.14.2"
   },
   "peerDependencies": {
@@ -66,7 +67,7 @@
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "babel-plugin-react-compiler": "^19.0.0-beta-9ee70a1-20241017",
-    "expo-module-scripts": "4.0.3-canary-20241211-61c49bd",
+    "expo-module-scripts": "4.0.4-canary-20250131-5c4e588",
     "jest": "^29.2.1",
     "react-compiler-runtime": "^19.0.0-beta-8a03594-20241020"
   }