obsidian-plugin-config 1.4.0 → 1.4.2

package/.prettierrc

@@ -6,5 +6,14 @@
 	"trailingComma": "none",
 	"semi": true,
 	"singleQuote": true,
-	"arrowParens": "always"
+	"arrowParens": "always",
+	"overrides": [
+		{
+			"files": ["*.json"],
+			"options": {
+				"useTabs": false,
+				"tabWidth": 2
+			}
+		}
+	]
 }

package/bin/obsidian-inject.js

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

package/eslint.config.mts

@@ -40,7 +40,11 @@ const configs: Linter.Config[] = [
 
       // Useful rules but not too strict
       "semi": "error",
+      "eqeqeq": ["error", "always"],
+      "prefer-const": "error",
       "@typescript-eslint/explicit-function-return-type": ["warn", { "allowExpressions": true }],
+      "@typescript-eslint/no-explicit-any": "warn",
+      "@typescript-eslint/consistent-type-imports": ["warn", { "prefer": "type-imports" }],
 
       // Disable overly strict rules
       "@typescript-eslint/no-unsafe-assignment": "off",
@@ -48,6 +52,12 @@ const configs: Linter.Config[] = [
       "@typescript-eslint/no-unsafe-member-access": "off",
       "@typescript-eslint/no-unsafe-argument": "off"
     }
+  },
+  {
+    files: ["src/**/*.ts"],
+    rules: {
+      "no-console": ["warn", { "allow": ["warn", "error", "debug"] }]
+    }
   }
 ];
 

package/package.json

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

package/scripts/build-npm.ts

@@ -197,11 +197,9 @@ main();
 /**
  * Complete NPM workflow - Version, Commit, Push, Publish
  */
-function buildAndPublishNpm(): void {
+async function buildAndPublishNpm(): Promise<void> {
   console.log(`🚀 Obsidian Plugin Config - Complete NPM Workflow`);
-  console.log(
-    `Full automation: version → exports → bin → commit → publish\n`
-  );
+  console.log(`Full automation: version → exports → bin → commit → publish\n`);
 
   try {
     // Step 0: Check NPM login
@@ -216,58 +214,52 @@ function buildAndPublishNpm(): void {
       process.exit(1);
     }
 
-    // Step 1: Update version in package.json only
-    // (no commit yet - we'll do one big commit after)
-    console.log(`📋 Step 1/6: Updating version...`);
-    execSync('tsx scripts/update-version-config.ts', {
-      stdio: 'inherit'
-    });
+    // Step 1: Update version
+    console.log(`📋 Step 1/7: Updating version...`);
+    execSync('tsx scripts/update-version-config.ts', { stdio: 'inherit' });
 
-    // Step 2: Update exports automatically
+    // Step 2: Update exports
     console.log(`\n📦 Step 2/7: Updating exports...`);
     execSync('yarn update-exports', { stdio: 'inherit' });
 
-    // Step 3: Generate bin file (uses updated version)
+    // Step 3: Generate bin file
     console.log(`\n🔧 Step 3/7: Generating bin/obsidian-inject.js...`);
-    generateBinFile();
+    await generateBinFile();
 
     // Step 4: Verify package and sync versions.json
-    // (must happen before commit so versions.json is included)
     console.log(`\n📋 Step 4/7: Verifying package...`);
     verifyPackage();
 
-    // Step 5: Commit and push ALL changes together
-    // (package.json version, bin/, versions.json, exports)
+    // Step 5: Commit and push
     console.log(`\n📤 Step 5/7: Committing and pushing changes...`);
     try {
-      execSync(
-        'echo "Publish NPM package" | tsx scripts/acp.ts -b',
-        { stdio: 'inherit' }
-      );
+      execSync('echo "Publish NPM package" | tsx scripts/acp.ts -b', { stdio: 'inherit' });
     } catch {
       console.log(`   ℹ️  No additional changes to commit`);
     }
 
     // Step 6: Publish to NPM
     console.log(`\n📤 Step 6/7: Publishing to NPM...`);
-    execSync(
-      'npm publish --registry https://registry.npmjs.org/',
-      { stdio: 'inherit' }
+    execSync('npm publish --registry https://registry.npmjs.org/', { stdio: 'inherit' });
+
+    // Step 7: Offer global update
+    console.log(`\n🌍 Step 7/7: Update global CLI?`);
+    const { askConfirmation, createReadlineInterface } = await import("./utils.js");
+    const rl = createReadlineInterface();
+    const doUpdate = await askConfirmation(
+      `Install npm install -g obsidian-plugin-config@latest?`, rl
     );
+    rl.close();
+    if (doUpdate) {
+      execSync('npm install -g obsidian-plugin-config@latest --force', { stdio: 'inherit' });
+      console.log(`   ✅ Global CLI updated`);
+    }
 
     console.log(`\n🎉 Complete workflow successful!`);
-    console.log(`\n📋 Next steps:`);
-    console.log(`   1. npm install -g obsidian-plugin-config`);
-    console.log(
-      `   2. Test injection: cd any-plugin && obsidian-inject`
-    );
+    console.log(`   Test: cd any-plugin && obsidian-inject`);
 
   } catch (error) {
-    console.error(
-      `\n❌ Workflow failed: ${
-        error instanceof Error ? error.message : String(error)
-      }`
-    );
+    console.error(`\n❌ Workflow failed: ${error instanceof Error ? error.message : String(error)}`);
     process.exit(1);
   }
 }
@@ -334,4 +326,4 @@ function verifyPackage(): void {
 }
 
 // Run the script
-buildAndPublishNpm();
+await buildAndPublishNpm();

package/scripts/help.ts

@@ -30,11 +30,20 @@ INJECTION (Development phase):
   yarn check-plugin <path>        # Verification only (dry-run)
 
 NPM PUBLISHING (all-in-one - no acp needed before):
-  yarn npm-publish                # Full workflow:
-                                  # version → exports → bin
-                                  # → commit+push → publish
+  yarn npm-publish                # Full workflow (7 steps):
+                                  # 0. NPM auth check
+                                  # 1. version bump
+                                  # 2. update exports
+                                  # 3. generate bin
+                                  # 4. verify package
+                                  # 5. commit + push
+                                  # 6. publish to NPM
+                                  # 7. offer global CLI update
   yarn build-npm                  # Alias for npm-publish
 
+UPGRADE:
+  yarn upgrade-all                # yarn upgrade + sync template deps
+
 HELP:
   yarn help, h                    # This help
 
@@ -129,7 +138,7 @@ STANDARD DEVELOPMENT WORKFLOW:
   (not required before npm-publish).
 
 AFTER NPM PUBLISH - Update global CLI:
-  npm install -g obsidian-plugin-config@latest
+  npm install -g obsidian-plugin-config@latest --force
   obsidian-inject                 # Test in current plugin dir
   obsidian-inject ../test-plugin --sass
 

package/scripts/inject-core.ts

@@ -282,7 +282,7 @@ export async function cleanOldLintFiles(targetPath: string): Promise<void> {
 /**
  * Inject scripts and config files
  */
-export async function injectScripts(targetPath: string, useSass: boolean = false): Promise<void> {
+export async function injectScripts(targetPath: string): Promise<void> {
   const scriptsPath = path.join(targetPath, "scripts");
 
   if (!await isValidPath(scriptsPath)) {
@@ -708,7 +708,7 @@ export async function performInjection(
   try {
     await cleanNpmArtifactsIfNeeded(targetPath);
     await ensureTsxInstalled(targetPath);
-    await injectScripts(targetPath, useSass);
+    await injectScripts(targetPath);
 
     console.log(`\n📦 Updating package.json...`);
     await updatePackageJson(targetPath, useSass);

package/scripts/update-version-config.ts

@@ -31,7 +31,7 @@ async function getTargetVersion(currentVersion: string): Promise<string> {
     }
 }
 
-async function updateJsonFile(filename: string, updateFn: (json: any) => void): Promise<void> {
+async function updateJsonFile(filename: string, updateFn: (json: Record<string, unknown>) => void): Promise<void> {
     try {
         const content = JSON.parse(await readFile(filename, "utf8"));
         updateFn(content);

package/scripts/utils.ts

@@ -76,17 +76,17 @@ export async function copyFilesToTargetDir(buildPath: string): Promise<void> {
 
   try {
     await mkdir(buildPath, { recursive: true });
-  } catch (error: any) {
-    if (error.code !== "EEXIST") {
-      console.error(`Error creating directory: ${error.message}`);
+  } catch (error: unknown) {
+    if ((error as NodeJS.ErrnoException).code !== "EEXIST") {
+      console.error(`Error creating directory: ${(error as Error).message}`);
     }
   }
 
   // Copy manifest
   try {
     await copyFile(manifestSrc, manifestDest);
-  } catch (error: any) {
-    console.error(`Error copying manifest: ${error.message}`);
+  } catch (error: unknown) {
+    console.error(`Error copying manifest: ${(error as Error).message}`);
   }
 
   // Copy CSS
@@ -107,16 +107,16 @@ export async function copyFilesToTargetDir(buildPath: string): Promise<void> {
     } else {
       return;
     }
-  } catch (error: any) {
-    console.error(`Error copying CSS: ${error.message}`);
+  } catch (error: unknown) {
+    console.error(`Error copying CSS: ${(error as Error).message}`);
   }
 }
 
 export function gitExec(command: string): void {
   try {
     execSync(command, { stdio: "inherit" });
-  } catch (error: any) {
-    console.error(`Error executing '${command}':`, error.message);
+  } catch (error: unknown) {
+    console.error(`Error executing '${command}':`, (error as Error).message);
     throw error;
   }
 }
@@ -141,8 +141,8 @@ export async function ensureGitSync(): Promise<void> {
     } else {
       console.log('✅ Repository is synchronized with remote');
     }
-  } catch (error: any) {
-    console.error(`❌ Git sync failed: ${error.message}`);
+  } catch (error: unknown) {
+    console.error(`❌ Git sync failed: ${(error as Error).message}`);
     throw error;
   }
 }

package/src/main.ts

@@ -1,4 +1,5 @@
-import { App, Plugin, PluginSettingTab, Setting, Notice } from 'obsidian';
+import type { App } from 'obsidian';
+import { Plugin, PluginSettingTab, Setting, Notice } from 'obsidian';
 import { showConfirmModal } from './modals/GenericConfirmModal.ts';
 // import { showTestMessage, getRandomEmoji } from "obsidian-plugin-config/tools";
 
@@ -14,7 +15,7 @@ export default class ObsidianPluginConfigPlugin extends Plugin {
 	settings: MyPluginSettings;
 
 	async onload(): Promise<void> {
-		console.log('Loading obsidian-plugin-config plugin for testing NPM exports');
+		console.debug('Loading obsidian-plugin-config plugin for testing NPM exports');
 		await this.loadSettings();
 
 		this.addCommand({
@@ -51,11 +52,9 @@ export default class ObsidianPluginConfigPlugin extends Plugin {
 			cancelText: 'Annuler',
 			onConfirm: () => {
 				new Notice('Action confirmée !');
-				console.log("Action confirmée par l'utilisateur");
 			},
 			onCancel: () => {
 				new Notice('Action annulée.');
-				console.log("Action annulée par l'utilisateur");
 			}
 		});
 	}

package/src/modals/GenericConfirmModal.ts

@@ -1,4 +1,5 @@
-import { App, Modal } from 'obsidian';
+import type { App } from 'obsidian';
+import { Modal } from 'obsidian';
 
 export interface ConfirmModalOptions {
 	title: string;
@@ -65,3 +66,14 @@ export class GenericConfirmModal extends Modal {
 export function showConfirmModal(app: App, options: ConfirmModalOptions): void {
 	new GenericConfirmModal(app, options).open();
 }
+
+export async function confirmation(app: App, message: string): Promise<boolean> {
+	return new Promise((resolve) => {
+		new GenericConfirmModal(app, {
+			title: 'Confirm',
+			message,
+			onConfirm: () => resolve(true),
+			onCancel: () => resolve(false)
+		}).open();
+	});
+}

package/src/modals/index.ts

@@ -1,3 +1,3 @@
 // Export all modals for easy importing
-export { GenericConfirmModal, showConfirmModal } from './GenericConfirmModal.js';
+export { GenericConfirmModal, showConfirmModal, confirmation } from './GenericConfirmModal.js';
 export type { ConfirmModalOptions } from './GenericConfirmModal.js';

package/templates/.prettierrc

@@ -6,5 +6,14 @@
 	"trailingComma": "none",
 	"semi": true,
 	"singleQuote": true,
-	"arrowParens": "always"
+	"arrowParens": "always",
+	"overrides": [
+		{
+			"files": ["*.json"],
+			"options": {
+				"useTabs": false,
+				"tabWidth": 2
+			}
+		}
+	]
 }

package/templates/eslint.config.mts

@@ -37,7 +37,11 @@ const configs: Linter.Config[] = [
 
       // Useful rules but not too strict
       "semi": "error",
+      "eqeqeq": ["error", "always"],
+      "prefer-const": "error",
       "@typescript-eslint/explicit-function-return-type": ["warn", { "allowExpressions": true }],
+      "@typescript-eslint/no-explicit-any": "warn",
+      "@typescript-eslint/consistent-type-imports": ["warn", { "prefer": "type-imports" }],
 
       // Disable overly strict rules
       "@typescript-eslint/no-unsafe-assignment": "off",

package/versions.json

@@ -39,5 +39,7 @@
 	"1.3.10": "1.8.9",
 	"1.3.11": "1.8.9",
 	"1.3.12": "1.8.9",
-	"1.4.0": "1.8.9"
+	"1.4.0": "1.8.9",
+	"1.4.1": "1.8.9",
+	"1.4.2": "1.8.9"
 }