Bump iframe-resizer from 4.3.7 to 4.3.9

lib/metalsmith.js

@@ -136,25 +136,15 @@ module.exports = metalsmith
       copyAssets('{fonts,images}/*', {
         cwd: join(dirname(require.resolve('govuk-frontend')), 'assets'),
         dest: 'assets'
-      }),
-
-      copyAssets('**/iframeResizer.contentWindow.@(map|min.js)', {
-        cwd: join(dirname(require.resolve('iframe-resizer')), 'js'),
-        dest: 'javascripts/vendor'
       })
     ])
 
     done()
   })
 
-  // build the entrypoint for application specific JavaScript
+  // build the entrypoints for application specific JavaScript
   .use(rollup('javascripts/application.mjs'))
-
-  // build GOV.UK Frontend JavaScript
-  .use(rollup('javascripts/govuk-frontend.mjs'))
-
-  // build the entrypoint for example specific JavaScript
-  .use(rollup('javascripts/example.mjs'))
+  .use(rollup('javascripts/application-example.mjs'))
 
   // add hash to files in production
   .use((files, metalsmith, done) => {

package.json

@@ -32,7 +32,7 @@
     "accessible-autocomplete": "^2.0.4",
     "clipboard": "^2.0.11",
     "govuk-frontend": "^4.7.0",
-    "iframe-resizer": "^4.3.7",
+    "iframe-resizer": "^4.3.9",
     "lunr": "^2.3.9"
   },
   "devDependencies": {

src/javascripts/application-example.mjs

@@ -0,0 +1,13 @@
+import { initAll } from 'govuk-frontend'
+
+import ExamplePage from './components/example-page.mjs'
+
+// Initialise GOV.UK Frontend
+initAll({
+  // Auto focusing the error summary and notification banner is not useful
+  // when used in examples, and causes the viewport to scroll
+  errorSummary: { disableAutoFocus: true },
+  notificationBanner: { disableAutoFocus: true }
+})
+
+new ExamplePage(document).init()

src/javascripts/application.mjs

@@ -1,3 +1,5 @@
+import { initAll } from 'govuk-frontend'
+
 import Analytics from './components/analytics.mjs'
 import BackToTop from './components/back-to-top.mjs'
 import CookieBanner from './components/cookie-banner.mjs'
@@ -14,6 +16,9 @@ import OptionsTable from './components/options-table.mjs'
 import Search from './components/search.mjs'
 import AppTabs from './components/tabs.mjs'
 
+// Initialise GOV.UK Frontend
+initAll()
+
 // Initialise cookie banner
 var $cookieBanner = document.querySelector(
   '[data-module="govuk-cookie-banner"]'

src/javascripts/example.mjs → src/javascripts/components/example-page.mjs

@@ -1,6 +1,9 @@
+import 'iframe-resizer/js/iframeResizer.contentWindow.js'
+
 function ExamplePage($module) {
   this.$module = $module
 }
+
 ExamplePage.prototype.init = function () {
   var $module = this.$module
   if (!$module) {
@@ -9,6 +12,7 @@ ExamplePage.prototype.init = function () {
   var $form = $module.querySelector('form[action="/form-handler"]')
   this.preventFormSubmission($form)
 }
+
 ExamplePage.prototype.preventFormSubmission = function ($form) {
   // we should only have one form per example
   if (!$form) {
@@ -19,4 +23,4 @@ ExamplePage.prototype.preventFormSubmission = function ($form) {
   })
 }
 
-new ExamplePage(document).init()
+export default ExamplePage

src/styles/page-template/block-areas/index.njk

@@ -83,7 +83,6 @@ stylesheets:
     <span class="app-annotate-block__label">block: bodyEnd</span>
     {{ super() }}
     {# Since we’re not extending the Design System layout we need to add this manually #}
-    <script src="{{ getFingerprint('javascripts/govuk-frontend.js') }}"></script>
-    <script src="{{ getFingerprint('javascripts/vendor/iframeResizer.contentWindow.min.js') }}"></script>
+    <script src="{{ getFingerprint('javascripts/application-example.js') }}"></script>
   </div>
 {%- endblock %}

src/styles/page-template/custom/index.njk

@@ -151,7 +151,5 @@ ignoreInSitemap: true
 {% endblock %}
 
 {% block bodyEnd %}
-  <script src="{{ getFingerprint('javascripts/govuk-frontend.js') }}"></script>
-  <script src="{{ getFingerprint('javascripts/example.js') }}"></script>
-  <script src="{{ getFingerprint('javascripts/vendor/iframeResizer.contentWindow.min.js') }}"></script>
+  <script src="{{ getFingerprint('javascripts/application-example.js') }}"></script>
 {% endblock %}

src/styles/page-template/default/index.njk

@@ -17,6 +17,5 @@ layout: false
 {% endblock %}
 
 {% block bodyEnd %}
-  <script src="{{ getFingerprint('javascripts/govuk-frontend.js') }}"></script>
-  <script src="{{ getFingerprint('javascripts/vendor/iframeResizer.contentWindow.min.js') }}"></script>
+  <script src="{{ getFingerprint('javascripts/application-example.js') }}"></script>
 {% endblock %}

views/layouts/_generic.njk

@@ -37,6 +37,5 @@
 {% block footer %}{% endblock %}
 
 {% block bodyEnd %}
-  <script src="{{ getFingerprint('javascripts/govuk-frontend.js') }}"></script>
   <script src="{{ getFingerprint('javascripts/application.js') }}"></script>
 {% endblock %}

views/layouts/layout-example-full-page-govuk.njk

@@ -22,7 +22,5 @@
   {{ contents | safe }}
 {% endblock %}
 {% block bodyEnd %}
-  <script src="{{ getFingerprint('javascripts/govuk-frontend.js') }}"></script>
-  <script src="{{ getFingerprint('javascripts/example.js') }}"></script>
-  <script src="{{ getFingerprint('javascripts/vendor/iframeResizer.contentWindow.min.js') }}"></script>
+  <script src="{{ getFingerprint('javascripts/application-example.js') }}"></script>
 {% endblock %}

views/layouts/layout-example-full-page.njk

@@ -24,7 +24,5 @@
   {{ contents | safe }}
 {% endblock %}
 {% block bodyEnd %}
-  <script src="{{ getFingerprint('javascripts/govuk-frontend.js') }}"></script>
-  <script src="{{ getFingerprint('javascripts/example.js') }}"></script>
-  <script src="{{ getFingerprint('javascripts/vendor/iframeResizer.contentWindow.min.js') }}"></script>
+  <script src="{{ getFingerprint('javascripts/application-example.js') }}"></script>
 {% endblock %}

views/layouts/layout-example.njk

@@ -32,9 +32,7 @@
 {% endblock %}
 
 {% block bodyEnd %}
-  <script src="{{ getFingerprint('javascripts/govuk-frontend.js') }}"></script>
-  <script src="{{ getFingerprint('javascripts/example.js') }}"></script>
-  <script src="{{ getFingerprint('javascripts/vendor/iframeResizer.contentWindow.min.js') }}"></script>
+  <script src="{{ getFingerprint('javascripts/application-example.js') }}"></script>
 {% endblock %}
 
 {# Example pages shouldn't have a footer, so blank the one provided by the template #}