doxa-life/doxa-maps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rebuild the served tree after rebasing onto main
Some checks are pending
build-gate / build (push) Waiting to run
Details

Browse source 
Five conflicts, all in public/ — build OUTPUT, where neither side is authoritative,
so it is resolved by rebuilding rather than picking hunks. Six files differ from the
hand-resolution, which is why that rebuild is not optional.

No source file overlapped: the upstream commits were regions-dashboard work, mine
is the packet-browser gate and its two renderer test hooks.
This commit is contained in:
doxa-maps-88655c70 2026-09-24 10:52:47 +00:00
parent 3519ca3934
commit 9c802b556f
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/__gallery/index.html
View file

File diff suppressed because one or more lines are too long

2
public/doxa-maps/index.html generated
View file

File diff suppressed because one or more lines are too long

8
public/doxa-maps/manifest.json generated
View file

@ -856,7 +856,7 @@
"bundle": "regions-dashboard",
"scriptUrl": "./regions-dashboard/regions-dashboard.js",
"output": "doxa-maps/regions-dashboard/regions-dashboard.js",
"integrity": "sha384-v1j6JZw06kyS0qiIJlJhSA4HxQMTxYuuXaCwes4u5PZ3QPOTAEOSyoMUCsvgf+RF",
"integrity": "sha384-/O+W0VH1mn7FRAkGdDFrxEdY5+LyABE0r/VQsZegXL0Efs9JniPZDtqcc+HyUFwS",
"elements": [
"regions-dashboard"
],
@ -876,7 +876,7 @@
"scriptUrl": "./regions-dashboard/regions-dashboard.js",
"embed": {
"iframe": "<iframe src=\"./regions-dashboard/region-dashboards/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
"script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./regions-dashboard/regions-dashboard.js\" integrity=\"sha384-v1j6JZw06kyS0qiIJlJhSA4HxQMTxYuuXaCwes4u5PZ3QPOTAEOSyoMUCsvgf+RF\" crossorigin=\"anonymous\"></script>\n<regions-dashboard profile-config='{\"profile\":\"region-dashboards\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></regions-dashboard>"
"script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./regions-dashboard/regions-dashboard.js\" integrity=\"sha384-/O+W0VH1mn7FRAkGdDFrxEdY5+LyABE0r/VQsZegXL0Efs9JniPZDtqcc+HyUFwS\" crossorigin=\"anonymous\"></script>\n<regions-dashboard profile-config='{\"profile\":\"region-dashboards\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></regions-dashboard>"
}
},
{
@ -890,7 +890,7 @@
"scriptUrl": "./regions-dashboard/regions-dashboard.js",
"embed": {
"iframe": "<iframe src=\"./regions-dashboard/regions-list/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
"script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./regions-dashboard/regions-dashboard.js\" integrity=\"sha384-v1j6JZw06kyS0qiIJlJhSA4HxQMTxYuuXaCwes4u5PZ3QPOTAEOSyoMUCsvgf+RF\" crossorigin=\"anonymous\"></script>\n<regions-dashboard profile-config='{\"profile\":\"regions-list\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></regions-dashboard>"
"script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./regions-dashboard/regions-dashboard.js\" integrity=\"sha384-/O+W0VH1mn7FRAkGdDFrxEdY5+LyABE0r/VQsZegXL0Efs9JniPZDtqcc+HyUFwS\" crossorigin=\"anonymous\"></script>\n<regions-dashboard profile-config='{\"profile\":\"regions-list\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></regions-dashboard>"
}
},
{
@ -904,7 +904,7 @@
"scriptUrl": "./regions-dashboard/regions-dashboard.js",
"embed": {
"iframe": "<iframe src=\"./regions-dashboard/regions-mfe/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
"script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./regions-dashboard/regions-dashboard.js\" integrity=\"sha384-v1j6JZw06kyS0qiIJlJhSA4HxQMTxYuuXaCwes4u5PZ3QPOTAEOSyoMUCsvgf+RF\" crossorigin=\"anonymous\"></script>\n<regions-dashboard profile-config='{\"profile\":\"regions-mfe\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></regions-dashboard>"
"script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./regions-dashboard/regions-dashboard.js\" integrity=\"sha384-/O+W0VH1mn7FRAkGdDFrxEdY5+LyABE0r/VQsZegXL0Efs9JniPZDtqcc+HyUFwS\" crossorigin=\"anonymous\"></script>\n<regions-dashboard profile-config='{\"profile\":\"regions-mfe\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></regions-dashboard>"
}
}
]

2
public/doxa-maps/regions-dashboard/region-dashboards/index.html generated
View file

@ -29,7 +29,7 @@
<script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
<!-- Bundle IIFE — registers the <regions-dashboard> custom element. -->
<script src="../regions-dashboard.js" integrity="sha384-v1j6JZw06kyS0qiIJlJhSA4HxQMTxYuuXaCwes4u5PZ3QPOTAEOSyoMUCsvgf+RF" crossorigin="anonymous"></script>
<script src="../regions-dashboard.js" integrity="sha384-/O+W0VH1mn7FRAkGdDFrxEdY5+LyABE0r/VQsZegXL0Efs9JniPZDtqcc+HyUFwS" crossorigin="anonymous"></script>
<script>
// Mapbox token resolution — the A3 ladder, in precedence order:

2
public/doxa-maps/regions-dashboard/regions-list/index.html generated
View file

@ -29,7 +29,7 @@
<script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
<!-- Bundle IIFE — registers the <regions-dashboard> custom element. -->
<script src="../regions-dashboard.js" integrity="sha384-v1j6JZw06kyS0qiIJlJhSA4HxQMTxYuuXaCwes4u5PZ3QPOTAEOSyoMUCsvgf+RF" crossorigin="anonymous"></script>
<script src="../regions-dashboard.js" integrity="sha384-/O+W0VH1mn7FRAkGdDFrxEdY5+LyABE0r/VQsZegXL0Efs9JniPZDtqcc+HyUFwS" crossorigin="anonymous"></script>
<script>
// Mapbox token resolution — the A3 ladder, in precedence order:

2
public/doxa-maps/regions-dashboard/regions-mfe/index.html generated
View file

@ -40,7 +40,7 @@
<script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
<!-- Bundle IIFE — registers the <regions-dashboard> custom element. -->
<script src="../regions-dashboard.js" integrity="sha384-v1j6JZw06kyS0qiIJlJhSA4HxQMTxYuuXaCwes4u5PZ3QPOTAEOSyoMUCsvgf+RF" crossorigin="anonymous"></script>
<script src="../regions-dashboard.js" integrity="sha384-/O+W0VH1mn7FRAkGdDFrxEdY5+LyABE0r/VQsZegXL0Efs9JniPZDtqcc+HyUFwS" crossorigin="anonymous"></script>
<script>
// Mapbox token resolution — the A3 ladder, in precedence order: