Skip to content

Commit f64d80d

Browse files
author
Fifciuu
committed
refactor: after CR
1 parent 10383a5 commit f64d80d

File tree

5 files changed

+24
-19
lines changed

5 files changed

+24
-19
lines changed

core/build/purge-config.js

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import omit from 'lodash/omit';
2+
3+
export default config => {
4+
const purgeConfig = (config.purgeConfig || []).slice();
5+
6+
config = omit(config, purgeConfig);
7+
delete config['purgeConfig'];
8+
9+
return config;
10+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import purgeConfig from './purgeConfig';
2+
3+
/**
4+
* clear config properties that shouldn't be visible on frontend
5+
*/
6+
export default function loader (source) {
7+
let config = JSON.parse(source);
8+
config = purgeConfig(config);
9+
10+
return JSON.stringify(config);
11+
}

core/build/webpack.base.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ export default {
196196
},
197197
{
198198
test: /core\/build\/config\.json$/,
199-
loader: path.resolve('core/build/purge-config.js')
199+
loader: path.resolve('core/build/purge-config/purgeConfigLoader.ts')
200200
}
201201
]
202202
}

core/server-entry.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import config from 'config'
1010
import { Logger } from '@vue-storefront/core/lib/logger'
1111
import { RouterManager } from './lib/router-manager';
1212
import queryString from 'query-string'
13-
import purgeConfigMethod from './build/purge-config';
13+
import purgeConfig from './build/purge-config/purgeConfig';
1414

1515
function _commonErrorHandler (err, reject) {
1616
if (err.message.indexOf('query returned empty result') > 0) {
@@ -44,7 +44,7 @@ function _ssrHydrateSubcomponents (components, store, router, resolve, reject, a
4444
if (excludeFromConfig && excludeFromConfig.length > 0) {
4545
context.state.config = omit(context.state.config, excludeFromConfig)
4646
}
47-
context.state.config = purgeConfigMethod({
47+
context.state.config = purgeConfig({
4848
...context.state.config,
4949
purgeConfig: buildTimeConfig.purgeConfig
5050
})

0 commit comments

Comments
 (0)