From ffbb76a429b2969c849d9cb1a4b17ed60ac3180d Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Wed, 2 May 2018 09:09:41 -0500 Subject: [PATCH] Ember cli sass update (#4496) * update ember-cli-sass * update :not syntax to not use strings --- ui/app/styles/components/confirm.scss | 2 +- ui/app/styles/components/list-pagination.scss | 2 +- ui/package.json | 2 +- ui/yarn.lock | 73 +++++++++++-------- 4 files changed, 44 insertions(+), 35 deletions(-) diff --git a/ui/app/styles/components/confirm.scss b/ui/app/styles/components/confirm.scss index d18a91f585..105dc5d115 100644 --- a/ui/app/styles/components/confirm.scss +++ b/ui/app/styles/components/confirm.scss @@ -8,7 +8,7 @@ margin-left: $size-8; } - .confirm-action-text:not('.is-block') { + .confirm-action-text:not(.is-block) { text-align: right; @include until($tablet) { diff --git a/ui/app/styles/components/list-pagination.scss b/ui/app/styles/components/list-pagination.scss index c012d7e413..7051b672cf 100644 --- a/ui/app/styles/components/list-pagination.scss +++ b/ui/app/styles/components/list-pagination.scss @@ -14,7 +14,7 @@ a.pagination-link { width: 3ch; } - a:not('.is-current'):hover { + a:not(.is-current):hover { text-decoration: underline; color: $blue; } diff --git a/ui/package.json b/ui/package.json index 09c6fe3ffd..1f46d6e9df 100644 --- a/ui/package.json +++ b/ui/package.json @@ -60,7 +60,7 @@ "ember-cli-page-object": "1.14", "ember-cli-pretender": "0.7.0", "ember-cli-qunit": "^4.0.0", - "ember-cli-sass": "6.0.0", + "ember-cli-sass": "^7.1.7", "ember-cli-shims": "^1.1.0", "ember-cli-sri": "meirish/ember-cli-sri#rooturl", "ember-cli-string-helpers": "^1.5.0", diff --git a/ui/yarn.lock b/ui/yarn.lock index 15033c0bec..300d222a47 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -1217,7 +1217,7 @@ broccoli-autoprefixer@^5.0.0: broccoli-persistent-filter "^1.1.6" postcss "^6.0.1" -broccoli-babel-transpiler@^5.5.0, broccoli-babel-transpiler@^5.6.0, broccoli-babel-transpiler@^5.6.2: +broccoli-babel-transpiler@^5.5.0, broccoli-babel-transpiler@^5.6.2: version "5.7.1" resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-5.7.1.tgz#e10d831faed1c57e37272e4223748ba71a7926d1" dependencies: @@ -1558,14 +1558,14 @@ broccoli-replace@^0.12.0: broccoli-persistent-filter "^1.2.0" minimatch "^3.0.0" -broccoli-sass-source-maps@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.0.0.tgz#7f25f9f4b296918cec6e00672c63e75abce33d45" +broccoli-sass-source-maps@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.2.0.tgz#1f1a0794136152b096188638b59b42b17a4bdc68" dependencies: broccoli-caching-writer "^3.0.3" include-path-searcher "^0.1.0" mkdirp "^0.3.5" - node-sass "^4.1.0" + node-sass "^4.7.2" object-assign "^2.0.0" rsvp "^3.0.6" @@ -2544,16 +2544,6 @@ ember-cli-autoprefixer@^0.8.1: broccoli-autoprefixer "^5.0.0" lodash "^4.0.0" -ember-cli-babel@5.1.10: - version "5.1.10" - resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.1.10.tgz#d403f178aab602e1337c403c5a58c0200a8969aa" - dependencies: - broccoli-babel-transpiler "^5.6.0" - broccoli-funnel "^1.0.0" - clone "^1.0.2" - ember-cli-version-checker "^1.0.2" - resolve "^1.1.2" - ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, 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" @@ -2869,16 +2859,14 @@ ember-cli-qunit@^4.0.0: resolve "^1.1.6" silent-error "^1.0.0" -ember-cli-sass@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-6.0.0.tgz#31c9c8fa789c0d25aaf8e315431b7a3ec4ba0175" +ember-cli-sass@^7.1.7: + version "7.1.7" + resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-7.1.7.tgz#66899134788ec8d2406a45f5346d4db47a2aa012" dependencies: broccoli-funnel "^1.0.0" broccoli-merge-trees "^1.1.0" - broccoli-sass-source-maps "^2.0.0" - ember-cli-babel "5.1.10" - ember-cli-version-checker "^1.0.2" - merge "^1.2.0" + broccoli-sass-source-maps "^2.1.0" + ember-cli-version-checker "^2.1.0" ember-cli-shims@^1.1.0: version "1.1.0" @@ -4185,6 +4173,16 @@ glob@^5.0.10, glob@^5.0.15: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^6.0.4: + version "6.0.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + glob@^7.0.0, glob@^7.1.2, glob@~7.1.1: version "7.1.2" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" @@ -5448,7 +5446,7 @@ merge-trees@^1.0.1: rimraf "^2.4.3" symlink-or-copy "^1.0.0" -merge@^1.1.3, merge@^1.2.0: +merge@^1.1.3: version "1.2.0" resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da" @@ -5616,7 +5614,11 @@ mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@^2.3.0, nan@^2.3.2: +nan@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" + +nan@^2.3.0: version "2.6.2" resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45" @@ -5709,9 +5711,9 @@ node-rest-client@^1.5.1: debug "~2.2.0" xml2js ">=0.2.4" -node-sass@^4.1.0: - version "4.5.3" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.5.3.tgz#d09c9d1179641239d1b97ffc6231fdcec53e1568" +node-sass@^4.7.2: + version "4.9.0" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.0.tgz#d1b8aa855d98ed684d6848db929a20771cc2ae52" dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -5725,12 +5727,13 @@ node-sass@^4.1.0: lodash.mergewith "^4.6.0" meow "^3.7.0" mkdirp "^0.5.1" - nan "^2.3.2" + nan "^2.10.0" node-gyp "^3.3.1" npmlog "^4.0.0" - request "^2.79.0" - sass-graph "^2.1.1" + request "~2.79.0" + sass-graph "^2.2.4" stdout-stream "^1.4.0" + "true-case-path" "^1.0.2" "nopt@2 || 3", nopt@^3.0.6, nopt@~3.0.6: version "3.0.6" @@ -6564,7 +6567,7 @@ request-progress@~2.0.1: dependencies: throttleit "^1.0.0" -request@2, request@^2.65.0, request@^2.79.0, request@^2.81.0: +request@2, request@^2.65.0, request@^2.81.0: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" dependencies: @@ -6791,7 +6794,7 @@ sane@^1.1.1, sane@^1.6.0: walker "~1.0.5" watch "~0.10.0" -sass-graph@^2.1.1: +sass-graph@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" dependencies: @@ -7462,6 +7465,12 @@ trim@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" +"true-case-path@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62" + dependencies: + glob "^6.0.4" + try-resolve@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/try-resolve/-/try-resolve-1.0.1.tgz#cfde6fabd72d63e5797cfaab873abbe8e700e912"