Skip to content

Commit

Permalink
Remove local ember-fontawesome dependency
Browse files Browse the repository at this point in the history
This is provided by common, we don't need a conflicting version here.
  • Loading branch information
jrjohnson committed Aug 24, 2018
1 parent 084cf17 commit d46652c
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 37 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
},
"devDependencies": {
"@ember/optional-features": "^0.6.1",
"@fortawesome/ember-fontawesome": "https://github.com/jrjohnson/ember-fontawesome#default-prefix-transform",
"broccoli-asset-rev": "^3.0.0",
"browserslist": "^4.0.0",
"caniuse-db": "^1.0.30000820",
Expand Down
72 changes: 36 additions & 36 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -223,26 +223,6 @@
markdown-toc "^1.2.0"
rollup-plugin-node-resolve "^3.0.2"

"@fortawesome/ember-fontawesome@https://github.com/jrjohnson/ember-fontawesome#default-prefix-transform":
version "0.1.0"
resolved "https://github.com/jrjohnson/ember-fontawesome#eb0f8c0c6b37e91667cd71c70192fb6cf9dfa704"
dependencies:
"@fortawesome/fontawesome-svg-core" "^1.2.0"
broccoli-file-creator "^1.1.1"
broccoli-funnel "^2.0.1"
broccoli-merge-trees "^2.0.0"
broccoli-plugin "^1.3.0"
broccoli-rollup "^2.0.0"
broccoli-source "^1.1.0"
broccoli-stew "^1.5.0"
camel-case "^3.0.0"
ember-ast-helpers "0.3.5"
ember-cli-babel "^6.6.0"
ember-cli-htmlbars "^2.0.3"
ember-get-config "^0.2.4"
glob "^7.1.2"
rollup-plugin-node-resolve "^3.0.2"

"@fortawesome/fontawesome-common-types@^0.2.2":
version "0.2.2"
resolved "https://npm.fontawesome.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.2.tgz#7fd64eacf7f64e4d7619d21b0b2f2467f5a70611"
Expand Down Expand Up @@ -950,8 +930,8 @@ autoprefixer@^9.0.0:
postcss-value-parser "^3.2.3"

aws-sdk@^2.1.48, aws-sdk@^2.252.1:
version "2.299.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.299.0.tgz#9c12f924f1e28d22899816e112dcb722c4bccf30"
version "2.300.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.300.0.tgz#862f993151b1d8c96f58a5c04aef562e04d56c6a"
dependencies:
buffer "4.9.1"
events "1.1.1"
Expand Down Expand Up @@ -1975,12 +1955,12 @@ broccoli-clean-css@^1.1.0:
json-stable-stringify "^1.0.0"

broccoli-concat@^3.2.2, broccoli-concat@^3.4.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.6.0.tgz#f64763319ec71d240ab0ed4e8864e15f56c867ec"
version "3.7.0"
resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.0.tgz#6407fd411bc0bdf70a1aa607e382a7fa214e55bb"
dependencies:
broccoli-debug "^0.6.4"
broccoli-kitchen-sink-helpers "^0.3.1"
broccoli-plugin "^1.3.0"
broccoli-stew "^1.5.0"
ensure-posix-path "^1.0.2"
fast-sourcemap-concat "^1.4.0"
find-index "^1.1.0"
Expand Down Expand Up @@ -2238,7 +2218,7 @@ broccoli-rollup@^1.2.0:
symlink-or-copy "^1.1.8"
walk-sync "^0.3.1"

broccoli-rollup@^2.0.0:
broccoli-rollup@^2.0.0, broccoli-rollup@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-2.1.1.tgz#0b77dc4b7560a53e998ea85f3b56772612d4988d"
dependencies:
Expand Down Expand Up @@ -2464,11 +2444,11 @@ browserslist@^3.1.0, browserslist@^3.1.1, browserslist@^3.2.6:
electron-to-chromium "^1.3.47"

browserslist@^4.0.0, browserslist@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.0.2.tgz#294388f5844bb3ab15ef7394ca17f49bf7a4e6f1"
version "4.1.0"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.1.0.tgz#81cbb8e52dfa09918f93c6e051d779cb7360785d"
dependencies:
caniuse-lite "^1.0.30000876"
electron-to-chromium "^1.3.57"
caniuse-lite "^1.0.30000878"
electron-to-chromium "^1.3.61"
node-releases "^1.0.0-alpha.11"

bser@^2.0.0:
Expand Down Expand Up @@ -2648,7 +2628,7 @@ caniuse-db@^1.0.30000820:
version "1.0.30000878"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000878.tgz#0d0c6d8500c3aea21441fad059bce4b8f3f509df"

caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000876, caniuse-lite@^1.0.30000878:
caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000878:
version "1.0.30000878"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000878.tgz#c644c39588dd42d3498e952234c372e5a40a4123"

Expand Down Expand Up @@ -4065,9 +4045,9 @@ [email protected]:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"

electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.57:
version "1.3.60"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.60.tgz#85a28db8484f3dd84de46bdcb7aa829e2f016423"
electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.61:
version "1.3.61"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.61.tgz#a8ac295b28d0f03d85e37326fd16b6b6b17a1795"

elegant-spinner@^1.0.1:
version "1.0.1"
Expand Down Expand Up @@ -5038,17 +5018,20 @@ ember-factory-for-polyfill@^1.1.0, ember-factory-for-polyfill@^1.3.1:
ember-cli-version-checker "^2.1.0"

"ember-fetch@^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0":
version "5.1.1"
resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-5.1.1.tgz#a7c791e85c4db46e315088287db1c73818ac9754"
version "5.1.2"
resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-5.1.2.tgz#084b206d285e1ee19ee2260262c0635eeed4e52a"
dependencies:
"@xg-wang/whatwg-fetch" "^3.0.0"
abortcontroller-polyfill "^1.1.9"
babel-preset-env "^1.7.0"
broccoli-concat "^3.2.2"
broccoli-merge-trees "^3.0.0"
broccoli-rollup "^2.1.1"
broccoli-stew "^2.0.0"
broccoli-templater "^2.0.1"
ember-cli-babel "^6.8.2"
node-fetch "^2.0.0-alpha.9"
rollup-plugin-babel "^3.0.7"

[email protected]:
version "2.8.4"
Expand Down Expand Up @@ -5939,6 +5922,10 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"

estree-walker@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"

estree-walker@^0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
Expand Down Expand Up @@ -10587,6 +10574,12 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
hash-base "^3.0.0"
inherits "^2.0.1"

rollup-plugin-babel@^3.0.7:
version "3.0.7"
resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-3.0.7.tgz#5b13611f1ab8922497e9d15197ae5d8a23fe3b1e"
dependencies:
rollup-pluginutils "^1.5.0"

rollup-plugin-node-resolve@^3.0.2:
version "3.3.0"
resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.3.0.tgz#c26d110a36812cbefa7ce117cadcd3439aa1c713"
Expand All @@ -10603,6 +10596,13 @@ rollup-plugin-replace@^1.1.1:
minimatch "^3.0.2"
rollup-pluginutils "^2.0.1"

rollup-pluginutils@^1.5.0:
version "1.5.2"
resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
dependencies:
estree-walker "^0.2.1"
minimatch "^3.0.2"

rollup-pluginutils@^2.0.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.1.tgz#760d185ccc237dedc12d7ae48c6bcd127b4892d0"
Expand Down

0 comments on commit d46652c

Please sign in to comment.