tackl 2.2.0 → 2.5.0

package/README.md

@@ -9,17 +9,17 @@ mkdir my-app && cd my-app   # or clone your empty repo and cd in
 bunx tackl                  # or: bun create tackl / npm create tackl@latest
 ```
 
-You'll be asked which CMS to use — **DatoCMS**, **Sanity**, or **None** — and the scaffold is pruned to match: only the chosen adapter, its dependencies, its docs, and its `.env.example` block survive.
+You'll be asked which CMS to use — **DatoCMS**, **Sanity**, or **None** — and the scaffold is pruned to match: only the chosen adapter, its dependencies, its docs, and its `.env.example` block survive. Draft preview ships with both CMS choices (the `app/api/draft-mode/` routes resolve through the adapter seam). **None** keeps the same shape as the others — the `@cms` seam stays, rewired to a stub adapter whose `fetchContent` returns `null` — so wiring up a CMS later never touches app code; only the draft-mode routes and CMS files are removed.
 
 Choosing **Sanity** sets the whole thing up: an embedded Studio at `/studio`, example schemas, and draft-mode preview routes ship in the scaffold, and the CLI offers to run `sanity init` for you — logging in, creating/linking a project, and writing your `.env`. Scaffold → `bun run dev` → `/studio` → start editing.
 
-On your first `bun run dev`, a **setup wizard** greets you in the browser: it walks through every theme token (colours, spacing, motion, fonts, the type scale), writes your answers into `src/theme`, then deletes itself — skip it to keep the starter defaults. The scaffold commit the CLI makes is your restore point if you ever want to run it again.
+Design tokens live in `src/theme` and type styles in `src/css/tackl/_type.scss` — set them from your Figma file before you start building.
 
 ## What it does
 
 1. Verifies the directory is empty (an existing `.git`, `.gitignore`, `README.md` or `LICENSE` is fine — your repo's `.git` and remote are kept)
-2. Downloads the latest tagged release of the template (falls back to `main` if none)
-3. Prunes repo-only cargo (the CLI itself, `.github`) and the unused CMS adapter
+2. Downloads the latest GitHub release of the template (falls back to `main` if none can be resolved). The lookup uses `GITHUB_TOKEN` / `GH_TOKEN` when set, and otherwise falls back to github.com's non-rate-limited release redirect — so shared IPs (offices, CI) still get the release
+3. Prunes repo-only cargo (the CLI itself, `.github` templates, internal `docs/plans`) and the unused CMS adapter
 4. Sets your package name, initialises git if needed, and runs `bun install`
 
 ## Options

package/bin/tackl.js

@@ -55,18 +55,44 @@ const dirIsScaffoldable = dir => {
 // SECTION • Template ref resolution
 // NOTE • Prefer the latest GitHub release so every scaffold is a tested,
 // reproducible snapshot; fall back to main (with a warning) when no
-// release exists. --ref overrides both.
+// release can be resolved. --ref overrides both.
+// The REST API allows only 60 unauthenticated requests/hour per IP — shared
+// IPs (offices, CI) hit that — so a GITHUB_TOKEN is used when present, and
+// the github.com /releases/latest redirect (not rate-limited) is tried next.
+const RELEASE_TAG_PATTERN = /\/releases\/tag\/([^/?#]+)/;
+
+const latestReleaseFromApi = async () => {
+	const token = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
+	const res = await fetch(`https://api.github.com/repos/${OWNER}/${REPO}/releases/latest`, {
+		headers: {
+			accept: 'application/vnd.github+json',
+			'user-agent': 'tackl-cli',
+			...(token && { authorization: `Bearer ${token}` }),
+		},
+	});
+	if (!res.ok) return null;
+	const json = await res.json();
+	return json?.tag_name ?? null;
+};
+
+const latestReleaseFromRedirect = async () => {
+	const res = await fetch(`https://github.com/${OWNER}/${REPO}/releases/latest`, {
+		method: 'HEAD',
+		redirect: 'manual',
+		headers: { 'user-agent': 'tackl-cli' },
+	});
+	const match = res.headers.get('location')?.match(RELEASE_TAG_PATTERN);
+	return match ? decodeURIComponent(match[1]) : null;
+};
+
 const resolveRef = async explicitRef => {
 	if (explicitRef) return { ref: explicitRef, source: 'flag' };
-	try {
-		const res = await fetch(`https://api.github.com/repos/${OWNER}/${REPO}/releases/latest`, {
-			headers: { accept: 'application/vnd.github+json' },
-		});
-		if (res.ok) {
-			const json = await res.json();
-			if (json?.tag_name) return { ref: json.tag_name, source: 'release' };
-		}
-	} catch {}
+	for (const lookup of [latestReleaseFromApi, latestReleaseFromRedirect]) {
+		try {
+			const tag = await lookup();
+			if (tag) return { ref: tag, source: 'release' };
+		} catch {}
+	}
 	return { ref: FALLBACK_REF, source: 'fallback' };
 };
 
@@ -107,15 +133,29 @@ const stripDeps = (root, deps) => {
 	fs.writeFileSync(p, `${JSON.stringify(json, null, '\t')}\n`);
 };
 
-// NOTE • Everything that exists solely for the embedded Sanity Studio
-const SANITY_STUDIO_PATHS = ['app/(studio)', 'app/api/draft-mode', 'sanity.config.ts', 'sanity'];
+// NOTE • Everything that exists solely for the embedded Sanity Studio.
+// app/api/draft-mode is NOT here — the draft routes are CMS-agnostic
+// (they resolve through @cms/draft) and only go when no CMS is chosen.
+const SANITY_STUDIO_PATHS = ['app/(studio)', 'sanity.config.ts', 'sanity'];
 const SANITY_DEPS = ['next-sanity', 'sanity', '@sanity/vision'];
 
+// NOTE • The two files the CLI rewires to the chosen adapter
+const ADAPTER_ENTRIES = ['src/cms/index.ts', 'src/cms/draft.ts'];
+const rewireAdapter = (root, adapter) => {
+	for (const rel of ADAPTER_ENTRIES) {
+		const p = path.join(root, rel);
+		if (fs.existsSync(p)) {
+			fs.writeFileSync(p, fs.readFileSync(p, 'utf8').replaceAll(`'./dato`, `'./${adapter}`));
+		}
+	}
+};
+
 const CMS = {
 	dato: {
 		title: 'DatoCMS',
 		prune: root => {
 			rmrf(root, 'src/cms/sanity');
+			rmrf(root, 'src/cms/none');
 			rmrf(root, 'docs/Sanity');
 			for (const p of SANITY_STUDIO_PATHS) rmrf(root, p);
 			stripDeps(root, SANITY_DEPS);
@@ -126,33 +166,47 @@ const CMS = {
 		title: 'Sanity',
 		prune: root => {
 			rmrf(root, 'src/cms/dato');
+			rmrf(root, 'src/cms/none');
 			rmrf(root, 'docs/DatoCMS');
 			stripDeps(root, ['@datocms/cda-client', 'react-datocms', 'graphql', 'graphql-tag']);
 			stripEnvBlock(root, '# CMS — DatoCMS');
-			// Rewire the adapter entry to the kept adapter
-			const entry = path.join(root, 'src/cms/index.ts');
-			if (fs.existsSync(entry)) {
-				fs.writeFileSync(entry, fs.readFileSync(entry, 'utf8').replace(`'./dato'`, `'./sanity'`));
-			}
+			rewireAdapter(root, 'sanity');
 		},
 	},
 	none: {
 		title: 'No CMS',
+		// NOTE • Same shape as the other choices — the '@cms' seam survives,
+		// rewired to the stub adapter (src/cms/none), so app code and the
+		// tsconfig alias stay valid and a CMS can be wired up later. Only the
+		// CMS-specific files go: adapters, draft-mode routes, studio, docs.
 		prune: root => {
-			rmrf(root, 'src/cms');
+			rmrf(root, 'src/cms/dato');
+			rmrf(root, 'src/cms/sanity');
+			rmrf(root, 'src/cms/draft.ts');
 			rmrf(root, 'docs/Sanity');
 			rmrf(root, 'docs/DatoCMS');
-			rmrf(root, 'docs/CMS.md');
+			rmrf(root, 'app/api/draft-mode');
 			for (const p of SANITY_STUDIO_PATHS) rmrf(root, p);
 			stripDeps(root, [...SANITY_DEPS, '@datocms/cda-client', 'react-datocms', 'graphql', 'graphql-tag']);
 			stripEnvBlock(root, '# CMS — Sanity');
 			stripEnvBlock(root, '# CMS — DatoCMS');
+			rewireAdapter(root, 'none');
 		},
 	},
 };
 
-// NOTE • Repo-only cargo that should never land in a scaffolded project
-const REPO_CARGO = ['tackl', '.github', 'bun.lock'];
+// NOTE • Repo-only cargo that should never land in a scaffolded project.
+// .github is pruned file-by-file — the CI workflow (.github/workflows) ships
+// with every scaffold so quality gates run from the first push.
+const REPO_CARGO = [
+	'tackl',
+	'docs/plans',
+	'.github/FUNDING.yml',
+	'.github/ISSUE_TEMPLATE.md',
+	'.github/PULL_REQUEST_TEMPLATE.md',
+	'.github/workflows/release.yml',
+	'bun.lock',
+];
 
 async function main() {
 	const args = process.argv.slice(2);
@@ -370,7 +424,7 @@ ${pc.bold('Repository:')} https://github.com/${OWNER}/${REPO}
 		console.log(`  ${step++}) cp .env.example .env   # then fill in your values`);
 	}
 	if (!doInstall) console.log(`  ${step++}) bun install`);
-	console.log(`  ${step++}) bun run dev   # a first-run setup wizard walks you through your theme`);
+	console.log(`  ${step++}) bun run dev   # then set your tokens in src/theme`);
 	if (cms === 'sanity') console.log(`  ${step}) open http://localhost:3000/studio to start editing content`);
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "tackl",
-	"version": "2.2.0",
-	"description": "Scaffold a Tackl project into the current directory — Next.js, styled-components, Waffl grid, DatoCMS/Sanity adapters",
+	"version": "2.5.0",
+	"description": "Scaffold a Tackl project into the current directory — Next.js, SCSS CSS Modules, Waffl grid, DatoCMS/Sanity adapters",
 	"type": "module",
 	"bin": {
 		"tackl": "bin/tackl.js"
@@ -17,7 +17,8 @@
 		"template",
 		"grid",
 		"css",
-		"styled-components",
+		"scss",
+		"css-modules",
 		"typescript"
 	],
 	"author": "joebentaylor1995",
@@ -27,11 +28,11 @@
 	},
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/12-studio/tackl.git"
+		"url": "git+https://github.com/12-Studio/Tackl.git"
 	},
-	"homepage": "https://github.com/12-studio/tackl",
+	"homepage": "https://github.com/12-Studio/Tackl",
 	"bugs": {
-		"url": "https://github.com/12-studio/tackl/issues"
+		"url": "https://github.com/12-Studio/Tackl/issues"
 	},
 	"files": [
 		"bin/",
@@ -40,6 +41,6 @@
 	"dependencies": {
 		"picocolors": "^1.1.1",
 		"prompts": "^2.4.2",
-		"tar": "^7.5.1"
+		"tar": "^7.5.22"
 	}
 }