diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index c91d61a72c2c0a053376515b194dfdb96fe261ec..3381697a7ea097d78e89a35468bf7d5fa5874e8e 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1061,9 +1061,9 @@
"resolved": "https://registry.npmjs.org/color/-/color-0.11.3.tgz"
},
"color-convert": {
- "version": "1.3.1",
+ "version": "1.5.0",
"from": "color-convert@>=1.3.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.3.1.tgz"
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.5.0.tgz"
},
"color-name": {
"version": "1.1.1",
@@ -1076,9 +1076,9 @@
"resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz"
},
"colormin": {
- "version": "1.1.1",
+ "version": "1.1.2",
"from": "colormin@>=1.0.5 <2.0.0",
- "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.1.tgz"
+ "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz"
},
"colors": {
"version": "1.1.2",
@@ -1263,9 +1263,9 @@
"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz"
},
"cssnano": {
- "version": "3.7.3",
+ "version": "3.7.4",
"from": "cssnano@>=2.6.1 <4.0.0",
- "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.7.3.tgz"
+ "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.7.4.tgz"
},
"csso": {
"version": "2.0.0",
@@ -3060,11 +3060,6 @@
"from": "has-gulplog@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz"
},
- "has-own": {
- "version": "1.0.0",
- "from": "has-own@>=1.0.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/has-own/-/has-own-1.0.0.tgz"
- },
"has-unicode": {
"version": "2.0.1",
"from": "has-unicode@>=2.0.0 <3.0.0",
@@ -4069,6 +4064,11 @@
"from": "lodash.escape@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz"
},
+ "lodash.indexof": {
+ "version": "4.0.5",
+ "from": "lodash.indexof@>=4.0.5 <5.0.0",
+ "resolved": "https://registry.npmjs.org/lodash.indexof/-/lodash.indexof-4.0.5.tgz"
+ },
"lodash.isarguments": {
"version": "3.0.9",
"from": "lodash.isarguments@>=3.0.0 <4.0.0",
@@ -4238,6 +4238,11 @@
"from": "map-obj@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
},
+ "math-expression-evaluator": {
+ "version": "1.2.14",
+ "from": "math-expression-evaluator@>=1.2.14 <2.0.0",
+ "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.14.tgz"
+ },
"media-typer": {
"version": "0.3.0",
"from": "media-typer@0.3.0",
@@ -4464,9 +4469,9 @@
"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"
},
"normalize-url": {
- "version": "1.6.0",
+ "version": "1.6.1",
"from": "normalize-url@>=1.4.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.6.0.tgz"
+ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.6.1.tgz"
},
"npmlog": {
"version": "3.1.2",
@@ -4792,9 +4797,9 @@
"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.1.1.tgz"
},
"postcss-calc": {
- "version": "5.3.0",
+ "version": "5.3.1",
"from": "postcss-calc@>=5.2.0 <6.0.0",
- "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.0.tgz"
+ "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz"
},
"postcss-colormin": {
"version": "2.2.0",
@@ -4837,9 +4842,9 @@
"resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.1.tgz"
},
"postcss-merge-idents": {
- "version": "2.1.6",
+ "version": "2.1.7",
"from": "postcss-merge-idents@>=2.1.5 <3.0.0",
- "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.6.tgz"
+ "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz"
},
"postcss-merge-longhand": {
"version": "2.0.1",
@@ -4867,9 +4872,9 @@
"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.3.tgz"
},
"postcss-minify-params": {
- "version": "1.0.4",
+ "version": "1.0.5",
"from": "postcss-minify-params@>=1.0.4 <2.0.0",
- "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.0.4.tgz"
+ "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.0.5.tgz"
},
"postcss-minify-selectors": {
"version": "2.0.5",
@@ -4916,9 +4921,9 @@
}
},
"postcss-modules-values": {
- "version": "1.1.3",
+ "version": "1.2.2",
"from": "postcss-modules-values@>=1.1.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.1.3.tgz"
+ "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz"
},
"postcss-normalize-charset": {
"version": "1.1.0",
@@ -4931,9 +4936,9 @@
"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.7.tgz"
},
"postcss-ordered-values": {
- "version": "2.2.1",
+ "version": "2.2.2",
"from": "postcss-ordered-values@>=2.1.0 <3.0.0",
- "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.1.tgz"
+ "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.2.tgz"
},
"postcss-reduce-idents": {
"version": "2.3.0",
@@ -4956,9 +4961,9 @@
"resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-1.0.7.tgz"
},
"postcss-selector-parser": {
- "version": "2.1.1",
+ "version": "2.2.1",
"from": "postcss-selector-parser@>=2.0.0 <3.0.0",
- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.1.1.tgz"
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.1.tgz"
},
"postcss-svgo": {
"version": "2.1.4",
@@ -5125,9 +5130,9 @@
"resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"
},
"query-string": {
- "version": "4.2.2",
+ "version": "4.2.3",
"from": "query-string@>=4.1.0 <5.0.0",
- "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.2.2.tgz"
+ "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.2.3.tgz"
},
"querystring": {
"version": "0.2.0",
@@ -5341,16 +5346,9 @@
"resolved": "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"
},
"reduce-css-calc": {
- "version": "1.2.4",
- "from": "reduce-css-calc@>=1.2.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.2.4.tgz",
- "dependencies": {
- "balanced-match": {
- "version": "0.1.0",
- "from": "balanced-match@>=0.1.0 <0.2.0",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.1.0.tgz"
- }
- }
+ "version": "1.3.0",
+ "from": "reduce-css-calc@>=1.2.6 <2.0.0",
+ "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz"
},
"reduce-function-call": {
"version": "1.0.1",
@@ -6506,9 +6504,9 @@
"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz"
},
"vendors": {
- "version": "1.0.0",
+ "version": "1.0.1",
"from": "vendors@>=1.0.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.0.tgz"
+ "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz"
},
"verror": {
"version": "1.3.6",
diff --git a/server/server-html.jsx b/server/server-html.jsx
index 641c03a860fe6bfb3bee6b9017b895cf3153ef6a..cb0f455e047920750e7f61d7883e30dea8cdc384 100644
--- a/server/server-html.jsx
+++ b/server/server-html.jsx
@@ -7,7 +7,6 @@ export default function ServerHTML({ body, assets, locale, title, meta }) {
<html lang="en">
<head>
<meta charSet="utf-8" />
- {process.env.NODE_ENV === 'production' && <meta httpEquiv="Content-Security-Policy" content="upgrade-insecure-requests" />}
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
{
meta && meta.map(m => {
diff --git a/webpack/base.config.js b/webpack/base.config.js
index 423f2579b614a11308ac06af345ad8fd13babd5b..a1240d5a65b29c1a17bb773b984377358adb75a5 100644
--- a/webpack/base.config.js
+++ b/webpack/base.config.js
@@ -1,11 +1,7 @@
import path from 'path';
-import webpack from 'webpack';
-
+import ExtractTextPlugin from 'extract-text-webpack-plugin';
import writeStats from './utils/write-stats';
-const scssLoaders = 'style!css!autoprefixer!sass?outputStyle=expanded';
-const cssLoaders = 'style!css!autoprefixer';
-
const Webpack_isomorphic_tools_plugin = require('webpack-isomorphic-tools/plugin');
const webpack_isomorphic_tools_plugin =
new Webpack_isomorphic_tools_plugin(require('./webpack-isotools-config'))
@@ -35,13 +31,21 @@ export default {
{
test: require.resolve("medium-editor-insert-plugin"),
loader: "imports?define=>false"
+ },
+ {
+ test: /\.css$/,
+ loader: 'style!css!autoprefixer'
+ },
+ {
+ test: /\.scss$/,
+ loader: ExtractTextPlugin.extract('style', 'css!autoprefixer!sass?outputStyle=expanded')
}
]
},
plugins: [
- // write webpack stats
function () { this.plugin('done', writeStats); },
- webpack_isomorphic_tools_plugin
+ webpack_isomorphic_tools_plugin,
+ new ExtractTextPlugin('[name]-[chunkhash].css')
],
resolve: {
root: [
@@ -49,9 +53,7 @@ export default {
],
extensions: ['', '.js', '.json', '.jsx'],
modulesDirectories: ['node_modules']
- },
- scssLoaders,
- cssLoaders
+ }
};
/* medium-editor, add to plugins[]
diff --git a/webpack/dev.config.js b/webpack/dev.config.js
index ee397b1071f1b7388b0de92d67dcfb7aa07d5943..d6a51379dfaf5a2d337fb36116067622345732e2 100644
--- a/webpack/dev.config.js
+++ b/webpack/dev.config.js
@@ -1,7 +1,6 @@
import webpack from 'webpack';
import git from 'git-rev-sync';
import { isArray } from 'lodash';
-
import baseConfig from './base.config';
import startKoa from './utils/start-koa';
@@ -41,17 +40,9 @@ export default {
...baseConfig.module,
loaders: [
...baseConfig.module.loaders,
- {test: /\.scss$/, loader: baseConfig.scssLoaders},
- {test: /\.css$/, loader: baseConfig.cssLoaders}
- //{
- // test: /\.(jpe?g|png|gif|svg|woff|woff2|eot|ttf)(\?v=[0-9].[0-9].[0-9])?$/,
- // loader: 'url?name=[sha512:hash:base64:7].[ext]',
- // exclude: /node_modules\/(?!font-awesome)/
- //},
]
},
plugins: [
- // hot reload
new webpack.optimize.OccurenceOrderPlugin(),
new webpack.HotModuleReplacementPlugin(),
new webpack.NoErrorsPlugin(),
diff --git a/webpack/prod.config.js b/webpack/prod.config.js
index 767d15e76655cd93476ee9684727a8b7364a8753..2f78a5f9906e0c987d8b8cb463b126af2f8f63fd 100644
--- a/webpack/prod.config.js
+++ b/webpack/prod.config.js
@@ -1,36 +1,15 @@
import webpack from 'webpack';
import git from 'git-rev-sync';
-import ExtractTextPlugin from 'extract-text-webpack-plugin';
-// import PurifyCSSPlugin from 'bird3-purifycss-webpack-plugin';
-
import baseConfig from './base.config';
-const scssLoaders = ExtractTextPlugin.extract('style', baseConfig.scssLoaders.substr(baseConfig.scssLoaders.indexOf('!')));
-
export default {
...baseConfig,
module: {
loaders: [
- ...baseConfig.module.loaders,
- //{
- // test: /\.(woff|woff2|eot|ttf|svg)(\?v=[0-9].[0-9].[0-9])?$/,
- // loader: 'file?name=[sha512:hash:base64:7].[ext]'
- //},
- //{
- // test: /\.(jpe?g|png|gif|svg)$/,
- // loader: 'file?name=[sha512:hash:base64:7].[ext]!image?optimizationLevel=7&progressive&interlaced'
- //},
- {
- test: /\.s?css$/,
- loader: scssLoaders
- }
+ ...baseConfig.module.loaders
]
},
plugins: [
- // extract css
- new ExtractTextPlugin('[name]-[chunkhash].css'),
-
- // set env
new webpack.DefinePlugin({
'process.env': {
BROWSER: JSON.stringify(true),