fix: some paths and checks

porkus1990 · Jul 15, 2022 · 589c667 · 589c667
1 parent fe76f7f
commit 589c667
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,10 +1,11 @@
 {
   "name": "@porkus1990/mopeds",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "private": false,
   "description": "A tool for updating peerDependencies in monorepos",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "files": ["dist/*.js", "dist/**/*.js"],
   "scripts": {
     "test": "jest",
     "lint": "eslint .",

diff --git a/src/index.ts b/src/index.ts
@@ -36,7 +36,9 @@ program
 
     const handleContent = program.opts().dryRun ? new Log : new Write;
     let changedSomething = false;
-    while (!changedSomething) {
+    let hardStop = 0;
+    while (!changedSomething && hardStop < 20) {
+      hardStop++;
       changedSomething = await strategy.run(handleContent);
     }
   });

diff --git a/src/sync-deps/SyncDepsByPath.ts b/src/sync-deps/SyncDepsByPath.ts
@@ -34,6 +34,8 @@ class SyncDepsByPath extends Base implements IStrategy {
         }
       });
       const fileToWrite = { ...file, dependencies, peerDependencies };
+      if (Object.keys(fileToWrite.dependencies).length === 0) delete fileToWrite.dependencies;
+      if (Object.keys(fileToWrite.peerDependencies).length === 0) delete fileToWrite.peerDependencies;
 
       handleContent.handle(file, fileToWrite, this.packagePaths);
 

diff --git a/src/sync-deps/strategies/Lerna.ts b/src/sync-deps/strategies/Lerna.ts
@@ -15,10 +15,10 @@ class Lerna implements IStrategy {
   constructor(packagePrefix: string = '') {
     this.packagePrefix = packagePrefix;
     const lernaConfig = JSON.parse(readFileSync(
-      path.resolve(process.cwd(), './package.json'),
+      path.resolve(process.cwd(), './lerna.json'),
     ).toString());
 
-    const runFor = lernaConfig.packages ?? [];
+    const runFor = lernaConfig.packages ?? [path.resolve(process.cwd(), './packages')];
     this.runFor = runFor.map(rfor => rfor.replace('/*', ''));
   }
 

diff --git a/src/sync-deps/strategies/handle-change/Write.ts b/src/sync-deps/strategies/handle-change/Write.ts
@@ -4,7 +4,9 @@ import { IHandleContent } from './handle-content.interface';
 
 class Write implements IHandleContent {
   public handle(oldFile: IPackageType, newFile: IPackageType, paths: string[]): boolean {
-    if (oldFile !== newFile) {
+    const oldFileStringified = JSON.stringify(oldFile, null, 2);
+    const newFileStringified = JSON.stringify(newFile, null, 2);
+    if (oldFileStringified !== newFileStringified) {
       let prefix = oldFile.name.split('/')[0] ?? '';
       if (prefix !== '') {
         prefix = `${prefix}/`;