Revert "Templatize jade templates"

This reverts commit ba63262.

Author: durran

package.json

@@ -70,7 +70,6 @@
     "font-awesome": "https://github.com/FortAwesome/Font-Awesome/archive/v4.4.0.tar.gz",
     "highlight.js": "^8.9.1",
     "jade": "^1.11.0",
-    "@lukekarrys/jade-runtime": "^1.11.1",
     "jquery": "^2.1.4",
     "keytar": "mongodb-js/node-keytar#node-pre-gyp",
     "less": "^2.6.1",
@@ -80,9 +79,11 @@
     "marky-mark": "^1.2.1",
     "moment": "^2.10.6",
     "mongodb-collection-model": "^0.1.1",
+    "mongodb-connection-model": "^4.0.0",
     "mongodb-data-service": "^0.0.9",
     "mongodb-database-model": "^0.1.2",
     "mongodb-extended-json": "^1.6.0",
+    "mongodb-instance-model": "^2.1.7",
     "mongodb-js-metrics": "^1.0.0",
     "mongodb-language-model": "^0.3.3",
     "mongodb-ns": "^1.0.3",
@@ -125,7 +126,6 @@
     "mongodb-runner": "^3.1.15",
     "semver": "^5.1.0",
     "spectron": "^0.34.1",
-    "templatizer": "^2.0.3",
     "which": "^1.2.0",
     "xvfb-maybe": "^0.1.3"
   },

scripts/prepublish.js

@@ -50,7 +50,6 @@ var run = require('electron-installer-run');
 var license = require('electron-license');
 var createCLI = require('mongodb-js-cli');
 var config = require('./config');
-var generateTemplates = require('./templatize');
 
 /**
  * TODO (imlucas) Document and use yargs environment variable support.
@@ -377,7 +376,6 @@ function main() {
       writeVersionFile,
       transformPackageJson,
       installDependencies,
-      generateTemplates,
       removeDevelopmentFiles,
       createApplicationAsar,
       createApplicationZip,

scripts/prestart.js

@@ -36,7 +36,6 @@ var format = require('util').format;
 var run = require('electron-installer-run');
 var checkPython = require('check-python');
 var async = require('async');
-var generateTemplates = require('./templatize');
 
 function checkNpmAndNodejs(done) {
   run('npm', ['version', '--json', '--loglevel', 'error'], {
@@ -78,8 +77,7 @@ function main() {
   cli.spinner('verifying current environment meets requirements');
   async.series([
     checkPython,
-    checkNpmAndNodejs,
-    generateTemplates
+    checkNpmAndNodejs
   ], function(err) {
     cli.abortIfError(err);
     cli.debug('Environment verified as sane!');

scripts/templatize.js

@@ -1,7 +1,9 @@
 var AmpersandView = require('ampersand-view');
 var numeral = require('numeral');
+var jade = require('jade');
+var path = require('path');
 
-var indexTemplate = require('../templates')['collection-stats'].index;
+var indexTemplate = jade.compileFile(path.resolve(__dirname, 'index.jade'));
 
 var CollectionStatsView = AmpersandView.extend({
   bindings: {

src/app/collection-stats/index.js

@@ -6,9 +6,11 @@
 var AuthenticationOptionCollection = require('./models/authentication-option-collection');
 
 var InputView = require('./input-view');
-var _ = require('lodash');
+var jade = require('jade');
+var path = require('path');
 
-var inputTemplate = require('../templates').connect['input-default'];
+var inputTemplate = jade.compileFile(path.resolve(__dirname, 'input-default.jade'));
+var _ = require('lodash');
 
 var NONE = {
   _id: 'NONE',

src/app/connect/authentication.js

@@ -8,8 +8,8 @@ var FilteredCollection = require('ampersand-filtered-subcollection');
 var jade = require('jade');
 var path = require('path');
 
-var inputTemplate = require('../templates').connect['input-default'];
-var selectTemplate = require('../templates').connect['select-default'];
+var inputTemplate = jade.compileFile(path.resolve(__dirname, 'input-default.jade'));
+var selectTemplate = jade.compileFile(path.resolve(__dirname, 'select-default.jade'));
 
 // create proxy collections that only contains the enabled auth options
 var enabledAuthOptions = new FilteredCollection(authOptions, {

src/app/connect/connect-form-view.js

@@ -6,9 +6,10 @@ var dialog = remote.dialog;
 var BrowserWindow = remote.BrowserWindow;
 var format = require('util').format;
 var bindings = require('ampersand-dom-bindings');
+var jade = require('jade');
 var path = require('path');
 
-var fileReaderTemplate = require('../templates').connect['filereader-default'];
+var fileReaderTemplate = jade.compileFile(path.resolve(__dirname, 'filereader-default.jade'));
 var assert = require('assert');
 
 // var debug = require('debug')('mongodb-compass:connect:filereader-view');

src/app/connect/filereader-view.js

@@ -19,6 +19,10 @@ var BrowserWindow = remote.BrowserWindow;
 var metrics = require('mongodb-js-metrics')();
 
 var debug = require('debug')('mongodb-compass:connect:index');
+var jade = require('jade');
+var path = require('path');
+
+var indexTemplate = jade.compileFile(path.resolve(__dirname, 'index.jade'));
 
 /**
  * AuthenticationOptionCollection
@@ -31,7 +35,7 @@ var authMethods = require('./authentication');
 var sslMethods = require('./ssl');
 
 var ConnectView = View.extend({
-  template: require('../templates').connect.index,
+  template: indexTemplate,
   screenName: 'Connect',
   props: {
     form: 'state',

src/app/connect/index.js

@@ -1,6 +1,8 @@
 var View = require('ampersand-view');
+var jade = require('jade');
+var path = require('path');
 
-var newConnectionTemplate = require('../../templates').connect.sidebar['new-connection-widget'];
+var newConnectionTemplate = jade.compileFile(path.resolve(__dirname, 'new-connection-widget.jade'));
 
 var debug = require('debug')('mongodb-compass:connect:sidebar:widget');