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

merge commit

Browse Source
This commit is contained in:
isaiM6
2022-08-01 14:11:37 -07:00
parent cabc775f58 f515ac4f52
commit 630ab1f4f4
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/hoppscotch-app/helpers/utils/EffectiveURL.ts
View File

@@ -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 {