@dotenvx/dotenvx 0.15.0 → 0.15.2

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.15.0",
+  "version": "0.15.2",
   "name": "@dotenvx/dotenvx",
   "description": "a better dotenv–from the creator of `dotenv`",
   "author": "@motdotla",
@@ -23,19 +23,20 @@
     "standard:fix": "standard --fix",
     "test": "jest --verbose"
   },
+  "funding": "Have you seen dotenvx.com? run anywhere, cross-platform, and encrypted envs.",
   "dependencies": {
     "@inquirer/prompts": "^3.3.0",
-    "axios": "^1.6.2",
     "chalk": "^4.1.2",
     "clipboardy": "^2.3.0",
     "commander": "^11.1.0",
     "conf": "^10.2.0",
-    "dotenv": "^16.4.0",
-    "dotenv-expand": "^10.0.0",
+    "dotenv": "^16.4.2",
+    "dotenv-expand": "^11.0.3",
     "execa": "^5.1.1",
     "ignore": "^5.3.0",
     "open": "^8.4.2",
     "ora": "^5.4.1",
+    "undici": "^6.6.2",
     "update-notifier": "^5.1.0",
     "winston": "^3.11.0",
     "xxhashjs": "^0.2.2"

package/src/cli/actions/hub/login.js

@@ -1,5 +1,5 @@
 const open = require('open')
-const axios = require('./../../../shared/axios')
+const { request } = require('undici')
 const clipboardy = require('clipboardy')
 const { confirm } = require('@inquirer/prompts')
 
@@ -16,41 +16,47 @@ async function pollTokenUrl (tokenUrl, deviceCode, interval) {
   logger.http(`POST ${tokenUrl} with deviceCode ${deviceCode} at interval ${interval}`)
 
   try {
-    const response = await axios.post(tokenUrl, {
-      client_id: OAUTH_CLIENT_ID,
-      device_code: deviceCode,
-      grant_type: 'urn:ietf:params:oauth:grant-type:device_code'
+    const response = await request(tokenUrl, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({
+        client_id: OAUTH_CLIENT_ID,
+        device_code: deviceCode,
+        grant_type: 'urn:ietf:params:oauth:grant-type:device_code'
+      })
     })
 
-    logger.http(response.data)
+    const responseData = await response.body.json()
 
-    if (response.data.access_token) {
-      spinner.start()
-      store.setToken(response.data.full_username, response.data.access_token)
-      store.setHostname(response.data.hostname)
-      spinner.succeed(`logged in as ${response.data.username}`)
-      process.exit(0)
-    } else {
-      // continue polling if no access_token. shouldn't ever get here it server is implemented correctly
-      setTimeout(() => pollTokenUrl(tokenUrl, deviceCode, interval), interval * 1000)
-    }
-  } catch (error) {
-    if (error.response && error.response.data) {
-      logger.http(error.response.data)
+    logger.http(responseData)
 
+    if (response.statusCode >= 400) {
       // continue polling if authorization_pending
-      if (error.response.data.error === 'authorization_pending') {
+      if (responseData.error === 'authorization_pending') {
         setTimeout(() => pollTokenUrl(tokenUrl, deviceCode, interval), interval * 1000)
       } else {
         spinner.start()
-        spinner.fail(error.response.data.error_description)
+        spinner.fail(responseData.error_description)
         process.exit(1)
       }
-    } else {
+    }
+
+    if (responseData.access_token) {
       spinner.start()
-      spinner.fail(error)
-      process.exit(1)
+      store.setToken(responseData.full_username, responseData.access_token)
+      store.setHostname(responseData.hostname)
+      spinner.succeed(`logged in as ${responseData.username}`)
+      process.exit(0)
+    } else {
+      // continue polling if no access_token. shouldn't ever get here it server is implemented correctly
+      setTimeout(() => pollTokenUrl(tokenUrl, deviceCode, interval), interval * 1000)
     }
+  } catch (error) {
+    spinner.start()
+    spinner.fail(error.toString())
+    process.exit(1)
   }
 }
 
@@ -63,14 +69,28 @@ async function login () {
   const tokenUrl = `${hostname}/oauth/token`
 
   try {
-    const response = await axios.post(deviceCodeUrl, {
-      client_id: OAUTH_CLIENT_ID
+    const response = await request(deviceCodeUrl, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({ client_id: OAUTH_CLIENT_ID })
     })
-    const data = response.data
-    const deviceCode = data.device_code
-    const userCode = data.user_code
-    const verificationUri = data.verification_uri
-    const interval = data.interval
+
+    const responseData = await response.body.json()
+
+    if (response.statusCode >= 400) {
+      logger.http(responseData)
+
+      spinner.start()
+      spinner.fail(responseData.error_description)
+      process.exit(1)
+    }
+
+    const deviceCode = responseData.device_code
+    const userCode = responseData.user_code
+    const verificationUri = responseData.verification_uri
+    const interval = responseData.interval
 
     try { clipboardy.writeSync(userCode) } catch (_e) {}
 
@@ -88,17 +108,9 @@ async function login () {
       spinner.start()
     }
   } catch (error) {
-    if (error.response && error.response.data) {
-      logger.http(error.response.data)
-
-      spinner.start()
-      spinner.fail(error.response.data.error_description)
-      process.exit(1)
-    } else {
-      spinner.start()
-      spinner.fail(error.toString())
-      process.exit(1)
-    }
+    spinner.start()
+    spinner.fail(error.toString())
+    process.exit(1)
   }
 }
 

package/src/cli/actions/hub/push.js

@@ -1,6 +1,6 @@
 const fs = require('fs')
 const { execSync } = require('child_process')
-const axios = require('./../../../shared/axios')
+const { request } = require('undici')
 
 const store = require('./../../../shared/store')
 const logger = require('./../../../shared/logger')
@@ -79,29 +79,32 @@ async function push () {
   const usernameName = helpers.extractUsernameName(remoteOriginUrl)
 
   try {
-    const postData = {
-      username_name: usernameName,
-      DOTENV_KEYS: dotenvKeysContent,
-      DOTENV_VAULT: dotenvVaultContent
-    }
-    const options = {
+    const response = await request(pushUrl, {
+      method: 'POST',
       headers: {
-        Authorization: `Bearer ${oauthToken}`
-      }
-    }
-    await axios.post(pushUrl, postData, options)
-  } catch (error) {
-    if (error.response && error.response.data) {
-      logger.http(error.response.data)
-      spinner.fail(error.response.data.error.message)
-      if (error.response.status === 404) {
+        Authorization: `Bearer ${oauthToken}`,
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({
+        username_name: usernameName,
+        DOTENV_KEYS: dotenvKeysContent,
+        DOTENV_VAULT: dotenvVaultContent
+      })
+    })
+
+    const responseData = await response.body.json()
+
+    if (response.statusCode >= 400) {
+      logger.http(responseData)
+      spinner.fail(responseData.error.message)
+      if (response.statusCode === 404) {
         logger.help(`? try visiting [${hostname}gh/${usernameName}] in your browser`)
       }
       process.exit(1)
-    } else {
-      spinner.fail(error.toString())
-      process.exit(1)
     }
+  } catch (error) {
+    spinner.fail(error.toString())
+    process.exit(1)
   }
 
   spinner.succeed(`pushed [${usernameName}]`)

package/src/lib/main.js

@@ -39,7 +39,7 @@ const parse = function (src) {
 const parseExpand = function (src) {
   const parsed = dotenv.parse(src)
   const expandPlease = {
-    ignoreProcessEnv: true, // https://github.com/motdotla/dotenv-expand?tab=readme-ov-file#ignoreprocessenv
+    processEnv: {}, // https://github.com/motdotla/dotenv-expand?tab=readme-ov-file#processenv
     parsed: { ...parsed, ...process.env } // must merge process.env in order to use pre-existing envs for expansion of parsed object
   }
   const expanded = dotenvExpand.expand(expandPlease).parsed

package/src/shared/axios.js

@@ -1,7 +0,0 @@
-try {
-  const axios = require('./../../node_modules/axios/dist/node/axios.cjs')
-  module.exports = axios
-} catch (error) {
-  const axios = require('axios')
-  module.exports = axios
-}