Improve docker configs and use web.sik.party:8000 as default backend

This commit is contained in:
Jan Tuomi
2018-08-21 20:13:49 +03:00
parent 63d390aaff
commit a0e05a69e9
9 changed files with 29 additions and 31 deletions
+8 -8
View File
@@ -2,11 +2,11 @@
const {resolve} = require("path");
const {CheckerPlugin} = require("awesome-typescript-loader");
const StyleLintPlugin = require("stylelint-webpack-plugin");
const Dotenv = require("dotenv-webpack");
const webpack = require('webpack');
module.exports = function (env, argv) {
const config = {};
config.resolve = {
extensions: [".ts", ".tsx", ".js", ".jsx"]
};
@@ -32,15 +32,15 @@ module.exports = function (env, argv) {
]
});
const envVars = {};
Object.keys(process.env).forEach((key) => {
envVars[`process.env.${key}`] = JSON.stringify(process.env[key]);
});
config.plugins = [
new webpack.DefinePlugin(envVars),
new CheckerPlugin(),
new StyleLintPlugin(),
new Dotenv({
path: "./.env.sample"
}),
new Dotenv({
path: "./.env"
}),
];
config.performance = {
+4 -19
View File
@@ -3,6 +3,7 @@ const merge = require("webpack-merge");
const webpack = require("webpack");
const FaviconsWebpackPlugin = require("favicons-webpack-plugin");
const HtmlWebpackPlugin = require("html-webpack-plugin");
const Dotenv = require("dotenv-webpack");
const commonConfig = require("./common.js");
@@ -24,28 +25,12 @@ module.exports = function (env, argv) {
'.sik.party',
'.sahkoinsinoorikilta.fi',
],
proxy: {
'/api': {
target: 'http://localhost:8000',
secure: false,
},
},
// clientLogLevel: 'none',
// https: settings.dev_server.https,
// host: settings.dev_server.host,
// port: settings.dev_server.port,
// contentBase: output.path,
// public: settings.dev_server.public,
// publicPath: output.publicPath,
// compress: true,
// headers: { 'Access-Control-Allow-Origin': '*' },
// historyApiFallback: true,
// watchOptions: {
// ignored: /node_modules/
// }
};
base.devtool = "cheap-module-eval-source-map";
base.plugins = base.plugins.concat([
new Dotenv({
path: "./.env"
}),
new FaviconsWebpackPlugin({
logo: "./assets/img/favicon.png",
prefix: "assets/icons/",
-1
View File
@@ -8,7 +8,6 @@ const nodeExternals = require('webpack-node-externals');
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const HtmlWebpackPlugin = require("html-webpack-plugin");
const WebpackCdnPlugin = require('webpack-cdn-plugin');
const webpack = require('webpack');
/* NOTE: This is a list of all routes that are prerendered for production use.
Please list all routes that contain search engine accessible content, i.e.,