Skip to content

Commit

Permalink
Return names of JS files to old format
Browse files Browse the repository at this point in the history
It turns out that rollup's 'input' option allows
you to define the 'name' property (used in the
format string that defines the final name of
output files). This can be done by passing in an
object containing name:path pairs.

For example:

'input': {
  'foo': '/path/to/file.js'
},
'output': {
  'entryFileNames': '[name].js'
}

...will produce 'foo.js'

These changes use this feature to return the
JavaScript files to the names they had before and
updates the HTML to reflect this.

See the docs for the input option for more detail:

https://www.rollupjs.org/guide/en/#input
  • Loading branch information
tombye committed Jul 2, 2021
1 parent 51152a3 commit 273f638
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 11 deletions.
12 changes: 9 additions & 3 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ const javascripts = {
// - deliver it in one bundle
// - allow it to run in browsers without support for JS Modules
return rollup.rollup({
input: paths.src + 'javascripts/govuk-frontend-details-init.mjs',
input: {
'govuk-frontend-details': paths.src + 'javascripts/govuk-frontend-details-init.mjs'
},
plugins: [
// determine module entry points from either 'module' or 'main' fields in package.json
rollupPluginNodeResolve.nodeResolve({
Expand Down Expand Up @@ -97,7 +99,9 @@ const javascripts = {
// - deliver it in one bundle
// - allow it to run in browsers without support for JS Modules
return rollup.rollup({
input: paths.src + 'javascripts/sharing-button-init.mjs',
input: {
'sharing-button': paths.src + 'javascripts/sharing-button-init.mjs'
},
plugins: [
// determine module entry points from either 'module' or 'main' fields in package.json
rollupPluginNodeResolve.nodeResolve({
Expand Down Expand Up @@ -127,7 +131,9 @@ const javascripts = {
// - deliver it in one bundle
// - allow it to run in browsers without support for JS Modules
return rollup.rollup({
input: paths.src + 'javascripts/relative-dates-init.mjs',
input: {
'relative-dates': paths.src + 'javascripts/relative-dates-init.mjs'
},
plugins: [
// determine module entry points from either 'module' or 'main' fields in package.json
rollupPluginNodeResolve.nodeResolve({
Expand Down
4 changes: 2 additions & 2 deletions src/alert.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ <h2 class="govuk-heading-s">
{% endblock %}

{% block bodyEnd %}
<script type="text/javascript" src="{{ '/alerts/assets/javascripts/govuk-frontend-details-init.js' | file_fingerprint }}"></script>
<!--[if gt IE 8]><!--><script type="text/javascript" src="{{ '/alerts/assets/javascripts/sharing-button-init.js' | file_fingerprint }}"></script><!--<![endif]-->
<script type="text/javascript" src="{{ '/alerts/assets/javascripts/govuk-frontend-details.js' | file_fingerprint }}"></script>
<!--[if gt IE 8]><!--><script type="text/javascript" src="{{ '/alerts/assets/javascripts/sharing-button.js' | file_fingerprint }}"></script><!--<![endif]-->

{% endblock %}
2 changes: 1 addition & 1 deletion src/current-alerts.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{% endblock %}

{% block prefetch %}
<link rel="prefetch" href="{{ '/alerts/assets/javascripts/govuk-frontend-details-init.js' | file_fingerprint }}" />
<link rel="prefetch" href="{{ '/alerts/assets/javascripts/govuk-frontend-details.js' | file_fingerprint }}" />
{% endblock %}

{% block pageTitleCurrent -%}
Expand Down
4 changes: 2 additions & 2 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{% endblock %}

{% block prefetch %}
<link rel="prefetch" href="{{ '/alerts/assets/javascripts/govuk-frontend-details-init.js' | file_fingerprint }}" />
<link rel="prefetch" href="{{ '/alerts/assets/javascripts/govuk-frontend-details.js' | file_fingerprint }}" />
{% endblock %}

{% block pageTitleCurrent -%}
Expand Down Expand Up @@ -106,5 +106,5 @@ <h2 class="govuk-heading-l">How it works</h2>
{% endblock %}

{% block bodyEnd %}
<script async type="text/javascript" src="{{ '/alerts/assets/javascripts/relative-dates-init.js' | file_fingerprint }}"></script>
<script async type="text/javascript" src="{{ '/alerts/assets/javascripts/relative-dates.js' | file_fingerprint }}"></script>
{% endblock %}
2 changes: 1 addition & 1 deletion src/opt-out.html
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,5 @@ <h2 class="govuk-heading-l">
{% endblock %}

{% block bodyEnd %}
<script type="text/javascript" src="{{ '/alerts/assets/javascripts/govuk-frontend-details-init.js' | file_fingerprint }}"></script>
<script type="text/javascript" src="{{ '/alerts/assets/javascripts/govuk-frontend-details.js' | file_fingerprint }}"></script>
{% endblock %}
2 changes: 1 addition & 1 deletion src/past-alerts.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{% endblock %}

{% block prefetch %}
<link rel="prefetch" href="{{ '/alerts/assets/javascripts/govuk-frontend-details-init.js' | file_fingerprint }}" />
<link rel="prefetch" href="{{ '/alerts/assets/javascripts/govuk-frontend-details.js' | file_fingerprint }}" />
{% endblock %}

{% block pageTitleCurrent -%}
Expand Down
2 changes: 1 addition & 1 deletion src/when-you-get-an-alert.html
Original file line number Diff line number Diff line change
Expand Up @@ -125,5 +125,5 @@ <h2 class="govuk-heading-m">
{% endblock %}

{% block bodyEnd %}
<script type="text/javascript" src="{{ '/alerts/assets/javascripts/govuk-frontend-details-init.js' | file_fingerprint }}"></script>
<script type="text/javascript" src="{{ '/alerts/assets/javascripts/govuk-frontend-details.js' | file_fingerprint }}"></script>
{% endblock %}

0 comments on commit 273f638

Please sign in to comment.