@dotenvx/dotenvx 1.47.2 → 1.47.4

package/CHANGELOG.md

@@ -2,7 +2,23 @@
 
 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.2...main)
+[Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.47.4...main)
+
+## 1.47.4
+
+### Changed
+
+* Smarter require of non-installed libs like [`dotenvx-radar`](https://dotenvx.com/radar) ([#638](https://github.com/dotenvx/dotenvx/pull/638))
+
+## 1.47.3
+
+### Added
+
+* Send to `radar#observe` if [Radar](https://dotenvx.com/radar) installed by user ([#631](https://github.com/dotenvx/dotenvx/pull/631))
+
+### Removed
+
+* Remove `cli` in package.json ([#632](https://github.com/dotenvx/dotenvx/pull/632))
 
 ## 1.47.2
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.47.2",
+  "version": "1.47.4",
   "name": "@dotenvx/dotenvx",
   "description": "a better dotenv–from the creator of `dotenv`",
   "author": "@motdotla",
@@ -25,8 +25,6 @@
       "require": "./src/lib/main.js",
       "default": "./src/lib/main.js"
     },
-    "./cli": "./src/cli/dotenvx.js",
-    "./cli.js": "./src/cli/dotenvx.js",
     "./config": "./src/lib/config.js",
     "./config.js": "./src/lib/config.js",
     "./package.json": "./package.json"

package/src/cli/actions/run.js

@@ -3,10 +3,10 @@ const { logger } = require('./../../shared/logger')
 
 const executeCommand = require('./../../lib/helpers/executeCommand')
 const Run = require('./../../lib/services/run')
+const Radar = require('./../../lib/services/radar')
 
 const conventions = require('./../../lib/helpers/conventions')
 const DeprecationNotice = require('./../../lib/helpers/deprecationNotice')
-const logRadar = require('./../../lib/helpers/logRadar')
 
 async function run () {
   const commandArgs = this.args
@@ -41,7 +41,7 @@ async function run () {
 
     new DeprecationNotice().dotenvKey() // DEPRECATION NOTICE
 
-    logRadar()
+    const radar = new Radar()
 
     const {
       processedEnvs,
@@ -50,6 +50,8 @@ async function run () {
       uniqueInjectedKeys
     } = new Run(envs, options.overload, process.env.DOTENV_KEY, process.env, options.envKeysFile).run()
 
+    radar.observe(processedEnvs)
+
     for (const processedEnv of processedEnvs) {
       if (processedEnv.type === 'envVaultFile') {
         logger.verbose(`loading env from encrypted ${processedEnv.filepath} (${path.resolve(processedEnv.filepath)})`)

package/src/lib/helpers/proKeypair.js

@@ -15,9 +15,10 @@ class ProKeypair {
     try {
       // if installed as sibling module
       const projectRoot = path.resolve(process.cwd())
-      const dotenvxProPath = require.resolve('@dotenvx/dotenvx-pro', { paths: [projectRoot] })
-      const { keypair } = require(dotenvxProPath)
-
+      // eslint-disable-next-line no-eval
+      const dotenvxProPath = eval('require').resolve('@dotenvx/dotenvx-pro', { paths: [projectRoot] }) // necessary for webpack builds
+      // eslint-disable-next-line no-eval
+      const { keypair } = eval('require')(dotenvxProPath) // necessary for webpack builds
       result = keypair(this.envFilepath)
     } catch (_e) {
       try {

package/src/lib/main.js

@@ -12,6 +12,7 @@ const Sets = require('./services/sets')
 const Get = require('./services/get')
 const Keypair = require('./services/keypair')
 const Genexample = require('./services/genexample')
+const Radar = require('./services/radar')
 
 // helpers
 const buildEnvs = require('./helpers/buildEnvs')
@@ -21,6 +22,8 @@ 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) {
@@ -59,6 +62,8 @@ const config = function (options = {}) {
       uniqueInjectedKeys
     } = new Run(envs, overload, DOTENV_KEY, processEnv, envKeysFile).run()
 
+    radar.observe(processedEnvs)
+
     let lastError
     /** @type {Record<string, string>} */
     const parsedAll = {}

package/src/lib/services/radar.js

@@ -0,0 +1,60 @@
+const path = require('path')
+const childProcess = require('child_process')
+
+const { logger } = require('./../../shared/logger')
+
+class Radar {
+  constructor () {
+    this.radarLib = null
+
+    // check npm lib
+    try {
+      this.radarLib = this._radarNpm()
+      logger.successv('📡 radar active')
+    } catch (e) {
+      // check binary cli
+      try {
+        this.radarLib = this._radarCli()
+        logger.successv('📡 radar active')
+      } catch (_e2) {
+        // noop
+      }
+      // noop
+    }
+  }
+
+  observe (payload) {
+    if (this.radarLib) {
+      const encoded = this.encode(payload)
+      this.radarLib.observe(encoded)
+    }
+  }
+
+  encode (payload) {
+    return Buffer.from(JSON.stringify(payload)).toString('base64')
+  }
+
+  _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
+  }
+
+  _radarCli () {
+    childProcess.execSync('dotenvx-radar help', { stdio: ['pipe', 'pipe', 'ignore'] })
+    return {
+      observe: (payload) => {
+        const encoded = this.encode(payload)
+        try {
+          childProcess.execSync(`dotenvx-radar observe ${encoded}`, { stdio: 'ignore' })
+        } catch (e) {
+          // noop
+        }
+      }
+    }
+  }
+}
+
+module.exports = Radar

package/src/lib/helpers/logRadar.js

@@ -1,31 +0,0 @@
-const path = require('path')
-const childProcess = require('child_process')
-
-const { logger } = require('./../../shared/logger')
-
-function logRadar () {
-  let installed = false
-
-  try {
-    // if installed as sibling module
-    const projectRoot = path.resolve(process.cwd())
-    const dotenvxRadarPath = require.resolve('@dotenvx/dotenvx-radar', { paths: [projectRoot] })
-    require(dotenvxRadarPath)
-    installed = true
-  } catch (_e) {
-    try {
-      // if installed as binary cli
-      childProcess.execSync('dotenvx-radar help', { stdio: ['pipe', 'pipe', 'ignore'] }).toString().trim()
-      installed = true
-      // if succeeds
-    } catch (_e) {
-      // do nothing
-    }
-  }
-
-  if (installed) {
-    logger.successv('radar active 📡')
-  }
-}
-
-module.exports = logRadar