@adamhl8/configs 3.0.3 → 3.1.1

package/README.md

@@ -37,6 +37,14 @@ export * from "@adamhl8/configs/bask"
 
 It provides `lint`, `build`, `test`, `bump-deps`, `release`, `release-run` (hidden, run by the release workflow), `tofu-check`, `commit-types`, and `prepare`. Run `bunx bask` to list them along with the allowed commit types. The tasks degrade gracefully so projects can use them as-is: `build` only runs `tsdown` if the project has a `tsdown.config.ts`, `test` (`bun test`) passes when there are no tests, and `tofu-check` (a `tofu plan` drift check, which `build` also runs) skips itself unless run locally in a project with `.tofu` files.
 
+In projects that depend on `tailwindcss`, `lint` also runs [tailwint](https://github.com/peterwangsc/tailwint) on `.astro` files, because oxlint can't see Astro markup. It only checks and never fixes, because tailwint resolves a class conflict by deleting a class by position, not by which one wins. Projects with `.astro` files install it:
+
+```sh
+bun add -D tailwint @tailwindcss/language-server
+```
+
+Both are optional peer dependencies. bask runs `bun tailwint` from the project, so with bun's `isolated` linker the bin has to be installed by the project, not just by `@adamhl8/configs`.
+
 To customize a task, add hooks to it from your `bask.ts`. A hook also runs when another base task calls that task, so extending `lint` extends `build` too:
 
 ```ts
@@ -46,12 +54,12 @@ import { bumpDeps, lint } from "@adamhl8/configs/bask"
 export * from "@adamhl8/configs/bask"
 
 export const astroSync = task(async ({ sh }) => {
-  await sh`bun astro sync`
+  await sh`astro sync`
 })
 
 lint.before(astroSync)
 bumpDeps.after(async ({ sh }) => {
-  await sh`bun prisma generate`
+  await sh`prisma generate`
 })
 ```
 
@@ -59,11 +67,11 @@ The only script left in `package.json` is `prepare`, which hands off to bask:
 
 ```json
 "scripts": {
-  "prepare": "bunx bask prepare"
+  "prepare": "bask prepare"
 }
 ```
 
-Scripts, git hooks, and the workflows run `bunx bask` rather than `bun bask`, because `bun bask` runs `bask.ts` instead of the bask bin.
+The `prepare` script and task `sh` calls run local bins by their bare name, because `bun run` and bask both put `node_modules/.bin` on `PATH`. Git hooks and the workflows run `bunx bask` rather than `bun bask`, because `bun bask` runs `bask.ts` instead of the bask bin.
 
 ### tsconfig
 
@@ -86,6 +94,8 @@ const config = oxfmtConfig({ ... })
 export default defineConfig(config)
 ```
 
+In projects that depend on `tailwindcss`, Tailwind classes are sorted against the project's Tailwind stylesheet, so classes from plugins and `@theme` sort correctly. The stylesheet is found the same way the Tailwind language server finds it: the first CSS file, in sorted order, that does `@import "tailwindcss"`. oxfmt has to run from the project root for this to find the file. If it picks the wrong file, set `sortTailwindcss: { stylesheet: "path/to/global.css" }`.
+
 ### oxlint
 
 ```ts
@@ -97,6 +107,8 @@ const config = oxlintConfig({ ... })
 export default defineConfig(config)
 ```
 
+When the project depends on `tailwindcss`, the config enables [oxlint-tailwindcss](https://github.com/sergioazoc/oxlint-tailwindcss) with every rule except `enforce-sort-order` and `enforce-consistent-line-wrapping` (oxfmt handles these), `enforce-logical` (it conflicts with `enforce-physical`), and `max-class-count`. The plugin reads the design system from the same stylesheet oxfmt sorts against. If that's the wrong file, set `settings: { tailwindcss: { entryPoint: "path/to/global.css" } }`, alongside the oxfmt `sortTailwindcss` override.
+
 ### knip
 
 ```ts
@@ -319,6 +331,6 @@ Configure these on each repo that uses the workflows (Settings -> Secrets and va
 
 ## Notes
 
-The `prepare` script is `"prepare": "bunx bask prepare"`, which runs the base `prepare` task (`lefthook install` outside CI, the `.gitignore` sync, and the `bunfig.toml` sync).
+The `prepare` script is `"prepare": "bask prepare"`, which runs the base `prepare` task (`lefthook install` outside CI, the `.gitignore` sync, and the `bunfig.toml` sync).
 
 bun links a dependency's `package.json` bin executables into the local `node_modules/.bin`, but not the bins of the package being developed itself. This repo depends on itself (`"@adamhl8/configs": "file:."`) so that its own bins can be run directly, e.g. `adamhl8-bunfig` instead of `src/adamhl8-bunfig/index.ts`. That's also why this repo's `bask.ts` runs `tsdown` before the `prepare` task: the bins point at `dist/`, so those builds need to be available.

package/dist/adamhl8-bunfig/index

@@ -3,6 +3,7 @@ import bun from "bun";
 import { isPlainObject, merge } from "es-toolkit";
 import { existsSync } from "node:fs";
 import { fileURLToPath } from "node:url";
+import "es-toolkit/predicate";
 const CONFIG_DIRS = ["./configs/", "../configs/"];
 /** Returns the absolute path of a file in this package's `configs` folder. */
 const configFilePath = (name) => {

package/dist/adamhl8-gitignore/index

@@ -2,6 +2,7 @@
 import bun from "bun";
 import { existsSync } from "node:fs";
 import { fileURLToPath } from "node:url";
+import "es-toolkit/predicate";
 const CONFIG_DIRS = ["./configs/", "../configs/"];
 /** Returns the absolute path of a file in this package's `configs` folder. */
 const configFilePath = (name) => {

package/dist/configs/bask.base.d.ts

@@ -1,4 +1,3 @@
-//#region src/configs/bask.base.d.ts
 export declare const tofuCheck: import("@adamhl8/bask").Task;
 export declare const prepare: import("@adamhl8/bask").Task;
 export declare const bumpDeps: import("@adamhl8/bask").Task;
@@ -8,5 +7,4 @@ export declare const build: import("@adamhl8/bask").Task;
 export declare const release: import("@adamhl8/bask").Task;
 export declare const releaseRun: import("@adamhl8/bask").Task;
 export declare const commitTypes: import("@adamhl8/bask").Task;
-//#endregion
 //# sourceMappingURL=bask.base.d.ts.map

package/dist/configs/bask.base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bask.base.d.ts","names":[],"sources":["../../src/configs/bask.base.ts"],"mappings":";qBAuBa,mCAAS;qBAIT,iCAAO;qBASP,kCAAQ;qBAOR,8BAAI;qBAIJ,8BAAI;qBAmBJ,+BAAK;qBAYL,iCAAO;qBAIP,oCAAU;qBAIV,qCAAW"}
+{"version":3,"file":"bask.base.d.ts","names":[],"sources":["../../src/configs/bask.base.ts"],"mappings":"A,qBAwBa,mCAAS;qBAIT,iCAAO;qBASP,kCAAQ;qBAOR,8BAAI;qBAIJ,8BAAI;qBA0BJ,+BAAK;qBAYL,iCAAO;qBAIP,oCAAU;qBAIV,qCAAW"}

package/dist/configs/bask.base.js

@@ -1,7 +1,8 @@
+import { resolveProjectTailwind } from "../utils.js";
 import { existsSync } from "node:fs";
 import { list, task } from "@adamhl8/bask";
 import bun, { $, Glob } from "bun";
-//#region src/configs/bask.base.ts
+// src/configs/bask.base.ts
 const inCi = Boolean(process.env["CI"]);
 /** Lists tracked and untracked files matching the pathspecs, skipping gitignored ones. */
 const lsFiles = async (pathspecs) => {
@@ -36,6 +37,9 @@ const lint = task(async ({ sh }) => {
 	await sh`bun markdown-toc -i --bullets - --maxdepth 3 ./README.md`;
 	await sh`bun oxlint --fix --fix-suggestions --fix-dangerously`;
 	await sh`bun oxfmt`;
+	if (resolveProjectTailwind()) {
+		if ((await lsFiles([":(glob)**/*.astro"])).length > 0) await sh`bun tailwint "**/*.astro"`;
+	}
 	const tofuFiles = await lsFiles([
 		":(glob)**/*.tf",
 		":(glob)**/*.tofu",
@@ -71,7 +75,6 @@ list.after(async () => {
 	console.log();
 	await commitTypes();
 });
-//#endregion
 export { build, bumpDeps, commitTypes, lint, prepare, release, releaseRun, test, tofuCheck };
 
 //# sourceMappingURL=bask.base.js.map

package/dist/configs/bask.base.js.map

@@ -1 +1 @@
-{"version":3,"file":"bask.base.js","names":[],"sources":["../../src/configs/bask.base.ts"],"sourcesContent":["import { existsSync } from \"node:fs\"\n\nimport { list, task } from \"@adamhl8/bask\"\nimport bun, { $, Glob } from \"bun\"\n\n// oxlint-disable-next-line node/no-process-env\nconst inCi = Boolean(process.env[\"CI\"])\n\n/** Lists tracked and untracked files matching the pathspecs, skipping gitignored ones. */\nconst lsFiles = async (pathspecs: string[]) => {\n  const output = await $`git ls-files -z --cached --others --exclude-standard -- ${pathspecs}`.quiet().text()\n  return output.split(\"\\0\").filter(Boolean)\n}\n\n/** Checks that we're not in CI, the repo has a root tofu module, and the aws profile exists on this machine. */\nconst canRunTofu = async () => {\n  if (inCi) return false\n  const tofuFiles = await Array.fromAsync(new Glob(\"*.tofu\").scan())\n  if (tofuFiles.length === 0) return false\n  const profiles = await $`aws configure list-profiles`.nothrow().quiet().text()\n  return profiles.split(\"\\n\").includes(\"adamhl8\")\n}\n\nexport const tofuCheck = task(async ({ sh }) => {\n  if (await canRunTofu()) await sh`tofu plan -detailed-exitcode -concise -compact-warnings`\n})\n\nexport const prepare = task(async ({ sh }) => {\n  // Skip `lefthook install` in CI so commits made by the workflows don't run the hooks.\n  if (!inCi) await sh`lefthook install`\n  await sh`bun adamhl8-gitignore`\n  await sh`bun adamhl8-bunfig`\n  await sh`bun oxfmt bunfig.toml`\n  if (await canRunTofu()) await sh`tofu init -upgrade`\n})\n\nexport const bumpDeps = task(async ({ sh }) => {\n  await sh`bunx npm-check-updates --upgrade --format group`\n  await sh`rm -f bun.lock`\n  await sh`rm -rf node_modules/`\n  await sh`bun install --no-summary --no-cache`\n})\n\nexport const test = task(async ({ sh }) => {\n  await sh`bun test --pass-with-no-tests`.echo(false)\n})\n\nexport const lint = task(async ({ sh }) => {\n  await sh`bun markdown-toc -i --bullets - --maxdepth 3 ./README.md`\n  await sh`bun oxlint --fix --fix-suggestions --fix-dangerously`\n  await sh`bun oxfmt`\n\n  const tofuFiles = await lsFiles([\n    \":(glob)**/*.tf\",\n    \":(glob)**/*.tofu\",\n    \":(glob)**/*.tfvars\",\n    \":(glob)**/*.tftest.hcl\",\n    \":(glob)**/*.tofutest.hcl\",\n  ])\n  if (tofuFiles.length > 0) await sh`tofu fmt ${tofuFiles}`\n\n  await sh`bun knip-bun`\n  if (existsSync(\".github/workflows\")) await sh`actionlint`\n  await test()\n})\n\nexport const build = task(async ({ sh }) => {\n  await lint()\n  if (await bun.file(\"tsdown.config.ts\").exists()) await sh`bun tsdown`\n  // Fail in CI if the build changed or created any files, because lint fixes and formatting are applied in place.\n  // `--intent-to-add` makes untracked files show up in the diff.\n  if (inCi) {\n    await sh`git add --intent-to-add --all`\n    await sh`git diff --exit-code`\n  }\n  await tofuCheck()\n})\n\nexport const release = task(async ({ sh }) => {\n  await sh`gh workflow run release.yml`\n})\n\nexport const releaseRun = task({ hidden: true }, async ({ sh }) => {\n  await sh`bun release-it -VV --ci`\n})\n\nexport const commitTypes = task(async ({ sh }) => {\n  // oxlint-disable-next-line typescript/no-unsafe-type-assertion\n  const config = (await sh`bun commitlint --print-config json`.echo(false).json()) as {\n    rules: { \"type-enum\": [number, string, string[]] }\n  }\n  const { 2: types } = config.rules[\"type-enum\"]\n  console.log(`Commit types:\\n    ${types.join(\"\\n    \")}`)\n})\n\nlist.after(async () => {\n  console.log()\n  await commitTypes()\n})\n"],"mappings":";;;;AAMA,MAAM,OAAO,QAAQ,QAAQ,IAAI,KAAK;;AAGtC,MAAM,UAAU,OAAO,cAAwB;CAE7C,QAAO,MADc,CAAC,2DAA2D,YAAY,MAAM,CAAC,CAAC,KAAK,EAAA,CAC5F,MAAM,IAAI,CAAC,CAAC,OAAO,OAAO;AAC1C;;AAGA,MAAM,aAAa,YAAY;CAC7B,IAAI,MAAM,OAAO;CAEjB,KAAI,MADoB,MAAM,UAAU,IAAI,KAAK,QAAQ,CAAC,CAAC,KAAK,CAAC,EAAA,CACnD,WAAW,GAAG,OAAO;CAEnC,QAAO,MADgB,CAAC,8BAA8B,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAA,CAC7D,MAAM,IAAI,CAAC,CAAC,SAAS,SAAS;AAChD;AAEA,MAAa,YAAY,KAAK,OAAO,EAAE,SAAS;CAC9C,IAAI,MAAM,WAAW,GAAG,MAAM,EAAE;AAClC,CAAC;AAED,MAAa,UAAU,KAAK,OAAO,EAAE,SAAS;CAE5C,IAAI,CAAC,MAAM,MAAM,EAAE;CACnB,MAAM,EAAE;CACR,MAAM,EAAE;CACR,MAAM,EAAE;CACR,IAAI,MAAM,WAAW,GAAG,MAAM,EAAE;AAClC,CAAC;AAED,MAAa,WAAW,KAAK,OAAO,EAAE,SAAS;CAC7C,MAAM,EAAE;CACR,MAAM,EAAE;CACR,MAAM,EAAE;CACR,MAAM,EAAE;AACV,CAAC;AAED,MAAa,OAAO,KAAK,OAAO,EAAE,SAAS;CACzC,MAAM,EAAE,gCAAgC,KAAK,KAAK;AACpD,CAAC;AAED,MAAa,OAAO,KAAK,OAAO,EAAE,SAAS;CACzC,MAAM,EAAE;CACR,MAAM,EAAE;CACR,MAAM,EAAE;CAER,MAAM,YAAY,MAAM,QAAQ;EAC9B;EACA;EACA;EACA;EACA;CACF,CAAC;CACD,IAAI,UAAU,SAAS,GAAG,MAAM,EAAE,YAAY;CAE9C,MAAM,EAAE;CACR,IAAI,WAAW,mBAAmB,GAAG,MAAM,EAAE;CAC7C,MAAM,KAAK;AACb,CAAC;AAED,MAAa,QAAQ,KAAK,OAAO,EAAE,SAAS;CAC1C,MAAM,KAAK;CACX,IAAI,MAAM,IAAI,KAAK,kBAAkB,CAAC,CAAC,OAAO,GAAG,MAAM,EAAE;CAGzD,IAAI,MAAM;EACR,MAAM,EAAE;EACR,MAAM,EAAE;CACV;CACA,MAAM,UAAU;AAClB,CAAC;AAED,MAAa,UAAU,KAAK,OAAO,EAAE,SAAS;CAC5C,MAAM,EAAE;AACV,CAAC;AAED,MAAa,aAAa,KAAK,EAAE,QAAQ,KAAK,GAAG,OAAO,EAAE,SAAS;CACjE,MAAM,EAAE;AACV,CAAC;AAED,MAAa,cAAc,KAAK,OAAO,EAAE,SAAS;CAKhD,MAAM,EAAE,GAAG,WAAU,MAHC,EAAE,qCAAqC,KAAK,KAAK,CAAC,CAAC,KAAK,EAAA,CAGlD,MAAM;CAClC,QAAQ,IAAI,sBAAsB,MAAM,KAAK,QAAQ,GAAG;AAC1D,CAAC;AAED,KAAK,MAAM,YAAY;CACrB,QAAQ,IAAI;CACZ,MAAM,YAAY;AACpB,CAAC"}
+{"version":3,"file":"bask.base.js","names":[],"sources":["../../src/configs/bask.base.ts"],"sourcesContent":["import { existsSync } from \"node:fs\"\n\nimport { list, task } from \"@adamhl8/bask\"\nimport bun, { $, Glob } from \"bun\"\n\nimport { resolveProjectTailwind } from \"#utils.ts\"\n\nconst inCi = Boolean(process.env[\"CI\"])\n\n/** Lists tracked and untracked files matching the pathspecs, skipping gitignored ones. */\nconst lsFiles = async (pathspecs: string[]) => {\n  const output = await $`git ls-files -z --cached --others --exclude-standard -- ${pathspecs}`.quiet().text()\n  return output.split(\"\\0\").filter(Boolean)\n}\n\n/** Checks that we're not in CI, the repo has a root tofu module, and the aws profile exists on this machine. */\nconst canRunTofu = async () => {\n  if (inCi) return false\n  const tofuFiles = await Array.fromAsync(new Glob(\"*.tofu\").scan())\n  if (tofuFiles.length === 0) return false\n  const profiles = await $`aws configure list-profiles`.nothrow().quiet().text()\n  return profiles.split(\"\\n\").includes(\"adamhl8\")\n}\n\nexport const tofuCheck = task(async ({ sh }) => {\n  if (await canRunTofu()) await sh`tofu plan -detailed-exitcode -concise -compact-warnings`\n})\n\nexport const prepare = task(async ({ sh }) => {\n  // Skip `lefthook install` in CI so commits made by the workflows don't run the hooks.\n  if (!inCi) await sh`lefthook install`\n  await sh`bun adamhl8-gitignore`\n  await sh`bun adamhl8-bunfig`\n  await sh`bun oxfmt bunfig.toml`\n  if (await canRunTofu()) await sh`tofu init -upgrade`\n})\n\nexport const bumpDeps = task(async ({ sh }) => {\n  await sh`bunx npm-check-updates --upgrade --format group`\n  await sh`rm -f bun.lock`\n  await sh`rm -rf node_modules/`\n  await sh`bun install --no-summary --no-cache`\n})\n\nexport const test = task(async ({ sh }) => {\n  await sh`bun test --pass-with-no-tests`.echo(false)\n})\n\nexport const lint = task(async ({ sh }) => {\n  await sh`bun markdown-toc -i --bullets - --maxdepth 3 ./README.md`\n  await sh`bun oxlint --fix --fix-suggestions --fix-dangerously`\n  await sh`bun oxfmt`\n\n  if (resolveProjectTailwind()) {\n    // Check for `.astro` files first so projects without them don't need tailwint installed.\n    const astroFiles = await lsFiles([\":(glob)**/*.astro\"])\n    // Skip `--fix` because tailwint resolves a class conflict by deleting a class by position, not by which one wins.\n    if (astroFiles.length > 0) await sh`bun tailwint \"**/*.astro\"`\n  }\n\n  const tofuFiles = await lsFiles([\n    \":(glob)**/*.tf\",\n    \":(glob)**/*.tofu\",\n    \":(glob)**/*.tfvars\",\n    \":(glob)**/*.tftest.hcl\",\n    \":(glob)**/*.tofutest.hcl\",\n  ])\n  if (tofuFiles.length > 0) await sh`tofu fmt ${tofuFiles}`\n\n  await sh`bun knip-bun`\n  if (existsSync(\".github/workflows\")) await sh`actionlint`\n  await test()\n})\n\nexport const build = task(async ({ sh }) => {\n  await lint()\n  if (await bun.file(\"tsdown.config.ts\").exists()) await sh`bun tsdown`\n  // Fail in CI if the build changed or created any files, because lint fixes and formatting are applied in place.\n  // `--intent-to-add` makes untracked files show up in the diff.\n  if (inCi) {\n    await sh`git add --intent-to-add --all`\n    await sh`git diff --exit-code`\n  }\n  await tofuCheck()\n})\n\nexport const release = task(async ({ sh }) => {\n  await sh`gh workflow run release.yml`\n})\n\nexport const releaseRun = task({ hidden: true }, async ({ sh }) => {\n  await sh`bun release-it -VV --ci`\n})\n\nexport const commitTypes = task(async ({ sh }) => {\n  // oxlint-disable-next-line typescript/no-unsafe-type-assertion - trust the shape that `commitlint --print-config json` prints\n  const config = (await sh`bun commitlint --print-config json`.echo(false).json()) as {\n    rules: { \"type-enum\": [number, string, string[]] }\n  }\n  const { 2: types } = config.rules[\"type-enum\"]\n  console.log(`Commit types:\\n    ${types.join(\"\\n    \")}`)\n})\n\nlist.after(async () => {\n  console.log()\n  await commitTypes()\n})\n"],"mappings":";;;;;AAOA,MAAM,OAAO,QAAQ,QAAQ,IAAI,KAAK;;AAGtC,MAAM,UAAU,OAAO,cAAwB;CAE7C,QAAO,MADc,CAAC,2DAA2D,YAAY,MAAM,CAAC,CAAC,KAAK,EAAA,CAC5F,MAAM,IAAI,CAAC,CAAC,OAAO,OAAO;AAC1C;;AAGA,MAAM,aAAa,YAAY;CAC7B,IAAI,MAAM,OAAO;CAEjB,KAAI,MADoB,MAAM,UAAU,IAAI,KAAK,QAAQ,CAAC,CAAC,KAAK,CAAC,EAAA,CACnD,WAAW,GAAG,OAAO;CAEnC,QAAO,MADgB,CAAC,8BAA8B,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAA,CAC7D,MAAM,IAAI,CAAC,CAAC,SAAS,SAAS;AAChD;AAEA,MAAa,YAAY,KAAK,OAAO,EAAE,SAAS;CAC9C,IAAI,MAAM,WAAW,GAAG,MAAM,EAAE;AAClC,CAAC;AAED,MAAa,UAAU,KAAK,OAAO,EAAE,SAAS;CAE5C,IAAI,CAAC,MAAM,MAAM,EAAE;CACnB,MAAM,EAAE;CACR,MAAM,EAAE;CACR,MAAM,EAAE;CACR,IAAI,MAAM,WAAW,GAAG,MAAM,EAAE;AAClC,CAAC;AAED,MAAa,WAAW,KAAK,OAAO,EAAE,SAAS;CAC7C,MAAM,EAAE;CACR,MAAM,EAAE;CACR,MAAM,EAAE;CACR,MAAM,EAAE;AACV,CAAC;AAED,MAAa,OAAO,KAAK,OAAO,EAAE,SAAS;CACzC,MAAM,EAAE,gCAAgC,KAAK,KAAK;AACpD,CAAC;AAED,MAAa,OAAO,KAAK,OAAO,EAAE,SAAS;CACzC,MAAM,EAAE;CACR,MAAM,EAAE;CACR,MAAM,EAAE;CAER,IAAI,uBAAuB,GAIrB;OAAA,MAFqB,QAAQ,CAAC,mBAAmB,CAAC,EAAA,CAEvC,SAAS,GAAG,MAAM,EAAE;CAAA;CAGrC,MAAM,YAAY,MAAM,QAAQ;EAC9B;EACA;EACA;EACA;EACA;CACF,CAAC;CACD,IAAI,UAAU,SAAS,GAAG,MAAM,EAAE,YAAY;CAE9C,MAAM,EAAE;CACR,IAAI,WAAW,mBAAmB,GAAG,MAAM,EAAE;CAC7C,MAAM,KAAK;AACb,CAAC;AAED,MAAa,QAAQ,KAAK,OAAO,EAAE,SAAS;CAC1C,MAAM,KAAK;CACX,IAAI,MAAM,IAAI,KAAK,kBAAkB,CAAC,CAAC,OAAO,GAAG,MAAM,EAAE;CAGzD,IAAI,MAAM;EACR,MAAM,EAAE;EACR,MAAM,EAAE;CACV;CACA,MAAM,UAAU;AAClB,CAAC;AAED,MAAa,UAAU,KAAK,OAAO,EAAE,SAAS;CAC5C,MAAM,EAAE;AACV,CAAC;AAED,MAAa,aAAa,KAAK,EAAE,QAAQ,KAAK,GAAG,OAAO,EAAE,SAAS;CACjE,MAAM,EAAE;AACV,CAAC;AAED,MAAa,cAAc,KAAK,OAAO,EAAE,SAAS;CAKhD,MAAM,EAAE,GAAG,WAAU,MAHC,EAAE,qCAAqC,KAAK,KAAK,CAAC,CAAC,KAAK,EAAA,CAGlD,MAAM;CAClC,QAAQ,IAAI,sBAAsB,MAAM,KAAK,QAAQ,GAAG;AAC1D,CAAC;AAED,KAAK,MAAM,YAAY;CACrB,QAAQ,IAAI;CACZ,MAAM,YAAY;AACpB,CAAC"}

package/dist/configs/commitlint.base.d.ts

@@ -1,11 +1,9 @@
 import { OptionalMergeConfigFn } from "../merge-config/merge-config.js";
 import { UserConfig } from "@commitlint/types";
-//#region src/configs/commitlint.base.d.ts
 export declare const commitlintConfig: OptionalMergeConfigFn<UserConfig, {
   readonly extends: ["@commitlint/config-conventional"];
   readonly rules: {
     readonly "type-enum": readonly [2, "always", string[]];
   };
 }>;
-//#endregion
 //# sourceMappingURL=commitlint.base.d.ts.map

package/dist/configs/commitlint.base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commitlint.base.d.ts","names":["_$_merge_config_merge_config_ts0.OptionalMergeConfigFn"],"sources":["../../src/configs/commitlint.base.ts"],"mappings":";;;qBAkBa,kBAAgBA,sBAAA;;;aAJzB"}
+{"version":3,"file":"commitlint.base.d.ts","names":["_$_merge_config_merge_config_ts0.OptionalMergeConfigFn"],"sources":["../../src/configs/commitlint.base.ts"],"mappings":";;qBAkBa,kBAAgBA,sBAAA;;;aAJzB"}

package/dist/configs/commitlint.base.js

@@ -1,6 +1,6 @@
 import { createMergeConfigFn } from "../merge-config/merge-config.js";
 import conventional from "@commitlint/config-conventional";
-//#region src/configs/commitlint.base.ts
+// src/configs/commitlint.base.ts
 const [_severity, _condition, conventionalTypes] = conventional.rules["type-enum"];
 const EXCLUDED_TYPES = /* @__PURE__ */ new Set([
 	"test",
@@ -20,7 +20,6 @@ const baseConfig = {
 	] }
 };
 const commitlintConfig = createMergeConfigFn(baseConfig);
-//#endregion
 export { commitlintConfig };
 
 //# sourceMappingURL=commitlint.base.js.map

package/dist/configs/knip.base.d.ts

@@ -1,11 +1,9 @@
 import { OptionalMergeConfigFn } from "../merge-config/merge-config.js";
 import { KnipConfig } from "knip";
-//#region src/configs/knip.base.d.ts
 export declare const knipConfig: OptionalMergeConfigFn<KnipConfig, {
   readonly project: ["**/*"];
   readonly bun: {
     readonly entry: ["**/*.test.ts", "bask.ts"];
   };
 }>;
-//#endregion
 //# sourceMappingURL=knip.base.d.ts.map

package/dist/configs/knip.base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"knip.base.d.ts","names":["_$_merge_config_merge_config_ts0.OptionalMergeConfigFn"],"sources":["../../src/configs/knip.base.ts"],"mappings":";;;qBAaa,YAAUA,sBAAA;;;aAJnB"}
+{"version":3,"file":"knip.base.d.ts","names":["_$_merge_config_merge_config_ts0.OptionalMergeConfigFn"],"sources":["../../src/configs/knip.base.ts"],"mappings":";;qBAaa,YAAUA,sBAAA;;;aAJnB"}

package/dist/configs/knip.base.js

@@ -3,7 +3,6 @@ const knipConfig = createMergeConfigFn({
 	project: ["**/*"],
 	bun: { entry: ["**/*.test.ts", "bask.ts"] }
 });
-//#endregion
 export { knipConfig };
 
 //# sourceMappingURL=knip.base.js.map

package/dist/configs/oxfmt.base.d.ts

@@ -1,14 +1,21 @@
 import { OptionalMergeConfigFn } from "../merge-config/merge-config.js";
 import { OxfmtConfig } from "oxfmt";
-//#region src/configs/oxfmt.base.d.ts
 export declare const oxfmtConfig: OptionalMergeConfigFn<OxfmtConfig, {
   readonly printWidth: 120;
   readonly semi: false;
+  readonly astro: {
+    readonly allowShorthand: false;
+  };
+  readonly experimentalOperatorPosition: "start";
   readonly jsdoc: true;
   readonly sortImports: {
     readonly groups: ["builtin", "external", ["subpath", "internal"], ["index", "sibling", "parent"], "side_effect", ["style", "side_effect_style"]];
   };
-  readonly sortTailwindcss: true;
+  readonly sortPackageJson: {
+    readonly sortScripts: true;
+  };
+  readonly sortTailwindcss: true | {
+    stylesheet: string;
+  };
 }>;
-//#endregion
 //# sourceMappingURL=oxfmt.base.d.ts.map

package/dist/configs/oxfmt.base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oxfmt.base.d.ts","names":["_$_merge_config_merge_config_ts0.OptionalMergeConfigFn"],"sources":["../../src/configs/oxfmt.base.ts"],"mappings":";;;qBAqBa,aAAWA,sBAAA;WAhBV;;;;aAIV"}
+{"version":3,"file":"oxfmt.base.d.ts","names":["_$_merge_config_merge_config_ts0.OptionalMergeConfigFn"],"sources":["../../src/configs/oxfmt.base.ts"],"mappings":";;qBA4Ba,aAAWA,sBAAA;WApBV;;;aAEH;;WACqB;;;aAG5B;;;aASiB"}

package/dist/configs/oxfmt.base.js

@@ -1,7 +1,12 @@
 import { createMergeConfigFn } from "../merge-config/merge-config.js";
+import { resolveProjectTailwind } from "../utils.js";
+// src/configs/oxfmt.base.ts
+const tailwindStylesheet = resolveProjectTailwind();
 const oxfmtConfig = createMergeConfigFn({
 	printWidth: 120,
 	semi: false,
+	astro: { allowShorthand: false },
+	experimentalOperatorPosition: "start",
 	jsdoc: true,
 	sortImports: { groups: [
 		"builtin",
@@ -15,9 +20,9 @@ const oxfmtConfig = createMergeConfigFn({
 		"side_effect",
 		["style", "side_effect_style"]
 	] },
-	sortTailwindcss: true
+	sortPackageJson: { sortScripts: true },
+	sortTailwindcss: tailwindStylesheet ? { stylesheet: tailwindStylesheet } : true
 });
-//#endregion
 export { oxfmtConfig };
 
 //# sourceMappingURL=oxfmt.base.js.map

package/dist/configs/oxfmt.base.js.map

@@ -1 +1 @@
-{"version":3,"file":"oxfmt.base.js","names":[],"sources":["../../src/configs/oxfmt.base.ts"],"sourcesContent":["import type { OxfmtConfig } from \"oxfmt\"\n\nimport { createMergeConfigFn } from \"#merge-config/merge-config.ts\"\n\nconst baseConfig = {\n  printWidth: 120,\n  semi: false,\n  jsdoc: true,\n  sortImports: {\n    groups: [\n      \"builtin\",\n      \"external\",\n      [\"subpath\", \"internal\"],\n      [\"index\", \"sibling\", \"parent\"],\n      \"side_effect\",\n      [\"style\", \"side_effect_style\"],\n    ],\n  },\n  sortTailwindcss: true,\n} as const satisfies OxfmtConfig\n\nexport const oxfmtConfig = createMergeConfigFn<OxfmtConfig, typeof baseConfig>(baseConfig)\n"],"mappings":";AAqBA,MAAa,cAAc,oBAAoD;CAhB7E,YAAY;CACZ,MAAM;CACN,OAAO;CACP,aAAa,EACX,QAAQ;EACN;EACA;EACA,CAAC,WAAW,UAAU;EACtB;GAAC;GAAS;GAAW;EAAQ;EAC7B;EACA,CAAC,SAAS,mBAAmB;CAC/B,EACF;CACA,iBAAiB;AAG4D,CAAU"}
+{"version":3,"file":"oxfmt.base.js","names":[],"sources":["../../src/configs/oxfmt.base.ts"],"sourcesContent":["import type { OxfmtConfig } from \"oxfmt\"\n\nimport { createMergeConfigFn } from \"#merge-config/merge-config.ts\"\nimport { resolveProjectTailwind } from \"#utils.ts\"\n\nconst tailwindStylesheet = resolveProjectTailwind()\n\nconst baseConfig = {\n  printWidth: 120,\n  semi: false,\n  astro: { allowShorthand: false },\n  experimentalOperatorPosition: \"start\",\n  jsdoc: true,\n  sortImports: {\n    groups: [\n      \"builtin\",\n      \"external\",\n      [\"subpath\", \"internal\"],\n      [\"index\", \"sibling\", \"parent\"],\n      \"side_effect\",\n      [\"style\", \"side_effect_style\"],\n    ],\n  },\n  sortPackageJson: { sortScripts: true },\n  // Sort against the project's stylesheet so classes from plugins and `@theme` are known.\n  sortTailwindcss: tailwindStylesheet ? { stylesheet: tailwindStylesheet } : true,\n} as const satisfies OxfmtConfig\n\nexport const oxfmtConfig = createMergeConfigFn<OxfmtConfig, typeof baseConfig>(baseConfig)\n"],"mappings":";;;AAKA,MAAM,qBAAqB,uBAAuB;AAuBlD,MAAa,cAAc,oBAAoD;CApB7E,YAAY;CACZ,MAAM;CACN,OAAO,EAAE,gBAAgB,MAAM;CAC/B,8BAA8B;CAC9B,OAAO;CACP,aAAa,EACX,QAAQ;EACN;EACA;EACA,CAAC,WAAW,UAAU;EACtB;GAAC;GAAS;GAAW;EAAQ;EAC7B;EACA,CAAC,SAAS,mBAAmB;CAC/B,EACF;CACA,iBAAiB,EAAE,aAAa,KAAK;CAErC,iBAAiB,qBAAqB,EAAE,YAAY,mBAAmB,IAAI;AAGE,CAAU"}

package/dist/configs/oxlint.base.d.ts

@@ -1,13 +1,13 @@
 import { OptionalMergeConfigFn } from "../merge-config/merge-config.js";
-import { OxlintConfig } from "oxlint";
-//#region src/configs/oxlint.base.d.ts
+import { DummyRule, OxlintConfig, OxlintOverride } from "oxlint";
+type PluginRules = Record<string, DummyRule>;
 export declare const oxlintConfig: OptionalMergeConfigFn<OxlintConfig, {
-  readonly options: {
+  options: {
     readonly reportUnusedDisableDirectives: "error";
     readonly typeAware: true;
     readonly typeCheck: true;
   };
-  readonly categories: {
+  categories: {
     readonly correctness: "error";
     readonly nursery: "error";
     readonly pedantic: "error";
@@ -16,121 +16,134 @@ export declare const oxlintConfig: OptionalMergeConfigFn<OxlintConfig, {
     readonly style: "error";
     readonly suspicious: "error";
   };
-  readonly plugins: ["eslint", "react", "unicorn", "typescript", "oxc", "import", "jsdoc", "vitest", "jsx-a11y", "react-perf", "promise", "node"];
-  readonly jsPlugins: [string];
-  readonly overrides: [{
+  plugins: ["eslint", "react", "unicorn", "typescript", "oxc", "import", "jsdoc", "vitest", "jsx-a11y", "react-perf", "promise", "node"];
+  jsPlugins: string[];
+  overrides: ({
     readonly files: [".release-it.ts", "astro.config.ts", "commitlint.config.ts", "knip.ts", "oxfmt.config.ts", "oxlint.config.ts", "prisma.config.ts", "tsdown.config.ts"];
     readonly rules: {
       readonly "import/no-default-export": "off";
     };
-  }, {
+  } | {
     readonly files: ["bask.ts"];
     readonly rules: {
       readonly "clean-modules/require-direct-exports": "off";
       readonly "import/export": "off";
     };
-  }, {
+  } | {
     readonly files: [".release-it.ts"];
     readonly rules: {
       readonly "no-template-curly-in-string": "off";
     };
-  }, {
+  } | {
     readonly files: ["**/*.tsx"];
     readonly rules: {
-      readonly "func-style": ["error", "expression", {
-        readonly overrides: {
-          readonly namedExports: "ignore";
-        };
+      readonly "func-style": ["error", "declaration", {
+        readonly allowArrowFunctions: true;
       }];
     };
-  }];
-  readonly rules: {
-    readonly "clean-modules/require-direct-exports": "error";
-    readonly "clean-modules/require-import-extensions": "error";
-    readonly "clean-modules/require-subpath-imports": "error";
-    readonly curly: ["error", "multi-or-nest"];
-    readonly "func-style": ["error", "expression"];
-    readonly "react/jsx-curly-brace-presence": ["error", {
+  } | (Omit<OxlintOverride, "rules"> & {
+    rules?: PluginRules;
+  }))[];
+  rules: {
+    curly: ["error", "multi-or-nest"];
+    "func-style": ["error", "expression"];
+    "require-unicode-regexp": ["error", {
+      readonly requireFlag: "v";
+    }];
+    "react/function-component-definition": ["error", {
+      readonly namedComponents: "function-declaration";
+      readonly unnamedComponents: "arrow-function";
+    }];
+    "react/jsx-curly-brace-presence": ["error", {
       readonly children: "never";
       readonly propElementValues: "always";
       readonly props: "never";
     }];
-    readonly "require-unicode-regexp": ["error", {
-      readonly requireFlag: "v";
-    }];
-    readonly "unicorn/filename-case": ["error", {
+    "unicorn/filename-case": ["error", {
       readonly cases: {
         readonly kebabCase: true;
         readonly pascalCase: true;
       };
     }];
-    readonly "unicorn/no-useless-undefined": ["error", {
+    "unicorn/no-useless-undefined": ["error", {
       readonly checkArguments: false;
     }];
-    readonly "capitalized-comments": "off";
-    readonly "id-length": "off";
-    readonly "import/exports-last": "off";
-    readonly "import/group-exports": "off";
-    readonly "import/max-dependencies": "off";
-    readonly "import/no-named-export": "off";
-    readonly "import/no-nodejs-modules": "off";
-    readonly "import/no-unassigned-import": "off";
-    readonly "import/prefer-default-export": "off";
-    readonly "init-declarations": "off";
-    readonly "jsdoc/require-param": "off";
-    readonly "jsdoc/require-returns": "off";
-    readonly "max-classes-per-file": "off";
-    readonly "max-lines": "off";
-    readonly "max-lines-per-function": "off";
-    readonly "max-statements": "off";
-    readonly "no-console": "off";
-    readonly "no-continue": "off";
-    readonly "no-duplicate-imports": "off";
-    readonly "no-inline-comments": "off";
-    readonly "no-magic-numbers": "off";
-    readonly "no-plusplus": "off";
-    readonly "no-ternary": "off";
-    readonly "no-undef": "off";
-    readonly "no-undefined": "off";
-    readonly "no-useless-return": "off";
-    readonly "no-void": "off";
-    readonly "node/callback-return": "off";
-    readonly "node/no-sync": "off";
-    readonly "node/no-top-level-await": "off";
-    readonly "one-var": "off";
-    readonly "oxc/no-async-await": "off";
-    readonly "oxc/no-optional-chaining": "off";
-    readonly "oxc/no-rest-spread-properties": "off";
-    readonly "react/forbid-component-props": "off";
-    readonly "react/jsx-filename-extension": "off";
-    readonly "react/jsx-max-depth": "off";
-    readonly "react/jsx-no-literals": "off";
-    readonly "react/react-in-jsx-scope": "off";
-    readonly "require-await": "off";
-    readonly "sort-imports": "off";
-    readonly "sort-keys": "off";
-    readonly "typescript/consistent-return": "off";
-    readonly "typescript/explicit-function-return-type": "off";
-    readonly "typescript/explicit-module-boundary-types": "off";
-    readonly "typescript/prefer-readonly-parameter-types": "off";
-    readonly "typescript/strict-boolean-expressions": "off";
-    readonly "unicorn/no-array-callback-reference": "off";
-    readonly "unicorn/no-array-method-this-argument": "off";
-    readonly "unicorn/no-await-expression-member": "off";
-    readonly "unicorn/no-process-exit": "off";
-    readonly "unicorn/number-literal-case": "off";
-    readonly "unicorn/switch-case-braces": "off";
-    readonly "vitest/no-hooks": "off";
-    readonly "vitest/no-importing-vitest-globals": "off";
-    readonly "vitest/prefer-describe-function-title": "off";
-    readonly "vitest/prefer-expect-assertions": "off";
-    readonly "vitest/prefer-importing-vitest-globals": "off";
-    readonly "vitest/prefer-lowercase-title": "off";
-    readonly "vitest/prefer-to-be-falsy": "off";
-    readonly "vitest/prefer-to-be-truthy": "off";
-    readonly "vitest/require-hook": "off";
-    readonly "vitest/require-test-timeout": "off";
+    "capitalized-comments": "off";
+    "id-length": "off";
+    "init-declarations": "off";
+    "max-classes-per-file": "off";
+    "max-lines": "off";
+    "max-lines-per-function": "off";
+    "max-statements": "off";
+    "no-console": "off";
+    "no-continue": "off";
+    "no-duplicate-imports": "off";
+    "no-inline-comments": "off";
+    "no-magic-numbers": "off";
+    "no-plusplus": "off";
+    "no-regex-spaces": "off";
+    "no-ternary": "off";
+    "no-undef": "off";
+    "no-undefined": "off";
+    "no-useless-return": "off";
+    "no-void": "off";
+    "one-var": "off";
+    "require-await": "off";
+    "sort-imports": "off";
+    "sort-keys": "off";
+    "import/exports-last": "off";
+    "import/group-exports": "off";
+    "import/max-dependencies": "off";
+    "import/no-named-export": "off";
+    "import/no-nodejs-modules": "off";
+    "import/no-unassigned-import": "off";
+    "import/prefer-default-export": "off";
+    "jsdoc/require-param": "off";
+    "jsdoc/require-returns": "off";
+    "node/callback-return": "off";
+    "node/no-process-env": "off";
+    "node/no-sync": "off";
+    "node/no-top-level-await": "off";
+    "oxc/no-async-await": "off";
+    "oxc/no-optional-chaining": "off";
+    "oxc/no-rest-spread-properties": "off";
+    "react/exhaustive-effect-dependencies": "off";
+    "react/forbid-component-props": "off";
+    "react/hooks": "off";
+    "react/invariant": "off";
+    "react/jsx-filename-extension": "off";
+    "react/jsx-max-depth": "off";
+    "react/jsx-no-literals": "off";
+    "react/memo-dependencies": "off";
+    "react/no-deriving-state-in-effects": "off";
+    "react/react-in-jsx-scope": "off";
+    "react/rule-suppression": "off";
+    "react/todo": "off";
+    "typescript/consistent-return": "off";
+    "typescript/explicit-function-return-type": "off";
+    "typescript/explicit-module-boundary-types": "off";
+    "typescript/prefer-readonly-parameter-types": "off";
+    "typescript/strict-boolean-expressions": "off";
+    "unicorn/no-array-callback-reference": "off";
+    "unicorn/no-array-method-this-argument": "off";
+    "unicorn/no-await-expression-member": "off";
+    "unicorn/no-process-exit": "off";
+    "unicorn/number-literal-case": "off";
+    "unicorn/switch-case-braces": "off";
+    "vitest/no-hooks": "off";
+    "vitest/no-importing-vitest-globals": "off";
+    "vitest/prefer-describe-function-title": "off";
+    "vitest/prefer-expect-assertions": "off";
+    "vitest/prefer-importing-vitest-globals": "off";
+    "vitest/prefer-lowercase-title": "off";
+    "vitest/prefer-to-be-falsy": "off";
+    "vitest/prefer-to-be-truthy": "off";
+    "vitest/require-hook": "off";
+    "vitest/require-test-timeout": "off";
+  };
+  settings: {
+    [k: string]: unknown;
   };
 }>;
-//#endregion
+export {};
 //# sourceMappingURL=oxlint.base.d.ts.map

package/dist/configs/oxlint.base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oxlint.base.d.ts","names":["_$_merge_config_merge_config_ts0.OptionalMergeConfigFn"],"sources":["../../src/configs/oxlint.base.ts"],"mappings":";;;qBAgKa,cAAYA,sBAAA;;aAzJrB;aACA;aACA;;;aAIA;aACA;aACA;aACA;aACA;aACA;aACA;;;;;;;eAkCI;;;;;eAMA;eACA;;;;;eAMA;;;;;;;mBAMqD;;;;;;aAMjB;aACG;aACF;;;;eAIe;eAA4B;eAAiB;;;eAClD;;;;iBAItC;iBAAiB;;;;;;aAKN;aACX;aACU;aACC;aACG;aACD;aACE;aACG;aACC;aACX;aACE;aACE;aACD;aACX;aACa;aACR;aACJ;aACC;aACS;aACF;aACF;aACL;aACD;aACF;aACI;aACK;aACV;aACa;aACR;aACW;aAChB;aACW;aACM;aACK;aACD;aACA;aACT;aACE;aACG;aACX;aACD;aACH;aACmB;aACY;aACC;aACC;aACL;aACF;aACE;aACH;aACX;aACI;aACD;aACX;aACmB;aACG;aACN;aACO;aACT;aACJ;aACC;aACP;aACQ"}
+{"version":3,"file":"oxlint.base.d.ts","names":["_$_merge_config_merge_config_ts0.OptionalMergeConfigFn"],"sources":["../../src/configs/oxlint.base.ts"],"mappings":";;KAmBK,cAAc,eAAe;qBAoUrB,cAhU4CA,sBAgUhC;;aAxMrB;aACA;aACA;;;aAIA;aACA;aACA;aACA;aACA;aACA;aACA;;;;;;;eA+BI;;;;;eAMA;eACA;;;;;eAMA;;;;;;;;;;IAhLiD,QAAA;;;;;;eAgMF;;;eAI9B;eAA2C;;;eAER;eAA4B;eAAiB;;;;iBAKxF;iBAAiB;;;;;;IAON;IACX;IACQ;IACG;IACX;IACa;IACR;IACJ;IACC;IACS;IACF;IACF;IACL;IACI;IACL;IACF;IACI;IACK;IACV;IACA;IACM;IACD;IACH;IAEU;IACC;IACG;IACD;IACE;IACG;IACC;IAET;IACE;IAED;IACD;IACP;IACW;IAEL;IACM;IACK;IAEO;IACR;IACjB;IACI;IACa;IACT;IACE;IACE;IACW;IACV;IACF;IACZ;IAEkB;IACY;IACC;IACC;IACL;IAEF;IACE;IACH;IACX;IACI;IACD;IAEX;IACmB;IACG;IACN;IACO;IACT;IACJ;IACC;IACP;IACQ"}