From 02f896c12efce87e33af15d0c88b77ad050a7fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Tue, 18 Jul 2017 18:42:45 +0200 Subject: [PATCH] Fix broken CSS reload due to webpack upgrade (#4250) --- package.json | 4 ++-- yarn.lock | 51 +++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index aede6df2e..c90e49db5 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "es6-symbol": "^3.1.1", "escape-html": "^1.0.3", "express": "^4.15.2", - "extract-text-webpack-plugin": "^3.0.0", + "extract-text-webpack-plugin": "^2.1.2", "file-loader": "^0.11.2", "font-awesome": "^4.7.0", "glob": "^7.1.1", @@ -112,7 +112,7 @@ "tiny-queue": "^0.2.1", "uuid": "^3.1.0", "uws": "^8.14.0", - "webpack": "^3.2.0", + "webpack": "^3.0.0", "webpack-bundle-analyzer": "^2.8.2", "webpack-manifest-plugin": "^1.1.2", "webpack-merge": "^4.1.0", diff --git a/yarn.lock b/yarn.lock index defd8599f..dcf09643e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -415,7 +415,7 @@ async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" -async@^2.1.2, async@^2.1.4, async@^2.1.5, async@^2.4.1: +async@^2.1.2, async@^2.1.4, async@^2.1.5: version "2.5.0" resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d" dependencies: @@ -1657,7 +1657,7 @@ cheerio@^0.22.0: lodash.reject "^4.4.0" lodash.some "^4.4.0" -chokidar@^1.4.3, chokidar@^1.6.0: +chokidar@^1.4.3, chokidar@^1.6.0, chokidar@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" dependencies: @@ -2868,12 +2868,12 @@ extglob@^0.3.1: dependencies: is-extglob "^1.0.0" -extract-text-webpack-plugin@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.0.tgz#90caa7907bc449f335005e3ac7532b41b00de612" +extract-text-webpack-plugin@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz#756ef4efa8155c3681833fbc34da53b941746d6c" dependencies: - async "^2.4.1" - loader-utils "^1.1.0" + async "^2.1.2" + loader-utils "^1.0.2" schema-utils "^0.3.0" webpack-sources "^1.0.1" @@ -7328,6 +7328,14 @@ watchpack@^1.3.1: chokidar "^1.4.3" graceful-fs "^4.1.2" +watchpack@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac" + dependencies: + async "^2.1.2" + chokidar "^1.7.0" + graceful-fs "^4.1.2" + wbuf@^1.1.0, wbuf@^1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.2.tgz#d697b99f1f59512df2751be42769c1580b5801fe" @@ -7425,7 +7433,7 @@ webpack-sources@^1.0.1: source-list-map "^2.0.0" source-map "~0.5.3" -"webpack@^2.5.1 || ^3.0.0", webpack@^3.2.0: +"webpack@^2.5.1 || ^3.0.0": version "3.2.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.2.0.tgz#8b0cae0e1a9fd76bfbf0eab61a8c2ada848c312f" dependencies: @@ -7452,6 +7460,33 @@ webpack-sources@^1.0.1: webpack-sources "^1.0.1" yargs "^6.0.0" +webpack@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.3.0.tgz#ce2f9e076566aba91f74887133a883fd7da187bc" + dependencies: + acorn "^5.0.0" + acorn-dynamic-import "^2.0.0" + ajv "^5.1.5" + ajv-keywords "^2.0.0" + async "^2.1.2" + enhanced-resolve "^3.3.0" + escope "^3.6.0" + interpret "^1.0.0" + json-loader "^0.5.4" + json5 "^0.5.1" + loader-runner "^2.3.0" + loader-utils "^1.1.0" + memory-fs "~0.4.1" + mkdirp "~0.5.0" + node-libs-browser "^2.0.0" + source-map "^0.5.3" + supports-color "^3.1.0" + tapable "~0.2.5" + uglifyjs-webpack-plugin "^0.4.6" + watchpack "^1.4.0" + webpack-sources "^1.0.1" + yargs "^6.0.0" + websocket-driver@>=0.5.1: version "0.6.5" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"