yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-29 08:04:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't parse npm scripts for dynamic config

Browse Source 
Fix the fix merged with #1575

The original patch was done over a block of code moved on #1667
resulting in re-introducing code that now is not invoqued and continue
with the bug reported on #916.

This patch take the original changes and put them in the current correct
place.
This commit is contained in:
Alberto Maturano 2018-09-19 18:11:22 -05:00
parent f1251ea342
commit 0e164d6da8
2 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/strapi-utils/lib/templateConfiguration.js
View File

@ -1,17 +1,22 @@
const { isString, isPlainObject } = require('lodash');
const regex = /\$\{[^()]*\}/g;
const excludeConfigPaths = ['info.scripts'];
/**
* Allow dynamic config values through the native ES6 template string function.
*/
const templateConfiguration = (obj) => {
const templateConfiguration = (obj, configPath = '') => {
// Allow values which looks like such as an ES6 literal string without parenthesis inside (aka function call).
// Exclude config with conflicting syntax (e.g. npm scripts).
return Object.keys(obj).reduce((acc, key) => {
if (isPlainObject(obj[key]) && !isString(obj[key])) {
acc[key] = templateConfiguration(obj[key]);
acc[key] = templateConfiguration(obj[key], `${configPath}.${key}`);
} else if (isString(obj[key]) && obj[key].match(regex) !== null) {
} else if (isString(obj[key])
&& !excludeConfigPaths.includes(configPath.substr(1))
&& obj[key].match(regex) !== null
) {
// eslint-disable-next-line prefer-template
acc[key] = eval('`' + obj[key] + '`');

25
packages/strapi/lib/core/configurations.js Executable file → Normal file
View File

@ -382,31 +382,6 @@ const enableHookNestedDependencies = function (name, flattenHooksConfig, force =
}
};
/**
* Allow dynamic config values through
* the native ES6 template string function.
*/
const regex = /\$\{[^()]*\}/g;
const excludeConfigPaths = ['info.scripts'];
const templateConfigurations = function (obj, configPath = '') {
// Allow values which looks like such as
// an ES6 literal string without parenthesis inside (aka function call).
// Exclude config with conflicting syntax (e.g. npm scripts).
return Object.keys(obj).reduce((acc, key) => {
if (isPlainObject(obj[key]) && !isString(obj[key])) {
acc[key] = templateConfigurations(obj[key], `${configPath}.${key}`);
} else if (isString(obj[key])
&& !excludeConfigPaths.includes(configPath.substr(1))
&& obj[key].match(regex) !== null) {
acc[key] = eval('`' + obj[key] + '`'); // eslint-disable-line prefer-template
} else {
acc[key] = obj[key];
}
return acc;
}, {});
};
const isAdminInDevMode = function () {
try {
fs.accessSync(path.resolve(this.config.appPath, 'admin', 'admin', 'build', 'index.html'), fs.constants.R_OK | fs.constants.W_OK);