Fix #1801, combine configure-raven.js with the raven.js client, into …

…/install-raven.js

Load raven via require() instead of a direct link.  Remove the now-unneeded static/vendor/ directory, and Makefile rules related to it

Makefile

@@ -34,9 +34,6 @@ static_addon_dest := $(static_addon_source:%=build/%)
 static_js_source := $(wildcard static/js/*.js)
 static_js_dest := $(static_js_source:%.js=build/server/%.js)
 
-static_vendor_source := $(shell find -L static/vendor -type f)
-static_vendor_dest := $(static_vendor_source:%=build/server/%)
-
 lib_source := $(wildcard addon/lib/*.js)
 lib_dest := $(lib_source:%.js=build/%.js)
 
@@ -74,10 +71,6 @@ build/addon/data/vendor/%.js: addon/data/vendor/%.js
 	@mkdir -p $(@D)
 	cp $< $@
 
-build/server/static/vendor/%: static/vendor/%
-	@mkdir -p $(@D)
-	cp $< $@
-
 build/server/static/homepage/%.js: static/homepage/%.js
 	@mkdir -p $(@D)
 	cp $< $@
@@ -253,7 +246,7 @@ build/server/export-shots.sh: server/src/export-shots.sh
 # The intention here is to only write build-time when something else needs
 # to be regenerated, but for some reason this gets rewritten every time
 # anyway:
-build/server/build-time.js: homepage $(server_dest) $(shared_server_dest) $(sass_server_dest) $(imgs_server_dest) $(static_js_dest) $(static_vendor_dest) build/server/export-shots.sh $(patsubst server/db-patches/%,build/server/db-patches/%,$(wildcard server/db-patches/*))
+build/server/build-time.js: homepage $(server_dest) $(shared_server_dest) $(sass_server_dest) $(imgs_server_dest) $(static_js_dest) build/server/export-shots.sh $(patsubst server/db-patches/%,build/server/db-patches/%,$(wildcard server/db-patches/*))
 	@mkdir -p $(@D)
 	./bin/build-scripts/write_build_time > build/server/build-time.js
 

server/src/reactruntime.js

@@ -26,8 +26,7 @@ exports.HeadTemplate = class HeadTemplate extends React.Component {
         <link rel="shortcut icon" href={this.props.staticLink("/static/img/pageshot-icon-32.png")} />
         { analyticsScript }
         { activationScript }
-        { this.props.sentryPublicDSN ? <script src={ this.props.staticLink("/static/vendor/raven.js") } /> : null }
-        { this.props.sentryPublicDSN ? <script src={this.props.staticLink("/configure-raven.js")} /> : null }
+        { this.props.sentryPublicDSN ? <script src={this.props.staticLink("/install-raven.js")} /> : null }
         {this.props.children}
       </head>
     );

server/src/server.js

@@ -252,7 +252,9 @@ app.get("/parent-helper.js", function (req, res) {
   jsResponse(res, script);
 });
 
-app.get("/configure-raven.js", function (req, res) {
+const ravenClientJs = readFileSync(require.resolve("raven-js/dist/raven.min"), {encoding: "UTF-8"});
+
+app.get("/install-raven.js", function (req, res) {
   setCache(res);
   if (! req.config.sentryPublicDSN) {
     jsResponse(res, "");
@@ -266,6 +268,8 @@ app.get("/configure-raven.js", function (req, res) {
   // FIXME: this monkeypatch is because our version of Raven (6.2) doesn't really work
   // with our version of Sentry (8.3.3)
   let script = `
+  ${ravenClientJs}
+
   (function () {
     var old_captureException = Raven.captureException.bind(Raven);
     Raven.captureException = function (ex, options) {