create-warlock 5.31.0 → 5.33.0

package/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@clack/prompts": "^0.8.2",
     "@mongez/copper": "^2.1.3",
-    "@warlock.js/fs": "5.31.0",
+    "@warlock.js/fs": "5.33.0",
     "@mongez/reinforcements": "^4.0.2",
     "cross-spawn": "^7.0.3",
     "rimraf": "^6.0.1",
@@ -22,7 +22,7 @@
   "engines": {
     "node": ">=22.15"
   },
-  "version": "5.31.0",
+  "version": "5.33.0",
   "type": "module",
   "main": "./esm/index.mjs",
   "module": "./esm/index.mjs",

package/skills/create-a-warlock-project/SKILL.md

@@ -55,7 +55,7 @@ Because almost every choice defaults silently, `create-warlock` prints what it
 decided right after scaffolding, e.g.:
 
 ```
-Using npm · database: none · lint: eslint · agent-kit targets: claude
+Using npm · database: none · lint: oxc · agent-kit targets: claude
 Features: none
   change these — package manager: --pm, database: --db/--no-db, agents: --agents,
   features: --features, ai: --ai, lint: --lint, git: --git/--no-git, jwt: --jwt/--no-jwt — or
@@ -72,7 +72,7 @@ Features: none
 | `--no-db`                      | no          | —                                                                   | Opt out of a database — shorthand for `--db=none`.                                                                     |
 | `--pm`                         | yes         | inferred (`npm_config_user_agent` / system)                         | Package manager — must be one of `npm` / `yarn` / `pnpm` / `bun`; anything else is rejected before scaffolding starts. |
 | `--features`                   | yes (CSV)   | none, or `["web"]` when `--stack=web` and `--features` is not given | Comma-separated optional feature keys. An explicit `--features` always wins over the `--stack` default.                |
-| `--lint`                       | yes         | `eslint`                                                            | `oxc` (Oxlint/Oxfmt) or `eslint` (ESLint/Prettier); unknown or missing values fail before writes.                      |
+| `--lint`                       | yes         | `oxc`                                                               | `oxc` (Oxlint/Oxfmt) or `eslint` (ESLint/Prettier, deprecated); unknown or missing values fail before writes.          |
 | `--ai`                         | yes (CSV)   | none                                                                | Comma-separated AI provider keys (auto-pulls `@warlock.js/ai`).                                                        |
 | `--agents`                     | yes (CSV)   | `claude`                                                            | Comma-separated `agent-kit` targets — see below.                                                                       |
 | `--git` / `--no-git`           | no          | off                                                                 | Initialize a Git repo (`git init` + `main` branch + initial commit).                                                   |
@@ -201,13 +201,18 @@ a total count; the success screen shows the complete list.
 
 ## Choose the linter and formatter
 
-`--lint=eslint` is the default. `--lint=oxc` (also `--lint oxc`) installs exact
+`--lint=oxc` is the default. It also accepts `--lint oxc` and installs exact
 `oxlint@1.88.0` and `oxfmt@0.73.0` versions, emits `.oxlintrc.json` and
 `.oxfmtrc.json`, and removes the template's ESLint/Prettier configs and dependencies.
-The custom wizard prompts for the same choice; a flag preselects it.
+Pass `--lint=eslint` to opt in to ESLint/Prettier. The custom wizard prompts for
+the same choice; a flag preselects it.
 
 ```bash
-npm create warlock@latest my-app -- --lint=oxc --yes
+# Default: Oxlint + Oxfmt, TypeScript 7.0.2
+npm create warlock@latest my-app -- --yes
+
+# Explicit opt-in: ESLint + Prettier, TypeScript 6.0.3
+npm create warlock@latest my-eslint-app -- --lint=eslint --yes
 ```
 
 Both choices provide `lint`/`format` and non-mutating `lint:check`/`format:check`
@@ -218,13 +223,77 @@ Oxc config enables `devServer.healthCheckers: { eslint: false, oxlint: true }` a
 leaves TypeScript health checks enabled. Style matches the template's 100-column,
 double-quote, semicolon and trailing-comma settings. Import sorting is on in
 `.oxfmtrc.json`, kept to one block like the ESLint toolchain's
-`prettier-plugin-organize-imports`:
+`@ianvs/prettier-plugin-sort-imports`:
 
 ```json
-{ "sortImports": { "newlinesBetween": false } }
+{ "sortImports": { "newlinesBetween": false, "internalPattern": ["app/", "web/", "@shared/"] } }
 ```
 
-`format` (`oxfmt --write ./src`) orders built-ins, then packages, then relative
-imports. Oxfmt does not delete unused imports, so remove them from Oxlint's
-`no-unused-vars` diagnostics. Scripts in both toolchains call local binaries
+`format` (`npm run format`) orders built-ins, packages, internal aliases,
+then relative imports. Neither formatter deletes unused imports. ESLint reports
+them through `unused-imports/no-unused-imports`; Oxlint uses `no-unused-vars`.
+Scripts in both toolchains call local binaries
 (`eslint --fix ./src --max-warnings=0`, `tsc --noEmit`), never `npx`.
+
+## TypeScript 7 in 5.32
+
+Default Oxlint/Oxfmt projects pin `typescript` to `7.0.2`; `tsc` is the native Go compiler.
+The template uses `module: "ESNext"`, `moduleResolution: "bundler"`, explicit
+Node types, and `paths` relative to its tsconfig, without `baseUrl`.
+Existing apps must remove `baseUrl`, rebase alias targets, and replace
+`moduleResolution: "node"` / `"node10"` before typechecking.
+
+Explicit `--lint=eslint` projects pin `typescript` to **6.0.3**, the newest version
+supported by typescript-eslint. Its parser requires the JavaScript compiler API
+removed in TypeScript 7, and its declared peer range is `>=4.8.4 <6.1.0`
+([parser package metadata](https://registry.npmjs.org/@typescript-eslint/parser/8.71.2)).
+Both modes use the same tsconfig settings above, which are valid in TypeScript 6.
+ESLint mode prints a deprecation warning naming removal in 5.34.0 and the Oxc migration command. Both modes install with every supported package manager.
+
+### Prettier import order in ESLint mode
+
+The ESLint scaffold’s `@ianvs/prettier-plugin-sort-imports` uses Babel instead of
+the compiler API. Keep these options in `.prettierrc.json`:
+
+```json
+{
+  "plugins": ["@ianvs/prettier-plugin-sort-imports"],
+  "importOrder": ["<BUILTIN_MODULES>", "<THIRD_PARTY_MODULES>", "^(app|web|@shared)/", "^[.]"],
+  "importOrderParserPlugins": ["typescript", "jsx", "decorators"]
+}
+```
+
+Leave `importOrderTypeScriptVersion` at its default to keep type and value imports
+separate. Run `npm run format`, then `npm run lint:check`; formatting preserves
+unused imports, and `npm run lint` can apply ESLint’s unused-import fixes.
+
+## Migrate to Oxlint and Oxfmt in 5.33
+
+ESLint + Prettier are deprecated in 5.33.0 and will be removed in **5.34.0**.
+New apps should use `--lint=oxc`. To migrate an existing app, install the new
+core release and `ts-morph`, then run:
+
+```bash
+npx warlock upgrade --from 5.32 --to 5.33.0 --dry-run
+npx warlock upgrade --from 5.32 --to 5.33.0
+npm install
+npm run format
+npm run lint:check
+npx warlock check
+```
+
+Review every reported `file:line`: customized configs are preserved and need
+manual translation before removal. The codemod installs the template's Oxlint
+and Oxfmt versions and pins TypeScript to 7.0.2. It replaces standard lint/format
+scripts, removes legacy dependencies, and deletes only recognized generated
+configs. A generated `.prettierignore` becomes `.oxfmtignore`. Existing Oxc
+configs are preserved. `--dry-run --json` reports the same planned changes
+without writing files.
+
+Explicit deprecated ESLint scaffolds set `devServer.healthCheckers.eslint: true`;
+existing apps must set this themselves to retain background ESLint checking.
+
+Oxc formatting scripts explicitly read `.gitignore` and `.oxfmtignore`. Oxfmt
+0.73 otherwise defaults to `.prettierignore` (`oxfmt --help`); the explicit
+paths make migrated ignore rules effective. The package template format gate
+also defaults to Oxfmt; `--lint=eslint` is its deprecated compatibility mode.

package/templates/toolchains/oxc/.oxfmtignore

@@ -0,0 +1,2 @@
+node_modules
+dist

package/templates/toolchains/oxc/.oxfmtrc.json

@@ -7,6 +7,9 @@
   "arrowParens": "always",
   "trailingComma": "all",
   "endOfLine": "lf",
-  "sortImports": { "newlinesBetween": false },
+  "sortImports": {
+    "newlinesBetween": false,
+    "internalPattern": ["app/", "web/", "@shared/"]
+  },
   "ignorePatterns": ["node_modules/", "dist/"]
 }

package/templates/warlock/.prettierrc.json

@@ -6,5 +6,7 @@
   "arrowParens": "always",
   "trailingComma": "all",
   "endOfLine": "lf",
-  "plugins": ["prettier-plugin-organize-imports"]
+  "plugins": ["@ianvs/prettier-plugin-sort-imports"],
+  "importOrder": ["<BUILTIN_MODULES>", "<THIRD_PARTY_MODULES>", "^(app|web|@shared)/", "^[.]"],
+  "importOrderParserPlugins": ["typescript", "jsx", "decorators"]
 }

package/templates/warlock/README.md

@@ -148,3 +148,16 @@ This project ships instructions and skills for AI coding agents:
 
 - [Documentation](https://warlock.js.org)
 - [Changelog](https://warlock.js.org/changelog)
+
+## TypeScript 7 in 5.32
+
+New projects pin `typescript` to `7.0.2`; `tsc` is the native Go compiler.
+The template uses `module: "ESNext"`, `moduleResolution: "bundler"`, explicit
+Node types, and `paths` relative to its tsconfig, without `baseUrl`.
+Existing apps must remove `baseUrl`, rebase alias targets, and replace
+`moduleResolution: "node"` / `"node10"` before typechecking.
+
+Use the Oxlint/Oxfmt lint mode with TS7. The optional ESLint scaffold is retained,
+but typescript-eslint's parser requires the removed JavaScript compiler API and
+does not support TS7. ESLint mode is scheduled for deprecation in 5.33 and removal
+in 5.34. A parser's bundled older TypeScript is separate from the app's native `tsc`.

package/templates/warlock/package.json

@@ -20,13 +20,13 @@
     "gen.r": "warlock generate.repository",
     "gen.rs": "warlock generate.resource",
     "lint": "eslint --fix ./src --max-warnings=0",
-    "format": "prettier --write \"./src/**/*.{js,jsx,ts,tsx,css,md,json}\" --config ./.prettierrc.json",
+    "format": "node -e \"console.warn('Deprecated: Prettier support is removed in 5.34.0; migrate with npx warlock upgrade --from 5.32 --to 5.33.0.')\" && prettier --write \"./src/**/*.{js,jsx,ts,tsx,css,md,json}\" --config ./.prettierrc.json",
     "tsc": "warlock generate.typings && tsc --noEmit",
     "postinstall": "agent-kit init && agent-kit sync || echo \"warning: AI agent skills were NOT synced, so coding agents will not see the @warlock.js skills. Run the skills:sync script.\"",
     "skills:sync": "agent-kit sync",
     "skills:watch": "agent-kit watch",
     "lint:check": "eslint ./src --max-warnings=0",
-    "format:check": "prettier --check \"./src/**/*.{js,jsx,ts,tsx,css,md,json}\" --config ./.prettierrc.json"
+    "format:check": "node -e \"console.warn('Deprecated: Prettier support is removed in 5.34.0; migrate with npx warlock upgrade --from 5.32 --to 5.33.0.')\" && prettier --check \"./src/**/*.{js,jsx,ts,tsx,css,md,json}\" --config ./.prettierrc.json"
   },
   "dependencies": {
     "@mongez/reinforcements": "^4.0.2",
@@ -43,6 +43,7 @@
     "dayjs": "^1.11.19"
   },
   "devDependencies": {
+    "@ianvs/prettier-plugin-sort-imports": "^4.7.1",
     "@mongez/agent-kit": "^1.3.1",
     "@types/node": "^25.0.3",
     "@types/prettier": "^3.0.0",
@@ -53,8 +54,7 @@
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-unused-imports": "^4.3.0",
     "prettier": "^3.7.4",
-    "prettier-plugin-organize-imports": "^4.3.0",
-    "typescript": "^5.9.3",
+    "typescript": "7.0.2",
     "vitest": "4.0.5"
   }
 }

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

@@ -574,7 +574,7 @@ For ESLint, consider enabling these additional rules:
 - `curly` — enforces braces (§ 4.4)
 - `no-console` — enforces § 8
 
-Match the selected formatter config: `.prettierrc.json` or `.oxfmtrc.json`. Both use 100 columns, double quotes, semicolons and trailing commas. Oxfmt does not run `prettier-plugin-organize-imports`; maintain import order and remove unused imports separately, then run the linter.
+Match the selected formatter config: `.prettierrc.json` or `.oxfmtrc.json`. Both use 100 columns, double quotes, semicolons and trailing commas. Prettier uses `@ianvs/prettier-plugin-sort-imports` (Babel, independent of TypeScript); it sorts built-ins, packages, aliases (`app/*`, `web/*`, `@shared/*`) and relatives in one block while preserving separate type imports. Oxfmt sorts imports through its own configuration. Both retain unused imports: ESLint reports them through `unused-imports/no-unused-imports`, and Oxlint through `no-unused-vars`. Run the formatter, then the linter.
 
 ---
 

package/templates/warlock/src/app/auth/controllers/login.controller.ts

@@ -1,5 +1,5 @@
 import { type Request, type RequestHandler } from "@warlock.js/core";
-import { type LoginSchema, loginSchema } from "../schema/login.schema";
+import { loginSchema, type LoginSchema } from "../schema/login.schema";
 import { loginService } from "../services/auth.service";
 
 /**

package/templates/warlock/src/app/contact/controllers/contact.controller.ts

@@ -1,6 +1,6 @@
-import { contactSchema } from "@shared/contact.schema";
 import { type Request, type RequestHandler } from "@warlock.js/core";
 import { type Infer } from "@warlock.js/seal";
+import { contactSchema } from "@shared/contact.schema";
 
 export type ContactSchema = Infer.Output<typeof contactSchema>;
 

package/templates/warlock/src/app/locale/controllers/locale.controller.ts

@@ -1,5 +1,5 @@
-import { localeSchema, type LocaleSchema } from "@shared/locale.schema";
 import { type Request, type RequestHandler } from "@warlock.js/core";
+import { localeSchema, type LocaleSchema } from "@shared/locale.schema";
 
 /** POST /api/locale — persists the visitor's locale preference in a cookie. */
 export const localeController: RequestHandler<Request<LocaleSchema>> = async ({

package/templates/warlock/src/app/posts/controllers/create-new-post.controller.ts

@@ -1,6 +1,6 @@
 import { type GuardedRequestHandler } from "app/auth/requests/guarded.request";
 import { Post } from "../models/post/post.model";
-import { type CreatePostSchema, createPostSchema } from "../schema/create-post.schema";
+import { createPostSchema, type CreatePostSchema } from "../schema/create-post.schema";
 
 export const createNewPostController: GuardedRequestHandler<CreatePostSchema> = async ({
   request,

package/templates/warlock/src/app/posts/controllers/update-post.controller.ts

@@ -1,6 +1,6 @@
 import { type GuardedRequestHandler } from "app/auth/requests/guarded.request";
 import { Post } from "../models/post/post.model";
-import { type UpdatePostSchema, updatePostSchema } from "../schema/update-post.schema";
+import { updatePostSchema, type UpdatePostSchema } from "../schema/update-post.schema";
 
 export const updatePostController: GuardedRequestHandler<UpdatePostSchema> = async ({
   request,

package/templates/warlock/src/app/posts/models/post/post.model.ts

@@ -1,6 +1,6 @@
 import { Model, RegisterModel } from "@warlock.js/cascade";
 import { useComputedSlug } from "@warlock.js/core";
-import { type Infer, v } from "@warlock.js/seal";
+import { v, type Infer } from "@warlock.js/seal";
 import { PostResource } from "app/posts/resources/post.resource";
 
 export const postSchema = v.object({

package/templates/warlock/src/app/posts/schema/create-post.schema.ts

@@ -1,4 +1,4 @@
-import { type Infer, v } from "@warlock.js/seal";
+import { v, type Infer } from "@warlock.js/seal";
 
 export const createPostSchema = v.object({
   title: v.string(),

package/templates/warlock/src/app/posts/schema/update-post.schema.ts

@@ -1,4 +1,4 @@
-import { type Infer, v } from "@warlock.js/seal";
+import { v, type Infer } from "@warlock.js/seal";
 
 export const updatePostSchema = v.object({
   title: v.string(),

package/templates/warlock/src/app/users/controllers/create-new-user.controller.ts

@@ -1,6 +1,6 @@
 import { type GuardedRequestHandler } from "app/auth/requests/guarded.request";
 import { User } from "../models/user";
-import { type CreateUserSchema, createUserSchema } from "../schema/create-user.schema";
+import { createUserSchema, type CreateUserSchema } from "../schema/create-user.schema";
 
 export const createNewUserController: GuardedRequestHandler<CreateUserSchema> = async ({
   request,

package/templates/warlock/src/app/users/controllers/list-users.controller.ts

@@ -1,6 +1,6 @@
 import { type GuardedRequestHandler } from "app/auth/requests/guarded.request";
 import { usersRepository } from "../repositories/users.repository";
-import { type ListUsersSchema, listUsersSchema } from "../schema/list-users.schema";
+import { listUsersSchema, type ListUsersSchema } from "../schema/list-users.schema";
 
 export const listUsersController: GuardedRequestHandler<ListUsersSchema> = async ({
   request,

package/templates/warlock/src/app/users/models/user/user.model.ts

@@ -1,7 +1,7 @@
 import { Auth } from "@warlock.js/auth";
 import { RegisterModel } from "@warlock.js/cascade";
 import { useHashedPassword } from "@warlock.js/core";
-import { type Infer, v } from "@warlock.js/seal";
+import { v, type Infer } from "@warlock.js/seal";
 import { UserResource } from "app/users/resources/user.resource";
 
 export const userSchema = v.object({

package/templates/warlock/src/app/users/schema/create-user.schema.ts

@@ -1,4 +1,4 @@
-import { type Infer, v } from "@warlock.js/seal";
+import { v, type Infer } from "@warlock.js/seal";
 import { User } from "../models/user";
 
 export const createUserSchema = v.object({

package/templates/warlock/src/app/users/schema/list-users.schema.ts

@@ -1,4 +1,4 @@
-import { type Infer, v } from "@warlock.js/seal";
+import { v, type Infer } from "@warlock.js/seal";
 
 /**
  * Query parameters the user list accepts. Unknown keys are stripped, so a

package/templates/warlock/src/config/storage.ts

@@ -1,8 +1,8 @@
 import {
   env,
-  type StorageConfigurations,
   storageConfigurations,
   uploadsPath,
+  type StorageConfigurations,
 } from "@warlock.js/core";
 
 const storageOptions: StorageConfigurations = {

package/templates/warlock/src/web/assets.d.ts

@@ -0,0 +1,2 @@
+/** Styles imported by the web build are loaded for their side effects. */
+declare module "*.css" {}

package/templates/warlock/src/web/home/components/contact-form-controls.tsx

@@ -1,4 +1,4 @@
-import { type FormControlProps, useFormControl, useSubmitButton } from "@mongez/react-form";
+import { useFormControl, useSubmitButton, type FormControlProps } from "@mongez/react-form";
 import { type ReactNode } from "react";
 
 type ContactFieldProps = FormControlProps & {

package/templates/warlock/src/web/home/components/hero-section.tsx

@@ -1,4 +1,5 @@
 import { RuntimePreview } from "./runtime-preview";
+
 type HeroSectionProps = { statusMessage: string };
 export function HeroSection({ statusMessage }: HeroSectionProps) {
   return (

package/templates/warlock/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "types": ["node"],
     "target": "ESNext",
     "lib": ["esnext", "dom"],
     "allowJs": false,
@@ -7,7 +8,6 @@
     "experimentalDecorators": false,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
-    "downlevelIteration": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,