Rvert set dev version code (Azure#14298)

AzureSDKAutomation · Mar 16, 2021 · ca6fcf0 · ca6fcf0
1 parent ebc3bc0
commit ca6fcf0
Showing 1 changed file with 22 additions and 21 deletions.
diff --git a/eng/tools/versioning/set-dev.js b/eng/tools/versioning/set-dev.js
@@ -56,22 +56,6 @@ const updatePackageVersion = (rushPackages, package, buildId) => {
   return rushPackages;
 };
 
-const shouldUpdateVersion = (packageVersion, depVersionRange) => {
-  // Update dependent pacakge version to daily dev if dependency requirement is either 'dev' or if it matches semver
-  let updateDependent = (depVersionRange === "dev");
-  if (!updateDependent) {
-    const parsedPackageVersion = semver.parse(packageVersion);
-    const parsedDepMinVersion = semver.minVersion(depVersionRange);
-    if (
-      parsedDepMinVersion.major == parsedPackageVersion.major &&
-      parsedDepMinVersion.minor == parsedPackageVersion.minor &&
-      parsedDepMinVersion.patch == parsedPackageVersion.patch) {
-      updateDependent = true;
-    }
-  }
-  return updateDependent;
-}
-
 const updateDependencySection = (rushPackages, dependencySection, buildId) => {
   //console.log(dependencySection);
   if (dependencySection) {
@@ -91,7 +75,14 @@ const updateDependencySection = (rushPackages, dependencySection, buildId) => {
       console.log(`version in package's dep = ${depVersionRange}`); //^1.0.0
       console.log(`dep's version = ${packageVersion}`); //1.0.0
 
-      if (shouldUpdateVersion(packageVersion, depVersionRange) && !rushPackages[depName].json["private"]) {
+      const parsedPackageVersion = semver.parse(packageVersion);
+      const parsedDepMinVersion = semver.minVersion(depVersionRange);
+
+      if (
+        parsedDepMinVersion.major == parsedPackageVersion.major &&
+        parsedDepMinVersion.minor == parsedPackageVersion.minor &&
+        parsedDepMinVersion.patch == parsedPackageVersion.patch
+      ) {
         rushPackages = updatePackageVersion(rushPackages, depName, buildId);
       }
     }
@@ -109,6 +100,13 @@ const updateInternalDependencyVersions = (rushPackages, package, buildId) => {
     buildId
   );
 
+  console.log("checking devDependencies ..");
+  rushPackages = updateDependencySection(
+    rushPackages,
+    rushPackages[package].json.devDependencies,
+    buildId
+  );
+
   console.log("checking peerDependencies ..");
   rushPackages = updateDependencySection(
     rushPackages,
@@ -135,17 +133,20 @@ const makeDependencySectionConsistentForPackage = (rushPackages, dependencySecti
 
     console.log(`version in package's dep = ${depVersionRange}`);
     console.log(`dep's version = ${packageVersion}`);
+    const parsedPackageVersion = semver.parse(packageVersion);
+    const parsedDepMinVersion = semver.minVersion(depVersionRange);
     // If the dependency range is satisfied by the package's current version,
     // replace it with an exact match to the package's new version
     if (
-      shouldUpdateVersion(packageVersion, depVersionRange) &&
-      rushPackages[depName].newVer !== undefined &&
-      !rushPackages[depName].json["private"]
+      parsedDepMinVersion.major == parsedPackageVersion.major &&
+      parsedDepMinVersion.minor == parsedPackageVersion.minor &&
+      parsedDepMinVersion.patch == parsedPackageVersion.patch &&
+      rushPackages[depName].newVer !== undefined
     ) {
 
       // Setting version to ^[major.minor.patch]-alpha so that this automatically matches 
       // with the latest dev version published on npm
-      dependencySection[depName] = `dev`;
+      dependencySection[depName] = `^${parsedPackageVersion.major}.${parsedPackageVersion.minor}.${parsedPackageVersion.patch}-alpha`;
     }
   }
   return rushPackages;