Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update some dependencies #73

Merged
merged 4 commits into from
Mar 18, 2024
Merged

update some dependencies #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5dc3527
update some dependencies
ricardofreitasrocha Mar 18, 2024
de3a22e
update yarn.lock
ricardofreitasrocha Mar 18, 2024
1e1f32f
revert gds tk to 4.8
ricardofreitasrocha Mar 18, 2024
38cbcd1
Merge branch 'master' into task/JM-5632
ricardofreitasrocha Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,18 +169,6 @@
{expand: true, cwd: 'config/', src: ['*.*'], dest: 'test/config'}
]
},

/*
govuk: {
files: [
{cwd: 'node_modules/govuk_frontend_toolkit/', src: ['**'], dest: 'govuk_modules/govuk_frontend_toolkit/'},
{cwd: 'node_modules/govuk_template_jinja/assets/', src: ['**'], dest: 'govuk_modules/govuk_template/assets/'},
{cwd: 'node_modules/govuk_template_jinja/views/layouts/', src: ['**'], dest: 'govuk_modules/govuk_template/views/layouts/'},
{cwd: 'node_modules/govuk-elements-sass/public/sass/', src: ['**', '!node_modules', '!elements-page.scss', '!elements-page-ie6.scss', '!elements-page-ie7.scss', '!elements-page-ie8.scss', '!main.scss', '!main-ie6.scss', '!main-ie7.scss', '!main-ie8.scss', '!prism.scss'], dest: 'govuk_modules/govuk-elements-sass/'}
]
}
*/

},


Expand Down
16 changes: 0 additions & 16 deletions client/scss/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
// Import GOV.UK elements from /govuk-modules/, this will import the frontend toolkit and some base styles.
// Take a look in /govuk-modules/_govuk-elements.scss to see which files are imported.//

//@import 'govuk-elements';

// ITCSS Imports
//@import '01-settings/index';
//@import '02-tools/index';
//@import '03-generic/index';
//@import '04-elements/index';
//@import '05-objects/index';
//@import '06-components/index';
//@import '07-trumps/index';

//$govuk-assets-path: '/govuk/assets/';

// override font family
$govuk-font-family: helvetica, arial, sans-serif;

Expand Down
14 changes: 2 additions & 12 deletions client/templates/includes/scripts.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,17 @@
<script src="{{ assetPath }}js/jquery.min.js"></script>

<!-- show-hide-content only needed for legacy datepicker popup -->
<!--<script src="{{ assetPath }}js/show-hide-content.js"></script>-->

<!-- Bureau page scripts -->
<script src="{{ assetPath }}js/bundle.js"></script>

<!-- Init GDS and MOJ toolkits -->
<script src="{{ assetPath }}js/govuk/all.js"></script>
<script src="{{ assetPath }}js/moj/all.js"></script>

<script>
$(document).ready(function () {
//console.log("init GOVUK toolkit");
window.GOVUKFrontend.initAll();
//console.log("init MOJ toolkit");
window.MOJFrontend.initAll();

// only needed for datepicker on Process Reply - Deferral action
//var showHideContent = new GOVUK.ShowHideContent();
//showHideContent.init();
})
});
</script>


<!-- scripts to run after GDS/MOJ inits only on reply details page -->

Expand Down
4 changes: 1 addition & 3 deletions client/templates/layouts/govuk_template.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@

<body class="govuk-template__body app-body-class jd-global-font" data-test="My value" data-other="report:details">

<script>
document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
</script>
<script>document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');</script>

{% block body_start %}{% endblock %}

Expand Down
11 changes: 4 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"dependencies": {
"@fengyuanchen/datepicker": "^0.6.4",
"@hmcts/properties-volume": "1.1.0",
"@ministryofjustice/frontend": "^1.6.3",
"@ministryofjustice/frontend": "^1.8.1",
"accessible-autocomplete": "^2.0.4",
"applicationinsights": "^2.9.4",
"basic-auth": "^2.0.0",
Expand All @@ -36,7 +36,7 @@
"express-nunjucks": "^2.2.5",
"express-session": "^1.14.0",
"fs-extra": "^4.0.3",
"govuk-frontend": "^4.7.0",
"govuk-frontend": "^4.8.0",
"helmet": "^3.9.0",
"ip": "^1.1.5",
"jsonwebtoken": "^9.0.0",
Expand All @@ -53,7 +53,7 @@
"referrer-policy": "^1.0.0",
"request": "^2.79.0",
"request-promise": "^4.1.1",
"url-join": "^2.0.2",
"url-join": "^4.0.1",
"validate.js": "^0.13.1",
"winston": "^2.4.5"
},
Expand All @@ -69,9 +69,6 @@
"eslint-plugin-protractor": "^1.34.2",
"eslint-plugin-react": "^7.5.1",
"faker": "^4.1.0",
"govuk-elements-sass": "^2.2.1",
"govuk_frontend_toolkit": "^4.14.0",
"govuk_template_jinja": "^0.26.0",
"grunt": "latest",
"grunt-accessibility": "^5.0.0",
"grunt-autoprefixer": "^3.0.4",
Expand Down Expand Up @@ -102,7 +99,7 @@
"mochawesome": "^3.0.0",
"nsp": "^3.1.0",
"open": "0.0.5",
"sass": "^1.69.7",
"sass": "^1.72.0",
"sinon": "^4.1.2",
"sinon-chai": "^2.8.0",
"time-grunt": "^1.4.0"
Expand Down
2 changes: 1 addition & 1 deletion server/config/express.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
// Setup templating engine
app.set('view engine', 'njk');
app.set('views', [
'node_modules/govuk-frontend/',
'node_modules/govuk-frontend',
'node_modules/@ministryofjustice/frontend/',
path.join(app.get('appPath'), 'templates'),
]);
Expand Down
61 changes: 14 additions & 47 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ __metadata:
languageName: node
linkType: hard

"@ministryofjustice/frontend@npm:^1.6.3":
"@ministryofjustice/frontend@npm:^1.8.1":
version: 1.8.1
resolution: "@ministryofjustice/frontend@npm:1.8.1"
dependencies:
Expand Down Expand Up @@ -6133,43 +6133,13 @@ __metadata:
languageName: node
linkType: hard

"govuk-elements-sass@npm:^2.2.1":
version: 2.2.1
resolution: "govuk-elements-sass@npm:2.2.1"
dependencies:
govuk_frontend_toolkit: ^5.0.2
checksum: a470f64becab83b7b620cbc79582ff36eeb5aff2b80d7f19226cb762d1db71f7bdb76cf24915ecc7b7f5cd8f7c145ed38db8e3893e6c22c61cf3e3c8658f37b5
languageName: node
linkType: hard

"govuk-frontend@npm:^3.0.0 || ^4.0.0, govuk-frontend@npm:^4.7.0":
"govuk-frontend@npm:^3.0.0 || ^4.0.0, govuk-frontend@npm:^4.8.0":
version: 4.8.0
resolution: "govuk-frontend@npm:4.8.0"
checksum: e255f924f399319e109347ec4993e0441fc5847a6a73ba44a465b1599c7d03e85c29212743b081ccd60e19224c6301143c77540b8e4bfe615fcb3e162b8663f4
languageName: node
linkType: hard

"govuk_frontend_toolkit@npm:^4.14.0":
version: 4.18.4
resolution: "govuk_frontend_toolkit@npm:4.18.4"
checksum: 8827ed6cdd02d7ebad0ce46e717015cce90b43273d2e468cf3f1a40c282d5029919d73887fc075c3dafcceb965e622bf4b1f75484d241ea92974bbcbc18810a2
languageName: node
linkType: hard

"govuk_frontend_toolkit@npm:^5.0.2":
version: 5.2.0
resolution: "govuk_frontend_toolkit@npm:5.2.0"
checksum: b193869de6c3d395fadd842c9c204183dad2dcb6fa657f383ac633831b1ef9c84771b195d69b0bf3ee34545a236d51321dcc9afbf974247c28b2e9c9367eaa83
languageName: node
linkType: hard

"govuk_template_jinja@npm:^0.26.0":
version: 0.26.0
resolution: "govuk_template_jinja@npm:0.26.0"
checksum: e343ab3ad59f2da31caf3b830c82bda89077cc6caff42ff0321aa74a3133a4c7546ec7bc2d27a202fd3774ca58a0514f0fa320c64d07bbf7adc1f34cd620bbc2
languageName: node
linkType: hard

"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.6":
version: 4.2.11
resolution: "graceful-fs@npm:4.2.11"
Expand Down Expand Up @@ -8597,7 +8567,7 @@ __metadata:
dependencies:
"@fengyuanchen/datepicker": ^0.6.4
"@hmcts/properties-volume": 1.1.0
"@ministryofjustice/frontend": ^1.6.3
"@ministryofjustice/frontend": ^1.8.1
"@scottish-government/pattern-library": 0.0.381
accessible-autocomplete: ^2.0.4
applicationinsights: ^2.9.4
Expand All @@ -8623,10 +8593,7 @@ __metadata:
express-session: ^1.14.0
faker: ^4.1.0
fs-extra: ^4.0.3
govuk-elements-sass: ^2.2.1
govuk-frontend: ^4.7.0
govuk_frontend_toolkit: ^4.14.0
govuk_template_jinja: ^0.26.0
govuk-frontend: ^4.8.0
grunt: latest
grunt-accessibility: ^5.0.0
grunt-autoprefixer: ^3.0.4
Expand Down Expand Up @@ -8673,11 +8640,11 @@ __metadata:
referrer-policy: ^1.0.0
request: ^2.79.0
request-promise: ^4.1.1
sass: ^1.69.7
sass: ^1.72.0
sinon: ^4.1.2
sinon-chai: ^2.8.0
time-grunt: ^1.4.0
url-join: ^2.0.2
url-join: ^4.0.1
validate.js: ^0.13.1
winston: ^2.4.5
languageName: unknown
Expand Down Expand Up @@ -12200,16 +12167,16 @@ __metadata:
languageName: node
linkType: hard

"sass@npm:^1.69.7":
version: 1.71.1
resolution: "sass@npm:1.71.1"
"sass@npm:^1.72.0":
version: 1.72.0
resolution: "sass@npm:1.72.0"
dependencies:
chokidar: ">=3.0.0 <4.0.0"
immutable: ^4.0.0
source-map-js: ">=0.6.2 <2.0.0"
bin:
sass: sass.js
checksum: 19c4939d3042eb9459d462bbd27b1f576fa18034e23c87ca0005b87effdee431c16503b5a785edcdcde1a76dfb804716d9ad42c85a78968ac3825d515e45cb53
checksum: f420079c7d51660b7256ee52463c1499ede36f7fd5c8ef50c687451777ad641509001454dea45244073cedd7c00e7a3bc1c362e55206ac6686171b994edb41e4
languageName: node
linkType: hard

Expand Down Expand Up @@ -14263,10 +14230,10 @@ __metadata:
languageName: node
linkType: hard

"url-join@npm:^2.0.2":
version: 2.0.5
resolution: "url-join@npm:2.0.5"
checksum: 5c935cc99e5bfd7150302420db4eff9830d117be5ea3edf4b2d9e30a51484bc422e94fd9f2fba78192a75cebe2663735af716e07ec094b9a5f24c75046644c73
"url-join@npm:^4.0.1":
version: 4.0.1
resolution: "url-join@npm:4.0.1"
checksum: f74e868bf25dbc8be6a8d7237d4c36bb5b6c62c72e594d5ab1347fe91d6af7ccd9eb5d621e30152e4da45c2e9a26bec21390e911ab54a62d4d82e76028374ee5
languageName: node
linkType: hard

Expand Down