Merge pull request #3228 from uswds/release-2.3.0

Release 2.3.0
uswds · Nov 20, 2019 · d8604d2 · d8604d2
2 parents 3d10edc + d5a9a52
commit d8604d2
Show file tree

Hide file tree

Showing 419 changed files with 20,295 additions and 24,460 deletions.
diff --git a/.circleci/config.yml b/.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
 
@@ -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
@@ -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:
@@ -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:

diff --git a/.codeclimate.yml b/.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/**/*

diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -1,4 +1,6 @@
-extends: airbnb-base
+extends:
+  - airbnb-base
+  - prettier
 plugins:
   - import
 env:

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-10.15.1
+12.13.0
diff --git a/.snyk b/.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: {}
diff --git a/.stylelintrc.json b/.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/**/*"
 }
diff --git a/LICENSE.md b/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
 
@@ -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: