Skip to content

Commit

Permalink
Merge branch 'main' into ans_facets
Browse files Browse the repository at this point in the history
  • Loading branch information
anselmbradford authored Mar 5, 2024
2 parents edb85f0 + 70c6454 commit 709b363
Show file tree
Hide file tree
Showing 2,355 changed files with 9,877 additions and 13,457 deletions.
4 changes: 1 addition & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
docs/\_site
docs/dist
test/unit-test-coverage/
packages/cfpb-design-system/cfpb-design-system.js
wdio.conf.js
wdio.conf.sauce.js
packages/cfpb-*/dist/
2 changes: 2 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module.exports = {
parserOptions: {
sourceType: 'module',
ecmaVersion: 2020,
},
settings: {
'import/resolver': {
Expand All @@ -24,6 +25,7 @@ module.exports = {
'plugin:jsdoc/recommended',
'plugin:jsx-a11y/recommended',
'plugin:react/recommended',
'plugin:cypress/recommended',
'eslint-config-prettier',
],
// Some plugins are automatically included.
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ __Current__
__Expected__


@sonnakim for awareness
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,6 @@ If applicable, add screenshots to help explain your problem.
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
Add any other context about the problem here.

@sonnakim for awareness
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/content_issues.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ Make sure NOT to include internal links.

***Thanks. Don't forget to add labels indicating issue type and size before submitting!***
***Once you've submitted your issue, please add it to the content backlog project board: https://github.com/cfpb/design-system/projects/1***

@sonnakim for awareness
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/create_new_page.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ Remember, new standards should be discussed in Hubcap first before being added t


When you're ready to share a draft of the page, or want to raise questions, use this issue to track the discussion.

@sonnakim for awareness
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ A clear and concise description of any alternative solutions or features you've

**Additional context**
Add any other context or screenshots about the feature request here.

@sonnakim for awareness
14 changes: 7 additions & 7 deletions .github/workflows/lighthouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# Install Node and configure its cache.
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20

# https://github.com/actions/cache/blob/master/examples.md#node---yarn
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v3
- uses: actions/cache@v4
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
Expand All @@ -33,11 +33,11 @@ jobs:
# Install Ruby and configure the Bundler cache.
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0.0
ruby-version: 3.2.3

# https://github.com/actions/cache/blob/master/examples.md#ruby---bundler
- name: Set up Bundler cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**Gemfile.lock') }}
Expand All @@ -57,7 +57,7 @@ jobs:

- name: Attach results as artifact to GitHub Actions run
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: lighthouse-results
path: .lighthouseci
8 changes: 4 additions & 4 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0.0
- uses: actions/checkout@v3
ruby-version: 3.2.3
- uses: actions/checkout@v4
- run: ./scripts/update-gh-pages.sh
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
registry-url: 'https://npm.pkg.github.com'

- name: Config Git
Expand Down
20 changes: 15 additions & 5 deletions .github/workflows/sauce.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ jobs:

steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20

- name: Set up Ruby for Jekyll
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0.0
ruby-version: 3.2.3

- name: Install dependencies with Yarn
run: |
Expand All @@ -34,7 +34,17 @@ jobs:
yarn start &
sleep 5
- name: Run browser tests
- name: Set up Sauce Connect
uses: saucelabs/sauce-connect-action@v2
with:
# These credentials are from @contolini's CFPB Sauce Labs account
# They're defined on the repo's settings page:
# https://github.com/cfpb/design-system/settings/secrets
username: ${{ secrets.SAUCE_USERNAME }}
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
configFile: ${{ github.workspace }}/.sauce/config.yml

- name: Run e2e browser tests
# Don't run these tests on forks. It would be nice to instead check
# to see if the Sauce Labs environment variables are defined, but that
# doesn't seem currently possible:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:

steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20

- name: Install dependencies with Yarn
run: yarn install
Expand Down
5 changes: 3 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ docs/_includes/*.html
test/unit-test-coverage/
.lighthouseci
.github
.eslintignore
.stylelintignore
CHANGELOG.md
packages/cfpb-design-system/cfpb-design-system.js
packages/cfpb-*/cfpb-*.css
packages/cfpb-*/dist/
3 changes: 0 additions & 3 deletions .prettierrc

This file was deleted.

50 changes: 50 additions & 0 deletions .sauce/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
apiVersion: v1
kind: cypress
defaults: {}
showConsoleLog: false
sauce:
region: us-west-1
concurrency: 15
sauceignore: .sauceignore
cypress:
configFile: cypress.config.js
version: 13.6.0
record: false
key: ''
reporters: []
suites:
- name: cypress - Windows 10 - chrome
browser: 'chrome'
browserVersion: 'latest'
platformName: 'Windows 10'
config:
testingType: e2e
specPattern:
- 'test/cypress/e2e/**/*.cy.js'
# Increase the VM's resolution for Netlify CMS tests that require a wider viewport.
screenResolution: '1920x1200'
- name: cypress - Windows 11 - edge
browser: 'microsoftedge'
browserVersion: '119'
platformName: 'Windows 11'
config:
testingType: e2e
specPattern:
- 'test/cypress/e2e/**/*.cy.js'
screenResolution: '1920x1200'
exclude:
# Netlify CMS is only tested with Chrome
- 'test/cypress/e2e/docs/netlify-cms.cy.js'
- name: cypress - Windows 10 - firefox
browser: 'firefox'
browserVersion: 'latest'
platformName: 'Windows 10'
config:
testingType: e2e
specPattern:
- 'test/cypress/e2e/**/*.cy.js'
screenResolution: '1920x1200'
exclude:
# Netlify CMS is only tested with Chrome
- 'test/cypress/e2e/docs/netlify-cms.cy.js'
rootDir: .
19 changes: 19 additions & 0 deletions .sauceignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# This file instructs saucectl to not package any files mentioned here.
/examples/
/artifacts/
cypress/videos/
cypress/results/
cypress/screenshots/
# Remove this to have node_modules uploaded with code
node_modules/
.git/
.github/
.DS_Store
.hg/
.vscode/
.idea/
.gitignore
.hgignore
.gitlab-ci.yml
.npmrc
*.gif
1 change: 1 addition & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
docs/_site
docs/dist
packages/cfpb-*/dist/
34 changes: 0 additions & 34 deletions .stylelintrc.cjs

This file was deleted.

Loading

0 comments on commit 709b363

Please sign in to comment.