Re-land phase 6 (Mintlify-inspired templates) with lockfile fix - #10
Merged
Conversation
npm ci was failing (EUSAGE) because package-lock.json wasn't regenerated after the 9→3 template consolidation: it still listed the 8 now-archived templates as workspaces and was missing the two new live ones (@inkform/theme-galley, @inkform/theme-shadcn).
This reverts commit 7d125a3.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Properly re-lands #7 (merged then reverted as #8 due to a stale lockfile / failing CI).
#7 was merged, but
npm cifailed in CI (package-lock.json wasn't regenerated after the 9→3 template consolidation — missing@inkform/theme-galley/@inkform/theme-shadcn, still listing 8 now-archived templates). It was reverted (#8) rather than left broken on main.Re-merging the original phase/6 branch directly (#9) came up CONFLICTING — reverting a merge and then trying to merge the same branch again is a known git gotcha (the merge-base already considers those commits merged). Per git's own docs, the fix is to revert the revert first, then merge the branch fresh. That's what this PR does:
829e08a— revert the revert, reintroducing Updated inkform docs #7's original changes5eeece6(from phase/6) — the lockfile fix, merged on topVerified locally end to end:
npm cisucceeds (previously failed: EUSAGE, missing/stale lockfile entries)npm run typecheck— clean across all workspacesnpm test— 80/80 passingnpm run build— succeeds (one pre-existing Turbopack NFT-tracing warning, not an error)npm audit --audit-level=high— will still show red, but this is pre-existing and unrelated to this PR: verified identically present on phase/5's tip (i.e. main before phase 6 touched anything) — 2 high-severity CVEs viasharp, transitively through Next.js's bundled version, very recently disclosed upstream. Not fixable here without a Next.js major-version bump (npm audit fix --forcewould downgrade Next to v9, which is destructive, not a fix). Flagging as a separate follow-up, not blocking this re-land.Test plan