diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-03-20 15:35:18 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-03-20 15:35:18 -0500 |
commit | a019ce900d67df5a612f42274a58faccb7fe8f1e (patch) | |
tree | db9574561bfbd84fa1fce8c49aa77249901a7ca5 | |
parent | 2bdd6b291370424d12d64b97f13f6f4900902ffa (diff) | |
download | gitlab-ce-upgrade-to-webpack-v4.tar.gz |
update karma-webpack dependency and remove yarn check reversionupgrade-to-webpack-v4-karma-fixupgrade-to-webpack-v4
-rw-r--r-- | lib/tasks/yarn.rake | 2 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | yarn.lock | 33 |
3 files changed, 20 insertions, 17 deletions
diff --git a/lib/tasks/yarn.rake b/lib/tasks/yarn.rake index be9dd2fb2a9..2ac88a039e7 100644 --- a/lib/tasks/yarn.rake +++ b/lib/tasks/yarn.rake @@ -18,7 +18,7 @@ namespace :yarn do 'Error: You have unmet dependencies. (`yarn check` command failed)'.color(:red), 'Run `yarn install` to install missing modules.'.color(:green) ) - # abort + abort end end diff --git a/package.json b/package.json index 9802528f854..e0ef16ff17d 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "karma-jasmine": "^1.1.1", "karma-mocha-reporter": "^2.2.5", "karma-sourcemap-loader": "^0.3.7", - "karma-webpack": "2.0.12", + "karma-webpack": "3.0.0", "nodemon": "^1.15.1", "prettier": "1.11.1", "webpack-dev-server": "^3.1.1" diff --git a/yarn.lock b/yarn.lock index 3f5865e1c32..94f04e1f4b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1105,7 +1105,7 @@ babel-register@^6.26.0, babel-register@^6.9.0: mkdirp "^0.5.1" source-map-support "^0.4.15" -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: +babel-runtime@^6.0.0, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" dependencies: @@ -5327,15 +5327,16 @@ karma-sourcemap-loader@^0.3.7: dependencies: graceful-fs "^4.1.2" -karma-webpack@2.0.12: - version "2.0.12" - resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.12.tgz#6cc0a81706dd7b091cfd436e50c28f57f49902e4" +karma-webpack@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-3.0.0.tgz#bf009c5b73c667c11c015717e9e520f581317c44" dependencies: async "^2.0.0" + babel-runtime "^6.0.0" loader-utils "^1.0.0" lodash "^4.0.0" source-map "^0.5.6" - webpack-dev-middleware "^1.12.0" + webpack-dev-middleware "^2.0.6" karma@^2.0.0: version "2.0.0" @@ -5970,7 +5971,7 @@ mime@1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" -mime@^1.3.4, mime@^1.4.1, mime@^1.5.0: +mime@^1.3.4, mime@^1.4.1: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" @@ -8805,10 +8806,6 @@ thunky@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/thunky/-/thunky-0.1.0.tgz#bf30146824e2b6e67b0f2d7a4ac8beb26908684e" -time-stamp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357" - timeago.js@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/timeago.js/-/timeago.js-3.0.2.tgz#32a67e7c0d887ea42ca588d3aae26f77de5e76cc" @@ -9123,6 +9120,10 @@ urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" +url-join@^2.0.2: + version "2.0.5" + resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728" + url-join@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a" @@ -9440,15 +9441,17 @@ webpack-dev-middleware@3.0.1: url-join "^4.0.0" webpack-log "^1.0.1" -webpack-dev-middleware@^1.12.0: - version "1.12.2" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e" +webpack-dev-middleware@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-2.0.6.tgz#a51692801e8310844ef3e3790e1eacfe52326fd4" dependencies: + loud-rejection "^1.6.0" memory-fs "~0.4.1" - mime "^1.5.0" + mime "^2.1.0" path-is-absolute "^1.0.0" range-parser "^1.0.3" - time-stamp "^2.0.0" + url-join "^2.0.2" + webpack-log "^1.0.1" webpack-dev-server@^3.1.1: version "3.1.1" |