btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Merge codeday/jason => codeday/isai

Browse Source
This commit is contained in:
Jason Casareno
2022-08-01 14:47:22 -07:00
parent 186803a465 bdfdb44743
commit e3482f66cc
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/hoppscotch-app/components/smart/EnvInput.vue
View File

@@ -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 aggregateVars = useReadonlyStream(restVars$, []) as Ref<HoppRESTVar[]>
const envVars = computed(() => const envVars = computed(() =>
props.envs props.envs
? props.envs.map((x) => ({ ? props.envs.map((x) => ({

3
packages/hoppscotch-data/src/environment.ts
View File

@@ -12,7 +12,8 @@ export type Environment = {
export type Variables = { export type Variables = {
key: string key: string
value: string value: string
}[] }[]
const REGEX_ENV_VAR = /<<([^>]*)>>/g // "<<myVariable>>" const REGEX_ENV_VAR = /<<([^>]*)>>/g // "<<myVariable>>"
const REGEX_PATH_VAR = /{{([^>]*)}}/g // "{{myVariable}}" const REGEX_PATH_VAR = /{{([^>]*)}}/g // "{{myVariable}}"