@dotenvx/dotenvx 1.47.4 → 1.47.6

package/CHANGELOG.md

@@ -2,7 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-[Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.47.4...main)
+[Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.47.6...main)
+
+## 1.47.6
+
+### Changed
+
+* Make Radar call non-blocking ([#642](https://github.com/dotenvx/dotenvx/pull/642))
+
+## 1.47.5
+
+### Changed
+
+* Add resilient handling of any Radar failures ([#639](https://github.com/dotenvx/dotenvx/pull/639))
 
 ## 1.47.4
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.47.4",
+  "version": "1.47.6",
   "name": "@dotenvx/dotenvx",
   "description": "a better dotenv–from the creator of `dotenv`",
   "author": "@motdotla",

package/src/cli/actions/run.js

@@ -41,8 +41,6 @@ async function run () {
 
     new DeprecationNotice().dotenvKey() // DEPRECATION NOTICE
 
-    const radar = new Radar()
-
     const {
       processedEnvs,
       readableStrings,
@@ -50,7 +48,7 @@ async function run () {
       uniqueInjectedKeys
     } = new Run(envs, options.overload, process.env.DOTENV_KEY, process.env, options.envKeysFile).run()
 
-    radar.observe(processedEnvs)
+    try { new Radar().observe({ processedEnvs }) } catch {}
 
     for (const processedEnv of processedEnvs) {
       if (processedEnv.type === 'envVaultFile') {

package/src/lib/main.js

@@ -22,8 +22,6 @@ const isIgnoringDotenvKeys = require('./helpers/isIgnoringDotenvKeys')
 
 /** @type {import('./main').config} */
 const config = function (options = {}) {
-  const radar = new Radar()
-
   // allow user to set processEnv to write to
   let processEnv = process.env
   if (options && options.processEnv != null) {
@@ -62,7 +60,7 @@ const config = function (options = {}) {
       uniqueInjectedKeys
     } = new Run(envs, overload, DOTENV_KEY, processEnv, envKeysFile).run()
 
-    radar.observe(processedEnvs)
+    try { new Radar().observe({ processedEnvs }) } catch {}
 
     let lastError
     /** @type {Record<string, string>} */

package/src/lib/services/radar.js

@@ -35,20 +35,35 @@ class Radar {
   }
 
   _radarNpm () {
-    const projectRoot = path.resolve(process.cwd())
-    // eslint-disable-next-line no-eval
-    const npmPath = eval('require').resolve('@dotenvx/dotenvx-radar', { paths: [projectRoot] }) // necessary for webpack builds
-    // eslint-disable-next-line no-eval
-    return eval('require')(npmPath) // necessary for webpack builds
+    const fallbackBin = path.resolve(process.cwd(), 'node_modules/.bin/dotenvx-radar')
+    childProcess.execSync(`${fallbackBin} help`, { stdio: ['pipe', 'pipe', 'ignore'] })
+    return {
+      observe: (encoded) => {
+        try {
+          const subprocess = childProcess.spawn(fallbackBin, ['observe', encoded], {
+            stdio: 'ignore',
+            detached: true
+          })
+
+          subprocess.unref() // let it run independently
+        } catch (e) {
+          // noop
+        }
+      }
+    }
   }
 
   _radarCli () {
     childProcess.execSync('dotenvx-radar help', { stdio: ['pipe', 'pipe', 'ignore'] })
     return {
-      observe: (payload) => {
-        const encoded = this.encode(payload)
+      observe: (encoded) => {
         try {
-          childProcess.execSync(`dotenvx-radar observe ${encoded}`, { stdio: 'ignore' })
+          const subprocess = childProcess.spawn('dotenvx-radar', ['observe', encoded], {
+            stdio: 'ignore',
+            detached: true
+          })
+
+          subprocess.unref() // let it run independently
         } catch (e) {
           // noop
         }