diff --git a/package.json b/package.json index c9311aaa758..a84c693fa9c 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "qunit-extras": "^1.5.0", "qunit-phantomjs-runner": "^2.2.0", "qunitjs": "^1.22.0", - "route-recognizer": "^0.3.2", + "route-recognizer": "^0.3.3", "router_js": "^1.2.7", "semver": "^5.3.0", "serve-static": "^1.12.2", diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js index 3d1352bddf1..9d9770c5909 100644 --- a/packages/ember/tests/routing/query_params_test.js +++ b/packages/ember/tests/routing/query_params_test.js @@ -9,7 +9,7 @@ import { run, get, computed, - meta + peekMeta } from 'ember-metal'; import { Route } from 'ember-routing'; import { jQuery } from 'ember-views'; @@ -1143,8 +1143,8 @@ moduleFor('Query Params - main', class extends QueryParamTestCase { this.add('route:other', Route.extend({ model(p, trans) { - let m = meta(trans.params.application); - assert.ok(!m.peekWatching('woot'), 'A meta object isn\'t constructed for this params POJO'); + let m = peekMeta(trans.params.application); + assert.ok(m === undefined, 'A meta object isn\'t constructed for this params POJO'); } })); diff --git a/yarn.lock b/yarn.lock index 45502f0891d..bee72ae1113 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1732,7 +1732,7 @@ crc32-stream@^1.0.0: buffer-crc32 "^0.2.1" readable-stream "^2.0.0" -cross-spawn@^5.0.0, cross-spawn@^5.1.0: +cross-spawn@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" dependencies: @@ -4002,10 +4002,6 @@ lodash.uniq@^4.2.0, lodash.uniq@^4.5.0, lodash.uniq@~4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" -lodash.uniqby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302" - lodash.without@~4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac" @@ -4917,7 +4913,7 @@ read@1, read@~1.0.1, read@~1.0.7: dependencies: mute-stream "~0.0.4" -"readable-stream@1 || 2", readable-stream@^2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.2.2: +"readable-stream@1 || 2", readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e" dependencies: @@ -4929,6 +4925,18 @@ read@1, read@~1.0.1, read@~1.0.7: string_decoder "~0.10.x" util-deprecate "~1.0.1" +readable-stream@^2, readable-stream@~2.1.5: + version "2.1.5" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" + dependencies: + buffer-shims "^1.0.0" + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + string_decoder "~0.10.x" + util-deprecate "~1.0.1" + readable-stream@~1.0.2: version "1.0.34" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" @@ -4949,18 +4957,6 @@ readable-stream@~2.0.5: string_decoder "~0.10.x" util-deprecate "~1.0.1" -readable-stream@~2.1.5: - version "2.1.5" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" - dependencies: - buffer-shims "^1.0.0" - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - readdir-scoped-modules@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747" @@ -5223,9 +5219,9 @@ rollup@^0.41.4: dependencies: source-map-support "^0.4.0" -route-recognizer@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.2.tgz#4ef82b1e9178ccb023143ce718a32b503d526d3a" +route-recognizer@^0.3.3: + version "0.3.3" + resolved "https://registry.npmjs.org/route-recognizer/-/route-recognizer-0.3.3.tgz#1d365e27fa6995e091675f7dc940a8c00353bd29" router_js@^1.2.7: version "1.2.7" @@ -5745,7 +5741,7 @@ temp@0.8.3: os-tmpdir "^1.0.0" rimraf "~2.2.6" -testem@1.15.0: +testem@1.15.0, testem@^1.8.1: version "1.15.0" resolved "https://registry.yarnpkg.com/testem/-/testem-1.15.0.tgz#2e3a9e7ac29f16a20f718eb0c4b12e7a44900675" dependencies: @@ -5775,37 +5771,6 @@ testem@1.15.0: tap-parser "^5.1.0" xmldom "^0.1.19" -testem@^1.8.1: - version "1.16.0" - resolved "https://registry.yarnpkg.com/testem/-/testem-1.16.0.tgz#3933040b5d5b5fbdb6a2b1e7032e511b54a05867" - dependencies: - backbone "^1.1.2" - bluebird "^3.4.6" - charm "^1.0.0" - commander "^2.6.0" - consolidate "^0.14.0" - cross-spawn "^5.1.0" - express "^4.10.7" - fireworm "^0.7.0" - glob "^7.0.4" - http-proxy "^1.13.1" - js-yaml "^3.2.5" - lodash.assignin "^4.1.0" - lodash.clonedeep "^4.4.1" - lodash.find "^4.5.1" - lodash.uniqby "^4.7.0" - mkdirp "^0.5.1" - mustache "^2.2.1" - node-notifier "^5.0.1" - npmlog "^4.0.0" - printf "^0.2.3" - rimraf "^2.4.4" - socket.io "1.6.0" - spawn-args "^0.2.0" - styled_string "0.0.1" - tap-parser "^5.1.0" - xmldom "^0.1.19" - text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"