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

Update router_js to 2.0.0. #15672

Merged
merged 1 commit into from
Sep 21, 2017
Merged

Update router_js to 2.0.0. #15672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions broccoli/packages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,10 @@ const { stripIndent } = require('common-tags');
const toES5 = require('./to-es5');

module.exports.routerES = function _routerES() {
return new Rollup(findLib('router_js', 'lib'), {
return new Rollup(findLib('router_js'), {
rollup: {
external: ['route-recognizer', 'rsvp'],
entry: 'router.js',
plugins: [{
transform(code, id) {
Copy link
Member Author

Choose a reason for hiding this comment

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

These overrides are not needed any longer, the upstream repo has corrected its invalid internals...

if (/[^t][^e][^r]\/router\.js$/.test(id)) {
code += 'export { Transition } from \'./router/transition\';\n'
} else if (/\/router\/handler-info\/[^\/]+\.js$/.test(id)) {
code = code.replace(/\'router\//g, '\'../');
}
code = code.replace(/import\ Promise\ from \'rsvp\/promise\'/g, 'import { Promise } from \'rsvp\'')
return {
code: code,
map: { mappings: '' }
};
}
}],
entry: 'index.js',
targets: [{
dest: 'router.js',
format: 'es'
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"qunit-phantomjs-runner": "^2.2.0",
"qunitjs": "^1.22.0",
"route-recognizer": "^0.3.3",
"router_js": "^1.2.8",
"router_js": "^2.0.0-beta.1",
"semver": "^5.3.0",
"serve-static": "^1.12.2",
"simple-dom": "^0.3.0",
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5322,9 +5322,9 @@ route-recognizer@^0.3.3:
version "0.3.3"
resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.3.tgz#1d365e27fa6995e091675f7dc940a8c00353bd29"

router_js@^1.2.8:
version "1.2.8"
resolved "https://registry.yarnpkg.com/router_js/-/router_js-1.2.8.tgz#d2ea5d00726e1fd6494d20ae3ebeb99ce86cf0b3"
router_js@^2.0.0-beta.1:
version "2.0.0-beta.1"
resolved "https://registry.yarnpkg.com/router_js/-/router_js-2.0.0-beta.1.tgz#6f267b5171bbe1e92729db3e8be447e6a9d63f5a"

[email protected]:
version "3.0.14"
Expand Down