Skip to content

Commit 7fda075

Browse files
authored
Merge pull request #104 from prasannavijayan/master
Update to ember fontawesome
2 parents f93a5c3 + 11cd352 commit 7fda075

File tree

4 files changed

+108
-2
lines changed

4 files changed

+108
-2
lines changed

.DS_Store

-8 KB
Binary file not shown.

ember-cli-build.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ module.exports = function(defaults) {
77
sassOptions: {
88
implementation: nodeSass
99
},
10+
fontawesome: {
11+
icons: {
12+
'free-solid-svg-icons': 'all',
13+
'free-regular-svg-icons': 'all',
14+
}
15+
},
1016
svgJar: {
1117
sourceDirs: [
1218
'public',

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
},
4141
"devDependencies": {
4242
"@ember/optional-features": "^0.7.0",
43+
"@fortawesome/ember-fontawesome": "^0.1.8",
44+
"@fortawesome/free-solid-svg-icons": "5.4.2",
45+
"@fortawesome/free-regular-svg-icons": "5.4.2",
4346
"broccoli-asset-rev": "^3.0.0",
4447
"ember-a11y-landmarks": "^1.0.1",
4548
"ember-cli": "~3.5.0",

yarn.lock

Lines changed: 99 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,48 @@
696696
ember-cli-babel "^6.12.0"
697697
ember-cli-htmlbars-inline-precompile "^1.0.0"
698698

699+
"@fortawesome/ember-fontawesome@^0.1.8":
700+
version "0.1.8"
701+
resolved "https://registry.yarnpkg.com/@fortawesome/ember-fontawesome/-/ember-fontawesome-0.1.8.tgz#79cc2fc9d1e0d67181227d12cd78fb27def95b79"
702+
integrity sha512-82SVD+c8dVidJAaZGBXBCjEykksF67K6TxtaDTBNI3SljoXr9AwIIQPdw+PolACp0ATojPKcLxQ4uut4tWtWzQ==
703+
dependencies:
704+
"@fortawesome/fontawesome-svg-core" "^1.2.0"
705+
broccoli-file-creator "^1.1.1"
706+
broccoli-merge-trees "^2.0.0"
707+
broccoli-plugin "^1.3.0"
708+
broccoli-rollup "^2.0.0"
709+
broccoli-source "^1.1.0"
710+
camel-case "^3.0.0"
711+
ember-ast-helpers "0.3.5"
712+
ember-cli-babel "^6.6.0"
713+
ember-cli-htmlbars "^2.0.3"
714+
ember-get-config "^0.2.4"
715+
glob "^7.1.2"
716+
rollup-plugin-node-resolve "^3.0.2"
717+
718+
"@fortawesome/fontawesome-common-types@^0.2.7":
719+
version "0.2.7"
720+
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.7.tgz#fe76803922db0eb4393675199c2e0c3bad52629c"
721+
integrity sha512-lFgL3Kqfwk8WS66pkBx5rpd7IQuo8UuahZXH9iuV9UrPK8eDzLccCYopnhTUgsz7+aJpMpqjVyv/N/11j5TtVw==
722+
723+
"@fortawesome/fontawesome-svg-core@^1.2.0":
724+
version "1.2.7"
725+
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.7.tgz#064aefa1c8e4b055fbc6de0b6fbd3ff5ecf564ea"
726+
integrity sha512-lkysL+BqfeggO+rAew3WFHJNImB47NBQrEfD32gXaS3MYkEdo1YkGkQ6/4hfY4Dt7rJfSseeUIYqMB8eEHD9JQ==
727+
dependencies:
728+
"@fortawesome/fontawesome-common-types" "^0.2.7"
729+
730+
"@glimmer/compiler@^0.27.0":
731+
version "0.27.0"
732+
resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.27.0.tgz#b24042752a53171d5cb3d9a95a29dfc0f314ed2c"
733+
integrity sha1-skBCdSpTFx1cs9mpWinfwPMU7Sw=
734+
dependencies:
735+
"@glimmer/interfaces" "^0.27.0"
736+
"@glimmer/syntax" "^0.27.0"
737+
"@glimmer/util" "^0.27.0"
738+
"@glimmer/wire-format" "^0.27.0"
739+
simple-html-tokenizer "^0.3.0"
740+
699741
"@glimmer/compiler@^0.36.2":
700742
version "0.36.4"
701743
resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.36.4.tgz#eee7ef4e49b2e7f8c59be8c0dda70b859333a810"
@@ -711,6 +753,13 @@
711753
resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.2.0.tgz#73bfd4a6ee4148a80bf092e8a5d29bcac9d4ce7e"
712754
integrity sha1-c7/Upu5BSKgL8JLopdKbysnUzn4=
713755

756+
"@glimmer/interfaces@^0.27.0":
757+
version "0.27.0"
758+
resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.27.0.tgz#473cda3c8cca636989fb310b4ffdb8f14ffae5c9"
759+
integrity sha1-RzzaPIzKY2mJ+zELT/248U/65ck=
760+
dependencies:
761+
"@glimmer/wire-format" "^0.27.0"
762+
714763
"@glimmer/interfaces@^0.36.4":
715764
version "0.36.4"
716765
resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.36.4.tgz#49dc81bd9aaf41905fe8426dc273f25cb339139c"
@@ -725,6 +774,16 @@
725774
dependencies:
726775
"@glimmer/di" "^0.2.0"
727776

777+
"@glimmer/syntax@^0.27.0":
778+
version "0.27.0"
779+
resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.27.0.tgz#e53133727cf465a8787a07c7ea660a91689ebdc2"
780+
integrity sha1-5TEzcnz0Zah4egfH6mYKkWievcI=
781+
dependencies:
782+
"@glimmer/interfaces" "^0.27.0"
783+
"@glimmer/util" "^0.27.0"
784+
handlebars "^4.0.6"
785+
simple-html-tokenizer "^0.3.0"
786+
728787
"@glimmer/syntax@^0.36.4":
729788
version "0.36.4"
730789
resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.36.4.tgz#dfc5d1f0e2bdbc8ff8ec482357311748776aa2ff"
@@ -735,11 +794,23 @@
735794
handlebars "^4.0.6"
736795
simple-html-tokenizer "^0.5.6"
737796

797+
"@glimmer/util@^0.27.0":
798+
version "0.27.0"
799+
resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.27.0.tgz#e6e26779b4b7ced899ec376c7b949d0f16f92383"
800+
integrity sha1-5uJnebS3ztiZ7Ddse5SdDxb5I4M=
801+
738802
"@glimmer/util@^0.36.4":
739803
version "0.36.4"
740804
resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.36.4.tgz#a79287fe261cc5b198d1c35943dc8aa879b98bc5"
741805
integrity sha512-ng907Cr4i5NsgmP6Im7KzbK5EfP9M21PZoacrhzIhljFW8XptExH0Sekhx8XJkb4SRt+b28cq4X29WM3EFidOQ==
742806

807+
"@glimmer/wire-format@^0.27.0":
808+
version "0.27.0"
809+
resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.27.0.tgz#1d1729814da57b99f2dbbe718f71456259484b11"
810+
integrity sha1-HRcpgU2le5ny275xj3FFYllISxE=
811+
dependencies:
812+
"@glimmer/util" "^0.27.0"
813+
743814
"@glimmer/wire-format@^0.36.4":
744815
version "0.36.4"
745816
resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.36.4.tgz#520918fbd2d4a91953081476ddcc269b0c714795"
@@ -3041,6 +3112,14 @@ callsites@^0.2.0:
30413112
resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
30423113
integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
30433114

3115+
camel-case@^3.0.0:
3116+
version "3.0.0"
3117+
resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
3118+
integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
3119+
dependencies:
3120+
no-case "^2.2.0"
3121+
upper-case "^1.1.1"
3122+
30443123
camelcase-css@^1.0.1:
30453124
version "1.0.1"
30463125
resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-1.0.1.tgz#157c4238265f5cf94a1dffde86446552cbf3f705"
@@ -4325,6 +4404,14 @@ ember-assign-polyfill@^2.5.0:
43254404
ember-cli-babel "^6.6.0"
43264405
ember-cli-version-checker "^2.0.0"
43274406

4407+
4408+
version "0.3.5"
4409+
resolved "https://registry.yarnpkg.com/ember-ast-helpers/-/ember-ast-helpers-0.3.5.tgz#db72afd9bc3de03759720ff7b03d4e3b2c7f2351"
4410+
integrity sha512-ZtaGAUDvRX13G9D4t4WbTMhcUzqsw6KqhcHreIiZi3ZhRFlSZ3BumgyJ6buDZj+tCBLiQsxRv7l5AY6imqNR6Q==
4411+
dependencies:
4412+
"@glimmer/compiler" "^0.27.0"
4413+
"@glimmer/syntax" "^0.27.0"
4414+
43284415
ember-bootstrap@^2.1.2:
43294416
version "2.1.2"
43304417
resolved "https://registry.yarnpkg.com/ember-bootstrap/-/ember-bootstrap-2.1.2.tgz#99fc88b32479e364e793a673f022962c81fb8565"
@@ -5220,7 +5307,7 @@ ember-font-awesome@^3.0.5:
52205307
ember-cli-htmlbars "^2.0.2"
52215308
font-awesome "^4.7.0"
52225309

5223-
ember-get-config@^0.2.2, ember-get-config@^0.2.3:
5310+
ember-get-config@^0.2.2, ember-get-config@^0.2.3, ember-get-config@^0.2.4:
52245311
version "0.2.4"
52255312
resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-0.2.4.tgz#118492a2a03d73e46004ed777928942021fe1ecd"
52265313
integrity sha1-EYSSoqA9c+RgBO13eSiUICH+Hs0=
@@ -11694,7 +11781,7 @@ rollup-plugin-commonjs@^8.3.0:
1169411781
resolve "^1.4.0"
1169511782
rollup-pluginutils "^2.0.1"
1169611783

11697-
rollup-plugin-node-resolve@^3.3.0:
11784+
rollup-plugin-node-resolve@^3.0.2, rollup-plugin-node-resolve@^3.3.0:
1169811785
version "3.4.0"
1169911786
resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz#908585eda12e393caac7498715a01e08606abc89"
1170011787
integrity sha512-PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg==
@@ -12017,6 +12104,11 @@ silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0:
1201712104
dependencies:
1201812105
debug "^2.2.0"
1201912106

12107+
simple-html-tokenizer@^0.3.0:
12108+
version "0.3.0"
12109+
resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.3.0.tgz#9b8b5559d80e331a544dd13dd59382e5d0d94411"
12110+
integrity sha1-m4tVWdgOMxpUTdE91ZOC5dDZRBE=
12111+
1202012112
simple-html-tokenizer@^0.5.6:
1202112113
version "0.5.6"
1202212114
resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.6.tgz#e1e442b14f5484bf9a7e2924f78f00855e6b3c14"
@@ -13416,6 +13508,11 @@ update-notifier@^2.1.0:
1341613508
semver-diff "^2.0.0"
1341713509
xdg-basedir "^3.0.0"
1341813510

13511+
upper-case@^1.1.1:
13512+
version "1.1.3"
13513+
resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
13514+
integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
13515+
1341913516
uri-js@^4.2.1, uri-js@^4.2.2:
1342013517
version "4.2.2"
1342113518
resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"

0 commit comments

Comments
 (0)