obsidian-plugin-config 1.6.0 → 1.6.2

package/.vscode/tasks.json

@@ -44,19 +44,12 @@
     {
       "label": "NPM Publish",
       "type": "shell",
-      "command": "yarn npm-publish --auto-update",
+      "command": "yarn npm-publish",
       "group": { "kind": "build", "isDefault": true },
       "presentation": { "reveal": "always", "panel": "shared" },
       "problemMatcher": []
     },
-    {
-      "label": "Install/Update obsidian-inject",
-      "type": "shell",
-      "command": "npm list -g obsidian-plugin-config --depth=0 && npm install -g obsidian-plugin-config@latest --force --engine-strict=false && npm list -g obsidian-plugin-config --depth=0",
-      "group": "build",
-      "presentation": { "reveal": "always", "panel": "shared" },
-      "problemMatcher": []
-    },
+
     {
       "label": "Cleanup: Lint + Prettier",
       "dependsOrder": "sequence",

package/bin/obsidian-inject.js

@@ -3,7 +3,7 @@
 /**
  * Obsidian Plugin Config - CLI Entry Point
  * Global command: obsidian-inject
- * Version: 1.6.0
+ * Version: 1.6.2
  */
 
 import { execSync } from 'child_process';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-plugin-config",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Global CLI injection tool for Obsidian plugins",
   "type": "module",
   "bin": {

package/scripts/acp.ts

@@ -33,16 +33,7 @@ async function main(): Promise<void> {
 			console.log('Build successful.');
 		}
 
-		// Only update exports if we're in the centralized repo and not explicitly disabled
-		if (
-			!process.argv.includes('-ne') &&
-			!process.argv.includes('--no-exports') &&
-			isInCentralizedRepo()
-		) {
-			console.log('Updating exports...');
-			gitExec('yarn run update-exports');
-			console.log('Exports updated.');
-		}
+
 
 		const input: string = await askQuestion('Enter commit message: ', rl);
 

package/scripts/build-npm.ts

@@ -223,7 +223,7 @@ async function ensureNpmAuth(): Promise<void> {
 				stdio: 'inherit'
 			});
 			console.log(`\n   ✅ Successfully logged in to NPM\n`);
-		} catch (loginError) {
+		} catch {
 			console.error(`\n   ❌ NPM login failed`);
 			console.error(`   Please run 'npm login' manually and try again`);
 			throw new Error('NPM authentication required');
@@ -257,11 +257,29 @@ async function buildAndPublishNpm(): Promise<void> {
 		// Step 4: Commit and push
 		console.log(`\n📤 Step 4/5: Committing and pushing changes...`);
 		try {
-			execSync('echo "Publish NPM package" | tsx scripts/acp.ts -b', {
-				stdio: 'inherit'
-			});
-		} catch {
-			console.log(`   ℹ️  No additional changes to commit`);
+			// Add all changes
+			execSync('git add -A', { stdio: 'pipe' });
+			
+			// Check if there are changes to commit
+			const status = execSync('git status --porcelain', { encoding: 'utf8' });
+			if (status.trim()) {
+				const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+				execSync(`git commit -m "Publish NPM package v${packageJson.version}"`, {
+					stdio: 'pipe'
+				});
+				
+				// Get current branch and push
+				const currentBranch = execSync('git rev-parse --abbrev-ref HEAD', {
+					encoding: 'utf8'
+				}).trim();
+				execSync(`git push origin ${currentBranch}`, { stdio: 'inherit' });
+				console.log(`   ✅ Changes committed and pushed`);
+			} else {
+				console.log(`   ℹ️  No changes to commit`);
+			}
+		} catch (error) {
+			console.error(`   ❌ Commit/push failed: ${error instanceof Error ? error.message : String(error)}`);
+			throw error;
 		}
 
 		// Step 5: Publish to NPM
@@ -270,29 +288,15 @@ async function buildAndPublishNpm(): Promise<void> {
 			stdio: 'inherit'
 		});
 
-		// Optional: Update global CLI
-		console.log(`\n🌍 Update global CLI?`);
-		const autoUpdate = process.argv.includes('--auto-update');
-		let doUpdate = autoUpdate;
-		if (!autoUpdate) {
-			const { askConfirmation, createReadlineInterface } =
-				await import('./utils.js');
-			const rl = createReadlineInterface();
-			doUpdate = await askConfirmation(
-				`Install obsidian-plugin-config@latest globally?`,
-				rl
-			);
-			rl.close();
-		}
-		if (doUpdate) {
-			console.log(`   ⏳ Waiting 15s for NPM registry propagation...`);
-			await new Promise((resolve) => setTimeout(resolve, 15000));
-			execSync(
-				'npm install -g obsidian-plugin-config@latest --force --engine-strict=false',
-				{ stdio: 'inherit' }
-			);
-			console.log(`   ✅ Global CLI updated`);
-		}
+		// Optional: Update global CLI automatically
+		console.log(`\n🌍 Updating global CLI...`);
+		console.log(`   ⏳ Waiting 15s for NPM registry propagation...`);
+		await new Promise((resolve) => setTimeout(resolve, 15000));
+		execSync(
+			'npm install -g obsidian-plugin-config@latest --force --engine-strict=false',
+			{ stdio: 'inherit' }
+		);
+		console.log(`   ✅ Global CLI updated`);
 
 		console.log(`\n🎉 Complete workflow successful!`);
 		console.log(`   Test: cd any-plugin && obsidian-inject`);

package/scripts/inject-core.ts

@@ -670,15 +670,37 @@ export async function cleanNpmArtifactsIfNeeded(targetPath: string): Promise<voi
 			}
 
 			if (fs.existsSync(nodeModulesPath)) {
+				console.log(`   ⏳ Removing node_modules (this may take a moment)...`);
 				try {
-					execSync(`rmdir /s /q "${nodeModulesPath}"`, { stdio: 'inherit' });
+					// Try standard rmdir first
+					execSync(`rmdir /s /q "${nodeModulesPath}"`, {
+						stdio: 'pipe',
+						windowsHide: true
+					});
+					console.log(
+						`   🗑️  Removed node_modules (will be reinstalled with Yarn)`
+					);
 				} catch {
-					// Fallback: fs.rmSync si rmdir échoue
-					fs.rmSync(nodeModulesPath, { recursive: true, force: true });
+					// If locked, rename it and let yarn install create a fresh one
+					try {
+						const timestamp = Date.now();
+						const oldPath = `${nodeModulesPath}.old.${timestamp}`;
+						fs.renameSync(nodeModulesPath, oldPath);
+						console.log(
+							`   🔄 Renamed locked node_modules to ${path.basename(oldPath)}`
+						);
+						console.log(
+							`   💡 You can delete it manually later when processes are closed`
+						);
+					} catch {
+						console.log(
+							`   ⚠️  Could not remove node_modules (files locked by running processes)`
+						);
+						console.log(
+							`   💡 Yarn will update it anyway, but close processes for clean install`
+						);
+					}
 				}
-				console.log(
-					`   🗑️  Removed node_modules (will be reinstalled with Yarn)`
-				);
 			}
 
 			console.log(`   ✅ Lock files and artifacts cleaned for fresh install`);