newcandies 0.1.6 → 0.1.7

package/dist/index.js

@@ -157,6 +157,7 @@ async function writeBaseline({ dest, name, withQuery }) {
   if (withQuery) {
     baseDeps["@tanstack/react-query"] = "latest";
   }
+  baseDeps["tailwind-merge"] = "latest";
   const pkg = {
     name,
     version: "0.0.0",
@@ -170,7 +171,8 @@ async function writeBaseline({ dest, name, withQuery }) {
     dependencies: baseDeps,
     devDependencies: {
       "@types/react": "~19.1.0",
-      typescript: "~5.9.2"
+      typescript: "~5.9.2",
+      "babel-plugin-module-resolver": "latest"
     }
   };
   await fs.writeJSON(path.join(dest, "package.json"), pkg, { spaces: 2 });
@@ -210,7 +212,7 @@ async function writeBaseline({ dest, name, withQuery }) {
         output: "static",
         favicon: "./assets/images/favicon.png"
       },
-      plugins: ["expo-router"],
+      plugins: [["expo-router", { appRoot: "./src/app" }]],
       experiments: {
         typedRoutes: true
       }
@@ -222,6 +224,7 @@ async function writeBaseline({ dest, name, withQuery }) {
   return {
     presets: ['babel-preset-expo'],
     plugins: [
+      ['module-resolver', { alias: { '~': './' } }],
       'react-native-reanimated/plugin'
     ]
   };
@@ -240,22 +243,79 @@ module.exports = withUniwindConfig(config, {
 `;
   await fs.writeFile(path.join(dest, "metro.config.js"), metro);
   const tsconfig = {
+    extends: "expo/tsconfig.base",
     compilerOptions: {
       strict: true,
-      jsx: "react-native",
-      target: "ES2020",
-      moduleResolution: "node",
-      types: ["react", "react-native"]
+      paths: {
+        "~/*": ["./*"]
+      }
     },
-    include: ["app", "./uniwind-types.d.ts", "./expo-env.d.ts"]
+    include: [
+      "**/*.ts",
+      "**/*.tsx",
+      ".expo/types/**/*.ts",
+      "expo-env.d.ts",
+      "./uniwind-types.d.ts"
+    ]
   };
   await fs.writeJSON(path.join(dest, "tsconfig.json"), tsconfig, { spaces: 2 });
   const expoEnv = `/// <reference types="expo" />
 /// <reference types="expo-router" />
 `;
   await fs.writeFile(path.join(dest, "expo-env.d.ts"), expoEnv);
-  const appDir = path.join(dest, "app");
+  const srcDir = path.join(dest, "src");
+  const appDir = path.join(srcDir, "app");
   await fs.ensureDir(appDir);
+  await fs.ensureDir(path.join(srcDir, "core"));
+  await fs.ensureDir(path.join(srcDir, "api"));
+  await fs.ensureDir(path.join(srcDir, "lib"));
+  await fs.ensureDir(path.join(srcDir, "types"));
+  await fs.ensureDir(path.join(srcDir, "components", "screens", "home"));
+  await fs.ensureDir(path.join(srcDir, "components", "screens", "profile"));
+  await fs.ensureDir(path.join(srcDir, "components", "core"));
+  const textCore = `import { Text as RNText, TextProps } from 'react-native';
+import { twMerge } from 'tailwind-merge';
+
+type TypographyVariant =
+  | 'title'
+  | 'subtitle'
+  | 'body'
+  | 'caption'
+  | 'button'
+  | 'display'
+  | 'caption-primary'
+  | 'body-primary'
+  | 'subtitle-primary';
+
+interface TextComponentProps extends TextProps {
+  className?: string;
+  variant?: TypographyVariant;
+}
+
+const variantStyles: Record<TypographyVariant, string> = {
+  title: 'text-2xl font-bold',
+  subtitle: 'text-xl font-semibold',
+  'subtitle-primary': 'text-xl font-semibold text-primary',
+  body: 'text-base',
+  'body-primary': 'text-base text-primary',
+  caption: 'text-sm font-medium',
+  'caption-primary': 'text-sm text-primary font-medium',
+  button: 'text-xl text-primary font-semibold text-white text-center',
+  display: 'text-3x font-bold',
+};
+
+const Text = ({ variant = 'body', children, className, ...props }: TextComponentProps) => {
+  const textStyle = twMerge('text-black', variantStyles[variant], className);
+  return (
+    <RNText className={textStyle} {...props}>
+      {children}
+    </RNText>
+  );
+};
+
+export default Text;
+`;
+  await fs.writeFile(path.join(srcDir, "components", "core", "text.tsx"), textCore);
   const easJson = {
     cli: { version: ">= 7.0.0" },
     build: {
@@ -292,7 +352,7 @@ import { Stack } from "expo-router";
 import * as SplashScreen from "expo-splash-screen";
 import { useEffect } from "react";
 import "react-native-reanimated";
-import "../global.css";
+import "../../global.css";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 
 export { ErrorBoundary } from "expo-router";
@@ -307,7 +367,7 @@ const queryClient = new QueryClient();
 
 export default function RootLayout() {
   const [loaded, error] = useFonts({
-    SpaceMono: require("../assets/fonts/SpaceMono-Regular.ttf"),
+    SpaceMono: require("../../assets/fonts/SpaceMono-Regular.ttf"),
     ...FontAwesome.font,
   });
 
@@ -346,7 +406,7 @@ import { Stack } from "expo-router";
 import * as SplashScreen from "expo-splash-screen";
 import { useEffect } from "react";
 import "react-native-reanimated";
-import "../global.css";
+import "../../global.css";
 
 export { ErrorBoundary } from "expo-router";
 
@@ -358,7 +418,7 @@ SplashScreen.preventAutoHideAsync();
 
 export default function RootLayout() {
   const [loaded, error] = useFonts({
-    SpaceMono: require("../assets/fonts/SpaceMono-Regular.ttf"),
+    SpaceMono: require("../../assets/fonts/SpaceMono-Regular.ttf"),
     ...FontAwesome.font,
   });
 
@@ -395,6 +455,7 @@ function RootLayoutNav() {
 import FontAwesome from '@expo/vector-icons/FontAwesome';
 import { Link, Tabs } from 'expo-router';
 import { Pressable } from 'react-native';
+import '../../global.css';
 
 function TabBarIcon(props: { name: React.ComponentProps<typeof FontAwesome>['name']; color: string; }) {
   return <FontAwesome size={28} style={{ marginBottom: -3 }} {...props} />;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newcandies",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Scaffold Expo Router + Uniwind React Native apps with layered templates.",
   "type": "module",
   "bin": {