Skip to content

Commit

Permalink
Merge pull request #4449 from uswds/release-3.0.0-beta.2
Browse files Browse the repository at this point in the history
USWDS 3.0.0 Beta 2
  • Loading branch information
thisisdano committed Jan 7, 2022
2 parents cce2874 + bf11b59 commit f0a2914
Show file tree
Hide file tree
Showing 398 changed files with 53,924 additions and 69,314 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ orbs:
references:
container: &container
docker:
- image: circleci/node:14.16.0-browsers
- image: circleci/node:16.13.0-browsers
environment:
CHROME_PATH: /usr/bin/google-chrome
CHROME_PATH: $(which google-chrome-stable)

restore_deps: &restore_deps
restore_cache:
Expand Down
10 changes: 6 additions & 4 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ rules:
no-unsanitized/method: error
no-unsanitized/property: error
overrides:
- {
files: ["*.spec.js"],
rules: { no-unsanitized/method: off, no-unsanitized/property: off },
}
- { files: ['*.spec.js'],
rules: {
no-unsanitized/method: off,
no-unsanitized/property: off
}
}
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ coverage/

# ignore the generated dist directory
dist/
html-templates/

# ignore the Pattern Lab directory
patternlab/
# ignore the build directory
build/
dependencyGraph.json

# ignore compiled storybook directory
storybook-static/
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.13.0
16
10 changes: 4 additions & 6 deletions .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,21 @@ module.exports = {
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/addon-a11y",
"@whitespace/storybook-addon-html",
],
webpackFinal: async (config, { configType }) => {
// `configType` has a value of 'DEVELOPMENT' or 'PRODUCTION'
// You can change the configuration based on that.
// 'PRODUCTION' is used when building the static version of storybook.
config.module.rules.push(
{
test: /\.ya?ml$/,
type: "json",
use: "yaml-loader",
},
{
test: /\.twig$/,
use: "twigjs-loader",
resolve: {
alias: {
'@components': path.resolve(__dirname, '../src/components')
'@components': path.resolve(__dirname, '../src/components'),
'@templates': path.resolve(__dirname, '../src/templates'),
'@compare': path.resolve(__dirname, '../src/compare')
}
}
},
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This repository is for the design system code itself. We maintain [another repos
- [Where things live](#where-things-live)
- [Browser support](#browser-support)
- [Accessibility](#accessibility)
- [Fractal](#fractal)
- [Pattern library](#pattern-library)
- [Template compatibility](#template-compatibility)
- [Long-term support of v1.x](#long-term-support-of-v1x)
- [Need installation help?](#need-installation-help)
Expand Down Expand Up @@ -309,7 +309,8 @@ function App() {
// initialize
characterCount.on(ref);
// default ref is document.body, if you want to use
// default you do not have to pass arguments accordion.on();
// default you do not have to pass arguments
accordion.on();

// remove event listeners when component un-mounts.
return () => {
Expand Down
1 change: 1 addition & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ We encourage you to verify the security and status of the USWDS package:

1. **Check the vulnerability badge.** Confirm the vulnerability badge in the [USWDS Github code repository](https://github.com/uswds/uswds) says there are `0` vulnerabilities.
1. **Download the package via npm.** We recommend using the [npm package](https://designsystem.digital.gov/documentation/developers/#install-using-npm) instead of the [zip file](https://designsystem.digital.gov/documentation/developers/#download-and-install), whenever possible. Using npm makes it easier to stay up-to-date and use the latest USWDS version as a project dependency, and is a secure and reliable way to download USWDS source code.

## Report a security issue

To learn more about our security practices or to report a security issue, please [email us](mailto:uswds@support.digitalgov.gov). If the issue is confirmed, we will release a patch as soon as possible.
5 changes: 0 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const { lintSass, lintJS } = require("./gulp-tasks/lint");
const { build } = require("./gulp-tasks/build");
const { release } = require("./gulp-tasks/release");
const { watch } = require("./gulp-tasks/watch");
const { buildPL } = require("./gulp-tasks/serve");
const { compileSass } = require("./gulp-tasks/sass");
const { copyVendor } = require("./gulp-tasks/copy");
const { cleanDist } = require("./gulp-tasks/clean");
Expand Down Expand Up @@ -67,12 +66,8 @@ exports.buildSprite = buildSprite;
exports.buildSass = series(lintSass, copyVendor, compileSass);
exports.buildJS = series(typeCheck, lintJS, compileJS);
exports.buildUSWDS = build;
exports.buildComponents = buildPL;
exports.release = release;

// Build task for Pattern Lab.
exports.styleguide = buildPL;

/**
* *Watch task*
* Builds USWDS and component library, creates local server, and watches
Expand Down

0 comments on commit f0a2914

Please sign in to comment.