Add SemVer to npm tracking, fix extension manager

petetnt · Dec 20, 2015 · 5719dcc · 5719dcc
1 parent 3f1b6a0
commit 5719dcc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -64,6 +64,7 @@
     "react": "^0.14.3",
     "react-dom": "^0.14.3",
     "requirejs": "^2.1.22",
+    "semver": "^4.3.6",
     "tern": "^0.16.0",
     "text": "github:requirejs/text",
     "tinycolor2": "^1.3.0"

diff --git a/src/extensibility/ExtensionManager.js b/src/extensibility/ExtensionManager.js
@@ -53,7 +53,7 @@ define(function (require, exports, module) {
         ThemeManager        = require("view/ThemeManager");
 
     // semver.browser is an AMD-compatible module
-    var semver = require("extensibility/node/node_modules/semver/semver.browser");
+    var semver = require("semver.browser");
 
     /**
      * @private

diff --git a/src/extensibility/ExtensionManagerView.js b/src/extensibility/ExtensionManagerView.js
@@ -37,6 +37,9 @@ define(function (require, exports, module) {
         LocalizationUtils         = require("utils/LocalizationUtils"),
         itemTemplate              = require("text!htmlContent/extension-manager-view-item.html");
 
+    // Parse item template for future use
+    Mustache.parse(itemTemplate);
+
     /**
      * Creates a view enabling the user to install and manage extensions. Must be initialized
      * with initialize(). When the view is closed, dispose() must be called.
@@ -56,7 +59,6 @@ define(function (require, exports, module) {
         var self = this,
             result = new $.Deferred();
         this.model = model;
-        this._itemTemplate = Mustache.compile(itemTemplate);
         this._itemViews = {};
         this.$el = $("<div class='extension-list tab-pane' id='" + this.model.source + "'/>");
         this._$emptyMessage = $("<div class='empty-message'/>")
@@ -100,12 +102,6 @@ define(function (require, exports, module) {
      */
     ExtensionManagerView.prototype._$table = null;
 
-    /**
-     * @private
-     * @type {function} The compiled template we use for rendering items in the extension list.
-     */
-    ExtensionManagerView.prototype._itemTemplate = null;
-
     /**
      * @private
      * @type {Object.<string, jQueryObject>}
@@ -335,8 +331,7 @@ define(function (require, exports, module) {
         ["lastVersionDate", "authorInfo"].forEach(function (helper) {
             context[helper] = registry_utils[helper];
         });
-
-        return $(this._itemTemplate(context));
+        return $(Mustache.render(itemTemplate, context));
     };
 
     /**

diff --git a/src/extensions/default/JavaScriptCodeHints/Session.js b/src/extensions/default/JavaScriptCodeHints/Session.js
@@ -33,8 +33,8 @@ define(function (require, exports, module) {
         HTMLUtils       = brackets.getModule("language/HTMLUtils"),
         HintUtils       = require("HintUtils"),
         ScopeManager    = require("ScopeManager"),
-        Acorn           = require("acorn/acorn"),
-        Acorn_Loose     = require("acorn/acorn_loose");
+        Acorn           = require("acorn"),
+        Acorn_Loose     = require("acorn_loose");
 
     /**
      * Session objects encapsulate state associated with a hinting session

diff --git a/src/main.js b/src/main.js
@@ -52,8 +52,9 @@ require.config({
         "tinycolor":                 "../node_modules/tinycolor2/tinycolor",
         "jslint":                    "../node_modules/jslint/lib/jslint",
         "tern":                      "../node_modules/tern/lib/tern",
-        "acorn":                     "../node_modules/acord/dist/acorn",
-        "acorn_loose":               "../node_modules/acord/dist/acorn_loose",
+        "acorn":                     "../node_modules/acorn/dist/acorn",
+        "acorn_loose":               "../node_modules/acorn/dist/acorn_loose",
+        "semver.browser":            "../node_modules/semver/semver.browser",
         "codemirror":                "../node_modules/codemirror"
     },
     shim: {