From 5428bc83e8995d7edeafd74be09bc5633f46c0a5 Mon Sep 17 00:00:00 2001 From: cohitre Date: Mon, 3 Jun 2024 11:45:28 -0700 Subject: [PATCH 1/3] Fixing markdown allowed attributes --- packages/block-text/package-lock.json | 4 ++-- packages/block-text/package.json | 2 +- packages/block-text/src/EmailMarkdown.tsx | 5 ++++- packages/editor-sample/package-lock.json | 21 +++++++++++++++++---- packages/editor-sample/package.json | 2 +- packages/email-builder/package-lock.json | 8 ++++---- packages/email-builder/package.json | 2 +- 7 files changed, 30 insertions(+), 14 deletions(-) diff --git a/packages/block-text/package-lock.json b/packages/block-text/package-lock.json index fac17c6..8e03601 100644 --- a/packages/block-text/package-lock.json +++ b/packages/block-text/package-lock.json @@ -1,12 +1,12 @@ { "name": "@usewaypoint/block-text", - "version": "0.0.5", + "version": "0.0.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@usewaypoint/block-text", - "version": "0.0.5", + "version": "0.0.6", "license": "MIT", "dependencies": { "insane": "^2.6.2", diff --git a/packages/block-text/package.json b/packages/block-text/package.json index f5ca587..a96d210 100644 --- a/packages/block-text/package.json +++ b/packages/block-text/package.json @@ -1,6 +1,6 @@ { "name": "@usewaypoint/block-text", - "version": "0.0.5", + "version": "0.0.6", "description": "@usewaypoint/document compatible Text component", "main": "./dist/index.js", "module": "./dist/index.mjs", diff --git a/packages/block-text/src/EmailMarkdown.tsx b/packages/block-text/src/EmailMarkdown.tsx index b390c89..ef7cafb 100644 --- a/packages/block-text/src/EmailMarkdown.tsx +++ b/packages/block-text/src/EmailMarkdown.tsx @@ -57,8 +57,11 @@ function sanitizer(html: string): string { }, {}), img: ['src', 'srcset', 'alt', 'width', 'height', ...GENERIC_ALLOWED_ATTRIBUTES], table: ['width', ...GENERIC_ALLOWED_ATTRIBUTES], - td: ['width', ...GENERIC_ALLOWED_ATTRIBUTES], + td: ['align', 'width', ...GENERIC_ALLOWED_ATTRIBUTES], + th: ['align', 'width', ...GENERIC_ALLOWED_ATTRIBUTES], a: ['href', 'target', ...GENERIC_ALLOWED_ATTRIBUTES], + ol: ['start', ...GENERIC_ALLOWED_ATTRIBUTES], + ul: ['start', ...GENERIC_ALLOWED_ATTRIBUTES], }, }); } diff --git a/packages/editor-sample/package-lock.json b/packages/editor-sample/package-lock.json index 4746627..e169e81 100644 --- a/packages/editor-sample/package-lock.json +++ b/packages/editor-sample/package-lock.json @@ -21,7 +21,7 @@ "@usewaypoint/block-html": "^0.0.3", "@usewaypoint/block-image": "^0.0.5", "@usewaypoint/block-spacer": "^0.0.3", - "@usewaypoint/block-text": "^0.0.5", + "@usewaypoint/block-text": "^0.0.6", "@usewaypoint/document-core": "^0.0.6", "@usewaypoint/email-builder": "^0.0.7", "highlight.js": "^11.9.0", @@ -1959,9 +1959,9 @@ } }, "node_modules/@usewaypoint/block-text": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/@usewaypoint/block-text/-/block-text-0.0.5.tgz", - "integrity": "sha512-b8xCDL3iruOfoxrvg4bMBcNgb9iQnU53Qp6VZskEA++L2Pz4tTWZ267ChPce7ocWhd7m17LpXrVdyC+6GvPHTw==", + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/@usewaypoint/block-text/-/block-text-0.0.6.tgz", + "integrity": "sha512-tsKTNLXUYs1PkM8G5sgIhO3KnW1IFTx2q+lnq5Y4prHeHNBrArez5BbwAyvwBKnhcIt5c4gYL2CSklIU4+hLLw==", "dependencies": { "insane": "^2.6.2", "marked": "^12.0.2" @@ -2003,6 +2003,19 @@ "zod": "^1 || ^2 || ^3" } }, + "node_modules/@usewaypoint/email-builder/node_modules/@usewaypoint/block-text": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/@usewaypoint/block-text/-/block-text-0.0.5.tgz", + "integrity": "sha512-b8xCDL3iruOfoxrvg4bMBcNgb9iQnU53Qp6VZskEA++L2Pz4tTWZ267ChPce7ocWhd7m17LpXrVdyC+6GvPHTw==", + "dependencies": { + "insane": "^2.6.2", + "marked": "^12.0.2" + }, + "peerDependencies": { + "react": "^16 || ^17 || ^18", + "zod": "^1 || ^2 || ^3" + } + }, "node_modules/@vitejs/plugin-react-swc": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/@vitejs/plugin-react-swc/-/plugin-react-swc-3.6.0.tgz", diff --git a/packages/editor-sample/package.json b/packages/editor-sample/package.json index f57618f..d9c7f50 100644 --- a/packages/editor-sample/package.json +++ b/packages/editor-sample/package.json @@ -21,7 +21,7 @@ "@usewaypoint/block-html": "^0.0.3", "@usewaypoint/block-image": "^0.0.5", "@usewaypoint/block-spacer": "^0.0.3", - "@usewaypoint/block-text": "^0.0.5", + "@usewaypoint/block-text": "^0.0.6", "@usewaypoint/document-core": "^0.0.6", "@usewaypoint/email-builder": "^0.0.7", "highlight.js": "^11.9.0", diff --git a/packages/email-builder/package-lock.json b/packages/email-builder/package-lock.json index f9d30b9..f068e93 100644 --- a/packages/email-builder/package-lock.json +++ b/packages/email-builder/package-lock.json @@ -18,7 +18,7 @@ "@usewaypoint/block-html": "^0.0.3", "@usewaypoint/block-image": "^0.0.5", "@usewaypoint/block-spacer": "^0.0.3", - "@usewaypoint/block-text": "^0.0.5", + "@usewaypoint/block-text": "^0.0.6", "@usewaypoint/document-core": "^0.0.6" }, "peerDependencies": { @@ -109,9 +109,9 @@ } }, "node_modules/@usewaypoint/block-text": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/@usewaypoint/block-text/-/block-text-0.0.5.tgz", - "integrity": "sha512-b8xCDL3iruOfoxrvg4bMBcNgb9iQnU53Qp6VZskEA++L2Pz4tTWZ267ChPce7ocWhd7m17LpXrVdyC+6GvPHTw==", + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/@usewaypoint/block-text/-/block-text-0.0.6.tgz", + "integrity": "sha512-tsKTNLXUYs1PkM8G5sgIhO3KnW1IFTx2q+lnq5Y4prHeHNBrArez5BbwAyvwBKnhcIt5c4gYL2CSklIU4+hLLw==", "dependencies": { "insane": "^2.6.2", "marked": "^12.0.2" diff --git a/packages/email-builder/package.json b/packages/email-builder/package.json index 405e226..b6d6d4b 100644 --- a/packages/email-builder/package.json +++ b/packages/email-builder/package.json @@ -35,7 +35,7 @@ "@usewaypoint/block-html": "^0.0.3", "@usewaypoint/block-image": "^0.0.5", "@usewaypoint/block-spacer": "^0.0.3", - "@usewaypoint/block-text": "^0.0.5", + "@usewaypoint/block-text": "^0.0.6", "@usewaypoint/document-core": "^0.0.6" } } From e2946aacf2cd0b2bdfe3b52fc02f1c96c858e963 Mon Sep 17 00:00:00 2001 From: cohitre Date: Mon, 3 Jun 2024 11:46:51 -0700 Subject: [PATCH 2/3] Bumping email-builder --- packages/email-builder/package-lock.json | 4 ++-- packages/email-builder/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/email-builder/package-lock.json b/packages/email-builder/package-lock.json index f068e93..07846d7 100644 --- a/packages/email-builder/package-lock.json +++ b/packages/email-builder/package-lock.json @@ -1,12 +1,12 @@ { "name": "@usewaypoint/email-builder", - "version": "0.0.7", + "version": "0.0.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@usewaypoint/email-builder", - "version": "0.0.7", + "version": "0.0.8", "license": "MIT", "dependencies": { "@usewaypoint/block-avatar": "^0.0.3", diff --git a/packages/email-builder/package.json b/packages/email-builder/package.json index b6d6d4b..de53cc2 100644 --- a/packages/email-builder/package.json +++ b/packages/email-builder/package.json @@ -1,6 +1,6 @@ { "name": "@usewaypoint/email-builder", - "version": "0.0.7", + "version": "0.0.8", "description": "React component to render email messages", "main": "./dist/index.js", "module": "./dist/index.mjs", From 5a2a06589e605ccbf9a7a57dcb5ed5845911d9bc Mon Sep 17 00:00:00 2001 From: cohitre Date: Mon, 3 Jun 2024 11:54:19 -0700 Subject: [PATCH 3/3] Markdown switch default value --- packages/editor-sample/package-lock.json | 23 ++++--------------- packages/editor-sample/package.json | 2 +- .../input-panels/TextSidebarPanel.tsx | 2 +- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/packages/editor-sample/package-lock.json b/packages/editor-sample/package-lock.json index e169e81..b9f04d4 100644 --- a/packages/editor-sample/package-lock.json +++ b/packages/editor-sample/package-lock.json @@ -23,7 +23,7 @@ "@usewaypoint/block-spacer": "^0.0.3", "@usewaypoint/block-text": "^0.0.6", "@usewaypoint/document-core": "^0.0.6", - "@usewaypoint/email-builder": "^0.0.7", + "@usewaypoint/email-builder": "^0.0.8", "highlight.js": "^11.9.0", "prettier": "^3.2.5", "react": "^18.2.0", @@ -1981,9 +1981,9 @@ } }, "node_modules/@usewaypoint/email-builder": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@usewaypoint/email-builder/-/email-builder-0.0.7.tgz", - "integrity": "sha512-ANOLEz7mN+wsSQP06KQiVgYj398RLP/WmJ6+h0q8ZyXHZSHBCEnZRKg/42jwPAuvaDGQ5j/daMlhBdUxmZSe5Q==", + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@usewaypoint/email-builder/-/email-builder-0.0.8.tgz", + "integrity": "sha512-gP1Us3n/rh9GoCnJRHN8INqYD9qPJ0wErm0SCjz6ng8IGSBBL+k0fFKD7l1mT3BflZSjCl6heqRDu9aRw1AcFw==", "dependencies": { "@usewaypoint/block-avatar": "^0.0.3", "@usewaypoint/block-button": "^0.0.3", @@ -1994,7 +1994,7 @@ "@usewaypoint/block-html": "^0.0.3", "@usewaypoint/block-image": "^0.0.5", "@usewaypoint/block-spacer": "^0.0.3", - "@usewaypoint/block-text": "^0.0.5", + "@usewaypoint/block-text": "^0.0.6", "@usewaypoint/document-core": "^0.0.6" }, "peerDependencies": { @@ -2003,19 +2003,6 @@ "zod": "^1 || ^2 || ^3" } }, - "node_modules/@usewaypoint/email-builder/node_modules/@usewaypoint/block-text": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/@usewaypoint/block-text/-/block-text-0.0.5.tgz", - "integrity": "sha512-b8xCDL3iruOfoxrvg4bMBcNgb9iQnU53Qp6VZskEA++L2Pz4tTWZ267ChPce7ocWhd7m17LpXrVdyC+6GvPHTw==", - "dependencies": { - "insane": "^2.6.2", - "marked": "^12.0.2" - }, - "peerDependencies": { - "react": "^16 || ^17 || ^18", - "zod": "^1 || ^2 || ^3" - } - }, "node_modules/@vitejs/plugin-react-swc": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/@vitejs/plugin-react-swc/-/plugin-react-swc-3.6.0.tgz", diff --git a/packages/editor-sample/package.json b/packages/editor-sample/package.json index d9c7f50..a197149 100644 --- a/packages/editor-sample/package.json +++ b/packages/editor-sample/package.json @@ -23,7 +23,7 @@ "@usewaypoint/block-spacer": "^0.0.3", "@usewaypoint/block-text": "^0.0.6", "@usewaypoint/document-core": "^0.0.6", - "@usewaypoint/email-builder": "^0.0.7", + "@usewaypoint/email-builder": "^0.0.8", "highlight.js": "^11.9.0", "prettier": "^3.2.5", "react": "^18.2.0", diff --git a/packages/editor-sample/src/App/InspectorDrawer/ConfigurationPanel/input-panels/TextSidebarPanel.tsx b/packages/editor-sample/src/App/InspectorDrawer/ConfigurationPanel/input-panels/TextSidebarPanel.tsx index ca61a04..3ef17fb 100644 --- a/packages/editor-sample/src/App/InspectorDrawer/ConfigurationPanel/input-panels/TextSidebarPanel.tsx +++ b/packages/editor-sample/src/App/InspectorDrawer/ConfigurationPanel/input-panels/TextSidebarPanel.tsx @@ -34,7 +34,7 @@ export default function TextSidebarPanel({ data, setData }: TextSidebarPanelProp /> updateData({ ...data, props: { ...data.props, markdown } })} />