diff --git a/client/packages/lowcoder/src/base/codeEditor/autoFormat.tsx b/client/packages/lowcoder/src/base/codeEditor/autoFormat.tsx index 4726ff112..436b43f92 100644 --- a/client/packages/lowcoder/src/base/codeEditor/autoFormat.tsx +++ b/client/packages/lowcoder/src/base/codeEditor/autoFormat.tsx @@ -5,26 +5,26 @@ import { format as formatSQL } from "sql-formatter"; import { Language } from "./codeEditorTypes"; export async function cssFormatter(text: string) { - const prettier = await import("prettier/standalone"); + const prettier = await require("prettier/standalone"); const parserPlugin = await require("prettier/parser-postcss"); return (await prettier.format(text, { parser: "css", plugins: [parserPlugin], semi: false })).trim(); } export async function htmlFormatter(text: string) { - const prettier = await import("prettier/standalone"); + const prettier = await require("prettier/standalone"); const parserPlugin = await require("prettier/parser-html"); return (await prettier.format(text, { parser: "html", plugins: [parserPlugin], semi: false })).trim(); } async function getJavascriptFormatter() { - const prettier = await import("prettier/standalone"); + const prettier = await require("prettier/standalone"); const parserBabel = await require("prettier/parser-babel"); return async (text: string) => (await prettier.format(text, { parser: "babel", plugins: [parserBabel], semi: false })).trim(); } export async function getJsonFormatter() { - const prettier = await import("prettier/standalone"); + const prettier = await require("prettier/standalone"); const parserBabel = await require("prettier/parser-babel"); return async (text: string) => (await prettier.format(text, { parser: "json", plugins: [parserBabel] })).trim(); } @@ -130,7 +130,7 @@ async function formatJsonWithJsSnippetsImpl(text: string) { return segment; })); - return (await formattedJSON).replace(/("{{\d+}}")|({{\d+}})|(\\\\{\\\\{\d+\\\\}\\\\})/g, (s) => { + return (await formattedJSON).replace(/("{{\d+}}")|({{\d+}})|(\\\\{\\\\{\d+\\\\}\\\\})/g, (s: string) => { const index = parseInt( s.startsWith('"{{') ? s.slice(3, -3) : s.startsWith("{{") ? s.slice(2, -2) : s.slice(6, -6) ); diff --git a/client/yarn.lock b/client/yarn.lock index 9f174cb5e..8517c9424 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -12328,21 +12328,6 @@ __metadata: languageName: unknown linkType: soft -"lowcoder-hillcharts@workspace:packages/lowcoder-hillcharts": - version: 0.0.0-use.local - resolution: "lowcoder-hillcharts@workspace:packages/lowcoder-hillcharts" - dependencies: - "@types/react": 17 - "@types/react-dom": 17 - lowcoder-dev-utils: ^0.0.6 - lowcoder-sdk: ^2.1.9 - react: 17 - react-dom: 17 - typescript: 5.3.3 - vite: ^5.0.6 - languageName: unknown - linkType: soft - "lowcoder-plugin-demo@workspace:packages/lowcoder-plugin-demo": version: 0.0.0-use.local resolution: "lowcoder-plugin-demo@workspace:packages/lowcoder-plugin-demo"