Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2.3.0 #3228

Merged
merged 73 commits into from Nov 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
261d063
Merge pull request #3115 from uswds/master
thisisdano Sep 23, 2019
2ae8d72
Add components theme variables to theme/styles
thisisdano Sep 25, 2019
0e69c79
Use previous path for $theme-hero-image default for backward compatib…
thisisdano Sep 25, 2019
b333121
Adds note that components import needs to come last
thisisdano Sep 25, 2019
50b711a
Merge pull request #3119 from uswds/dw-add-components-import
thisisdano Sep 25, 2019
9a610c4
Merge branch 'develop' into dw-add-bc-hero-var
thisisdano Sep 25, 2019
fd91e9e
Add note that components import needs to be last
thisisdano Sep 25, 2019
e46fea5
Merge pull request #3120 from uswds/dw-add-bc-hero-var
thisisdano Sep 25, 2019
d40e2c9
adds US Army MEDCoE to the who is using page
fpigeonjr Oct 15, 2019
4a957c7
Merge pull request #3132 from fpigeonjr/develop
thisisdano Oct 15, 2019
d201b58
Merge pull request #3133 from uswds/ext-army-medcoe
thisisdano Oct 15, 2019
e05f098
Fix mangled syntax
thisisdano Oct 18, 2019
2b71b27
Fix typo in National Institutes of Health
thisisdano Oct 24, 2019
a6d3741
Remove extra class on slim footer.
mejiaj Oct 30, 2019
a03efdf
Move inline-block on contact-info to slim footer only.
mejiaj Oct 31, 2019
e0d1fe5
Set grid-col-auto on desktop to Primary Footer section.
mejiaj Oct 31, 2019
6c1c821
Update Big Footer.
mejiaj Oct 31, 2019
244962f
Update and clarify Public Sans license
thisisdano Nov 1, 2019
604ad7c
Use updated language
thisisdano Nov 13, 2019
150adba
Merge pull request #3212 from uswds/update-license
thisisdano Nov 13, 2019
c2345e0
Run npm audit fix
thisisdano Nov 15, 2019
a18081c
Merge pull request #3143 from mejiaj/develop+3124
thisisdano Nov 15, 2019
1c6bc3e
Update dependencies
thisisdano Nov 15, 2019
d3eefbf
Update stylelint
thisisdano Nov 15, 2019
00d90ca
Uninstall chalk
thisisdano Nov 15, 2019
0cf32b3
Remove jquery
thisisdano Nov 15, 2019
f2eb1d3
Remove canvas-prebuilt
thisisdano Nov 15, 2019
afe3020
Remove array-filter and should
thisisdano Nov 15, 2019
4c4ff42
Update node-notifier
thisisdano Nov 15, 2019
33b034c
Remove acorn
thisisdano Nov 15, 2019
1cc4a69
Use most current LTS version of Node (12.13.0)
thisisdano Nov 15, 2019
d1d84f7
Update npm version in docs
thisisdano Nov 15, 2019
860f85f
Use latest types/node
thisisdano Nov 15, 2019
3ae6150
Update del
thisisdano Nov 15, 2019
7475792
Use beta version of fractal to fix 404 bug
thisisdano Nov 15, 2019
49aef0a
Update sinon
thisisdano Nov 15, 2019
8c8cddb
Update normalize
thisisdano Nov 15, 2019
b316fdd
Fix megamenu mobile column width bug
thisisdano Nov 15, 2019
bc7ca86
Add Prettier, format code, and integrate into tests
thisisdano Nov 15, 2019
cdba668
Prettify additional files
thisisdano Nov 15, 2019
b91c8ad
Remove @frctl/mandelbrot
thisisdano Nov 15, 2019
d88f79c
Remove cracks (not used)
thisisdano Nov 15, 2019
0b1f8d6
Add note about Prettier formatting
thisisdano Nov 18, 2019
85e6a81
Improve link specificity
thisisdano Nov 18, 2019
6385c6b
Reinstate mandelbrot
thisisdano Nov 18, 2019
e572982
Update deps
thisisdano Nov 18, 2019
12df784
Remove mandelbrot dep again, as it appears to be unnecessary
thisisdano Nov 18, 2019
50f6ffd
Merge pull request #3215 from uswds/dw-npm-audit
thisisdano Nov 18, 2019
ac62269
Alphabetize and Prettier
thisisdano Nov 18, 2019
ca3cea9
Merge branch 'develop' into internal-develop-3124
thisisdano Nov 18, 2019
57ead6f
Properly scope contact info link hover
thisisdano Nov 18, 2019
1ee381e
Use public sans v1.007
thisisdano Nov 18, 2019
902a66a
Merge pull request #3214 from uswds/internal-develop-3124
thisisdano Nov 19, 2019
3fc6d14
Merge pull request #3219 from uswds/dw-add-public-sans-1.007
thisisdano Nov 19, 2019
b6296d1
Install all USWDS in Federalist script
thisisdano Nov 19, 2019
d926739
Merge pull request #3220 from uswds/dw-fix-federalist-build
thisisdano Nov 19, 2019
8814f1b
Update refs to 2.3.0
thisisdano Nov 19, 2019
02736c3
Update .snyk
thisisdano Nov 19, 2019
91e745f
Use snyk orb
thisisdano Nov 19, 2019
8247704
Use proper npm command
thisisdano Nov 19, 2019
25400da
Merge pull request #3222 from uswds/dw-snyk-circle
thisisdano Nov 19, 2019
2e15330
Merge branch 'develop' into dw-update-refs-2.3.0
thisisdano Nov 19, 2019
328dec9
Merge pull request #3221 from uswds/dw-update-refs-2.3.0
thisisdano Nov 19, 2019
c699bf5
Use Snyk orb and rename workflow for clarity
thisisdano Nov 20, 2019
4e50b1b
Merge pull request #3226 from uswds/dw-circle-settings
thisisdano Nov 20, 2019
fd35fc4
Run prettier on project js
thisisdano Nov 20, 2019
e836930
Update .codeclimate.yml
thisisdano Nov 20, 2019
c09cf5b
Update README.md
thisisdano Nov 20, 2019
521e441
Update README.md
thisisdano Nov 20, 2019
a08c548
Rename workflow
thisisdano Nov 20, 2019
c3b8460
Update config.yml
thisisdano Nov 20, 2019
9d783d4
Merge pull request #3227 from uswds/dw-test-codeclimate
thisisdano Nov 20, 2019
d5a9a52
2.3.0
thisisdano Nov 20, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
31 changes: 13 additions & 18 deletions .circleci/config.yml
@@ -1,9 +1,12 @@
version: 2
version: 2.1

orbs:
snyk: snyk/snyk@0.0.8

references:
container: &container
docker:
- image: circleci/node:10.15.1-browsers
- image: circleci/node:12.13.0-browsers
environment:
CHROME_PATH: /usr/bin/google-chrome

Expand All @@ -22,21 +25,17 @@ jobs:
command: sudo npm install -g codeclimate-test-reporter
- restore_cache:
keys:
- v2-uswds-dependencies-{{ checksum "package-lock.json" }}
- v2-uswds-dependencies-{{ checksum "package-lock.json" }}
- run: npm install
- save_cache:
paths:
- node_modules
key: v2-uswds-dependencies-{{ checksum "package-lock.json" }}
- run:
name: Setup Snyk
command: sudo npm install -g snyk
- run: # run snyk auth - authenticate snyk use environment variables to add token
name: snyk auth
command: snyk auth $SNYK_TOKEN
- snyk/scan:
organization: uswds
- run:
name: Run test
command: npm test
command: npm run test:ci
- run:
name: Run code coverage report
command: npm run cover
Expand All @@ -54,7 +53,7 @@ jobs:
- checkout
- restore_cache:
keys:
- v2-uswds-dependencies-{{ checksum "package-lock.json" }}
- v2-uswds-dependencies-{{ checksum "package-lock.json" }}
- run: npm install --ignore-scripts
- run: npm rebuild node-sass
- run:
Expand All @@ -65,16 +64,12 @@ jobs:
command: |
npm config set "//registry.npmjs.org/:_authToken=$NPM_TOKEN"
npm publish
- run:
name: Setup Snyk
command: sudo npm install -g snyk
- run:
name: Update dependencies in Snyk dashboard
command: snyk monitor --org=uswds
- snyk/scan:
organization: uswds

workflows:
version: 2
build_and_deploy:
circle-uswds:
jobs:
- build
- deploy:
Expand Down
25 changes: 3 additions & 22 deletions .codeclimate.yml
@@ -1,30 +1,11 @@
engines:
csslint:
enabled: false

eslint:
enabled: false

version: "2"
plugins:
duplication:
enabled: true
config:
languages:
- javascript

nodesecurity:
enabled: false

golint:
enabled: false

rubocop:
enabled: false

ratings:
paths:
- src/js/**/*.js

exclude_paths:
exclude_patterns:
- config/**/*.js
- dist/**/*.js
- spec/**/*
Expand Down
4 changes: 3 additions & 1 deletion .eslintrc.yml
@@ -1,4 +1,6 @@
extends: airbnb-base
extends:
- airbnb-base
- prettier
plugins:
- import
env:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
@@ -1 +1 @@
10.15.1
12.13.0
2 changes: 1 addition & 1 deletion .snyk
@@ -1,4 +1,4 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.13.3
version: v1.13.5
ignore: {}
patch: {}
76 changes: 6 additions & 70 deletions .stylelintrc.json
@@ -1,76 +1,12 @@
{
"plugins": [
"stylelint-scss"
"extends": [
"stylelint-config-recommended-scss",
"stylelint-prettier/recommended"
],
"rules": {
"at-rule-name-case": "lower",
"at-rule-name-space-after": "always-single-line",
"at-rule-semicolon-newline-after": "always",
"block-closing-brace-newline-after": "always",
"block-closing-brace-newline-before": "always-multi-line",
"block-closing-brace-space-before": "always-single-line",
"block-no-empty": true,
"block-opening-brace-newline-after": "always-multi-line",
"block-opening-brace-space-after": "always-single-line",
"block-opening-brace-space-before": "always",
"color-hex-case": "lower",
"color-no-invalid-hex": true,
"declaration-bang-space-after": "never",
"declaration-bang-space-before": "always",
"declaration-block-no-shorthand-property-overrides": true,
"declaration-block-semicolon-newline-after": "always-multi-line",
"declaration-block-semicolon-space-after": "always-single-line",
"declaration-block-semicolon-space-before": "never",
"declaration-block-single-line-max-declarations": 1,
"declaration-block-trailing-semicolon": "always",
"declaration-colon-space-after": "always-single-line",
"declaration-colon-space-before": "never",
"declaration-no-important": true,
"function-calc-no-unspaced-operator": true,
"function-comma-space-after": "always-single-line",
"function-comma-space-before": "never",
"function-linear-gradient-no-nonstandard-direction": true,
"function-max-empty-lines": 0,
"function-name-case": "lower",
"function-parentheses-space-inside": "never-single-line",
"function-url-quotes": "always",
"function-whitespace-after": "always",
"indentation": 2,
"length-zero-no-unit": true,
"max-empty-lines": 1,
"max-nesting-depth": 4,
"media-feature-colon-space-after": "always",
"media-feature-colon-space-before": "never",
"media-feature-range-operator-space-after": "always",
"media-feature-range-operator-space-before": "always",
"media-query-list-comma-space-after": "always-single-line",
"media-query-list-comma-space-before": "never",
"media-feature-parentheses-space-inside": "never",
"no-eol-whitespace": true,
"no-extra-semicolons": true,
"no-invalid-double-slash-comments": true,
"number-no-trailing-zeros": true,
"property-case": "lower",
"selector-attribute-brackets-space-inside": "never",
"selector-attribute-operator-space-after": "never",
"selector-attribute-operator-space-before": "never",
"selector-combinator-space-after": "always",
"selector-combinator-space-before": "always",
"selector-list-comma-space-before": "never",
"selector-max-empty-lines": 0,
"selector-max-id": 0,
"selector-no-qualifying-type": true,
"selector-pseudo-class-case": "lower",
"selector-pseudo-class-parentheses-space-inside": "never",
"selector-pseudo-element-case": "lower",
"selector-pseudo-element-no-unknown": true,
"selector-type-case": "lower",
"string-no-newline": true,
"string-quotes": "single",
"unit-case": "lower",
"value-list-comma-newline-after": "always-multi-line",
"value-list-comma-space-after": "always-single-line",
"value-list-comma-space-before": "never"
"unit-no-unknown": null,
"no-descending-specificity": null,
"no-duplicate-selectors": null
},
"ignoreFiles": "./src/stylesheets/lib/**/*"
}
12 changes: 6 additions & 6 deletions LICENSE.md
@@ -1,14 +1,14 @@
## A few parts of this project are not in the public domain

### Files licensed under the SIL Open Font License
### Files licensed under the SIL Open Font License, Version 1.1

The Source Sans Pro font files in `src/fonts/source-sans-pro` are a [customized subset](https://github.com/miguelsousa/source-sans-pro-subset) of [Source Sans Pro](https://github.com/adobe-fonts/source-sans-pro), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Adobe Systems Incorporated](http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
The Source Sans Pro font files in `src/fonts/source-sans-pro` are a [customized subset](https://github.com/miguelsousa/source-sans-pro-subset) of [Source Sans Pro](https://github.com/adobe-fonts/source-sans-pro) owned by Adobe Systems Incorporated, licensed under the [SIL Open Font License, Version 1.1](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web), and copyright 2010, 2012, 2014 [Adobe Systems Incorporated], with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States or other countries.

The Merriweather font files in `src/fonts/merriweather` are v2.001 from [GitHub](https://github.com/EbenSorkin/Merriweather/releases/tag/v2.001) subsetted into Latin and with additional formats generated with [Transfonter](https://transfonter.org/), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Sorkin Type Co](www.sorkintype.com) with Reserved Font Name 'Merriweather'.
The Merriweather font files in `src/fonts/merriweather` are the version 2.001 files from [GitHub](https://github.com/EbenSorkin/Merriweather/releases/tag/v2.001) subsetted into Latin and with additional formats generated with [Transfonter](https://transfonter.org/), licensed under the [SIL Open Font License, Version 1.1](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web), and copyright [Sorkin Type Co](www.sorkintype.com) with Reserved Font Name 'Merriweather'.

The Public Sans font files in `src/fonts/public-sans` are licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL). Public Sans is a modification of Libre Franklin, copyright [Impallari Type](www.impallari.com).
The Public Sans font files in `src/fonts/public-sans` are licensed under the [SIL Open Font License, Version 1.1](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web). Public Sans is a modification of Libre Franklin, copyright [Impallari Type](www.impallari.com).

The files in `src/img` are from [Font Awesome](http://fontawesome.io/) by Dave Gandy under the [SIL Open Font License 1.1](http://scripts.sil.org/OFL).
The files in `src/img` are from [Font Awesome](http://fontawesome.io/) by Dave Gandy under the [SIL Open Font License, Version 1.1](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web).

### Files licensed under the Apache 2.0 License

Expand All @@ -18,7 +18,7 @@ The Roboto Mono font files in `src/fonts/roboto-mono` are licensed under the [Ap

The files in `src/stylesheets/lib` are from:

* [Normalize.css](https://github.com/necolas/normalize.css), copyright Nicolas Gallagher and Jonathan Neal, under the [MIT license](https://github.com/necolas/normalize.css/blob/master/LICENSE.md).
- [Normalize.css](https://github.com/necolas/normalize.css), copyright Nicolas Gallagher and Jonathan Neal, under the [MIT license](https://github.com/necolas/normalize.css/blob/master/LICENSE.md).

#### Full license text for the MIT licensed files:

Expand Down