Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
rmccar committed Sep 20, 2023
2 parents 09d1bee + 6d5e003 commit a8b93f4
Show file tree
Hide file tree
Showing 11 changed files with 716 additions and 662 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"no-var": [1],
"one-var": [0],
"max-len": [0, { "code": 140, "ignoreUrls": true }],
"comma-dangle": ["error", "always-multiline"]
"comma-dangle": ["error", "always-multiline"],
"arrow-parens": 1
}
}
16 changes: 15 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
<!-- ignore-task-list-start -->

### What is the context of this PR?

Describe what you have changed and why, link to other PRs or Issues as appropriate.

### How to review
### How to review this PR

Describe the steps required to test the changes (include screenshots if appropriate).

### Checklist

This needs to be completed by the person raising the PR.

<!-- ignore-task-list-end -->

- [ ] I have selected the correct Project for this PR (Design System) and selected the correct status
- [ ] I have selected the correct Assignee
- [ ] I have linked the correct Issue
6 changes: 6 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ changelog:
labels:
- Component
- Pattern
- title: Accessibility improvements
labels:
- Accessibility
- title: Enhancements
labels:
- Enhancement
Expand All @@ -16,6 +19,9 @@ changelog:
- title: Documentation
labels:
- Documentation
- title: Dependency updates
labels:
- Dependencies
- title: Other changes
labels:
- "*"
17 changes: 17 additions & 0 deletions .github/workflows/check-checklist.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Checklist Checker
on:
pull_request:
types:
- opened
- edited
- synchronize
- reopened

jobs:
check-tasks:
name: Check tasks
runs-on: ubuntu-latest
steps:
- uses: mheap/require-checklist-action@v2
with:
requireChecklist: false
22 changes: 22 additions & 0 deletions .github/workflows/check-labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Label Checker
on:
pull_request:
types:
- opened
- synchronize
- reopened
- labeled
- unlabeled

jobs:
check-labels:
name: Check labels
runs-on: ubuntu-latest
permissions:
pull-requests: read
steps:
- uses: docker://onsdigital/github-pr-label-checker:v1.2.7
with:
one_of: Breaking changes,Accessibility,Bug,Documentation,Dependencies,Enhancement,Example
none_of: Awaiting resource,Do not merge,Duplicate,Needs validating,Not doing
repo_token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ gulp.task('copy-js-files', () => {
return gulp.src('./src/js/*.js').pipe(gulp.dest('./build/js'));
});

gulp.task('generate-pages', async function() {
gulp.task('generate-pages', async function () {
await generateStaticPages();
});

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"pinst": "^3.0.0",
"postcss": "^8.3.5",
"postcss-url": "^10.1.3",
"prepend-file": "^1.3.1",
"prepend-file": "^2.0.1",
"prettier": "^3.0.0",
"puppeteer": "^21.0.2",
"remark-cli": "^11.0.0",
Expand Down
4 changes: 0 additions & 4 deletions src/components/checkboxes/_checkbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ $checkbox-padding: 11px;

&:checked,
&:focus {
background-color: initial;

& + .ons-checkbox__label::before {
background: none;
border: none;
Expand Down Expand Up @@ -123,8 +121,6 @@ $checkbox-padding: 11px;

&:checked,
&:focus {
background-color: initial;

& + .ons-checkbox__label::before {
background: none;
border: none;
Expand Down
6 changes: 3 additions & 3 deletions src/tests/helpers/debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ async function extractTextFromMessage(message) {
// the actual error text. This is some sort of serialization thing between Chromium and
// Puppeteer: https://github.com/puppeteer/puppeteer/issues/3397#issuecomment-434970058
messageParts = await Promise.all(
message.args().map(arg =>
arg.executionContext().evaluate(arg => {
message.args().map((arg) =>
arg.executionContext().evaluate((arg) => {
if (arg instanceof Error) {
return arg.message;
} else {
Expand Down Expand Up @@ -44,7 +44,7 @@ export function verifyConsoleSubscription(page) {

consoleSubscriptionPage = page;

page.on('console', async message => {
page.on('console', async (message) => {
const text = await extractTextFromMessage(message);
quietLog(`browser ${message.type()}: ${text}`, message.type());

Expand Down
10 changes: 5 additions & 5 deletions src/tests/helpers/puppeteer.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { quietLog } from './debug';
const INTERCEPT_INSTANCE_HEADER_NAME = 'x-test-intercept-instance';

export async function getNodeAttributes(page, selector) {
return await page.$eval(selector, node => {
return await page.$eval(selector, (node) => {
const reducer = (map, attr) => {
map[attr.name] = attr.value;
return map;
Expand Down Expand Up @@ -41,7 +41,7 @@ export class PuppeteerEndpointFaker {
}

get requestedPaths() {
return this.requestHistory.map(entry => entry.path);
return this.requestHistory.map((entry) => entry.path);
}

async setup(page) {
Expand All @@ -67,20 +67,20 @@ export class PuppeteerEndpointFaker {
}

setOverrides(paths, response) {
paths.forEach(path => this.setOverride(path, response));
paths.forEach((path) => this.setOverride(path, response));
}

setTemporaryOverride(path, response) {
this.#temporaryOverrides.set(sanitizeHref(this.baseUrl + path), response);
}

setTemporaryOverrides(paths, response) {
paths.forEach(path => this.setTemporaryOverride(path, response));
paths.forEach((path) => this.setTemporaryOverride(path, response));
}

getRequestCount(path) {
path = sanitizeHref(path);
return this.requestHistory.filter(entry => entry.path === path).length;
return this.requestHistory.filter((entry) => entry.path === path).length;
}

async #refreshInstanceHeader() {
Expand Down
Loading

0 comments on commit a8b93f4

Please sign in to comment.