Merge branch 'usebruno:main' into main

packages/bruno-app/src/components/Sidebar/NewRequest/StyledWrapper.js

@@ -35,6 +35,10 @@ const StyledWrapper = styled.div`
       }
     }
   }
+
+  textarea.curl-command {
+    min-height: 150px;
+  }
 `;
 
 export default StyledWrapper;

packages/bruno-app/src/components/Sidebar/NewRequest/index.js

@@ -1,4 +1,4 @@
-import React, { useRef, useEffect } from 'react';
+import React, { useRef, useEffect, useCallback } from 'react';
 import { useFormik } from 'formik';
 import * as Yup from 'yup';
 import toast from 'react-hot-toast';
@@ -115,6 +115,25 @@ const NewRequest = ({ collection, item, isEphemeral, onClose }) => {
 
   const onSubmit = () => formik.handleSubmit();
 
+  const handlePaste = useCallback(
+    (event) => {
+      const clipboardData = event.clipboardData || window.clipboardData;
+      const pastedData = clipboardData.getData('Text');
+
+      // Check if pasted data looks like a cURL command
+      const curlCommandRegex = /^\s*curl\s/i;
+      if (curlCommandRegex.test(pastedData)) {
+        // Switch to the 'from-curl' request type
+        formik.setFieldValue('requestType', 'from-curl');
+        formik.setFieldValue('curlCommand', pastedData);
+
+        // Prevent the default paste behavior to avoid pasting into the textarea
+        event.preventDefault();
+      }
+    },
+    [formik]
+  );
+
   return (
     <StyledWrapper>
       <Modal size="md" title="New Request" confirmText="Create" handleConfirm={onSubmit} handleCancel={onClose}>
@@ -174,7 +193,7 @@ const NewRequest = ({ collection, item, isEphemeral, onClose }) => {
               Name
             </label>
             <input
-              id="collection-name"
+              id="request-name"
               type="text"
               name="requestName"
               ref={inputRef}
@@ -216,6 +235,7 @@ const NewRequest = ({ collection, item, isEphemeral, onClose }) => {
                       spellCheck="false"
                       onChange={formik.handleChange}
                       value={formik.values.requestUrl || ''}
+                      onPaste={handlePaste}
                     />
                   </div>
                 </div>
@@ -232,8 +252,7 @@ const NewRequest = ({ collection, item, isEphemeral, onClose }) => {
               <textarea
                 name="curlCommand"
                 placeholder="Enter cURL request here.."
-                className="block textbox w-full mt-4"
+                className="block textbox w-full mt-4 curl-command"
-                style={{ resize: 'none' }}
                 value={formik.values.curlCommand}
                 onChange={formik.handleChange}
               ></textarea>

packages/bruno-app/src/components/Sidebar/index.js

@@ -105,7 +105,7 @@ const Sidebar = () => {
                   Star
                 </GitHubButton>
               </div>
-              <div className="flex flex-grow items-center justify-end text-xs mr-2">v1.1.0</div>
+              <div className="flex flex-grow items-center justify-end text-xs mr-2">v1.1.1</div>
             </div>
           </div>
         </div>

packages/bruno-app/src/utils/curl/curl-to-json.spec.js

@@ -46,8 +46,8 @@ describe('curlToJson', () => {
     const result = curlToJson(curlCommand);
 
     expect(result).toEqual({
-      url: '%27https://www.usebruno.com%27',
+      url: 'https://www.usebruno.com',
-      raw_url: "'https://www.usebruno.com'",
+      raw_url: 'https://www.usebruno.com',
       method: 'post',
       headers: {
         Accept: 'application/json, text/plain, */*',

packages/bruno-cli/changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.0
+
+- Upgraded axios to 1.5.1
+
 ## 1.0.0
 
 - Announcing Stable Release

packages/bruno-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usebruno/cli",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "license": "MIT",
   "main": "src/index.js",
   "bin": {

packages/bruno-electron/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "v1.1.0",
+  "version": "v1.1.1",
   "name": "bruno",
   "description": "Opensource API Client for Exploring and Testing APIs",
   "homepage": "https://www.usebruno.com",