Improve local registry URLS behaviour in resolve-scripts (#2015)

reimagined · Aug 30, 2021 · 0b78805 · 0b78805
1 parent f3d0c63
commit 0b78805
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -400,6 +400,7 @@ module.exports = {
           'savepoint',
           'scalable',
           'sdk',
+          'semver',
           'sep',
           'serializable',
           'Serializers',

diff --git a/packages/tools/scripts/package.json b/packages/tools/scripts/package.json
@@ -50,6 +50,7 @@
     "opn": "^6.0.0",
     "respawn": "2.6.0",
     "route-trie": "3.0.0",
+    "semver": "7.3.5",
     "socket.io-client": "4.0.0",
     "synchronous-promise": "2.0.15",
     "testcafe": "1.14.2",

diff --git a/packages/tools/scripts/src/write_package_jsons_for_assemblies.js b/packages/tools/scripts/src/write_package_jsons_for_assemblies.js
@@ -1,5 +1,6 @@
 import fs from 'fs'
 import path from 'path'
+import semver from 'semver'
 
 const writePackageJsonsForAssemblies = (
   distDir,
@@ -35,7 +36,10 @@ const writePackageJsonsForAssemblies = (
       new Set(
         Object.entries(applicationPackageJson.dependencies)
           .filter(([dependency]) => dependency.startsWith('@resolve-js/'))
-          .map(([, version]) => version)
+          .map(([, version]) => {
+            const parsedVersion = semver.parse(version)
+            return parsedVersion != null ? version : null
+          })
       )
     )
 
@@ -63,9 +67,10 @@ const writePackageJsonsForAssemblies = (
           resolveRuntimePackageJson.dependencies.hasOwnProperty(val) &&
           nodeModules.has(val)
         ) {
-          acc[val] = val.startsWith('@resolve-js/')
-            ? frameworkVersion
-            : resolveRuntimePackageJson.dependencies[val]
+          acc[val] =
+            val.startsWith('@resolve-js/') && frameworkVersion != null
+              ? frameworkVersion
+              : resolveRuntimePackageJson.dependencies[val]
         }
 
         return acc

diff --git a/yarn.lock b/yarn.lock
@@ -16167,7 +16167,7 @@ [email protected]:
   dependencies:
     lru-cache "^6.0.0"
 
-[email protected], semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+semver@7.3.5, semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==