feat: add define to package entrypoint (#22)

* feat: add define to entrypoint

* feat: add define to package entrypoint

.changeset/witty-ears-shop.md

@@ -0,0 +1,5 @@
+---
+"@primer/live-region-element": minor
+---
+
+Add define behavior to entrypoint, remove define entrypoint

packages/live-region-element/package.json

@@ -16,18 +16,6 @@
       },
       "import": "./dist/esm/index.js",
       "require": "./dist/cjs/index.cjs"
-    },
-    "./define": {
-      "types": {
-        "import": "./dist/esm/define.d.ts",
-        "require": "./dist/cjs/define.d.cts"
-      },
-      "node": {
-        "import": "./dist/esm/node/define.js",
-        "require": "./dist/cjs/node/define.cjs"
-      },
-      "import": "./dist/esm/define.js",
-      "require": "./dist/cjs/define.cjs"
     }
   },
   "repository": {
@@ -68,9 +56,14 @@
   },
   "sideEffects": [
     "./src/define.ts",
+    "./src/index.ts",
     "./dist/esm/define.js",
-    "./dist/cjs/define.js",
+    "./dist/esm/index.js",
+    "./dist/cjs/define.cjs",
+    "./dist/cjs/index.cjs",
     "./dist/esm/node/define.js",
-    "./dist/cjs/node/define.js"
+    "./dist/esm/node/index.js",
+    "./dist/cjs/node/define.cjs",
+    "./dist/cjs/node/index.cjs"
   ]
 }

packages/live-region-element/rollup.config.js

@@ -8,7 +8,7 @@ import typescript from 'rollup-plugin-typescript2'
  */
 const config = [
   {
-    input: ['./src/index.ts', './src/define.ts'],
+    input: ['./src/index.ts'],
     external: ['@lit-labs/ssr-dom-shim'],
     plugins: [typescript({tsconfig: 'tsconfig.build.json'}), esbuild()],
     output: {
@@ -17,7 +17,7 @@ const config = [
     },
   },
   {
-    input: ['./src/index.ts', './src/define.ts'],
+    input: ['./src/index.ts'],
     external: ['@lit-labs/ssr-dom-shim'],
     plugins: [typescript({tsconfig: 'tsconfig.build.json'}), esbuild()],
     output: {
@@ -27,7 +27,7 @@ const config = [
     },
   },
   {
-    input: ['./src/index.ts', './src/define.ts'],
+    input: ['./src/index.ts'],
     external: ['@lit-labs/ssr-dom-shim'],
     plugins: [
       esbuild(),
@@ -50,7 +50,7 @@ const config = [
     },
   },
   {
-    input: ['./src/index.ts', './src/define.ts'],
+    input: ['./src/index.ts'],
     external: ['@lit-labs/ssr-dom-shim'],
     plugins: [
       esbuild(),

packages/live-region-element/src/__tests__/global-announce.test.ts

@@ -1,7 +1,6 @@
 import {afterEach, describe, test, expect} from 'vitest'
 import {announce, announceFromElement} from '../'
 import {LiveRegionElement} from '../live-region-element'
-import '../define'
 
 describe('Global announcements', () => {
   afterEach(() => {

packages/live-region-element/src/index.ts

@@ -1,3 +1,4 @@
+import './define'
 import {LiveRegionElement, templateContent, type AnnounceOptions} from './live-region-element'
 
 type GlobalAnnounceOptions = AnnounceOptions & {

packages/live-region-element/src/live-region-element.ts

@@ -42,8 +42,9 @@ class LiveRegionElement extends HTMLElement {
    * corresponding politeness level
    */
   public announceFromElement(element: HTMLElement, options?: AnnounceOptions) {
-    if (element.textContent) {
-      this.announce(element.textContent, options)
+    const textContent = getTextContent(element)
+    if (textContent !== '') {
+      this.announce(textContent, options)
     }
   }
 
@@ -56,6 +57,22 @@ class LiveRegionElement extends HTMLElement {
   }
 }
 
+function getTextContent(element: HTMLElement): string {
+  let value: string | null = ''
+
+  if (element.hasAttribute('aria-label')) {
+    value = element.getAttribute('aria-label')
+    // eslint-disable-next-line github/no-innerText
+  } else if (element.innerText) {
+    // eslint-disable-next-line github/no-innerText
+    value = element.innerText
+  } else if (element.textContent) {
+    value = element.textContent
+  }
+
+  return value ? value.trim() : ''
+}
+
 let template: HTMLTemplateElement | null = null
 
 const templateContent = `

website/src/components/Layout.tsx

@@ -1,7 +1,5 @@
 'use client'
 
-import '@primer/live-region-element/define'
-
 export function Layout({children}: React.PropsWithChildren) {
   return children
 }