Revert "bundle vepbundle along with everything else. use the power of symlinks. closes #606"

This reverts commit 62978433.

Revert "bundle vepbundle along with everything else. use the power of symlinks. closes #606"
This reverts commit 62978433.
eaddd0c3 · Lloyd Hilaiel · 62978433 · eaddd0c3 · eaddd0c3 · eaddd0c3
Commit eaddd0c3 authored 13 years ago by Lloyd Hilaiel
--- a/lib/browserid/views.js
+++ b/lib/browserid/views.js
@@ -114,4 +114,18 @@ exports.setup = function(app) {
  app.get("/pk", function(req, res) {
    res.json(publicKey.toSimpleObject());
  });
+
+  // vep bundle of JavaScript
+  try {
+    const vepBundleFilePath = path.join(__dirname, "..", "..", "node_modules", "jwcrypto", "vepbundle.js");
+    var vepBundleFile = fs.readFileSync(vepBundleFilePath);
+  } catch(e) {
+    logger.error("can't read vepbundle file (" + vepBundleFilePath +"): " + e);
+  }
+
+  app.get("/vepbundle", function(req, res) {
+    res.writeHead(200, {'Content-Type': 'text/javascript'});
+    res.write(vepBundleFile);
+    res.end();
+  });
 };
--- a/resources/static/communication_iframe/iframe.js
+++ b/resources/static/communication_iframe/iframe.js
@@ -44,7 +44,6 @@ steal
  .then('../lib/jschannel',
        '../lib/base64',
        '../lib/underscore-min',
-        '../lib/vepbundle',
        '../dialog/resources/channel',
        '../shared/browserid',
        '../shared/storage',

--- a/resources/static/dialog/dialog.js
+++ b/resources/static/dialog/dialog.js
@@ -49,7 +49,6 @@ steal
               '../lib/jschannel',
               '../lib/base64',
               '../lib/underscore-min',
-               '../lib/vepbundle',
               '../lib/ejs',
               '../shared/browserid',
               '../lib/dom-jquery',

--- a/resources/static/lib/vepbundle.js
+++ b/resources/static/lib/vepbundle.js
-../../../node_modules/jwcrypto/vepbundle.js
\ No newline at end of file
--- a/resources/static/test/qunit.html
+++ b/resources/static/test/qunit.html
@@ -2,6 +2,7 @@
 	<head>
 		<link rel="stylesheet" type="text/css" href="/funcunit/qunit/qunit.css" />
 		<title>BrowserID QUnit Test</title>
+		<script type='text/javascript' src='/vepbundle'></script>
 		<script type='text/javascript' src='/steal/steal.js?/test/qunit'></script>
 	</head>
 	<body>

--- a/resources/views/communication_iframe.ejs
+++ b/resources/views/communication_iframe.ejs
 <head><title>non-interactive iframe</title>
+  <script type="text/javascript" src="/vepbundle"></script>
  <script type="text/javascript" src="steal/steal<%= production ? '.production' : '' %>.js?communication_iframe/iframe.js"></script>
 </head><body></body>
--- a/resources/views/dialog_layout.ejs
+++ b/resources/views/dialog_layout.ejs
@@ -45,6 +45,7 @@
      </div>

      <% if (useJavascript !== false) { %>
+          <script type="text/javascript" src="/vepbundle"></script>
          <script type="text/javascript" src="steal/steal<%= production ? '.production' : '' %>.js?dialog"></script>
      <% } %>
 	</body>

--- a/resources/views/layout.ejs
+++ b/resources/views/layout.ejs
@@ -7,6 +7,7 @@
    <script src="/js/html5shim.js"></script>
  <![endif]-->
  <link href='https://fonts.googleapis.com/css?family=Droid+Serif:400,400italic,700,700italic' rel='stylesheet' type='text/css'>
+  <script src="/vepbundle" type="text/javascript"></script>
  <% if (production) { %>
    <link rel="stylesheet" type="text/css" href="/css/browserid.min.css">
    <script src="/pages/lib.min.js" type="text/javascript"></script>
@@ -14,7 +15,6 @@
    <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen">
    <link rel="stylesheet" href="/css/m.css" type="text/css" media="screen">

-    <script src="/lib/vepbundle.js" type="text/javascript"></script>
    <script src="/lib/jquery-1.6.2.min.js" type="text/javascript"></script>
    <script src="/lib/json2.js" type="text/javascript"></script>
    <script src="/lib/underscore-min.js" type="text/javascript"></script>