Skip to content

Commit fca1d63

Browse files
frankierobertofrankieroberto
committed
Merge branch 'main' into johnrimmer2-patch-5
2 parents 0eeeaea + 1e3e575 commit fca1d63

File tree

2,049 files changed

+17689
-17527
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,049 files changed

+17689
-17527
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{
2+
"name": "NHS Digital prevention services design history",
3+
"portsAttributes": {
4+
"8080": {
5+
"label": "Preview",
6+
"onAutoForward": "openBrowser"
7+
}
8+
},
9+
"forwardPorts": [8080],
10+
"postCreateCommand": "npm install",
11+
"postAttachCommand": "npm start",
12+
// codespace customisations
13+
"customizations": {
14+
// Configure properties specific to VS Code web-basde IDE used within codespaces.
15+
"vscode": {
16+
// editor settings
17+
"settings": {
18+
// Turn on word wrapping by default
19+
"editor.wordWrap": "on",
20+
// Use pre-set indentation settings for all files
21+
"editor.detectIndentation": false,
22+
// Set default tab size to 2 spaces and use spaces not tabs
23+
// This should work via .editorconfig but doesn't so setting here
24+
"editor.tabSize": 2,
25+
"editor.insertSpaces": true,
26+
"[nunjucks]": {
27+
"editor.tabSize": 2
28+
},
29+
"[html]": {
30+
"editor.tabSize": 2
31+
},
32+
"[css]": {
33+
"editor.tabSize": 2
34+
},
35+
"[javascript]": {
36+
"editor.tabSize": 2
37+
},
38+
// make emmet work within nunjucks
39+
"emmet.includeLanguages": {
40+
"njk": "html",
41+
"nunjucks": "html",
42+
"erb": "html",
43+
"jinja": "html",
44+
"jinja-html": "html",
45+
"markdown": "html"
46+
},
47+
// Explicitly enable semantic highlighting to work around issue in codespaces where it wouldn't apply
48+
"editor.semanticHighlighting.enabled": true,
49+
"editor.bracketPairColorization.enabled": true,
50+
// Force VS Code to re-evaluate file types
51+
"files.associations": {
52+
"*.html": "nunjucks"
53+
},
54+
"html.suggest.html5": true,
55+
"files.exclude": {
56+
"node_modules/": true,
57+
"_site/": true
58+
}
59+
},
60+
// bundle the following editor extensions
61+
"extensions": [
62+
// nunjuck syntax highlighting
63+
"ginfuru.better-nunjucks",
64+
// File utilities like duplicate, move, rename, delete files
65+
"sleistner.vscode-fileutils"
66+
]
67+
}
68+
}
69+
}

‎.github/dependabot.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
version: 2
22
updates:
3-
- package-ecosystem: npm
4-
directory: "/"
5-
schedule:
6-
interval: daily
7-
open-pull-requests-limit: 10
8-
ignore:
9-
- dependency-name: markdown-it-anchor
10-
versions:
11-
- 7.0.0
12-
- 7.0.1
13-
- 7.0.2
14-
- package-ecosystem: "github-actions"
15-
directory: "/"
16-
schedule:
17-
interval: "weekly"
3+
- package-ecosystem: npm
4+
directory: '/'
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 10
8+
ignore:
9+
- dependency-name: markdown-it-anchor
10+
versions:
11+
- 7.0.0
12+
- 7.0.1
13+
- 7.0.2
14+
- package-ecosystem: 'github-actions'
15+
directory: '/'
16+
schedule:
17+
interval: 'weekly'

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# For most projects, this workflow file will not need changing; you simply need
22
# to commit it to your repository.
33
#
4-
# You may wish to alter this file to override the set of languages analyzed,
4+
# You may wish to alter this file to override the set of languages analysed,
55
# or to provide custom queries or build logic.
66
#
77
# ******** NOTE ********
88
# We have attempted to detect the languages in your repository. Please check
99
# the `language` matrix defined below to confirm you have the correct set of
1010
# supported CodeQL languages.
1111
#
12-
name: "CodeQL"
12+
name: 'CodeQL'
1313

1414
on:
1515
push:
16-
branches: [ main ]
16+
branches: [main]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ main ]
19+
branches: [main]
2020
schedule:
2121
- cron: '38 15 * * 3'
2222

@@ -32,39 +32,39 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
language: [ 'javascript' ]
36-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
35+
language: ['javascript']
36+
# CodeQL supports ['cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby']
3737
# Learn more about CodeQL language support at https://git.io/codeql-language-support
3838

3939
steps:
40-
- name: Checkout repository
41-
uses: actions/checkout@v4
40+
- name: Checkout repository
41+
uses: actions/checkout@v5
4242

43-
# Initializes the CodeQL tools for scanning.
44-
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v3
46-
with:
47-
languages: ${{ matrix.language }}
48-
# If you wish to specify custom queries, you can do so here or in a config file.
49-
# By default, queries listed here will override any specified in a config file.
50-
# Prefix the list here with "+" to use these queries and those in the config file.
51-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
43+
# Initializes the CodeQL tools for scanning.
44+
- name: Initialize CodeQL
45+
uses: github/codeql-action/init@v3
46+
with:
47+
languages: ${{ matrix.language }}
48+
# If you wish to specify custom queries, you can do so here or in a config file.
49+
# By default, queries listed here will override any specified in a config file.
50+
# Prefix the list here with "+" to use these queries and those in the config file.
51+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5252

53-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
54-
# If this step fails, then you should remove it and run the build manually (see below)
55-
- name: Autobuild
56-
uses: github/codeql-action/autobuild@v3
53+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
54+
# If this step fails, then you should remove it and run the build manually (see below)
55+
- name: Autobuild
56+
uses: github/codeql-action/autobuild@v3
5757

58-
# ℹ️ Command-line programs to run using the OS shell.
59-
# 📚 https://git.io/JvXDl
58+
# ℹ️ Command-line programs to run using the OS shell.
59+
# 📚 https://git.io/JvXDl
6060

61-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
62-
# and modify them (or add more) to build your code if your project
63-
# uses a compiled language
61+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
62+
# and modify them (or add more) to build your code if your project
63+
# uses a compiled language
6464

65-
#- run: |
66-
# make bootstrap
67-
# make release
65+
#- run: |
66+
# make bootstrap
67+
# make release
6868

69-
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v3
69+
- name: Perform CodeQL Analysis
70+
uses: github/codeql-action/analyze@v3

‎.github/workflows/deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2828
- name: Setup Pages
2929
uses: actions/configure-pages@v5
3030
- name: Install dependencies
3131
run: npm ci
3232
- name: Build with Eleventy
3333
run: npm run-script build
3434
- name: Upload artifact
35-
uses: actions/upload-pages-artifact@v3
35+
uses: actions/upload-pages-artifact@v4
3636

3737
deploy:
3838
environment:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ node_modules
33
_site
44
.DS_Store
55
.nova
6+
.tool-versions

‎.prettierignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
**/*.html

‎.prettierrc.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"semi": false,
3+
"singleQuote": true,
4+
"tabWidth": 2,
5+
"trailingComma": "none",
6+
"overrides": [
7+
{
8+
"files": "*.md",
9+
"options": {
10+
"embeddedLanguageFormatting": "off"
11+
}
12+
},
13+
{
14+
"files": "*.scss",
15+
"options": {
16+
"printWidth": 120,
17+
"singleQuote": false
18+
}
19+
}
20+
]
21+
}

‎.stylelintrc.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"extends": "stylelint-config-gds/scss",
3+
"ignoreFiles": ["_site/**/*.css"]
4+
}

‎.tool-versions‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎app/_components/_all.scss‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)