fix(minify): keyword regex + remove JoomGallery overrides #121

Merged

jmiller merged 23 commits from dev into main 2026-06-04 12:18:43 +00:00

Conversation 0 Commits 23 Files Changed 19

+91 -793

jmiller commented 2026-06-04 12:06:17 +00:00

Owner

Copy Link

Copy Source

Summary

• fix(minify): Add word boundary assertions to JS keyword restoration regex
• refactor: Remove JoomGallery template overrides
• fix: Clean up embedded conflict markers from prior bad merge
• chore: CI syncs, conflict-marker guard, repo-health updates

Test plan

• Verify template.min.js regenerates cleanly
• Confirm theme FAB and dark mode toggle work
• Confirm JoomGallery pages render with Joomla defaults
• Check no conflict markers remain in source files

## Summary - fix(minify): Add word boundary assertions to JS keyword restoration regex - refactor: Remove JoomGallery template overrides - fix: Clean up embedded conflict markers from prior bad merge - chore: CI syncs, conflict-marker guard, repo-health updates ## Test plan - [ ] Verify template.min.js regenerates cleanly - [ ] Confirm theme FAB and dark mode toggle work - [ ] Confirm JoomGallery pages render with Joomla defaults - [ ] Check no conflict markers remain in source files

jmiller added 20 commits 2026-06-04 12:06:18 +00:00

chore: sync updates.xml 02.18.00 from main [skip ci] 2242a61197

chore(ci): add CI issue reporter for auto-filing gate failures 1859dd728c

chore(ci): add CI issue reporter for auto-filing gate failures eac32646cb

chore(ci): add CI issue reporter for auto-filing gate failures 04ca05ccc3

chore(ci): sync CI issue reporter from Template-Joomla b1fb0d2294

chore(ci): sync CI issue reporter from Template-Joomla 2aeb4d5ecc

chore(ci): sync CI issue reporter from Template-Joomla 6d1aaa952b

fix(ci): add conflict-marker guard to release and PR workflows ... 61adcb0bc9

Prevents releases from shipping with unresolved merge conflict markers.
Adds a validation step to both auto-release.yml (blocks release) and
pr-check.yml (catches at PR time). Also cleans existing conflict markers
from templateDetails.xml.

Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

chore(version): auto-bump 02.16.02-dev [skip ci] 97466819c5

chore: update development channel 02.16.02-dev [skip ci] 6c61c13db6

chore: sync .mokogitea/workflows/repo-health.yml from moko-platform [skip ci] 4ceb9efbf0

chore: sync .mokogitea/workflows/repo-health.yml from moko-platform [skip ci] 36c15a3d86

fix(minify): add word boundary assertions to JS keyword restoration regex ... 2886ebdf54

The keyword restoration step in minifyJs() was matching 'in' and other
short keywords as substrings inside identifiers (init → in it,
window → win dow, contains → contain s, getBoundingClientRect →
getBoundin gClientRect), corrupting the minified JS output and breaking
all template JavaScript on every MokoOnyx site.

Adding \b word boundaries ensures only standalone keywords are matched.

Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

chore(version): auto-bump 02.16.03-dev [skip ci] 98fddcbedb

chore: update development channel 02.16.03-dev [skip ci] e265edb4ba

refactor: remove JoomGallery template overrides ... 0dffd277e0

JoomGallery overrides are no longer maintained in the core template.

Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Merge origin/main into dev ... 28da101822

Resolve conflicts: take main for CI/workflows/docs, dev for source.
Remove JoomGallery template overrides. Fix embedded conflict markers
from prior bad merge on main. Bump version to 02.18.01-dev.

Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Merge origin/dev — reconcile auto-bump commits with main merge ... 1cfc8f8669

Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

chore(version): auto-bump 02.18.02-dev [skip ci] ad5bb9d46a

chore: update development channel 02.18.02-dev [skip ci] 0b47958b28

jmiller added 1 commit 2026-06-04 12:12:10 +00:00

feat(script): add removeDeletedFiles() to clean up stale overrides on upgrade ... 9f88c265bc

Joomla's installer never deletes files on upgrade. This adds a
maintenance list of files/dirs removed from the package so they get
cleaned up on existing installs. Starts with the JoomGallery template
overrides removed in this release.

Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

jmiller added 1 commit 2026-06-04 12:12:23 +00:00

chore(version): auto-bump 02.18.03-dev [skip ci] 0e420718cf

jmiller added 1 commit 2026-06-04 12:12:24 +00:00

chore: update development channel 02.18.03-dev [skip ci] 50762b3e20

jmiller merged commit 0e4e329770 into main 2026-06-04 12:18:43 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

automation

Automated processes or scripts

breaking-change

Breaking API or functionality change

build

Build system changes

ci-cd

CI/CD pipeline changes

config

Configuration file changes

css

CSS/styling changes

dependencies

Dependency updates

deploy-failure

Automated deploy failure tracking

docker

Docker configuration changes

documentation

Documentation changes

dolibarr

Dolibarr module or extension

generic

Generic project or library

good first issue

Good for newcomers

health-check

Repository health check results

health: excellent

Health score 90-100

health: fair

Health score 50-69

health: good

Health score 70-89

health: poor

Health score below 50

help wanted

Extra attention needed

html

HTML template changes

javascript

JavaScript code changes

joomla

Joomla extension or component

major-release

Major version release

minor-release

Minor version release

mokostandards

MokoStandards compliance

needs-review

Awaiting code review

patch-release

Patch version release

php

PHP code changes

push-failure

File push failure requiring attention

python

Python code changes

release-candidate

Release candidate build

security

Security-related changes

size/l

Large change (101-300 lines)

size/m

Medium change (31-100 lines)

size/s

Small change (11-30 lines)

size/xl

Extra large change (301-1000 lines)

size/xs

Extra small change (1-10 lines)

size/xxl

Extremely large change (1000+ lines)

standards-drift

Repository drifted from MokoStandards

standards-update

MokoStandards sync update

sync-failure

Bulk sync failure requiring attention

sync-report

Bulk sync run report

template-validation-failure

Template workflow validation failure

tests

Test suite changes

type: bug

Something isn't working

type: chore

Maintenance tasks

type: enhancement

Enhancement to existing feature

type: feature

New feature or request

type: refactor

Code refactoring

type: version

Version-related change

typescript

TypeScript code changes

version

Version bump or release

version-drift

Version mismatch detected

work-in-progress

Work in progress, not ready for merge

No labels

Priority -

Type -

Milestone

No items

No Milestone

Assignees

Clear assignees

jmiller (Jonathan Miller)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: MokoConsulting/MokoOnyx#121