Always try to semver.clean(), fixes yarnpkg#3661 (yarnpkg#3702)

arcanis · Jun 23, 2017 · c63e015 · c63e015
1 parent 1e0575c
commit c63e015
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/__tests__/fixtures/normalize-manifest/clean version with v/actual.json b/__tests__/fixtures/normalize-manifest/clean version with v/actual.json
@@ -0,0 +1,3 @@
+{
+  "version": "v1.0.0"
+}
diff --git a/__tests__/fixtures/normalize-manifest/clean version with v/expected.json b/__tests__/fixtures/normalize-manifest/clean version with v/expected.json
@@ -0,0 +1,4 @@
+{
+  "name": "",
+  "version": "1.0.0"
+}
diff --git a/__tests__/fixtures/normalize-manifest/clean version with v/warnings.json b/__tests__/fixtures/normalize-manifest/clean version with v/warnings.json
@@ -0,0 +1 @@
+["No license field"]
diff --git a/src/config.js b/src/config.js
@@ -491,7 +491,7 @@ export default class Config {
 
   /**
  * try get the manifest file by looking
- * 1. mainfest file in cache
+ * 1. manifest file in cache
  * 2. manifest file in registry
  */
   async maybeReadManifest(dir: string, priorityRegistry?: RegistryNames, isRoot?: boolean = false): Promise<?Manifest> {

diff --git a/src/util/normalize-manifest/fix.js b/src/util/normalize-manifest/fix.js
@@ -32,7 +32,7 @@ export default (async function(
   const files = await fs.readdir(moduleLoc);
 
   // clean info.version
-  if (typeof info.version === 'string' && !semver.valid(info.version)) {
+  if (typeof info.version === 'string') {
     info.version = semver.clean(info.version, looseSemver) || info.version;
   }