Commit graph

3384 commits

Author SHA1 Message Date
Doxa Maps
212ec20816 Merge remote-tracking branch 'origin/development' into bundler-2/handoff
# Conflicts:
#	package.json
2026-09-29 15:54:16 +00:00
Doxa Maps
00edf89a45 Merge development into exp-shepherd/handoff-merge 2026-09-29 15:40:46 +00:00
Doxa Maps
b005629f75 Merge remote-tracking branch 'origin/development' into dx-base/handoff-integration 2026-09-29 15:31:23 +00:00
Doxa Maps
decdf31ed5 Merge remote-tracking branch 'origin/development' into dx-base/handoff-integration 2026-09-29 15:24:30 +00:00
Doxa Maps
35faf8cbf0 Merge development into the gospel handoff branch 2026-09-29 15:24:12 +00:00
Doxa Maps
ed49ce5159 Do not ship rudder-voice in the web export
My handoff rebuild ran BUNDLE=rudder-voice, which wrote
public/dx-maps/rudder-voice/rudder-voice.js and committed it. check:targets
failed on exactly that: rudder-voice is a DESKTOP-only voice-to-text tool, not a
web plugin, so a bundle under public/dx-maps would ship it in the /cdn export.

Development has no such file; this was mine, created minutes ago by rebuilding
every composite the scan named without checking which of them are web targets.
Removed from the index and from disk. check:targets passes.
2026-09-29 15:21:29 +00:00
Doxa Maps
d5549cf58f Merge development into the gospel handoff branch 2026-09-29 15:19:40 +00:00
Doxa Maps
76d54e06a2 Merge remote-tracking branch 'origin/development' into dx-base/handoff-integration 2026-09-29 15:04:25 +00:00
Doxa Maps
62afbdcdf3 check:ported-globals-identical compares only the ported rules, not the whole stylesheet
The gate hashed each component's entire emitted CSS, so any unrelated style change
in these four files (Regions giving three :host rules position:relative) failed it,
and could pass only by re-baselining a guard that exists to prove something else.
It now hashes what library/styles/portedGlobals.js emits, found in the executed CSS:
each cyrillicHeading and strongMedium rule with the selectors in front of it, and
each scrollbar-gutter declaration with its rule's selector.

Re-baselined on the tree the old gate passed on. Proven both ways: re-scoping
GoalCard's strong rule, changing the module's Cyrillic letter-spacing and dropping
a file's ported rules each fail it; --write refuses to baseline an empty block.
2026-09-29 15:03:05 +00:00
Doxa Maps
2efde93a31 Rebuild the five composites the handoff merges touched
BUNDLE=<name> bun x vite build for cities-internet, gospel-internet,
gospel-resources, plugin-studio and rudder-voice, then bun run tree and fix:sri.
Regenerated on this tip, never merged: the scan refused the previous sha with
gospel-internet stale (committed 7361a689e3a6 against a rebuild of ce15dd0ba73f).
2026-09-29 15:02:05 +00:00
Doxa Maps
5539710503 Merge remote-tracking branch 'origin/development' into bundler-2/handoff 2026-09-29 15:01:31 +00:00
Doxa Maps
60b7023c3a Merge development into exp-shepherd/handoff-merge 2026-09-29 15:00:58 +00:00
Doxa Maps
3b41321d18 Merge remote-tracking branch 'origin/development' into dx-base/handoff-integration 2026-09-29 15:00:47 +00:00
Doxa Maps
bd1c2374cc Merge development into exp-shepherd/handoff-merge 2026-09-29 15:00:33 +00:00
Doxa Maps
56f049d11c Merge origin/development into repo/integration at the landing turn 2026-09-29 14:59:51 +00:00
Doxa Maps
d7ec917023 Record as merged, content NOT taken (already on development / superseded / abandoned):
- repo/auto-signin: carried by repo/handoff's 6df2da9c9 (merged above), replayed with its entry.sh conflict against V2 and DEV_SERVER resolved; UNVERIFIED, default off.
- repo/plugin-designer-skill: on development with edits: cde106a55 landed as f66650462, and the other four are in skills/plugin-designer/SKILL.md sections 2, 5, 8 and 9-10 in newer wording.
- repo/gospel-number-revert: abandoned. The numerals hold became the LOC-ENUS warn in check:universal-props, pending the numerals decision, and gospel has since rewritten the files it touches.
- repo/land-shots, repo/land-shots4: superseded by later README screenshot retakes on development (6e5c0874d, 09-27 09:58Z, and after).
2026-09-29 14:58:20 +00:00
Doxa Maps
7c2d4d21b2 Record exp-shepherd's 21 unmerged branches as merged, content NOT taken (already on development / superseded / abandoned / parked)
Already on development by content (it landed under other shas, often with edits):
- composite-interop-gate: check-composite-interop is registered.
- cp-i18n: the legend keys; the country wall is translated in upg100's pass 03839179b.
- drvref: source c2473d0e4 (L13); the rebuild was regenerated as c8f9b3882.
- i18n-pplr: pplr.tabs.* and pplr.status.*.
- internet-adm1-full, internet-adm1-india: build-adm1-internet.mjs, India by state.
- list-prop-tier-a: library/lists/peopleGroupList.js.
- pplr-d3-no-merge: loadPinnedUmd in pplrData.js.
- pplr-globals: connectivity-map deletes window.__ciMap on unmount.
- print-floor: R23, printInPlace FRAME_KEEP_MS and check:print-frame-reclaim.
- pwp-hamburger: the Zones drawer.
- template-map: template-map-a is the real map.
- upgn-howto-keys: neighbor.about.greenTitle.
- uprops-allow: the upg-neighbor ALLOW in check-universal-props.
- wall-keys: wall.drawLibError and the share keys.

Superseded:
- mobile-gating: by the phone-flag implementation 51ef6f7ec.
- wall-sizes: by the Wall A6 sizes and footer, 35df7410d.
- research-core: by the shared legend-map bridge refactor of the same twins, 155c774b2.
- apg-lite: by apg-perf2, 1bbc5ff87 (the APG2 ruling); it keyed a thinning to software rendering, which is what test rigs have, not readers.

Deliberately not taken, pending a product decision, and reachable in history:
- wall-4x6: a 4 x 6 ft preset outside the brief's size set (sheet row 117).
- wall-d3-measure: MEASUREMENT ONLY, the A9 bundling trade-off; no npm deps added.

The tree is unchanged: an octopus merge with the 'ours' strategy.
2026-09-29 14:57:28 +00:00
Doxa Maps
d3cdc2c3bc Two gates the branch backlog turned red
Seven Driver citations came back with the merged branches. Each keeps its
engineering reason and its date, and loses the speaker: the overlap report, the
poster's legend rule, the network-change defect, the chart's provenance.

check:plural-forms crashed rather than failed. It built its locale list by
listing the catalogue directory, so a README.md moved in beside the locale
folders became a 'locale', passed the exists check because a file does exist,
and crashed readdirSync on a non-directory. It now filters to directories. The
gate on development has the same line and only survives because that README is
not there yet -- so this is a fix for development, not a merge artefact.

Both found by running the full 103-gate chain; the shortened chain the merge
produced ran neither.
2026-09-29 14:55:35 +00:00
Doxa Maps
33864ffac7 Record as merged, content NOT taken (already on development)
- rega/gi-heavy (05b5a3e62): already on development as f9ce2aeb4 (same
  change: the gospel-internet board counted as a heavy Gallery tab);
  all 6 files it touches were changed later on development.
- rega/readme-shots-7a7ca67b (12070ba36): already on development as
  17763cdcc (20 of its 23 shots) and 6e5c0874d (the other 3); all 22
  files it touches were retaken later on development.

Merge strategy "ours": the tree is unchanged.
2026-09-29 14:54:32 +00:00
Doxa Maps
cbdf5546c4 Keep the reason, drop the speaker, in two comments the merge restored
Merging gospel/a5-cpu and gospel/panel-followup brought back two comments that
quote the Driver directly, and check:no-new-driver-references failed on them —
correctly. Development had already swept these; the merge reintroduced them from
an older base.

Both keep their reasoning and lose the attribution: a recording pill that
changes width on every word reads as instability, and on a phone the header can
take most of the panel, leaving the draft unscrollable and its last lines
unreachable. Those are the facts the rules encode; who said them is not.
2026-09-29 14:54:15 +00:00
Doxa Maps
5154c5c7bf Merge rega/readme-shots-8b6f37f6, keeping development's side
The branch retook 25 README shots tokenless from main 8b6f37f6 on 09-26.
Development has since retaken every one of those files (d25974f04,
9caf30e81, 17763cdcc, 6e5c0874d), so its content is superseded: this
merge records the branch as merged and keeps development's tree
unchanged (merge strategy "ours").
2026-09-29 14:51:58 +00:00
Doxa Maps
023afcb55e Restore the gate chains after merging eleven branches
Merging the branch backlog cut gates:pre to 49 entries of 102 and gates:post to
86 of 108: package.json holds each gate on its own line, but the chains are
single long strings, so a line-wise union takes one side wholesale while every
definition survives. A run then passes and means almost nothing.

Both chains come from development, with the one gate these merges add appended
rather than replacing them. Every gate named in a chain is defined: checked,
not assumed.
2026-09-29 14:51:12 +00:00
Doxa Maps
ed1aa635ce Merge development into the gospel handoff branch 2026-09-29 14:51:04 +00:00
Doxa Maps
33072c5525 Merge gospel/whiteboard-adopt-2 for the handoff
# Conflicts:
#	package.json
2026-09-29 14:50:53 +00:00
Doxa Maps
6cfbcaf757 Merge gospel/whiteboard-adopt for the handoff
# Conflicts:
#	package.json
2026-09-29 14:50:52 +00:00
Doxa Maps
6c7fc10034 Merge gospel/set-fit for the handoff
# Conflicts:
#	package.json
#	plugin-designs/gospel-internet/src/components/GiBoundedSetMap.vue
#	plugin-designs/gospel-internet/src/components/GiCenteredSetMap.vue
#	public/dx-maps/doxa-maps-spa/manifest.json
#	public/dx-maps/gospel-internet/board/board/index.html
#	public/dx-maps/gospel-internet/board/index.html
#	public/dx-maps/gospel-internet/board/india-china/index.html
#	public/dx-maps/gospel-internet/board/language-tree/index.html
#	public/dx-maps/gospel-internet/board/platforms/index.html
#	public/dx-maps/gospel-internet/board/project-700/index.html
#	public/dx-maps/gospel-internet/board/zero/index.html
#	public/dx-maps/gospel-internet/gospel-internet.js
#	public/dx-maps/manifest.json
2026-09-29 14:50:52 +00:00
Doxa Maps
bdb74ff69f Merge remote-tracking branch 'origin/development' into bundler-2/handoff 2026-09-29 14:50:51 +00:00
Doxa Maps
65e17f614f Merge repo/handoff: OIDC_AUTO_SIGNIN (UNVERIFIED, default off) and the Rudder screenshot commits it carries (already merged above) 2026-09-29 14:50:50 +00:00
Doxa Maps
ef1e8b8f94 Merge gospel/sentences-3 for the handoff
# Conflicts:
#	library/i18n/locales/ar/gospel.json
#	library/i18n/locales/de/gospel.json
#	library/i18n/locales/en/gospel.json
#	library/i18n/locales/es/gospel.json
#	library/i18n/locales/fr/gospel.json
#	library/i18n/locales/hi/gospel.json
#	library/i18n/locales/it/gospel.json
#	library/i18n/locales/pt/gospel.json
#	library/i18n/locales/ro/gospel.json
#	library/i18n/locales/ru/gospel.json
#	library/i18n/locales/zh/gospel.json
#	public/dx-maps/doxa-maps-spa/manifest.json
#	public/dx-maps/gospel-resources/charts/index.html
#	public/dx-maps/gospel-resources/data-tables/index.html
#	public/dx-maps/gospel-resources/gospel-dashboard/index.html
#	public/dx-maps/gospel-resources/gospel-resources.js
#	public/dx-maps/gospel-resources/resources-list/index.html
#	public/dx-maps/gospel-resources/resources-map/index.html
#	public/dx-maps/manifest.json
2026-09-29 14:50:49 +00:00
Doxa Maps
4d65d399b1 Merge origin/development into the handoff integration 2026-09-29 14:50:47 +00:00
Doxa Maps
dfdde4d339 Merge gospel/ring-lib for the handoff
# Conflicts:
#	internal/check-ring-bands.mjs
#	library/components/charts/ringBands.js
#	package.json
2026-09-29 14:50:46 +00:00
Doxa Maps
6156895e54 Merge branch 'bundler-2/driver-1650' into bundler-2/handoff
# Conflicts:
#	internal/check-embed-url-absolute.mjs
#	internal/check-legend-top-offset.mjs
#	internal/check-map-menu-anchor.mjs
#	internal/check-mercator-slice.mjs
#	internal/check-one-scroll-container.mjs
#	library/components/map-controls/MapControlMenu.vue
#	library/composables/poster/useMapPoster.js
#	library/composables/usePosterPrints.js
#	library/maps/mercator-slice.js
#	library/utils/embedBase.js
#	package.json
#	plugin-designs/doxa-research-map/research-map.vue
2026-09-29 14:50:44 +00:00
Doxa Maps
506b42fc31 Merge repo/readme-rudder-shot: the Driver's Rudder desktop screenshot in the README (HELD since 01:32Z for his cut-off condition "before you add it to the readme you nee"; merged on the merge-all order) 2026-09-29 14:50:44 +00:00
Doxa Maps
ab2c4da619 Merge gospel/ring-bands for the handoff
# Conflicts:
#	internal/check-ring-bands.mjs
#	library/components/charts/ringBands.js
#	package.json
#	plugin-designs/gospel-internet/src/components/GiBoundedSetMap.vue
#	plugin-designs/gospel-internet/src/components/GiCenteredSetMap.vue
2026-09-29 14:50:44 +00:00
Doxa Maps
1495fb73c6 Merge repo/v8-reader-2: its content is already on development (studio squashed 53dbba4a4 + f0e965e4d into the R26 README commit); recorded as merged, development's side kept 2026-09-29 14:50:44 +00:00
Doxa Maps
77e3077814 Merge gospel/region-headings for the handoff 2026-09-29 14:50:43 +00:00
Doxa Maps
0a813fca35 Merge repo/public-studio-mode: its content is already on development (21330066e landed as 097952b5f with the V2 round); recorded as merged, development's side kept 2026-09-29 14:50:43 +00:00
Doxa Maps
336a1e0a18 Merge branch 'bundler-2/script-registry' into bundler-2/handoff
# Conflicts:
#	internal/check-legend-data-contract.mjs
#	internal/check-map-control-overlap.mjs
#	library/composables/poster/useMapPoster.js
#	library/composables/useMapInstance.js
#	package.json
#	plugin-designs/doxa-research-map/research-map.vue
#	plugin-designs/research-dashboard/src/components/dashboards/DashboardMapPanel.vue
2026-09-29 14:50:42 +00:00
Doxa Maps
f35828476a Merge gospel/queued for the handoff
# Conflicts:
#	plugin-designs/gospel-internet/src/components/GiBoundedSetMap.vue
#	plugin-designs/gospel-internet/src/components/GiCenteredSet.vue
#	plugin-designs/gospel-internet/src/components/GiCenteredSetMap.vue
#	public/dx-maps/cities-internet/cities-internet.js
#	public/dx-maps/cities-internet/connectivity-list/index.html
#	public/dx-maps/cities-internet/connectivity-map/index.html
#	public/dx-maps/cities-internet/data-tables/index.html
#	public/dx-maps/doxa-maps-spa/manifest.json
#	public/dx-maps/gospel-internet/board/board/index.html
#	public/dx-maps/gospel-internet/board/index.html
#	public/dx-maps/gospel-internet/board/india-china/index.html
#	public/dx-maps/gospel-internet/board/language-tree/index.html
#	public/dx-maps/gospel-internet/board/platforms/index.html
#	public/dx-maps/gospel-internet/board/project-700/index.html
#	public/dx-maps/gospel-internet/board/zero/index.html
#	public/dx-maps/gospel-internet/gospel-internet.js
#	public/dx-maps/gospel-resources/charts/index.html
#	public/dx-maps/gospel-resources/data-tables/index.html
#	public/dx-maps/gospel-resources/gospel-dashboard/index.html
#	public/dx-maps/gospel-resources/gospel-resources.js
#	public/dx-maps/gospel-resources/resources-list/index.html
#	public/dx-maps/gospel-resources/resources-map/index.html
#	public/dx-maps/manifest.json
2026-09-29 14:50:42 +00:00
Doxa Maps
85252c8d47 Merge branch 'bundler-2/he-sr' into bundler-2/handoff
# Conflicts:
#	internal/check-hardcoded-english.mjs
#	internal/check-label-key-coverage.mjs
#	internal/check-packet-variants.mjs
#	library/ProfileLoader.vue
#	library/i18n/locales/ar/search.json
#	library/i18n/locales/de/search.json
#	library/i18n/locales/en/search.json
#	library/i18n/locales/es/search.json
#	library/i18n/locales/fr/search.json
#	library/i18n/locales/hi/search.json
#	library/i18n/locales/it/search.json
#	library/i18n/locales/pt/search.json
#	library/i18n/locales/ro/search.json
#	library/i18n/locales/ru/search.json
#	library/i18n/locales/zh/search.json
#	package.json
#	plugin-designs/doxa-research-map/research-map.vue
#	plugin-designs/research-dashboard/src/components/dashboards/DashboardResearchFilters.vue
2026-09-29 14:50:40 +00:00
Doxa Maps
a7930ca0ea Merge branch 'bundler-2/whiteboard' into bundler-2/handoff
# Conflicts:
#	internal/check-whiteboard-projection.mjs
#	library/maps/whiteboard-map.js
#	library/maps/whiteboard-projection.js
#	library/scripts/build-language-tree.mjs
2026-09-29 14:50:39 +00:00
Doxa Maps
4308e27f1f Merge gospel/pending-loading-fix for the handoff
# Conflicts:
#	plugin-designs/gospel-internet/src/components/GiBoundedSet.vue
#	plugin-designs/gospel-internet/src/components/GiBoundedSetMap.vue
#	plugin-designs/gospel-internet/src/components/GiCenteredSet.vue
#	plugin-designs/gospel-internet/src/components/GiCenteredSetMap.vue
#	plugin-designs/gospel-internet/src/setChartFeatures.js
#	public/dx-maps/doxa-maps-spa/manifest.json
#	public/dx-maps/gospel-internet/board/board/index.html
#	public/dx-maps/gospel-internet/board/index.html
#	public/dx-maps/gospel-internet/board/india-china/index.html
#	public/dx-maps/gospel-internet/board/language-tree/index.html
#	public/dx-maps/gospel-internet/board/platforms/index.html
#	public/dx-maps/gospel-internet/board/project-700/index.html
#	public/dx-maps/gospel-internet/board/zero/index.html
#	public/dx-maps/gospel-internet/gospel-internet.js
#	public/dx-maps/manifest.json
2026-09-29 14:50:38 +00:00
Doxa Maps
c9ffa34e93 Merge branch 'bundler-2/provide-warnings' into bundler-2/handoff
# Conflicts:
#	internal/check-element-bootstrap.mjs
#	internal/check-provide-shadowing.mjs
#	library/elements/defineMapElement.js
#	library/elements/provide-own.js
#	package.json
#	plugin-designs/all-people-groups/index.js
#	plugin-designs/cities-internet/index.js
#	plugin-designs/country-posters/index.js
#	plugin-designs/doxa-research-map/index.js
#	plugin-designs/gospel-internet/index.js
#	plugin-designs/gospel-resources/index.js
#	plugin-designs/key-cities/index.js
#	plugin-designs/my-upg-100-list/index.js
#	plugin-designs/pplr-data-maps/index.js
#	plugin-designs/regions-dashboard/index.js
#	plugin-designs/upg-neighbor/index.js
2026-09-29 14:50:37 +00:00
Doxa Maps
aef7728648 Merge branch 'bundler-2/reader-shapes' into bundler-2/handoff
# Conflicts:
#	library/scripts/build-language-tree.mjs
#	plugin-designs/research-dashboard/src/components/dashboards/DashboardTopBar.vue
2026-09-29 14:50:36 +00:00
Doxa Maps
fb5b740b69 Merge gospel/panel-followup for the handoff
# Conflicts:
#	plugin-designs/rudder-voice/rudder-voice.vue
2026-09-29 14:50:35 +00:00
Doxa Maps
b82d2050f8 Merge gospel/orphan-fix for the handoff
# Conflicts:
#	package.json
2026-09-29 14:50:35 +00:00
Doxa Maps
a4cc29e163 Merge dx-base/a9-leaf-hints (content already integrated via cherry-pick; merge for the handoff record)
# Conflicts:
#	package.json
2026-09-29 14:50:34 +00:00
Doxa Maps
c7f08dbd79 Merge gospel/notice-order-solo for the handoff 2026-09-29 14:50:34 +00:00
Doxa Maps
5f0b9e2e7f Merge gospel/notice-order-r27 for the handoff 2026-09-29 14:50:34 +00:00
Doxa Maps
fcbe9dc951 Merge gospel/notice-order for the handoff
# Conflicts:
#	package.json
2026-09-29 14:50:33 +00:00