Skip to content

Commit 451e1c9

Browse files
Update review app to import { initAll } from ES module bundle
1 parent 338d98f commit 451e1c9

File tree

9 files changed

+32
-26
lines changed

9 files changed

+32
-26
lines changed

packages/govuk-frontend-review/rollup.config.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default defineConfig(({ i: input }) => ({
1414
* Output options
1515
*/
1616
output: {
17-
format: 'iife',
17+
format: 'es',
1818

1919
/**
2020
* Output plugins
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
import * as GOVUKFrontend from 'govuk-frontend'
2-
3-
// @ts-expect-error Manually add globals to window for tests
4-
window.GOVUKFrontend = GOVUKFrontend
1+
export * from 'govuk-frontend'

packages/govuk-frontend-review/src/views/examples/scoped-initialisation/index.njk

+3-4
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,10 @@
4545
{% endblock %}
4646

4747
{% block bodyEnd %}
48-
<script type="module" src="/javascripts/all.min.js"></script>
48+
<script type="module" src="/javascripts/all.bundle.min.mjs"></script>
4949
<script type="module">
50+
import { initAll } from '/javascripts/all.bundle.min.mjs'
5051
const $scope = document.getElementById('scoped')
51-
window.GOVUKFrontend.initAll({
52-
scope: $scope
53-
})
52+
initAll({ scope: $scope })
5453
</script>
5554
{% endblock %}

packages/govuk-frontend-review/src/views/examples/template-custom/index.njk

+5-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,10 @@
121121

122122
{% block bodyEnd %}
123123
<!-- block:bodyEnd -->
124-
<script type="module" src="/javascripts/all.min.js"></script>
125-
<script type="module">window.GOVUKFrontend.initAll()</script>
124+
<script type="module" src="/javascripts/all.bundle.min.mjs"></script>
125+
<script type="module">
126+
import { initAll } from '/javascripts/all.bundle.min.mjs'
127+
initAll()
128+
</script>
126129
<!-- endblock:bodyEnd -->
127130
{% endblock %}

packages/govuk-frontend-review/src/views/examples/template-default/index.njk

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212

1313
{% block bodyEnd %}
1414
<!-- block:bodyEnd -->
15-
<script type="module" src="/javascripts/all.min.js"></script>
16-
<script type="module">window.GOVUKFrontend.initAll()</script>
15+
<script type="module" src="/javascripts/all.bundle.min.mjs"></script>
16+
<script type="module">
17+
import { initAll } from '/javascripts/all.bundle.min.mjs'
18+
initAll()
19+
</script>
1720
<!-- endblock:bodyEnd -->
1821
{% endblock %}

packages/govuk-frontend-review/src/views/examples/translated/index.njk

+9-8
Original file line numberDiff line numberDiff line change
@@ -937,18 +937,19 @@
937937
{% endblock %}
938938

939939
{% block bodyEnd %}
940-
<script type="module" src="/javascripts/all.min.js"></script>
940+
<script type="module" src="/javascripts/all.bundle.min.mjs"></script>
941941
<script type="module">
942-
window.GOVUKFrontend.initAll({
942+
import { initAll } from '/javascripts/all.bundle.min.mjs'
943+
initAll({
943944
accordion: {
944945
i18n: {
945-
showAllSections: "Dangos adrannau",
946-
hideAllSections: "Cuddio adrannau",
946+
showAllSections: 'Dangos adrannau',
947+
hideAllSections: 'Cuddio adrannau',
947948
},
948-
"i18n.showSection": "Dangos",
949-
"i18n.showSectionAriaLabel": "Dangos adran",
950-
"i18n.hideSection": "Cuddio",
951-
"i18n.hideSectionAriaLabel": "Cuddio adran"
949+
'i18n.showSection': 'Dangos',
950+
'i18n.showSectionAriaLabel': 'Dangos adran',
951+
'i18n.hideSection': 'Cuddio',
952+
'i18n.hideSectionAriaLabel': 'Cuddio adran'
952953
}
953954
})
954955
</script>

packages/govuk-frontend-review/src/views/layouts/_generic.njk

+5-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
{% set mainClasses = 'govuk-main-wrapper--auto-spacing' %}
1616

1717
{% block bodyEnd %}
18-
<script type="module" src="/javascripts/all.min.js"></script>
19-
<script type="module">window.GOVUKFrontend.initAll()</script>
18+
<script type="module" src="/javascripts/all.bundle.min.mjs"></script>
19+
<script type="module">
20+
import { initAll } from '/javascripts/all.bundle.min.mjs'
21+
initAll()
22+
</script>
2023
{% endblock %}

packages/govuk-frontend-review/src/views/tests/boilerplate.njk

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
{% endblock %}
1515

1616
{% block scripts %}
17-
<script type="module" src="/javascripts/all.min.js"></script>
17+
<script type="module" src="/javascripts/all.bundle.min.mjs"></script>
1818
{% endblock %}

packages/govuk-frontend-review/tasks/scripts.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ export const compile = (options) => gulp.series(
1818
destPath: join(options.destPath, 'javascripts'),
1919
configPath: join(options.basePath, 'rollup.config.mjs'),
2020

21-
// Rename with `*.min.js` extension
21+
// Rename with `*.bundle.min.mjs` extension
2222
filePath ({ dir, name }) {
23-
return join(dir, `${name}.min.js`)
23+
return join(dir, `${name}.bundle.min.mjs`)
2424
}
2525
})
2626
),

0 commit comments

Comments
 (0)