add more robust implementation

jaegertracing · Aug 16, 2023 · a6c1d52 · a6c1d52
1 parent adccd3a
commit a6c1d52
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 112 deletions.
diff --git a/scripts/generateDepcheckrc.js b/scripts/generateDepcheckrc.js
diff --git a/scripts/generateDepcheckrcJaegerUI.js b/scripts/generateDepcheckrcJaegerUI.js
@@ -14,6 +14,7 @@
 
 /* eslint-disable import/no-extraneous-dependencies */
 const fs = require('fs');
+const path = require('path');
 const { babelConfiguration } = require('../packages/jaeger-ui/test/babel-transform');
 
 const packageNames = [
@@ -34,4 +35,14 @@ const depcheckrcContent = {
   'ignore-dirs': ['build'],
 };
 
-fs.writeFileSync('packages/jaeger-ui/.depcheckrc.json', JSON.stringify(depcheckrcContent, null, 2));
+// Use the argument provided to the script as the output file path
+const outputFile = process.argv[2];
+
+if (!outputFile) {
+  console.error('Usage: node generateDepcheckrcJaegerUI.js <outputFile>');
+  process.exit(1);
+}
+
+const depcheckrcPath = path.resolve(__dirname, outputFile);
+
+fs.writeFileSync(depcheckrcPath, JSON.stringify(depcheckrcContent, null, 2));
diff --git a/scripts/generateDepcheckrcPlexus.js b/scripts/generateDepcheckrcPlexus.js
@@ -14,6 +14,7 @@
 
 /* eslint-disable import/no-extraneous-dependencies */
 const fs = require('fs');
+const path = require('path');
 const getBabelConfig = require('../packages/plexus/babel.config');
 
 const babelConfiguration = getBabelConfig({
@@ -44,4 +45,14 @@ const depcheckrcContent = {
   ignores: [...packageNames, ...otherPackages],
 };
 
-fs.writeFileSync('packages/plexus/.depcheckrc.json', JSON.stringify(depcheckrcContent, null, 2));
+// Use the argument provided to the script as the output file path
+const outputFile = process.argv[2];
+
+if (!outputFile) {
+  console.error('Usage: node generateDepcheckrcJaegerUI.js <outputFile>');
+  process.exit(1);
+}
+
+const depcheckrcPath = path.resolve(__dirname, outputFile);
+
+fs.writeFileSync(depcheckrcPath, JSON.stringify(depcheckrcContent, null, 2));
diff --git a/scripts/run-depcheck.sh b/scripts/run-depcheck.sh
@@ -1,24 +1,12 @@
 #!/bin/sh
-# This script runs depcheck on two different packages: 'jaeger-ui' and 'plexus'
+set -ex
 
-# Run depcheck for the 'jaeger-ui' package
-(
-  node scripts/generateDepcheckrcJaegerUI.js &&               # Generate depcheckrc for 'jaeger-ui'
-  depcheck packages/jaeger-ui &&                              # Run depcheck on 'jaeger-ui'
-  rm -f packages/jaeger-ui/.depcheckrc.json                   # Clean up generated depcheckrc
-) || (
-  EXIT_CODE=$?                                                # Store the exit code from the previous command
-  rm -f packages/jaeger-ui/.depcheckrc.json                   # Clean up generated depcheckrc
-  exit $EXIT_CODE                                             # Exit with the stored exit code
-)
+# Create a temporary depcheckrc file for 'jaeger-ui'
+tempfile_jaeger=$(mktemp /tmp/depcheckrc.XXXXXX.json)
+node scripts/generateDepcheckrcJaegerUI.js "$tempfile_jaeger"
+depcheck packages/jaeger-ui --config "$tempfile_jaeger"
 
-# Run depcheck for the 'plexus' package
-(
-  node scripts/generateDepcheckrcPlexus.js &&                 # Generate depcheckrc for 'plexus'
-  depcheck packages/plexus &&                                 # Run depcheck on 'plexus'
-  rm -f packages/plexus/.depcheckrc.json                      # Clean up generated depcheckrc
-) || (
-  EXIT_CODE=$?                                                # Store the exit code from the previous command
-  rm -f packages/plexus/.depcheckrc.json                      # Clean up generated depcheckrc
-  exit $EXIT_CODE                                             # Exit with the stored exit code
-)
+# Create a temporary depcheckrc file for 'plexus'
+tempfile_plexus=$(mktemp /tmp/depcheckrc.XXXXXX.json)
+node scripts/generateDepcheckrcPlexus.js "$tempfile_plexus"
+depcheck packages/plexus --config "$tempfile_plexus"