codingpixel-expo-app 0.1.5 → 0.1.7

package/dist/fonts.js

@@ -54,8 +54,11 @@ export function generateUseFontsBlocks(primary, secondary) {
         fontPairs.push([`${secondary}-Regular`, `${secondary}-Regular.ttf`], [`${secondary}-Medium`, `${secondary}-Medium.ttf`], [`${secondary}-SemiBold`, `${secondary}-SemiBold.ttf`], [`${secondary}-Bold`, `${secondary}-Bold.ttf`]);
     }
     const importBlock = `import { useFonts } from "expo-font";`;
+    // From `src/app/_layout.tsx` to `src/assets/fonts/`:
+    //   .. → src   →   ../assets/fonts/<file>
+    // (Was `../../assets/fonts/...` when assets lived at project root pre-Deviation #22.)
     const mapEntries = fontPairs
-        .map(([key, file]) => `    "${key}": require("../../assets/fonts/${file}"),`)
+        .map(([key, file]) => `    "${key}": require("../assets/fonts/${file}"),`)
         .join("\n");
     const hookBlock = `  const [loaded] = useFonts({\n${mapEntries}\n  });`;
     const guardBlock = `  if (!loaded) return null;`;

package/dist/index.js

@@ -14,13 +14,13 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { resolveTargetDir } from "./bootstrap.js";
 import { gatherAnswers, validateEnvVars } from "./prompts.js";
-import { cleanupBlankTemplate, runCreateExpoApp } from "./scaffold.js";
+import { cleanupBlankTemplate, moveExpoIconsIntoSrcAssets, runCreateExpoApp, } from "./scaffold.js";
 import { applyBase, applyBottomSheet, applyImagePicker } from "./overlay.js";
-import { patchAppJson, patchAppJsonPlugins, patchConstants, patchExpoRouterEntry, patchLayout, patchPackageJsonScripts, patchTsconfig, } from "./patch.js";
+import { patchAppJson, patchAppJsonAssetPaths, patchAppJsonPlugins, patchConstants, patchExpoRouterEntry, patchLayout, patchPackageJsonScripts, patchTsconfig, } from "./patch.js";
 import { patchBabel } from "./babel.js";
 import { buildLayoutReplacements } from "./fonts.js";
 import { ensureLockfile, installNativeDeps } from "./install.js";
-import { log } from "./util.js";
+import { ensureDir, log } from "./util.js";
 import { readSDKNotes } from "./sdkNotes.js";
 import { SDK_PROBE_RESULTS } from "./sdkProbeResults.js";
 const __filename = fileURLToPath(import.meta.url);
@@ -49,6 +49,7 @@ async function main() {
     log.info(`App name:   ${target.name}`);
     await runCreateExpoApp(target.dir, target.name);
     cleanupBlankTemplate(target.dir);
+    moveExpoIconsIntoSrcAssets(target.dir);
     const answers = await gatherAnswers();
     log.info(`Answers: primaryFont="${answers.primaryFont}" secondaryFont="${answers.secondaryFont}" ` +
         `bottomSheet=${answers.bottomSheet} imagePicker=${answers.imagePicker} pm=${answers.packageManager}`);
@@ -56,6 +57,18 @@ async function main() {
     const templatesRoot = resolveTemplatesRoot();
     log.step("Overlaying templates/base/ …");
     applyBase(target.dir, templatesRoot);
+    // Ensure empty dirs that npm strips from the tarball still exist in the
+    // generated app (Deviation #22 + extension). All four are intentionally
+    // empty placeholders apps fill as features grow / they drop fonts/images.
+    // No `.gitkeep` is shipped — `ensureDir` creates the bare directory.
+    for (const rel of [
+        "src/features",
+        "src/core/hooks",
+        "src/assets/fonts",
+        "src/assets/images",
+    ]) {
+        ensureDir(path.join(target.dir, rel));
+    }
     if (answers.bottomSheet) {
         log.step("Overlaying templates/bottom-sheet/ …");
         applyBottomSheet(target.dir, templatesRoot);
@@ -67,6 +80,7 @@ async function main() {
     // ---- Patches ----
     log.step("Patching app.json + expo-router entry …");
     patchAppJson(target.dir, target.name, answers);
+    patchAppJsonAssetPaths(target.dir);
     patchExpoRouterEntry(target.dir);
     patchAppJsonPlugins(target.dir, answers);
     log.step("Splicing constants + layout sentinels …");
@@ -105,7 +119,7 @@ async function main() {
             "@components": "./src/ui/components",
             "@icons": "./src/ui/iconComponents",
             "@features": "./src/features",
-            "@assets": "./assets",
+            "@assets": "./src/assets",
         },
     });
     // ---- Install + verify ----

package/dist/patch.js

@@ -84,6 +84,41 @@ export function patchAppJson(target, name, _answers) {
     }
     writeJson(p, json);
 }
+/**
+ * Rewrite `app.json` asset paths from create-expo-app's `./assets/<file>`
+ * defaults to `./src/assets/<file>` (Deviation #22 — unified asset layout).
+ *
+ * Pairs with `moveExpoIconsIntoSrcAssets` in scaffold.ts (which moves the
+ * actual PNG files). Idempotent: only rewrites paths that start with `./assets/`,
+ * so re-running on an already-patched app.json is a no-op.
+ */
+export function patchAppJsonAssetPaths(target) {
+    const p = path.join(target, "app.json");
+    if (!fileExists(p))
+        return;
+    const json = readJson(p);
+    json.expo ??= {};
+    const rewrite = (value) => {
+        if (!value)
+            return value;
+        if (value.startsWith("./assets/")) {
+            return value.replace(/^\.\/assets\//, "./src/assets/");
+        }
+        return value;
+    };
+    if (json.expo.icon)
+        json.expo.icon = rewrite(json.expo.icon);
+    if (json.expo.splash?.image) {
+        json.expo.splash.image = rewrite(json.expo.splash.image);
+    }
+    if (json.expo.android?.adaptiveIcon?.foregroundImage) {
+        json.expo.android.adaptiveIcon.foregroundImage = rewrite(json.expo.android.adaptiveIcon.foregroundImage);
+    }
+    if (json.expo.web?.favicon) {
+        json.expo.web.favicon = rewrite(json.expo.web.favicon);
+    }
+    writeJson(p, json);
+}
 /**
  * Phase 5 step 5 — add image-picker plugin entry conditionally. Idempotent via
  * `nameOf` equality (user-customized options object preserved).
@@ -214,7 +249,7 @@ const SPEC_PATHS = {
     "@components/*": ["src/ui/components/*"],
     "@icons/*": ["src/ui/iconComponents/*"],
     "@features/*": ["src/features/*"],
-    "@assets": ["assets"],
+    "@assets": ["src/assets"],
 };
 /**
  * Phase 7 step 3 — patch tsconfig:

package/dist/scaffold.js

@@ -31,13 +31,68 @@ 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/).`);
+        }
+    }
+}
+/**
+ * Move create-expo-app's root `assets/*.png` icons (icon, splash-icon,
+ * adaptive-icon, favicon) into `src/assets/` so the project has a single
+ * unified assets layout. Caller updates `app.json` paths separately (see
+ * `patchAppJsonAssetPaths` in patch.ts).
+ *
+ * Idempotent — if the source file is missing (already moved or never existed),
+ * skip it without erroring.
+ */
+export function moveExpoIconsIntoSrcAssets(target) {
+    const rootAssets = path.join(target, "assets");
+    const srcAssets = path.join(target, "src", "assets");
+    if (!fs.existsSync(rootAssets))
+        return;
+    fs.mkdirSync(srcAssets, { recursive: true });
+    const movableFiles = [
+        "icon.png",
+        "splash-icon.png",
+        "adaptive-icon.png",
+        "favicon.png",
+    ];
+    let moved = 0;
+    for (const file of movableFiles) {
+        const from = path.join(rootAssets, file);
+        const to = path.join(srcAssets, file);
+        if (fileExists(from) && !fileExists(to)) {
+            fs.renameSync(from, to);
+            moved++;
+        }
+    }
+    // If root `assets/` is now empty (only icons lived there), remove it.
+    try {
+        const remaining = fs.readdirSync(rootAssets);
+        if (remaining.length === 0)
+            fs.rmdirSync(rootAssets);
+    }
+    catch {
+        // Not empty (user-added content) → leave alone.
+    }
+    if (moved > 0) {
+        log.step(`Moved ${moved} icon file(s) from assets/ to src/assets/.`);
     }
 }

package/package.json

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

package/templates/base/src/assets/index.tsx

@@ -0,0 +1 @@
+export const Images = {};

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();
   },
 };

package/templates/base/src/ui/theme/colors.ts

@@ -1,54 +1,10 @@
 export const enum Colors {
   PRIMARY = "#2E5A88",
-  PRIMARY_1 = "#436B94",
-  PRIMARY_2 = "#587BA0",
-  PRIMARY_3 = "#829CB8",
-  PRIMARY_4 = "#97ADC4",
-  PRIMARY_5 = "#ABBDCF",
-  PRIMARY_6 = "#C1CEDC",
-  PRIMARY_7 = "#D5DEE7",
-  PRIMARY_8 = "#EBEFF4",
 
   SECONDARY = "#2D85B7",
-  SECONDARY_1 = "#4292BF",
-  SECONDARY_2 = "#579DC5",
-  SECONDARY_3 = "#6CAACD",
-  SECONDARY_4 = "#81B6D4",
-  SECONDARY_5 = "#96C2DB",
-  SECONDARY_6 = "#ABCEE2",
-  SECONDARY_7 = "#C0DBEA",
-  SECONDARY_8 = "#D5E7F1",
-  SECONDARY_9 = "#EAF3F8",
-
-  SUCCESS = "#22BB33",
-  SUCCESS_10_PERCENT = "#E9F9EB",
-  INFO = "#246BFD",
-  WARNING = "#BF6A02",
-  WARNING_10_PERCENT = "#FEF7EE",
-  ERROR = "#BB2124",
-  ERROR_10_PERCENT = "#F9E9EA",
-  DISABLED = "#AAAAAA",
-  DISABLED_BUTTON = "#693EC9",
-  NOTIFICATION = "#F75555",
-
-  PURPLE_TEN_PERCENT = "#F0ECFA",
-  PURPLE = "#693EC9",
-
-  GRAY_10 = "#303030",
-  GRAY_9 = "#3C3D3D",
-  GRAY_8 = "#444546",
-  GRAY_7 = "#4E4F50",
-  GRAY_6 = "#5B5D5F",
-  GRAY_5 = "#86888A",
-  GRAY_4 = "#AEB0B2",
-  GRAY_3 = "#D0D1D1",
-  GRAY_2 = "#E6E7E7",
-  GRAY_1 = "#F5F6F6",
 
   WHITE = "#FFFFFF",
-  BORDER = "#D1D0D0",
   BLACK = "#1A1A1A",
 
   TRANSPARENT = "transparent",
-  BG_COLOR = "#FDFDFD",
 }

package/templates/base/assets/index.ts

@@ -1,8 +0,0 @@
-// Asset registry shim. Apps add real exports as they bundle .png / .ttf etc.
-// Example:
-//   import notification from "./images/notification.png";
-//   export const Images = { notification };
-//
-// `@assets` resolves here via tsconfig path mapping.
-export const Images = {} as Record<string, number>;
-export {};