Skip to content

Commit

Permalink
Merge branch 'main' into rc-publish-combobox-checklist
Browse files Browse the repository at this point in the history
  • Loading branch information
thisisdano committed Sep 18, 2024
2 parents 27c7208 + adc49ae commit e8b46e0
Show file tree
Hide file tree
Showing 13 changed files with 1,950 additions and 422 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

orbs:
snyk: snyk/snyk@1.1.2
snyk: snyk/snyk@2.2.0

executors:
my-executor:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.9.0
lts/*
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ruby 3.1.2
ruby 3.2.5
nodejs 20.9.0
28 changes: 13 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ GEM
eventmachine (1.2.7)
ffi (1.17.0-arm64-darwin)
forwardable-extended (2.6.0)
google-protobuf (4.27.3-arm64-darwin)
google-protobuf (4.28.1-arm64-darwin)
bigdecimal
rake (>= 13)
html-proofer (4.4.3)
Expand All @@ -28,9 +28,9 @@ GEM
yell (~> 2.0)
zeitwerk (~> 2.5)
http_parser.rb (0.8.0)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
jekyll (4.3.3)
jekyll (4.3.4)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
Expand Down Expand Up @@ -72,7 +72,7 @@ GEM
mercenary (0.4.0)
nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4)
parallel (1.26.2)
parallel (1.26.3)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (6.0.1)
Expand All @@ -82,27 +82,25 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.3.5)
strscan
rouge (4.3.0)
rspec-core (3.13.0)
rexml (3.3.7)
rouge (4.4.0)
rspec-core (3.13.1)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.1)
rspec-expectations (3.13.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
safe_yaml (1.0.5)
sass-embedded (1.77.8-arm64-darwin)
google-protobuf (~> 4.26)
strscan (3.1.0)
sass-embedded (1.78.0-arm64-darwin)
google-protobuf (~> 4.27)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
typhoeus (1.4.1)
ethon (>= 0.9.0)
unicode-display_width (2.5.0)
unicode-display_width (2.6.0)
webrick (1.8.1)
yell (2.2.2)
zeitwerk (2.6.17)
zeitwerk (2.6.18)

PLATFORMS
arm64-darwin-21
Expand All @@ -123,4 +121,4 @@ DEPENDENCIES
webrick (~> 1.7)

BUNDLED WITH
2.3.7
2.5.7
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Recommended before install:

You will need to have the following installed on your machine before following the commands below:

1. Ruby v3.1.2 (see `.ruby-version` or `.tool-versions`), [Installation guides](https://www.ruby-lang.org/en/documentation/installation/)
1. Ruby v3.2.5 (see `.ruby-version` or `.tool-versions`), [Installation guides](https://www.ruby-lang.org/en/documentation/installation/)
1. Node v20.9.0 (see `.nvmrc` or `.tool-versions`), [Installation guides](https://nodejs.org/en/download/)
1. Bundler v2.2.0 (see `.bundler-version`) [Installation guides](https://bundler.io/guides/using_bundler_in_applications.html#getting-started---installing-bundler-and-bundle-init)
1. Chrome v59 or higher (v60 if on Windows)
Expand Down
11 changes: 9 additions & 2 deletions _data/changelogs/about-monthly-calls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,16 @@ title: Monthly calls
type: documentation
changelogURL:
items:
- date: 2024-09-16
summary: Added August 2024 monthly call.
githubPr: 2827
githubRepo: uswds-site
- date: 2024-07-26
summary: Added June 2024 monthly call.
githubPr: 2747
githubRepo: uswds-site
- date: 2024-06-14
summary: Added May 2024 monthly call.
summaryAdditional: Note that there is no video available for this call yet.
summary: Added May 2024 monthly call.
githubPr: 2708
githubRepo: uswds-site
- date: 2024-05-15
Expand Down
10 changes: 10 additions & 0 deletions _data/changelogs/docs-getting-started-devs-phase-2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@ title: "Phase 2: Compile"
type: documentation
changelogURL:
items:
- date: 2024-09-05
summary: Added documentation for `settings.compile.browserslist` and `settings.compile.sassSourcemaps`.
affectsGuidance: true
githubPr: 2750
githubRepo: uswds-site
- date: 2024-09-05
summary: Removed the version number from "Gulp 4" references.
affectsGuidance: true
githubPr: 2750
githubRepo: uswds-site
- date: 2024-04-26
summary: Replaced outdated references to `paths.dist.sass` with `paths.dist.theme`.
affectsGuidance: true
Expand Down
12 changes: 12 additions & 0 deletions _data/monthly-calls.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
videos:
- title: A look at beta Web Components
subtitle: Progress toward the next version of USWDS
description: |
At the August 2024 monthly call, USWDS Experience Design Lead Anne Petersen answered community-submitted questions including an update on the submission and review process for component proposals. USWDS Product Lead Dan Williams shared updates on new and upcoming releases and demoed a preview of our new USWDS Figma Design Kit. USWDS Engineering Lead Matt Henry and USWDS contractor developer Amy Leadem also demoed early working prototypes of a few components.
date: August 2024
id:
event_link: https://digital.gov/event/2024/08/15/uswds-monthly-call-august-2024/
slides:
link: https://s3.amazonaws.com/digitalgov/static/uswds-monthly-call-august-2024.pptx
size: 3.6
pages: 48
questions_link: https://github.com/uswds/uswds/discussions/6060
- title: A first look at U.S. Web Design System Web Components
subtitle: See new Web Components in action
description: |
Expand Down
Loading

0 comments on commit e8b46e0

Please sign in to comment.