Merge pull request #5562 from vuestorefront/purge-loader-dynamic-conf-fix

fix: purgeLoader with dynamicConfigReload

Author: Fifciu

CHANGELOG.md

@@ -38,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Got rid of memory leak related to dynamic config - tomasz-duda (#4768)
 - servercart-after-diff event payload - Fifciu (#5365)
 - Fix Original Price Calculation typo - @akucharczyk / @lukaszjedrasik (#5472)
+- Purge loader works properly with dynamic config reload - @Fifciu
 ### Changed / Improved
 
 - Moved hardcoded fields from omitSelectedVariantFields.ts to config (#4679)

core/build/purge-config.js

@@ -0,0 +1,10 @@
+import omit from 'lodash/omit';
+
+export default config => {
+  const purgeConfig = (config.purgeConfig || []).slice();
+
+  config = omit(config, purgeConfig);
+  delete config['purgeConfig'];
+
+  return config;
+}

core/build/purge-config/purgeConfig.ts

@@ -0,0 +1,11 @@
+import purgeConfig from './purgeConfig';
+
+/**
+ * clear config properties that shouldn't be visible on frontend
+ */
+export default function loader (source) {
+  let config = JSON.parse(source);
+  config = purgeConfig(config);
+
+  return JSON.stringify(config);
+}

core/build/purge-config/purgeConfigLoader.ts

@@ -196,7 +196,7 @@ export default {
       },
       {
         test: /core\/build\/config\.json$/,
-        loader: path.resolve('core/build/purge-config.js')
+        loader: path.resolve('core/build/purge-config/purgeConfigLoader.ts')
       }
     ]
   }

core/build/webpack.base.config.ts

@@ -10,6 +10,7 @@ import config from 'config'
 import { Logger } from '@vue-storefront/core/lib/logger'
 import { RouterManager } from './lib/router-manager';
 import queryString from 'query-string'
+import purgeConfig from './build/purge-config/purgeConfig';
 
 function _commonErrorHandler (err, reject) {
   if (err.message.indexOf('query returned empty result') > 0) {
@@ -43,6 +44,10 @@ function _ssrHydrateSubcomponents (components, store, router, resolve, reject, a
         if (excludeFromConfig && excludeFromConfig.length > 0) {
           context.state.config = omit(context.state.config, excludeFromConfig)
         }
+        context.state.config = purgeConfig({
+          ...context.state.config,
+          purgeConfig: buildTimeConfig.purgeConfig
+        })
       }
       resolve(app)
     }).catch(err => {