Skip to content

Commit

Permalink
Merge pull request #19136 from emberjs/update-router-js
Browse files Browse the repository at this point in the history
  • Loading branch information
rwjblue authored Sep 10, 2020
2 parents af4253e + ab4dcea commit 27d547d
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
"rollup-plugin-commonjs": "^9.3.4",
"rollup-plugin-node-resolve": "^4.2.4",
"route-recognizer": "^0.3.4",
"router_js": "^7.0.0",
"router_js": "^7.1.0",
"rsvp": "^4.8.5",
"serve-static": "^1.14.1",
"simple-dom": "^1.4.0",
Expand Down
26 changes: 26 additions & 0 deletions packages/@ember/-internals/routing/lib/system/transition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,3 +166,29 @@
value that the final redirecting transition fulfills with
@public
*/

/**
In non-production builds, this function will return the stack that this Transition was
created within. In production builds, this function will not be present.
@method debugCreationStack
@return string
*/

/**
In non-production builds, this function will return the stack that this Transition was
aborted within (or `undefined` if the Transition has not been aborted yet). In production
builds, this function will not be present.
@method debugAbortStack
@return string
*/

/**
In non-production builds, this property references the Transition that _this_ Transition
was derived from or `undefined` if this transition did not derive from another. In
production builds, this property will not be present.
@property debugPreviousTransition
@type {Transition | undefined}
*/
3 changes: 3 additions & 0 deletions tests/docs/expected.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,10 @@ module.exports = {
'deactivate',
'debounce',
'debug',
'debugAbortStack',
'debugCreationStack',
'debugger',
'debugPreviousTransition',
'decamelize',
'decrementProperty',
'defer',
Expand Down
10 changes: 6 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7986,10 +7986,12 @@ route-recognizer@^0.3.4:
resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==

router_js@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/router_js/-/router_js-7.0.0.tgz#92eb56141ee2cb59e04271e5f2d685cdfa836c37"
integrity sha512-pJ+W6SyPmMkZ/qawWyaDaAue1bXOx4FOuMMpxvYW/1r6Hifpp06+jURFbR8ryZszYopPYKS5OUQnv1izd3iPKA==
router_js@^7.1.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/router_js/-/router_js-7.1.0.tgz#d2a47d7224a30f3b6416be20c9c80868fc14ff0c"
integrity sha512-03n6mJCD6hTX4bUkowS+HcsyI9ghP3AxmtVSRnMmDWzykNlHE/wXy+hbybdHmnOH2sDe97L/4V7q6MfrVQBoIg==
dependencies:
"@glimmer/env" "^0.1.7"

[email protected]:
version "3.0.14"
Expand Down

0 comments on commit 27d547d

Please sign in to comment.