Skip to content

refactor: simplify xml generation #4942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 5, 2025
Merged

refactor: simplify xml generation #4942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16c86ef
refactor: simplify xml generation
TrySound Mar 4, 2025
66908ec
Fix dedupeMeta
TrySound Mar 5, 2025
1f62701
Remove unused import
TrySound Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fixtures/webstudio-features/.template/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { defineConfig } from "vite";
import { reactRouter } from "@react-router/dev/vite";
// @ts-ignore
import { dedupeMeta } from "./proxy-emulator/dedupe-meta";
import { existsSync, readdirSync } from "fs";
import { existsSync } from "fs";
// @ts-ignore
import path from "path";
// @ts-ignore
Expand Down
10 changes: 5 additions & 5 deletions fixtures/webstudio-features/.webstudio/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"build": {
"id": "fce42d58-8a67-4f4b-8427-ea7500132e28",
"id": "6f14cdae-073c-4f2c-b535-da3f404f3e36",
"projectId": "cddc1d44-af37-4cb6-a430-d300cf6f932d",
"version": 477,
"createdAt": "2025-02-28T14:52:36.082+00:00",
"updatedAt": "2025-02-28T14:52:36.082+00:00",
"version": 479,
"createdAt": "2025-03-04T16:25:33.097+00:00",
"updatedAt": "2025-03-04T16:25:33.097+00:00",
"pages": {
"meta": {
"siteName": "KittyGuardedZone",
Expand Down Expand Up @@ -2867,7 +2867,7 @@
"instanceId": "SVI6fI342JAxCvwsg4Oc6",
"name": "xmlns:xhtml",
"type": "string",
"value": "http://www.w3.org/1999/xhtml"
"value": "http://www.w3.org/TR/xhtml11/xhtml11_schema.html"
}
],
[
Expand Down
12 changes: 6 additions & 6 deletions fixtures/webstudio-features/app/__generated__/$resources.sitemap.xml.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

95 changes: 45 additions & 50 deletions fixtures/webstudio-features/app/__generated__/[sitemap.xml]._index.tsx
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion fixtures/webstudio-features/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dev": "react-router dev",
"cli": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",
"fixtures:link": "pnpm cli link --link https://p-cddc1d44-af37-4cb6-a430-d300cf6f932d-dot-${BUILDER_HOST:-main.development.webstudio.is}'?authToken=1cdc6026-dd5b-4624-b89b-9bd45e9bcc3d'",
"fixtures:sync": "pnpm cli sync --buildId fce42d58-8a67-4f4b-8427-ea7500132e28 && pnpm prettier --write ./.webstudio/",
"fixtures:sync": "pnpm cli sync --buildId 6f14cdae-073c-4f2c-b535-da3f404f3e36 && pnpm prettier --write ./.webstudio/",
"fixtures:build": "pnpm cli build --template react-router --template ./.template && pnpm prettier --write ./app/ ./package.json ./tsconfig.json"
},
"private": true,
Expand Down
7 changes: 4 additions & 3 deletions fixtures/webstudio-features/proxy-emulator/dedupe-meta.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,19 @@ export const dedupeMeta: Plugin = {
const originalWrite = res.write;
const originalEnd = res.end;

let body = "";
const buffers: Buffer[] = [];

res.write = (chunk) => {
body += chunk.toString();
buffers.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
return true;
};

res.end = (chunk) => {
if (chunk) {
body += chunk.toString();
buffers.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
}

const body = Buffer.concat(buffers).toString("utf8");
const response = new Response(body);

const metasSet = new Set<string>();
Expand Down
2 changes: 1 addition & 1 deletion fixtures/webstudio-features/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { defineConfig } from "vite";
import { reactRouter } from "@react-router/dev/vite";
// @ts-ignore
import { dedupeMeta } from "./proxy-emulator/dedupe-meta";
import { existsSync, readdirSync } from "fs";
import { existsSync } from "fs";
// @ts-ignore
import path from "path";
// @ts-ignore
Expand Down
Loading