merge queue: checking main (f0a5e5f) and #12486 together - #12494
Closed
mergify[bot] wants to merge 2 commits into
Closed
merge queue: checking main (f0a5e5f) and #12486 together#12494mergify[bot] wants to merge 2 commits into
mergify[bot] wants to merge 2 commits into
Conversation
Supersedes #12345, which only moves the version and so is red on `build`, `lint`, `test` and `config-examples`. v5 is a breaking release and the two call sites have to move with it. `scripts/validate-config-examples.mjs` now imports js-yaml as a namespace. v5 dropped the CommonJS default export, so `import yaml from 'js-yaml'` failed to load at all. That was also behind the three test failures: `yaml` was `undefined`, `yaml.load` threw a `TypeError`, the script caught it and reported "invalid YAML", so an example that should have failed AJV schema validation failed at the parse step instead. All three pass on the import fix alone — no v5 parsing behaviour change is involved. `OptionsTable.tsx` drops `noCompatMode: true`, which v5 removed. It suppressed YAML-1.1-compat quoting of `yes`/`no`/`on`/`off` and base-60 values. None of the 136 defaults in the schema are one of those, so this is a no-op today; v5 quotes them by default and offers no way to opt out, so a future default of `no` would start rendering as `"no"`. `OptionsTable.tsx` also renames `quotingType: '"'` to `quoteStyle: 'double'`, and this is the reason the bump is not mechanical. v5 renamed that option *and* flipped its default to `'single'`, so just deleting the two options `tsc` rejects silently reflows four published defaults. The worst is `post_check.title`, whose value contains single quotes: before "'{{ check_rule_name }}'{% if check_status == 'success' %} …" after '''{{ check_rule_name }}''{% if check_status == ''success'' %} …' Equivalent YAML, unreadable in a table people copy-paste from. `@types/js-yaml` is dropped rather than bumped: v5 ships its own types, so the stub is now a mismatched duplicate. This goes to 5.3.0 rather than the 5.2.3 in #12345 because `^5.2.3` resolves to 5.3.0 anyway, and 5.3.0 only adds a custom-tag API this repo does not touch — `dump` output is byte-identical between the two. Verification: built the site on `main` and on this branch and diffed the output — all 385 pages are byte-identical, so nothing readers see moves. Every schema default also renders identically through `dumpDefault`. `pnpm check`, `pnpm test` (172), `pnpm check:config-examples` (122 examples) and `pnpm check:internal-leaks` are green, and a full build with OG generation on produces 137 cards, same as `main`. Change-Id: I67baaa318cc15d45ff7f1d6dcf4e8bff693a2cb2
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.
🎉 This pull request has been checked successfully and will be merged soon. 🎉
Branch main (f0a5e5f) and #12486 are queued together for merge.
This pull request has been created by Mergify to check the mergeability of #12486.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue rule
defaultfor merge:github-review-approved[🛡 GitHub repository ruleset ruleRequire pull request for default branch]schedule=Mon-Fri 09:00-17:30[Europe/Paris]Enforce conventional commit]:title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:👀 Review Requirements]:#approved-reviews-by >= 2author = dependabot[bot]author = mergify-ci-bot-head ~= ^docs-agent/📕 PR description]:body ~= (?ms:.{48,})🔎 Reviews]:#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0🤖 Continuous Integration]:check-success = buildcheck-success = lintcheck-success = testcheck-success = test-broken-linkslabel = ignore-broken-linkscheck-success=Cloudflare Pages-head-repo-full-name~=^Mergifyio/Required conditions to stay in the queue:
github-review-approved[🛡 GitHub repository ruleset ruleRequire pull request for default branch]Enforce conventional commit]:title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:👀 Review Requirements]:#approved-reviews-by >= 2author = dependabot[bot]author = mergify-ci-bot-head ~= ^docs-agent/📕 PR description]:body ~= (?ms:.{48,})🔎 Reviews]:#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0🤖 Continuous Integration]:check-success = buildcheck-success = lintcheck-success = testcheck-success = test-broken-linkslabel = ignore-broken-linkscheck-success=Cloudflare Pages-head-repo-full-name~=^Mergifyio/author != dependabot[bot]author != mergify-ci-bothead ~= ^docs-agent/