From a519f367925a9e8e427ad304dfed2ee51498e13e Mon Sep 17 00:00:00 2001 From: kmcaloon Date: Tue, 19 Apr 2022 08:33:03 -0400 Subject: [PATCH] Optionally get custom scripts config from toolkit.config.js --- packages/toolkit/utils/config.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/toolkit/utils/config.js b/packages/toolkit/utils/config.js index bcb117a1..f36017bf 100644 --- a/packages/toolkit/utils/config.js +++ b/packages/toolkit/utils/config.js @@ -126,13 +126,17 @@ const getDefaultConfig = () => { }; /** - * Returns 10up-scripts config from package.json with default values +/** + * Returns 10up-scripts config either from toolkit.config.js or package.json with default values * * @returns {object} */ const getTenUpScriptsConfig = () => { const packageJson = getPackage(); - const config = packageJson['10up-toolkit'] || packageJson['@10up/scripts']; + const configFile = 'toolkit.config.js'; + const config = hasProjectFile(configFile) + ? require(fromProjectRoot(configFile)) + : packageJson['10up-toolkit'] || packageJson['@10up/scripts']; const defaultConfig = getDefaultConfig(); if (!config) {