]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge branch 'develop' into chore/commit-messages-linting
authorNicolas Coden <nicolas@ncoden.fr>
Sun, 29 Apr 2018 13:50:28 +0000 (15:50 +0200)
committerNicolas Coden <nicolas@ncoden.fr>
Sun, 29 Apr 2018 13:50:28 +0000 (15:50 +0200)
1  2 
package-lock.json
package.json
yarn.lock

Simple merge
diff --cc package.json
Simple merge
diff --cc yarn.lock
index b6da50b7854251e7c812eba0e180b345804c75e1,4fc2cc8577ac1918e96386514b22c56b3272ddb0..450b940f49790c7aa4c309a1b4d4f2ccd62efd8c
+++ b/yarn.lock
@@@ -333,7 -196,7 +333,7 @@@ ansi-styles@^2.2.1
    version "2.2.1"
    resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
  
- ansi-styles@^3.1.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1:
 -ansi-styles@^3.2.1:
++ansi-styles@^3.2.0, ansi-styles@^3.2.1:
    version "3.2.1"
    resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
    dependencies:
@@@ -1469,17 -1319,9 +1468,17 @@@ camelcase-keys@^2.0.0
      camelcase "^2.0.0"
      map-obj "^1.0.0"
  
- camelcase@4.1.0, camelcase@^4.0.0, camelcase@^4.1.0:
-   version "4.1.0"
-   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 +camelcase-keys@^4.0.0:
 +  version "4.2.0"
 +  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
 +  dependencies:
 +    camelcase "^4.1.0"
 +    map-obj "^2.0.0"
 +    quick-lru "^1.0.0"
 +
+ camelcase@5.0.0:
+   version "5.0.0"
+   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
  
  camelcase@^1.0.2, camelcase@^1.2.1:
    version "1.2.1"
@@@ -1546,22 -1392,14 +1549,22 @@@ chalk@0.4.0
      has-color "~0.1.0"
      strip-ansi "~0.1.0"
  
- chalk@2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
-   dependencies:
-     ansi-styles "^3.1.0"
-     escape-string-regexp "^1.0.5"
-     supports-color "^4.0.0"
 +chalk@2.3.1:
 +  version "2.3.1"
 +  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
 +  dependencies:
 +    ansi-styles "^3.2.0"
 +    escape-string-regexp "^1.0.5"
 +    supports-color "^5.2.0"
 +
+ chalk@2.3.2:
+   version "2.3.2"
+   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
+   dependencies:
+     ansi-styles "^3.2.1"
+     escape-string-regexp "^1.0.5"
+     supports-color "^5.3.0"
  chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
    version "1.1.3"
    resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@@ -1959,30 -1790,7 +1962,30 @@@ constants-browserify@^1.0.0
    version "1.0.0"
    resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
  
- convert-source-map@1.X, convert-source-map@^1.1.1, convert-source-map@^1.5.0:
 +conventional-changelog-angular@^1.3.3:
 +  version "1.6.6"
 +  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f"
 +  dependencies:
 +    compare-func "^1.3.1"
 +    q "^1.5.1"
 +
 +conventional-commit-types@^2.0.0:
 +  version "2.2.0"
 +  resolved "https://registry.yarnpkg.com/conventional-commit-types/-/conventional-commit-types-2.2.0.tgz#5db95739d6c212acbe7b6f656a11b940baa68946"
 +
 +conventional-commits-parser@^2.1.0:
 +  version "2.1.7"
 +  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e"
 +  dependencies:
 +    JSONStream "^1.0.4"
 +    is-text-path "^1.0.0"
 +    lodash "^4.2.1"
 +    meow "^4.0.0"
 +    split2 "^2.0.0"
 +    through2 "^2.0.0"
 +    trim-off-newlines "^1.0.0"
 +
+ convert-source-map@1.X, convert-source-map@^1.1.1, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
    version "1.5.1"
    resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
  
@@@ -5650,7 -5332,7 +5657,7 @@@ lodash@^3.10.1, lodash@^3.2.0
    version "3.10.1"
    resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
  
- lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.4:
 -lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.3.0, lodash@~4.17.4:
++lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.4:
    version "4.17.5"
    resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
  
@@@ -7017,11 -6666,7 +7025,11 @@@ punycode@^2.1.0
    version "2.1.0"
    resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
  
- puppeteer@^1.2.0:
 +pupa@^1.0.0:
 +  version "1.0.0"
 +  resolved "https://registry.yarnpkg.com/pupa/-/pupa-1.0.0.tgz#9a9568a5af7e657b8462a6e9d5328743560ceff6"
 +
+ puppeteer@^1.3.0:
    version "1.3.0"
    resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.3.0.tgz#f571c5f27153ca164a8188e6328ce2e4946878f3"
    dependencies: