Skip to content

Commit

Permalink
Update review app to load govuk-frontend from package
Browse files Browse the repository at this point in the history
  • Loading branch information
colinrotherham committed Apr 4, 2023
1 parent bc83957 commit 9c54e4a
Show file tree
Hide file tree
Showing 12 changed files with 87 additions and 13 deletions.
1 change: 1 addition & 0 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"govuk_frontend_toolkit": "^9.0.1",
"govuk_template_jinja": "^0.26.0",
"govuk-elements-sass": "3.1.3",
"govuk-frontend": "*",
"gulp": "^4.0.2",
"gulp-cli": "^2.3.0",
"highlight.js": "^11.7.0",
Expand Down
3 changes: 3 additions & 0 deletions app/src/javascripts/main.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { initAll } from 'govuk-frontend'

initAll()
2 changes: 1 addition & 1 deletion app/src/stylesheets/app-ie8.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "../../../package/src/govuk/all-ie8";
@import "govuk-frontend/src/govuk/all-ie8";
@import "partials/app";
@import "partials/banner";
2 changes: 1 addition & 1 deletion app/src/stylesheets/app.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$govuk-show-breakpoints: true;
$govuk-new-link-styles: true;

@import "../../../package/src/govuk/all";
@import "govuk-frontend/src/govuk/all";
@import "partials/app";
@import "partials/code";
@import "partials/banner";
Expand Down
4 changes: 2 additions & 2 deletions app/src/stylesheets/full-page-examples/campaign-page.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../../../../package/src/govuk/base";
@import "govuk-frontend/src/govuk/base";
$govuk-new-link-styles: true;
@import "../../../../package/src/govuk/core/all";
@import "govuk-frontend/src/govuk/core/all";

.app-header--campaign {
padding-bottom: govuk-spacing(2);
Expand Down
4 changes: 2 additions & 2 deletions app/src/stylesheets/full-page-examples/search.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../../../../package/src/govuk/base";
@import "govuk-frontend/src/govuk/base";
$govuk-new-link-styles: true;
@import "../../../../package/src/govuk/core/all";
@import "govuk-frontend/src/govuk/core/all";

.app-document-list > li {
padding-top: govuk-spacing(4);
Expand Down
3 changes: 1 addition & 2 deletions app/src/views/layouts/_generic.njk
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,5 @@
{% include "partials/legacyJavaScript.njk" %}
{% endif %}

<script src="/javascripts/all.min.js"></script>
<script>window.GOVUKFrontend.initAll()</script>
<script src="/javascripts/main.min.js"></script>
{% endblock %}
3 changes: 1 addition & 2 deletions app/src/views/layouts/legacy.njk
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@

{% block body_end %}
{% include "partials/legacyJavaScript.njk" %}
<script src="/javascripts/all.min.js"></script>
<script>window.GOVUKFrontend.initAll()</script>
<script src="/javascripts/main.min.js"></script>
{% endblock %}
4 changes: 2 additions & 2 deletions app/tasks/scripts.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import { npm, scripts, task } from '../../tasks/index.mjs'
*/
export const compile = gulp.series(
task.name('compile:js', () =>
scripts.compile('all.mjs', {
srcPath: join(paths.src, 'govuk'),
scripts.compile('main.mjs', {
srcPath: join(paths.app, 'src/javascripts'),
destPath: join(paths.app, 'dist/javascripts'),

filePath (file) {
Expand Down
68 changes: 68 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"postcss-unrgba": "^1.1.1",
"puppeteer": "^19.8.2",
"rollup": "0.59.4",
"rollup-plugin-node-resolve": "^4.2.4",
"rollup-plugin-replace": "^2.2.0",
"sass-embedded": "^1.60.0",
"sassdoc": "^2.7.4",
Expand Down
5 changes: 4 additions & 1 deletion tasks/scripts.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { join, parse } from 'path'

import PluginError from 'plugin-error'
import { rollup } from 'rollup'
import resolve from 'rollup-plugin-node-resolve'
import replace from 'rollup-plugin-replace'
import { minify } from 'terser'

Expand Down Expand Up @@ -42,7 +43,9 @@ export async function compileJavaScript ([modulePath, { srcPath, destPath, fileP
const moduleDestPath = join(destPath, filePath ? filePath(parse(modulePath)) : modulePath)

// Rollup plugins
const plugins = []
const plugins = [
resolve()
]

if (!isDev) {
// Add GOV.UK Frontend release version
Expand Down

0 comments on commit 9c54e4a

Please sign in to comment.