Skip to content

Commit

Permalink
Merge branch 'major-release' into set-custom-list-attributes-on-list-…
Browse files Browse the repository at this point in the history
…item-not-link
  • Loading branch information
rmccar authored Sep 10, 2024
2 parents 2531c1f + 86dee21 commit ba5108c
Show file tree
Hide file tree
Showing 180 changed files with 2,969 additions and 1,381 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:
steps:
- uses: docker://onsdigital/github-pr-label-checker:latest
with:
one_of: Accessibility,Bug,Documentation,Dependencies,Enhancement,Example,Component,Pattern,CI/CD,Tech improvements
one_of: Accessibility,Bug,Documentation,Dependencies,Enhancement,Example,Component,Pattern,CI/CD,Tech improvements,Breaking changes
none_of: Awaiting resource,Do not merge,Duplicate,Needs validating,Not doing
repo_token: ${{ secrets.GITHUB_TOKEN }}
44 changes: 25 additions & 19 deletions __snapshots__/layout/_template.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ exports[`base page template matches the favicons block override snapshot 1`] = `

<div class="ons-header__top">
<div class="ons-container">
<div class="ons-header__grid-top ons-grid ons-grid--flex ons-grid--between ons-grid--vertical-center ons-grid--no-wrap ons-grid--gutterless">
<div class="ons-header__grid-top ons-grid ons-grid-flex ons-grid-flex--between ons-grid-flex--vertical-center ons-grid-flex--no-wrap ons-grid--gutterless">
<div class="ons-grid__col ons-col-auto">

<div class="ons-header__org-logo ons-header__org-logo--large">
Expand Down Expand Up @@ -236,7 +236,7 @@ exports[`base page template matches the favicons block override snapshot 1`] = `
</div>
<div class="ons-header__main">
<div class="ons-container">
<div class="ons-grid ons-grid--flex ons-grid--between ons-grid--vertical-center ons-grid--no-wrap ons-grid--gutterless">
<div class="ons-grid ons-grid-flex ons-grid-flex--between ons-grid-flex--vertical-center ons-grid-flex--no-wrap ons-grid--gutterless">
<div class="ons-grid__col ons-col-auto ons-u-flex-shrink">


Expand Down Expand Up @@ -404,7 +404,7 @@ exports[`base page template matches the footer block override snapshot 1`] = `

<div class="ons-header__top">
<div class="ons-container">
<div class="ons-header__grid-top ons-grid ons-grid--flex ons-grid--between ons-grid--vertical-center ons-grid--no-wrap ons-grid--gutterless">
<div class="ons-header__grid-top ons-grid ons-grid-flex ons-grid-flex--between ons-grid-flex--vertical-center ons-grid-flex--no-wrap ons-grid--gutterless">
<div class="ons-grid__col ons-col-auto">

<div class="ons-header__org-logo ons-header__org-logo--large">
Expand Down Expand Up @@ -475,7 +475,7 @@ exports[`base page template matches the footer block override snapshot 1`] = `
</div>
<div class="ons-header__main">
<div class="ons-container">
<div class="ons-grid ons-grid--flex ons-grid--between ons-grid--vertical-center ons-grid--no-wrap ons-grid--gutterless">
<div class="ons-grid ons-grid-flex ons-grid-flex--between ons-grid-flex--vertical-center ons-grid-flex--no-wrap ons-grid--gutterless">
<div class="ons-grid__col ons-col-auto ons-u-flex-shrink">


Expand Down Expand Up @@ -671,7 +671,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `

<div class="ons-phase-banner">
<div class="ons-container">
<div class="ons-grid ons-grid--flex ons-grid--gutterless ons-grid--vertical-top ons-grid--no-wrap">
<div class="ons-grid ons-grid-flex ons-grid--gutterless ons-grid-flex--vertical-top ons-grid-flex--no-wrap">

<div class="ons-grid__col ons-col-auto ons-u-flex-no-grow ons-u-flex-no-shrink">
<strong class="ons-phase-banner__badge">BETA</strong>
Expand All @@ -687,7 +687,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `

<div class="ons-header__top">
<div class="ons-container">
<div class="ons-header__grid-top ons-grid ons-grid--flex ons-grid--between ons-grid--vertical-center ons-grid--no-wrap ons-grid--gutterless">
<div class="ons-header__grid-top ons-grid ons-grid-flex ons-grid-flex--between ons-grid-flex--vertical-center ons-grid-flex--no-wrap ons-grid--gutterless">
<div class="ons-grid__col ons-col-auto"><a class="ons-header__org-logo-link" href="#0">
<div class="ons-header__org-logo ons-header__org-logo--large">
<svg class="ons-icon--logo" xmlns="http://www.w3.org/2000/svg" width="197" height="19" viewBox="33 2 552 60" aria-labelledby="ons-logo-en-alt" role="img">
Expand Down Expand Up @@ -884,7 +884,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `
</div>
<div class="ons-header__main">
<div class="ons-container">
<div class="ons-grid ons-grid--flex ons-grid--between ons-grid--vertical-center ons-grid--no-wrap">
<div class="ons-grid ons-grid-flex ons-grid-flex--between ons-grid-flex--vertical-center ons-grid-flex--no-wrap">
<div class="ons-grid__col ons-col-auto ons-u-flex-shrink">


Expand Down Expand Up @@ -1326,7 +1326,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `






<footer class="ons-footer">
Expand Down Expand Up @@ -1600,7 +1600,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `

</div>

<div class="ons-grid ons-grid--flex ons-grid--vertical-top ons-grid--between">
<div class="ons-grid ons-grid-flex--vertical-top ons-grid-flex--between">
<div class="ons-grid__col">

<!-- Legal -->
Expand Down Expand Up @@ -1705,9 +1705,14 @@ exports[`base page template matches the full configuration snapshot 1`] = `

</div>






<a class="ons-footer__poweredBy-link" href="https://www.ons.gov.uk/">
<div class="ons-footer__poweredby-logo ons-u-mb-m">

<div class="ons-footer__logo-container ons-u-mb-m ons-grid-flex ons-grid-flex--vertical-top">
<a class="ons-footer__logo-link" href="https://www.ons.gov.uk/">
<svg class="ons-icon--logo" xmlns="http://www.w3.org/2000/svg" width="197" height="19" viewBox="33 2 552 60" aria-labelledby="ons-logo-en-footer-alt" role="img">
<title id="ons-logo-en-footer-alt">
Office for National Statistics
Expand Down Expand Up @@ -1748,14 +1753,15 @@ exports[`base page template matches the full configuration snapshot 1`] = `
<path d="M605.1,47.79A15.9,15.9,0,0,1,597.45,46l1.42-3.47A10.54,10.54,0,0,0,604.4,44c2.77,0,5-1.78,5-3.94,0-6-11.1-3.2-11.1-11.47,0-3.76,3.37-7.42,8.85-7.42a13.49,13.49,0,0,1,7.1,1.83l-1.42,3.14a8.42,8.42,0,0,0-4.63-1.45c-2.8,0-4.53,1.69-4.53,3.62,0,5.64,11.32,3.14,11.32,11.6,0,4-3.85,7.9-9.89,7.9"></path>
</g>
</svg>
</div>
</a>

</a>



</div>
</div>

</div>


</div>
</div>
</footer>
Expand Down Expand Up @@ -1886,7 +1892,7 @@ exports[`base page template matches the meta block override snapshot 1`] = `

<div class="ons-header__top">
<div class="ons-container">
<div class="ons-header__grid-top ons-grid ons-grid--flex ons-grid--between ons-grid--vertical-center ons-grid--no-wrap ons-grid--gutterless">
<div class="ons-header__grid-top ons-grid ons-grid-flex ons-grid-flex--between ons-grid-flex--vertical-center ons-grid-flex--no-wrap ons-grid--gutterless">
<div class="ons-grid__col ons-col-auto">

<div class="ons-header__org-logo ons-header__org-logo--large">
Expand Down Expand Up @@ -1957,7 +1963,7 @@ exports[`base page template matches the meta block override snapshot 1`] = `
</div>
<div class="ons-header__main">
<div class="ons-container">
<div class="ons-grid ons-grid--flex ons-grid--between ons-grid--vertical-center ons-grid--no-wrap ons-grid--gutterless">
<div class="ons-grid ons-grid-flex ons-grid-flex--between ons-grid-flex--vertical-center ons-grid-flex--no-wrap ons-grid--gutterless">
<div class="ons-grid__col ons-col-auto ons-u-flex-shrink">


Expand Down Expand Up @@ -2109,7 +2115,7 @@ exports[`base page template matches the social block override snapshot 1`] = `

<div class="ons-header__top">
<div class="ons-container">
<div class="ons-header__grid-top ons-grid ons-grid--flex ons-grid--between ons-grid--vertical-center ons-grid--no-wrap ons-grid--gutterless">
<div class="ons-header__grid-top ons-grid ons-grid-flex ons-grid-flex--between ons-grid-flex--vertical-center ons-grid-flex--no-wrap ons-grid--gutterless">
<div class="ons-grid__col ons-col-auto">

<div class="ons-header__org-logo ons-header__org-logo--large">
Expand Down Expand Up @@ -2180,7 +2186,7 @@ exports[`base page template matches the social block override snapshot 1`] = `
</div>
<div class="ons-header__main">
<div class="ons-container">
<div class="ons-grid ons-grid--flex ons-grid--between ons-grid--vertical-center ons-grid--no-wrap ons-grid--gutterless">
<div class="ons-grid ons-grid-flex ons-grid-flex--between ons-grid-flex--vertical-center ons-grid-flex--no-wrap ons-grid--gutterless">
<div class="ons-grid__col ons-col-auto ons-u-flex-shrink">


Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require('@babel/register');
const babelEsmConfig = require('./babel.conf.esm');
const babelNomoduleConfig = require('./babel.conf.nomodule');
const postCssPlugins = require('./postcss.config').default;
const generateURLs = require('./src/tests/helpers/url-generator.js').default;
const generateUrls = require('./src/tests/helpers/url-generator.js').default;
const generateStaticPages = require('./lib/generate-static-pages').default;

const isProduction = process.env.NODE_ENV === 'production';
Expand Down Expand Up @@ -92,13 +92,13 @@ gulp.task('generate-pages', async function () {
});

gulp.task('generate-urls', async () => {
const urls = await generateURLs();
const urls = await generateUrls();
return urls;
});

function createBackstopTask(task) {
return (backstopTestTask = async () => {
const urls = await generateURLs();
const urls = await generateUrls();
const backstopConfig = require('./backstop.config.js');
backstopConfig.scenarios = urls;
await backstop(task, {
Expand Down
8 changes: 4 additions & 4 deletions lighthouse/lighthouse-get-urls.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ const util = require('util');
const { glob } = require('glob');
const readdir = util.promisify(fs.readdir);

async function createURLsFile() {
async function createUrlsFile() {
try {
const urls = await getURLs();
const urls = await getUrls();
fs.writeFileSync('./lighthouse/urls.json', urls);
} catch (e) {
console.error(e);
return;
}
}

async function getURLs() {
async function getUrls() {
let data = {};
data.urls = [];
const directories = [
Expand All @@ -39,4 +39,4 @@ async function getURLs() {
return JSON.stringify(data);
}

createURLsFile();
createUrlsFile();
Loading

0 comments on commit ba5108c

Please sign in to comment.