create-foldkit-app 0.32.1 → 0.33.0

package/dist/templates/examples/slow-warnings/package.json

@@ -17,9 +17,7 @@
     "@foldkit/devtools": "workspace:*",
     "@foldkit/vite-plugin": "workspace:*",
     "@tailwindcss/vite": "^4.3.3",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "happy-dom": "^20.11.13",
-    "prettier": "^3.9.6",
     "tailwindcss": "^4.3.3",
     "typescript": "^7.0.2",
     "vite": "^8.2.2",

package/dist/templates/examples/snake/package.json

@@ -17,9 +17,7 @@
     "@foldkit/devtools": "workspace:*",
     "@foldkit/vite-plugin": "workspace:*",
     "@tailwindcss/vite": "^4.3.3",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "happy-dom": "^20.11.13",
-    "prettier": "^3.9.6",
     "tailwindcss": "^4.3.3",
     "typescript": "^7.0.2",
     "vite": "^8.2.2",

package/dist/templates/examples/ssg/package.json

@@ -18,8 +18,6 @@
     "@foldkit/devtools": "workspace:*",
     "@foldkit/vite-plugin": "workspace:*",
     "@tailwindcss/vite": "^4.3.3",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
-    "prettier": "^3.9.6",
     "tailwindcss": "^4.3.3",
     "typescript": "^7.0.2",
     "vite": "^8.2.2"

package/dist/templates/examples/ssr/package.json

@@ -21,9 +21,7 @@
     "@foldkit/devtools": "workspace:*",
     "@foldkit/vite-plugin": "workspace:*",
     "@tailwindcss/vite": "^4.3.3",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "happy-dom": "^20.11.13",
-    "prettier": "^3.9.6",
     "tailwindcss": "^4.3.3",
     "typescript": "^7.0.2",
     "vite": "^8.2.2",

package/dist/templates/examples/state-machine/package.json

@@ -19,9 +19,7 @@
     "@foldkit/devtools": "workspace:*",
     "@foldkit/vite-plugin": "workspace:*",
     "@tailwindcss/vite": "^4.3.3",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "happy-dom": "^20.11.13",
-    "prettier": "^3.9.6",
     "tailwindcss": "^4.3.3",
     "typescript": "^7.0.2",
     "vite": "^8.2.2",

package/dist/templates/examples/state-machine/src/main.ts

@@ -161,173 +161,165 @@ export const checkoutMachine = Machine.define({
   message: Message,
 })({
   initial: CheckoutState.Cart({ isShippingRequired: true }),
+  shared: [
+    Machine.forStates(['Cart', 'Shipping', 'Payment', 'Review']).on({
+      ClickedCancel: to('Cancelled', ({ state }) => ({
+        model: CheckoutState.Cancelled({
+          isShippingRequired: state.isShippingRequired,
+        }),
+      })),
+    }),
+    Machine.forStates(['Confirmed', 'Cancelled']).on({
+      ClickedStartOver: to('Cart', ({ state }) => ({
+        model: CheckoutState.Cart({
+          isShippingRequired: state.isShippingRequired,
+        }),
+      })),
+    }),
+  ],
   states: {
     Cart: {
       on: {
-        SelectedEdition: to('Cart', ({ state, message }) =>
-          evo(state, { isShippingRequired: () => message.isShippingRequired }),
-        ),
+        SelectedEdition: to('Cart', ({ state, message }) => ({
+          model: evo(state, {
+            isShippingRequired: () => message.isShippingRequired,
+          }),
+        })),
         ClickedContinue: [
           when(
             state => state.isShippingRequired,
             'Shipping',
-            ({ state }) =>
-              CheckoutState.Shipping({
+            ({ state }) => ({
+              model: CheckoutState.Shipping({
                 isShippingRequired: state.isShippingRequired,
               }),
+            }),
           ),
           otherwise(
-            to('Payment', ({ state }) =>
-              CheckoutState.Payment({
+            to('Payment', ({ state }) => ({
+              model: CheckoutState.Payment({
                 isPaymentMethodSelected: false,
                 isShippingRequired: state.isShippingRequired,
               }),
-            ),
+            })),
           ),
         ],
-        ClickedCancel: to('Cancelled', ({ state }) =>
-          CheckoutState.Cancelled({
-            isShippingRequired: state.isShippingRequired,
-          }),
-        ),
       },
     },
     Shipping: {
       on: {
-        ClickedContinue: to('Payment', ({ state }) =>
-          CheckoutState.Payment({
+        ClickedContinue: to('Payment', ({ state }) => ({
+          model: CheckoutState.Payment({
             isPaymentMethodSelected: false,
             isShippingRequired: state.isShippingRequired,
           }),
-        ),
-        ClickedBack: to('Cart', ({ state }) =>
-          CheckoutState.Cart({ isShippingRequired: state.isShippingRequired }),
-        ),
-        ClickedCancel: to('Cancelled', ({ state }) =>
-          CheckoutState.Cancelled({
+        })),
+        ClickedBack: to('Cart', ({ state }) => ({
+          model: CheckoutState.Cart({
             isShippingRequired: state.isShippingRequired,
           }),
-        ),
+        })),
       },
     },
     Payment: {
       on: {
-        ToggledPaymentMethod: to('Payment', ({ state, message }) =>
-          evo(state, { isPaymentMethodSelected: () => message.isSelected }),
-        ),
-        ClickedContinue: to('Review', ({ state }) =>
-          CheckoutState.Review({
+        ToggledPaymentMethod: to('Payment', ({ state, message }) => ({
+          model: evo(state, {
+            isPaymentMethodSelected: () => message.isSelected,
+          }),
+        })),
+        ClickedContinue: to('Review', ({ state }) => ({
+          model: CheckoutState.Review({
             isPaymentMethodSelected: state.isPaymentMethodSelected,
             isShippingRequired: state.isShippingRequired,
             isTermsAccepted: false,
             promo: Promo.NoPromo(),
             promoCodeInput: '',
           }),
-        ),
+        })),
         ClickedBack: [
           when(
             state => state.isShippingRequired,
             'Shipping',
-            ({ state }) =>
-              CheckoutState.Shipping({
+            ({ state }) => ({
+              model: CheckoutState.Shipping({
                 isShippingRequired: state.isShippingRequired,
               }),
+            }),
           ),
           otherwise(
-            to('Cart', ({ state }) =>
-              CheckoutState.Cart({
+            to('Cart', ({ state }) => ({
+              model: CheckoutState.Cart({
                 isShippingRequired: state.isShippingRequired,
               }),
-            ),
+            })),
           ),
         ],
-        ClickedCancel: to('Cancelled', ({ state }) =>
-          CheckoutState.Cancelled({
-            isShippingRequired: state.isShippingRequired,
-          }),
-        ),
       },
     },
     Review: {
       on: {
-        ToggledPaymentMethod: to('Review', ({ state, message }) =>
-          evo(state, { isPaymentMethodSelected: () => message.isSelected }),
-        ),
-        ToggledTermsAccepted: to('Review', ({ state, message }) =>
-          evo(state, { isTermsAccepted: () => message.isAccepted }),
-        ),
-        UpdatedPromoCode: to('Review', ({ state, message }) =>
-          evo(state, {
+        ToggledPaymentMethod: to('Review', ({ state, message }) => ({
+          model: evo(state, {
+            isPaymentMethodSelected: () => message.isSelected,
+          }),
+        })),
+        ToggledTermsAccepted: to('Review', ({ state, message }) => ({
+          model: evo(state, { isTermsAccepted: () => message.isAccepted }),
+        })),
+        UpdatedPromoCode: to('Review', ({ state, message }) => ({
+          model: evo(state, {
             promoCodeInput: () => message.value,
             promo: currentPromo =>
               currentPromo._tag === 'RejectedPromo'
                 ? Promo.NoPromo()
                 : currentPromo,
           }),
-        ),
+        })),
         SubmittedPromoCode: [
           when(
             reviewToMaybeDiscount,
             'Review',
-            ({ state, guardValue: discount }) =>
-              evo(state, { promo: () => Promo.AppliedPromo({ discount }) }),
+            ({ state, guardValue: discount }) => ({
+              model: evo(state, {
+                promo: () => Promo.AppliedPromo({ discount }),
+              }),
+            }),
           ),
           otherwise(
-            to('Review', ({ state }) =>
-              evo(state, { promo: () => Promo.RejectedPromo() }),
-            ),
+            to('Review', ({ state }) => ({
+              model: evo(state, { promo: () => Promo.RejectedPromo() }),
+            })),
           ),
         ],
         ClickedPlaceOrder: [
-          when(
-            isReviewReady,
-            'Placing',
-            ({ state }) =>
-              CheckoutState.Placing({
-                isShippingRequired: state.isShippingRequired,
-                maybeDiscount: promoToMaybeDiscount(state.promo),
-              }),
-            ({ state }) => [
+          when(isReviewReady, 'Placing', ({ state }) => ({
+            model: CheckoutState.Placing({
+              isShippingRequired: state.isShippingRequired,
+              maybeDiscount: promoToMaybeDiscount(state.promo),
+            }),
+            commands: [
               PlaceOrder({ isShippingRequired: state.isShippingRequired }),
             ],
-          ),
+          })),
         ],
-        ClickedBack: to('Payment', ({ state }) =>
-          CheckoutState.Payment({
+        ClickedBack: to('Payment', ({ state }) => ({
+          model: CheckoutState.Payment({
             isPaymentMethodSelected: state.isPaymentMethodSelected,
             isShippingRequired: state.isShippingRequired,
           }),
-        ),
-        ClickedCancel: to('Cancelled', ({ state }) =>
-          CheckoutState.Cancelled({
-            isShippingRequired: state.isShippingRequired,
-          }),
-        ),
+        })),
       },
     },
     Placing: {
       on: {
-        SucceededPlaceOrder: to('Confirmed', ({ state, message }) =>
-          CheckoutState.Confirmed({
+        SucceededPlaceOrder: to('Confirmed', ({ state, message }) => ({
+          model: CheckoutState.Confirmed({
             isShippingRequired: state.isShippingRequired,
             maybeDiscount: state.maybeDiscount,
             orderId: message.orderId,
           }),
-        ),
-      },
-    },
-    Confirmed: {
-      on: {
-        ClickedStartOver: to('Cart', ({ state }) =>
-          CheckoutState.Cart({ isShippingRequired: state.isShippingRequired }),
-        ),
-      },
-    },
-    Cancelled: {
-      on: {
-        ClickedStartOver: to('Cart', ({ state }) =>
-          CheckoutState.Cart({ isShippingRequired: state.isShippingRequired }),
-        ),
+        })),
       },
     },
   },

package/dist/templates/examples/state-machine/src/scene.test.ts

@@ -12,14 +12,13 @@ import {
 import { describe, test } from 'vitest'
 
 import { RadioGroup } from '@foldkit/ui'
-import { Message as RadioGroupMessage } from '@foldkit/ui/radioGroup'
 
 import { Message, PlaceOrder, initialModel, update } from './main'
 import { view } from './view'
 
 const resolveFocusOption = Command.resolve(
   RadioGroup.FocusOption,
-  RadioGroupMessage.CompletedFocusOption(),
+  RadioGroup.Message.CompletedFocusOption(),
 )
 
 describe('scene', () => {

package/dist/templates/examples/stopwatch/package.json

@@ -18,9 +18,7 @@
     "@foldkit/devtools": "workspace:*",
     "@foldkit/vite-plugin": "workspace:*",
     "@tailwindcss/vite": "^4.3.3",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "happy-dom": "^20.11.13",
-    "prettier": "^3.9.6",
     "tailwindcss": "^4.3.3",
     "typescript": "^7.0.2",
     "vite": "^8.2.2",

package/dist/templates/examples/todo/package.json

@@ -19,9 +19,7 @@
     "@foldkit/devtools": "workspace:*",
     "@foldkit/vite-plugin": "workspace:*",
     "@tailwindcss/vite": "^4.3.3",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "happy-dom": "^20.11.13",
-    "prettier": "^3.9.6",
     "tailwindcss": "^4.3.3",
     "typescript": "^7.0.2",
     "vite": "^8.2.2",

package/dist/templates/examples/ui-showcase/package.json

@@ -19,9 +19,7 @@
     "@foldkit/devtools": "workspace:*",
     "@foldkit/vite-plugin": "workspace:*",
     "@tailwindcss/vite": "^4.3.3",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "happy-dom": "^20.11.13",
-    "prettier": "^3.9.6",
     "tailwindcss": "^4.3.3",
     "typescript": "^7.0.2",
     "vite": "^8.2.2",

package/dist/templates/examples/ui-showcase/src/story.test.ts

@@ -5,7 +5,6 @@ import { fromString } from 'foldkit/url'
 import { describe, expect, test } from 'vitest'
 
 import { Dialog } from '@foldkit/ui'
-import { Message as DialogMessage } from '@foldkit/ui/dialog'
 
 import { AppRoute, Message, type Model, update } from './main'
 import { uiInit } from './ui/init'
@@ -117,7 +116,7 @@ describe('update', () => {
         ),
         Command.resolve(
           Dialog.CloseDialog,
-          DialogMessage.CompletedCloseDialog(),
+          Dialog.Message.CompletedCloseDialog(),
         ),
         model(model => {
           expect(model.uiModel.mobileMenuDialog.isOpen).toBe(false)

package/dist/templates/examples/view-transitions/package.json

@@ -17,9 +17,7 @@
     "@foldkit/devtools": "workspace:*",
     "@foldkit/vite-plugin": "workspace:*",
     "@tailwindcss/vite": "^4.3.3",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "happy-dom": "^20.11.13",
-    "prettier": "^3.9.6",
     "tailwindcss": "^4.3.3",
     "typescript": "^7.0.2",
     "vite": "^8.2.2",

package/dist/templates/examples/view-transitions/src/styles.css

@@ -53,9 +53,9 @@
    The directions differ in pace, not in curve: arriving at a detail page is
    unhurried, returning to the grid is brisk. Transition types are what let CSS
    tell the two apart, since the DOM change is otherwise symmetric. */
-:root:active-view-transition-type(to-artwork-detail)::view-transition-group(
-    .artwork
-  ) {
+:root:active-view-transition-type(
+    to-artwork-detail
+  )::view-transition-group(.artwork) {
   animation-duration: 480ms;
   animation-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 }

package/dist/templates/examples/weather/package.json

@@ -18,9 +18,7 @@
     "@foldkit/devtools": "workspace:*",
     "@foldkit/vite-plugin": "workspace:*",
     "@tailwindcss/vite": "^4.3.3",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "happy-dom": "^20.11.13",
-    "prettier": "^3.9.6",
     "tailwindcss": "^4.3.3",
     "typescript": "^7.0.2",
     "vite": "^8.2.2",

package/dist/templates/examples/web-components/package.json

@@ -21,9 +21,7 @@
     "@foldkit/devtools": "workspace:*",
     "@foldkit/vite-plugin": "workspace:*",
     "@tailwindcss/vite": "^4.3.3",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "happy-dom": "^20.11.13",
-    "prettier": "^3.9.6",
     "tailwindcss": "^4.3.3",
     "typescript": "^7.0.2",
     "vite": "^8.2.2",

package/dist/templates/examples/websocket-chat/package.json

@@ -18,9 +18,7 @@
     "@foldkit/devtools": "workspace:*",
     "@foldkit/vite-plugin": "workspace:*",
     "@tailwindcss/vite": "^4.3.3",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "happy-dom": "^20.11.13",
-    "prettier": "^3.9.6",
     "tailwindcss": "^4.3.3",
     "typescript": "^7.0.2",
     "vite": "^8.2.2",

package/dist/templates/release.json

@@ -1,27 +1,26 @@
 {
   "schemaVersion": 1,
   "channel": "stable",
-  "sourceCommit": "2f739758a2786fb72c0983e125a6f3d2f8eae56a",
+  "sourceCommit": "bfd25c089383e4c210423f16966d58026d7c7141",
   "packages": {
-    "create-foldkit-app": "0.32.1",
-    "@foldkit/devtools": "0.157.0",
-    "@foldkit/devtools-mcp": "0.19.3",
-    "foldkit": "0.157.0",
+    "create-foldkit-app": "0.33.0",
+    "@foldkit/devtools": "0.158.1",
+    "@foldkit/devtools-mcp": "0.19.4",
+    "foldkit": "0.158.1",
     "@foldkit/markdown": "0.9.0",
     "@foldkit/oxlint-plugin": "0.12.0",
-    "@foldkit/ui": "0.157.0",
+    "@foldkit/ui": "0.158.1",
     "@foldkit/vite-plugin": "0.20.1"
   },
   "dependencies": {
-    "@foldkit/devtools": "0.157.0",
+    "@foldkit/devtools": "0.158.1",
     "@foldkit/vite-plugin": "0.20.1",
-    "@foldkit/devtools-mcp": "0.19.3",
+    "@foldkit/devtools-mcp": "0.19.4",
     "@foldkit/oxlint-plugin": "0.12.0",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "@types/node": "^26.4.0",
     "happy-dom": "^20.11.13",
+    "oxfmt": "^0.66.0",
     "oxlint": "^1.80.0",
-    "prettier": "^3.9.6",
     "vitest": "^4.1.11"
   }
 }

package/dist/templates/rendering/ssg/package.json

@@ -7,7 +7,7 @@
     "build": "vite build",
     "preview": "vite preview --outDir dist/client",
     "typecheck": "tsc --noEmit",
-    "format": "prettier -w .",
+    "format": "oxfmt",
     "test": "vitest run",
     "lint": "oxlint src"
   }

package/dist/templates/rendering/ssr/package.json

@@ -7,7 +7,7 @@
     "build": "vite build",
     "start": "node dist/server/main.js",
     "typecheck": "tsc --noEmit",
-    "format": "prettier -w .",
+    "format": "oxfmt",
     "test": "vitest run",
     "lint": "oxlint src server"
   }

package/dist/utils/packages.js

@@ -40,10 +40,9 @@ const TEMPLATE_DEV_DEPENDENCIES = [
     '@foldkit/vite-plugin',
     '@foldkit/devtools-mcp',
     '@foldkit/oxlint-plugin',
-    '@trivago/prettier-plugin-sort-imports',
     'happy-dom',
+    'oxfmt',
     'oxlint',
-    'prettier',
     'vitest',
 ];
 const SERVER_RENDERING_DEV_DEPENDENCIES = ['@types/node'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-foldkit-app",
-  "version": "0.32.1",
+  "version": "0.33.0",
   "description": "Create Foldkit applications",
   "type": "module",
   "main": "./dist/index.js",
@@ -38,7 +38,7 @@
     "url": "https://github.com/foldkit/foldkit.git",
     "directory": "packages/create-foldkit-app"
   },
-  "homepage": "https://foldkit.dev/get-started/getting-started",
+  "homepage": "https://foldkit.dev/get-started",
   "publishConfig": {
     "access": "public"
   },
@@ -48,7 +48,7 @@
   "scripts": {
     "clean": "rimraf dist *.tsbuildinfo",
     "build": "pnpm run clean && tsc -b tsconfig.build.json && node scripts/build-templates.mjs",
-    "format": "prettier -w .",
+    "format": "oxfmt",
     "test": "vitest run",
     "typecheck": "tsc -p tsconfig.json --noEmit"
   }

package/dist/templates/base/.prettierignore

@@ -1,5 +0,0 @@
-node_modules
-dist
-repos
-*.tsbuildinfo
-pnpm-lock.yaml

package/dist/templates/base/.prettierrc

@@ -1,13 +0,0 @@
-{
-  "semi": false,
-  "singleQuote": true,
-  "arrowParens": "avoid",
-  "trailingComma": "all",
-  "printWidth": 80,
-
-  "importOrder": ["<THIRD_PARTY_MODULES>", "^@", "^[./]"],
-  "importOrderSeparation": true,
-  "importOrderSortSpecifiers": true,
-
-  "plugins": ["@trivago/prettier-plugin-sort-imports"]
-}

package/dist/templates/examples/job-application/src/step/coverLetter.ts

@@ -1,34 +0,0 @@
-import { Schema } from 'effect'
-import { type Update } from 'foldkit'
-import { defineMessageUnion } from 'foldkit/message'
-import { evo } from 'foldkit/struct'
-
-// MODEL
-
-export const Model = Schema.Struct({
-  content: Schema.String,
-})
-export type Model = typeof Model.Type
-
-// MESSAGE
-
-export const Message = defineMessageUnion({
-  UpdatedContent: { value: Schema.String },
-})
-
-export type Message = typeof Message.Type
-
-// INIT
-
-export const init = (): Model => ({
-  content: '',
-})
-
-// UPDATE
-
-export const update = (model: Model, message: Message) =>
-  Message.match<Update.Return<Model, Message>>(message, {
-    UpdatedContent: ({ value }) => ({
-      model: evo(model, { content: () => value }),
-    }),
-  })