Merge pull request #36 in FFE/ffe-monorepo from master_fix-hoist-warn…

…ings to master * commit '04a4bf44d13d964fce08c622ad6db4ee3f7c17dd': chore: Bump various dependencies to eradicate hoist warnings
SpareBank1 · Jan 5, 2018 · 9ae5870 · 9ae5870
2 parents ec5541b + af10dc2
commit 9ae5870
Show file tree

Hide file tree

Showing 34 changed files with 373 additions and 370 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -13,4 +13,4 @@ indent_size = 4
 
 [{*.json,*.yml}]
 indent_style = space
-indent_size = 2
+indent_size = 4
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ node_modules
 dist/
 example/
 styleguide/
+.idea/
diff --git a/package.json b/package.json
@@ -30,6 +30,7 @@
         "babel-preset-stage-3": "^6.24.1",
         "case": "^1.5.4",
         "css-loader": "^0.28.7",
+        "eslint": "^4.13.1",
         "eslint-config-prettier": "^2.9.0",
         "husky": "^0.14.3",
         "lerna": "^2.5.1",

diff --git a/packages/ffe-accordion-react/CHANGELOG.md b/packages/ffe-accordion-react/CHANGELOG.md
@@ -4,88 +4,104 @@ All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 <a name="3.1.4"></a>
-## [3.1.4](***REMOVED***) (2018-01-05)
-
-
 
+## [3.1.4](***REMOVED***) (2018-01-05)
 
 **Note:** Version bump only for package ffe-accordion-react
 
 <a name="3.1.3"></a>
-## 3.1.3 (2018-01-04)
 
+## 3.1.3 (2018-01-04)
 
 ### Bug Fixes
 
 * **ffe-accordion-react:** Create ID only once ([d448528](***REMOVED***))
 
-
-
-
 # Changelog
 
 ## v3.1.2
+
 * Added documentation and refactored internally.
 
 ## v3.1.1
+
 * Removed button and replaced with div to fix bug in internet explorer
 
 ## v3.1.0
+
 * Upgraded to react 16. Enzyme to 3.1.1 to support react 16. Added repository to remove warning.
-Upgraded ffe-accordian to remove warning.
+  Upgraded ffe-accordian to remove warning.
 
 ## v3.0.1
+
 * Fix a propType error that would happen if isOpen was not set on AccordionItem. Collapse complained that
-`this.state.isOpen` was undefined, so it now defaults to the boolean `false`.
+  `this.state.isOpen` was undefined, so it now defaults to the boolean `false`.
 
 ## v3.0.0
+
 * Changing to use flex to align items instead of absolute positioning
 
 ## v2.1.0
+
 Use `react-collapse` instead of ffe-expandable-react, since the latter is deprecated. Also add a new property
 `hasNestedCollapse`, which lets the consumer use another `react-collapse` element inside the accordion.
 
 ## v2.0.4
+
 Set `type="button"` for Button-toggler to prevent submit when accordion is used inside a form.
 
 ## v.2.0.3
+
 * Use PropTypes from prop-types package
 
 ## v2.0.2
+
 Remove the `--white` modifier classes, since they are now the default.
 
 ## v2.0.1
+
 Bump ffe-accordion version.
 
 ## v2.0.0
+
 Use `<button>` (instead of `<a>`) for the toggler to prevent unnecessary links.
 Add `ffe-accordion` as a peer dependency.
 
 ## v1.2.7
+
 Fixed bug in aria label id
 
 ## v1.2.6
+
 Update ffe-expandable-react to 1.0.5 or above
 
 ## v1.2.5
+
 Update eslint configuration
 
 ## v1.2.4
+
 This release fixes a few issues from v1.2.3.
-- Use `uuid` instead of `nfe-hash` for unique IDs.
-- Make `uuid` and `isOpen` optional props.
+
+* Use `uuid` instead of `nfe-hash` for unique IDs.
+* Make `uuid` and `isOpen` optional props.
 
 ## v1.2.3
+
 Make accordion items have globally unique IDs.
 
 ## v1.2.2
+
 Updated ffe-expandable-react to use react-height to calculate panel height
 
 ## v1.2.1
+
 Updated ffe-expandable-react and ffe-icons-react to fix some bugs.
 
 ## v1.2.0
+
 Added aria-label-tag to be able to set text screen-readers read.
 
 ## v1.0.0
+
 "Initial" version
diff --git a/packages/ffe-accordion-react/package.json b/packages/ffe-accordion-react/package.json
@@ -8,7 +8,8 @@
         "build": "babel -d lib/. --ignore=*.test.js src/. && npm run example",
         "watch": "onchange 'src/**.js' -- npm run build",
         "lint": "eslint src/.",
-        "start": "budo examples/accordion.js --open --live --title \"FFE Accordion React\" -- -t [ babelify --presets [ es2015 react ] ] -t node-lessify",
+        "start":
+            "budo examples/accordion.js --open --live --title \"FFE Accordion React\" -- -t [ babelify --presets [ es2015 react ] ] -t node-lessify",
         "test:nsp": "nsp check",
         "test:spec": "jest",
         "test": "npm run test:spec && npm run test:nsp",
@@ -22,26 +23,22 @@
     },
     "dependencies": {
         "classnames": "^2.2.5",
-        "ffe-icons-react": "^2.4.17",
+        "ffe-icons-react": "^3.0.0",
         "prop-types": "^15.6.0",
         "react-collapse": "^4.0.3",
         "react-motion": "^0.5.2",
         "uuid": "^3.1.0"
     },
     "devDependencies": {
         "babel-plugin-transform-object-rest-spread": "^6.26.0",
-        "babel-preset-es2015": "^6.3.13",
+        "babel-preset-es2015": "^6.18.0",
         "enzyme": "^3.3.0",
         "enzyme-adapter-react-16": "^1.1.1",
         "ffe-accordion": "^3.0.2",
         "ffe-core": "^10.2.2",
         "jest": "^22.0.4"
     },
-    "files": [
-        "lib",
-        "example.html",
-        "*.js"
-    ],
+    "files": ["lib", "example.html", "*.js"],
     "jest": {
         "setupTestFrameworkScriptFile": "./test-setup.js"
     }

diff --git a/packages/ffe-accordion/CHANGELOG.md b/packages/ffe-accordion/CHANGELOG.md
@@ -4,39 +4,40 @@ All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 <a name="3.0.2"></a>
-## [3.0.2](***REMOVED***) (2018-01-05)
-
-
 
+## [3.0.2](***REMOVED***) (2018-01-05)
 
 **Note:** Version bump only for package ffe-accordion
 
 <a name="3.0.1"></a>
-## 3.0.1 (2018-01-04)
-
-
 
+## 3.0.1 (2018-01-04)
 
 **Note:** Version bump only for package ffe-accordion
 
 # CHANGELOG
 
 ## Version 3.0.0
-* *Breaking change* to use flex to align items instead of absolute positioning
+
+* _Breaking change_ to use flex to align items instead of absolute positioning
 
 ## Version 2.0.4
-* Set default background of `ffe-accordion-item__toggler` explicit to transparent. 
-This fixes IE11 error where background becomes gray when a toggler is a button.
+
+* Set default background of `ffe-accordion-item__toggler` explicit to transparent.
+  This fixes IE11 error where background becomes gray when a toggler is a button.
 
 ## Version 2.0.3
+
 * Support both versions 9 and 10 of `ffe-core`
 
 ## Version 2.0.2
+
 * Replaced hardcoded transition properties with variables from ffe-core
 
 ## Version 2.0.1
+
 * Make white accordion the default layout. Previously there was no default layout (that wasn't broken) without
-tons of modifiers everywhere. Now you don't need to add modifiers if you want the white design.
+  tons of modifiers everywhere. Now you don't need to add modifiers if you want the white design.
 * Fix a bug where single-item accordions got a double bottom border
 * Add a `viewport` meta tag to the examples page so that it scales correctly on smaller devices
 
@@ -53,26 +54,34 @@ Bumped peer dependency version of ffe-core. No external API change, but this ver
 To migrate, update your app to ffe-core version 9.x
 
 ## Version 1.3.3
+
 * Add a few minor style changes to the toggler, to make it possible to use either an `<a>` or a `<button>` tag with the same visual results.
 * Updated all examples to use a `<button>`, as it makes the most sense semantically.
 
 ## Version 1.3.2
+
 * Remove .accordion-item bottom margin for white accordions that was introduced in 1.3.1.
 
 ## Version 1.3.1
+
 * Design changes, including normalizing content and title padding, removing text-decoration and correcting colors
 
 ## Version 1.3.0
+
 * Add visual tests and examples
 
 ## Version 1.2.0
+
 * Increased padding right for accordion-toggler to make sure arrow does end on top of toggler-content
 
 ## Version 1.1.1
+
 * Removed default padding from `<ul>` element as this counters the centering given by `margin: 0 auto;`
 
 ## Version 1.1.0
+
 * Removed list style dots (list-style: none) as this shouldn't be pushed to the consumer app
 
 ## Version 1.0.0
+
 * Initial version of ffe-accordion. Supports both blue and white version.
diff --git a/packages/ffe-accordion/package.json b/packages/ffe-accordion/package.json
@@ -6,17 +6,15 @@
     "license": "UNLICENSED",
     "main": "index.js",
     "scripts": {
-        "build": "npm run lint && lessc examples/examples.less examples/examples.css && cp -R node_modules/ffe-core/fonts/ examples/fonts/ && echo \"$(date +%T): Updated example\"",
+        "build":
+            "npm run lint && lessc examples/examples.less examples/examples.css && cp -R node_modules/ffe-core/fonts/ examples/fonts/ && echo \"$(date +%T): Updated example\"",
         "lint": "lessc --lint examples/examples.less && stylelint less/*.less",
-        "start": "opn examples/accordion.html & watch \"npm run -s compile\" less/",
+        "start":
+            "opn examples/accordion.html & watch \"npm run -s compile\" less/",
         "test:nsp": "nsp check",
         "test": "npm run lint && npm run test:nsp"
     },
-    "keywords": [
-        "FFE",
-        "SpareBank1",
-        "Accordion"
-    ],
+    "keywords": ["FFE", "SpareBank1", "Accordion"],
     "peerDependencies": {
         "ffe-core": "^10.2.2"
     },