merge commit

packages/hoppscotch-app/components/smart/EnvInput.vue

@@ -118,6 +118,8 @@ const aggregateVars = useReadonlyStream(restVars$, []) as Ref<HoppRESTVar[]>
 
 const aggregateVars = useReadonlyStream(restVars$, []) as Ref<HoppRESTVar[]>
 
+const aggregateVars = useReadonlyStream(restVars$, []) as Ref<HoppRESTVar[]>
+
 const envVars = computed(() =>
   props.envs
     ? props.envs.map((x) => ({

packages/hoppscotch-app/helpers/utils/EffectiveURL.ts

@@ -15,10 +15,14 @@ import {
   HoppRESTParam,
 } from "@hoppscotch/data"
 <<<<<<< HEAD
+<<<<<<< HEAD
 import { parseTemplateStringV } from "@hoppscotch/data/src/pathVariables"
 =======
 import { parseTemplateStringV } from "@hoppscotch/data/src/variables"
 >>>>>>> origin/codeday/main
+=======
+import { parseTemplateStringV } from "@hoppscotch/data/src/variables"
+>>>>>>> origin/codeday/jason
 import { arrayFlatMap, arraySort } from "../functional/array"
 import { toFormData } from "../functional/formData"
 import { tupleToRecord } from "../functional/record"
@@ -308,6 +312,8 @@ export function getEffectiveRESTRequest(
 
   const effectiveFinalVars = request.vars
 
+  const effectiveFinalVars = request.vars
+
   const effectiveFinalBody = getFinalBodyFromRequest(request, envVariables)
 
   return {

packages/hoppscotch-data/src/environment.ts

@@ -12,6 +12,7 @@ export type Environment = {
 export type Variables = {
   key: string
   value: string
+<<<<<<< HEAD
 <<<<<<< HEAD
   }[]
 
@@ -24,6 +25,12 @@ const REGEX_PATHVAR = /{{([^>]*)}}/g // "{{myVariable}}"
 const REGEX_ENV_VAR = /<<([^>]*)>>/g // "<<myVariable>>"
 const REGEX_PATH_VAR = /{{([^>]*)}}/g // "{{myVariable}}"
 >>>>>>> origin/codeday/main
+=======
+}[]
+
+const REGEX_ENV_VAR = /<<([^>]*)>>/g // "<<myVariable>>"
+const REGEX_PATH_VAR = /{{([^>]*)}}/g // "{{myVariable}}"
+>>>>>>> origin/codeday/jason
 
 /**
  * How much times can we expand environment variables