Merge pull request #232 from forcedotcom/mdonnalley/dev-js

fix: allow dev.js in wireit scripts
forcedotcom · Oct 25, 2023 · 9f79d0b · 9f79d0b
2 parents c39d614 + 3ebca53
commit 9f79d0b
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 44 deletions.
diff --git a/utils/sf-config.js b/utils/sf-config.js
@@ -68,55 +68,56 @@ const PACKAGE_DEFAULTS = {
   },
 };
 
-const PLUGIN_DEFAULTS = {
-  scripts: {
-    ...PACKAGE_DEFAULTS.scripts,
-    // wireit scripts don't need an entry in pjson scripts.
-    // remove these from scripts and let wireit handle them (just repeat running yarn test)
-    // https://github.com/google/wireit/blob/main/CHANGELOG.md#094---2023-01-30
-    'test:command-reference': undefined,
-    'test:deprecation-policy': undefined,
-    'test:json-schema': undefined,
-  },
-  wireit: {
-    ...PACKAGE_DEFAULTS.wireit,
-    'test:command-reference': {
-      command: `"./bin/dev" commandreference:generate --erroronwarnings`,
-      files: ['src/**/*.ts', 'messages/**', 'package.json'],
-      output: ['tmp/root'],
-    },
-    'test:deprecation-policy': {
-      command: '"./bin/dev" snapshot:compare',
-      files: ['src/**/*.ts'],
-      output: [],
-      dependencies: ['compile'],
-    },
-    'test:json-schema': {
-      command: '"./bin/dev" schema:compare',
-      files: ['src/**/*.ts', 'schemas'],
-      output: [],
-    },
-    test: {
-      dependencies: [
-        'test:compile',
-        'test:only',
-        'test:command-reference',
-        'test:deprecation-policy',
-        'lint',
-        'test:json-schema',
-      ],
-    },
-  },
-};
-
 // Path to resolved config object.
 const resolvedConfigs = {};
 
-const resolveConfig = (path) => {
+const resolveConfig = (path, options = {}) => {
   if (path && resolvedConfigs[path]) {
     return resolvedConfigs[path];
   }
 
+  const dev = options.jsBinScripts ? 'dev.js' : 'dev';
+  const PLUGIN_DEFAULTS = {
+    scripts: {
+      ...PACKAGE_DEFAULTS.scripts,
+      // wireit scripts don't need an entry in pjson scripts.
+      // remove these from scripts and let wireit handle them (just repeat running yarn test)
+      // https://github.com/google/wireit/blob/main/CHANGELOG.md#094---2023-01-30
+      'test:command-reference': undefined,
+      'test:deprecation-policy': undefined,
+      'test:json-schema': undefined,
+    },
+    wireit: {
+      ...PACKAGE_DEFAULTS.wireit,
+      'test:command-reference': {
+        command: `"./bin/${dev}" commandreference:generate --erroronwarnings`,
+        files: ['src/**/*.ts', 'messages/**', 'package.json'],
+        output: ['tmp/root'],
+      },
+      'test:deprecation-policy': {
+        command: `"./bin/${dev}" snapshot:compare`,
+        files: ['src/**/*.ts'],
+        output: [],
+        dependencies: ['compile'],
+      },
+      'test:json-schema': {
+        command: `"./bin/${dev}" schema:compare`,
+        files: ['src/**/*.ts', 'schemas'],
+        output: [],
+      },
+      test: {
+        dependencies: [
+          'test:compile',
+          'test:only',
+          'test:command-reference',
+          'test:deprecation-policy',
+          'lint',
+          'test:json-schema',
+        ],
+      },
+    },
+  };
+
   const explorerSync = cosmiconfigSync('sfdev');
   const result = explorerSync.search(path);
 

diff --git a/utils/standardize-pjson.js b/utils/standardize-pjson.js
@@ -5,15 +5,22 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-const { readFileSync } = require('fs');
+const { readFileSync, existsSync } = 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 config = resolveConfig(packageRoot);
+  const options = {
+    jsBinScripts: usesJsBinScripts(packageRoot),
+  };
+  const config = resolveConfig(packageRoot, options);
   const pjson = new PackageJson(packageRoot);
 
   const license = pjson.get('license');