From 7c0c7b5541b357e791dbb10dd8dd758bd45055e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Velarde?= Date: Fri, 26 Mar 2021 16:59:12 +0100 Subject: [PATCH] Read config for public statics compilation --- config/public_statics_config.js | 14 ++++++++++++++ webpack/static-pages/webpack.base.config.js | 5 ++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 config/public_statics_config.js diff --git a/config/public_statics_config.js b/config/public_statics_config.js new file mode 100644 index 0000000000..63177c8bb0 --- /dev/null +++ b/config/public_statics_config.js @@ -0,0 +1,14 @@ +/** + * Configuration required for statics pages at frontend assets compilation¡ + * See its use from /webpack/static-pages/ + * + * Note: don't modify its contents unless it's coordinated to work with deployments in different environments + */ + +const CARTO_BUILDER_ASSET_HOST = process.env.CARTO_BUILDER_ASSET_HOST || '//'; +const CARTO_MAPS_API_V2_EXTERNAL_URL = process.env.CARTO_MAPS_API_V2_EXTERNAL_URL || 'http://localhost.lan:8282'; + +module.exports = { + 'CARTO_BUILDER_ASSET_HOST': CARTO_BUILDER_ASSET_HOST, + 'CARTO_MAPS_API_V2_EXTERNAL_URL': CARTO_MAPS_API_V2_EXTERNAL_URL +}; diff --git a/webpack/static-pages/webpack.base.config.js b/webpack/static-pages/webpack.base.config.js index 59edc3d56d..c72402257f 100644 --- a/webpack/static-pages/webpack.base.config.js +++ b/webpack/static-pages/webpack.base.config.js @@ -5,6 +5,7 @@ const webpackFiles = require('../../lib/build/files/webpack_files'); const Package = require('./../../package.json'); const VERSION = Package.version; +const PUBLIC_STATICS_CONFIG = require('../../config/public_statics_config'); module.exports = { entry: Object.assign( @@ -19,7 +20,9 @@ module.exports = { devtool: 'source-map', plugins: [ new webpack.DefinePlugin({ - __ASSETS_VERSION__: `'${VERSION}'` + __ASSETS_VERSION__: `'${VERSION}'`, + __CARTO_BUILDER_ASSET_HOST__: PUBLIC_STATICS_CONFIG.CARTO_BUILDER_ASSET_HOST, + __CARTO_MAPS_API_V2_EXTERNAL_URL__: PUBLIC_STATICS_CONFIG.CARTO_MAPS_API_V2_EXTERNAL_URL }), ...Object.keys(webpackFiles.htmlFiles).map((entryName) => {