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.

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

Use object with null prototype for settings #4835

Closed

Conversation

EvanHahn
Copy link
Contributor

@EvanHahn EvanHahn commented Feb 21, 2022

express().settings is now an object with a null prototype. This simplifies the code.

lib/application.js Outdated Show resolved Hide resolved
test/app.locals.js Outdated Show resolved Hide resolved
test/config.js Outdated Show resolved Hide resolved
@EvanHahn
Copy link
Contributor Author

Just rebased this.

@EvanHahn
Copy link
Contributor Author

Anything else I should do here? No rush from me, just wanna make sure I'm not blocking anything.

@dougwilson
Copy link
Contributor

Hey! No, these 5.x changes are good. I'm just waiting to merge after the 4.x branch is merged in to reduce the merge conflicts is all. That should be very soon, as the 4.x changes landed are supposed to be out next week! Thank you for your hard work and discovering this issue. API is more sane now thanks to you 😊

@EvanHahn
Copy link
Contributor Author

Great, thanks!!

If there are other things that need doing, feel free to reach out to me@evanhahn.com and I'll see if I can help.

@EvanHahn
Copy link
Contributor Author

This has been open for over a year. No rush from me, but let me know if there's anything I can do to move this along.

History.md Outdated Show resolved Hide resolved
@EvanHahn EvanHahn force-pushed the ignore-settings-on-object-prototype-5.x branch from e49bb35 to 01395fb Compare April 28, 2024 23:24
@EvanHahn EvanHahn force-pushed the ignore-settings-on-object-prototype-5.x branch from 01395fb to 790d083 Compare April 28, 2024 23:25
@EvanHahn EvanHahn changed the title Ignore settings on Object.prototype Use object with null prototype for settings Apr 28, 2024
@EvanHahn
Copy link
Contributor Author

It seems that the 5.x branch was rebased against main. That means that this PR is primarily a code cleanup, and should be ready to merge.

@wesleytodd
Copy link
Member

wesleytodd commented Apr 29, 2024

#4861 is merged which created a conflict here. If you want to resolve it go for it (its super simple) or I can with a local merge (instead of just clicking the buttons). I will leave it here for a bit and if I don't hear back will merge it when I circle back.

@EvanHahn
Copy link
Contributor Author

Fixed, I believe.

@wesleytodd
Copy link
Member

Hm, it still doesn't like it, but afaict that was the line which changed in both. This is the reason not to leave branches to become stale this long, sorry about the difficulty. I will pull and check it locally now.

@wesleytodd
Copy link
Member

🤷 merged in the referenced cherry-picked version above.

@wesleytodd wesleytodd closed this Apr 29, 2024
@EvanHahn EvanHahn deleted the ignore-settings-on-object-prototype-5.x branch April 29, 2024 20:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants