@take-out/docs 0.0.61 → 0.0.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/docs",
-  "version": "0.0.61",
+  "version": "0.0.62",
   "description": "Documentation files for Takeout starter kit",
   "type": "module",
   "files": [

package/sync-prompt.md

@@ -1,19 +1,27 @@
 ---
 name: takeout-sync-prompt
-description: Intelligent sync guide for updating forked Takeout with upstream changes while preserving customizations. sync, upstream sync, fork sync, merging upstream, git merge, tamagui/takeout2, upstream changes, update from takeout, takeout updates.
+description:
+  Intelligent sync guide for updating forked Takeout with upstream changes while
+  preserving customizations. sync, upstream sync, fork sync, merging upstream,
+  git merge, tamagui/takeout2, upstream changes, update from takeout, takeout
+  updates.
 ---
 
 # Takeout Repository Sync Prompt
 
-You are helping sync a fork of the Takeout starter kit with the latest upstream changes.
+You are helping sync a fork of the Takeout starter kit with the latest upstream
+changes.
 
 ## Context
 
-This application was forked from Takeout, a full-stack starter kit for building production-ready apps. The upstream repository is at `git@github.com:tamagui/takeout2.git`.
+This application was forked from Takeout, a full-stack starter kit for building
+production-ready apps. The upstream repository is at
+`git@github.com:tamagui/takeout2.git`.
 
 ## Your Task
 
-Intelligently sync the latest Takeout changes into this repository while preserving all user customizations.
+Intelligently sync the latest Takeout changes into this repository while
+preserving all user customizations.
 
 ## Process
 
@@ -28,17 +36,21 @@ cd /tmp/takeout-upstream
 
 ### 2. Identify Last Synced Commit
 
-Compare the current repository with the upstream to determine the last commit that was synced from Takeout. You can do this by:
+Compare the current repository with the upstream to determine the last commit
+that was synced from Takeout. You can do this by:
 
 - Checking git history for merge commits from upstream
 - Comparing file contents and commit messages
-- Looking for a `.takeout` marker file (if it exists) that contains the last synced commit SHA
+- Looking for a `.takeout` marker file (if it exists) that contains the last
+  synced commit SHA
 
-Create or update a `.takeout` file in the project root with the current HEAD SHA after syncing.
+Create or update a `.takeout` file in the project root with the current HEAD SHA
+after syncing.
 
 ### 3. Analyze New Commits
 
-Starting from the last synced commit, go through each new commit in the upstream repository:
+Starting from the last synced commit, go through each new commit in the upstream
+repository:
 
 ```bash
 git log --oneline <last-synced-commit>..HEAD
@@ -65,16 +77,20 @@ For each commit:
 For each applicable change:
 
 **If the code still exists and hasn't been heavily customized:**
+
 - Apply the change directly, preserving user modifications where possible
 - Use three-way merge strategies when conflicts arise
 
 **If the code has been customized:**
+
 - Pause and ask the user:
   - Show them the upstream change
   - Show them their current code
-  - Ask if they want to: (a) apply the change, (b) skip it, (c) manually merge it, or (d) see more details
+  - Ask if they want to: (a) apply the change, (b) skip it, (c) manually merge
+    it, or (d) see more details
 
 **If the code doesn't exist anymore:**
+
 - Skip the change (user likely removed this feature intentionally)
 - Optionally mention it in a summary at the end
 
@@ -87,36 +103,47 @@ Check if the user has ejected from the monorepo setup:
 ```
 
 **If ejected:**
+
 - DO NOT copy any changes from `./packages/*` directories
-- Instead, at the end of syncing, check the latest `@take-out/*` package versions in the upstream `package.json`
-- Run: `bun add @take-out/cli@^X.X.X @take-out/helpers@^X.X.X` (etc.) with the latest versions
+- Instead, at the end of syncing, check the latest `@take-out/*` package
+  versions in the upstream `package.json`
+- Run: `bun add @take-out/cli@^X.X.X @take-out/helpers@^X.X.X` (etc.) with the
+  latest versions
 
 **If NOT ejected:**
+
 - Sync changes to `./packages/*` normally
 - Preserve any local modifications to these packages
 
 ### 6. Handle Special Cases
 
 **Environment variables:**
+
 - Never overwrite `.env` or `.env.local`
 - For new variables in `.env.development`, notify the user but don't auto-add
 
 **Configuration files:**
-- `package.json`: Merge dependencies carefully, don't overwrite user's custom scripts/config
-- `tsconfig.json`, `.oxfmtrc.jsonc`, `.oxlintrc.json`: Merge carefully, preserving user customizations
+
+- `package.json`: Merge dependencies carefully, don't overwrite user's custom
+  scripts/config
+- `tsconfig.json`, `.oxfmtrc.jsonc`, `.oxlintrc.json`: Merge carefully,
+  preserving user customizations
 - `app.config.ts`: Never overwrite (contains user's app identity)
 
 **Database migrations:**
+
 - Always apply new migrations in `./migrations/*`
 - Never modify existing migrations
 
 **Generated files:**
+
 - Skip `src/data/generated/*` (these are auto-generated)
 - Skip `node_modules/`, `.vxrn/`, `dist/`, etc.
 
 ### 7. Pause for Decisions
 
 Stop and ask the user whenever:
+
 - A change conflicts with their customizations
 - A breaking change is detected
 - Multiple valid approaches exist for merging a change
@@ -124,6 +151,7 @@ Stop and ask the user whenever:
 - You're uncertain about the best approach
 
 When pausing, provide:
+
 - Clear explanation of the situation
 - The upstream change details
 - Their current code
@@ -144,6 +172,7 @@ After processing all commits:
 2. Update the `.takeout` marker file with the new HEAD SHA
 
 3. Run post-sync checks:
+
    ```bash
    bun install
    bun lint:fix
@@ -154,16 +183,19 @@ After processing all commits:
 
 ## Important Guidelines
 
-- **Preserve user intent**: When in doubt, preserve the user's changes over upstream changes
+- **Preserve user intent**: When in doubt, preserve the user's changes over
+  upstream changes
 - **Be transparent**: Always explain what you're doing and why
 - **Ask questions**: Better to pause and ask than to make a wrong assumption
 - **Test incrementally**: After significant changes, suggest running tests
 - **Document decisions**: Keep track of choices made for future reference
-- **Respect customizations**: Recognize that users forked Takeout to make it their own
+- **Respect customizations**: Recognize that users forked Takeout to make it
+  their own
 
 ## Example Decision Points
 
 **Example 1: Upstream updates a component the user has heavily customized**
+
 ```
 ⚠️  Decision needed: Upstream updated Button component
 
@@ -187,6 +219,7 @@ What would you like to do? [a/b/c/d]
 ```
 
 **Example 2: New dependency in upstream**
+
 ```
 ℹ️  Upstream added new dependency: @tamagui/animate-presence@1.0.0
 
@@ -203,6 +236,15 @@ What would you like to do? [a/b]
 ## Final Notes
 
 - This is an **intelligent sync**, not a blind merge
-- The goal is to **keep you up-to-date** while **respecting your customizations**
+- The goal is to **keep you up-to-date** while **respecting your
+  customizations**
 - When uncertain, **always ask** before making changes
 - Keep a **detailed log** of all changes for review
+
+## What's meant to not sync
+
+Note that apps have different schemas and use-cases, for things inside app/, for
+src/data/ models and such, what you do want to sync is if there were sweeping
+changes to how these things are structured fundamentally - but you don't want to
+sync the actual specific models, or ./src/data/generated, or things like the
+schema changes specific to an individual app.

package/zero.md

@@ -10,7 +10,7 @@ queries are plain exported functions in `src/data/queries/` that use the global
 
 ```ts
 // src/data/queries/post.ts
-import { serverWhere, zql } from 'over-zero'
+import { serverWhere, zql } from 'on-zero'
 
 const permission = serverWhere('post', () => true)
 
@@ -144,7 +144,7 @@ models in `src/data/models/` define schema, permissions, and mutations:
 ```ts
 // src/data/models/post.ts
 import { boolean, number, string, table } from '@rocicorp/zero'
-import { mutations, serverWhere } from 'over-zero'
+import { mutations, serverWhere } from 'on-zero'
 
 export const schema = table('post')
   .columns({
@@ -379,6 +379,6 @@ bun tko zero generate
 ## resources
 
 - zero docs: https://zero.rocicorp.dev
-- over-zero: packages/over-zero/readme.md
+- on-zero: packages/on-zero/readme.md
 - models: src/data/models/
 - queries: src/data/queries/