From 8bbf318f4a21ba61de46d037cfa67d471688de9c Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 22 Feb 2024 00:46:22 +0100 Subject: [PATCH] Fixes --- packages/string-templates/src/index.ts | 2 +- packages/string-templates/test/basic.spec.ts | 6 +++--- packages/string-templates/test/javascript.spec.ts | 10 +++------- packages/string-templates/test/renderApp.spec.ts | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/packages/string-templates/src/index.ts b/packages/string-templates/src/index.ts index a3eb890211..7d0f198772 100644 --- a/packages/string-templates/src/index.ts +++ b/packages/string-templates/src/index.ts @@ -108,7 +108,7 @@ export async function processObject(object, context, opts?) { export async function processString( string: string, context: object, - opts?: { noHelpers?: boolean; escapeNewlines?: boolean } + opts?: { noHelpers?: boolean; escapeNewlines?: boolean; onlyFound?: boolean } ) { // TODO: carry out any async calls before carrying out async call return processStringSync(string, context, opts) diff --git a/packages/string-templates/test/basic.spec.ts b/packages/string-templates/test/basic.spec.ts index b1e2865486..278cd9de40 100644 --- a/packages/string-templates/test/basic.spec.ts +++ b/packages/string-templates/test/basic.spec.ts @@ -1,4 +1,4 @@ -const { +import { processObject, processString, isValid, @@ -8,7 +8,7 @@ const { doesContainString, disableEscaping, findHBSBlocks, -} = require("../src/index") +} from "../src/index" describe("Test that the string processing works correctly", () => { it("should process a basic template string", async () => { @@ -28,7 +28,7 @@ describe("Test that the string processing works correctly", () => { it("should fail gracefully when wrong type passed in", async () => { let error = null try { - await processString(null, null) + await processString(null as any, null as any) } catch (err) { error = err } diff --git a/packages/string-templates/test/javascript.spec.ts b/packages/string-templates/test/javascript.spec.ts index ab68e70830..fd961446da 100644 --- a/packages/string-templates/test/javascript.spec.ts +++ b/packages/string-templates/test/javascript.spec.ts @@ -1,11 +1,7 @@ -const vm = require("vm") +import vm from "vm" -const { - processStringSync, - encodeJSBinding, - setJSRunner, -} = require("../src/index") -const { UUID_REGEX } = require("./constants") +import { processStringSync, encodeJSBinding, setJSRunner } from "../src/index" +import { UUID_REGEX } from "./constants" const processJS = (js, context?) => { return processStringSync(encodeJSBinding(js), context) diff --git a/packages/string-templates/test/renderApp.spec.ts b/packages/string-templates/test/renderApp.spec.ts index f09bc1c2b9..7570d1a8ec 100644 --- a/packages/string-templates/test/renderApp.spec.ts +++ b/packages/string-templates/test/renderApp.spec.ts @@ -1,4 +1,4 @@ -const { processString } = require("../src/index") +import { processString } from "../src/index" describe("specific test case for whether or not full app template can still be rendered", () => { it("should be able to render the app template", async () => {