Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

refactor: migrate curl parse to args-tokenizer (#4628)

Bogdan Chadkine877b1f93ac5
diff --git a/@types/arrgv.d.ts b/@types/arrgv.d.ts
deleted file mode 100644
index fe07b3b6b7..0000000000
--- a/@types/arrgv.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-declare module "arrgv" {
- export default function arrgv(input: string): string[];
-}
diff --git a/apps/builder/app/builder/features/settings-panel/curl.ts b/apps/builder/app/builder/features/settings-panel/curl.ts
index 36948f684e..2238ddc993 100644
--- a/apps/builder/app/builder/features/settings-panel/curl.ts
+++ b/apps/builder/app/builder/features/settings-panel/curl.ts
@@ -1,5 +1,5 @@
import type { ResourceRequest } from "@webstudio-is/sdk";
-import arrgv from "arrgv";
+import { tokenizeArgs } from "args-tokenizer";
import { parse as parseArgs } from "ultraflag";
/*
@@ -30,15 +30,7 @@ export type CurlRequest = Pick<
>;
export const parseCurl = (curl: string): undefined | CurlRequest => {
- // remove backslash followed by newline
- // https://github.com/astur/arrgv/issues/3
- curl = curl.replaceAll(/\\(?=\s)/g, "");
- let argv;
- try {
- argv = arrgv(curl);
- } catch {
- return;
- }
+ const argv = tokenizeArgs(curl);
if (argv.length === 0) {
return;
}
diff --git a/apps/builder/package.json b/apps/builder/package.json
index d62635ec77..a69c56b5de 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -75,7 +75,7 @@
"@webstudio-is/sdk-components-react-radix": "workspace:*",
"@webstudio-is/template": "workspace:*",
"@webstudio-is/trpc-interface": "workspace:*",
- "arrgv": "^1.0.2",
+ "args-tokenizer": "^0.1.0",
"bcp-47": "^2.1.0",
"change-case": "^5.4.4",
"colord": "^2.9.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 11f844f741..0b1dfa570b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -292,9 +292,9 @@ importers:
'@webstudio-is/trpc-interface':
specifier: workspace:*
version: link:../../packages/trpc-interface
- arrgv:
- specifier: ^1.0.2
- version: 1.0.2
+ args-tokenizer:
+ specifier: ^0.1.0
+ version: 0.1.0
bcp-47:
specifier: ^2.1.0
version: 2.1.0
@@ -5111,6 +5111,9 @@ packages:
resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+ resolution: {integrity: sha512-9yDBBeg+2WTmWXJMfdO3efV+VknAL2UlxS7Yxt5e/aYjMW3yDiQhGPuFg+wEuTGN3JxsRL/wjCg0qBDFklyXjw==}
+
resolution: {integrity: sha512-RhVWFtKH5BiGMycI72q2RAFMLQi8JP9bLuQXgR5a8Znp7P5KOIADSJeyfI8PCVxLEp067B2HbP5JIiI/PXIZeA==}
engines: {node: '>=8.5.0'}
@@ -5127,10 +5130,6 @@ packages:
resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==}
- resolution: {integrity: sha512-a4eg4yhp7mmruZDQFqVMlxNRFGi/i1r87pt8SDHy0/I8PqSXoUTlWZRdAZo0VXgvEARcujbtTk8kiZRi1uDGRw==}
- engines: {node: '>=8.0.0'}
-
resolution: {integrity: sha512-xvsWESUJn0JN421Xb9MQw6AsMHRCUknCe0Wjlxvjud80mU4E6hQf1A6NzQKcYNmYw62MfzEtXc+badstZP3JpQ==}
@@ -12008,6 +12007,8 @@ snapshots:
+
dependencies:
tslib: 1.14.1
@@ -12027,8 +12028,6 @@ snapshots:
-
dependencies:
printable-characters: 1.0.42