Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move 7.9.2 patches into 7.10.0 xkit.js #2165

Merged
merged 7 commits into from
Dec 1, 2024
Merged

Move 7.9.2 patches into 7.10.0 xkit.js #2165

merged 7 commits into from
Dec 1, 2024

Conversation

marcustyphoon
Copy link

@marcustyphoon marcustyphoon commented Nov 24, 2024 •
edited
Loading

It has come to my attention that the contents of the XKit Patches per-version patch functions are supposed to be moved into xkit.js itself when the extension is updated. It makes particular sense to do this when moving to a packaged extension, as there's no need to use this patch behavior at all after that transition; changes can be made to xkit.js directly. (Users can still in theory use the xkit editor to add patches, of course.) This thus:

  • Copies the entire v7.9.2 patch function into xkit.js. For review simplicity, this is a direct copy rather than merging the patches into the object. I did check, and the patches should have no side effects (they're all adjustments to the XKit object, mostly added methods), so it shouldn't matter that this occurs earlier in the boot process. (The code in the body of the XKit Patches run function does have side effects; this PR does not touch it.)
  • Improves the run_order logic a bit, such that versions not contained in the run_order array simply have no patches applied and it does not need to be updated for future releases (resolves note in Document release automation #2163). This needs to be copied to the v7.9.2 branch in place of 9a32d0c, in which I crashed XKit; fun times.

Note that this could delete the v7.9.2 patches entirely, on the basis that this version of XKit Patches will only be shipped with v7.10.0 and above, but that would cause crashes when downgrading (particularly annoying for development).

  • smoke test this

@marcustyphoon marcustyphoon mentioned this pull request Nov 24, 2024
Merged
hobinjk
hobinjk approved these changes Nov 25, 2024
View reviewed changes
Copy link

@hobinjk hobinjk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I bestow upon this my highest honor: LGTM and works on my local setup

Extensions/xkit_patches.js Outdated
@@ -1,5 +1,5 @@
//* TITLE XKit Patches **//
//* VERSION 7.4.23 **//
//* VERSION 7.5.0 **//
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this file and https://github.com/new-xkit/XKit/pull/2166/files#diff-ea5f39eec50155bb36f18e7325511f0ad4c00a9376459f0dda3e8562920db8de be consolidated at this point? I think the new run_order logic resolves the issues that would've happened otherwise

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should, yep!

xkit.css Outdated Show resolved Hide resolved
@marcustyphoon marcustyphoon merged commit bb16651 into new-xkit:master Dec 1, 2024
1 check passed
@marcustyphoon marcustyphoon deleted the xkit-patches-7.10.0 branch December 1, 2024 21:15
marcustyphoon added a commit to marcustyphoon/XKit that referenced this pull request Dec 2, 2024
@marcustyphoon
remove XKit Patches version bump requirement
e0755f3 
see new-xkit#2165, new-xkit#2166
@marcustyphoon marcustyphoon mentioned this pull request Dec 2, 2024
Open
marcustyphoon added a commit to marcustyphoon/XKit that referenced this pull request Dec 2, 2024
@marcustyphoon
Squashed commit of the following:
4256c25 
commit 43e5e17
Author: marcustyphoon <[email protected]>
Date:   Sun Dec 1 17:24:57 2024 -0800

    Fix gh-pages workflow (master branch) (new-xkit#2170)

commit bb16651
Author: marcustyphoon <[email protected]>
Date:   Sun Dec 1 13:15:26 2024 -0800

    Move 7.9.2 patches into 7.10.0 xkit.js (new-xkit#2165)

commit ee9ab3e
Author: marcustyphoon <[email protected]>
Date:   Sat Nov 23 20:58:57 2024 -0800

    Release action: fix XPI download step (new-xkit#2164)

commit d2e56bc
Author: marcustyphoon <[email protected]>
Date:   Fri Nov 22 11:45:25 2024 -0800

    Add release actions (new-xkit#2155)

commit a305a37
Author: marcustyphoon <[email protected]>
Date:   Fri Nov 22 11:20:28 2024 -0800

    7.10.0 xkit patches version bump (new-xkit#2161)

commit 900076f
Author: marcustyphoon <[email protected]>
Date:   Fri Nov 22 10:24:11 2024 -0800

    Add 7.9.2 deployment workflow (new-xkit#2159)

commit a1e6fd6
Author: marcustyphoon <[email protected]>
Date:   Sun Nov 17 10:11:02 2024 -0800

    Update CI action (new-xkit#2156)

commit 9d175f6
Author: marcustyphoon <[email protected]>
Date:   Sun Nov 17 10:10:41 2024 -0800

    Add release metadata action (new-xkit#2153)

commit 3d5f273
Author: marcustyphoon <[email protected]>
Date:   Sun Nov 17 10:09:42 2024 -0800

    Clean up more whitespace (new-xkit#2152)

commit d4a8db0
Merge: da64504 965f1c9
Author: marcustyphoon <[email protected]>
Date:   Sat Nov 16 11:45:29 2024 -0800

    Package code with extension (new-xkit#2148)

commit 965f1c9
Author: Marcus <[email protected]>
Date:   Wed Nov 13 17:06:31 2024 -0800

    add npm cache to action

commit cc385e8
Author: Marcus <[email protected]>
Date:   Tue Nov 5 18:03:21 2024 -0800

    don't fetch invalid resources

commit 4568328
Author: Marcus <[email protected]>
Date:   Tue Nov 5 17:01:57 2024 -0800

    Update .eslintrc.yml

commit 0103bc6
Author: Marcus <[email protected]>
Date:   Tue Nov 5 17:01:52 2024 -0800

    commit index build script

commit d574831
Author: Marcus <[email protected]>
Date:   Tue Oct 22 04:52:47 2024 -0700

    add caching to getExtensionData

commit 7d5d32e
Author: Marcus <[email protected]>
Date:   Mon Oct 21 21:36:21 2024 -0700

    don't remove run_order entries (for downgrade compat)

commit adfd409
Author: Marcus <[email protected]>
Date:   Thu Oct 10 14:52:32 2024 -0700

    add back pages workflow

commit 41e82fc
Author: Marcus <[email protected]>
Date:   Thu Oct 10 15:25:17 2024 -0700

    bump script versions

commit b3fe374
Author: Marcus <[email protected]>
Date:   Wed Oct 9 21:18:56 2024 -0700

    bump version

commit 9bede3b
Author: Marcus <[email protected]>
Date:   Thu Oct 10 01:36:22 2024 -0700

    check updates immediately

commit e7f81db
Author: Marcus <[email protected]>
Date:   Wed Oct 9 21:56:51 2024 -0700

    remove gulp server

commit 48a8a83
Author: Marcus <[email protected]>
Date:   Wed Oct 9 21:17:19 2024 -0700

    remove github pages extension hosting

commit d614d0b
Author: Marcus <[email protected]>
Date:   Thu Oct 10 01:18:59 2024 -0700

    commit index files

commit cb46cba
Author: Marcus <[email protected]>
Date:   Wed Oct 9 21:26:03 2024 -0700

    update eslint globals

commit 66e93e2
Author: Marcus <[email protected]>
Date:   Mon Oct 7 18:47:49 2024 -0700

    remove unused patches

commit 396640f
Author: Marcus <[email protected]>
Date:   Mon Oct 7 18:13:04 2024 -0700

    remove direct eval
@marcustyphoon marcustyphoon mentioned this pull request Dec 2, 2024
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hobinjk hobinjk hobinjk approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@marcustyphoon @hobinjk