Merge codeday/jason => codeday/isai

2022-08-01 14:47:22 -07:00
parent 186803a465 bdfdb44743
commit e3482f66cc
2 changed files with 4 additions and 1 deletions
--- a/packages/hoppscotch-app/components/smart/EnvInput.vue
+++ b/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) => ({
--- a/packages/hoppscotch-data/src/environment.ts
+++ b/packages/hoppscotch-data/src/environment.ts
@@ -12,7 +12,8 @@ export type Environment = {
 export type Variables = {
  key: string
  value: string
-}[]
+  }[]
+

 const REGEX_ENV_VAR = /<<([^>]*)>>/g // "<<myVariable>>"
 const REGEX_PATH_VAR = /{{([^>]*)}}/g // "{{myVariable}}"