create-warlock 5.33.0 → 5.34.1

package/templates/warlock/skills/git-workflow/SKILL.md

@@ -37,18 +37,18 @@ refactor(cart): extract totals calculation into a util
 
 ### 1.2 Types
 
-| Type        | Use for                                          |
-| ----------- | ------------------------------------------------ |
-| `feat`      | New user-visible feature or capability           |
-| `fix`       | Bug fix                                          |
-| `refactor`  | Internal restructure with no behaviour change    |
-| `docs`      | Documentation only (skills, README, code docs)   |
-| `test`      | Adding or updating tests only                    |
-| `chore`     | Tooling, config, scripts — no app code change    |
-| `perf`      | Performance improvement                          |
-| `build`     | Build system or external dependencies            |
-| `ci`        | CI configuration                                 |
-| `style`     | Formatting only (rare — Prettier handles this)   |
+| Type       | Use for                                        |
+| ---------- | ---------------------------------------------- |
+| `feat`     | New user-visible feature or capability         |
+| `fix`      | Bug fix                                        |
+| `refactor` | Internal restructure with no behaviour change  |
+| `docs`     | Documentation only (skills, README, code docs) |
+| `test`     | Adding or updating tests only                  |
+| `chore`    | Tooling, config, scripts — no app code change  |
+| `perf`     | Performance improvement                        |
+| `build`    | Build system or external dependencies          |
+| `ci`       | CI configuration                               |
+| `style`    | Formatting only (rare — Oxfmt handles this)    |
 
 ### 1.3 Scope
 
@@ -143,18 +143,23 @@ Each PR is independently mergeable, independently reviewable.
 
 ```markdown
 ## What
+
 One-line summary of the change.
 
 ## Why
+
 The reason — link to a ticket, design doc, or bug report.
 
 ## How to verify
+
 Steps a reviewer can take to confirm it works.
 
 ## Screenshots / recordings
+
 If UI or output changed.
 
 ## Notes for reviewer
+
 Anything that's intentionally weird or worth knowing.
 ```
 
@@ -195,14 +200,14 @@ A drive-by approve is worse than no approve — it gives false confidence. If yo
 
 Every PR runs these. All must pass before merge. The exact commands match `package.json` scripts:
 
-| Gate                          | Command                       | Blocks on                          |
-| ----------------------------- | ----------------------------- | ---------------------------------- |
-| Type-check                    | `yarn tsc`                    | Any TS error                       |
-| Lint                          | `yarn lint`                   | Any ESLint error                   |
-| Tests                         | `yarn test --run`             | Any failed test                    |
-| Coverage (recommended floor)  | `yarn test:coverage`          | TBD per team policy                |
-| Dependency audit              | `yarn audit --level=high`     | High / critical vulnerabilities    |
-| Format check                  | `yarn format --check`         | Any unformatted file               |
+| Gate                         | Command                   | Blocks on                       |
+| ---------------------------- | ------------------------- | ------------------------------- |
+| Type-check                   | `yarn tsc`                | Any TS error                    |
+| Lint                         | `yarn lint`               | Any Oxlint error                |
+| Tests                        | `yarn test --run`         | Any failed test                 |
+| Coverage (recommended floor) | `yarn test:coverage`      | TBD per team policy             |
+| Dependency audit             | `yarn audit --level=high` | High / critical vulnerabilities |
+| Format check                 | `yarn format --check`     | Any unformatted file            |
 
 Additional rules:
 

package/templates/warlock/skills/module-boundaries/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: module-boundaries
-description: 'Architecture rules for how modules under `src/app/**` relate — each module owns one domain noun (`orders`, `users`, `carts`, `payments`); standard layout per module (`controllers/`, `services/`, `models/<noun>/`, `repositories/`, `schema/`, `resources/`, `types/`, `utils/`, `events/`, `errors/`, `routes.ts`); public surface exposed through sub-folder barrels (`services/index.ts`, `utils/index.ts`, `types/index.ts`) — NEVER a module-root `index.ts` re-exporting everything; no module reaches into another module''s internal files; zero circular dependencies between modules; inter-module communication is explicit — direct service call OR `@mongez/events` bus, never shared mutable globals; cross-cutting helpers live in `src/app/shared/`. Triggers: adding a new module under `src/app/**`; importing from another module; deciding where new code belongs; circular import error; ESLint `import/no-restricted-paths` violation; user asks "can module A use module B''s internals", "how should modules talk", "where should this code live", "I''m getting a circular dependency", "what folders does a module need", "what goes in shared". Skip: intra-module file organization (load `skills/code-standards/SKILL.md` § 4); barrel mechanics within a module (load `skills/code-standards/SKILL.md` § 2.2); deploying / packaging / monorepo questions; framework primitive details — load relevant `@warlock.js/*` skill.'
+description: 'Architecture rules for how modules under `src/app/**` relate — each module owns one domain noun (`orders`, `users`, `carts`, `payments`); standard layout per module (`controllers/`, `services/`, `models/<noun>/`, `repositories/`, `schema/`, `resources/`, `types/`, `utils/`, `events/`, `errors/`, `routes.ts`); public surface exposed through sub-folder barrels (`services/index.ts`, `utils/index.ts`, `types/index.ts`) — NEVER a module-root `index.ts` re-exporting everything; no module reaches into another module''s internal files; zero circular dependencies between modules; inter-module communication is explicit — direct service call OR `@mongez/events` bus, never shared mutable globals; cross-cutting helpers live in `src/app/shared/`. Triggers: adding a new module under `src/app/**`; importing from another module; deciding where new code belongs; circular import error; Oxlint `import/no-restricted-paths` violation; user asks "can module A use module B''s internals", "how should modules talk", "where should this code live", "I''m getting a circular dependency", "what folders does a module need", "what goes in shared". Skip: intra-module file organization (load `skills/code-standards/SKILL.md` § 4); barrel mechanics within a module (load `skills/code-standards/SKILL.md` § 2.2); deploying / packaging / monorepo questions; framework primitive details — load relevant `@warlock.js/*` skill.'
 ---
 
 # Module boundaries
@@ -116,26 +116,35 @@ See `skills/code-standards/SKILL.md` § 2.2 for the reasoning.
 - `src/app/<module>/schema/*` — schemas belong to the endpoint that uses them
 - `src/app/<module>/routes.ts` — registers routes for the framework, nobody imports it
 
-### 3.3 Enforce with ESLint
+### 3.3 Enforce with Oxlint
 
-Add `eslint-plugin-import/no-restricted-paths` rules:
+Add scoped native rules to `.oxlintrc.json`:
 
-```js
-// eslint.config.js — proposed addition
+```json
 {
-  rules: {
-    "import/no-restricted-paths": ["error", {
-      zones: [
-        { target: "src/app/*/controllers", from: "src/app/*/controllers", except: ["./"] },
-        { target: "src/app", from: "src/app/*/repositories", except: ["./*/services"] },
-        { target: "src/app", from: "src/app/*/schema", except: ["./*/controllers"] },
-      ],
-    }],
-  },
+  "overrides": [
+    {
+      "files": ["src/app/orders/**/*.ts"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "patterns": [
+              {
+                "group": ["app/*/controllers/**", "app/*/repositories/**"],
+                "message": "Import public services instead"
+              }
+            ]
+          }
+        ]
+      }
+    }
+  ]
 }
 ```
 
-The exact rule shape depends on the eslint config — but the principle is: cross-module imports go through services / utils / types / resources / models / errors, never through the private folders.
+Cross-module imports go through public services, utils, types, resources, models
+and errors. Adapt each override to the module's public surface.
 
 ---
 
@@ -192,7 +201,7 @@ Or, if the shared concept is purely cross-cutting (not a domain), it goes to `ap
 
 ### 5.4 Detect in CI
 
-`eslint-plugin-import/no-cycle` catches cycles at lint time. Enable it.
+`import/no-cycle` catches cycles at lint time. Enable it.
 
 ---
 
@@ -244,13 +253,13 @@ Top-level mutable exports across modules are the worst kind of coupling — invi
 
 ## 7. Where shared code lives
 
-| If the code is...                       | Put it in                                     |
-| --------------------------------------- | --------------------------------------------- |
-| Used by 2+ modules, stable, cross-domain | `src/app/shared/`                            |
-| Used by 2+ modules, domain-specific      | Extract a new domain module                   |
-| Used by exactly 1 module                 | Stays inside that module's `utils/`           |
-| Third-party integration glue (SDK wrappers) | `src/app/shared/` (or a dedicated module)  |
-| Build-time config                        | `src/config/` (one file per concern)          |
+| If the code is...                           | Put it in                                 |
+| ------------------------------------------- | ----------------------------------------- |
+| Used by 2+ modules, stable, cross-domain    | `src/app/shared/`                         |
+| Used by 2+ modules, domain-specific         | Extract a new domain module               |
+| Used by exactly 1 module                    | Stays inside that module's `utils/`       |
+| Third-party integration glue (SDK wrappers) | `src/app/shared/` (or a dedicated module) |
+| Build-time config                           | `src/config/` (one file per concern)      |
 
 ### 7.1 Promotion to `shared/` is a deliberate choice
 
@@ -285,7 +294,7 @@ Before merging a change that adds, restructures, or imports across modules:
 - [ ] No module-root `index.ts` created
 - [ ] Sub-folder barrels exist for `services/`, `utils/`, `types/` where applicable
 - [ ] No imports from another module's `controllers/`, `repositories/`, `schema/`
-- [ ] No circular imports between modules (ESLint `no-cycle` clean)
+- [ ] No circular imports between modules (Oxlint `no-cycle` clean)
 - [ ] Cross-module communication uses direct service call or `@mongez/events` — never shared mutable globals
 - [ ] Shared code that's used by 2+ modules lives in `src/app/shared/`, not duplicated
 - [ ] Module has a `README.md` describing purpose, public surface, and ownership

package/templates/warlock/skills/web-code-standards/SKILL.md

@@ -53,19 +53,19 @@ make the feature harder to read.
 
 ## 1. Keep the page contract, make the implementation thin
 
-Warlock's file-routed modules have one policy export: `config`. A page's
-`route`, `cache`, `middleware`, `validation`, `metadata`, and `sitemap` all
-belong in that object; do not use legacy top-level policy exports. `loader`,
-`register`, `ErrorBoundary`, and the default component remain top-level
-exports. Layouts, registration files, `root.tsx`, `404.page.tsx`, and
-`error.page.tsx` also have framework-defined roles. These are intentional
-exceptions to the generic "one primary export per file" rule; do not split
-them merely to satisfy it.
+Page logic lives in the matching `.setup.ts` file: `config`, `loader`,
+`register`, and `action`/`actions`. UI files contain the default
+component and named components such as `ErrorBoundary`. Pair `layout.tsx` with
+`layout.setup.ts`, `root.tsx` with `root.setup.ts`, and `error.page.tsx` with
+`error.setup.ts`. Use type-only imports from setup for loader/action inference.
+The framework projects browser-safe `register()` code to the client. Put route,
+cache, validation, middleware, metadata, and sitemap policy inside `config`;
+metadata always belongs in `config.metadata`.
 
 Use the config type that matches the module. A page can preserve loader data
 inference for metadata by satisfying `PageConfig<typeof loader>`:
 
-```tsx
+```ts title="src/web/posts.setup.ts"
 import type { PageConfig } from "@warlock.js/web";
 
 export async function loader() {
@@ -79,7 +79,9 @@ export const config = {
   metadata: ({ data }) => ({ title: data.title }),
   sitemap: { changefreq: "daily" },
 } satisfies PageConfig<typeof loader>;
+```
 
+```tsx title="src/web/posts.page.tsx"
 export default function PostsPage() {
   return <main>Posts</main>;
 }
@@ -93,21 +95,22 @@ route-name and parameter types are not available in 5.17.
 Layouts use one `config satisfies LayoutConfig` object for `prefix`,
 `middleware`, `metadata`, and a sitemap default. Roots use one
 `config satisfies RootConfig` object for `middleware` and the static `strictMode`
-flag: root modules do
-not declare routes, prefixes, metadata, validation, cache, or sitemap policy.
-
-```tsx
-import type { LayoutConfig, RootConfig } from "@warlock.js/web";
+flag, plus metadata defaults. Root modules do not declare routes, prefixes,
+validation, cache, or sitemap policy.
 
-// src/web/account/layout.tsx
+```ts title="src/web/account/layout.setup.ts"
+import type { LayoutConfig } from "@warlock.js/web";
 export const config = {
   prefix: "/account",
   middleware: [requireUser],
   metadata: { robots: "noindex" },
   sitemap: false,
 } satisfies LayoutConfig;
+```
+
+```ts title="src/web/root.setup.ts"
+import type { RootConfig } from "@warlock.js/web";
 
-// src/web/root.tsx
 export const config = {
   middleware: [loadRequestContext],
 } satisfies RootConfig;
@@ -119,8 +122,8 @@ let TypeScript infer its return. Use
 `LayoutLoaderContext` for a layout, and `AppLoaderContext` for the root. Do not
 annotate the whole function as `PageLoader`, use `satisfies` on a loader,
 duplicate its payload shape, or cast an unknown return.
-A page file declares its route contract, coordinates a controller-like loader,
-and composes presentational components. The loader validates input, calls
+A setup file declares the route contract and coordinates a controller-like
+loader; its UI file composes presentational components. The loader validates input, calls
 named services under `src/app/<domain>/services/`, converts results through
 their resources, and returns the page data. **Every model/repository read and
 every business rule belongs in an app service, even when the loader would need
@@ -134,7 +137,7 @@ Extract substantive view sections into cohesive components. A component
 that needs any behavior gets a separate feature-named custom-hook file; a
 component with no behavior stays presentational and needs no hook. Split by
 responsibility, not by a mechanical line-count limit. Framework exports
-remain in the page file even when their work is delegated elsewhere.
+for logic remain in the setup file even when their work is delegated elsewhere.
 
 Preserve the framework's rendering boundary: `root.tsx` owns the document,
 `#vessel` and `<Scripts />`; the loader runs on the server, while the rendered
@@ -292,7 +295,7 @@ and refresh primitives so state and loader data stay in sync.
 
 Apply the shared `code-standards` rules to web TypeScript as well: `type` for
 plain props/data, no `any`, no swallowed catches, no unsafe assertions used
-to hide an unknown data contract. Configure non-mutating ESLint and formatting
+to hide an unknown data contract. Configure non-mutating Oxlint and formatting
 checks to enforce rules that can be automated; do not rely on a lint command
 that rewrites files as the only quality gate.
 

package/templates/warlock/src/web/home/components/home-footer.tsx

@@ -1,5 +1,7 @@
 import { HomeLogo } from "./logo";
 
+const copyrightYear = new Date().getFullYear();
+
 export function HomeFooter() {
   return (
     <>
@@ -27,7 +29,7 @@ export function HomeFooter() {
           <a href="https://github.com/warlockjs" target="_blank" rel="noreferrer">
             GitHub
           </a>
-          <span>MIT © {new Date().getFullYear()}</span>
+          <span>MIT © {copyrightYear}</span>
         </div>
       </footer>
     </>

package/esm/prompts/ask-lint-toolchain.mjs

@@ -1,21 +0,0 @@
-import { select } from "@clack/prompts";
-
-//#region ../../packages/create-warlock/src/prompts/ask-lint-toolchain.ts
-/** The full wizard offers the same toolchain choice as --lint. */
-function askLintToolchain(initialValue = "oxc") {
-	return select({
-		message: "Choose lint and formatting tools",
-		options: [{
-			value: "eslint",
-			label: "ESLint + Prettier (deprecated)"
-		}, {
-			value: "oxc",
-			label: "Oxlint + Oxfmt"
-		}],
-		initialValue
-	});
-}
-
-//#endregion
-export { askLintToolchain };
-//# sourceMappingURL=ask-lint-toolchain.mjs.map

package/esm/prompts/ask-lint-toolchain.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"ask-lint-toolchain.mjs","names":[],"sources":["../../../../../../../packages/create-warlock/src/prompts/ask-lint-toolchain.ts"],"sourcesContent":["import { select } from \"@clack/prompts\";\nimport type { LintToolchain } from \"../commands/create-new-app/types\";\n\n/** The full wizard offers the same toolchain choice as --lint. */\nexport function askLintToolchain(initialValue: LintToolchain = \"oxc\") {\n  return select<LintToolchain>({\n    message: \"Choose lint and formatting tools\",\n    options: [\n      { value: \"eslint\", label: \"ESLint + Prettier (deprecated)\" },\n      { value: \"oxc\", label: \"Oxlint + Oxfmt\" },\n    ],\n    initialValue,\n  });\n}\n"],"mappings":";;;;AAIA,SAAgB,iBAAiB,eAA8B,OAAO;CACpE,OAAO,OAAsB;EAC3B,SAAS;EACT,SAAS,CACP;GAAE,OAAO;GAAU,OAAO;EAAiC,GAC3D;GAAE,OAAO;GAAO,OAAO;EAAiB,CAC1C;EACA;CACF,CAAC;AACH"}

package/templates/warlock/.prettierrc.json

@@ -1,12 +0,0 @@
-{
-  "semi": true,
-  "tabWidth": 2,
-  "printWidth": 100,
-  "singleQuote": false,
-  "arrowParens": "always",
-  "trailingComma": "all",
-  "endOfLine": "lf",
-  "plugins": ["@ianvs/prettier-plugin-sort-imports"],
-  "importOrder": ["<BUILTIN_MODULES>", "<THIRD_PARTY_MODULES>", "^(app|web|@shared)/", "^[.]"],
-  "importOrderParserPlugins": ["typescript", "jsx", "decorators"]
-}

package/templates/warlock/eslint.config.js

@@ -1,98 +0,0 @@
-import tsPlugin from "@typescript-eslint/eslint-plugin";
-import tsParser from "@typescript-eslint/parser";
-import prettierConfig from "eslint-config-prettier";
-import prettierPlugin from "eslint-plugin-prettier";
-import unusedImports from "eslint-plugin-unused-imports";
-
-export default [
-  // Global configuration
-  {
-    languageOptions: {
-      ecmaVersion: "latest",
-      sourceType: "module",
-      globals: {
-        // Node.js globals
-        console: "readonly",
-        process: "readonly",
-        Buffer: "readonly",
-        __dirname: "readonly",
-        __filename: "readonly",
-        global: "readonly",
-        module: "readonly",
-        require: "readonly",
-        exports: "readonly",
-        // ES2021 globals
-        Promise: "readonly",
-        // Jest globals
-        describe: "readonly",
-        it: "readonly",
-        test: "readonly",
-        expect: "readonly",
-        beforeEach: "readonly",
-        afterEach: "readonly",
-        beforeAll: "readonly",
-        afterAll: "readonly",
-        jest: "readonly",
-      },
-    },
-  },
-
-  // TypeScript files configuration
-  {
-    files: ["**/*.ts", "**/*.tsx"],
-    languageOptions: {
-      parser: tsParser,
-      parserOptions: {
-        ecmaVersion: "latest",
-        sourceType: "module",
-      },
-    },
-    plugins: {
-      "@typescript-eslint": tsPlugin,
-      prettier: prettierPlugin,
-      "unused-imports": unusedImports,
-    },
-    rules: {
-      // Prettier integration
-      ...prettierConfig.rules,
-      "prettier/prettier": "error",
-
-      // TypeScript rules
-      "@typescript-eslint/no-explicit-any": "off",
-      "@typescript-eslint/no-unused-vars": "off",
-      "no-unused-vars": "off",
-      "unused-imports/no-unused-vars": [
-        "warn",
-        {
-          vars: "all",
-          varsIgnorePattern: "^_",
-          args: "after-used",
-          argsIgnorePattern: "^_",
-        },
-      ],
-      "unused-imports/no-unused-imports": "error",
-      "@typescript-eslint/explicit-member-accessibility": [
-        "error",
-        { accessibility: "explicit" },
-      ],
-      "@typescript-eslint/consistent-type-imports": [
-        "error",
-        {
-          prefer: "type-imports",
-          disallowTypeAnnotations: false,
-        },
-      ],
-    },
-  },
-
-  // Ignore patterns
-  {
-    ignores: [
-      "dist/",
-      "node_modules/",
-      "**/*.js",
-      "!**/*.config.js",
-      "!eslint.config.js",
-    ],
-  },
-];