Skip to content

Commit

Permalink
Merge pull request #5044 from bekzod/updates
Browse files Browse the repository at this point in the history 
update `ember-resolver` `loader.js` `rsvp`
  • Loading branch information
@stefanpenner
stefanpenner authored Jun 30, 2017
2 parents 9c0cc48 + 826971c commit 4f2e2ad
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 28 deletions.
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.6.0",
"ember-publisher": "0.0.7",
"ember-resolver": "^2.0.3",
"ember-resolver": "^4.1.0",
"ember-source": "~2.11.0",
"ember-watson": "^0.7.0",
"express": "^4.14.0",
Expand All @@ -100,13 +100,13 @@
"glob": "5.0.13",
"heimdall-query": "^0.0.5",
"json-api-mock-server": "0.1.1",
"loader.js": "^4.2.2",
"loader.js": "^4.5.0",
"mocha": "2.4.5",
"mocha-only-detector": "0.0.2",
"morgan": "^1.7.0",
"pretender": "1.0.0",
"rimraf": "2.5.2",
"rsvp": "3.2.1"
"rsvp": "3.6.0"
},
"peerDependencies": {
"ember-inflector": "^2.0.0"
Expand Down
69 changes: 44 additions & 25 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
# yarn lockfile v1


"@glimmer/di@^0.2.0":
version "0.2.0"
resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.2.0.tgz#73bfd4a6ee4148a80bf092e8a5d29bcac9d4ce7e"

"@glimmer/resolver@^0.3.0":
version "0.3.1"
resolved "https://registry.yarnpkg.com/@glimmer/resolver/-/resolver-0.3.1.tgz#41069345b6f41beb0948cc35d8e4aa60adcadfc5"
dependencies:
"@glimmer/di" "^0.2.0"

"@types/node@*", "@types/node@^7.0.5":
version "7.0.32"
resolved "https://registry.npmjs.org/@types/node/-/node-7.0.32.tgz#6afe6c66520a4c316623a14aef123908d01b4bba"
Expand Down Expand Up @@ -492,7 +502,7 @@ babel-plugin-dead-code-elimination@^1.0.2:
version "1.0.2"
resolved "https://registry.npmjs.org/babel-plugin-dead-code-elimination/-/babel-plugin-dead-code-elimination-1.0.2.tgz#5f7c451274dcd7cccdbfbb3e0b85dd28121f0f65"

babel-plugin-debug-macros@^0.1.10, babel-plugin-debug-macros@^0.1.7:
babel-plugin-debug-macros@^0.1.1, babel-plugin-debug-macros@^0.1.10, babel-plugin-debug-macros@^0.1.7:
version "0.1.10"
resolved "https://registry.npmjs.org/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.1.10.tgz#dd077ad6e1cc0a8f9bbc6405c561392ebfc9a01c"
dependencies:
Expand Down Expand Up @@ -1078,29 +1088,29 @@ broccoli-builder@^0.18.3:
rsvp "^3.0.17"
silent-error "^1.0.1"

broccoli-caching-writer@^2.0.4, broccoli-caching-writer@^2.2.0, broccoli-caching-writer@^2.3.1:
version "2.3.1"
resolved "https://registry.npmjs.org/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07"
broccoli-caching-writer@^2.0.4, broccoli-caching-writer@~2.0.1:
version "2.0.4"
resolved "https://registry.npmjs.org/broccoli-caching-writer/-/broccoli-caching-writer-2.0.4.tgz#d995d7d1977292e498f78df05887230fcb4a5e2c"
dependencies:
broccoli-kitchen-sink-helpers "^0.2.5"
broccoli-plugin "1.1.0"
debug "^2.1.1"
lodash-node "^3.2.0"
rimraf "^2.2.8"
rsvp "^3.0.17"
walk-sync "^0.2.5"
symlink-or-copy "^1.0.0"
walk-sync "^0.2.0"

broccoli-caching-writer@~2.0.1:
version "2.0.4"
resolved "https://registry.npmjs.org/broccoli-caching-writer/-/broccoli-caching-writer-2.0.4.tgz#d995d7d1977292e498f78df05887230fcb4a5e2c"
broccoli-caching-writer@^2.2.0, broccoli-caching-writer@^2.3.1:
version "2.3.1"
resolved "https://registry.npmjs.org/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07"
dependencies:
broccoli-kitchen-sink-helpers "^0.2.5"
broccoli-plugin "1.1.0"
debug "^2.1.1"
lodash-node "^3.2.0"
rimraf "^2.2.8"
rsvp "^3.0.17"
symlink-or-copy "^1.0.0"
walk-sync "^0.2.0"
walk-sync "^0.2.5"

broccoli-clean-css@^1.1.0:
version "1.1.0"
Expand Down Expand Up @@ -2454,12 +2464,17 @@ ember-qunit@^0.4.18:
dependencies:
ember-test-helpers "^0.5.32"

ember-resolver@^2.0.3:
version "2.1.1"
resolved "https://registry.npmjs.org/ember-resolver/-/ember-resolver-2.1.1.tgz#5e4c1fffe9f5f48fc2194ad7592274ed0cd74f72"
ember-resolver@^4.1.3:
version "4.1.0"
resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-4.1.0.tgz#f02aeb2f1f2e944ed47e085412a7b84f759d11df"
dependencies:
ember-cli-babel "^5.1.6"
"@glimmer/resolver" "^0.3.0"
babel-plugin-debug-macros "^0.1.1"
broccoli-funnel "^1.1.0"
broccoli-merge-trees "^2.0.0"
ember-cli-babel "^6.0.0-beta.7"
ember-cli-version-checker "^1.1.6"
resolve "^1.3.2"

ember-router-generator@^1.0.0:
version "1.2.3"
Expand Down Expand Up @@ -3948,9 +3963,9 @@ load-json-file@^1.0.0:
pinkie-promise "^2.0.0"
strip-bom "^2.0.0"

loader.js@^4.2.2:
version "4.5.0"
resolved "https://registry.npmjs.org/loader.js/-/loader.js-4.5.0.tgz#fa4369702f176410c810605999f79dd590ff3308"
loader.js@^4.5.0:
version "4.5.1"
resolved "https://registry.yarnpkg.com/loader.js/-/loader.js-4.5.1.tgz#c15ab15a6b8376bd4fbf7ea56f8d76cc557331da"

locate-path@^2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -5092,7 +5107,7 @@ resolve-from@^1.0.0:
version "1.0.1"
resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"

resolve@^1.1.2, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.0, resolve@^1.3.3:
resolve@^1.1.2, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.0, resolve@^1.3.2, resolve@^1.3.3:
version "1.3.3"
resolved "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
dependencies:
Expand All @@ -5111,13 +5126,13 @@ right-align@^0.1.1:
dependencies:
align-text "^0.1.1"

rimraf@2.5.2, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4:
rimraf@2.5.2, rimraf@^2.4.3, rimraf@^2.4.4:
version "2.5.2"
resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz#62ba947fa4c0b4363839aefecd4f0fbad6059726"
dependencies:
glob "^7.0.0"

rimraf@^2.1.4, rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.4.1, rimraf@^2.5.1, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1:
rimraf@^2.1.4, rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.3.4, rimraf@^2.4.1, rimraf@^2.5.1, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1:
version "2.6.1"
resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
dependencies:
Expand All @@ -5141,14 +5156,18 @@ route-recognizer@^0.2.3:
version "0.2.10"
resolved "https://registry.npmjs.org/route-recognizer/-/route-recognizer-0.2.10.tgz#024b2283c2e68d13a7c7f5173a5924645e8902df"

rsvp@3.2.1, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.6, rsvp@^3.2.1, rsvp@~3.2.1:
version "3.2.1"
resolved "https://registry.npmjs.org/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a"
rsvp@3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.0.tgz#666dfffa715f7e10eef76f4d1e56fb2566fce5c3"

rsvp@^3.0.14, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.1.0, rsvp@^3.3.3, rsvp@^3.4.0:
rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.3.3, rsvp@^3.4.0:
version "3.5.0"
resolved "https://registry.npmjs.org/rsvp/-/rsvp-3.5.0.tgz#a62c573a4ae4e1dfd0697ebc6242e79c681eaa34"

rsvp@^3.0.16, rsvp@^3.0.6, rsvp@~3.2.1:
version "3.2.1"
resolved "https://registry.npmjs.org/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a"

rsvp@~3.0.6:
version "3.0.21"
resolved "https://registry.npmjs.org/rsvp/-/rsvp-3.0.21.tgz#49c588fe18ef293bcd0ab9f4e6756e6ac433359f"
Expand Down

0 comments on commit 4f2e2ad

Please sign in to comment.