Skip to content

Commit 509df7c

Browse files
committed
Lock down ember-cli-sass version
Works around adopted-ember-addons/ember-cli-sass#180, which is causing test failures with node 4.
1 parent 079bdfc commit 509df7c

File tree

2 files changed

+107
-17
lines changed

2 files changed

+107
-17
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"ember-cli-babel": "^6.8.2",
2929
"ember-cli-clipboard": "^0.8.0",
3030
"ember-cli-htmlbars": "^2.0.3",
31-
"ember-cli-sass": "^7.0.0",
31+
"ember-cli-sass": "^7.0.0 <7.1.4",
3232
"ember-code-snippet": "^2.0.0",
3333
"ember-component-css": "^0.3.5",
3434
"ember-data": "^2.0.0",

yarn.lock

Lines changed: 106 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,14 +1560,14 @@ broccoli-rollup@^1.2.0:
15601560
symlink-or-copy "^1.1.8"
15611561
walk-sync "^0.3.1"
15621562

1563-
broccoli-sass-source-maps@^2.0.0:
1564-
version "2.0.0"
1565-
resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.0.0.tgz#7f25f9f4b296918cec6e00672c63e75abce33d45"
1563+
broccoli-sass-source-maps@^2.1.0:
1564+
version "2.2.0"
1565+
resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.2.0.tgz#1f1a0794136152b096188638b59b42b17a4bdc68"
15661566
dependencies:
15671567
broccoli-caching-writer "^3.0.3"
15681568
include-path-searcher "^0.1.0"
15691569
mkdirp "^0.3.5"
1570-
node-sass "^4.1.0"
1570+
node-sass "^4.7.2"
15711571
object-assign "^2.0.0"
15721572
rsvp "^3.0.6"
15731573

@@ -1772,6 +1772,10 @@ cardinal@^1.0.0:
17721772
ansicolors "~0.2.1"
17731773
redeyed "~1.0.0"
17741774

1775+
caseless@~0.11.0:
1776+
version "0.11.0"
1777+
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
1778+
17751779
caseless@~0.12.0:
17761780
version "0.12.0"
17771781
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -2010,6 +2014,10 @@ commander@^2.6.0:
20102014
dependencies:
20112015
graceful-readlink ">= 1.0.0"
20122016

2017+
commander@^2.9.0:
2018+
version "2.13.0"
2019+
resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
2020+
20132021
commoner@~0.10.3:
20142022
version "0.10.8"
20152023
resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5"
@@ -2717,13 +2725,13 @@ ember-cli-qunit@^4.0.1:
27172725
resolve "^1.4.0"
27182726
silent-error "^1.1.0"
27192727

2720-
ember-cli-sass@^7.0.0:
2721-
version "7.0.0"
2722-
resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-7.0.0.tgz#24bdf6e6c13610c57cbddb1f077715588aedcf13"
2728+
"ember-cli-sass@^7.0.0 <7.1.4":
2729+
version "7.1.3"
2730+
resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-7.1.3.tgz#d4a418d68bb513c40270b88576bd2cf07301fdf2"
27232731
dependencies:
27242732
broccoli-funnel "^1.0.0"
27252733
broccoli-merge-trees "^1.1.0"
2726-
broccoli-sass-source-maps "^2.0.0"
2734+
broccoli-sass-source-maps "^2.1.0"
27272735
ember-cli-version-checker "^1.0.2"
27282736

27292737
ember-cli-shims@^1.1.0:
@@ -3851,6 +3859,16 @@ gaze@^1.0.0:
38513859
dependencies:
38523860
globule "^1.0.0"
38533861

3862+
generate-function@^2.0.0:
3863+
version "2.0.0"
3864+
resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
3865+
3866+
generate-object-property@^1.1.0:
3867+
version "1.2.0"
3868+
resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
3869+
dependencies:
3870+
is-property "^1.0.0"
3871+
38543872
get-caller-file@^1.0.0, get-caller-file@^1.0.1:
38553873
version "1.0.2"
38563874
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -3926,6 +3944,16 @@ glob@^5.0.10, glob@^5.0.15:
39263944
once "^1.3.0"
39273945
path-is-absolute "^1.0.0"
39283946

3947+
glob@^6.0.4:
3948+
version "6.0.4"
3949+
resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
3950+
dependencies:
3951+
inflight "^1.0.4"
3952+
inherits "2"
3953+
minimatch "2 || 3"
3954+
once "^1.3.0"
3955+
path-is-absolute "^1.0.0"
3956+
39293957
glob@^7.0.0, glob@^7.1.2, glob@~7.1.1:
39303958
version "7.1.2"
39313959
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -4012,6 +4040,15 @@ har-schema@^1.0.5:
40124040
version "1.0.5"
40134041
resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
40144042

4043+
har-validator@~2.0.6:
4044+
version "2.0.6"
4045+
resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
4046+
dependencies:
4047+
chalk "^1.1.1"
4048+
commander "^2.9.0"
4049+
is-my-json-valid "^2.12.4"
4050+
pinkie-promise "^2.0.0"
4051+
40154052
har-validator@~4.2.1:
40164053
version "4.2.1"
40174054
resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
@@ -4383,6 +4420,15 @@ is-integer@^1.0.4:
43834420
dependencies:
43844421
is-finite "^1.0.0"
43854422

4423+
is-my-json-valid@^2.12.4:
4424+
version "2.17.1"
4425+
resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz#3da98914a70a22f0a8563ef1511a246c6fc55471"
4426+
dependencies:
4427+
generate-function "^2.0.0"
4428+
generate-object-property "^1.1.0"
4429+
jsonpointer "^4.0.0"
4430+
xtend "^4.0.0"
4431+
43864432
is-number@^2.1.0:
43874433
version "2.1.0"
43884434
resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -4427,6 +4473,10 @@ is-promise@^2.1.0:
44274473
version "2.1.0"
44284474
resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
44294475

4476+
is-property@^1.0.0:
4477+
version "1.0.2"
4478+
resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
4479+
44304480
is-resolvable@^1.0.0:
44314481
version "1.0.0"
44324482
resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62"
@@ -4616,6 +4666,10 @@ jsonify@~0.0.0:
46164666
version "0.0.0"
46174667
resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
46184668

4669+
jsonpointer@^4.0.0:
4670+
version "4.0.1"
4671+
resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
4672+
46194673
jsprim@^1.2.2:
46204674
version "1.4.0"
46214675
resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
@@ -5321,9 +5375,9 @@ node-pre-gyp@^0.6.36:
53215375
tar "^2.2.1"
53225376
tar-pack "^3.4.0"
53235377

5324-
node-sass@^4.1.0:
5325-
version "4.5.3"
5326-
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.5.3.tgz#d09c9d1179641239d1b97ffc6231fdcec53e1568"
5378+
node-sass@^4.7.2:
5379+
version "4.7.2"
5380+
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.7.2.tgz#9366778ba1469eb01438a9e8592f4262bcb6794e"
53275381
dependencies:
53285382
async-foreach "^0.1.3"
53295383
chalk "^1.1.1"
@@ -5340,9 +5394,10 @@ node-sass@^4.1.0:
53405394
nan "^2.3.2"
53415395
node-gyp "^3.3.1"
53425396
npmlog "^4.0.0"
5343-
request "^2.79.0"
5344-
sass-graph "^2.1.1"
5397+
request "~2.79.0"
5398+
sass-graph "^2.2.4"
53455399
stdout-stream "^1.4.0"
5400+
"true-case-path" "^1.0.2"
53465401

53475402
node-uuid@~1.4.0:
53485403
version "1.4.8"
@@ -5788,6 +5843,10 @@ qs@~1.0.0:
57885843
version "1.0.2"
57895844
resolved "https://registry.yarnpkg.com/qs/-/qs-1.0.2.tgz#50a93e2b5af6691c31bcea5dae78ee6ea1903768"
57905845

5846+
qs@~6.3.0:
5847+
version "6.3.2"
5848+
resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
5849+
57915850
quick-temp@^0.1.0, quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
57925851
version "0.1.8"
57935852
resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408"
@@ -6014,7 +6073,7 @@ repeating@^2.0.0:
60146073
dependencies:
60156074
is-finite "^1.0.0"
60166075

6017-
request@2, request@^2.55.0, request@^2.79.0, request@^2.81.0:
6076+
request@2, request@^2.55.0, request@^2.81.0:
60186077
version "2.81.0"
60196078
resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
60206079
dependencies:
@@ -6060,6 +6119,31 @@ request@~2.40.0:
60606119
tough-cookie ">=0.12.0"
60616120
tunnel-agent "~0.4.0"
60626121

6122+
request@~2.79.0:
6123+
version "2.79.0"
6124+
resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
6125+
dependencies:
6126+
aws-sign2 "~0.6.0"
6127+
aws4 "^1.2.1"
6128+
caseless "~0.11.0"
6129+
combined-stream "~1.0.5"
6130+
extend "~3.0.0"
6131+
forever-agent "~0.6.1"
6132+
form-data "~2.1.1"
6133+
har-validator "~2.0.6"
6134+
hawk "~3.1.3"
6135+
http-signature "~1.1.0"
6136+
is-typedarray "~1.0.0"
6137+
isstream "~0.1.2"
6138+
json-stringify-safe "~5.0.1"
6139+
mime-types "~2.1.7"
6140+
oauth-sign "~0.8.1"
6141+
qs "~6.3.0"
6142+
stringstream "~0.0.4"
6143+
tough-cookie "~2.3.0"
6144+
tunnel-agent "~0.4.1"
6145+
uuid "^3.0.0"
6146+
60636147
require-directory@^2.1.1:
60646148
version "2.1.1"
60656149
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -6198,7 +6282,7 @@ sane@^1.1.1, sane@^1.6.0:
61986282
walker "~1.0.5"
61996283
watch "~0.10.0"
62006284

6201-
sass-graph@^2.1.1:
6285+
sass-graph@^2.2.4:
62026286
version "2.2.4"
62036287
resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
62046288
dependencies:
@@ -6808,6 +6892,12 @@ trim-right@^1.0.0, trim-right@^1.0.1:
68086892
version "1.0.1"
68096893
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
68106894

6895+
"true-case-path@^1.0.2":
6896+
version "1.0.2"
6897+
resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62"
6898+
dependencies:
6899+
glob "^6.0.4"
6900+
68116901
try-resolve@^1.0.0:
68126902
version "1.0.1"
68136903
resolved "https://registry.yarnpkg.com/try-resolve/-/try-resolve-1.0.1.tgz#cfde6fabd72d63e5797cfaab873abbe8e700e912"
@@ -6826,7 +6916,7 @@ tunnel-agent@^0.6.0:
68266916
dependencies:
68276917
safe-buffer "^5.0.1"
68286918

6829-
tunnel-agent@~0.4.0:
6919+
tunnel-agent@~0.4.0, tunnel-agent@~0.4.1:
68306920
version "0.4.3"
68316921
resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
68326922

0 commit comments

Comments
 (0)