From 087435178c547bb930f0a4043e3b7212f56e958a Mon Sep 17 00:00:00 2001 From: LordMathis Date: Sat, 16 Feb 2019 17:56:43 +0100 Subject: [PATCH] CSS is finally working --- src/cmrh.conf.js | 10 ---------- src/server.js | 5 ++++- src/utils/serverRender.js | 6 +----- webpack.config.js | 19 ++++++++++--------- 4 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 src/cmrh.conf.js diff --git a/src/cmrh.conf.js b/src/cmrh.conf.js deleted file mode 100644 index f60158a..0000000 --- a/src/cmrh.conf.js +++ /dev/null @@ -1,10 +0,0 @@ -var sass = require('node-sass'); - -module.exports = { - generateScopedName: '[name]__[local]___[hash:base64:5]', - extensions: ['.scss', '.css'], - preprocessCss: (data, filename) => sass.renderSync({ - data, - file: filename, - }).css -} diff --git a/src/server.js b/src/server.js index b603e79..1cd36f7 100644 --- a/src/server.js +++ b/src/server.js @@ -1,7 +1,6 @@ import express from 'express' import fs from 'fs' import {serverRender} from './utils/serverRender' -import csshook from 'css-modules-require-hook/preset' const port = process.env.PORT || 3000; const app = express() @@ -13,6 +12,10 @@ const app = express() app.use('/static', express.static('public/static')) +app.get('/favicon.ico', (req, res) => { + res.status(404).send('Not Found !!!'); +}) + app.get("*", serverRender); app.listen(port, function(error) { diff --git a/src/utils/serverRender.js b/src/utils/serverRender.js index 8cd45d7..1568b3a 100644 --- a/src/utils/serverRender.js +++ b/src/utils/serverRender.js @@ -4,7 +4,6 @@ import { renderToString } from 'react-dom/server' import { StaticRouter as Router, matchPath } from 'react-router-dom' import { App } from '../components' import routes from './routes' -import manifest from './manifest.json' export function serverRender(req, res, next) { @@ -21,10 +20,6 @@ export function serverRender(req, res, next) { , ); - console.log(req.url) - console.log(markup) - console.log() - res.status(200).send(renderFullPage(markup)); }).catch(next) @@ -42,6 +37,7 @@ function renderFullPage(html) { +
${html}
diff --git a/webpack.config.js b/webpack.config.js index e559524..1f237b5 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -10,10 +10,9 @@ const nodeExternals = require('webpack-node-externals') const browserConfig = { mode: 'production', - context: resolve(__dirname, 'src'), entry: { bundle: [ - './app-client.js' + './src/app-client.js' ] }, output: { @@ -22,7 +21,7 @@ const browserConfig = { // filename: '[name].[contenthash].js', publicPath: '/static/' }, - devtool: "eval-source-map", + // devtool: 'eval-source-map', module: { rules: [ { @@ -35,13 +34,13 @@ const browserConfig = { { test: /\.scss$/, use: [ - //MiniCssExtractPlugin.loader, + MiniCssExtractPlugin.loader, { loader: 'css-loader', options: { modules: true, - importLoaders: 2 - // localIdentName: '[name]__[local]___[hash:base64:5]' + importLoaders: 2, + localIdentName: '[name]__[local]___[hash:base64:5]' } }, { @@ -65,7 +64,7 @@ const browserConfig = { plugins: [ new webpack.DefinePlugin({__isBrowser__: "true"}), new CleanWebpackPlugin(['public/static', 'build'], {}), - //new MiniCssExtractPlugin(), + new MiniCssExtractPlugin(), // new CompressionPlugin({}), new ManifestPlugin(), ] @@ -92,6 +91,7 @@ const serverConfig = { { test: /\.scss$/, use: [ + MiniCssExtractPlugin.loader, { loader: 'css-loader', options: { @@ -102,7 +102,7 @@ const serverConfig = { } }, { - loader: "postcss-loader" + loader: 'postcss-loader' }, { loader: 'sass-loader' @@ -114,7 +114,7 @@ const serverConfig = { exclude: /node_modules/, loader: 'url-loader', options: { - limit: 8192 + limit: 10000 } }, ] @@ -123,6 +123,7 @@ const serverConfig = { new webpack.DefinePlugin({ __isBrowser__: "false" }), + new MiniCssExtractPlugin(), ] }