umpordez 1.3.2 → 1.4.0

package/template/mobile/{{PROJECT_SLUG}}/package.json

@@ -12,49 +12,51 @@
         "lint": "eslint src --ext .ts,.tsx",
         "typecheck": "tsc --noEmit"
     },
+    "expo": {
+        "install": {
+            "exclude": ["typescript"]
+        }
+    },
     "dependencies": {
         "@noble/hashes": "^2.2.0",
-        "@react-native-async-storage/async-storage": "^2.2.0",
+        "@react-native-async-storage/async-storage": "2.2.0",
         "@react-navigation/bottom-tabs": "^7.7.3",
         "@react-navigation/native": "^7.1.19",
         "@react-navigation/native-stack": "^7.6.2",
-        "expo": "~57.0.2",
+        "expo": "~57.0.4",
         "expo-apple-authentication": "~57.0.0",
-        "expo-auth-session": "~7.0.10",
+        "expo-auth-session": "~57.0.2",
         "expo-build-properties": "~57.0.3",
         "expo-constants": "~57.0.3",
         "expo-file-system": "~57.0.0",
-        "expo-linking": "~57.0.1",
+        "expo-linking": "~57.0.2",
         "expo-localization": "~57.0.0",
-        "expo-share-intent": "^8.0.0",
         "expo-splash-screen": "~57.0.2",
         "expo-sqlite": "~57.0.0",
         "expo-status-bar": "~57.0.0",
         "expo-system-ui": "~57.0.0",
         "expo-web-browser": "~57.0.0",
         "i18next": "^23.16.5",
-        "lucide-react-native": "^1.8.0",
-        "react": "19.1.0",
-        "react-native": "0.83.10",
+        "lucide-react-native": "^1.24.0",
+        "react": "19.2.3",
+        "react-native": "0.86.0",
         "react-i18next": "^15.1.1",
-        "react-native-gesture-handler": "~3.0.2",
-        "react-native-health": "^1.19.0",
-        "react-native-health-connect": "^3.5.0",
-        "react-native-iap": "^15.2.0",
+        "react-native-gesture-handler": "~2.32.0",
+        "react-native-iap": "^15.3.6",
         "react-native-nitro-modules": "^0.35.4",
-        "react-native-reanimated": "~4.5.1",
-        "react-native-safe-area-context": "^5.8.0",
-        "react-native-screens": "~4.25.2",
-        "react-native-svg": "15.12.1",
+        "react-native-reanimated": "4.5.0",
+        "react-native-safe-area-context": "~5.7.0",
+        "react-native-screens": "4.25.2",
+        "react-native-svg": "15.15.4",
         "react-native-toast-message": "^2.3.3",
-        "react-native-worklets": "~0.10.1"
+        "react-native-worklets": "0.10.0"
     },
     "devDependencies": {
         "@stylistic/eslint-plugin": "^2.13.0",
-        "@types/react": "~19.1.0",
-        "babel-preset-expo": "~57.0.1",
+        "@types/react": "~19.2.2",
+        "babel-preset-expo": "~57.0.2",
         "eslint": "^9.20.1",
-        "typescript": "~5.7.0",
+        "typescript": "~5.9.3",
         "typescript-eslint": "^8.24.0"
     }
 }

package/template/mobile/{{PROJECT_SLUG}}/src/components/AnimatedSplash.tsx

@@ -193,7 +193,11 @@ const RING_SIZE = width * 0.58;
 
 const s = StyleSheet.create({
     root: {
-        ...StyleSheet.absoluteFillObject,
+        position: 'absolute',
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0,
         backgroundColor: BG,
         alignItems: 'center',
         justifyContent: 'center',

package/template/mobile/{{PROJECT_SLUG}}/src/config.ts

@@ -47,6 +47,15 @@ const GOOGLE_IOS_CLIENT_ID = 'TODO_GOOGLE_IOS_CLIENT_ID';
 // appears. Set at scaffold time via `umpordez create`.
 export const SPLASH_ANIMATED = {{SPLASH_ANIMATED}};
 
+// Sign-in providers, chosen at scaffold time via `umpordez create`.
+// Email+password always ships; these gate the extra buttons on
+// AuthLanding. Flipping appleAuth back on also requires restoring
+// `usesAppleSignIn` + the `expo-apple-authentication` plugin in
+// app.json (the scaffold strips them when Apple is disabled so iOS
+// builds don't demand the Sign in with Apple capability).
+const GOOGLE_AUTH_ENABLED = {{AUTH_GOOGLE_ENABLED}};
+const APPLE_AUTH_ENABLED = {{AUTH_APPLE_ENABLED}};
+
 if (__DEV__) {
     console.log(
         `[config] API: ${baseApiUrl} | prod=${isProdBuild} `
@@ -62,5 +71,7 @@ export default {
     version: APP_VERSION,
     googleClientId: GOOGLE_CLIENT_ID,
     googleIosClientId: GOOGLE_IOS_CLIENT_ID,
+    googleAuth: GOOGLE_AUTH_ENABLED,
+    appleAuth: APPLE_AUTH_ENABLED,
     scheme: '{{MOBILE_SCHEME}}'
 };

package/template/mobile/{{PROJECT_SLUG}}/src/pages/auth/AuthLanding.tsx

@@ -47,7 +47,7 @@ export default function AuthLandingScreen({ navigation }: Props) {
             })
         ]).start();
 
-        if (Platform.OS === 'ios') {
+        if (Platform.OS === 'ios' && config.appleAuth) {
             AppleAuthentication.isAvailableAsync()
                 .then(setAppleAvailable)
                 .catch(() => setAppleAvailable(false));
@@ -279,58 +279,63 @@ export default function AuthLandingScreen({ navigation }: Props) {
                     </TouchableOpacity>
                 )}
 
-                <TouchableOpacity
-                    style={[
-                        s.googleBtn,
-                        {
-                            backgroundColor: colors.card,
-                            borderColor: colors.border
-                        },
-                        busy && s.btnDisabled
-                    ]}
-                    onPress={handleGoogle}
-                    activeOpacity={0.88}
-                    disabled={busy}
-                >
-                    {provider === 'google' ? (
-                        <ActivityIndicator color={colors.text} />
-                    ) : (
-                        <>
-                            <GoogleIcon />
-                            <Text
-                                style={[
-                                    s.googleTxt,
-                                    { color: colors.text }
-                                ]}
-                            >
-                                {t('auth.landing.google')}
-                            </Text>
-                        </>
-                    )}
-                </TouchableOpacity>
-
-                <View style={s.divRow}>
-                    <View
-                        style={[
-                            s.divLine,
-                            { backgroundColor: colors.border }
-                        ]}
-                    />
-                    <Text
+                {config.googleAuth && (
+                    <TouchableOpacity
                         style={[
-                            s.divLabel,
-                            { color: colors.textMuted }
+                            s.googleBtn,
+                            {
+                                backgroundColor: colors.card,
+                                borderColor: colors.border
+                            },
+                            busy && s.btnDisabled
                         ]}
+                        onPress={handleGoogle}
+                        activeOpacity={0.88}
+                        disabled={busy}
                     >
-                        {t('auth.landing.divider')}
-                    </Text>
-                    <View
-                        style={[
-                            s.divLine,
-                            { backgroundColor: colors.border }
-                        ]}
-                    />
-                </View>
+                        {provider === 'google' ? (
+                            <ActivityIndicator color={colors.text} />
+                        ) : (
+                            <>
+                                <GoogleIcon />
+                                <Text
+                                    style={[
+                                        s.googleTxt,
+                                        { color: colors.text }
+                                    ]}
+                                >
+                                    {t('auth.landing.google')}
+                                </Text>
+                            </>
+                        )}
+                    </TouchableOpacity>
+                )}
+
+                {(config.googleAuth
+                    || (Platform.OS === 'ios' && appleAvailable)) && (
+                    <View style={s.divRow}>
+                        <View
+                            style={[
+                                s.divLine,
+                                { backgroundColor: colors.border }
+                            ]}
+                        />
+                        <Text
+                            style={[
+                                s.divLabel,
+                                { color: colors.textMuted }
+                            ]}
+                        >
+                            {t('auth.landing.divider')}
+                        </Text>
+                        <View
+                            style={[
+                                s.divLine,
+                                { backgroundColor: colors.border }
+                            ]}
+                        />
+                    </View>
+                )}
 
                 <TouchableOpacity
                     style={[

package/template-variables.mjs

@@ -39,6 +39,19 @@
 //                            plays the AnimatedSplash on boot or shows
 //                            up instantly (native splash hides on font
 //                            load). Consumed by mobile src/config.ts.
+// {{AUTH_GOOGLE_ENABLED}}  — "true"/"false" — Google sign-in button in
+//                            the mobile app. Consumed by src/config.ts.
+// {{AUTH_APPLE_ENABLED}}   — "true"/"false" — Apple sign-in button in
+//                            the mobile app. Consumed by src/config.ts.
+// {{IOS_APPLE_SIGNIN_JSON}} — app.json fragment: `"usesAppleSignIn":
+//                            true,` (with leading newline+indent) when
+//                            Apple sign-in is on, empty when off.
+// {{APPLE_AUTH_PLUGIN_JSON}} — app.json fragment: the
+//                            `"expo-apple-authentication",` plugins
+//                            entry when Apple sign-in is on, empty
+//                            when off (the plugin adds the Sign in
+//                            with Apple entitlement unconditionally,
+//                            so it must not ship when disabled).
 
 // ─── Site landing variants ────────────────────────────────────────────────────
 // The public site ships two landing flavors. The SaaS landing (CTAs →
@@ -52,6 +65,101 @@
 
 export const SITE_VARIANT_DIR = 'ui/site/_variants';
 
+// ─── Components ──────────────────────────────────────────────────────────────
+// A project is any combination of four components, each picked with a
+// yes/no at create time:
+//
+//   server   — Admin API + Site API (Express + PostgreSQL)
+//   adminUi  — React admin webapp (requires server)
+//   site     — Public site / landing page (EJS + i18n)
+//   mobile   — Expo + React Native app
+//
+// Both create.mjs and update.mjs derive "which template paths ship"
+// from these flags via the helpers below, so the two tools can never
+// drift. The legacy preset names are kept as manifest labels (old
+// projects only recorded a preset string).
+
+export const LEGACY_PRESET_COMPONENTS = {
+    everything:          { server: true,  adminUi: true,
+                           site: true,   mobile: true  },
+    'web-only':          { server: true,  adminUi: true,
+                           site: true,   mobile: false },
+    'mobile-and-site':   { server: false, adminUi: false,
+                           site: true,   mobile: true  },
+    'mobile-and-server': { server: true,  adminUi: false,
+                           site: false,  mobile: true  },
+    'just-mobile':       { server: false, adminUi: false,
+                           site: false,  mobile: true  }
+};
+
+/** Components for a manifest that only recorded a preset name. */
+export function componentsForPreset(preset) {
+    return LEGACY_PRESET_COMPONENTS[preset]
+        ?? LEGACY_PRESET_COMPONENTS.everything;
+}
+
+/**
+ * Manifest label for a component combo. Combos matching a legacy
+ * preset keep its exact name (older CLI versions still understand
+ * the manifest); anything else is "custom".
+ */
+export function presetNameForComponents(c) {
+    for (const [name, def] of
+        Object.entries(LEGACY_PRESET_COMPONENTS)) {
+        if (def.server === !!c.server
+            && def.adminUi === !!c.adminUi
+            && def.site === !!c.site
+            && def.mobile === !!c.mobile) {
+            return name;
+        }
+    }
+    return 'custom';
+}
+
+/** Top-level template dirs a component combo ships. */
+export function includesForComponents(c) {
+    const includes = ['doc'];
+    if (c.server) {
+        includes.push('server', 'misc');
+    }
+    if (c.adminUi) {
+        includes.push('ui/admin');
+    }
+    if (c.site) {
+        includes.push('ui/site');
+    }
+    if (c.mobile) {
+        includes.push('mobile', 'scripts');
+    }
+    return includes;
+}
+
+/** Root-level template files a component combo ships. */
+export function rootFilesForComponents(c) {
+    const files = ['CLAUDE.md', 'README.md', 'code.md',
+                   'install.sh', 'dev.sh'];
+    if (c.server) {
+        files.push('architecture.md', 'seed.sh');
+    }
+    if (c.server || c.site || c.adminUi) {
+        files.push('AGENTS.md');
+    }
+    return files;
+}
+
+/**
+ * Whether the public site ships the app-marketing landing (store
+ * buttons + download CTA) instead of the SaaS landing (signup CTA).
+ * New projects store the decision in details.appLanding; legacy
+ * manifests fall back to the preset that implied it.
+ */
+export function wantsAppLanding(details, preset) {
+    if (typeof details?.appLanding === 'boolean') {
+        return details.appLanding;
+    }
+    return preset === 'mobile-and-site';
+}
+
 // [variantPath, canonicalPath] — relative to the project root.
 export const APP_LANDING_SWAPS = [
     ['ui/site/_variants/app/home.ejs',
@@ -275,5 +383,24 @@ export function buildReplacements(details) {
         '{{JWT_TOKEN_SECRET}}': details.jwtTokenSecret ?? randomSecret(),
         '{{SPLASH_ANIMATED}}':
             details.splashStyle === 'animated' ? 'true' : 'false',
+        // Sign-in providers chosen at scaffold time. Email+password
+        // always ships; these gate the extra buttons in the mobile
+        // app. Default to enabled so legacy manifests (which never
+        // recorded a choice) keep their current behavior on update.
+        '{{AUTH_GOOGLE_ENABLED}}':
+            details.authGoogle === false ? 'false' : 'true',
+        '{{AUTH_APPLE_ENABLED}}':
+            details.authApple === false ? 'false' : 'true',
+        // app.json fragments — the expo-apple-authentication config
+        // plugin adds the Sign in with Apple entitlement
+        // unconditionally when listed, so when Apple is disabled the
+        // plugin entry (and usesAppleSignIn) must disappear from the
+        // JSON entirely, not just flip to false.
+        '{{IOS_APPLE_SIGNIN_JSON}}': details.authApple === false
+            ? ''
+            : '\n            "usesAppleSignIn": true,',
+        '{{APPLE_AUTH_PLUGIN_JSON}}': details.authApple === false
+            ? ''
+            : '\n            "expo-apple-authentication",',
     };
 }

package/update.mjs

@@ -34,7 +34,11 @@ import { fileURLToPath } from 'node:url';
 import chalk from 'chalk';
 import {
     buildReplacements,
-    APP_LANDING_SWAPS
+    APP_LANDING_SWAPS,
+    componentsForPreset,
+    includesForComponents,
+    rootFilesForComponents,
+    wantsAppLanding
 } from './template-variables.mjs';
 import { generateIcons, ICON_TARGETS } from './icons.mjs';
 
@@ -42,23 +46,15 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const TEMPLATE_DIR = path.join(__dirname, 'template');
 const MANIFEST_PATH = '.umpordez/manifest.json';
 
-// Mirror of the preset → top-level includes mapping in create.mjs.
-// Kept in sync manually because importing from create.mjs would pull
-// inquirer + the prompt code into the update command unnecessarily.
-const PRESET_INCLUDES = {
-    everything: ['server', 'ui/admin', 'ui/site', 'mobile', 'misc',
-                 'scripts', 'doc'],
-    'web-only': ['server', 'ui/admin', 'ui/site', 'misc', 'doc'],
-    'mobile-and-site': ['mobile', 'ui/site', 'scripts', 'doc'],
-    'mobile-and-server': ['server', 'mobile', 'misc', 'scripts',
-                          'doc'],
-    'just-mobile': ['mobile', 'scripts', 'doc']
-};
-
-// Presets that use the app-marketing landing instead of the SaaS one.
-// Mirror of create.mjs's `appLanding` preset flag — kept in sync
-// manually (see PRESET_INCLUDES note above).
-const APP_LANDING_PRESETS = new Set(['mobile-and-site']);
+// Which components a project shipped. New manifests record the
+// components object in details; legacy ones only stored a preset
+// name — map it through the shared table in template-variables.mjs.
+function componentsFromManifest(manifest) {
+    if (manifest.details?.components) {
+        return manifest.details.components;
+    }
+    return componentsForPreset(manifest.preset);
+}
 
 const green = chalk.hex('#02e027');
 const cyan = chalk.hex('#00fff9');
@@ -153,30 +149,26 @@ function applyPathPlaceholders(p, slug) {
 }
 
 /**
- * Walk the template, resolve each file's contents (post-replacement)
- * + final relative path. Returns a map of relative-path → buffer.
- *
- * Skips files outside the project's preset by checking against the
- * project's existing top-level layout — we only want to update what
- * the project actually shipped.
- */
-/**
- * Whether a relative path belongs to the preset. Same prune rules
- * as create.mjs's copyTemplate, expressed as a predicate so we can
- * evaluate per-file instead of pruning a directory.
+ * Whether a relative path belongs to the project's component combo.
+ * Same prune rules as create.mjs's copyTemplate, expressed as a
+ * predicate so we can evaluate per-file instead of pruning a
+ * directory.
  */
-// Top-level directories that ship with every preset (project config
+// Top-level dirs/files that ship with every combo (project config
 // like .claude/ that doesn't belong to any single sub-app). Mirrors
-// the ALWAYS_KEEP set in create.mjs.
-const ALWAYS_IN_PRESET = new Set(['.claude']);
-
-function isPathInPreset(rel, preset) {
-    const includes = PRESET_INCLUDES[preset] ?? PRESET_INCLUDES.everything;
+// the ALWAYS_KEEP sets in create.mjs. Note: rel arrives post
+// path-placeholder pass, so the dot-less `gitignore` the template
+// ships is already `.gitignore` here.
+const ALWAYS_IN_PROJECT = new Set(['.claude']);
+const ALWAYS_ROOT_FILES = new Set(['.gitignore', '.editorconfig']);
+
+function isPathInComponents(rel, components) {
+    const includes = includesForComponents(components);
     const top = rel.split('/')[0];
-    if (ALWAYS_IN_PRESET.has(top)) {
+    if (ALWAYS_IN_PROJECT.has(top)) {
         return true;
     }
-    // ui is special: only the chosen sub-apps live in the preset.
+    // ui is special: only the chosen sub-apps ship.
     if (top === 'ui') {
         const sub = rel.split('/')[1];
         return includes.includes(`ui/${sub}`);
@@ -184,22 +176,34 @@ function isPathInPreset(rel, preset) {
     if (includes.includes(top)) {
         return true;
     }
-    // Top-level files (CLAUDE.md, dev.sh, etc) — let create.mjs's
-    // root-files filter decide. For update we ship them all and let
-    // the manifest comparison do the right thing per file.
-    return rel.indexOf('/') === -1;
+    // Top-level files: same filter create.mjs applies at scaffold
+    // time, so update never re-adds a root file the combo doesn't
+    // ship (e.g. seed.sh on a project without the server).
+    if (rel.indexOf('/') === -1) {
+        return ALWAYS_ROOT_FILES.has(rel)
+            || rootFilesForComponents(components).includes(rel);
+    }
+    return false;
 }
 
-async function loadTemplate(details, preset) {
+/**
+ * Walk the template, resolve each file's contents (post-replacement)
+ * + final relative path. Returns a map of relative-path → buffer.
+ * Skips files outside the project's component combo — we only want
+ * to update what the project actually shipped.
+ */
+
+async function loadTemplate(details, manifest) {
     const replacements = buildReplacements(details);
     const files = await getAllFiles(TEMPLATE_DIR);
     const out = new Map();
+    const components = componentsFromManifest(manifest);
 
     for (const abs of files) {
         const relRaw = path.relative(TEMPLATE_DIR, abs);
         const rel = applyPathPlaceholders(relRaw, details.slug);
 
-        if (preset && !isPathInPreset(rel, preset)) {
+        if (!isPathInComponents(rel, components)) {
             continue;
         }
 
@@ -213,13 +217,13 @@ async function loadTemplate(details, preset) {
     }
 
     // Landing-page variant resolution — mirror create.mjs's copyTemplate
-    // swap. For app-landing presets the canonical landing files are
+    // swap. For app-landing projects the canonical landing files are
     // sourced from ui/site/_variants/app/ so `umpordez update` compares
     // against the SAME flavor the project was scaffolded with (otherwise
     // it would try to push the SaaS landing over an app project). The
-    // _variants/ staging files never ship, so drop them from the map for
-    // every preset.
-    if (APP_LANDING_PRESETS.has(preset)) {
+    // _variants/ staging files never ship, so drop them from the map
+    // in every case.
+    if (wantsAppLanding(details, manifest.preset)) {
         for (const [variant, canonical] of APP_LANDING_SWAPS) {
             if (out.has(variant)) {
                 out.set(canonical, out.get(variant));
@@ -366,7 +370,7 @@ export async function updateProject(projectDirArg, opts = {}) {
     ));
     console.log('');
 
-    const template = await loadTemplate(details, manifest.preset);
+    const template = await loadTemplate(details, manifest);
     const newHashes = {};
 
     let acceptAll = !!opts.yes;