Skip to content

Pull router_js into the Ember monorepo#21211

Merged
kategengler merged 696 commits intoemberjs:mainfrom
mansona:router-js
Mar 20, 2026
Merged

Pull router_js into the Ember monorepo#21211
kategengler merged 696 commits intoemberjs:mainfrom
mansona:router-js

Conversation

@mansona
Copy link
Copy Markdown
Member

@mansona mansona commented Mar 10, 2026

With the Router RFC coming very soon we need to have router_js in the main monorepo. This PR does that work (with preserving history)

Still todo:

  • make sure the tests are actually running in CI
  • remove unnecessary files from router_js
  • make sure that only the entrypoint is added to renamed packages in package.json
  • profit 🎉

For anyone wanting to review this PR and not wanting to read all history from all of router_js then you can start at this commit and use the "Next commit" links at the top to go forward

Alternatively you can see the full diff with actual changes by looking at this link: mansona/ember.js@60942e2...mansona:ember.js:router-js

wagenet and others added 30 commits February 12, 2018 21:00
When calling replace on a replace, it should replace not update
The versions of prettier should be updated manually (to avoid churn in
unrelated PRs).
Prevent context matching if the oldContext is null
fix `{{url-for 'posts' (hash queryParams=paramsHash)}}` use case
Fix a crash when (hash) helper is used to create queryParams object
[BREAKING] Router Abstract Base class
@NullVoxPopuli NullVoxPopuli dismissed their stale review March 19, 2026 22:44

sus browserstack result

@kategengler
Copy link
Copy Markdown
Member

The Browserstack errors are consistent

@mansona
Copy link
Copy Markdown
Member Author

mansona commented Mar 20, 2026

The Browserstack errors are consistent

This is very strange 🙈 the CI run just before I removed an eslint commit passed without any issue: https://github.com/emberjs/ember.js/actions/runs/23306124516 so something strange/flakey is going on here

And the errors have nothing to do with the router https://github.com/emberjs/ember.js/actions/runs/23309427423/job/67814938742#step:6:128 the last two runs failed on not ok 17 Safari 15.6 - [1013 ms] - Strict Mode - Runtime Template Compiler (explicit) - built ins: Can use hash

It could be that integrating the router_js test suite has introduced new flakiness but there is 0% chance that there was a causal reason why this is failing (and only on safari too 🫠 )

@mansona
Copy link
Copy Markdown
Member Author

mansona commented Mar 20, 2026

@kategengler @NullVoxPopuli I ended up removing the custom backburner wrapper in the tests since the flakeyness was probably being caused by that leaking (somehow)

To review that last commit you should probably ignore whitespace 🙈 the change is much smaller when you do because of indentation changes and prettier 🫠

Copy link
Copy Markdown
Contributor

@NullVoxPopuli NullVoxPopuli left a comment

Choose a reason for hiding this comment

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

test changes seem reasonable!

@kategengler kategengler merged commit 468a145 into emberjs:main Mar 20, 2026
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.