Skip to content

Commit

Permalink
Merge pull request #4235 from uswds/jm-update-dependencies
Browse files Browse the repository at this point in the history
USWDS - Dependencies: Update dev dependencies.
  • Loading branch information
thisisdano committed Jun 16, 2021
2 parents 8f62a67 + bd5e165 commit 143432f
Show file tree
Hide file tree
Showing 17 changed files with 2,103 additions and 557 deletions.
12 changes: 6 additions & 6 deletions README.md
Expand Up @@ -65,12 +65,12 @@ How you implement the design system depends on the needs of your project and you

### Download and install

1. Download the [USWDS zip file](https://github.com/uswds/uswds/releases/download/v2.11.2/uswds-2.11.2.zip) from the latest USWDS release and open that file.
1. Download the [USWDS zip file](https://github.com/uswds/uswds/releases/download/v2.12.0/uswds-2.12.0.zip) from the latest USWDS release and open that file.

After extracting the zip file you should see the following file and folder structure:

```
uswds-2.11.2/
uswds-2.12.0/
├── css/
│   ├── uswds.min.css.map
│   ├── uswds.min.css
Expand Down Expand Up @@ -101,7 +101,7 @@ How you implement the design system depends on the needs of your project and you
```
example-project/
├── assets/
│   ├── uswds-2.11.2/
│   ├── uswds-2.12.0/
│   ├── stylesheets/
│   ├── images/
│   └── javascript/
Expand All @@ -121,11 +121,11 @@ How you implement the design system depends on the needs of your project and you
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<title>My Example Project</title>
<script src="assets/uswds-2.11.2/js/uswds-init.min.js"></script>
<link rel="stylesheet" href="assets/uswds-2.11.2/css/uswds.min.css" />
<script src="assets/uswds-2.12.0/js/uswds-init.min.js"></script>
<link rel="stylesheet" href="assets/uswds-2.12.0/css/uswds.min.css" />
</head>
<body>
<script src="assets/uswds-2.11.2/js/uswds.min.js"></script>
<script src="assets/uswds-2.12.0/js/uswds.min.js"></script>
</body>
</html>
```
Expand Down
2,579 changes: 2,055 additions & 524 deletions package-lock.json

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions package.json
Expand Up @@ -97,25 +97,25 @@
"resolve-id-refs": "^0.1.0"
},
"devDependencies": {
"@babel/preset-env": "^7.13.15",
"@babel/preset-env": "^7.14.5",
"@frctl/fractal": "^1.5.8",
"@frctl/nunjucks": "^2.0.10",
"@types/node": "^14.14.43",
"@types/node": "^14.17.3",
"ansi-colors": "^4.1.1",
"autoprefixer": "^10.2.5",
"axe-core": "^4.2.0",
"autoprefixer": "^10.2.6",
"axe-core": "^4.2.2",
"babelify": "^10.0.0",
"browserify": "^17.0.0",
"chrome-launcher": "^0.13.4",
"chrome-remote-interface": "^0.28.2",
"chrome-launcher": "^0.14.0",
"chrome-remote-interface": "^0.30.1",
"cross-spawn": "^7.0.3",
"eslint": "^7.25.0",
"eslint": "^7.28.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-prettier": "^7.2.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-import": "^2.23.4",
"fancy-log": "^1.3.3",
"gulp": "^4.0.2",
"gulp-changed": "^4.0.2",
"gulp-changed": "^4.0.3",
"gulp-clean": "^0.4.0",
"gulp-cli": "^2.3.0",
"gulp-dart-scss": "^1.1.0",
Expand All @@ -139,21 +139,21 @@
"normalize.css": "^8.0.1",
"nswatch": "^0.2.0",
"nyc": "^15.1.0",
"postcss": "^8.2.13",
"postcss": "^8.3.4",
"postcss-csso": "^5.0.1",
"postcss-discard-comments": "^4.0.2",
"prettier": "^2.2.0",
"prettier": "^2.3.1",
"resemblejs": "^3.2.5",
"sass": "^1.32.11",
"sass": "^1.35.1",
"sass-true": "^6.0.1",
"sinon": "^9.2.4",
"snyk": "^1.570.0",
"snyk": "^1.634.0",
"stylelint": "^13.13.0",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-recommended-scss": "^4.2.0",
"stylelint-prettier": "^1.2.0",
"stylelint-scss": "^3.19.0",
"typescript": "^4.2.4",
"typescript": "^4.3.2",
"vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0",
"yargs": "^16.1.1"
Expand Down
7 changes: 6 additions & 1 deletion src/stylesheets/core/_deprecated.scss
Expand Up @@ -24,7 +24,7 @@ $theme-title-font-size: $theme-display-font-size !default;
$theme-navigation-width: $theme-header-min-width !default;
$theme-megamenu-logo-text-width: $theme-header-logo-text-width !default;

// Deprecated in 2.11.2
// Deprecated in 2.11.0
$theme-site-max-width: $theme-grid-container-max-width !default;

@mixin title {
Expand All @@ -34,3 +34,8 @@ $theme-site-max-width: $theme-grid-container-max-width !default;
@mixin typeset-title {
@include typeset-display;
}

// Deprecated in 2.12.0
$theme-input-tile-background-color-selected: "primary-lighter" !default;
$theme-input-tile-border-color: "base-lighter" !default;
$theme-input-tile-border-color-selected: "primary-lighter" !default;
10 changes: 10 additions & 0 deletions src/stylesheets/core/_notifications.scss
Expand Up @@ -15,6 +15,16 @@ $uswds-notifications:
+ "\A --------------------------------------------------------------------"
+ "\A \2709 USWDS Notifications"
+ "\A --------------------------------------------------------------------"
+ "\A 2.12.0:"
+ "\A - We deprecated three settings:"
+ "\A $theme-input-tile-background-color-selected"
+ "\A $theme-input-tile-border-color"
+ "\A $theme-input-tile-border-color-selected"
+ "\A Each of these is now calculated automatically"
+ "\A - We updated some settings defaults:"
+ "\A $theme-color-success-dark: green-cool-50v (was green-cool-50)"
+ "\A $theme-color-success-darker: green-cool-60v (was green-cool-80)"
+ "\A --------------------------------------------------------------------"
+ "\A 2.11.2:"
+ "\A - We deprecated the `$theme-site-max-width` variable. We're using"
+ "\A `$theme-grid-container-max-width` instead."
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/settings/_settings-color.scss
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.11.2
USWDS 2.12.0
----------------------------------------
COLOR SETTINGS
----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/settings/_settings-components.scss
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.11.2
USWDS 2.12.0
----------------------------------------
COMPONENT SETTINGS
----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/settings/_settings-general.scss
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.11.2
USWDS 2.12.0
----------------------------------------
GENERAL SETTINGS
----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/settings/_settings-spacing.scss
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.11.2
USWDS 2.12.0
----------------------------------------
SPACING SETTINGS
----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/settings/_settings-typography.scss
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.11.2
USWDS 2.12.0
----------------------------------------
TYPOGRAPHY SETTINGS
----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/settings/_settings-utilities.scss
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.11.2
USWDS 2.12.0
----------------------------------------
UTILITIES SETTINGS
----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/theme/_uswds-theme-color.scss
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.11.2
USWDS 2.12.0
----------------------------------------
COLOR SETTINGS
----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/theme/_uswds-theme-components.scss
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.11.2
USWDS 2.12.0
----------------------------------------
COMPONENT SETTINGS
----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/theme/_uswds-theme-general.scss
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.11.2
USWDS 2.12.0
----------------------------------------
GENERAL SETTINGS
----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/theme/_uswds-theme-spacing.scss
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.11.2
USWDS 2.12.0
----------------------------------------
SPACING SETTINGS
----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/theme/_uswds-theme-typography.scss
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.11.2
USWDS 2.12.0
----------------------------------------
TYPOGRAPHY SETTINGS
----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/theme/_uswds-theme-utilities.scss
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.11.2
USWDS 2.12.0
----------------------------------------
UTILITIES SETTINGS
----------------------------------------
Expand Down

0 comments on commit 143432f

Please sign in to comment.