Merge pull request #528 from bring/revert-527-dependabot-collection-t…

…ry-2 Revert "Dependabot collection try 2"
bring · Aug 15, 2019 · 80384d5 · 80384d5
2 parents d8fe7fe + 03dfa20
commit 80384d5
Show file tree

Hide file tree

Showing 12 changed files with 13,952 additions and 10,037 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,12 +1,12 @@
 // .babelrc
 {
   "presets": [
-    ["@babel/preset-env", { "modules": false }]
+    ["es2015", { "modules": false }]
   ],
   "plugins": [],
   "env": {
     "test": {
-      "presets": ["@babel/preset-env"]
+      "presets": ["es2015"]
     }
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,12 +34,12 @@
     "build": "rm -Rf dist && npm run concatcss && npm run docs:build && npm run css:build && npm run js:build && npm run svg",
     "release": "npm run build && np --any-branch && npm run cache:purge:jsdelivr",
     "css:dev": "npm run css:dev:bring & npm run css:dev:posten",
-    "css:dev:bring": "postcss tmp/bring.css --use postcss-import postcss-preset-env postcss-nested postcss-extend -o ./dist/bring.css",
-    "css:dev:posten": "postcss tmp/posten.css --use postcss-import postcss-preset-env postcss-nested postcss-extend -o ./dist/posten.css",
+    "css:dev:bring": "postcss tmp/bring.css --use postcss-import postcss-cssnext postcss-nested postcss-extend -o ./dist/bring.css",
+    "css:dev:posten": "postcss tmp/posten.css --use postcss-import postcss-cssnext postcss-nested postcss-extend -o ./dist/posten.css",
     "css:build": "npm run css:build:bring && npm run css:build:posten",
     "css:build:test": "npm run css:build:bring:test & npm run css:build:posten:test",
-    "css:build:bring": "postcss tmp/bring.css --no-map --use postcss-import postcss-preset-env postcss-nested postcss-extend cssnano -o ./dist/bring.css",
-    "css:build:posten": "postcss tmp/posten.css --no-map --use postcss-import postcss-preset-env postcss-nested postcss-extend cssnano -o ./dist/posten.css",
+    "css:build:bring": "postcss tmp/bring.css --no-map --use postcss-import postcss-cssnext postcss-nested postcss-extend cssnano -o ./dist/bring.css",
+    "css:build:posten": "postcss tmp/posten.css --no-map --use postcss-import postcss-cssnext postcss-nested postcss-extend cssnano -o ./dist/posten.css",
     "js:dev": "rollup -m inline -c --name \"hedwig\"",
     "js:build": "npm run js:build:main && npm run js:build:icons",
     "js:build:main": "rollup -c --name \"hedwig\"",
@@ -49,7 +49,7 @@
     "watcher": "node ./scripts/watcher",
     "server": "node ./server",
     "serve": "concurrently \"npm run server\" \"npm run livereload\"",
-    "livereload": "livereload \"docs/, dist/\" -p 9091",
+    "livereload": "live-reload --port 9091 docs/ dist/",
     "test": "jest",
     "start": "npm run docs:build & npm run js:build & npm run cpexamples & npm run server",
     "start_staging": "npm run build && npm run cpdist && npm run server",
@@ -70,53 +70,55 @@
     "cache:purge:jsdelivr:js:default": "curl -X POST https://purge.jsdelivr.net/ -H 'cache-control: no-cache' -H 'content-type: application/json' -d '{\"path\": [\"npm/@posten/hedwig@latest\"]}'"
   },
   "dependencies": {
-    "express": "^4.17.1",
-    "npm": "^6.10.3",
-    "sanitize.css": "^11.0.0",
-    "stickybits": "^3.6.6",
+    "express": "^4.16.4",
+    "npm": "^6.8.0",
+    "sanitize.css": "^10.0.0",
+    "stickybits": "^3.5.7",
     "zenscroll": "^4.0.2"
   },
   "engines": {
     "node": "10.16.0",
     "npm": "6.9.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
-    "@fortawesome/fontawesome-svg-core": "^1.2.21",
-    "@fortawesome/free-brands-svg-icons": "^5.10.1",
-    "@fortawesome/pro-light-svg-icons": "^5.10.1",
-    "@fortawesome/pro-regular-svg-icons": "^5.10.1",
-    "@fortawesome/pro-solid-svg-icons": "^5.10.1",
+    "@fortawesome/fontawesome-svg-core": "^1.2.8",
+    "@fortawesome/free-brands-svg-icons": "^5.5.0",
+    "@fortawesome/pro-light-svg-icons": "^5.5.0",
+    "@fortawesome/pro-regular-svg-icons": "^5.5.0",
+    "@fortawesome/pro-solid-svg-icons": "^5.5.0",
+    "babel-cli": "^6.26.0",
     "babel-jest": "^24.8.0",
-    "concurrently": "^4.1.1",
-    "cssnano": "^4.1.10",
+    "babel-preset-env": "^1.7.0",
+    "babel-preset-es2015": "^6.24.0",
+    "concurrently": "^3.4.0",
+    "cssnano": "^4.1.7",
     "dotenv": "^8.0.0",
-    "eslint": "^6.1.0",
-    "eslint-config-airbnb": "^18.0.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
-    "jest": "^24.8.0",
-    "livereload": "^0.8.0",
-    "lodash": "^4.17.15",
-    "node-watch": "^0.6.3",
+    "eslint": "^3.19.0",
+    "eslint-config-airbnb": "^17.1.1",
+    "eslint-plugin-import": "^2.2.0",
+    "eslint-plugin-jsx-a11y": "^4.0.0",
+    "jest": "^23.6.0",
+    "live-reload": "^1.1.0",
+    "lodash": "^4.17.4",
+    "node-watch": "^0.5.2",
     "np": "^5.0.3",
-    "postcss-cli": "^6.1.3",
+    "postcss-cli": "^6.1.2",
+    "postcss-cssnext": "^3.1.0",
     "postcss-extend": "^1.0.5",
     "postcss-import": "^12.0.1",
     "postcss-nested": "^4.1.2",
-    "postcss-preset-env": "^6.7.0",
-    "rollup": "^1.19.4",
-    "rollup-plugin-babel": "^4.3.3",
-    "rollup-plugin-commonjs": "^10.0.2",
+    "rollup": "^1.14.3",
+    "rollup-plugin-babel": "^3.0.2",
+    "rollup-plugin-commonjs": "^10.0.0",
     "rollup-plugin-jsx": "^1.0.3",
-    "rollup-plugin-multi-entry": "^2.1.0",
-    "rollup-plugin-node-resolve": "^5.2.0",
+    "rollup-plugin-multi-entry": "^2.0.2",
+    "rollup-plugin-node-resolve": "^5.0.1",
     "rollup-plugin-uglify": "^6.0.2",
-    "stylelint": "^10.1.0",
-    "stylelint-config-standard": "^18.3.0",
+    "rollup-watch": "^4.3.1",
+    "stylelint": "^7.13.0",
+    "stylelint-config-standard": "^16.0.0",
     "svg2sprite": "^2.0.1",
-    "svgo": "^1.3.0",
+    "svgo": "^0.7.2",
     "validate-npm-package-name": "^3.0.0"
   }
 }
diff --git a/postcss.config.js b/postcss.config.js
diff --git a/rollup.config.js b/rollup.config.js
@@ -12,7 +12,7 @@ import { uglify } from 'rollup-plugin-uglify';
 export default [{
   input: {
     include: ['src/shared/utilities/js/polyfills/*.js', 'src/**/*.js'],
-    exclude: ['src/**/*.test.js', 'src/**/*.example.js'],
+    exclude: ['src/**/*.test.js','src/**/*.example.js'],
   },
   onwarn: (warning) => {
     // Skip certain warnings

diff --git a/scripts/config/docs-html-bring.js b/scripts/config/docs-html-bring.js
@@ -1,6 +1,6 @@
 const nodeEnv = process.env.NODE_ENV;
 
-let reload = '<script src="//localhost:9091/livereload.js?snipver=1"></script>';
+let reload = '<script src="//localhost:9091"></script>';
 let icons = '<script id="hw-icons" src="http://localhost:3001/icons.min.js"></script>';
 const pikaday = '<script src="https://cdn.jsdelivr.net/npm/[email protected]/pikaday.min.js"></script>';
 

diff --git a/scripts/config/docs-html-posten.js b/scripts/config/docs-html-posten.js
@@ -1,6 +1,6 @@
 const nodeEnv = process.env.NODE_ENV;
 
-let reload = '<script src="//localhost:9091/livereload.jp?snipver=1"></script>';
+let reload = '<script src="//localhost:9091"></script>';
 let icons = '<script id="hw-icons" src="http://localhost:3001/icons.min.js"></script>';
 const pikaday = '<script src="https://cdn.jsdelivr.net/npm/[email protected]/pikaday.min.js"></script>';
 

diff --git a/src/shared/_config/variables.css b/src/shared/_config/variables.css
@@ -3,6 +3,7 @@
  */
 
 :root {
+
   /**
    * Spacing
    * NOTE: This is in PX because we want them to specific.
@@ -22,18 +23,20 @@
    */
 
   --hw-color-gray-lightest: #f2f2f2;
-  --hw-color-gray-lighter: #e6e6e6;
-  --hw-color-gray-light: #c1c1c1;
-  --hw-color-gray: #888;
-  --hw-color-gray-dark: #666;
-  --hw-color-gray-darker: #444;
-  --hw-color-gray-darkest: #222;
+  --hw-color-gray-lighter: #E6E6E6;
+  --hw-color-gray-light: #C1C1C1;
+  --hw-color-gray: #888888;
+  --hw-color-gray-dark: #666666;
+  --hw-color-gray-darker: #444444;
+  --hw-color-gray-darkest: #222222;
+
   --hw-color-yellow: #fdbb2f;
   --hw-color-yellow-darker: #f5a623;
   --hw-color-green: #26b576;
   --hw-color-red: #e32d22;
-  --hw-color-white: #fff;
-  --hw-color-black: #000;
+
+  --hw-color-white: #ffffff;
+  --hw-color-black: #000000;
   --hw-color-avocado: #26b576;
   --hw-color-secondary: #fdbb2f;
 
@@ -69,26 +72,29 @@
    * NOTE: To achieve fluid font sizes on h-tags we used the calculation described here:
    * https://css-tricks.com/snippets/css/fluid-typography/
    */
-  --hw-font-size-max-view-port: 1200;
-  --hw-font-size-min-view-port: 300;
-  --hw-font-size-max-h1-large: 54;
-  --hw-font-size-min-h1-large: 32;
-  --hw-font-size-max-h1: 44;
-  --hw-font-size-min-h1: 28;
-  --hw-font-size-max-h2: 35;
-  --hw-font-size-min-h2: 25;
-  --hw-font-size-max-h3: 28;
-  --hw-font-size-min-h3: 22;
-  --hw-font-size-max-h4: 22;
-  --hw-font-size-min-h4: 20;
-  --hw-font-size-max-h5: 18;
-  --hw-font-size-min-h5: 18;
-  --hw-font-size-h1-large: calc(var(--hw-font-size-min-h1-large) + (var(--hw-font-size-max-h1-large) - var(--hw-font-size-min-h1-large)) * ((100vw - var(--hw-font-size-min-view-port)) / (var(--hw-font-size-max-view-port) - var(--hw-font-size-min-view-port))));
-  --hw-font-size-h1: calc(var(--hw-font-size-min-h1) + (var(--hw-font-size-max-h1) - var(--hw-font-size-min-h1)) * ((100vw - var(--hw-font-size-min-view-port)) / (var(--hw-font-size-max-view-port) - var(--hw-font-size-min-view-port))));
-  --hw-font-size-h2: calc(var(--hw-font-size-min-h2) + (var(--hw-font-size-max-h2) - var(--hw-font-size-min-h2)) * ((100vw - var(--hw-font-size-min-view-port)) / (var(--hw-font-size-max-view-port) - var(--hw-font-size-min-view-port))));
-  --hw-font-size-h3: calc(var(--hw-font-size-min-h3) + (var(--hw-font-size-max-h3) - var(--hw-font-size-min-h3)) * ((100vw - var(--hw-font-size-min-view-port)) / (var(--hw-font-size-max-view-port) - var(--hw-font-size-min-view-port))));
-  --hw-font-size-h4: calc(var(--hw-font-size-min-h4) + (var(--hw-font-size-max-h4) - var(--hw-font-size-min-h4)) * ((100vw - var(--hw-font-size-min-view-port)) / (var(--hw-font-size-max-view-port) - var(--hw-font-size-min-view-port))));
-  --hw-font-size-h5: calc(var(--hw-font-size-min-h5) + (var(--hw-font-size-max-h5) - var(--hw-font-size-min-h5)) * ((100vw - var(--hw-font-size-min-view-port)) / (var(--hw-font-size-max-view-port) - var(--hw-font-size-min-view-port))));
+
+
+  --hw-font-size-max-view-port:1200;
+  --hw-font-size-min-view-port:300;
+  --hw-font-size-max-h1-large:54;
+  --hw-font-size-min-h1-large:32;
+  --hw-font-size-max-h1:44;
+  --hw-font-size-min-h1:28;
+  --hw-font-size-max-h2:35;
+  --hw-font-size-min-h2:25;
+  --hw-font-size-max-h3:28;
+  --hw-font-size-min-h3:22;
+  --hw-font-size-max-h4:22;
+  --hw-font-size-min-h4:20;
+  --hw-font-size-max-h5:18;
+  --hw-font-size-min-h5:18;
+
+  --hw-font-size-h1-large: calc(var(--hw-font-size-min-h1-large)px + (var(--hw-font-size-max-h1-large) - var(--hw-font-size-min-h1-large)) * ((100vw - var(--hw-font-size-min-view-port)px) / (var(--hw-font-size-max-view-port) - var(--hw-font-size-min-view-port))));
+  --hw-font-size-h1: calc(var(--hw-font-size-min-h1)px + (var(--hw-font-size-max-h1) - var(--hw-font-size-min-h1)) * ((100vw - var(--hw-font-size-min-view-port)px) / (var(--hw-font-size-max-view-port) - var(--hw-font-size-min-view-port))));
+  --hw-font-size-h2: calc(var(--hw-font-size-min-h2)px + (var(--hw-font-size-max-h2) - var(--hw-font-size-min-h2)) * ((100vw - var(--hw-font-size-min-view-port)px) / (var(--hw-font-size-max-view-port) - var(--hw-font-size-min-view-port))));
+  --hw-font-size-h3: calc(var(--hw-font-size-min-h3)px + (var(--hw-font-size-max-h3) - var(--hw-font-size-min-h3)) * ((100vw - var(--hw-font-size-min-view-port)px) / (var(--hw-font-size-max-view-port) - var(--hw-font-size-min-view-port))));
+  --hw-font-size-h4: calc(var(--hw-font-size-min-h4)px + (var(--hw-font-size-max-h4) - var(--hw-font-size-min-h4)) * ((100vw - var(--hw-font-size-min-view-port)px) / (var(--hw-font-size-max-view-port) - var(--hw-font-size-min-view-port))));
+  --hw-font-size-h5: calc(var(--hw-font-size-min-h5)px + (var(--hw-font-size-max-h5) - var(--hw-font-size-min-h5)) * ((100vw - var(--hw-font-size-min-view-port)px) / (var(--hw-font-size-max-view-port) - var(--hw-font-size-min-view-port))));
   --hw-font-size-lead: 22px;
   --hw-font-size-p: 18px;
   --hw-font-size-small: 16px;
@@ -119,6 +125,7 @@
   /* For high resolution mobiles */
   @custom-media --high-res-mobile (orientation: portrait) and (-webkit-min-device-pixel-ratio: 2) and (max-device-width: 939px) ;
 
+
   /* Navbar heights */
   --hw-navbar-height-mobile: 54px;
   --hw-navbar-height-desktop: 72px;
@@ -136,4 +143,9 @@
   --z-index--hero-search: 100;
   --z-index--modal: 400;
   --z-index--modal-foreground: 500;
+
+
+
 }
+
+
diff --git a/src/shared/components/button/button.css b/src/shared/components/button/button.css
@@ -61,7 +61,7 @@
 
   &--mobile-full {
     @media (--max-medium){
-      /* @extend .hw-button--full; -- Extending at-rules cannot occur within unnamed rules */
+      @extend .hw-button--full;
     }
   }
 

diff --git a/src/shared/components/hero/hero.css b/src/shared/components/hero/hero.css
@@ -88,13 +88,13 @@
 
   &--mobile-small {
     @media (--max-medium){
-      /* @extend .hw-hero--small; -- Extending at-rules cannot occur within unnamed rules */
+      @extend .hw-hero--small;
     }
   }
 
   &--desktop-small {
     @media (--large){
-      /* @extend .hw-hero--small; -- Extending at-rules cannot occur within unnamed rules */
+      @extend .hw-hero--small;
     }
   }
 

diff --git a/src/shared/components/modal/modal.css b/src/shared/components/modal/modal.css
@@ -48,8 +48,8 @@
       background: var(--hw-color-gray-lightest);
       position: absolute;
       padding: var(--hw-spacing-smallest);
-      right: calc( var(--hw-spacing-small) * -1);
-      top: calc( var(--hw-spacing-small) * -1);
+      right: calc(- var(--hw-spacing-small));
+      top: calc(- var(--hw-spacing-small));
     }
 
     &:hover {

diff --git a/src/shared/layout/grid/grid.css b/src/shared/layout/grid/grid.css
@@ -1,13 +1,13 @@
 .hw-grid {
   padding: 0;
   margin: 0;
-  margin-left: calc( var(--hw-spacing-small) * -1);
+  margin-left: calc(- var(--hw-spacing-small));
   list-style: none;
 }
 
 @media (--medium) {
   .hw-grid {
-    margin-left: calc( var(--hw-spacing) * -1);
+    margin-left: calc(- var(--hw-spacing));
   }
 }
 
@@ -76,7 +76,7 @@
  * Create grids with narrower gutters. Extends '.hw-grid'.
  */
 .hw-grid--narrow {
-  margin-left: calc( var(--hw-spacing-smaller) * -1);
+  margin-left: calc(- var(--hw-spacing-smaller));
 }
 
 .hw-grid--narrow > .hw-grid__item {
@@ -87,18 +87,18 @@
  * Create grids with wider gutters. Extends '.hw-grid'.
  */
 .hw-grid--wide {
-  margin-left: calc( var(--hw-spacing-small) * -1);
+  margin-left: calc(- var(--hw-spacing-small));
 }
 
 @media (--medium) {
   .hw-grid--wide {
-    margin-left: calc( var(--hw-spacing) * -1);
+    margin-left: calc(- var(--hw-spacing));
   }
 }
 
 @media (--xlarge) {
   .hw-grid--wide {
-    margin-left: calc( var(--hw-spacing-large) * -1);
+    margin-left: calc(- var(--hw-spacing-large));
   }
 }