From 7b3d69adf14681e0ebfd2ecca44e6eda138fa914 Mon Sep 17 00:00:00 2001
From: Romaric Pascal <romaric.pascal@digital.cabinet-office.gov.uk>
Date: Fri, 18 Aug 2023 12:23:41 +0100
Subject: [PATCH] Move `$module` inside the base component class

---
 .../src/govuk/components/accordion/accordion.mjs            | 3 ---
 .../govuk-frontend/src/govuk/components/button/button.mjs   | 3 ---
 .../govuk/components/character-count/character-count.mjs    | 3 ---
 .../src/govuk/components/checkboxes/checkboxes.mjs          | 3 ---
 .../src/govuk/components/error-summary/error-summary.mjs    | 3 ---
 .../src/govuk/components/exit-this-page/exit-this-page.mjs  | 3 ---
 .../govuk-frontend/src/govuk/components/header/header.mjs   | 3 ---
 .../components/notification-banner/notification-banner.mjs  | 3 ---
 .../govuk-frontend/src/govuk/components/radios/radios.mjs   | 3 ---
 .../src/govuk/components/skip-link/skip-link.mjs            | 5 ++++-
 packages/govuk-frontend/src/govuk/components/tabs/tabs.mjs  | 3 ---
 .../govuk-frontend/src/govuk/govuk-frontend-component.mjs   | 6 ++++++
 12 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/packages/govuk-frontend/src/govuk/components/accordion/accordion.mjs b/packages/govuk-frontend/src/govuk/components/accordion/accordion.mjs
index 97ece92165..f4b5ea0f3b 100644
--- a/packages/govuk-frontend/src/govuk/components/accordion/accordion.mjs
+++ b/packages/govuk-frontend/src/govuk/components/accordion/accordion.mjs
@@ -18,9 +18,6 @@ import { I18n } from '../../i18n.mjs'
  * @preserve
  */
 export class Accordion extends GOVUKFrontendComponent {
-  /** @private */
-  $module
-
   /**
    * @private
    * @type {AccordionConfig}
diff --git a/packages/govuk-frontend/src/govuk/components/button/button.mjs b/packages/govuk-frontend/src/govuk/components/button/button.mjs
index 2f00df49c5..cfe35eab62 100644
--- a/packages/govuk-frontend/src/govuk/components/button/button.mjs
+++ b/packages/govuk-frontend/src/govuk/components/button/button.mjs
@@ -11,9 +11,6 @@ const DEBOUNCE_TIMEOUT_IN_SECONDS = 1
  * @preserve
  */
 export class Button extends GOVUKFrontendComponent {
-  /** @private */
-  $module
-
   /**
    * @private
    * @type {ButtonConfig}
diff --git a/packages/govuk-frontend/src/govuk/components/character-count/character-count.mjs b/packages/govuk-frontend/src/govuk/components/character-count/character-count.mjs
index a0c6c2fba0..067cf59291 100644
--- a/packages/govuk-frontend/src/govuk/components/character-count/character-count.mjs
+++ b/packages/govuk-frontend/src/govuk/components/character-count/character-count.mjs
@@ -17,9 +17,6 @@ import { I18n } from '../../i18n.mjs'
  * @preserve
  */
 export class CharacterCount extends GOVUKFrontendComponent {
-  /** @private */
-  $module
-
   /** @private */
   $textarea
 
diff --git a/packages/govuk-frontend/src/govuk/components/checkboxes/checkboxes.mjs b/packages/govuk-frontend/src/govuk/components/checkboxes/checkboxes.mjs
index cde34d2fcb..8d9d93fffc 100644
--- a/packages/govuk-frontend/src/govuk/components/checkboxes/checkboxes.mjs
+++ b/packages/govuk-frontend/src/govuk/components/checkboxes/checkboxes.mjs
@@ -6,9 +6,6 @@ import { GOVUKFrontendComponent } from '../../govuk-frontend-component.mjs'
  * @preserve
  */
 export class Checkboxes extends GOVUKFrontendComponent {
-  /** @private */
-  $module
-
   /** @private */
   $inputs
 
diff --git a/packages/govuk-frontend/src/govuk/components/error-summary/error-summary.mjs b/packages/govuk-frontend/src/govuk/components/error-summary/error-summary.mjs
index d6e16a4527..a180bedc20 100644
--- a/packages/govuk-frontend/src/govuk/components/error-summary/error-summary.mjs
+++ b/packages/govuk-frontend/src/govuk/components/error-summary/error-summary.mjs
@@ -10,9 +10,6 @@ import { GOVUKFrontendComponent } from '../../govuk-frontend-component.mjs'
  * @preserve
  */
 export class ErrorSummary extends GOVUKFrontendComponent {
-  /** @private */
-  $module
-
   /**
    * @private
    * @type {ErrorSummaryConfig}
diff --git a/packages/govuk-frontend/src/govuk/components/exit-this-page/exit-this-page.mjs b/packages/govuk-frontend/src/govuk/components/exit-this-page/exit-this-page.mjs
index 5aae8602d9..2ab98f6fe0 100644
--- a/packages/govuk-frontend/src/govuk/components/exit-this-page/exit-this-page.mjs
+++ b/packages/govuk-frontend/src/govuk/components/exit-this-page/exit-this-page.mjs
@@ -9,9 +9,6 @@ import { I18n } from '../../i18n.mjs'
  * @preserve
  */
 export class ExitThisPage extends GOVUKFrontendComponent {
-  /** @private */
-  $module
-
   /**
    * @private
    * @type {ExitThisPageConfig}
diff --git a/packages/govuk-frontend/src/govuk/components/header/header.mjs b/packages/govuk-frontend/src/govuk/components/header/header.mjs
index 9f2860c4e0..1cc9582b67 100644
--- a/packages/govuk-frontend/src/govuk/components/header/header.mjs
+++ b/packages/govuk-frontend/src/govuk/components/header/header.mjs
@@ -6,9 +6,6 @@ import { GOVUKFrontendComponent } from '../../govuk-frontend-component.mjs'
  * @preserve
  */
 export class Header extends GOVUKFrontendComponent {
-  /** @private */
-  $module
-
   /** @private */
   $menuButton
 
diff --git a/packages/govuk-frontend/src/govuk/components/notification-banner/notification-banner.mjs b/packages/govuk-frontend/src/govuk/components/notification-banner/notification-banner.mjs
index 2aea3fc60a..64eb37b4b4 100644
--- a/packages/govuk-frontend/src/govuk/components/notification-banner/notification-banner.mjs
+++ b/packages/govuk-frontend/src/govuk/components/notification-banner/notification-banner.mjs
@@ -8,9 +8,6 @@ import { GOVUKFrontendComponent } from '../../govuk-frontend-component.mjs'
  * @preserve
  */
 export class NotificationBanner extends GOVUKFrontendComponent {
-  /** @private */
-  $module
-
   /**
    * @private
    * @type {NotificationBannerConfig}
diff --git a/packages/govuk-frontend/src/govuk/components/radios/radios.mjs b/packages/govuk-frontend/src/govuk/components/radios/radios.mjs
index 9301860a5c..ca77106b81 100644
--- a/packages/govuk-frontend/src/govuk/components/radios/radios.mjs
+++ b/packages/govuk-frontend/src/govuk/components/radios/radios.mjs
@@ -6,9 +6,6 @@ import { GOVUKFrontendComponent } from '../../govuk-frontend-component.mjs'
  * @preserve
  */
 export class Radios extends GOVUKFrontendComponent {
-  /** @private */
-  $module
-
   /** @private */
   $inputs
 
diff --git a/packages/govuk-frontend/src/govuk/components/skip-link/skip-link.mjs b/packages/govuk-frontend/src/govuk/components/skip-link/skip-link.mjs
index 4c15ca2669..949e53d3f4 100644
--- a/packages/govuk-frontend/src/govuk/components/skip-link/skip-link.mjs
+++ b/packages/govuk-frontend/src/govuk/components/skip-link/skip-link.mjs
@@ -6,7 +6,10 @@ import { GOVUKFrontendComponent } from '../../govuk-frontend-component.mjs'
  * @preserve
  */
 export class SkipLink extends GOVUKFrontendComponent {
-  /** @private */
+  /**
+   * @protected
+   * @type {HTMLAnchorElement}
+   */
   $module
 
   /**
diff --git a/packages/govuk-frontend/src/govuk/components/tabs/tabs.mjs b/packages/govuk-frontend/src/govuk/components/tabs/tabs.mjs
index 51add04707..a44284a654 100644
--- a/packages/govuk-frontend/src/govuk/components/tabs/tabs.mjs
+++ b/packages/govuk-frontend/src/govuk/components/tabs/tabs.mjs
@@ -6,9 +6,6 @@ import { GOVUKFrontendComponent } from '../../govuk-frontend-component.mjs'
  * @preserve
  */
 export class Tabs extends GOVUKFrontendComponent {
-  /** @private */
-  $module
-
   /** @private */
   $tabs
 
diff --git a/packages/govuk-frontend/src/govuk/govuk-frontend-component.mjs b/packages/govuk-frontend/src/govuk/govuk-frontend-component.mjs
index bd537c2ac5..0f55c069a3 100644
--- a/packages/govuk-frontend/src/govuk/govuk-frontend-component.mjs
+++ b/packages/govuk-frontend/src/govuk/govuk-frontend-component.mjs
@@ -10,6 +10,12 @@ import { SupportError } from './errors/index.mjs'
  * @abstract
  */
 export class GOVUKFrontendComponent {
+  /**
+   * @protected
+   * @type {HTMLElement}
+   */
+  $module
+
   /**
    * Constructs a new component, validating that GOV.UK Frontend is supported
    *