From 3cc866214dcd4c3b9dc84bf885d8faf1a25245ba Mon Sep 17 00:00:00 2001 From: Bj Tecu Date: Fri, 11 Mar 2022 11:39:57 -0500 Subject: [PATCH 1/3] Make styles safe --- packages/ember/rollup.config.js | 2 +- packages/ember/src/render.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/ember/rollup.config.js b/packages/ember/rollup.config.js index a84e9ef..da94f97 100644 --- a/packages/ember/rollup.config.js +++ b/packages/ember/rollup.config.js @@ -11,7 +11,7 @@ const config = [ format: 'esm', }, ], - external: ['@glimmer/component', '@glimmer/tracking'], + external: ['@ember/template', '@glimmer/component', '@glimmer/tracking'], plugins: [ resolve({ browser: true, diff --git a/packages/ember/src/render.ts b/packages/ember/src/render.ts index d32567d..601b6d9 100644 --- a/packages/ember/src/render.ts +++ b/packages/ember/src/render.ts @@ -1,3 +1,4 @@ +import { htmlSafe } from '@ember/template'; import type { IconifyIcon } from '@iconify/types'; import type { FullIconCustomisations } from '@iconify/utils/lib/customisations'; import { @@ -124,7 +125,7 @@ export const render = ( return { ...item.attributes, - style: style === '' ? void 0 : style, + style: style === '' ? void 0 : htmlSafe(style), className, body, }; From 8d7043692e9cc3bd84e5d8e63cad0d837fe71775 Mon Sep 17 00:00:00 2001 From: Bj Tecu Date: Mon, 14 Mar 2022 09:28:00 -0400 Subject: [PATCH 2/3] Add ember-source package --- packages/ember/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/ember/package.json b/packages/ember/package.json index 00dbaad..bed6ab6 100644 --- a/packages/ember/package.json +++ b/packages/ember/package.json @@ -27,6 +27,7 @@ "@microsoft/api-extractor": "^7.19.4", "@rollup/plugin-node-resolve": "^13.1.3", "@rollup/plugin-typescript": "^8.3.0", + "ember-source": "~4.1.0", "rollup": "^2.66.0", "typescript": "^4.5.5" }, From 41db5b5c0606f26cc5a605caf151d7a16502cb0d Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Mon, 14 Mar 2022 15:50:58 +0200 Subject: [PATCH 3/3] Fix dependencies in Ember component, ignore import from @ember/template --- packages/ember/package.json | 1 - packages/ember/src/render.ts | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ember/package.json b/packages/ember/package.json index bed6ab6..00dbaad 100644 --- a/packages/ember/package.json +++ b/packages/ember/package.json @@ -27,7 +27,6 @@ "@microsoft/api-extractor": "^7.19.4", "@rollup/plugin-node-resolve": "^13.1.3", "@rollup/plugin-typescript": "^8.3.0", - "ember-source": "~4.1.0", "rollup": "^2.66.0", "typescript": "^4.5.5" }, diff --git a/packages/ember/src/render.ts b/packages/ember/src/render.ts index 601b6d9..2d589a2 100644 --- a/packages/ember/src/render.ts +++ b/packages/ember/src/render.ts @@ -1,3 +1,4 @@ +// @ts-ignore import { htmlSafe } from '@ember/template'; import type { IconifyIcon } from '@iconify/types'; import type { FullIconCustomisations } from '@iconify/utils/lib/customisations';