From 503f94199f7fc730da4a1a1165c2863956d10000 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Sun, 10 Dec 2017 00:22:36 +0100 Subject: Setup react-redux env --- webpack.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webpack.config.js') diff --git a/webpack.config.js b/webpack.config.js index 8b713a6..f7e74da 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,7 +1,7 @@ const path = require('path'); module.exports = { - entry: './src/client/javascript/main.js', + entry: './src/client/react/index.js', output: { path: path.resolve(__dirname, 'src/client/static'), filename: 'bundle.js' @@ -12,7 +12,7 @@ module.exports = { test: [/\.js$/], exclude: [/node_modules/], loader: 'babel-loader', - options: { presets: ['es2015'] } + options: { presets: ['es2015', 'react'] } } ] } -- cgit v1.1 From 4ce420528dd747021f7fa51483710388f5733724 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Sun, 10 Dec 2017 01:01:36 +0100 Subject: Add Search container --- webpack.config.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'webpack.config.js') diff --git a/webpack.config.js b/webpack.config.js index f7e74da..baba614 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -4,7 +4,7 @@ module.exports = { entry: './src/client/react/index.js', output: { path: path.resolve(__dirname, 'src/client/static'), - filename: 'bundle.js' + filename: 'bundle.js', }, module: { rules: [ @@ -12,8 +12,8 @@ module.exports = { test: [/\.js$/], exclude: [/node_modules/], loader: 'babel-loader', - options: { presets: ['es2015', 'react'] } - } - ] - } -} \ No newline at end of file + options: { presets: ['es2015', 'react', 'stage-2'] }, + }, + ], + }, +}; -- cgit v1.1 From 7bd3b6766536e33146bb55506c79619a1ab7d3b3 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Sun, 10 Dec 2017 11:10:05 +0100 Subject: Move reducers and actions into seperate folders --- webpack.config.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'webpack.config.js') diff --git a/webpack.config.js b/webpack.config.js index baba614..482f8db 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,7 +1,7 @@ const path = require('path'); module.exports = { - entry: './src/client/react/index.js', + entry: './src/client/react/index.jsx', output: { path: path.resolve(__dirname, 'src/client/static'), filename: 'bundle.js', @@ -9,11 +9,14 @@ module.exports = { module: { rules: [ { - test: [/\.js$/], + test: [/\.js$/, /\.jsx$/], exclude: [/node_modules/], loader: 'babel-loader', options: { presets: ['es2015', 'react', 'stage-2'] }, }, ], }, + resolve: { + extensions: ['.js', '.jsx'], + } }; -- cgit v1.1 From edaa91d05e753e3609c00068f565b88c4ef77e62 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Sun, 10 Dec 2017 11:37:32 +0100 Subject: Compile scss to css --- webpack.config.js | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'webpack.config.js') diff --git a/webpack.config.js b/webpack.config.js index 482f8db..6db6543 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,6 +1,7 @@ const path = require('path'); +const ExtractTextPlugin = require('extract-text-webpack-plugin'); -module.exports = { +const js = { entry: './src/client/react/index.jsx', output: { path: path.resolve(__dirname, 'src/client/static'), @@ -18,5 +19,27 @@ module.exports = { }, resolve: { extensions: ['.js', '.jsx'], - } + }, +}; + +const style = { + entry: './src/client/style/index.scss', + output: { + path: path.resolve(__dirname, 'src/client/static'), + filename: 'bundle.css', + }, + module: { + rules: [ + { + test: [/\.scss$/], + exclude: [/node_modules/], + loader: ExtractTextPlugin.extract(['css-loader', 'sass-loader']), + }, + ], + }, + plugins: [ + new ExtractTextPlugin('bundle.css'), + ], }; + +module.exports = [js, style]; -- cgit v1.1 From 569b2969d530f08e55798c5cb3079948c7c037cd Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 14 Dec 2017 18:54:00 +0100 Subject: Use .js extention instead of .jsx --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webpack.config.js') diff --git a/webpack.config.js b/webpack.config.js index 6db6543..061f0d1 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -2,7 +2,7 @@ const path = require('path'); const ExtractTextPlugin = require('extract-text-webpack-plugin'); const js = { - entry: './src/client/react/index.jsx', + entry: './src/client/react/index.js', output: { path: path.resolve(__dirname, 'src/client/static'), filename: 'bundle.js', -- cgit v1.1 From f0c8cf0e79f003514fd65a70def5820205955a77 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 21 Dec 2017 12:06:41 +0100 Subject: Move to typescript --- webpack.config.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'webpack.config.js') diff --git a/webpack.config.js b/webpack.config.js index 061f0d1..357bfd1 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -2,23 +2,25 @@ const path = require('path'); const ExtractTextPlugin = require('extract-text-webpack-plugin'); const js = { - entry: './src/client/react/index.js', + entry: './src/client/react/index.tsx', output: { path: path.resolve(__dirname, 'src/client/static'), filename: 'bundle.js', }, + devtool: 'source-map', module: { rules: [ { - test: [/\.js$/, /\.jsx$/], - exclude: [/node_modules/], - loader: 'babel-loader', - options: { presets: ['es2015', 'react', 'stage-2'] }, + test: [/\.tsx?$/], + loader: 'awesome-typescript-loader', }, + // exclude: [/node_modules/], + // loader: 'babel-loader', + // options: { presets: ['es2015', 'react', 'stage-2'] }, ], }, resolve: { - extensions: ['.js', '.jsx'], + extensions: ['.js', '.ts', '.tsx'], }, }; -- cgit v1.1 From 77dccd31b32ee0a9a53b2186bae231069c5ab152 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Sat, 6 Jan 2018 12:11:19 +0100 Subject: Revert "Move to typescript" This reverts commit f0c8cf0e79f003514fd65a70def5820205955a77. --- webpack.config.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'webpack.config.js') diff --git a/webpack.config.js b/webpack.config.js index 357bfd1..061f0d1 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -2,25 +2,23 @@ const path = require('path'); const ExtractTextPlugin = require('extract-text-webpack-plugin'); const js = { - entry: './src/client/react/index.tsx', + entry: './src/client/react/index.js', output: { path: path.resolve(__dirname, 'src/client/static'), filename: 'bundle.js', }, - devtool: 'source-map', module: { rules: [ { - test: [/\.tsx?$/], - loader: 'awesome-typescript-loader', + test: [/\.js$/, /\.jsx$/], + exclude: [/node_modules/], + loader: 'babel-loader', + options: { presets: ['es2015', 'react', 'stage-2'] }, }, - // exclude: [/node_modules/], - // loader: 'babel-loader', - // options: { presets: ['es2015', 'react', 'stage-2'] }, ], }, resolve: { - extensions: ['.js', '.ts', '.tsx'], + extensions: ['.js', '.jsx'], }, }; -- cgit v1.1 From 19534b4770b4f4097b02f5fa021a24822b12d907 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Fri, 26 Jan 2018 20:30:34 +0100 Subject: Add week selector --- webpack.config.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'webpack.config.js') diff --git a/webpack.config.js b/webpack.config.js index 061f0d1..cf63880 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,3 +1,4 @@ +const webpack = require('webpack'); const path = require('path'); const ExtractTextPlugin = require('extract-text-webpack-plugin'); @@ -20,6 +21,9 @@ const js = { resolve: { extensions: ['.js', '.jsx'], }, + plugins: [ + new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /nl/), + ], }; const style = { -- cgit v1.1