Skip to content

Commit

Permalink
Merge pull request #6 from ganes1410/reorder-dependencies
Browse files Browse the repository at this point in the history
Reorder dependecies
  • Loading branch information
lolmaus committed Mar 26, 2018
2 parents c1c263f + d7c1daf commit a1bdb33
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 37 deletions.
6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -31,7 +31,9 @@
"dependencies": {
"ember-cli-babel": "^6.10.0",
"ember-cli-htmlbars": "^2.0.1",
"ember-truth-helpers": "^2.0.0"
"ember-truth-helpers": "^2.0.0",
"liquid-fire": "^0.29.2",
"liquid-tether": "^2.0.6"
},
"devDependencies": {
"babel-plugin-transform-object-rest-spread": "^6.26.0",
Expand Down Expand Up @@ -66,8 +68,6 @@
"eslint-plugin-node": "^5.1.1",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-standard": "^3.0.1",
"liquid-fire": "^0.29.1",
"liquid-tether": "^2.0.6",
"loader.js": "^4.2.3"
},
"engines": {
Expand Down
85 changes: 51 additions & 34 deletions yarn.lock
Expand Up @@ -1507,6 +1507,13 @@ browserslist@^2.1.2:
caniuse-lite "^1.0.30000718"
electron-to-chromium "^1.3.18"

browserslist@^2.2.2:
version "2.11.3"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
dependencies:
caniuse-lite "^1.0.30000792"
electron-to-chromium "^1.3.30"

bser@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
Expand Down Expand Up @@ -1567,6 +1574,10 @@ caniuse-lite@^1.0.30000718:
version "1.0.30000731"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000731.tgz#6f2b9096285af3c7bcf2abe39647bb525d68c842"

caniuse-lite@^1.0.30000792:
version "1.0.30000820"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000820.tgz#6e36ee75187a2c83d26d6504a1af47cc580324d2"

capture-exit@^1.1.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
Expand Down Expand Up @@ -2220,13 +2231,17 @@ electron-to-chromium@^1.3.18:
version "1.3.21"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.21.tgz#a967ebdcfe8ed0083fc244d1894022a8e8113ea2"

electron-to-chromium@^1.3.30:
version "1.3.40"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.40.tgz#1fbd6d97befd72b8a6f921dc38d22413d2f6fddf"

ember-ajax@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/ember-ajax/-/ember-ajax-3.0.0.tgz#8f21e9da0c1d433cf879aa855fce464d517e9ab5"
dependencies:
ember-cli-babel "^6.0.0"

ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7:
ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.7:
version "5.2.4"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.4.tgz#5ce4f46b08ed6f6d21e878619fb689719d6e8e13"
dependencies:
Expand Down Expand Up @@ -2683,11 +2698,11 @@ ember-export-application-global@^2.0.0:
dependencies:
ember-cli-babel "^6.0.0-beta.7"

ember-factory-for-polyfill@^1.1.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/ember-factory-for-polyfill/-/ember-factory-for-polyfill-1.2.0.tgz#e27752a7d9dbd5336e8b470341bc1c55bbe3e4d2"
ember-factory-for-polyfill@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/ember-factory-for-polyfill/-/ember-factory-for-polyfill-1.3.1.tgz#b446ed64916d293c847a4955240eb2c993b86eae"
dependencies:
ember-cli-version-checker "^1.2.0"
ember-cli-version-checker "^2.1.0"

ember-fork-me@^1.0.1:
version "1.0.1"
Expand All @@ -2697,18 +2712,18 @@ ember-fork-me@^1.0.1:
ember-cli-htmlbars "^2.0.1"

ember-getowner-polyfill@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-2.0.1.tgz#9bfe2b4d527ed174e76fef2c8f30937d77cb66fb"
version "2.2.0"
resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-2.2.0.tgz#38e7dccbcac69d5ec694000329ec0b2be651d2b2"
dependencies:
ember-cli-version-checker "^1.2.0"
ember-factory-for-polyfill "^1.1.0"
ember-cli-version-checker "^2.1.0"
ember-factory-for-polyfill "^1.3.1"

ember-hash-helper-polyfill@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/ember-hash-helper-polyfill/-/ember-hash-helper-polyfill-0.2.0.tgz#0913a06ad59147f345dff0edda04b112deba0f7e"
version "0.2.1"
resolved "https://registry.yarnpkg.com/ember-hash-helper-polyfill/-/ember-hash-helper-polyfill-0.2.1.tgz#73b074d8e2f7183d2e68c3df77e951097afa907c"
dependencies:
ember-cli-babel "^6.8.2"
ember-cli-version-checker "^1.2.0"
ember-cli-version-checker "^2.1.0"

ember-load-initializers@^1.0.0:
version "1.0.0"
Expand Down Expand Up @@ -2817,11 +2832,13 @@ ember-try@^0.2.15:
rsvp "^3.0.17"
semver "^5.1.0"

ember-weakmap@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ember-weakmap/-/ember-weakmap-2.0.0.tgz#71c6819a8bfd0b077ae17ca1d9053fc5db06e4ac"
ember-weakmap@^3.1.0:
version "3.1.1"
resolved "https://registry.yarnpkg.com/ember-weakmap/-/ember-weakmap-3.1.1.tgz#2ae6e0080b5b80cf0d108f7752dc69ea9603dbd7"
dependencies:
ember-cli-babel "^5.1.6"
browserslist "^2.2.2"
debug "^3.1.0"
ember-cli-babel "^6.3.0"

encodeurl@~1.0.1:
version "1.0.1"
Expand Down Expand Up @@ -4471,9 +4488,9 @@ linkify-it@^2.0.0:
dependencies:
uc.micro "^1.0.1"

liquid-fire@^0.29.1:
version "0.29.1"
resolved "https://registry.yarnpkg.com/liquid-fire/-/liquid-fire-0.29.1.tgz#bcfea12db65799def263721a2b9dd6142d426bdf"
liquid-fire@^0.29.2:
version "0.29.2"
resolved "https://registry.yarnpkg.com/liquid-fire/-/liquid-fire-0.29.2.tgz#db3900c0d6554262e2c2f30a3f24681a3006f850"
dependencies:
broccoli-funnel "^1.0.1"
broccoli-merge-trees "^1.0.0"
Expand All @@ -4484,7 +4501,7 @@ liquid-fire@^0.29.1:
ember-getowner-polyfill "^2.0.1"
ember-hash-helper-polyfill "^0.2.0"
match-media "^0.2.0"
velocity-animate ">= 0.11.8"
velocity-animate "^1.5.1"

liquid-tether@^2.0.6:
version "2.0.6"
Expand All @@ -4498,14 +4515,14 @@ liquid-tether@^2.0.6:
tether "^1.4.0"

liquid-wormhole@^2.0.2:
version "2.0.7"
resolved "https://registry.yarnpkg.com/liquid-wormhole/-/liquid-wormhole-2.0.7.tgz#239abb12a031a3c9ca979efcf7417115b75f1895"
version "2.1.1"
resolved "https://registry.yarnpkg.com/liquid-wormhole/-/liquid-wormhole-2.1.1.tgz#f53c53bb30aa8593e15b27b1b452a07fba225551"
dependencies:
ember-cli-babel "^5.1.7"
ember-cli-babel "^6.8.2"
ember-cli-htmlbars "^1.1.1"
ember-getowner-polyfill "^2.0.1"
ember-weakmap "2.0.0"
perf-primitives "0.0.4"
ember-weakmap "^3.1.0"
perf-primitives "^0.0.6"

livereload-js@^2.2.2:
version "2.2.2"
Expand Down Expand Up @@ -5791,11 +5808,11 @@ path-type@^2.0.0:
dependencies:
pify "^2.0.0"

perf-primitives@0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/perf-primitives/-/perf-primitives-0.0.4.tgz#f07e7f33ef3e200393aa218f591918fb3abe46e8"
perf-primitives@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/perf-primitives/-/perf-primitives-0.0.6.tgz#ceee069f3d7a49f83fe34b67e6b15a6d482825d8"
dependencies:
ember-cli-babel "^5.1.6"
ember-cli-babel "^6.8.2"

performance-now@^0.2.0:
version "0.2.0"
Expand Down Expand Up @@ -6964,8 +6981,8 @@ testem@^1.18.0:
xmldom "^0.1.19"

tether@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.0.tgz#0f9fa171f75bf58485d8149e94799d7ae74d1c1a"
version "1.4.3"
resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.3.tgz#fd547024c47b6e5c9b87e1880f997991a9a6ad54"

text-table@~0.2.0:
version "0.2.0"
Expand Down Expand Up @@ -7215,9 +7232,9 @@ vary@~1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"

"velocity-animate@>= 0.11.8":
version "1.5.0"
resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-1.5.0.tgz#fc8771d8dfe1136ff02a707e10fbb0957c4b030f"
velocity-animate@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-1.5.1.tgz#606837047bab8fbfb59a636d1d82ecc3f7bd71a6"

verror@1.10.0:
version "1.10.0"
Expand Down

0 comments on commit a1bdb33

Please sign in to comment.