obsidian-plugin-config 1.6.18 → 1.7.1

package/.editorconfig

@@ -1,14 +1,9 @@
-# top-most EditorConfig file
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-indent_style = tab
-indent_size = 4
-tab_width = 4
-
-[*.json]
-indent_style = space
-indent_size = 2
+# top-most EditorConfig file
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2

package/.prettierrc

@@ -1,19 +1,10 @@
 {
-	"useTabs": true,
-	"tabWidth": 4,
+	"useTabs": false,
+	"tabWidth": 2,
 	"printWidth": 90,
 	"endOfLine": "lf",
 	"trailingComma": "none",
 	"semi": true,
 	"singleQuote": true,
-	"arrowParens": "always",
-	"overrides": [
-		{
-			"files": ["*.json"],
-			"options": {
-				"useTabs": false,
-				"tabWidth": 2
-			}
-		}
-	]
+	"arrowParens": "always"
 }

package/README.md

@@ -32,10 +32,6 @@ obsidian-inject ../my-plugin
 # Auto-confirms all file replacements (no prompts)
 obsidian-inject ../my-plugin --no
 
-# Inject with SASS support
-# Adds esbuild-sass-plugin dependency and SCSS compilation
-obsidian-inject ../my-plugin --sass
-
 # Verification only (dry-run)
 # Shows what would be injected without making any changes
 obsidian-inject ../my-plugin --dry-run
@@ -47,7 +43,6 @@ obsidian-inject --help
 ## CLI Options
 
 - `--no`, `-n` - Skip confirmation prompts (auto-confirm)
-- `--sass` - Add SASS support (esbuild-sass-plugin)
 - `--dry-run` - Verification only (no changes)
 
 ## What is injected
@@ -61,7 +56,7 @@ obsidian-inject --help
   `.env`, `.vscode/settings.json`, `.vscode/tasks.json`
 - ✅ **GitHub Actions**: release workflow
 - ✅ **Traceability**: `.injection-info.json` (version, date)
-- 🎨 **SASS support**: optional, via `--sass` flag
+- 🎨 **SCSS support**: automatic detection in the injected `esbuild.config.ts`
 
 ## Commands available after injection
 
@@ -89,15 +84,17 @@ yarn upgrade        # Update all dependencies to latest
 
 ## SASS Support
 
-```bash
-obsidian-inject ../my-plugin --sass
-```
+SCSS is detected automatically by the injected `esbuild.config.ts`:
 
-What gets added:
-- ✅ `esbuild-sass-plugin` dependency
 - ✅ Automatic `.scss` detection (`src/styles.scss` priority)
 - ✅ CSS cleanup after compilation
 
+If your plugin uses SCSS, install the plugin once:
+
+```bash
+yarn add -D esbuild-sass-plugin
+```
+
 ## Architecture
 
 Target plugins become **100% standalone** after injection:
@@ -192,7 +189,6 @@ yarn install
 ```bash
 yarn inject-prompt              # Interactive injection
 yarn inject-path ../my-plugin   # Direct injection
-yarn inject ../my-plugin --sass # With SASS support
 yarn check-plugin ../my-plugin  # Dry-run only
 ```
 

package/bin/obsidian-inject.js

@@ -3,7 +3,7 @@
 /**
  * Obsidian Plugin Config - CLI Entry Point
  * Global command: obsidian-inject
- * Version: 1.6.18
+ * Version: 1.7.1
  */
 
 import { execSync } from 'child_process';
@@ -28,19 +28,16 @@ USAGE:
   obsidian-inject                    # Inject in current directory (with confirmation)
   obsidian-inject <path>             # Inject by path (with confirmation)
   obsidian-inject <path> --no        # Inject without confirmation
-  obsidian-inject <path> --sass      # Inject with SASS support
   obsidian-inject --help, -h         # Show this help
 
 OPTIONS:
   --no, -n                           # Skip confirmation prompts (auto-confirm all)
-  --sass                             # Add SASS support (esbuild-sass-plugin)
   --dry-run                          # Verification only (no changes)
 
 EXAMPLES:
   cd my-plugin && obsidian-inject
   obsidian-inject ../my-other-plugin
   obsidian-inject ../my-plugin --no
-  obsidian-inject ../my-plugin --sass
   obsidian-inject "C:\\Users\\dev\\plugins\\my-plugin"
 
 WHAT IS INJECTED:
@@ -49,7 +46,6 @@ WHAT IS INJECTED:
   ✅ Config files (tsconfig, eslint, prettier, vscode, github)
   ✅ Yarn protection enforced
   ✅ Automatic dependency installation
-  🎨 SASS support (with --sass option): esbuild-sass-plugin + SCSS compilation
 
 ARCHITECTURE:
   - Plugin becomes AUTONOMOUS with local scripts
@@ -78,7 +74,6 @@ function main() {
 
   // Parse arguments
   const noConfirm = args.includes('--no') || args.includes('-n');
-  const sassFlag = args.includes('--sass');
   const dryRun = args.includes('--dry-run');
   const pathArg = args.find(arg => !arg.startsWith('-'));
 
@@ -93,7 +88,6 @@ function main() {
 
   console.log(`🎯 Obsidian Plugin Config - Global Injection`);
   console.log(`📁 Target: ${targetPath}`);
-  console.log(`🎨 SASS: ${sassFlag ? 'Enabled' : 'Disabled'}`);
   console.log(`❓ Confirmation: ${noConfirm ? 'Disabled (auto-confirm)' : 'Enabled'}`);
   console.log(`📦 From: ${packageRoot}\n`);
 
@@ -139,7 +133,6 @@ function main() {
     }
 
     // Check if tsx is available locally in target
-    let tsxCommand = 'npx tsx';
     try {
       execSync('npx tsx --version', {
         cwd: targetPath,
@@ -164,10 +157,9 @@ function main() {
     }
 
     // Execute the injection script with tsx
-    const sassOption = sassFlag ? ' --sass' : '';
     const yesOption = noConfirm ? ' --yes' : '';
     const dryRunOption = dryRun ? ' --dry-run' : '';
-    const command = `npx tsx "${injectScriptPath}" "${targetPath}"${yesOption}${sassOption}${dryRunOption}`;
+    const command = `npx tsx "${injectScriptPath}" "${targetPath}"${yesOption}${dryRunOption}`;
 
     execSync(command, {
       stdio: 'inherit',

package/docs/INTERACTIVE_INJECTION.md

@@ -1,137 +1,76 @@
-# Système d'Injection Interactive
+# Injection interactive
 
-## ✅ Fonctionnalité Ajoutée
+L'injection est **interactive par défaut** : elle compare chaque fichier du template
+avec le fichier existant de la cible et ne demande confirmation que lorsque le contenu
+diffère.
 
-Un système de sélection interactive permet maintenant de choisir quels fichiers injecter.
+## Points d'entrée
 
-## Utilisation
-
-### Mode par défaut (tout injecter)
-```bash
-obsidian-inject ../my-plugin
-```
-
-### Mode interactif (choisir quoi injecter)
-```bash
-obsidian-inject ../my-plugin --interactive
-# ou
-obsidian-inject ../my-plugin -i
-```
-
-### Presets rapides
 ```bash
-# Minimal : scripts + package.json + .env
-obsidian-inject ../my-plugin --preset=minimal
-
-# Scripts uniquement
-obsidian-inject ../my-plugin --preset=scripts-only
-
-# Config uniquement (tsconfig, eslint, prettier, etc.)
-obsidian-inject ../my-plugin --preset=config-only
+# CLI globale
+obsidian-inject                 # Injection dans le dossier courant
+obsidian-inject ../my-plugin    # Injection par chemin
+
+# Scripts locaux (développement de ce repo)
+yarn inject-prompt              # Demande le chemin du plugin cible, puis injecte
+yarn inject-path ../my-plugin   # Injection directe par chemin
+yarn check-plugin ../my-plugin  # Dry-run (vérification seule, aucune modification)
 ```
 
-## Options Disponibles
-
-Le mode interactif permet de choisir :
+## Comportement fichier par fichier
 
-1. **scripts** - Scripts (esbuild.config.ts, acp.ts, utils.ts, etc.)
-2. **packageJson** - package.json (scripts & dependencies)
-3. **tsconfig** - tsconfig.json
-4. **eslint** - eslint.config.mts
-5. **prettier** - .prettierrc & .prettierignore
-6. **editorconfig** - .editorconfig
-7. **vscode** - .vscode/ (settings.json, tasks.json, extensions.json)
-8. **github** - .github/workflows/ (release workflow)
-9. **gitignore** - .gitignore
-10. **env** - .env (template)
+Pendant l'injection, chaque fichier est traité ainsi :
 
-## Presets
+- **La cible n'existe pas encore** → le fichier est injecté sans demander.
+- **Contenu identique** → ignoré silencieusement (`✅ ... (unchanged)`).
+- **Contenu différent** → l'outil demande `Update <fichier>? (content differs)`.
+  - `y` → le fichier est remplacé.
+  - `n` → le fichier existant est conservé (`⏭️ Kept existing ...`).
 
-### minimal
-- ✅ scripts
-- ✅ packageJson
-- ✅ env
-- ❌ Tout le reste
+Cas particuliers :
 
-### scripts-only
-- ✅ scripts uniquement
-- ❌ Tout le reste
+- `.env` est toujours **fusionné** : le template est réécrit en préservant les
+  valeurs déjà renseignées (chemins de vault, etc.).
+- `.npmrc` est toujours injecté (protection Yarn).
+- `eslint.config.mts` est approuvé automatiquement si un ancien `.eslintrc*`
+  est détecté (migration depuis l'ancien format).
 
-### config-only
-- ✅ tsconfig
-- ✅ eslint
-- ✅ prettier
-- ✅ editorconfig
-- ✅ vscode
-- ✅ gitignore
-- ❌ scripts, packageJson, github, env
-
-## Exemple d'Utilisation
+## Options
 
 ```bash
-# Lancer en mode interactif
-$ obsidian-inject ../my-plugin -i
-
-🎯 Injection Options
-Select what you want to inject (default: all)
-
-Use default options (inject everything)? [Y/n]: n
-
-📋 Select individual options:
-
-Inject Scripts (esbuild.config.ts, acp.ts, utils.ts, etc.)? [Y/n]: y
-Inject package.json (scripts & dependencies)? [Y/n]: y
-Inject tsconfig.json? [Y/n]: n
-Inject eslint.config.mts? [Y/n]: n
-Inject .prettierrc & .prettierignore? [Y/n]: y
-Inject .editorconfig? [Y/n]: y
-Inject .vscode/ (settings.json, tasks.json, extensions.json)? [Y/n]: y
-Inject .github/workflows/ (release workflow)? [Y/n]: n
-Inject .gitignore? [Y/n]: y
-Inject .env (template)? [Y/n]: y
-
-📋 Selected options:
-   ✅ Scripts (esbuild.config.ts, acp.ts, utils.ts, etc.)
-   ✅ package.json (scripts & dependencies)
-   ❌ tsconfig.json
-   ❌ eslint.config.mts
-   ✅ .prettierrc & .prettierignore
-   ✅ .editorconfig
-   ✅ .vscode/ (settings.json, tasks.json, extensions.json)
-   ❌ .github/workflows/ (release workflow)
-   ✅ .gitignore
-   ✅ .env (template)
-
-Proceed with these options? [Y/n]: y
+# Auto-confirmer tous les remplacements (aucune question)
+obsidian-inject ../my-plugin --no      # CLI globale : --no / -n
+yarn inject-path ../my-plugin --yes    # Scripts locaux : --yes / -y
+
+# Vérification seule (n'écrit rien)
+obsidian-inject ../my-plugin --dry-run
 ```
 
-## Fichiers Modifiés
+| Option           | Effet                                              |
+| ---------------- | -------------------------------------------------- |
+| `--no`, `-n`     | (CLI globale) auto-confirme tous les remplacements |
+| `--yes`, `-y`    | (scripts locaux) auto-confirme tous les remplacements |
+| `--dry-run`      | vérification seule, aucune modification            |
 
-1. **scripts/inject-options.ts** (nouveau) - Gestion des options
-2. **scripts/inject-core.ts** - Ajout paramètre `options` aux fonctions
-3. **scripts/inject-path.ts** - Ajout flags `--interactive` et `--preset`
+## Ce qui est injecté
 
-## Cas d'Usage
+Tous les fichiers du template sont pris en compte à chaque injection (pas de
+sélection par composant) :
 
-### Ne pas écraser esbuild.config.ts existant
-```bash
-obsidian-inject ../my-plugin -i
-# Répondre 'n' à "Inject Scripts"
-```
+- `templates/scripts/*` → `<cible>/scripts/`
+- `templates/tsconfig.json`, `eslint.config.mts`, `.editorconfig`,
+  `.prettierrc`, `.prettierignore`, `.npmrc`, `.env`
+- `templates/.vscode/*`
+- `templates/.github/workflows/*`
+- `templates/gitignore.template` → `<cible>/.gitignore`
 
-### Injecter uniquement les configs
-```bash
-obsidian-inject ../my-plugin --preset=config-only
-```
-
-### Tout sauf GitHub workflows
-```bash
-obsidian-inject ../my-plugin -i
-# Répondre 'n' uniquement à ".github/workflows/"
-```
+La confirmation fichier par fichier permet de conserver un fichier existant
+(par exemple un `esbuild.config.ts` personnalisé) en répondant `n` lorsque la
+question apparaît.
 
-## Notes
+## Fichiers concernés
 
-- Le fichier `.npmrc` est toujours injecté (protection Yarn)
-- En mode non-interactif, tout est injecté par défaut
-- Les options peuvent être combinées : `--interactive --sass`
+1. **scripts/inject-core.ts** — logique d'injection (`diffAndPromptFiles`,
+   `injectScripts`, `updatePackageJson`, `performInjection`).
+2. **scripts/inject-prompt.ts** — entrée interactive (demande le chemin).
+3. **scripts/inject-path.ts** — entrée CLI (parse `--yes`, `--dry-run`).

package/docs/LLM-GUIDE.md

@@ -14,7 +14,6 @@
 
 - `templates/scripts/` — scripts copied into `<target>/scripts/`
 - `templates/package.json` — base deps/scripts merged into `<target>/package.json`
-- `templates/package-sass.json` — additional deps merged when `--sass` flag is used
 - `templates/tsconfig.json` — TypeScript config injected as `<target>/tsconfig.json`
 - `templates/eslint.config.mts` — ESLint config injected into target
 - `templates/.editorconfig`, `templates/.prettierrc`, etc. — config files injected into target
@@ -38,7 +37,7 @@
 
 ### 1. Package.json merge
 
-`inject-core.ts → updatePackageJson()` reads `templates/package.json` (and `templates/package-sass.json` if `--sass`) and merges into the target plugin's `package.json`:
+`inject-core.ts → updatePackageJson()` reads `templates/package.json` and merges into the target plugin's `package.json`:
 
 - All `scripts` are overwritten with template values
 - All `devDependencies` from template are added/updated
@@ -66,22 +65,31 @@ Creates `.injection-info.json` in target with version and date.
 
 Scripts in `templates/scripts/` that get copied to target plugins:
 
-- `esbuild.config.ts` — build configuration (handles SASS automatically)
+**Build system (modular):**
+- `esbuild.config.ts` — build entry point, orchestrates all build modules
+- `constants.ts` — shared constants (external deps list, banner, REST port)
+- `env.ts` — environment validation, manifest check, build path resolution
+- `reload.ts` — Obsidian hot-reload via Local REST API
+- `typingsPlugin.ts` — esbuild plugin for obsidian-typings resolution
+- `utils.ts` — shared utilities (readline, file ops, git, vault path helpers)
+
+**Workflow scripts:**
 - `acp.ts` — add, commit, push workflow
 - `update-version.ts` — version bump utility
 - `release.ts` — GitHub release automation
-- `utils.ts` — shared utilities
 - `help.ts` — help documentation
 
 ---
 
 ## SASS support
 
-When `--sass` flag is used:
+SCSS is handled automatically by the injected `esbuild.config.ts`:
+
+1. The build detects `.scss` files (e.g. `src/styles.scss`)
+2. When found, it dynamically imports `esbuild-sass-plugin` and compiles the SCSS
+3. The generated `main.css` is cleaned up after compilation
 
-1. `templates/package-sass.json` deps are merged into target's `package.json`
-2. Adds `esbuild-sass-plugin` dependency
-3. The injected `esbuild.config.ts` automatically detects `.scss` files and uses the plugin
+The `esbuild-sass-plugin` dependency is **not** injected automatically. If a plugin uses SCSS, install it once with `yarn add -D esbuild-sass-plugin` (the build prints a clear warning if it is missing). Plugins without `.scss` files build normally with no extra dependency.
 
 ---
 
@@ -90,6 +98,7 @@ When `--sass` flag is used:
 - ❌ Do not hardcode deps/scripts in `inject-core.ts` — they must come from `templates/package.json`
 - ❌ Do not modify root config files thinking it will affect injected plugins — always modify `templates/`
 - ❌ Do not add `obsidian-plugin-config` as a dependency in `templates/package.json` — injected plugins are standalone
+- ❌ Do not inject `esbuild.config.ts` without its dependencies (`constants.ts`, `env.ts`, `reload.ts`, `typingsPlugin.ts`, `utils.ts`) — they are all required
 
 ---
 

package/eslint.config.mts

@@ -1,64 +1,63 @@
-import * as typescriptEslintParser from "@typescript-eslint/parser";
-import typescriptEslintPlugin from "@typescript-eslint/eslint-plugin";
-import "eslint-import-resolver-typescript";
-import type {
-  Linter
-} from "eslint";
-
-const configs: Linter.Config[] = [
-  {
-    ignores: [
-      "eslint.config.mts",
-      "templates/**"
-    ]
-  },
-  {
-    files: ["**/*.ts"],
-    ignores: [
-      "dist/**",
-      "node_modules/**",
-      "main.js"
-    ],
-    languageOptions: {
-      parser: typescriptEslintParser,
-      sourceType: "module",
-      parserOptions: {
-        project: "./tsconfig.json",
-        ecmaVersion: 2023
-      }
-    },
-    plugins: {
-      "@typescript-eslint": typescriptEslintPlugin as any // Type assertion to bypass type checking
-    },
-    rules: {
-      // Base rules
-      "no-unused-vars": "off",
-      "@typescript-eslint/no-unused-vars": ["error", { "args": "none", "varsIgnorePattern": "^_" }],
-      "@typescript-eslint/ban-ts-comment": "warn",
-      "no-prototype-builtins": "off",
-      "@typescript-eslint/no-empty-function": "off",
-
-      // 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",
-      "@typescript-eslint/no-unsafe-call": "off",
-      "@typescript-eslint/no-unsafe-member-access": "off",
-      "@typescript-eslint/no-unsafe-argument": "off"
-    }
-  },
-  {
-    files: ["src/**/*.ts"],
-    rules: {
-      "no-console": ["warn", { "allow": ["warn", "error", "debug"] }]
-    }
-  }
-];
-
-export default configs;
+import * as typescriptEslintParser from "@typescript-eslint/parser";
+import typescriptEslintPlugin from "@typescript-eslint/eslint-plugin";
+import "eslint-import-resolver-typescript";
+import type {
+  Linter
+} from "eslint";
+
+const configs: Linter.Config[] = [
+  {
+    ignores: [
+      "eslint.config.mts"
+    ]
+  },
+  {
+    files: ["**/*.ts"],
+    ignores: [
+      "dist/**",
+      "node_modules/**",
+      "main.js"
+    ],
+    languageOptions: {
+      parser: typescriptEslintParser,
+      sourceType: "module",
+      parserOptions: {
+        project: "./tsconfig.json",
+        ecmaVersion: 2023
+      }
+    },
+    plugins: {
+      "@typescript-eslint": typescriptEslintPlugin as any // Type assertion to bypass type checking
+    },
+    rules: {
+      // Base rules
+      "no-unused-vars": "off",
+      "@typescript-eslint/no-unused-vars": ["error", { "args": "none", "varsIgnorePattern": "^_" }],
+      "@typescript-eslint/ban-ts-comment": "warn",
+      "no-prototype-builtins": "off",
+      "@typescript-eslint/no-empty-function": "off",
+
+      // 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",
+      "@typescript-eslint/no-unsafe-call": "off",
+      "@typescript-eslint/no-unsafe-member-access": "off",
+      "@typescript-eslint/no-unsafe-argument": "off"
+    }
+  },
+  {
+    files: ["src/**/*.ts"],
+    rules: {
+      "no-console": ["warn", { "allow": ["warn", "error", "debug"] }]
+    }
+  }
+];
+
+export default configs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-plugin-config",
-  "version": "1.6.18",
+  "version": "1.7.1",
   "description": "Global CLI injection tool for Obsidian plugins",
   "type": "module",
   "bin": {
@@ -20,8 +20,9 @@
     "v": "tsx scripts/update-version-config.ts",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
+    "prettier": "prettier --check '**/*.{ts,json}'",
+    "prettier:fix": "prettier --write '**/*.{ts,json}'",
     "inject-path": "tsx scripts/inject-path.ts",
-    "inject-sass": "tsx scripts/inject-path.ts --sass",
     "inject-prompt": "tsx scripts/inject-prompt.ts",
     "inject": "tsx scripts/inject-prompt.ts",
     "check-plugin": "tsx scripts/inject-path.ts --dry-run",
@@ -31,7 +32,6 @@
   "devDependencies": {
     "@types/eslint": "latest",
     "@types/node": "^22.15.26",
-    "@types/semver": "^7.7.0",
     "@typescript-eslint/eslint-plugin": "^8.58.0",
     "@typescript-eslint/parser": "^8.58.0",
     "dedent": "^1.6.0",
@@ -39,7 +39,6 @@
     "eslint-import-resolver-typescript": "latest",
     "jiti": "latest",
     "prettier": "^3.4.0",
-    "semver": "^7.7.2",
     "tsx": "^4.21.0",
     "typescript": "^5.8.2"
   },