test and verity jspm-npm@0.14 upgrade path

jspm · Jan 2, 2015 · 0ef24c6 · 0ef24c6
1 parent 5c1d144
commit 0ef24c6
Show file tree

Hide file tree

Showing 2 changed files with 253 additions and 40 deletions.
diff --git a/lib/install.js b/lib/install.js
@@ -373,41 +373,56 @@ function getInstalledMatch(target) {
 }
 
 function saveInstall() {
+  return Promise.resolve()
+  .then(function() {
 
-  // merge the installing tree into the installed
-  Object.keys(installing.baseMap).forEach(function(p) {
-    installed.baseMap[p] = installing.baseMap[p];
-  });
-
-  Object.keys(installing.depMap).forEach(function(p) {
-    installed.depMap[p] = installing.depMap[p];
-  });
-
-  if (hasProperties(installedResolves)) {
-    ui.log('');
-    ui.log('info', 'The following existing package versions were altered by install deduping:');
-    ui.log('');
-    Object.keys(installedResolves).forEach(function(pkg) {
-      var pkgName = new PackageName(pkg);
-      ui.log('info', '  %' + pkgName.package + '% ' + getUpdateRangeText(pkgName, new PackageName(installedResolves[pkg])));
+    // merge the installing tree into the installed
+    Object.keys(installing.baseMap).forEach(function(p) {
+      installed.baseMap[p] = installing.baseMap[p];
     });
-    ui.log('');
-    ui.log('info', 'To keep existing dependencies locked during install, use the %--lock% option.');
-  }
 
-  if (hasProperties(installingResolves)) {
-    ui.log('');
-    ui.log('info', 'The following new package versions were substituted by install deduping:');
-    ui.log('');
-    Object.keys(installingResolves).forEach(function(pkg) {
-      var pkgName = new PackageName(pkg);
-      ui.log('info', '  %' + pkgName.package + '% ' + getUpdateRangeText(pkgName, new PackageName(installingResolves[pkg])));
+    Object.keys(installing.depMap).forEach(function(p) {
+      installed.depMap[p] = installing.depMap[p];
     });
-    ui.log('') ;
-  }
 
-  // then save
-  return config.save();
+    // deprecate old nodelibs
+    // NB this can be removed when 0.9 is no longer supported
+    for (var i = 0; i < 10; i++) {
+      if (installed.depMap['github:jspm/nodelibs@0.0.' + i])
+        return clean();
+    }
+
+    if (hasProperties(installedResolves))
+      return clean();
+
+  })
+  .then(function() {
+    if (hasProperties(installedResolves)) {
+      ui.log('');
+      ui.log('info', 'The following existing package versions were altered by install deduping:');
+      ui.log('');
+      Object.keys(installedResolves).forEach(function(pkg) {
+        var pkgName = new PackageName(pkg);
+        ui.log('info', '  %' + pkgName.package + '% ' + getUpdateRangeText(pkgName, new PackageName(installedResolves[pkg])));
+      });
+      ui.log('');
+      ui.log('info', 'To keep existing dependencies locked during install, use the %--lock% option.');
+    }
+
+    if (hasProperties(installingResolves)) {
+      ui.log('');
+      ui.log('info', 'The following new package versions were substituted by install deduping:');
+      ui.log('');
+      Object.keys(installingResolves).forEach(function(pkg) {
+        var pkgName = new PackageName(pkg);
+        ui.log('info', '  %' + pkgName.package + '% ' + getUpdateRangeText(pkgName, new PackageName(installingResolves[pkg])));
+      });
+      ui.log('') ;
+    }
+
+    // then save
+    return config.save();
+  });
 }
 
 var logged = {};