diff --git a/lib/metalsmith.js b/lib/metalsmith.js index 2e44687c63..936d1761e7 100644 --- a/lib/metalsmith.js +++ b/lib/metalsmith.js @@ -136,11 +136,6 @@ 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' }) ]) diff --git a/src/javascripts/components/example-page.mjs b/src/javascripts/components/example-page.mjs index d2c29e7925..58410519ca 100644 --- a/src/javascripts/components/example-page.mjs +++ b/src/javascripts/components/example-page.mjs @@ -1,3 +1,5 @@ +import 'iframe-resizer/js/iframeResizer.contentWindow.js' + function ExamplePage($module) { this.$module = $module } diff --git a/src/styles/page-template/block-areas/index.njk b/src/styles/page-template/block-areas/index.njk index c81bcf4303..5499fd6298 100644 --- a/src/styles/page-template/block-areas/index.njk +++ b/src/styles/page-template/block-areas/index.njk @@ -84,6 +84,5 @@ stylesheets: {{ super() }} {# Since we’re not extending the Design System layout we need to add this manually #} - {%- endblock %} diff --git a/src/styles/page-template/custom/index.njk b/src/styles/page-template/custom/index.njk index 3a1a056828..f37c998f28 100644 --- a/src/styles/page-template/custom/index.njk +++ b/src/styles/page-template/custom/index.njk @@ -152,5 +152,4 @@ ignoreInSitemap: true {% block bodyEnd %} - {% endblock %} diff --git a/src/styles/page-template/default/index.njk b/src/styles/page-template/default/index.njk index 4c417b7ccb..8e7ea45b08 100644 --- a/src/styles/page-template/default/index.njk +++ b/src/styles/page-template/default/index.njk @@ -18,5 +18,4 @@ layout: false {% block bodyEnd %} - {% endblock %} diff --git a/views/layouts/layout-example-full-page-govuk.njk b/views/layouts/layout-example-full-page-govuk.njk index 181e3c1c48..e5121f7127 100644 --- a/views/layouts/layout-example-full-page-govuk.njk +++ b/views/layouts/layout-example-full-page-govuk.njk @@ -23,5 +23,4 @@ {% endblock %} {% block bodyEnd %} - {% endblock %} diff --git a/views/layouts/layout-example-full-page.njk b/views/layouts/layout-example-full-page.njk index ebba5a0483..d0bbf432d0 100644 --- a/views/layouts/layout-example-full-page.njk +++ b/views/layouts/layout-example-full-page.njk @@ -25,5 +25,4 @@ {% endblock %} {% block bodyEnd %} - {% endblock %} diff --git a/views/layouts/layout-example.njk b/views/layouts/layout-example.njk index 84a87d71ba..8294b5a8c6 100644 --- a/views/layouts/layout-example.njk +++ b/views/layouts/layout-example.njk @@ -33,7 +33,6 @@ {% block bodyEnd %} - {% endblock %} {# Example pages shouldn't have a footer, so blank the one provided by the template #}