obsidian-plugin-config 1.5.5 → 1.5.7

package/bin/obsidian-inject.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-plugin-config",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "description": "Système d'injection pour plugins Obsidian autonomes",
   "type": "module",
   "main": "src/index.ts",

package/scripts/inject-core.ts

@@ -608,19 +608,30 @@ export function readInjectionInfo(targetPath: string): Record<string, string> |
 }
 
 /**
- * Clean NPM artifacts if package-lock.json is found
+ * Clean NPM/Yarn lock files and node_modules to ensure fresh install
  */
 export async function cleanNpmArtifactsIfNeeded(targetPath: string): Promise<void> {
 	const packageLockPath = path.join(targetPath, 'package-lock.json');
+	const yarnLockPath = path.join(targetPath, 'yarn.lock');
+	const nodeModulesPath = path.join(targetPath, 'node_modules');
 
-	if (fs.existsSync(packageLockPath)) {
-		console.log(`\n🧹 NPM installation detected, cleaning artifacts...`);
+	const hasPackageLock = fs.existsSync(packageLockPath);
+	const hasYarnLock = fs.existsSync(yarnLockPath);
+
+	if (hasPackageLock || hasYarnLock) {
+		console.log(`\n🧹 Cleaning lock files and node_modules...`);
 
 		try {
-			fs.unlinkSync(packageLockPath);
-			console.log(`   🗑️  Removed package-lock.json`);
+			if (hasPackageLock) {
+				fs.unlinkSync(packageLockPath);
+				console.log(`   🗑️  Removed package-lock.json`);
+			}
+
+			if (hasYarnLock) {
+				fs.unlinkSync(yarnLockPath);
+				console.log(`   🗑️  Removed yarn.lock`);
+			}
 
-			const nodeModulesPath = path.join(targetPath, 'node_modules');
 			if (fs.existsSync(nodeModulesPath)) {
 				fs.rmSync(nodeModulesPath, { recursive: true, force: true });
 				console.log(
@@ -628,11 +639,11 @@ export async function cleanNpmArtifactsIfNeeded(targetPath: string): Promise<voi
 				);
 			}
 
-			console.log(`   ✅ NPM artifacts cleaned to avoid Yarn conflicts`);
+			console.log(`   ✅ Lock files and artifacts cleaned for fresh install`);
 		} catch (error) {
-			console.error(`   ❌ Failed to clean NPM artifacts: ${error}`);
+			console.error(`   ❌ Failed to clean artifacts: ${error}`);
 			console.log(
-				`   💡 You may need to manually remove package-lock.json and node_modules`
+				`   💡 You may need to manually remove package-lock.json, yarn.lock and node_modules`
 			);
 		}
 	}

package/templates/package.json

@@ -6,17 +6,17 @@
   },
   "scripts": {
     "start": "yarn install && yarn dev",
-    "dev": "tsx scripts/esbuild.config.ts",
-    "build": "tsc -noEmit -skipLibCheck && tsx scripts/esbuild.config.ts production",
-    "real": "tsx scripts/esbuild.config.ts production real",
-    "acp": "tsx scripts/acp.ts",
-    "bacp": "tsx scripts/acp.ts -b",
-    "update-version": "tsx scripts/update-version.ts",
-    "v": "tsx scripts/update-version.ts",
-    "release": "tsx scripts/release.ts",
-    "r": "tsx scripts/release.ts",
-    "help": "tsx scripts/help.ts",
-    "h": "tsx scripts/help.ts",
+    "dev": "npx tsx scripts/esbuild.config.ts",
+    "build": "tsc -noEmit -skipLibCheck && npx tsx scripts/esbuild.config.ts production",
+    "real": "npx tsx scripts/esbuild.config.ts production real",
+    "acp": "npx tsx scripts/acp.ts",
+    "bacp": "npx tsx scripts/acp.ts -b",
+    "update-version": "npx tsx scripts/update-version.ts",
+    "v": "npx tsx scripts/update-version.ts",
+    "release": "npx tsx scripts/release.ts",
+    "r": "npx tsx scripts/release.ts",
+    "help": "npx tsx scripts/help.ts",
+    "h": "npx tsx scripts/help.ts",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "prettier": "npx prettier --check '**/*.{ts,json}'",
@@ -36,7 +36,6 @@
     "eslint-import-resolver-typescript": "latest",
     "jiti": "latest",
     "obsidian": "*",
-    "obsidian-plugin-config": "latest",
     "obsidian-typings": "latest",
     "prettier": "latest",
     "semver": "latest",

package/templates/scripts/release.ts

@@ -22,10 +22,21 @@ async function createReleaseNotesFile(tagMessage: string, tag: string): Promise<
 }
 
 async function handleExistingTag(tag: string): Promise<boolean> {
-	const confirmed = await askConfirmation(
-		`Tag ${tag} already exists. Do you want to replace it?`,
-		rl
-	);
+	// Get the existing tag message to show to the user
+	let existingMessage = '';
+	try {
+		existingMessage = execSync(`git tag -l -n999 ${tag}`, { encoding: 'utf8' }).trim();
+	} catch {
+		// If we can't get the message, continue anyway
+	}
+
+	let prompt = `Tag ${tag} already exists.`;
+	if (existingMessage) {
+		prompt += `\n\nExisting tag message:\n${existingMessage}\n`;
+	}
+	prompt += `\nDo you want to replace it?`;
+
+	const confirmed = await askConfirmation(prompt, rl);
 
 	if (!confirmed) {
 		console.log('Operation aborted');

package/versions.json

@@ -53,5 +53,7 @@
   "1.5.2": "1.8.9",
   "1.5.3": "1.8.9",
   "1.5.4": "1.8.9",
-  "1.5.5": "1.8.9"
+  "1.5.5": "1.8.9",
+  "1.5.6": "1.8.9",
+  "1.5.7": "1.8.9"
 }