maping fix, config ordering fix, beta.12

jspm · Oct 22, 2014 · 6e25a6b · 6e25a6b
1 parent b704e6f
commit 6e25a6b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/lib/build.js b/lib/build.js
@@ -466,6 +466,7 @@ exports.compileDir = function(dir, options) {
             else if (format == 'cjs') {
               source = source.replace(cjsRequireRegEx, function(statement, singleString, doubleString) {
                 var name = singleString || doubleString;
+                name = name.substr(1, name.length - 2);
                 var mapped = applyMap(name, map, relFile, options.removeJSExtensions);
 
                 if (!mapped)

diff --git a/lib/config/package.js b/lib/config/package.js
@@ -156,11 +156,12 @@ PackageJSON.prototype.write = function() {
   if (!hasProperties(pjson.map))
     delete pjson.map;
 
-  // reuse existing package.json dependencies if possible to maintain ordering
   pjson.dependencies = {};
   var depValue;
   for (var d in this.dependencies) {
     var dep = this.dependencies[d];
+    if (!dep)
+      continue;
     var regName;
     // github:some/thing: x.y.z
     if (d == dep.name)

diff --git a/lib/core.js b/lib/core.js
@@ -105,7 +105,7 @@ function removePackage(name) {
 
   // remove from config.pjson.dependencies
   if (config.pjson.dependencies[name] && (removed = true))
-    delete config.pjson.dependencies[name];
+    config.pjson.dependencies[name] = undefined;
 
   if (!config.loader.baseMap[name])
     return removed;

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jspm",
   "description": "",
-  "version": "0.8.0-beta.11",
+  "version": "0.8.0-beta.12",
   "main": "./api.js",
   "author": "",
   "dependencies": {