fix version match check

Author: mbektas

package.json

@@ -165,7 +165,6 @@
     "@types/yargs": "^17.0.18",
     "@typescript-eslint/eslint-plugin": "~5.28.0",
     "@typescript-eslint/parser": "~5.28.0",
-    "@yarnpkg/lockfile": "~1.1.0",
     "css-loader": "~5.1.1",
     "electron": "^23.1.4",
     "electron-builder": "^23.6.0",

scripts/buildutil.js

@@ -2,7 +2,6 @@ const meow = require('meow');
 const fs = require('fs-extra');
 const path = require('path');
 const semver = require('semver');
-const lockfile = require('@yarnpkg/lockfile');
 const yaml = require('js-yaml');
 
 const pkgjsonFilePath = path.resolve(__dirname, '../package.json');
@@ -96,40 +95,6 @@ if (cli.flags.checkVersionMatch) {
   const appVersion = pkgjsonFileData['version'];
   console.log(`JupyterLab Desktop version: ${appVersion}`);
 
-  // parse JupyterLab version bundled to application UI
-  const yarnlockFilePath = path.resolve(__dirname, '../yarn.lock');
-  if (!fs.existsSync(yarnlockFilePath)) {
-    console.error('yarn.lock not found!');
-    process.exit(1);
-  }
-
-  const yarnLockFileContent = fs.readFileSync(yarnlockFilePath, 'utf8');
-  const yarnLockData = lockfile.parse(yarnLockFileContent).object;
-  const yarnPackages = Object.keys(yarnLockData);
-  const metapackage = yarnPackages.find(pkg =>
-    pkg.startsWith('@jupyterlab/metapackage')
-  );
-  if (!metapackage) {
-    console.error('@jupyterlab/metapackage not found!');
-    process.exit(1);
-  }
-
-  const jlabVersion = yarnLockData[metapackage].version;
-  console.log(`JupyterLab version: ${jlabVersion}`);
-
-  if (
-    !semver.valid(appVersion) ||
-    !semver.valid(jlabVersion) ||
-    semver.major(appVersion) !== semver.major(jlabVersion) ||
-    semver.minor(appVersion) !== semver.minor(jlabVersion) ||
-    semver.patch(appVersion) !== semver.patch(jlabVersion)
-  ) {
-    console.error(
-      `Application package version ${appVersion} doesn't match bundled JupyterLab version ${jlabVersion}`
-    );
-    process.exit(1);
-  }
-
   // check JupyterLab version bundled to Application Server
   const constructorData = yaml.load(
     fs.readFileSync(
@@ -158,15 +123,19 @@ if (cli.flags.checkVersionMatch) {
   const appServerJLabVersion = specParts[1];
   console.log(`Application Server JupyterLab version: ${appServerJLabVersion}`);
 
-  if (appServerJLabVersion !== jlabVersion) {
+  if (
+    !semver.valid(appVersion) ||
+    !semver.valid(appServerJLabVersion) ||
+    semver.major(appVersion) !== semver.major(appServerJLabVersion) ||
+    semver.minor(appVersion) !== semver.minor(appServerJLabVersion) ||
+    semver.patch(appVersion) !== semver.patch(appServerJLabVersion)
+  ) {
     console.error(
-      `Application Server package version ${appServerJLabVersion} doesn't match bundled JupyterLab version ${jlabVersion}`
+      `Application package version ${appVersion} doesn't match bundled JupyterLab Python package version ${appServerJLabVersion}`
     );
     process.exit(1);
   }
 
-  checkExtensionImports();
-
   console.log('JupyterLab version match satisfied!');
   process.exit(0);
 }

yarn.lock

@@ -701,11 +701,6 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-"@yarnpkg/lockfile@~1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
-  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
-
 acorn-import-assertions@^1.7.6:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"