Skip to content

Commit

Permalink
Merge branch 'wet-boew:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
fsnoddy authored Dec 16, 2024
2 parents c9784f8 + a4a99fd commit de6f39c
Show file tree
Hide file tree
Showing 680 changed files with 97,777 additions and 18,008 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"JSON": true
},
"rules": {
"indent": ["error", "tab", { "outerIIFEBody": 0 }],
"indent": ["error", "tab", { "outerIIFEBody": 0, "SwitchCase": 1 }],
"eqeqeq": [2, "allow-null"],
"no-eq-null": 2,
"no-unused-expressions": [2, { "allowTernary": true }],
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

strategy:
matrix:
node-version: [12.x]
node-version: [20.x]
env:
REPO_GCWEB: GCWeb
REPO_JEKYLL: gcweb-jekyll
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
- name: Copy the missing _sprite_share.scss file - related to GCWeb#1737 about wet-boew#cc340a6 commit
run: |
curl https://gist.githubusercontent.com/duboisp/d69787b300eb1f4d40f937508e10d013/raw/12cd8472baf6070d9868bdce3d961c3fb6320c83/_sprites_share.scss >> _sprites_share.scss
curl https://gist.githubusercontent.com/duboisp/d69787b300eb1f4d40f937508e10d013/raw/86e7a0b15ad6a695754599e9793e986b460bf514/_sprites_share.scss >> _sprites_share.scss
mv _sprites_share.scss node_modules/wet-boew/src/plugins/share/sprites/_sprites_share.scss
- name: Checkout wet-boew latest build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
node-version: [12.x]
node-version: [20.x]
steps:
- uses: actions/checkout@v2

Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Copy the missing _sprite_share.scss file - related to GCWeb#1737 about wet-boew#cc340a6 commit
run: |
curl https://gist.githubusercontent.com/duboisp/d69787b300eb1f4d40f937508e10d013/raw/12cd8472baf6070d9868bdce3d961c3fb6320c83/_sprites_share.scss >> _sprites_share.scss
curl https://gist.githubusercontent.com/duboisp/d69787b300eb1f4d40f937508e10d013/raw/86e7a0b15ad6a695754599e9793e986b460bf514/_sprites_share.scss >> _sprites_share.scss
mv _sprites_share.scss node_modules/wet-boew/src/plugins/share/sprites/_sprites_share.scss
- name: Checkout wet-boew latest build
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

ARG RUBY_VERSION=2.7.3
ARG RUBY_VERSION=3.3.0
FROM ruby:$RUBY_VERSION

RUN apt-get update \
Expand All @@ -15,6 +15,7 @@ RUN apt-get update \
jekyll-github-metadata \
minitest \
&& gem install rake html-proofer \
&& gem install webrick \
&& mkdir -p /usr/src/app \
&& rm -rf /usr/lib/ruby/gems/*/cache/*.gem

Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ gem 'minitest'
#gem "scss_lint"
gem "html-proofer"
gem "rake"
gem "webrick"
16 changes: 13 additions & 3 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,17 @@ module.exports = (grunt) ->
]
)

@registerTask(
"build"
"Build a local working copy without dependencies check"
[
"jekyll-theme"
"jekyll-theme-runLocal"
"core-dist-DEBUG"
"site-contents"
]
)

@registerTask(
"demo"
"Build a demo ready version of the site"
Expand Down Expand Up @@ -488,8 +499,7 @@ module.exports = (grunt) ->
"check-wet-version"
"Ensure WET-BOEW's version is the same in package as in node_modules",
(src) ->
installedFull = this.data[0]
installed = installedFull.substring(installedFull.indexOf("#") + 2)
installed = this.data[0]
expectedFull = this.data[1]
expected = expectedFull.substring(expectedFull.indexOf("#") + 2)

Expand Down Expand Up @@ -527,7 +537,7 @@ module.exports = (grunt) ->
checkGitUrls: true

"check-wet-version":
src: ["<%= pkgWET._from %>", "<%= pkg.dependencies['wet-boew'] %>"]
src: ["<%= pkgWET.version %>", "<%= pkg.dependencies['wet-boew'] %>"]

"a11y-report":
all:
Expand Down
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#
# Local site settings
remote_theme: wet-boew/gcweb-jekyll
repository: wet-boew/GCWeb
title: "GCWeb, the Canada.ca official theme" # Site name or title
website: "https://wet-boew.github.io/GCWeb/" # URL of your public facing website
global:
Expand Down
2 changes: 1 addition & 1 deletion _data/a11yComponents.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"name":"Archived - template","a11y":[],"acr":[]},{"name":"Authentication","a11y":[],"acr":[]},{"name":"Breadcrumb trail","a11y":[],"acr":[]},{"name":"Date modified","a11y":[],"acr":[]},{"name":"Feedback area","a11y":[],"acr":[]},{"name":"Footer","a11y":[{"allStates":["earl:passed","earl:inapplicable"],"date":"2022-12-02","isPartial":false,"testRequirementNotCovered":[],"state":"Pass","link":"sites/footers/reports/a11y-1.json"}],"acr":[]},{"name":"GCWeb Menu","a11y":[],"acr":[]},{"name":"Header","a11y":[],"acr":[]},{"name":"Helpers","a11y":[],"acr":[]},{"name":"Language toggle link","a11y":[],"acr":[]},{"name":"Page details","a11y":[],"acr":[]},{"name":"Secondary/Local menu","a11y":[],"acr":[]},{"name":"Skip links","a11y":[],"acr":[]},{"name":"Checkboxes and radio buttons","a11y":[],"acr":[]},{"name":"Download link","a11y":[],"acr":[]},{"name":"Featured link - Documentation and working example","a11y":[],"acr":[]},{"name":"Context-specific features","a11y":[{"allStates":["earl:untested","earl:inapplicable"],"date":"2023-06-30","isPartial":false,"testRequirementNotCovered":[],"state":"Mixed","link":"components/gc-features/reports/pre-a11y-1.json"},{"allStates":["earl:passed","earl:inapplicable"],"date":"2023-08-23","isPartial":false,"testRequirementNotCovered":[],"state":"Pass","link":"components/gc-features/reports/pre-a11y-2.json"}],"acr":[]},{"name":"Feeds plugin GC override","a11y":[],"acr":[]},{"name":"Most requested - Documentation and working example","a11y":[],"acr":[]},{"name":"Services and information","a11y":[],"acr":[]},{"name":"Step by Step navigation","a11y":[],"acr":[]},{"name":"GC Subway map menu","a11y":[],"acr":[]},{"name":"GC tables","a11y":[],"acr":[]},{"name":"Table of Contents","a11y":[],"acr":[]},{"name":"Well header responsive","a11y":[],"acr":[]},{"name":"Other components","a11y":[],"acr":[]},{"name":"Labels","a11y":[],"acr":[]},{"name":"List - Additional style","a11y":[],"acr":[]},{"name":"Chat wizard","a11y":[],"acr":[]},{"name":"Data JSON","a11y":[],"acr":[]},{"name":"Do action","a11y":[],"acr":[]},{"name":"Fieldflow","a11y":[],"acr":[]},{"name":"JSON Manager","a11y":[],"acr":[]},{"name":"Datalist dynamic suggestion","a11y":[],"acr":[]},{"name":"URL Mapping","a11y":[],"acr":[]},{"name":"wb5-click postback converter","a11y":[],"acr":[]},{"name":"Well bold","a11y":[],"acr":[]},{"name":"Ajax Fetch","a11y":[],"acr":[]},{"name":"Alert","a11y":[],"acr":[]},{"name":"Alignment","a11y":[],"acr":[]},{"name":"Buttons","a11y":[],"acr":[]},{"name":"Color (Foreground/Background)","a11y":[],"acr":[]},{"name":"List","a11y":[],"acr":[]},{"name":"Scaffolding","a11y":[{"allStates":["earl:failed"],"date":"2023-11-21","isPartial":true,"testRequirementNotCovered":["WCAG21:non-text-content","WCAG21:audio-only-and-video-only-prerecorded","WCAG21:captions-prerecorded","WCAG21:audio-description-or-media-alternative-prerecorded","WCAG21:captions-live","WCAG21:audio-description-prerecorded","WCAG21:info-and-relationships","WCAG21:meaningful-sequence","WCAG21:sensory-characteristics","WCAG21:orientation","WCAG21:identify-input-purpose","WCAG21:use-of-color","WCAG21:audio-control","WCAG21:contrast-minimum","WCAG21:resize-text","WCAG21:image-of-text","WCAG21:reflow","WCAG21:text-spacing","WCAG21:content-on-hover-or-focus","WCAG21:keyboard","WCAG21:no-keyboard-trap","WCAG21:character-key-shortcuts","WCAG21:timing-adjustable","WCAG21:pause-stop-hide","WCAG21:three-flashes-or-below-threshold","WCAG21:bypass-blocks","WCAG21:page-titled","WCAG21:focus-order","WCAG21:link-purpose-in-context","WCAG21:multiple-ways","WCAG21:headings-and-labels","WCAG21:focus-visible","WCAG21:pointer-gestures","WCAG21:pointer-cancellation","WCAG21:label-in-name","WCAG21:motion-actuation","WCAG21:language-of-page","WCAG21:language-of-parts","WCAG21:on-focus","WCAG21:on-input","WCAG21:consistent-navigation","WCAG21:consistent-identification","WCAG21:error-identification","WCAG21:labels-or-instructions","WCAG21:error-suggestion","WCAG21:error-prevention-legal-financial-data)","WCAG21:parsing","WCAG21:name-role-value","WCAG21:status-messages"],"state":"earl:failed","link":"common/scaffolding/reports/a11y-1.json"}],"acr":[]},{"name":"Share widget","a11y":[{"allStates":["earl:passed","earl:inapplicable","earl:untested"],"date":"2023-07-06","isPartial":false,"testRequirementNotCovered":[],"state":"Mixed","link":"common/share/reports/pre-ally-1.json"}],"acr":[]},{"name":"Tables","a11y":[],"acr":[]},{"name":"Basic HTML","a11y":[],"acr":[]},{"name":"Advanced Service - Probably deprecated","a11y":[],"acr":[]},{"name":"Application","a11y":[],"acr":[]},{"name":"Campaign name","a11y":[],"acr":[]},{"name":"Content page","a11y":[],"acr":[]},{"name":"Home","a11y":[],"acr":[]},{"name":"Other template","a11y":[],"acr":[]},{"name":"Index","a11y":[],"acr":[]},{"name":"Institutional profile","a11y":[],"acr":[]},{"name":"Laws and regulations pages","a11y":[],"acr":[]},{"name":"Lowest topic (with secondary navigation)","a11y":[],"acr":[]},{"name":"Ministerial profile","a11y":[],"acr":[]},{"name":"News","a11y":[],"acr":[]},{"name":"Organizational profile","a11y":[],"acr":[]},{"name":"Search results","a11y":[],"acr":[]},{"name":"Server error message","a11y":[],"acr":[]},{"name":"Splash page - Canada.ca","a11y":[],"acr":[]},{"name":"Thematic","a11y":[],"acr":[]},{"name":"Beta - Theme, Topic","a11y":[],"acr":[]},{"name":"Topic","a11y":[],"acr":[]},{"name":"Background image","a11y":[],"acr":[]},{"name":"Favicon","a11y":[],"acr":[]}]
[{"name":"Archived - template","a11y":[],"acr":[]},{"name":"Authentication","a11y":[],"acr":[]},{"name":"Breadcrumb trail","a11y":[],"acr":[]},{"name":"Date modified","a11y":[],"acr":[]},{"name":"Feedback area","a11y":[{"allStates":["earl:passed","earl:inapplicable","earl:failed","earl:cantTell"],"date":"2023-10-30","isPartial":true,"testRequirementNotCovered":["WCAG21:error-prevention-legal-financial-data)"],"state":"Mixed","link":"sites/feedback/reports/pre-a11y-2.json"}],"acr":[{"allStates":[],"date":"2023-12-14","isPartial":false,"conformityNotCovered":[],"conformity":"Satisfied","link":"sites/feedback/reports/acr-2023-autumn.json","state":"Empty and incomplete","createdOn":"2023-12-14"}]},{"name":"Footer","a11y":[{"allStates":["earl:passed","earl:inapplicable"],"date":"2022-12-02","isPartial":false,"testRequirementNotCovered":[],"state":"Pass","link":"sites/footers/reports/a11y-1.json"}],"acr":[]},{"name":"GCWeb Menu","a11y":[],"acr":[]},{"name":"Header","a11y":[],"acr":[]},{"name":"Helpers","a11y":[],"acr":[]},{"name":"Language toggle link","a11y":[],"acr":[]},{"name":"Main title of the page","a11y":[],"acr":[]},{"name":"Page details","a11y":[],"acr":[]},{"name":"Secondary/Local menu","a11y":[],"acr":[]},{"name":"Skip links","a11y":[],"acr":[]},{"name":"Bold content","a11y":[],"acr":[]},{"name":"Checkboxes and radio buttons","a11y":[],"acr":[]},{"name":"Download link","a11y":[],"acr":[]},{"name":"Featured link - Documentation and working example","a11y":[{"allStates":["earl:inapplicable","earl:untested"],"date":"2023-09-21","isPartial":true,"testRequirementNotCovered":["WCAG21:error-prevention-legal-financial-data)"],"state":"Mixed","link":"components/gc-featured-link/reports/pre-a11y-1.json"},{"allStates":["earl:inapplicable","earl:passed"],"date":"2023-09-21","isPartial":true,"testRequirementNotCovered":["WCAG21:error-prevention-legal-financial-data)"],"state":"Pass","link":"components/gc-featured-link/reports/pre-a11y-2.json"}],"acr":[]},{"name":"Context-specific features","a11y":[{"allStates":["earl:untested","earl:inapplicable"],"date":"2023-06-30","isPartial":true,"testRequirementNotCovered":["WCAG21:error-prevention-legal-financial-data)"],"state":"Mixed","link":"components/gc-features/reports/pre-a11y-1.json"},{"allStates":["earl:passed","earl:inapplicable"],"date":"2023-08-23","isPartial":true,"testRequirementNotCovered":["WCAG21:error-prevention-legal-financial-data)"],"state":"Pass","link":"components/gc-features/reports/pre-a11y-2.json"}],"acr":[]},{"name":"Social media channels","a11y":[],"acr":[]},{"name":"Most requested - Documentation and working example","a11y":[],"acr":[]},{"name":"Services and information","a11y":[{"allStates":["earl:passed","earl:inapplicable","earl:untested"],"date":"2023-07-06","isPartial":false,"testRequirementNotCovered":[],"state":"Mixed","link":"components/gc-servinfo/reports/ally-1.json"}],"acr":[]},{"name":"Step by Step navigation","a11y":[],"acr":[]},{"name":"GC Subway map menu","a11y":[],"acr":[]},{"name":"GC tables","a11y":[],"acr":[]},{"name":"Table of Contents","a11y":[],"acr":[]},{"name":"Well header responsive","a11y":[],"acr":[]},{"name":"Images","a11y":[],"acr":[]},{"name":"Other components","a11y":[],"acr":[]},{"name":"Labels","a11y":[],"acr":[]},{"name":"List - Additional style","a11y":[],"acr":[]},{"name":"Chat wizard","a11y":[],"acr":[]},{"name":"Do action","a11y":[],"acr":[]},{"name":"Fieldflow","a11y":[],"acr":[]},{"name":"Datalist dynamic suggestion","a11y":[],"acr":[]},{"name":"URL Mapping","a11y":[],"acr":[]},{"name":"wb5-click postback converter","a11y":[],"acr":[]},{"name":"Ajax Fetch","a11y":[{"allStates":["earl:inapplicable","earl:untested"],"date":"2023-09-09","isPartial":false,"testRequirementNotCovered":[],"state":"Mixed","link":"common/ajax-fetch/reports/pre-a11y-1.json"}],"acr":[]},{"name":"Alert","a11y":[],"acr":[]},{"name":"Alignment","a11y":[],"acr":[]},{"name":"Buttons","a11y":[],"acr":[]},{"name":"Color (Foreground/Background)","a11y":[],"acr":[]},{"name":"List","a11y":[],"acr":[]},{"name":"Scaffolding","a11y":[{"allStates":["earl:failed"],"date":"2023-11-21","isPartial":true,"testRequirementNotCovered":["WCAG21:non-text-content","WCAG21:audio-only-and-video-only-prerecorded","WCAG21:captions-prerecorded","WCAG21:audio-description-or-media-alternative-prerecorded","WCAG21:captions-live","WCAG21:audio-description-prerecorded","WCAG21:info-and-relationships","WCAG21:meaningful-sequence","WCAG21:sensory-characteristics","WCAG21:orientation","WCAG21:identify-input-purpose","WCAG21:use-of-color","WCAG21:audio-control","WCAG21:contrast-minimum","WCAG21:resize-text","WCAG21:image-of-text","WCAG21:reflow","WCAG21:text-spacing","WCAG21:content-on-hover-or-focus","WCAG21:keyboard","WCAG21:no-keyboard-trap","WCAG21:character-key-shortcuts","WCAG21:timing-adjustable","WCAG21:pause-stop-hide","WCAG21:three-flashes-or-below-threshold","WCAG21:bypass-blocks","WCAG21:page-titled","WCAG21:focus-order","WCAG21:link-purpose-in-context","WCAG21:multiple-ways","WCAG21:headings-and-labels","WCAG21:focus-visible","WCAG21:pointer-gestures","WCAG21:pointer-cancellation","WCAG21:label-in-name","WCAG21:motion-actuation","WCAG21:language-of-page","WCAG21:language-of-parts","WCAG21:on-focus","WCAG21:on-input","WCAG21:consistent-navigation","WCAG21:consistent-identification","WCAG21:error-identification","WCAG21:labels-or-instructions","WCAG21:error-suggestion","WCAG21:error-prevention-legal-financial-data)","WCAG21:parsing","WCAG21:name-role-value","WCAG21:status-messages"],"state":"earl:failed","link":"common/scaffolding/reports/a11y-1.json"},{"allStates":["earl:passed","earl:inapplicable","earl:cantTell",null],"date":"2024-02-29","isPartial":true,"testRequirementNotCovered":["WCAG21:bypass-blocks"],"state":"Mixed","link":"common/scaffolding/reports/ally-assess-1.json"}],"acr":[]},{"name":"Share widget","a11y":[{"allStates":["earl:passed","earl:inapplicable","earl:untested"],"date":"2023-07-06","isPartial":false,"testRequirementNotCovered":[],"state":"Mixed","link":"common/share/reports/pre-ally-1.json"}],"acr":[]},{"name":"Tables","a11y":[],"acr":[]},{"name":"Basic HTML","a11y":[],"acr":[]},{"name":"Advanced Service - Probably deprecated","a11y":[],"acr":[]},{"name":"Application","a11y":[],"acr":[]},{"name":"Campaign name","a11y":[],"acr":[]},{"name":"Content page","a11y":[],"acr":[]},{"name":"Home","a11y":[{"allStates":["earl:untested","earl:inapplicable"],"date":"2023-07-14","isPartial":false,"testRequirementNotCovered":[],"state":"Mixed","link":"templates/home/reports/pre-a11y-1.json"}],"acr":[]},{"name":"Other template","a11y":[],"acr":[]},{"name":"Index","a11y":[],"acr":[]},{"name":"Institutional profile","a11y":[],"acr":[]},{"name":"Laws and regulations pages","a11y":[],"acr":[]},{"name":"Lowest topic (with secondary navigation)","a11y":[],"acr":[]},{"name":"Ministerial profile","a11y":[],"acr":[]},{"name":"News","a11y":[],"acr":[]},{"name":"Organizational profile","a11y":[],"acr":[]},{"name":"Search results","a11y":[],"acr":[]},{"name":"Server error message","a11y":[],"acr":[]},{"name":"Splash page - Canada.ca","a11y":[],"acr":[]},{"name":"Thematic","a11y":[],"acr":[]},{"name":"Beta - Theme, Topic","a11y":[],"acr":[]},{"name":"Topic","a11y":[],"acr":[]}]
2 changes: 1 addition & 1 deletion _data/a11yTestRequirement.json

Large diffs are not rendered by default.

Loading

0 comments on commit de6f39c

Please sign in to comment.