@mateoserrano/simple-config 1.1.3 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mateoserrano/simple-config",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "type": "module",
   "private": false,
   "description": "Initialize ESLint, Prettier, Husky and lint-staged for modern TypeScript projects",

package/src/constants.js

@@ -62,11 +62,7 @@ export const devDepFiles = {
     },
   ],
 }
-export const addHuskyPrepare = 'npm pkg set scripts.prepare="husky"'
+export const addHuskyPrepare = 'npm pkg set scripts.prepare="husky init"'
 export const installCmd = (installNames) => `npm install -D ${installNames.join(' ')} --save-exact`
-export const setupHuskyCommand = 'echo "' +
-  '#!/usr/bin/env sh\n' +
-  '. "$(dirname -- "$0")/_/husky.sh"\n\n' +
-  'npx lint-staged"' +
-  '> .husky/pre-commit'
-export const authorizeHuskyCommand = 'chmod +x .husky/pre-commit'
+export const prepareHuskyCommand = 'npx prepare'
+export const setupHuskyCommand = 'npx husky add .husky/pre-commit "npx lint-staged"'

package/src/core/deps.js

@@ -1,4 +1,5 @@
-import { getPackageRoot, moveFromPath } from './utils/index.js'
+import { moveFromPath } from './utils/index.js'
+import { getPackageRoot } from './urls.js'
 import { copyFileToFolderOrSkip } from './files.js'
 
 export const getTemplatesFolder = (templatesRelativePath) => {

package/src/core/urls.js

@@ -0,0 +1,20 @@
+import { fileURLToPath } from 'node:url'
+import { moveFromPath, verifyValidFile } from './utils/files.js'
+
+export function getPackageRoot() {
+  let current = fileURLToPath(new URL('.', import.meta.url))
+
+  while (true) {
+    if (verifyValidFile(moveFromPath(current, 'package.json'))) {
+      return current
+    }
+
+    const parent = moveFromPath(current, '..')
+
+    if (parent === current) {
+      throw new Error('package.json not found')
+    }
+
+    current = parent
+  }
+}

package/src/core/utils/index.js

@@ -1,2 +1 @@
 export * from './files.js'
-export * from './urls.js'

package/src/functions.js

@@ -6,18 +6,19 @@ import {
   verifyNodePackage,
 } from './core/index.js'
 import {
-  addHuskyPrepare, authorizeHuskyCommand,
+  addHuskyPrepare,
   devDepFiles,
   devDeps,
   installCmd,
+  prepareHuskyCommand,
   setupHuskyCommand,
 } from './constants.js'
 
 const runAddPrepareCommand = () => runCommandSilent(addHuskyPrepare)
 const runInstallCommand = (installNames) => runCommandSilent(installCmd(installNames))
 const runHuskyCommand = () => {
+  runCommandSilent(prepareHuskyCommand)
   runCommandSilent(setupHuskyCommand)
-  runCommandSilent(authorizeHuskyCommand)
 }
 const getInstallationArguments = () => getInstallNames(devDeps)
 
@@ -38,6 +39,6 @@ export const configureHusky = () => {
 }
 export const copyConfigurationFiles = () => {
   console.log('Copying configuration files...')
-  const templatesDirectory = getTemplatesFolder('../templates')
+  const templatesDirectory = getTemplatesFolder('templates')
   copyFilesToTargetOrSkip(devDepFiles, templatesDirectory)
 }

package/src/core/utils/urls.js

@@ -1,7 +0,0 @@
-import { fileURLToPath } from 'node:url'
-import { resolve } from "node:path";
-
-export function getPackageRoot() {
-  const currentDir = fileURLToPath(new URL('.', import.meta.url))
-  return resolve(currentDir, '..', '..')
-}