diff --git a/{{cookiecutter.project_slug}}/webpack/common.config.js b/{{cookiecutter.project_slug}}/webpack/common.config.js index cec060c8c..41efb1c77 100644 --- a/{{cookiecutter.project_slug}}/webpack/common.config.js +++ b/{{cookiecutter.project_slug}}/webpack/common.config.js @@ -13,7 +13,7 @@ module.exports = { path: path.resolve(__dirname, '../{{cookiecutter.project_slug}}/static/webpack_bundles/'), publicPath: '/static/webpack_bundles/', filename: 'js/[name]-[fullhash].js', - chunkFilename: 'js/[name]-[hash].js' + chunkFilename: 'js/[name]-[hash].js', }, plugins: [ new BundleTracker({filename: path.resolve(__dirname, '../webpack-stats.json')}), @@ -45,11 +45,11 @@ module.exports = { }, 'sass-loader', ], - } + }, ], }, resolve: { modules: ['node_modules'], - extensions: ['.js', '.jsx'] + extensions: ['.js', '.jsx'], }, -} +}; diff --git a/{{cookiecutter.project_slug}}/webpack/dev.config.js b/{{cookiecutter.project_slug}}/webpack/dev.config.js index 43b991d7c..c2f14abb1 100644 --- a/{{cookiecutter.project_slug}}/webpack/dev.config.js +++ b/{{cookiecutter.project_slug}}/webpack/dev.config.js @@ -17,4 +17,4 @@ module.exports = merge(commonConfig, { hot: false, liveReload: true, }, -}) +}); diff --git a/{{cookiecutter.project_slug}}/webpack/prod.config.js b/{{cookiecutter.project_slug}}/webpack/prod.config.js index 9bb148eec..1d48ab1a4 100644 --- a/{{cookiecutter.project_slug}}/webpack/prod.config.js +++ b/{{cookiecutter.project_slug}}/webpack/prod.config.js @@ -1,8 +1,24 @@ const { merge } = require('webpack-merge'); const commonConfig = require('./common.config'); +// This variable should mirror the one from config/settings/production.py +{%- if cookiecutter.use_whitenoise == 'n' and cookiecutter.cloud_provider == 'AWS' %} +const s3BucketName = process.env.DJANGO_AWS_STORAGE_BUCKET_NAME; +const awsS3Domain = process.env.DJANGO_AWS_S3_CUSTOM_DOMAIN ? + process.env.DJANGO_AWS_S3_CUSTOM_DOMAIN + : `${s3BucketName}.s3.amazonaws.com`; +const staticUrl = `https://${awsS3Domain}/static/`; +{%- elif cookiecutter.use_whitenoise == 'n' and cookiecutter.cloud_provider == 'GCP' %} +const staticUrl = `https://storage.googleapis.com/${process.env.DJANGO_GCP_STORAGE_BUCKET_NAME}/static/`; +{%- else %} +const staticUrl = '/static/'; +{%- endif %} + module.exports = merge(commonConfig, { mode: 'production', devtool: 'source-map', bail: true, -}) + output: { + publicPath: `${staticUrl}webpack_bundles/`, + }, +});