Merge branch 'master' of github.com:Human-Connection/Human-Connection into fix-deprecation-warnings

2025-12-13 07:45:56 +00:00 · 2019-08-27 09:20:27 +02:00 · 2019-08-27 09:20:27 +02:00 · 6976336ef0
commit 6976336ef0
parent c8b5779f87 fa7d76b316
8 changed files with 449 additions and 522 deletions
--- a/backend/package.json
+++ b/backend/package.json
@ -49,14 +49,14 @@
    "apollo-client": "~2.6.4",
    "apollo-link-context": "~1.0.18",
    "apollo-link-http": "~1.5.15",
-    "apollo-server": "~2.8.2",
+    "apollo-server": "~2.9.0",
    "apollo-server-express": "^2.9.0",
    "babel-plugin-transform-runtime": "^6.23.0",
    "bcryptjs": "~2.4.3",
    "cheerio": "~1.0.0-rc.3",
    "cors": "~2.8.5",
    "cross-env": "~5.2.0",
-    "date-fns": "2.0.0",
+    "date-fns": "2.0.1",
    "debug": "~4.1.1",
    "dotenv": "~8.1.0",
    "express": "^4.17.1",
@ -66,7 +66,7 @@
    "graphql-iso-date": "~3.6.1",
    "graphql-middleware": "~3.0.5",
    "graphql-middleware-sentry": "^3.2.0",
-    "graphql-shield": "~6.0.5",
+    "graphql-shield": "~6.0.6",
    "graphql-tag": "~2.10.1",
    "helmet": "~3.20.0",
    "jsonwebtoken": "~8.5.1",
@ -112,7 +112,7 @@
    "@babel/register": "~7.5.5",
    "apollo-server-testing": "~2.9.0",
    "babel-core": "~7.0.0-0",
-    "babel-eslint": "~10.0.2",
+    "babel-eslint": "~10.0.3",
    "babel-jest": "~24.9.0",
    "chai": "~4.2.0",
    "cucumber": "~5.1.0",
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@ -1675,33 +1675,6 @@ apollo-server-caching@0.5.0:
  dependencies:
    lru-cache "^5.0.0"

-apollo-server-core@2.8.2:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.8.2.tgz#d7e5a94c43457dd5c5a171c79b1c554b418581d4"
-  integrity sha512-ePMy1Ci5PflvM9XUWdnF2C+B6kZF2mhmsoV+SUN7O2jWFb5cW2XvWd4Pppov6reusqkz4VlABgZDfjr+Ck09+g==
-  dependencies:
-    "@apollographql/apollo-tools" "^0.4.0"
-    "@apollographql/graphql-playground-html" "1.6.24"
-    "@types/graphql-upload" "^8.0.0"
-    "@types/ws" "^6.0.0"
-    apollo-cache-control "0.8.1"
-    apollo-datasource "0.6.1"
-    apollo-engine-reporting "1.4.3"
-    apollo-server-caching "0.5.0"
-    apollo-server-env "2.4.1"
-    apollo-server-errors "2.3.1"
-    apollo-server-plugin-base "0.6.1"
-    apollo-server-types "0.2.1"
-    apollo-tracing "0.8.1"
-    fast-json-stable-stringify "^2.0.0"
-    graphql-extensions "0.9.2"
-    graphql-tag "^2.9.2"
-    graphql-tools "^4.0.0"
-    graphql-upload "^8.0.2"
-    sha.js "^2.4.11"
-    subscriptions-transport-ws "^0.9.11"
-    ws "^6.0.0"
-
 apollo-server-core@2.9.0:
  version "2.9.0"
  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.0.tgz#5db251093ee121a5f4d90a24d51aa4c21e421243"
@ -1742,27 +1715,7 @@ apollo-server-errors@2.3.1:
  resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.1.tgz#033cf331463ebb99a563f8354180b41ac6714eb6"
  integrity sha512-errZvnh0vUQChecT7M4A/h94dnBSRL213dNxpM5ueMypaLYgnp4hiCTWIEaooo9E4yMGd1qA6WaNbLDG2+bjcg==

-apollo-server-express@2.8.2:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.8.2.tgz#cd1c6994cf5adceea057a088aff52f289bb36377"
-  integrity sha512-eA7IupNbx3PjIW4E0uMjQU9WvxcHznzgdFWRxJ4RqDiIwrrwROb7dgmPm3TJaatU/etjGq482pdfJIlMDNYPeA==
-  dependencies:
-    "@apollographql/graphql-playground-html" "1.6.24"
-    "@types/accepts" "^1.3.5"
-    "@types/body-parser" "1.17.1"
-    "@types/cors" "^2.8.4"
-    "@types/express" "4.17.1"
-    accepts "^1.3.5"
-    apollo-server-core "2.8.2"
-    apollo-server-types "0.2.1"
-    body-parser "^1.18.3"
-    cors "^2.8.4"
-    graphql-subscriptions "^1.0.0"
-    graphql-tools "^4.0.0"
-    subscriptions-transport-ws "^0.9.16"
-    type-is "^1.6.16"
-
-apollo-server-express@^2.9.0:
+apollo-server-express@2.9.0, apollo-server-express@^2.9.0:
  version "2.9.0"
  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.0.tgz#9d2a2d9823422ef26bca15931669d3153dc8a08b"
  integrity sha512-+057V6Ui1BX69jUlV6YDQ7Xw9CCBfowN/GauvyF09KnsjYUJ+cB1xf4mkj/HAjaz4ReXQaALJNr2qPYPXS4R6w==
@ -1806,13 +1759,13 @@ apollo-server-types@0.2.1:
    apollo-server-caching "0.5.0"
    apollo-server-env "2.4.1"

-apollo-server@~2.8.2:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.8.2.tgz#8dd9edef656f7466402be8d7715e788d73d2c50e"
-  integrity sha512-7mZVsM+p8mf0cA3pTiMuEw8uYilQjZErKx092XNYRzAjoDdGddIC3GvUuhxMkmqvD2YhrWRNRL3QlxHZKnYXQw==
+apollo-server@~2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.9.0.tgz#32685712215d420ff5f3298b3b34e972e21ec1c6"
+  integrity sha512-KouRjMWn8pnR4KvVsFXT1GZYzH53J0+v9KwnLUKrLNo2G4KiZu5KhP+tEkF7uTlpHzdPMQAIbwjdXKzOH/r6ew==
  dependencies:
-    apollo-server-core "2.8.2"
-    apollo-server-express "2.8.2"
+    apollo-server-core "2.9.0"
+    apollo-server-express "2.9.0"
    express "^4.0.0"
    graphql-subscriptions "^1.0.0"
    graphql-tools "^4.0.0"
@ -2024,17 +1977,17 @@ babel-core@~7.0.0-0:
  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
  integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==

-babel-eslint@~10.0.2:
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.2.tgz#182d5ac204579ff0881684b040560fdcc1558456"
-  integrity sha512-UdsurWPtgiPgpJ06ryUnuaSXC2s0WoSZnQmEpbAH65XZSdwowgN5MvyP7e88nW07FYXv72erVtpBkxyDVKhH1Q==
+babel-eslint@~10.0.3:
+  version "10.0.3"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz#81a2c669be0f205e19462fed2482d33e4687a88a"
+  integrity sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==
  dependencies:
    "@babel/code-frame" "^7.0.0"
    "@babel/parser" "^7.0.0"
    "@babel/traverse" "^7.0.0"
    "@babel/types" "^7.0.0"
-    eslint-scope "3.7.1"
    eslint-visitor-keys "^1.0.0"
+    resolve "^1.12.0"

 babel-jest@^24.9.0, babel-jest@~24.9.0:
  version "24.9.0"
@ -2881,10 +2834,10 @@ data-urls@^1.0.0:
    whatwg-mimetype "^2.2.0"
    whatwg-url "^7.0.0"

-date-fns@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0.tgz#52f05c6ae1fe0e395670082c72b690ab781682d0"
-  integrity sha512-nGZDA64Ktq5uTWV4LEH3qX+foV4AguT5qxwRlJDzJtf57d4xLNwtwrfb7SzKCoikoae8Bvxf0zdaEG/xWssp/w==
+date-fns@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.1.tgz#c5f30e31d3294918e6b6a82753a4e719120e203d"
+  integrity sha512-C14oTzTZy8DH1Eq8N78owrCWvf3+cnJw88BTK/N3DYWVxDJuJzPaNdplzYxDYuuXXGvqBcO4Vy5SOrwAooXSWw==

 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
  version "2.6.9"
@ -3414,14 +3367,6 @@ eslint-plugin-standard@~4.0.1:
  resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4"
  integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==

-eslint-scope@3.7.1:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
-  integrity sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
 eslint-scope@^4.0.0:
  version "4.0.3"
  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
@ -4154,15 +4099,6 @@ graphql-extensions@0.9.1:
    apollo-server-env "2.4.1"
    apollo-server-types "0.2.1"

-graphql-extensions@0.9.2:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.9.2.tgz#4bdd81d5d9102e20b7ad3d790b16624fb97c7ab7"
-  integrity sha512-7yP6Mr6cDBadrM5dl4CIlp1wTMyPPpL64FtcsOABmaOdf9sOb/X7E3wJSi80UsB8sw0CY2V/HCeU3CIXParQjw==
-  dependencies:
-    "@apollographql/apollo-tools" "^0.4.0"
-    apollo-server-env "2.4.1"
-    apollo-server-types "0.2.1"
-
 graphql-import@0.7.1:
  version "0.7.1"
  resolved "https://registry.yarnpkg.com/graphql-import/-/graphql-import-0.7.1.tgz#4add8d91a5f752d764b0a4a7a461fcd93136f223"
@ -4195,10 +4131,10 @@ graphql-request@~1.8.2:
  dependencies:
    cross-fetch "2.2.2"

-graphql-shield@~6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-6.0.5.tgz#e55c7eb1984c684863c897746044bb216a285b41"
-  integrity sha512-+uRVptAv6RvaM5GVqZjEsanlZ2OTmUgDu+x/UW/qD6+Zb+I6nTGZ7nII8LTFHuUdXrCICfxesyMODhQYXcEZWQ==
+graphql-shield@~6.0.6:
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-6.0.6.tgz#ef8c53f1dd972c2d1828ffd45ce9b1f877576534"
+  integrity sha512-rwhno5ZvEBbedQ8mEOi/Lk71J5CrpQCOcyuDIO+qb1hqm7cvWLtLVyZFrhVp7vN/vULV9oX30j0clC/1d05LpQ==
  dependencies:
    "@types/yup" "0.26.23"
    lightercollective "^0.3.0"
@ -7461,7 +7397,7 @@ resolve@1.1.7:
  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=

-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0:
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0:
  version "1.12.0"
  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
  integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
--- a/package.json
+++ b/package.json
@ -23,7 +23,7 @@
    "codecov": "^3.5.0",
    "cross-env": "^5.2.0",
    "cypress": "^3.4.1",
-    "cypress-cucumber-preprocessor": "^1.14.1",
+    "cypress-cucumber-preprocessor": "^1.15.0",
    "cypress-file-upload": "^3.3.3",
    "cypress-plugin-retries": "^1.2.2",
    "dotenv": "^8.1.0",
@ -34,4 +34,4 @@
    "npm-run-all": "^4.1.5",
    "slug": "^1.1.0"
  }
-}
+}
--- a/webapp/package.json
+++ b/webapp/package.json
@ -51,7 +51,7 @@
  },
  "dependencies": {
    "@human-connection/styleguide": "0.5.19",
-    "@nuxtjs/apollo": "^4.0.0-rc11",
+    "@nuxtjs/apollo": "^4.0.0-rc12",
    "@nuxtjs/axios": "~5.6.0",
    "@nuxtjs/dotenv": "~1.4.0",
    "@nuxtjs/sentry": "^3.0.0",
@ -104,7 +104,7 @@
    "eslint": "~5.16.0",
    "eslint-config-prettier": "~6.1.0",
    "eslint-config-standard": "~12.0.0",
-    "eslint-loader": "~2.2.1",
+    "eslint-loader": "~3.0.0",
    "eslint-plugin-import": "~2.18.2",
    "eslint-plugin-jest": "~22.15.2",
    "eslint-plugin-node": "~9.1.0",
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@ -49,10 +49,10 @@
    <div
      v-if="hasMore"
      v-infinite-scroll="showMoreContributions"
-      :infinite-scroll-immediate-check="true"
      :infinite-scroll-disabled="$apollo.loading"
      :infinite-scroll-distance="10"
      :infinite-scroll-throttle-delay="800"
+      :infinite-scroll-immediate-check="true"
    >
      <hc-load-more v-if="true" :loading="$apollo.loading" @click="showMoreContributions" />
    </div>
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@ -244,8 +244,10 @@
        <div
          v-if="hasMore"
          v-infinite-scroll="showMoreContributions"
-          infinite-scroll-disabled="$apollo.loading"
-          infinite-scroll-distance="10"
+          :infinite-scroll-disabled="$apollo.loading"
+          :infinite-scroll-distance="10"
+          :infinite-scroll-throttle-delay="800"
+          :infinite-scroll-immediate-check="true"
        >
          <hc-load-more :loading="$apollo.loading" @click="showMoreContributions" />
        </div>
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@ -1847,10 +1847,10 @@ cucumber@^4.2.1:
    util-arity "^1.0.2"
    verror "^1.9.0"

-cypress-cucumber-preprocessor@^1.14.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-1.14.1.tgz#47a6ddd28ca1b0a4ec24707b20ca5c0d7ffc7875"
-  integrity sha512-72RN3sUeq0r4aNiFfztQD6Uvi58fifkfc2R4pCyX6oTEZLfHfcudkNQLd98ByCyiWXNXPHlGGihE6+EPCDK59A==
+cypress-cucumber-preprocessor@^1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-1.15.0.tgz#bc2bbad5799dcc07798a0f8f1d374b99e0d3bbab"
+  integrity sha512-6exZ4cPruFcx55INZtxGnUwoGuzcAq+8T1k7NaCC2g36mdweltGjtjIGuHy4lk+VQaW6zmLV6zDtuxrEQsFC/w==
  dependencies:
    "@cypress/browserify-preprocessor" "^1.1.2"
    chai "^4.1.2"