Minor fixes

Author: birdofpreyru

__tests__/__snapshots__/misc.test.tsx.snap

@@ -27,3 +27,7 @@ exports[`misc Declarative API only adds new tags and preserves tags when renderi
 exports[`misc Declarative API only adds new tags and preserves tags when rendering additional Helmet instances 5`] = `"<meta content="Test description" name="description" data-rh="true">"`;
 
 exports[`misc Declarative API recognizes valid tags regardless of attribute ordering 1`] = `"<meta content="Test Description" name="description" data-rh="true">"`;
+
+exports[`misc Declarative API throws on invalid elements 1`] = `"Only elements types base, body, Symbol(react.fragment), head, html, link, meta, noscript, script, style, title are allowed. Helmet does not support rendering <div> elements. Refer to our API for more information."`;
+
+exports[`misc Declarative API throws on invalid self-closing elements 1`] = `"Only elements types base, body, Symbol(react.fragment), head, html, link, meta, noscript, script, style, title are allowed. Helmet does not support rendering <div> elements. Refer to our API for more information."`;

__tests__/misc.test.tsx

@@ -350,9 +350,7 @@ describe('misc', () => {
         );
       };
 
-      expect(renderInvalid).toThrow(
-        'Only elements types base, body, head, html, link, meta, noscript, script, style, title, Symbol(react.fragment) are allowed. Helmet does not support rendering <div> elements. Refer to our API for more information.',
-      );
+      expect(renderInvalid).toThrowErrorMatchingSnapshot();
 
       global.console.error = consoleError;
     });
@@ -377,9 +375,7 @@ describe('misc', () => {
         /* eslint-enable react/no-unknown-property */
       };
 
-      expect(renderInvalid).toThrow(
-        'Only elements types base, body, head, html, link, meta, noscript, script, style, title, Symbol(react.fragment) are allowed. Helmet does not support rendering <div> elements. Refer to our API for more information.',
-      );
+      expect(renderInvalid).toThrowErrorMatchingSnapshot();
 
       global.console.error = consoleError;
     });

jest/browser-utils.tsx

@@ -1,11 +1,11 @@
 import {
   type FunctionComponent,
   type ReactNode,
-  act,
   StrictMode,
+  act,
 } from 'react';
 
-import { createRoot, type Root } from 'react-dom/client';
+import { type Root, createRoot } from 'react-dom/client';
 
 import Provider from '../src/Provider';
 import type { HelmetDataContext, HelmetServerState } from '../src/types';

src/Helmet.ts

@@ -1,17 +1,17 @@
 import {
+  Children,
   type FunctionComponent,
   type ReactElement,
   type ReactNode,
-  Children,
   use,
   useEffect,
   useId,
 } from 'react';
 
-import { REACT_TAG_MAP, TAG_NAMES, VALID_TAG_NAMES } from './constants';
-
 import { Context } from './Provider';
 
+import { REACT_TAG_MAP, TAG_NAMES, VALID_TAG_NAMES } from './constants';
+
 import type {
   BaseProps,
   BodyProps,

src/Provider.tsx

@@ -5,17 +5,17 @@ import {
   useRef,
 } from 'react';
 
+import { commitTagChanges } from './client';
+
+import { IS_DOM_ENVIRONMENT } from './constants';
+import { newServerState } from './server';
 import type {
   ContextValue,
   HelmetDataContext,
   HelmetProps,
   HelmetProviderHeap,
 } from './types';
-
-import { newServerState } from './server';
-import { IS_DOM_ENVIRONMENT } from './constants';
 import { calcAggregatedState } from './utils';
-import { commitTagChanges } from './client';
 
 export const Context = createContext<ContextValue | undefined>(undefined);
 

src/client.ts

@@ -18,8 +18,8 @@ import { flattenArray } from './utils';
 
 type TagUpdates = {
   allTags: HTMLElement[];
-  oldTags: HTMLElement[];
   newTags: HTMLElement[];
+  oldTags: HTMLElement[];
 };
 
 type TagUpdateList = Record<string, TagUpdates>;
@@ -92,8 +92,13 @@ function updateTags(type: string, tags: HelmetChildProps[]) {
     }
   }
 
-  oldTags.forEach((tag: Node) => tag.parentNode?.removeChild(tag));
-  newTags.forEach((tag) => headElement.appendChild(tag));
+  oldTags.forEach((tag: Node) => {
+    tag.parentNode?.removeChild(tag);
+  });
+
+  newTags.forEach((tag) => {
+    headElement.appendChild(tag);
+  });
 
   // TODO: Do we really need this return value anywhere? Especially `oldTags`
   // that have been removed from DOM already?

src/constants.ts

@@ -21,6 +21,7 @@ export enum ATTRIBUTE_NAMES {
 export enum TAG_NAMES {
   BASE = 'base',
   BODY = 'body',
+  FRAGMENT = 'Symbol(react.fragment)',
   HEAD = 'head',
   HTML = 'html',
   LINK = 'link',
@@ -29,7 +30,6 @@ export enum TAG_NAMES {
   SCRIPT = 'script',
   STYLE = 'style',
   TITLE = 'title',
-  FRAGMENT = 'Symbol(react.fragment)',
 }
 
 export const SEO_PRIORITY_TAGS = {

src/index.ts

@@ -1,5 +1,5 @@
 export type * from './types';
 
 export { default as Helmet } from './Helmet';
-export { default as HelmetProvider } from './Provider';
 export { default as MetaTags } from './MetaTags';
+export { default as HelmetProvider } from './Provider';

src/server.tsx

@@ -7,10 +7,10 @@ import {
 
 import {
   HELMET_ATTRIBUTE,
-  TAG_NAMES,
+  HTML_TAG_MAP,
   REACT_TAG_MAP,
+  TAG_NAMES,
   TAG_PROPERTIES,
-  HTML_TAG_MAP,
 } from './constants';
 
 import type {

src/types.ts

@@ -1,7 +1,7 @@
 import type {
   BaseHTMLAttributes,
-  HtmlHTMLAttributes,
   HTMLAttributes,
+  HtmlHTMLAttributes,
   LinkHTMLAttributes,
   MetaHTMLAttributes,
   ReactNode,
@@ -51,8 +51,8 @@ export type HelmetTags = {
 };
 
 export type HelmetDatum<T = ReactNode> = {
-  toString(): string;
   toComponent(): T;
+  toString(): string;
 };
 
 export type HelmetHTMLBodyDatum = HelmetDatum<HTMLAttributes<HTMLBodyElement>>;
@@ -138,8 +138,8 @@ export type HelmetPropBooleans = {
  * Properties accepted by <Helmet> components.
  */
 export type HelmetProps = HelmetPropArrays
-  & HelmetPropObjects
   & HelmetPropBooleans
+  & HelmetPropObjects
   & {
     base?: BaseProps;
     children?: ReactNode;