fixup into more consistent version checking

demergent-labs · Sep 17, 2024 · 9b797c9 · 9b797c9
1 parent 2501c02
commit 9b797c9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/src/build/stable/commands/install_global_dependencies/index.ts b/src/build/stable/commands/install_global_dependencies/index.ts
@@ -102,7 +102,7 @@ If no options are provided, all dependencies will be installed.
 
 async function getGlobalDependencies(): Promise<Versions> {
     // Path to package.json
-    const packageJsonPath = join(process.cwd(), 'package.json');
+    const packageJsonPath = join(AZLE_PACKAGE_PATH, 'package.json');
 
     // Read the existing package.json file
     const packageJsonContent = await readFile(packageJsonPath, 'utf-8');

diff --git a/src/build/stable/utils/versions/dfx.ts b/src/build/stable/utils/versions/dfx.ts
@@ -1,3 +1,5 @@
+import { pathToFileURL } from 'url';
+
 import { execSyncPretty } from '../exec_sync_pretty';
 
 export function getDfxVersion(): string {
@@ -22,6 +24,6 @@ function main(): void {
     }
 }
 
-if (require.main === module) {
+if (import.meta.url === pathToFileURL(process.argv[1]).href) {
     main();
 }
diff --git a/src/build/stable/utils/versions/node.ts b/src/build/stable/utils/versions/node.ts
@@ -1,3 +1,5 @@
+import { pathToFileURL } from 'url';
+
 import { execSyncPretty } from '../exec_sync_pretty';
 
 export function getNodeVersion(): string {
@@ -21,6 +23,6 @@ function main(): void {
     }
 }
 
-if (require.main === module) {
+if (import.meta.url === pathToFileURL(process.argv[1]).href) {
     main();
 }
diff --git a/src/build/stable/utils/versions/rust.ts b/src/build/stable/utils/versions/rust.ts
@@ -1,3 +1,5 @@
+import { pathToFileURL } from 'url';
+
 import { execSyncPretty } from '../exec_sync_pretty';
 
 export function getRustVersion(): string {
@@ -21,6 +23,6 @@ function main(): void {
     }
 }
 
-if (require.main === module) {
+if (import.meta.url === pathToFileURL(process.argv[1]).href) {
     main();
 }
diff --git a/src/build/stable/utils/versions/wasi2ic.ts b/src/build/stable/utils/versions/wasi2ic.ts
@@ -1,3 +1,5 @@
+import { pathToFileURL } from 'url';
+
 import { execSyncPretty } from '../exec_sync_pretty';
 
 export function getWasiVersion(): string {
@@ -34,6 +36,6 @@ function main(): void {
     }
 }
 
-if (require.main === module) {
+if (import.meta.url === pathToFileURL(process.argv[1]).href) {
     main();
 }