From ba07659f6a781a34b9a9da44622d24c3a38b91a7 Mon Sep 17 00:00:00 2001 From: Erik Engi Date: Thu, 3 Apr 2025 02:23:15 +0200 Subject: [PATCH 1/6] implemented #3320 --- .changeset/feat-styled-tags-export.md | 5 +++++ packages/styled/package.json | 15 +++++++++++++++ packages/styled/src/index.ts | 2 +- packages/styled/src/tags.ts | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 .changeset/feat-styled-tags-export.md diff --git a/.changeset/feat-styled-tags-export.md b/.changeset/feat-styled-tags-export.md new file mode 100644 index 0000000000..ff713f9323 --- /dev/null +++ b/.changeset/feat-styled-tags-export.md @@ -0,0 +1,5 @@ +--- +"@emotion/styled": minor +--- + +Added ability to import tags directly from '@emotion/styled/tags' \ No newline at end of file diff --git a/packages/styled/package.json b/packages/styled/package.json index c79ba24c25..636bdfa0fe 100644 --- a/packages/styled/package.json +++ b/packages/styled/package.json @@ -44,6 +44,20 @@ ], "umd:main": "dist/emotion-styled.umd.min.js", "exports": { + "./tags": { + "types": { + "import": "./base/dist/emotion-styled-tags.cjs.mjs", + "default": "./base/dist/emotion-styled-tags.cjs.js" + }, + "development": { + "module": "./dist/emotion-styled-tags.development.esm.js", + "import": "./dist/emotion-styled-tags.development.cjs.mjs", + "default": "./dist/emotion-styled-tags.development.cjs.js" + }, + "module": "./dist/emotion-styled-tags.esm.js", + "import": "./dist/emotion-styled-tags.cjs.mjs", + "default": "./dist/emotion-styled-tags.cjs.js" + }, "./base": { "types": { "import": "./base/dist/emotion-styled-base.cjs.mjs", @@ -177,6 +191,7 @@ "preconstruct": { "umdName": "emotionStyled", "entrypoints": [ + "./tags.ts", "./index.ts", "./base.tsx" ], diff --git a/packages/styled/src/index.ts b/packages/styled/src/index.ts index 2d8877ff1a..7d145b1f5e 100644 --- a/packages/styled/src/index.ts +++ b/packages/styled/src/index.ts @@ -1,7 +1,7 @@ import { Theme } from '@emotion/react' import styled from './base' import { ReactJSXIntrinsicElements } from './jsx-namespace' -import { tags } from './tags' +import tags from './tags' import { CreateStyledComponent, CreateStyled as BaseCreateStyled diff --git a/packages/styled/src/tags.ts b/packages/styled/src/tags.ts index 437bd1a03f..35d312bdfe 100644 --- a/packages/styled/src/tags.ts +++ b/packages/styled/src/tags.ts @@ -1,4 +1,4 @@ -export const tags = [ +export default [ 'a', 'abbr', 'address', From 2ef91c8d8ef5dd8ce4d97cf99228dba8742c0b9d Mon Sep 17 00:00:00 2001 From: Erik Engi Date: Thu, 3 Apr 2025 02:52:51 +0200 Subject: [PATCH 2/6] implemented #3320 --- packages/styled/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/styled/package.json b/packages/styled/package.json index 636bdfa0fe..a5d3ac859b 100644 --- a/packages/styled/package.json +++ b/packages/styled/package.json @@ -46,8 +46,8 @@ "exports": { "./tags": { "types": { - "import": "./base/dist/emotion-styled-tags.cjs.mjs", - "default": "./base/dist/emotion-styled-tags.cjs.js" + "import": "./dist/emotion-styled-tags.cjs.mjs", + "default": "./dist/emotion-styled-tags.cjs.js" }, "development": { "module": "./dist/emotion-styled-tags.development.esm.js", From 963d4e96d0fa352a862304465e4dd29323eb07df Mon Sep 17 00:00:00 2001 From: Erik Engi Date: Thu, 3 Apr 2025 02:57:09 +0200 Subject: [PATCH 3/6] implemented emotion-js#3320 --- packages/styled/package.json | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/packages/styled/package.json b/packages/styled/package.json index a5d3ac859b..5bc4cf7e1e 100644 --- a/packages/styled/package.json +++ b/packages/styled/package.json @@ -50,10 +50,50 @@ "default": "./dist/emotion-styled-tags.cjs.js" }, "development": { + "edge-light": { + "module": "./dist/emotion-styled-tags.development.edge-light.esm.js", + "import": "./dist/emotion-styled-tags.development.edge-light.cjs.mjs", + "default": "./dist/emotion-styled-tags.development.edge-light.cjs.js" + }, + "worker": { + "module": "./dist/emotion-styled-tags.development.edge-light.esm.js", + "import": "./dist/emotion-styled-tags.development.edge-light.cjs.mjs", + "default": "./dist/emotion-styled-tags.development.edge-light.cjs.js" + }, + "workerd": { + "module": "./dist/emotion-styled-tags.development.edge-light.esm.js", + "import": "./dist/emotion-styled-tags.development.edge-light.cjs.mjs", + "default": "./dist/emotion-styled-tags.development.edge-light.cjs.js" + }, + "browser": { + "module": "./dist/emotion-styled-tags.browser.development.esm.js", + "import": "./dist/emotion-styled-tags.browser.development.cjs.mjs", + "default": "./dist/emotion-styled-tags.browser.development.cjs.js" + }, "module": "./dist/emotion-styled-tags.development.esm.js", "import": "./dist/emotion-styled-tags.development.cjs.mjs", "default": "./dist/emotion-styled-tags.development.cjs.js" }, + "edge-light": { + "module": "./dist/emotion-styled-tags.edge-light.esm.js", + "import": "./dist/emotion-styled-tags.edge-light.cjs.mjs", + "default": "./dist/emotion-styled-tags.edge-light.cjs.js" + }, + "worker": { + "module": "./dist/emotion-styled-tags.edge-light.esm.js", + "import": "./dist/emotion-styled-tags.edge-light.cjs.mjs", + "default": "./dist/emotion-styled-tags.edge-light.cjs.js" + }, + "workerd": { + "module": "./dist/emotion-styled-tags.edge-light.esm.js", + "import": "./dist/emotion-styled-tags.edge-light.cjs.mjs", + "default": "./dist/emotion-styled-tags.edge-light.cjs.js" + }, + "browser": { + "module": "./dist/emotion-styled-tags.browser.esm.js", + "import": "./dist/emotion-styled-tags.browser.cjs.mjs", + "default": "./dist/emotion-styled-tags.browser.cjs.js" + }, "module": "./dist/emotion-styled-tags.esm.js", "import": "./dist/emotion-styled-tags.cjs.mjs", "default": "./dist/emotion-styled-tags.cjs.js" From 4f97d8fc2bacbbb293ab19f2f52fd364f53ef0e6 Mon Sep 17 00:00:00 2001 From: Erik Engi Date: Thu, 3 Apr 2025 03:06:20 +0200 Subject: [PATCH 4/6] implemented #3320 --- packages/styled/package.json | 64 ++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/styled/package.json b/packages/styled/package.json index 5bc4cf7e1e..2b3b67c154 100644 --- a/packages/styled/package.json +++ b/packages/styled/package.json @@ -46,57 +46,57 @@ "exports": { "./tags": { "types": { - "import": "./dist/emotion-styled-tags.cjs.mjs", - "default": "./dist/emotion-styled-tags.cjs.js" + "import": "./tags/dist/emotion-styled-tags.cjs.mjs", + "default": "./tags/dist/emotion-styled-tags.cjs.js" }, "development": { "edge-light": { - "module": "./dist/emotion-styled-tags.development.edge-light.esm.js", - "import": "./dist/emotion-styled-tags.development.edge-light.cjs.mjs", - "default": "./dist/emotion-styled-tags.development.edge-light.cjs.js" + "module": "./tags/dist/emotion-styled-tags.development.edge-light.esm.js", + "import": "./tags/dist/emotion-styled-tags.development.edge-light.cjs.mjs", + "default": "./tags/dist/emotion-styled-tags.development.edge-light.cjs.js" }, "worker": { - "module": "./dist/emotion-styled-tags.development.edge-light.esm.js", - "import": "./dist/emotion-styled-tags.development.edge-light.cjs.mjs", - "default": "./dist/emotion-styled-tags.development.edge-light.cjs.js" + "module": "./tags/dist/emotion-styled-tags.development.edge-light.esm.js", + "import": "./tags/dist/emotion-styled-tags.development.edge-light.cjs.mjs", + "default": "./tags/dist/emotion-styled-tags.development.edge-light.cjs.js" }, "workerd": { - "module": "./dist/emotion-styled-tags.development.edge-light.esm.js", - "import": "./dist/emotion-styled-tags.development.edge-light.cjs.mjs", - "default": "./dist/emotion-styled-tags.development.edge-light.cjs.js" + "module": "./tags/dist/emotion-styled-tags.development.edge-light.esm.js", + "import": "./tags/dist/emotion-styled-tags.development.edge-light.cjs.mjs", + "default": "./tags/dist/emotion-styled-tags.development.edge-light.cjs.js" }, "browser": { - "module": "./dist/emotion-styled-tags.browser.development.esm.js", - "import": "./dist/emotion-styled-tags.browser.development.cjs.mjs", - "default": "./dist/emotion-styled-tags.browser.development.cjs.js" + "module": "./tags/dist/emotion-styled-tags.browser.development.esm.js", + "import": "./tags/dist/emotion-styled-tags.browser.development.cjs.mjs", + "default": "./tags/dist/emotion-styled-tags.browser.development.cjs.js" }, - "module": "./dist/emotion-styled-tags.development.esm.js", - "import": "./dist/emotion-styled-tags.development.cjs.mjs", - "default": "./dist/emotion-styled-tags.development.cjs.js" + "module": "./tags/dist/emotion-styled-tags.development.esm.js", + "import": "./tags/dist/emotion-styled-tags.development.cjs.mjs", + "default": "./tags/dist/emotion-styled-tags.development.cjs.js" }, "edge-light": { - "module": "./dist/emotion-styled-tags.edge-light.esm.js", - "import": "./dist/emotion-styled-tags.edge-light.cjs.mjs", - "default": "./dist/emotion-styled-tags.edge-light.cjs.js" + "module": "./tags/dist/emotion-styled-tags.edge-light.esm.js", + "import": "./tags/dist/emotion-styled-tags.edge-light.cjs.mjs", + "default": "./tags/dist/emotion-styled-tags.edge-light.cjs.js" }, "worker": { - "module": "./dist/emotion-styled-tags.edge-light.esm.js", - "import": "./dist/emotion-styled-tags.edge-light.cjs.mjs", - "default": "./dist/emotion-styled-tags.edge-light.cjs.js" + "module": "./tags/dist/emotion-styled-tags.edge-light.esm.js", + "import": "./tags/dist/emotion-styled-tags.edge-light.cjs.mjs", + "default": "./tags/dist/emotion-styled-tags.edge-light.cjs.js" }, "workerd": { - "module": "./dist/emotion-styled-tags.edge-light.esm.js", - "import": "./dist/emotion-styled-tags.edge-light.cjs.mjs", - "default": "./dist/emotion-styled-tags.edge-light.cjs.js" + "module": "./tags/dist/emotion-styled-tags.edge-light.esm.js", + "import": "./tags/dist/emotion-styled-tags.edge-light.cjs.mjs", + "default": "./tags/dist/emotion-styled-tags.edge-light.cjs.js" }, "browser": { - "module": "./dist/emotion-styled-tags.browser.esm.js", - "import": "./dist/emotion-styled-tags.browser.cjs.mjs", - "default": "./dist/emotion-styled-tags.browser.cjs.js" + "module": "./tags/dist/emotion-styled-tags.browser.esm.js", + "import": "./tags/dist/emotion-styled-tags.browser.cjs.mjs", + "default": "./tags/dist/emotion-styled-tags.browser.cjs.js" }, - "module": "./dist/emotion-styled-tags.esm.js", - "import": "./dist/emotion-styled-tags.cjs.mjs", - "default": "./dist/emotion-styled-tags.cjs.js" + "module": "./tags/dist/emotion-styled-tags.esm.js", + "import": "./tags/dist/emotion-styled-tags.cjs.mjs", + "default": "./tags/dist/emotion-styled-tags.cjs.js" }, "./base": { "types": { From 576ae256e58893176939e753ccacac1066077288 Mon Sep 17 00:00:00 2001 From: Erik Engi Date: Thu, 3 Apr 2025 03:09:51 +0200 Subject: [PATCH 5/6] implemented #3320 --- packages/styled/tags/package.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 packages/styled/tags/package.json diff --git a/packages/styled/tags/package.json b/packages/styled/tags/package.json new file mode 100644 index 0000000000..b22de201f2 --- /dev/null +++ b/packages/styled/tags/package.json @@ -0,0 +1,9 @@ +{ + "main": "dist/emotion-styled-tags.cjs.js", + "module": "dist/emotion-styled-tags.esm.js", + "umd:main": "dist/emotion-styled-tags.umd.min.js", + "types": "dist/emotion-styled-tags.cjs.d.ts", + "preconstruct": { + "umdName": "emotionStyledTags" + } +} From f3039fabd1a814c496193cb4062aaea00e054f47 Mon Sep 17 00:00:00 2001 From: Erik Engi Date: Sat, 5 Apr 2025 19:25:05 +0200 Subject: [PATCH 6/6] added a missing setting --- packages/styled/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/styled/package.json b/packages/styled/package.json index 2b3b67c154..2571f6f764 100644 --- a/packages/styled/package.json +++ b/packages/styled/package.json @@ -39,6 +39,7 @@ "files": [ "src", "dist", + "tags", "base", "macro.*" ],