diff --git a/.gitignore b/.gitignore index 8e0bd576..b5ae8fc8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ docker-compose.override.yml # Build directories for typescript and webpack dist -public # Built by webpack src/views/partials/webpack.hbs diff --git a/src/server.ts b/src/server.ts index 79ace7a5..1ffded27 100644 --- a/src/server.ts +++ b/src/server.ts @@ -17,7 +17,6 @@ import { Config } from './config'; import { router } from './routes'; import * as webpackConfig from '../webpack.config'; -import { exit } from 'process'; const compiler = webpack(webpackConfig); const isDeveloping = process.env.NODE_ENV !== 'production'; diff --git a/webpack.config.ts b/webpack.config.ts index 2a916771..a83ad623 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -10,7 +10,7 @@ import FaviconsWebpackPlugin = require('favicons-webpack-plugin'); import { Config } from './src/config'; const srcDir = resolve(__dirname, 'src'); -const publicDir = resolve(__dirname, 'public'); +const publicDir = resolve(__dirname, 'dist/public'); const jsDir = join(srcDir, 'scripts'); const assetsDir = join(srcDir, 'assets'); const imagesDir = join(assetsDir, 'images');