codingpixel-expo-app 0.1.4 → 0.1.6

package/dist/index.js

@@ -22,6 +22,7 @@ import { buildLayoutReplacements } from "./fonts.js";
 import { ensureLockfile, installNativeDeps } from "./install.js";
 import { log } from "./util.js";
 import { readSDKNotes } from "./sdkNotes.js";
+import { SDK_PROBE_RESULTS } from "./sdkProbeResults.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 /**
@@ -33,7 +34,9 @@ function resolveTemplatesRoot() {
     return path.resolve(__dirname, "..", "templates");
 }
 /**
- * Locate `docs/SDK_NOTES.md`. Same layout assumption as `resolveTemplatesRoot`.
+ * Locate `docs/SDK_NOTES.md` for OPTIONAL out-of-tree dev runs (when the CLI
+ * is invoked from its own source tree with fresh probe results). Production
+ * runs from a published tarball read from `SDK_PROBE_RESULTS` instead.
  */
 function resolveSdkNotesPath() {
     return path.resolve(__dirname, "..", "docs", "SDK_NOTES.md");
@@ -69,15 +72,21 @@ async function main() {
     log.step("Splicing constants + layout sentinels …");
     patchConstants(target.dir, templatesRoot, answers);
     patchLayout(target.dir, buildLayoutReplacements(answers));
-    // ---- Read SDK_NOTES.md probe outcomes ----
+    // ---- Resolve probe outcomes ----
+    // Primary: baked-in `SDK_PROBE_RESULTS` (always available; ships in dist/).
+    // Override: `docs/SDK_NOTES.md` if present in the CLI source tree (out-of-tree
+    // development scenarios where probe was just re-run against a newer SDK).
     const sdk = readSDKNotes(resolveSdkNotesPath());
-    const flagsOk = sdk.get("FLAGS_OK") === "1";
-    const probePass = sdk.get("PROBE_PASS") === "1";
-    const workletsAutoIncluded = sdk.get("BABEL_PRESET_AUTO_INCLUDES_WORKLETS") === "1";
-    const workletsPkg = sdk.get("WORKLETS_PKG") === "react-native-worklets-core"
+    const get = (key, fallback) => sdk.get(key) ?? fallback;
+    const flagsOk = get("FLAGS_OK", SDK_PROBE_RESULTS.FLAGS_OK ? "1" : "0") === "1";
+    const probePass = get("PROBE_PASS", SDK_PROBE_RESULTS.PROBE_PASS ? "1" : "0") === "1";
+    const workletsAutoIncluded = get("BABEL_PRESET_AUTO_INCLUDES_WORKLETS", SDK_PROBE_RESULTS.BABEL_PRESET_AUTO_INCLUDES_WORKLETS ? "1" : "0") === "1";
+    const workletsPkg = get("WORKLETS_PKG", SDK_PROBE_RESULTS.WORKLETS_PKG) ===
+        "react-native-worklets-core"
         ? "react-native-worklets-core"
         : "react-native-worklets";
-    const expoBaseUrlInherited = sdk.get("EXPO_TSCONFIG_BASEURL") !== "null";
+    const baseUrlNoteRaw = get("EXPO_TSCONFIG_BASEURL", SDK_PROBE_RESULTS.EXPO_TSCONFIG_BASEURL_INHERITED ? "." : "null");
+    const expoBaseUrlInherited = baseUrlNoteRaw !== "null";
     log.step("Patching package.json scripts + tsconfig + babel.config.js …");
     patchPackageJsonScripts(target.dir);
     patchTsconfig(target.dir, { expoBaseUrlInherited });

package/dist/scaffold.js

@@ -31,13 +31,25 @@ export async function runCreateExpoApp(dir, _name) {
     ], { stdio: "inherit" });
 }
 /**
- * Delete `App.tsx` shipped by blank-typescript — collides with expo-router's
- * auto-detection of `src/app/`. Idempotent (no-op if already absent).
+ * Delete blank-typescript leftovers that conflict with our expo-router setup:
+ *
+ *   - `App.tsx` — root component for non-expo-router apps; collides with
+ *     expo-router's auto-detection of `src/app/`.
+ *   - `index.ts` — root entry shipped by blank-typescript: imports `./App`
+ *     and calls `registerRootComponent`. We set `package.json#main` to
+ *     `expo-router/entry` so this file is unused at runtime, but TypeScript
+ *     still type-checks it and errors with `Cannot find module './App'`
+ *     after we delete the file above.
+ *
+ * Idempotent (no-op if already absent).
  */
 export function cleanupBlankTemplate(target) {
-    const appTsx = path.join(target, "App.tsx");
-    if (fileExists(appTsx)) {
-        fs.rmSync(appTsx);
-        log.step("Removed blank-typescript App.tsx (replaced by expo-router src/app/).");
+    const removable = ["App.tsx", "index.ts"];
+    for (const rel of removable) {
+        const p = path.join(target, rel);
+        if (fileExists(p)) {
+            fs.rmSync(p);
+            log.step(`Removed blank-typescript ${rel} (replaced by expo-router src/app/).`);
+        }
     }
 }

package/dist/sdkProbeResults.js

@@ -0,0 +1,28 @@
+// Probe values captured during template authoring (run `scripts/run-probes.sh`
+// to regenerate when bumping target SDK; then update this file by hand).
+//
+// These values are compiled into `dist/` so the CLI has them at runtime without
+// depending on `docs/SDK_NOTES.md` being shipped in the npm tarball. Shipping
+// the docs file was tried earlier and left two real bugs:
+//   1. `BABEL_PRESET_AUTO_INCLUDES_WORKLETS` defaulted false → patchBabel
+//      added `react-native-worklets/plugin` even though babel-preset-expo
+//      already auto-includes it (double-load risk + duplicate-plugin warnings).
+//   2. `EXPO_TSCONFIG_BASEURL` defaulted "inherited" → `baseUrl` never set
+//      → TS path resolution fragile.
+//
+// Constants here override `readSDKNotes` (which is now a fallback for
+// out-of-tree development scenarios).
+export const SDK_PROBE_RESULTS = {
+    /** Pinned by template-authoring date — bump alongside Expo SDK upgrades. */
+    EXPO_SDK_VERSION: "~54.0.33",
+    /** SDK 54+ `babel-preset-expo` auto-includes worklets/reanimated plugin. */
+    BABEL_PRESET_AUTO_INCLUDES_WORKLETS: true,
+    /** Canonical name per SDK 54 (vs the legacy `-core` variant). */
+    WORKLETS_PKG: "react-native-worklets",
+    /** SDK 54 `expo/tsconfig.base` does NOT provide `baseUrl` → patcher sets ".". */
+    EXPO_TSCONFIG_BASEURL_INHERITED: false,
+    /** SDK 54 `npx expo install --yarn`/`--npm` flags supported (Branch A). */
+    FLAGS_OK: true,
+    /** SDK 54 `expo install` materializes lockfile → no explicit PM install needed. */
+    PROBE_PASS: true,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codingpixel-expo-app",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Opinionated Expo app scaffolder mirroring MyRoster conventions.",
   "type": "module",
   "bin": {

package/templates/base/src/core/redux/mmkvStorage.ts

@@ -1,8 +1,8 @@
-// react-native-mmkv 3.x+ exports `MMKV` as a class (was `createMMKV()` factory
-// in older versions). MyRoster's source predates the API change.
-import { MMKV } from "react-native-mmkv";
+// react-native-mmkv 4.x exports `createMMKV()` factory + `MMKV` as a TYPE only.
+// (Earlier 3.x exported `MMKV` as a class; the API was reverted in 4.x.)
+import { createMMKV } from "react-native-mmkv";
 
-const storage = new MMKV();
+const storage = createMMKV();
 
 export const reduxStorage = {
   setItem: (key: string, value: string) => {
@@ -14,7 +14,7 @@ export const reduxStorage = {
     return Promise.resolve(value);
   },
   removeItem: (key: string) => {
-    storage.delete(key);
+    storage.remove(key);
     return Promise.resolve();
   },
 };