Bump Danger (which now ships with Chainsmoker!) and some housekeeping (#3276)

See https://github.com/danger/danger-js/issues/431#issuecomment-480269809 and danger/danger-js#850

dangerfile.js

@@ -11,36 +11,25 @@
 // DANGER_GITHUB_API_TOKEN=your-github-api-token npm run danger -- pr https://github.com/badges/shields/pull/2665
 
 const { danger, fail, message, warn } = require('danger')
-const chainsmoker = require('chainsmoker')
 const { default: noTestShortcuts } = require('danger-plugin-no-test-shortcuts')
-
+const { fileMatch } = danger.git
-const fileMatch = chainsmoker({
-  created: danger.git.created_files,
-  modified: danger.git.modified_files,
-  createdOrModified: danger.git.modified_files.concat(danger.git.created_files),
-  deleted: danger.git.deleted_files,
-})
 
 const documentation = fileMatch(
   '**/*.md',
   'lib/all-badge-examples.js',
-  'frontend/components/usage.js'
+  'frontend/components/usage.js',
-)
+  'frontend/pages/endpoint.js'
-const server = fileMatch('server.js')
-const serverTests = fileMatch('server.spec.js')
-const helpers = fileMatch(
-  'lib/**/*.js',
-  '!**/*.spec.js',
-  '!lib/all-badge-examples.js'
 )
+const server = fileMatch('core/server/**.js', '!*.spec.js')
+const serverTests = fileMatch('core/server/**.spec.js')
+const legacyHelpers = fileMatch('lib/**/*.js', '!*.spec.js')
+const legacyHelperTests = fileMatch('lib/**/*.spec.js')
 const logos = fileMatch('logo/*.svg')
-const helperTests = fileMatch('lib/**/*.spec.js')
 const packageJson = fileMatch('package.json')
 const packageLock = fileMatch('package-lock.json')
 const secretsDocs = fileMatch('doc/server-secrets.md')
 const capitals = fileMatch('**/*[A-Z]*.js')
 const underscores = fileMatch('**/*_*.js')
-const targetBranch = danger.github.pr.base.ref
 
 message(
   [
@@ -49,13 +38,14 @@ message(
   ].join('')
 )
 
+const targetBranch = danger.github.pr.base.ref
 if (targetBranch !== 'master') {
   const message = `This PR targets \`${targetBranch}\``
   const idea = 'It is likely that the target branch should be `master`'
   warn(`${message} - <i>${idea}</i>`)
 }
 
-if (documentation.createdOrModified) {
+if (documentation.edited) {
   message(
     [
       'Thanks for contributing to our documentation. ',
@@ -79,14 +69,9 @@ if (server.modified && !serverTests.modified) {
   )
 }
 
-if (helpers.created && !helperTests.created) {
+if (legacyHelpers.created) {
-  warn(
+  warn(['This PR added helper modules in `lib/` which is deprecated.'].join(''))
-    [
+} else if (legacyHelpers.edited && !legacyHelperTests.edited) {
-      'This PR added helper modules in `lib/` but not accompanying tests. <br>',
-      'Generally helper modules should have their own tests.',
-    ].join('')
-  )
-} else if (helpers.createdOrModified && !helperTests.createdOrModified) {
   warn(
     [
       'This PR modified helper functions in `lib/` but not accompanying tests. <br>',

package-lock.json

@@ -1785,12 +1785,13 @@
       }
     },
     "@octokit/rest": {
-      "version": "16.19.0",
+      "version": "16.23.2",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.19.0.tgz",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.23.2.tgz",
-      "integrity": "sha512-mUk/GU2LtV95OAM3FnvK7KFFNzUUzEGFldOhWliJnuhwBqxEag1gW85o//L6YphC9wLoTaZQOhCHmQcsCnt2ag==",
+      "integrity": "sha512-ZxiZMaCuqBG/IsbgNRVfGwYsvBb5DjHuMGjJgOrinT+/b+1j1U7PiGyRkHDJdjTGA6N/PsMC2lP2ZybX9579iA==",
       "dev": true,
       "requires": {
         "@octokit/request": "2.4.2",
+        "atob-lite": "^2.0.0",
         "before-after-hook": "^1.4.0",
         "btoa-lite": "^1.0.0",
         "deprecation": "^1.0.1",
@@ -2723,6 +2724,12 @@
       "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=",
       "dev": true
     },
+    "atob-lite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/atob-lite/-/atob-lite-2.0.0.tgz",
+      "integrity": "sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY=",
+      "dev": true
+    },
     "autoprefixer": {
       "version": "9.4.9",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.9.tgz",
@@ -4023,16 +4030,6 @@
       "integrity": "sha1-xVEoN4+bs5nplPAAUhUZhO1uvnA=",
       "dev": true
     },
-    "chainsmoker": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/chainsmoker/-/chainsmoker-0.1.0.tgz",
-      "integrity": "sha512-ihBiEnUimngO7ySwxbpgLZG0K+jEiNjYCLe/paIe9yiLlUDYuNkaer8oOLcykgsjNGtrcZ5B9PvzJ1sagl5P4A==",
-      "dev": true,
-      "requires": {
-        "lodash.mapvalues": "^4.6.0",
-        "minimatch": "^3.0.4"
-      }
-    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -6499,9 +6496,9 @@
       "dev": true
     },
     "danger": {
-      "version": "7.0.15",
+      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/danger/-/danger-7.0.15.tgz",
+      "resolved": "https://registry.npmjs.org/danger/-/danger-7.1.0.tgz",
-      "integrity": "sha512-A4G3+5/JW19tsB9o+QWlEofRz9WJgzqhlzaCLWBbav8rc9Y2IEAJY6cnervPdeCR1JEjAq/RCXL2TChOCas6Dg==",
+      "integrity": "sha512-Zi4ylmidTSId3NGLv3bZ1CKaUuB3DjWkFb9pSRcZdVd/zfG+x9Eivtb0CKPusmJ6E8arspt3Birydf6+GD6SAQ==",
       "dev": true,
       "requires": {
         "@babel/polyfill": "^7.2.5",
@@ -6521,8 +6518,10 @@
         "lodash.includes": "^4.3.0",
         "lodash.isobject": "^3.0.2",
         "lodash.keys": "^4.0.8",
+        "lodash.mapvalues": "^4.6.0",
         "lodash.memoize": "^4.1.2",
         "memfs-or-file-map-to-github-branch": "^1.1.0",
+        "micromatch": "^3.1.10",
         "node-cleanup": "^2.1.2",
         "node-fetch": "^2.3.0",
         "override-require": "^1.1.1",
@@ -11993,12 +11992,12 @@
       "dev": true
     },
     "jsonwebtoken": {
-      "version": "8.5.0",
+      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
-      "integrity": "sha512-IqEycp0znWHNA11TpYi77bVgyBO/pGESDh7Ajhas+u0ttkGkKYIIAjniL4Bw5+oVejVF+SYkaI7XKfwCCyeTuA==",
+      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
       "dev": true,
       "requires": {
-        "jws": "^3.2.1",
+        "jws": "^3.2.2",
         "lodash.includes": "^4.3.0",
         "lodash.isboolean": "^3.0.3",
         "lodash.isinteger": "^4.0.4",
@@ -12794,9 +12793,9 @@
       "dev": true
     },
     "macos-release": {
-      "version": "2.1.0",
+      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.2.0.tgz",
-      "integrity": "sha512-8TCbwvN1mfNxbBv0yBtfyIFMo3m1QsNbKHv7PYIp/abRBKVQBXN7ecu3aeGGgT18VC/Tf397LBDGZF9KBGJFFw==",
+      "integrity": "sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==",
       "dev": true
     },
     "make-dir": {
@@ -16150,12 +16149,12 @@
       }
     },
     "os-name": {
-      "version": "3.0.0",
+      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
-      "integrity": "sha512-7c74tib2FsdFbQ3W+qj8Tyd1R3Z6tuVRNNxXjJcZ4NgjIEQU9N/prVMqcW29XZPXGACqaXN3jq58/6hoaoXH6g==",
+      "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
       "dev": true,
       "requires": {
-        "macos-release": "^2.0.0",
+        "macos-release": "^2.2.0",
         "windows-release": "^3.1.0"
       }
     },
@@ -22283,12 +22282,57 @@
       }
     },
     "windows-release": {
-      "version": "3.1.0",
+      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.2.0.tgz",
-      "integrity": "sha512-hBb7m7acFgQPQc222uEQTmdcGLeBmQLNLFIh0rDk3CwFOBrfjefLzEfEfmpMq8Af/n/GnFf3eYf203FY1PmudA==",
+      "integrity": "sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==",
       "dev": true,
       "requires": {
-        "execa": "^0.10.0"
+        "execa": "^1.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+          "dev": true
+        }
       }
     },
     "wordwrap": {

package.json

@@ -141,12 +141,11 @@
     "chai-datetime": "^1.5.0",
     "chai-enzyme": "^1.0.0-beta.1",
     "chai-string": "^1.4.0",
-    "chainsmoker": "^0.1.0",
     "child-process-promise": "^2.2.1",
     "clipboard-copy": "^2.0.1",
     "concurrently": "^4.1.0",
     "cypress": "^3.2.0",
-    "danger": "^7.0.15",
+    "danger": "^7.1.0",
     "danger-plugin-no-test-shortcuts": "^2.0.0",
     "enzyme": "^3.9.0",
     "enzyme-adapter-react-16": "^1.9.1",