fix: improve bin/dev.js check

forcedotcom · Oct 26, 2023 · caafbca · caafbca
1 parent c528a6c
commit caafbca
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git a/utils/sf-config.js b/utils/sf-config.js
@@ -5,7 +5,8 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-const { dirname } = require('path');
+const { existsSync } = require('fs');
+const { dirname, join } = require('path');
 const { cosmiconfigSync } = require('cosmiconfig');
 const { isPlugin } = require('./project-type');
 
@@ -71,13 +72,20 @@ const PACKAGE_DEFAULTS = {
 // Path to resolved config object.
 const resolvedConfigs = {};
 
-const resolveConfig = (path, options = {}) => {
+const resolveConfig = (path) => {
   if (path && resolvedConfigs[path]) {
     return resolvedConfigs[path];
   }
+  const explorerSync = cosmiconfigSync('sfdev');
+  const result = explorerSync.search(path);
 
-  const dev = options.jsBinScripts ? 'ts-node "./bin/dev.js"' : '"./bin/dev"';
-  const PLUGIN_DEFAULTS = {
+  if (!path && result) {
+    path = dirname(result.filepath);
+  }
+
+  const usesJsBinScripts = existsSync(join(path, 'bin', 'dev.js'));
+  const dev = usesJsBinScripts ? 'ts-node "./bin/dev.js"' : '"./bin/dev"';
+  const pluginDefaults = {
     scripts: {
       ...PACKAGE_DEFAULTS.scripts,
       // wireit scripts don't need an entry in pjson scripts.
@@ -118,14 +126,7 @@ const resolveConfig = (path, options = {}) => {
     },
   };
 
-  const explorerSync = cosmiconfigSync('sfdev');
-  const result = explorerSync.search(path);
-
-  if (!path && result) {
-    path = dirname(result.filepath);
-  }
-
-  const defaults = path && isPlugin(path) ? PLUGIN_DEFAULTS : PACKAGE_DEFAULTS;
+  const defaults = path && isPlugin(path) ? pluginDefaults : PACKAGE_DEFAULTS;
 
   const configFromFile = (result && result.config) || {};
 

diff --git a/utils/standardize-pjson.js b/utils/standardize-pjson.js
@@ -5,22 +5,15 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-const { readFileSync, existsSync } = require('fs');
+const { readFileSync } = require('fs');
 const { join } = require('path');
 const { resolveConfig } = require('./sf-config');
 const { semverIsLessThan } = require('./semver');
 
 const PackageJson = require('./package-json');
 
-function usesJsBinScripts(packageRoot) {
-  return existsSync(join(packageRoot, 'bin', 'dev.js'));
-}
-
 module.exports = (packageRoot = require('./package-path')) => {
-  const options = {
-    jsBinScripts: usesJsBinScripts(packageRoot),
-  };
-  const config = resolveConfig(packageRoot, options);
+  const config = resolveConfig(packageRoot);
   const pjson = new PackageJson(packageRoot);
 
   const license = pjson.get('license');