babel-preset-expo 11.1.0-canary-20240628-1ba8152 → 11.1.0-canary-20240719-83ee47b

package/build/client-module-proxy-plugin.js

@@ -73,7 +73,7 @@ function reactClientReferencesPlugin() {
                                     pushProxy(exportName);
                                 }
                             }
-                            else if (!['InterfaceDeclaration', 'TypeAlias'].includes(exportPath.node.declaration.type)) {
+                            else if (!['InterfaceDeclaration', 'TSTypeAliasDeclaration', 'TypeAlias'].includes(exportPath.node.declaration.type)) {
                                 // TODO: What is this type?
                                 console.warn('[babel-preset-expo] Unsupported export specifier for "use client":', exportPath.node.declaration.type);
                             }

package/build/detect-dynamic-exports.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Copyright © 2024 650 Industries.
+ */
+import { ConfigAPI, types } from '@babel/core';
+export declare function detectDynamicExports(api: ConfigAPI & {
+    types: typeof types;
+}): babel.PluginObj;

package/build/detect-dynamic-exports.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectDynamicExports = void 0;
+const debug = require('debug')('expo:babel:exports');
+// A babel pass to detect the usage of `module.exports` or `exports` in a module for use in
+// export all expansion passes during tree shaking.
+function detectDynamicExports(api) {
+    const { types: t } = api;
+    return {
+        name: 'expo-detect-dynamic-exports',
+        pre(file) {
+            assertExpoMetadata(file.metadata);
+            file.metadata.hasCjsExports = false;
+        },
+        visitor: {
+            // Any usage of `module.exports` or `exports` will mark the module as non-static.
+            // module.exports.a = 1;
+            // exports.a = 1;
+            CallExpression(path, state) {
+                assertExpoMetadata(state.file.metadata);
+                if (state.file.metadata.hasCjsExports)
+                    return;
+                const callee = path.node.callee;
+                if (
+                // Object.assign(...)
+                t.isMemberExpression(callee) &&
+                    t.isIdentifier(callee.object, { name: 'Object' }) &&
+                    t.isIdentifier(callee.property, { name: 'assign' }) &&
+                    // Allow `Object.assign(module.exports)` since it does nothing. Must have a second argument.
+                    path.node.arguments.length > 1) {
+                    const isModuleExports = t.isMemberExpression(path.node.arguments[0]) &&
+                        t.isIdentifier(path.node.arguments[0].object, { name: 'module' }) &&
+                        // Second argument is `exports` or 'exports'
+                        // .exports
+                        (t.isIdentifier(path.node.arguments[0].property, { name: 'exports' }) ||
+                            // ['exports']
+                            (t.isStringLiteral(path.node.arguments[0].property) &&
+                                path.node.arguments[0].property.value === 'exports'));
+                    // NOTE: Cannot match `['exp' + 'orts']`. We'd need to run after minification to match that confidently.
+                    // Check for Object.assign(module.exports, ...), Object.assign(exports, ...)
+                    if (
+                    // module.exports
+                    isModuleExports ||
+                        // exports
+                        t.isIdentifier(path.node.arguments[0], { name: 'exports' })) {
+                        debug('Found Object.assign to module.exports or exports at ' + path.node.loc?.start.line);
+                        state.file.metadata.hasCjsExports = true;
+                    }
+                }
+            },
+            AssignmentExpression(path, state) {
+                assertExpoMetadata(state.file.metadata);
+                if (state.file.metadata.hasCjsExports)
+                    return;
+                const left = path.node.left;
+                // Detect module.exports.foo = ... or exports.foo = ...
+                if ((t.isMemberExpression(left) &&
+                    ((t.isIdentifier(left.object, { name: 'module' }) &&
+                        (t.isIdentifier(left.property, { name: 'exports' }) ||
+                            (t.isStringLiteral(left.property) && left.property.value === 'exports'))) ||
+                        t.isIdentifier(left.object, { name: 'exports' }))) ||
+                    ('object' in left &&
+                        t.isMemberExpression(left.object) &&
+                        t.isIdentifier(left.object.object, { name: 'module' }) &&
+                        (t.isIdentifier(left.object.property, { name: 'exports' }) ||
+                            (t.isStringLiteral(left.object.property) &&
+                                left.object.property.value === 'exports')))) {
+                    debug('Found assignment to module.exports or exports at ' + path.node.loc?.start.line);
+                    state.file.metadata.hasCjsExports = true;
+                }
+                else if (t.isIdentifier(left, { name: 'exports' }) &&
+                    path.scope.hasGlobal('exports') &&
+                    // Ensure left is not defined in any scope
+                    !path.scope.hasBinding('exports')) {
+                    debug('Found assignment to exports at ' + path.node.loc?.start.line);
+                    state.file.metadata.hasCjsExports = true;
+                }
+            },
+        },
+    };
+}
+exports.detectDynamicExports = detectDynamicExports;
+function assertExpoMetadata(metadata) {
+    if (metadata && typeof metadata === 'object') {
+        return;
+    }
+    throw new Error('Expected Babel state.file.metadata to be an object');
+}

package/build/environment-restricted-imports.js

@@ -7,14 +7,14 @@ const FORBIDDEN_REACT_SERVER_IMPORTS = ['client-only'];
 /** Prevent importing certain known imports in given environments. This is for sanity to ensure a module never accidentally gets imported unexpectedly. */
 function environmentRestrictedImportsPlugin(api) {
     const { types: t } = api;
-    const isReactServer = api.caller(common_1.getIsReactServer);
-    const forbiddenPackages = isReactServer
+    const isAnyServerEnvironment = api.caller(common_1.getIsReactServer) || api.caller(common_1.getIsServer);
+    const forbiddenPackages = isAnyServerEnvironment
         ? FORBIDDEN_REACT_SERVER_IMPORTS
         : FORBIDDEN_CLIENT_IMPORTS;
     function checkSource(source, path) {
         forbiddenPackages.forEach((forbiddenImport) => {
             if (source === forbiddenImport) {
-                if (isReactServer) {
+                if (isAnyServerEnvironment) {
                     throw path.buildCodeFrameError(`Importing '${forbiddenImport}' module is not allowed in a React server bundle. Add the "use client" directive to this file or one of the parent modules to allow importing this module.`);
                 }
                 else {

package/build/expo-router-plugin.d.ts

@@ -1,3 +1,6 @@
+/**
+ * Copyright © 2024 650 Industries.
+ */
 import { ConfigAPI, types } from '@babel/core';
 /**
  * Inlines environment variables to configure the process:

package/build/expo-router-plugin.js

@@ -4,6 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expoRouterBabelPlugin = void 0;
+/**
+ * Copyright © 2024 650 Industries.
+ */
 const core_1 = require("@babel/core");
 const path_1 = __importDefault(require("path"));
 const resolve_from_1 = __importDefault(require("resolve-from"));

package/build/index.js

@@ -89,15 +89,18 @@ function babelPresetExpo(api, options = {}) {
         // @see https://github.com/expo/expo/pull/11960#issuecomment-887796455
         extraPlugins.push([require('@babel/plugin-transform-object-rest-spread'), { loose: false }]);
     }
-    else if (!isServerEnv) {
-        // This is added back on hermes to ensure the react-jsx-dev plugin (`@babel/preset-react`) works as expected when
-        // JSX is used in a function body. This is technically not required in production, but we
-        // should retain the same behavior since it's hard to debug the differences.
-        extraPlugins.push(require('@babel/plugin-transform-parameters'));
+    else {
+        if (platform !== 'web' && !isServerEnv) {
+            // This is added back on hermes to ensure the react-jsx-dev plugin (`@babel/preset-react`) works as expected when
+            // JSX is used in a function body. This is technically not required in production, but we
+            // should retain the same behavior since it's hard to debug the differences.
+            extraPlugins.push(require('@babel/plugin-transform-parameters'));
+        }
     }
     const inlines = {
         'process.env.EXPO_OS': platform,
         // 'typeof document': isServerEnv ? 'undefined' : 'object',
+        'process.env.EXPO_SERVER': !!isServerEnv,
     };
     // `typeof window` is left in place for native + client environments.
     const minifyTypeofWindow = (platformOptions.minifyTypeofWindow ?? isServerEnv) || platform === 'web';
@@ -162,6 +165,9 @@ function babelPresetExpo(api, options = {}) {
             },
         ]);
     }
+    if (platformOptions.disableImportExportTransform) {
+        extraPlugins.push([require('./detect-dynamic-exports').detectDynamicExports]);
+    }
     // Use the simpler babel preset for web and server environments (both web and native SSR).
     const isModernEngine = platform === 'web' || isServerEnv;
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-expo",
-  "version": "11.1.0-canary-20240628-1ba8152",
+  "version": "11.1.0-canary-20240719-83ee47b",
   "description": "The Babel preset for Expo projects",
   "main": "build/index.js",
   "files": [
@@ -55,8 +55,8 @@
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
-    "expo-module-scripts": "3.6.0-canary-20240628-1ba8152",
+    "expo-module-scripts": "3.6.0-canary-20240719-83ee47b",
     "jest": "^29.2.1"
   },
-  "gitHead": "1ba815237ed606c5ee8488f68e49773fc9735cc3"
+  "gitHead": "83ee47b5c89c7f1b1a5101189580eaf3555f5962"
 }