obsidian-plugin-config 1.3.2 → 1.3.5

package/bin/obsidian-inject.js

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

package/package.json

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

package/scripts/inject-core.ts

@@ -97,36 +97,66 @@ export function copyFromLocal(filePath: string): string {
  */
 export async function ensurePluginConfigClean(): Promise<void> {
   const configRoot = findPluginConfigRoot();
+  const gitDir = path.join(configRoot, ".git");
+
+  // Skip git check if not a git repo
+  // (e.g. NPM global install)
+  if (!fs.existsSync(gitDir)) {
+    console.log(
+      `✅ Plugin-config repo is clean` +
+      ` (NPM install, no git check)`
+    );
+    return;
+  }
+
   const originalCwd = process.cwd();
 
   try {
     process.chdir(configRoot);
-    const gitStatus = execSync("git status --porcelain", { encoding: "utf8" }).trim();
+    const gitStatus = execSync(
+      "git status --porcelain",
+      { encoding: "utf8" }
+    ).trim();
 
     if (gitStatus) {
-      console.log(`\n⚠️  Plugin-config has uncommitted changes:`);
+      console.log(
+        `\n⚠️  Plugin-config has uncommitted changes:`
+      );
       console.log(gitStatus);
-      console.log(`\n🔧 Auto-committing changes with yarn bacp...`);
+      console.log(
+        `\n🔧 Auto-committing changes...`
+      );
 
-      const commitMessage = "🔧 Update plugin-config templates and scripts";
+      const msg =
+        "🔧 Update plugin-config templates";
       gitExec("git add -A");
-      gitExec(`git commit -m "${commitMessage}"`);
+      gitExec(`git commit -m "${msg}"`);
 
       try {
-        const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", {
-          encoding: "utf8"
-        }).trim();
-        gitExec(`git push origin ${currentBranch}`);
-        console.log(`✅ Changes committed and pushed successfully`);
+        const branch = execSync(
+          "git rev-parse --abbrev-ref HEAD",
+          { encoding: "utf8" }
+        ).trim();
+        gitExec(`git push origin ${branch}`);
+        console.log(
+          `✅ Changes committed and pushed`
+        );
       } catch {
         try {
-          const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", {
-            encoding: "utf8"
-          }).trim();
-          gitExec(`git push --set-upstream origin ${currentBranch}`);
-          console.log(`✅ New branch pushed with upstream set`);
+          const branch = execSync(
+            "git rev-parse --abbrev-ref HEAD",
+            { encoding: "utf8" }
+          ).trim();
+          gitExec(
+            `git push --set-upstream origin ${branch}`
+          );
+          console.log(
+            `✅ New branch pushed with upstream`
+          );
         } catch {
-          console.log(`⚠️  Changes committed locally but push failed. Continue with injection.`);
+          console.log(
+            `⚠️  Committed locally, push failed`
+          );
         }
       }
     } else {
@@ -263,17 +293,25 @@ export async function injectScripts(targetPath: string, useSass: boolean = false
     "templates/scripts/help.ts"
   ];
 
-  const configFiles = [
-    "templates/tsconfig.json",
-    "templates/.gitignore",
-    "templates/eslint.config.mts",
-    "templates/.vscode/settings.json",
-    "templates/.editorconfig",
-    "templates/.prettierrc",
-    "templates/.npmrc",
-    "templates/.env",
-    "templates/.vscode/tasks.json"
-  ];
+  // Files with .template suffix are renamed by NPM
+  // exclusion rules (.gitignore, .npmrc, .env)
+  // Map: { source: targetName }
+  const configFileMap: Record<string, string> = {
+    "templates/tsconfig.json": "tsconfig.json",
+    "templates/gitignore.template": ".gitignore",
+    "templates/eslint.config.mts": "eslint.config.mts",
+    "templates/.editorconfig": ".editorconfig",
+    "templates/.prettierrc": ".prettierrc",
+    "templates/npmrc.template": ".npmrc",
+    "templates/env.template": ".env",
+  };
+
+  const configVscodeMap: Record<string, string> = {
+    "templates/.vscode/settings.json":
+      ".vscode/settings.json",
+    "templates/.vscode/tasks.json":
+      ".vscode/tasks.json",
+  };
 
   const workflowFiles = [
     "templates/.github/workflows/release.yml",
@@ -294,33 +332,45 @@ export async function injectScripts(targetPath: string, useSass: boolean = false
     }
   }
 
-  console.log(`\n📥 Copying config files from local files...`);
+  console.log(`\n📥 Copying config files...`);
 
-  for (const configFile of configFiles) {
+  // Copy root config files
+  for (const [src, destName] of Object.entries(
+    configFileMap
+  )) {
     try {
-      const content = copyFromLocal(configFile);
-      let targetFile: string;
-      let displayName: string;
-
-      if (configFile.includes(".vscode/")) {
-        const vscodePart = configFile.replace("templates/.vscode/", "");
-        targetFile = path.join(targetPath, ".vscode", vscodePart);
-        displayName = `.vscode/${vscodePart}`;
-      } else {
-        const fileName = path.basename(configFile);
-        targetFile = path.join(targetPath, fileName);
-        displayName = fileName;
-      }
+      const content = copyFromLocal(src);
+      const targetFile = path.join(
+        targetPath, destName
+      );
+      fs.writeFileSync(targetFile, content, "utf8");
+      console.log(`   ✅ ${destName}`);
+    } catch (error) {
+      console.error(
+        `   ❌ Failed to inject ${destName}: ${error}`
+      );
+    }
+  }
 
+  // Copy .vscode config files
+  for (const [src, destName] of Object.entries(
+    configVscodeMap
+  )) {
+    try {
+      const content = copyFromLocal(src);
+      const targetFile = path.join(
+        targetPath, destName
+      );
       const targetDir = path.dirname(targetFile);
       if (!await isValidPath(targetDir)) {
         fs.mkdirSync(targetDir, { recursive: true });
       }
-
       fs.writeFileSync(targetFile, content, "utf8");
-      console.log(`   ✅ ${displayName}`);
+      console.log(`   ✅ ${destName}`);
     } catch (error) {
-      console.error(`   ❌ Failed to inject ${configFile}: ${error}`);
+      console.error(
+        `   ❌ Failed to inject ${destName}: ${error}`
+      );
     }
   }
 

package/templates/env.template

@@ -0,0 +1,10 @@
+# Environment variables for plugin development
+# Update these paths to match your setup
+
+# Path to test vault (for development)
+TEST_VAULT=
+
+# Path to real vault (for production testing)
+REAL_VAULT=
+
+# Note: Run 'yarn version' to update these paths interactively

package/templates/gitignore.template

@@ -0,0 +1,34 @@
+# Intellij
+*.iml
+.idea
+
+# npm
+node_modules
+package-lock.json
+
+# yarn - keep yarn.lock for version consistency
+# yarn.lock
+
+# Don't include the compiled main.js file in the repo.
+# They should be uploaded to GitHub releases instead.
+main.js
+
+# Exclude sourcemaps
+*.map
+
+# obsidian
+data.json
+
+# Exclude macOS Finder (System Explorer) View States
+.DS_Store
+
+# scss result
+main.css
+
+# VSCode - keep settings.json for yarn protection
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+
+# Keep injection info for traceability
+# .injection-info.json should be committed to track injection version

package/templates/npmrc.template

@@ -0,0 +1,2 @@
+# Force yarn usage - prevent npm install accidents
+engine-strict=true

package/versions.json

@@ -28,5 +28,8 @@
 	"1.2.0": "1.8.9",
 	"1.3.0": "1.8.9",
 	"1.3.1": "1.8.9",
-	"1.3.2": "1.8.9"
+	"1.3.2": "1.8.9",
+	"1.3.3": "1.8.9",
+	"1.3.4": "1.8.9",
+	"1.3.5": "1.8.9"
 }