Merge pull request #163 from hypothesis/clean-jenkins-before-build

Fix Jenkins builds failing if package.json or shrinkwrap change after branch is initially pushed

Jenkinsfile

@@ -8,6 +8,7 @@ node {
 
     stage 'Build'
     nodeEnv.inside("-e HOME=${workspace}") {
+        sh 'make clean'
         sh 'make'
     }
 

Makefile

@@ -24,6 +24,6 @@ lint: node_modules/.uptodate
 build/manifest.json: node_modules/.uptodate
 	npm run-script build
 
-node_modules/.uptodate:
+node_modules/.uptodate: package.json npm-shrinkwrap.json
 	npm run-script deps 2>/dev/null || npm install
 	@touch $@

npm-shrinkwrap.json

@@ -3948,14 +3948,36 @@
       }
     },
     "request": {
-      "version": "2.71.0",
-      "from": "request@>=2.61.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.71.0.tgz",
+      "version": "2.76.0",
+      "from": "request@latest",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.76.0.tgz",
       "dependencies": {
         "extend": {
           "version": "3.0.0",
           "from": "extend@>=3.0.0 <3.1.0",
           "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+        },
+        "form-data": {
+          "version": "2.1.1",
+          "from": "form-data@>=2.1.1 <2.2.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz",
+          "dependencies": {
+            "mime-types": {
+              "version": "2.1.12",
+              "from": "mime-types@>=2.1.12 <3.0.0",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz"
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.24.0",
+          "from": "mime-db@>=1.24.0 <1.25.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz"
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "from": "tough-cookie@>=2.3.0 <2.4.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz"
         }
       }
     },
@@ -4952,4 +4974,4 @@
       "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.3.0.tgz"
     }
   }
-}
+}
\ No newline at end of file

package.json

@@ -81,7 +81,7 @@
     "raven-js": "^3.7.0",
     "redux": "^3.5.2",
     "redux-thunk": "^2.1.0",
-    "request": "^2.72.0",
+    "request": "^2.76.0",
     "retry": "^0.8.0",
     "scroll-into-view": "^1.3.1",
     "seamless-immutable": "^6.0.1",