updates

jupyterlab/package.json

@@ -72,7 +72,7 @@
     "json-loader": "~0.5.7",
     "raw-loader": "~0.5.1",
     "rimraf": "~2.6.2",
-    "sort-package-json": "~1.7.1",
+    "sort-package-json": "1.0;",
     "source-map-loader": "~0.2.1",
     "style-loader": "~0.13.2",
     "url-loader": "~0.5.9",

packages/buildutils/package.json

@@ -32,8 +32,8 @@
     "glob": "~7.1.2"
   },
   "devDependencies": {
-    "@types/fs-extra": "~4.0.3",
-    "@types/glob": "~5.0.33",
+    "@types/fs-extra": "1.0;",
+    "@types/glob": "1.0;",
     "@types/node": "~8.0.47",
     "rimraf": "~2.6.2",
     "typescript": "~2.4.2"

scripts/package.json

@@ -12,16 +12,16 @@
   },
   "dependencies": {
     "child_process": "1.0;",
-    "fs-extra": "1.0;",
-    "glob": "1.0;",
+    "fs-extra": "~4.0.2",
+    "glob": "~7.1.2",
     "path": "1.0;",
     "sort-package-json": "1.0;",
-    "typescript": "1.0;"
+    "typescript": "~2.4.2"
   },
   "devDependencies": {
     "@types/fs-extra": "1.0;",
     "@types/glob": "1.0;",
-    "@types/node": "1.0;",
-    "rimraf": "1.0;"
+    "@types/node": "~8.0.47",
+    "rimraf": "~2.6.2"
   }
 }

scripts/src/ensure-integrity.ts

@@ -72,7 +72,7 @@ function ensurePackage(pkgName: string): string[] {
 
   if (filenames.length === 0) {
     if (utils.ensurePackageData(data, path.join(dname, 'package.json'))) {
-      messages.push('foo');
+      messages.push('Update package.json');
     }
     return messages;
   }
@@ -124,7 +124,7 @@ function ensurePackage(pkgName: string): string[] {
   });
 
   if (utils.ensurePackageData(data, path.join(dname, 'package.json'))) {
-    messages.push('bar');
+    messages.push('Update package.json');
   }
   return messages;
 }
@@ -316,7 +316,7 @@ function ensureIntegrity(): void {
   let corePath: string = path.resolve('.', 'package.json');
   let coreData: any = require(corePath);
   if (utils.ensurePackageData(coreData, corePath)) {
-    messages['baz'] = ['buzz'];
+    messages['top'] = ['Update package.json'];
   }
 
   // Handle the all-packages metapackage.

scripts/src/get-dependency.ts

@@ -1,7 +1,7 @@
 // Get the appropriate dependency for a package.
-// import path = require('path');
-// import utils = require('./utils');
-// import childProcess = require('child_process');
+import path = require('path');
+import utils = require('./utils');
+import childProcess = require('child_process');
 
 let allDeps: string[] = [];
 let allDevDeps: string[] = [];
@@ -17,61 +17,60 @@ let versions: { [key: string]: number } = {};
  */
 export
 function getDependency(name: string): string {
-  // let version = '';
+  let version = '';
   allDeps = [];
   allDevDeps = [];
   versions = {};
-  return '1.0;'
 
-  // utils.getLernaPaths().forEach(pkgRoot => {
-  // // Read in the package.json.
-  //   let packagePath = path.join(pkgRoot, 'package.json');
-  //   let data: any;
-  //   try {
-  //     data = require(packagePath);
-  //   } catch (e) {
-  //     return;
-  //   }
+  utils.getLernaPaths().forEach(pkgRoot => {
+  // Read in the package.json.
+    let packagePath = path.join(pkgRoot, 'package.json');
+    let data: any;
+    try {
+      data = require(packagePath);
+    } catch (e) {
+      return;
+    }
 
-  //   if (data.name === name) {
-  //     version = '^' + data.version;
-  //     return;
-  //   }
+    if (data.name === name) {
+      version = '^' + data.version;
+      return;
+    }
 
-  //   let deps = data.dependencies || {};
-  //   let devDeps = data.devDependencies || {};
-  //   if (deps[name]) {
-  //     allDeps.push(data.name);
-  //     if (deps[name] in versions) {
-  //       versions[deps[name]]++;
-  //     } else {
-  //       versions[deps[name]] = 1;
-  //     }
-  //   }
-  //   if (devDeps[name]) {
-  //     allDevDeps.push(data.name);
-  //     if (devDeps[name] in versions) {
-  //       versions[devDeps[name]]++;
-  //     } else {
-  //       versions[devDeps[name]] = 1;
-  //     }
-  //   }
-  // });
+    let deps = data.dependencies || {};
+    let devDeps = data.devDependencies || {};
+    if (deps[name]) {
+      allDeps.push(data.name);
+      if (deps[name] in versions) {
+        versions[deps[name]]++;
+      } else {
+        versions[deps[name]] = 1;
+      }
+    }
+    if (devDeps[name]) {
+      allDevDeps.push(data.name);
+      if (devDeps[name] in versions) {
+        versions[devDeps[name]]++;
+      } else {
+        versions[devDeps[name]] = 1;
+      }
+    }
+  });
 
-  // if (version) {
-  //   return version;
-  // }
+  if (version) {
+    return version;
+  }
 
-  // if (Object.keys(versions).length > 0) {
-  //   // Get the most common version.
-  //   version = Object.keys(versions)
-  //     .reduce((a, b) => { return versions[a] > versions[b] ? a : b; });
-  // } else {
-  //   let cmd = 'npm view ' + name + ' version';
-  //   version = '~' + String(childProcess.execSync(cmd)).trim();
-  // }
+  if (Object.keys(versions).length > 0) {
+    // Get the most common version.
+    version = Object.keys(versions)
+      .reduce((a, b) => { return versions[a] > versions[b] ? a : b; });
+  } else {
+    let cmd = 'npm view ' + name + ' version';
+    version = '~' + String(childProcess.execSync(cmd)).trim();
+  }
 
-  // return version;
+  return version;
 }
 
 if (require.main === module) {