Skip to content

Commit

Permalink
Fix sass/node-sass issue with Yarn and Travis CI
Browse files Browse the repository at this point in the history 
References:
  yarnpkg/yarn#1981 (comment)
    adopted-ember-addons/ember-paper@42db2c8

Should be able to revert once this issues is closed in sass/node-sass
  sass/node-sass#1804
  • Loading branch information
@alexdiliberto
alexdiliberto committed Jun 1, 2017
1 parent 6b6f07b commit 40455fd
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 23 deletions.
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"url": "https://github.com/alexdiliberto/ember-cli-transformicons/issues"
},
"scripts": {
"postinstall": "npm rebuild node-sass",
"build": "ember build",
"start": "ember server",
"test": "ember try:each",
Expand Down
77 changes: 54 additions & 23 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2021,20 +2021,21 @@ ember-ajax@^3.0.0:
dependencies:
ember-cli-babel "^6.0.0"

ember-cli-addon-tests@~0.6.3:
version "0.6.3"
resolved "https://registry.yarnpkg.com/ember-cli-addon-tests/-/ember-cli-addon-tests-0.6.3.tgz#be4daba4d34b77c2bc830dedc88c9baa6903243a"
ember-cli-addon-tests@~0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/ember-cli-addon-tests/-/ember-cli-addon-tests-0.7.0.tgz#c7ad8f839f22ad1b3c22a4b993df6c0f691324ef"
dependencies:
chalk "^1.1.3"
cpr "^2.0.0"
debug "^2.2.0"
exists-sync "0.0.4"
findup-sync "^0.4.3"
fs-extra "^2.0.0"
findup-sync "^1.0.0"
fs-extra "^3.0.0"
fs-promise "^2.0.0"
lodash "^4.0.0"
mkdirp "^0.5.1"
rsvp "^3.1.0"
semver "^5.3.0"
symlink-or-copy "^1.1.3"
temp "^0.8.3"

Expand Down Expand Up @@ -2089,13 +2090,13 @@ [email protected]:
chalk "^1.0.0"
ember-cli-babel "^5.0.0"

ember-cli-dependency-checker@^1.3.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-1.4.0.tgz#2b13f977e1eea843fc1a21a001be6ca5d4ef1942"
ember-cli-dependency-checker@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-2.0.0.tgz#f2f2ff144acce7447cde7e0a8666dbfe5029a355"
dependencies:
chalk "^0.5.1"
is-git-url "^0.2.0"
semver "^4.1.0"
chalk "^1.1.3"
is-git-url "^1.0.0"
semver "^5.3.0"

[email protected]:
version "1.0.2"
Expand Down Expand Up @@ -2139,15 +2140,14 @@ ember-cli-htmlbars-inline-precompile@^0.4.0:
ember-cli-version-checker "^1.2.0"
hash-for-dep "^1.0.2"

ember-cli-htmlbars@^1.1.1:
version "1.3.0"
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.3.0.tgz#e090f011239153bf45dab29625f94a46fce205af"
ember-cli-htmlbars@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-2.0.1.tgz#e1e333c7ef4cc546c67734996541fd94ca4423ca"
dependencies:
broccoli-persistent-filter "^1.0.3"
ember-cli-version-checker "^1.0.2"
hash-for-dep "^1.0.2"
json-stable-stringify "^1.0.0"
strip-bom "^2.0.0"
strip-bom "^3.0.0"

ember-cli-inject-live-reload@^1.4.1:
version "1.6.1"
Expand Down Expand Up @@ -2411,16 +2411,16 @@ ember-load-initializers@^1.0.0:
dependencies:
ember-cli-babel "^6.0.0-beta.7"

ember-native-dom-helpers@0.3.12:
version "0.3.12"
resolved "https://registry.yarnpkg.com/ember-native-dom-helpers/-/ember-native-dom-helpers-0.3.12.tgz#034cb273056ac94914e7081925175357e4c37a81"
ember-native-dom-helpers@0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/ember-native-dom-helpers/-/ember-native-dom-helpers-0.4.0.tgz#dd0a706542204adc7c3b3a5fc4fff47339c280cb"
dependencies:
broccoli-funnel "^1.1.0"
ember-cli-babel "^6.0.0-beta.9"

[email protected].10:
version "1.2.10"
resolved "https://registry.yarnpkg.com/ember-percy/-/ember-percy-1.2.10.tgz#4a6218f48913d226812a03f3e5fb8f45982af386"
[email protected].11:
version "1.2.11"
resolved "https://registry.yarnpkg.com/ember-percy/-/ember-percy-1.2.11.tgz#054a2763805867ca36815c512d729e8b575b4748"
dependencies:
body-parser "^1.15.0"
ember-cli-babel "^5.1.7"
Expand Down Expand Up @@ -2982,6 +2982,15 @@ findup-sync@^0.4.2, findup-sync@^0.4.3:
micromatch "^2.3.7"
resolve-dir "^0.1.0"

findup-sync@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-1.0.0.tgz#6f7e4b57b6ee3a4037b4414eaedea3f58f71e0ec"
dependencies:
detect-file "^0.1.0"
is-glob "^2.0.1"
micromatch "^2.3.7"
resolve-dir "^0.1.0"

fireworm@^0.7.0:
version "0.7.1"
resolved "https://registry.yarnpkg.com/fireworm/-/fireworm-0.7.1.tgz#ccf20f7941f108883fcddb99383dbe6e1861c758"
Expand Down Expand Up @@ -3083,6 +3092,14 @@ fs-extra@^1.0.0:
jsonfile "^2.1.0"
klaw "^1.0.0"

fs-extra@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
dependencies:
graceful-fs "^4.1.2"
jsonfile "^3.0.0"
universalify "^0.1.0"

fs-promise@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-2.0.2.tgz#cfea45c80f46480a3fd176213fa22abc8c159521"
Expand Down Expand Up @@ -3606,6 +3623,10 @@ is-git-url@^0.2.0:
version "0.2.3"
resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-0.2.3.tgz#445200d6fbd6da028fb5e01440d9afc93f3ccb64"

is-git-url@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"

is-glob@^2.0.0, is-glob@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
Expand Down Expand Up @@ -3812,6 +3833,12 @@ jsonfile@^2.1.0:
optionalDependencies:
graceful-fs "^4.1.6"

jsonfile@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.0.tgz#92e7c7444e5ffd5fa32e6a9ae8b85034df8347d0"
optionalDependencies:
graceful-fs "^4.1.6"

jsonify@~0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
Expand Down Expand Up @@ -5268,7 +5295,7 @@ scss-tokenizer@^0.2.1:
version "5.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"

semver@^4.1.0, semver@^4.3.1, semver@^4.3.6:
semver@^4.3.1, semver@^4.3.6:
version "4.3.6"
resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"

Expand Down Expand Up @@ -5899,6 +5926,10 @@ unique-string@^1.0.0:
dependencies:
crypto-random-string "^1.0.0"

universalify@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.0.tgz#9eb1c4651debcc670cc94f1a75762332bb967778"

[email protected], unpipe@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
Expand Down

0 comments on commit 40455fd

Please sign in to comment.