diff options
| author | jbub <contact@jbub.eu> | 2017-02-12 20:53:59 +0300 |
|---|---|---|
| committer | jbub <contact@jbub.eu> | 2017-02-12 20:53:59 +0300 |
| commit | baf2b66730dd3728a67377bca0a588b3520cb75e (patch) | |
| tree | b06887b331b533280ee8613622581d85ea667fe6 | |
| parent | bf11f50556f27019f235c6bdb32389568b727bce (diff) | |
| parent | 23080ffc321555d1d74852ba317f2557f1a25672 (diff) | |
Merge branch 'master' of github.com:jbub/ghostwriter.
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | webpack.config.js | 2 | ||||
| -rw-r--r-- | yarn.lock | 9 |
3 files changed, 7 insertions, 6 deletions
diff --git a/package.json b/package.json index 20d5fdd..ad42df9 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "css-loader": "^0.26.1", - "extract-text-webpack-plugin": "^v2.0.0-rc.2", + "extract-text-webpack-plugin": "^v2.0.0-rc.3", "node-sass": "^4.5.0", "normalize.css": "^5.0.0", "optimize-css-assets-webpack-plugin": "^1.3.0", diff --git a/webpack.config.js b/webpack.config.js index 5280014..dbf13f3 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -36,7 +36,7 @@ module.exports = { loaders: [ { test: /\.scss$/, - loader: ExtractTextPlugin.extract({ fallbackLoader: 'style-loader', loader: 'css-loader!sass-loader' }) + loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader!sass-loader' }) } ] } @@ -20,7 +20,7 @@ ajv-keywords@^1.1.1: version "1.5.1" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c" -ajv@^4.7.0: +ajv@^4.11.2, ajv@^4.7.0: version "4.11.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.2.tgz#f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6" dependencies: @@ -801,10 +801,11 @@ extglob@^0.3.1: dependencies: is-extglob "^1.0.0" -extract-text-webpack-plugin@^v2.0.0-rc.2: - version "2.0.0-rc.2" - resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.0.0-rc.2.tgz#a1d6963b5699031349e92a832a983cccd2c29edf" +extract-text-webpack-plugin@^v2.0.0-rc.3: + version "2.0.0-rc.3" + resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.0.0-rc.3.tgz#7381aa7869ce26d4b39a7bab71cf09e5a38432b2" dependencies: + ajv "^4.11.2" async "^2.1.2" loader-utils "^0.2.16" webpack-sources "^0.1.0" |