tabshift/payload
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implements an easier pattern of pointing to files within config

Browse Source
This commit is contained in:
James
2020-09-19 19:31:04 -04:00
parent 20bf4680db
commit 939a2923d3
17 changed files with 248 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/webpack/getWebpackDevConfig.js
View File

@@ -121,7 +121,9 @@ module.exports = (config) => {
},
plugins: [
new HtmlWebpackPlugin({
template: config.admin && config.admin.indexHTML ? config.admin.indexHTML : path.resolve(__dirname, '../client/index.html'),
template: config.admin && config.admin.indexHTML
? path.join(config.paths.configDir, config.admin.indexHTML)
: path.resolve(__dirname, '../client/index.html'),
filename: './index.html',
}),
new webpack.HotModuleReplacementPlugin(),
@@ -139,7 +141,7 @@ module.exports = (config) => {
}
if (config.paths.scss) {
webpackConfig.resolve.alias['payload-scss-overrides'] = config.paths.scss;
webpackConfig.resolve.alias['payload-scss-overrides'] = path.join(config.paths.configDir, config.paths.scss);
} else {
webpackConfig.resolve.alias['payload-scss-overrides'] = path.resolve(__dirname, '../client/scss/overrides.scss');
}