expo-bbase 1.3.4 → 1.4.0

package/README.md

@@ -231,6 +231,9 @@ MIT
 
 ## 更新日志
 
+### v1.3.5
+- 🔧 **修复 Facebook 登录模块**：移除已废弃的 `expo-facebook`（SDK 54 不再包含），改用 `expo-auth-session` + `expo-web-browser` 实现 Facebook OAuth 登录
+
 ### v1.3.4
 - 🔧 **目录结构修复**：去除 `src/` 层，模块文件（`modules/`、`api/`、`stores/` 等）与 `app/` 平级
 - 📝 修正 Facebook 登录模块描述（SDK 54 不再支持 `expo-facebook`，改用 `expo-auth-session`）

package/dist/index.js

@@ -1219,92 +1219,88 @@ var auth_google_default = authGoogleModule;
 var authFacebookModule = {
   id: "auth-facebook",
   name: "Facebook \u767B\u5F55",
-  description: "expo-facebook",
+  description: "expo-auth-session + expo-web-browser\uFF08SDK 54 \u4E0D\u518D\u652F\u6301 expo-facebook\uFF09",
   defaultChecked: false,
   dependencies: {
-    "expo-facebook": "~13.0.0"
+    "expo-auth-session": "~7.0.11",
+    "expo-web-browser": "~15.0.11",
+    "expo-crypto": "~15.0.9"
   },
   devDependencies: {},
   files: [
     {
       path: "modules/auth/facebook.ts",
       content: lines(
-        'import * as Facebook from "expo-facebook";',
+        'import { responseTypes } from "expo-auth-session";',
+        'import { makeRedirectUri, useAuthRequest, useAutoDiscovery } from "expo-auth-session";',
+        'import * as WebBrowser from "expo-web-browser";',
         "",
+        "// Facebook OAuth \u914D\u7F6E",
         "export interface FacebookAuthConfig {",
-        "  appId: string;",
-        "  appName: string;",
+        "  clientId: string; // Facebook App ID",
         "}",
         "",
-        "export async function setupFacebookAuth(config: FacebookAuthConfig): Promise<void> {",
-        "  await Facebook.initializeAsync({",
-        "    appId: config.appId,",
-        "    appName: config.appName,",
-        "  });",
-        "}",
+        "// Facebook OAuth \u7AEF\u70B9",
+        'const FACEBOOK_AUTH_ENDPOINT = "https://www.facebook.com/v18.0/dialog/oauth";',
+        'const FACEBOOK_TOKEN_ENDPOINT = "https://graph.facebook.com/v18.0/oauth/access_token";',
         "",
-        "export async function signInWithFacebook(): Promise<{",
-        "  token: string | null;",
-        "  userId: string | null;",
-        "  userName: string | null;",
-        "  error: string | null;",
-        "}> {",
-        "  try {",
-        "    const result = await Facebook.logInWithReadPermissionsAsync({",
-        '      permissions: ["public_profile", "email"],',
-        "    });",
+        "// \u786E\u4FDD WebBrowser \u56DE\u8C03\u5B8C\u6210\u65F6\u5173\u95ED",
+        "WebBrowser.maybeCompleteAuthSession();",
         "",
-        '    if (result.type === "success") {',
-        "      const response = await fetch(",
-        "        `https://graph.facebook.com/me?access_token=${result.token}&fields=id,name,email`",
-        "      );",
-        "      const userData = await response.json();",
+        "/**",
+        " * \u4F7F\u7528 expo-auth-session \u5B9E\u73B0 Facebook \u767B\u5F55",
+        " *",
+        " * \u7528\u6CD5\uFF1A",
+        " * 1. \u5728 Facebook Developer Console \u521B\u5EFA\u5E94\u7528\uFF0C\u83B7\u53D6 App ID",
+        " * 2. \u914D\u7F6E OAuth \u91CD\u5B9A\u5411 URI",
+        " * 3. \u5728\u7EC4\u4EF6\u4E2D\u4F7F\u7528 useFacebookAuth hook",
+        " *",
+        " * \u6CE8\u610F\uFF1ASDK 54 \u4E0D\u518D\u652F\u6301 expo-facebook\uFF0C\u6539\u7528 expo-auth-session",
+        " */",
         "",
-        "      return {",
-        "        token: result.token,",
-        "        userId: userData.id,",
-        "        userName: userData.name,",
-        "        error: null,",
-        "      };",
-        "    } else {",
-        "      return {",
-        "        token: null,",
-        "        userId: null,",
-        "        userName: null,",
-        '        error: "\u7528\u6237\u53D6\u6D88\u4E86 Facebook \u767B\u5F55",',
-        "      };",
+        "export function useFacebookAuth(config: FacebookAuthConfig) {",
+        "  const redirectUri = makeRedirectUri({",
+        "    scheme: 'your-app-scheme', // \u66FF\u6362\u4E3A\u4F60\u7684 app scheme",
+        "  });",
+        "",
+        "  const [request, response, promptAsync] = useAuthRequest(",
+        "    {",
+        "      clientId: config.clientId,",
+        "      scopes: ['public_profile', 'email'],",
+        "      redirectUri,",
+        "    },",
+        "    {",
+        "      authorizationEndpoint: FACEBOOK_AUTH_ENDPOINT,",
+        "      tokenEndpoint: FACEBOOK_TOKEN_ENDPOINT,",
         "    }",
-        "  } catch (error) {",
-        '    console.error("[FacebookAuth] Error:", error);',
-        "    return {",
-        "      token: null,",
-        "      userId: null,",
-        "      userName: null,",
-        '      error: "Facebook \u767B\u5F55\u5931\u8D25",',
-        "    };",
-        "  }",
+        "  );",
+        "",
+        "  return { request, response, promptAsync };",
         "}",
         "",
-        "export async function signOutFacebook(): Promise<void> {",
-        "  try {",
-        "    await Facebook.logOutAsync();",
-        "  } catch (error) {",
-        '    console.error("[FacebookAuth] Sign out error:", error);',
-        "  }",
+        "/**",
+        " * \u4ECE Facebook OAuth \u54CD\u5E94\u4E2D\u63D0\u53D6\u7528\u6237\u4FE1\u606F",
+        " */",
+        "export async function getFacebookUserInfo(accessToken: string): Promise<{",
+        "  userId: string;",
+        "  userName: string;",
+        "  email: string | null;",
+        "}> {",
+        "  const response = await fetch(",
+        "    `https://graph.facebook.com/me?access_token=${accessToken}&fields=id,name,email`",
+        "  );",
+        "  const userData = await response.json();",
+        "",
+        "  return {",
+        "    userId: userData.id,",
+        "    userName: userData.name,",
+        "    email: userData.email ?? null,",
+        "  };",
         "}"
       )
     }
   ],
-  appConfig: {
-    plugins: [
-      [
-        "expo-facebook",
-        {
-          appId: "YOUR_FACEBOOK_APP_ID"
-        }
-      ]
-    ]
-  }
+  appConfig: {}
 };
 var auth_facebook_default = authFacebookModule;
 
@@ -1723,29 +1719,12 @@ var i18n_default = i18nModule;
 var animationModule = {
   id: "animation",
   name: "\u52A8\u753B/\u624B\u52BF",
-  description: "Reanimated 4 + Gesture Handler + Worklets",
+  description: "Reanimated 4 + Gesture Handler + Worklets\uFF08\u5DF2\u9ED8\u8BA4\u5305\u542B\uFF0C\u6B64\u6A21\u5757\u4EC5\u6DFB\u52A0\u5C01\u88C5\u4EE3\u7801\uFF09",
   defaultChecked: false,
-  dependencies: {
-    "react-native-reanimated": "~4.1.1",
-    "react-native-gesture-handler": "~2.28.0",
-    "react-native-worklets": "~0.5.1"
-  },
+  // Dependencies are already included in base package.json
+  dependencies: {},
   devDependencies: {},
   files: [
-    {
-      path: "babel.config.js",
-      content: `module.exports = function (api) {
-  api.cache(true);
-  return {
-    presets: [
-      ["babel-preset-expo", { jsxImportSource: "nativewind" }],
-      "nativewind/babel",
-    ],
-    plugins: [],
-  };
-};
-`
-    },
     {
       path: "modules/animation/index.ts",
       content: lines(
@@ -1802,9 +1781,6 @@ var animationModule = {
       )
     }
   ],
-  // When animation module is selected, babel.config.js is overwritten above
-  // to re-enable babel-preset-expo's auto-detection of reanimated/worklets plugins
-  // (since those packages will be installed as dependencies)
   babelPlugins: []
 };
 var animation_default = animationModule;
@@ -3183,7 +3159,7 @@ SplashScreen.preventAutoHideAsync();
 export default function RootLayout() {
   const colorScheme = useColorScheme();
   const [loaded] = useFonts({
-    SpaceMono: require("../assets/fonts/SpaceMono-Regular.ttf"),
+    NunitoBold: require("../assets/fonts/Nunito-Bold.ttf"),
   });
 
   useEffect(() => {
@@ -3531,7 +3507,9 @@ export {};
     "version": "1.0.0",
     "orientation": "portrait",
     "userInterfaceStyle": "light",
+    "icon": "./assets/icon.png",
     "splash": {
+      "image": "./assets/splash-icon.png",
       "resizeMode": "contain",
       "backgroundColor": "#ffffff"
     },
@@ -3540,11 +3518,19 @@ export {};
       "bundleIdentifier": "com.${projectName}.app"
     },
     "android": {
+      "adaptiveIcon": {
+        "foregroundImage": "./assets/adaptive-icon.png",
+        "backgroundColor": "#ffffff"
+      },
       "package": "com.${projectName}.app"
     },
+    "web": {
+      "favicon": "./assets/favicon.png"
+    },
     "plugins": [
       "expo-router",
-      "expo-splash-screen"
+      "expo-splash-screen",
+      "react-native-reanimated"
     ]
   }
 }
@@ -3554,25 +3540,14 @@ export {};
     {
       path: "tsconfig.json",
       content: `{
+  "extends": "expo/tsconfig.base",
   "compilerOptions": {
-    "target": "ESNext",
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "lib": ["ESNext"],
     "strict": true,
-    "jsx": "react-jsx",
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
     "paths": {
       "@/*": ["./*"]
     }
   },
-  "include": ["**/*.ts", "**/*.tsx", ".expo/types/**/*.ts", "expo-env.d.ts"],
-  "exclude": ["node_modules"]
+  "include": ["**/*.ts", "**/*.tsx", ".expo/types/**/*.ts", "expo-env.d.ts", "nativewind-env.d.ts"]
 }
 `
     },
@@ -3583,7 +3558,8 @@ export {};
 module.exports = {
   content: [
     "./app/**/*.{js,jsx,ts,tsx}",
-    "./src/**/*.{js,jsx,ts,tsx}",
+    "./components/**/*.{js,jsx,ts,tsx}",
+    "./modules/**/*.{js,jsx,ts,tsx}",
   ],
   presets: [require("nativewind/preset")],
   theme: {
@@ -3647,7 +3623,7 @@ module.exports = withNativeWind(config, { input: "./global.css" });
   api.cache(true);
   return {
     presets: [
-      ["babel-preset-expo", { jsxImportSource: "nativewind", reanimated: false, worklets: false }],
+      ["babel-preset-expo", { jsxImportSource: "nativewind" }],
       "nativewind/babel",
     ],
     plugins: [],
@@ -3776,7 +3752,7 @@ function generateLoginTabsTemplates(projectName) {
         "export default function RootLayout() {",
         "  const colorScheme = useColorScheme();",
         "  const [loaded] = useFonts({",
-        '    SpaceMono: require("../assets/fonts/SpaceMono-Regular.ttf"),',
+        '    NunitoBold: require("../assets/fonts/Nunito-Bold.ttf"),',
         "  });",
         "",
         "  useEffect(() => {",
@@ -4198,10 +4174,14 @@ function generateBasePackageJson(projectName) {
       "expo-constants": "~18.0.13",
       "expo-status-bar": "~3.0.9",
       "expo-splash-screen": "~31.0.13",
+      "expo-font": "~14.0.11",
       react: "19.1.0",
       "react-native": "0.81.5",
       "react-native-safe-area-context": "~5.6.0",
       "react-native-screens": "~4.16.0",
+      "react-native-reanimated": "~4.1.1",
+      "react-native-worklets": "~0.5.1",
+      "react-native-gesture-handler": "~2.28.0",
       nativewind: "^4.1.0",
       tailwindcss: "^3.4.0",
       "react-native-svg": "^15.8.0"
@@ -4215,7 +4195,7 @@ function generateBasePackageJson(projectName) {
 
 // src/index.ts
 var import_execa = require("execa");
-var CLI_VERSION = "1.3.4";
+var CLI_VERSION = "1.4.0";
 var CONFIG_FILE = ".expo-bbase.json";
 async function run() {
   const program = new import_commander.Command();
@@ -4342,6 +4322,12 @@ async function createProject(projectName) {
         await writeFile(filePath, content);
       }
     }
+    spinner.text = "Copying assets...";
+    const assetsSource = import_path2.default.join(__dirname, "..", "templates", "assets");
+    const assetsTarget = import_path2.default.join(targetDir, "assets");
+    if (import_fs_extra2.default.existsSync(assetsSource)) {
+      import_fs_extra2.default.copySync(assetsSource, assetsTarget);
+    }
     spinner.text = "Generating package.json...";
     const pkgJson = generateBasePackageJson(projectName);
     const allDeps = {};