merge main

.babelrc

@@ -1,9 +1,12 @@
 {
     "presets": [
-        ["@babel/preset-env", {
-            "targets": {
-                "node": "20"
+        [
+            "@babel/preset-env",
+            {
+                "targets": {
+                    "node": "20"
+                }
             }
-        }]
+        ]
     ]
 }

.editorconfig

@@ -4,17 +4,7 @@ root = true
 [*]
 end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = false
+trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
-[{*.yml,*.json}]
-indent_size = 2
-# Sass
-[{*.scss, *.sass}]
-indent_size = 2
-# Javascript + derivatives
-[{*.coffee,*.js,*.ts}]
-indent_size = 2
-# Templates
-[*.pug,*.jade,*.njk]
 indent_size = 4

.eslintrc.json

@@ -1,40 +1,39 @@
 {
-  "parser": "@babel/eslint-parser",
-  "plugins": ["prettier", "unused-imports"],
-  "extends": ["prettier"],
-  "env": {
-    "es6": true,
-    "browser": true
-  },
-  "globals": {
-    "$": true,
-    "jQuery": true,
-    "browser": true,
-    "ga": true
-  },
-  "rules": {
-    "prettier/prettier": "error",
-    "no-unused-vars": [1],
-    "no-alert": 0,
-    "strict": [2, "never"],
-    "new-cap": [0],
-    "consistent-return": 0,
-    "no-underscore-dangle": 0,
-    "no-var": [1],
-    "one-var": [0],
-    "max-len": [0, { "code": 140, "ignoreUrls": true }],
-    "comma-dangle": ["error", "always-multiline"],
-    "arrow-parens": 1,
-    "indent": ["error", 2, { "SwitchCase": 1 }],
-    "unused-imports/no-unused-imports": "error",
-    "unused-imports/no-unused-vars": [
-      "error",
-      {
-        "vars": "all",
-        "varsIgnorePattern": "^_",
-        "args": "after-used",
-        "argsIgnorePattern": "^_"
-      }
-    ]
-  }
+    "parser": "@babel/eslint-parser",
+    "plugins": ["prettier", "unused-imports"],
+    "extends": ["prettier"],
+    "env": {
+        "es6": true,
+        "browser": true
+    },
+    "globals": {
+        "$": true,
+        "jQuery": true,
+        "browser": true,
+        "ga": true
+    },
+    "rules": {
+        "prettier/prettier": "error",
+        "no-unused-vars": [1],
+        "no-alert": 0,
+        "strict": [2, "never"],
+        "new-cap": [0],
+        "consistent-return": 0,
+        "no-underscore-dangle": 0,
+        "no-var": [1],
+        "one-var": [0],
+        "max-len": [0, { "code": 140, "ignoreUrls": true }],
+        "comma-dangle": ["error", "always-multiline"],
+        "arrow-parens": 1,
+        "unused-imports/no-unused-imports": "error",
+        "unused-imports/no-unused-vars": [
+            "error",
+            {
+                "vars": "all",
+                "varsIgnorePattern": "^_",
+                "args": "after-used",
+                "argsIgnorePattern": "^_"
+            }
+        ]
+    }
 }

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -1,102 +1,102 @@
 name: Bug Report
 description: File a bug report
-title: "[Bug]: "
-labels: ["Bug", "Community backlog"]
+title: '[Bug]: '
+labels: ['Bug', 'Community backlog']
 assignees: []
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for taking the time to fill out this bug report
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: What happened?
-    validations:
-      required: true
-  - type: textarea
-    id: expected-outcome
-    attributes:
-      label: What was the expected outcome?
-    validations:
-      required: true
-  - type: textarea
-    id: impact
-    attributes:
-      label: How is this problem impacting your service?
-    validations:
-      required: true
-  - type: textarea
-    id: reproduction-steps
-    attributes:
-      label: What list of steps can be followed to reproduce the bug or issue?
-    validations:
-      required: true
-  - type: textarea
-    id: example
-    attributes:
-      label: Example
-      description: Add screenshot(s) or examples of the bug or issue
-      placeholder: Add a file, image or link
-    validations:
-      required: false
-  - type: input
-    id: version
-    attributes:
-      label: What version of the ONS Design System are you using?
-      placeholder: For example, 32.2.7
-    validations:
-      required: true
-  - type: dropdown
-    id: device
-    attributes:
-      label: What devices are you seeing the problem on?
-      options:
-        - Desktop
-        - Mobile
-        - Tablet
-      multiple: true
-  - type: input
-    id: device-details
-    attributes:
-      label: Device details
-      description: Here you can provide further information about the device(s) that are affected by this bug or issue.
-    validations:
-      required: false
-  - type: dropdown
-    id: operating-system
-    attributes:
-      label: What operating systems are you seeing the problem on?
-      options:
-        - Windows
-        - macOS
-        - Android
-        - iOS
-        - Other
-      multiple: true
-  - type: input
-    id: operating-system-details
-    attributes:
-      label: Operating system details
-      description: Here you can provide further information about the operating system(s) that are affected by this bug or issue.
-    validations:
-      required: false
-  - type: dropdown
-    id: browsers
-    attributes:
-      label: What browsers are you seeing the problem on?
-      options:
-        - Firefox
-        - Chrome
-        - Safari
-        - Microsoft Edge
-        - Microsoft Internet Explorer
-        - Other
-      multiple: true
-  - type: input
-    id: browsers-details
-    attributes:
-      label: Browser details
-      description: Here you can provide further information about the browser(s) that are affected by this bug or issue.
-    validations:
-      required: false
+    - type: markdown
+      attributes:
+          value: |
+              Thank you for taking the time to fill out this bug report
+    - type: textarea
+      id: what-happened
+      attributes:
+          label: What happened?
+      validations:
+          required: true
+    - type: textarea
+      id: expected-outcome
+      attributes:
+          label: What was the expected outcome?
+      validations:
+          required: true
+    - type: textarea
+      id: impact
+      attributes:
+          label: How is this problem impacting your service?
+      validations:
+          required: true
+    - type: textarea
+      id: reproduction-steps
+      attributes:
+          label: What list of steps can be followed to reproduce the bug or issue?
+      validations:
+          required: true
+    - type: textarea
+      id: example
+      attributes:
+          label: Example
+          description: Add screenshot(s) or examples of the bug or issue
+          placeholder: Add a file, image or link
+      validations:
+          required: false
+    - type: input
+      id: version
+      attributes:
+          label: What version of the ONS Design System are you using?
+          placeholder: For example, 32.2.7
+      validations:
+          required: true
+    - type: dropdown
+      id: device
+      attributes:
+          label: What devices are you seeing the problem on?
+          options:
+              - Desktop
+              - Mobile
+              - Tablet
+          multiple: true
+    - type: input
+      id: device-details
+      attributes:
+          label: Device details
+          description: Here you can provide further information about the device(s) that are affected by this bug or issue.
+      validations:
+          required: false
+    - type: dropdown
+      id: operating-system
+      attributes:
+          label: What operating systems are you seeing the problem on?
+          options:
+              - Windows
+              - macOS
+              - Android
+              - iOS
+              - Other
+          multiple: true
+    - type: input
+      id: operating-system-details
+      attributes:
+          label: Operating system details
+          description: Here you can provide further information about the operating system(s) that are affected by this bug or issue.
+      validations:
+          required: false
+    - type: dropdown
+      id: browsers
+      attributes:
+          label: What browsers are you seeing the problem on?
+          options:
+              - Firefox
+              - Chrome
+              - Safari
+              - Microsoft Edge
+              - Microsoft Internet Explorer
+              - Other
+          multiple: true
+    - type: input
+      id: browsers-details
+      attributes:
+          label: Browser details
+          description: Here you can provide further information about the browser(s) that are affected by this bug or issue.
+      validations:
+          required: false

.github/ISSUE_TEMPLATE/config.yaml

@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
-  - name: Community Discussions
-    url: https://github.com/ONSdigital/design-system/discussions
-    about: Please ask and answer questions here.
+    - name: Community Discussions
+      url: https://github.com/ONSdigital/design-system/discussions
+      about: Please ask and answer questions here.