@ornikar/repo-config 7.2.0 → 7.2.4

package/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.2.4](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@7.2.3...@ornikar/repo-config@7.2.4) (2022-02-10)
+
+**Note:** Version bump only for package @ornikar/repo-config
+
+
+
+
+
+## [7.2.3](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@7.2.2...@ornikar/repo-config@7.2.3) (2022-02-09)
+
+
+### Bug Fixes
+
+* **repo-config:** cd package location [no issue] ([#647](https://github.com/ornikar/shared-configs/issues/647)) ([bbfea60](https://github.com/ornikar/shared-configs/commit/bbfea6042e64cec11deb119699c63e8e330b2e3d))
+
+
+
+
+
+## [7.2.2](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@7.2.1...@ornikar/repo-config@7.2.2) (2022-02-04)
+
+
+### Bug Fixes
+
+* update husky hooks ([74b9498](https://github.com/ornikar/shared-configs/commit/74b94983cc37bc011992ca910f48946b205fae5e))
+
+
+
+
+
+## [7.2.1](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@7.2.0...@ornikar/repo-config@7.2.1) (2022-01-24)
+
+**Note:** Version bump only for package @ornikar/repo-config
+
+
+
+
+
 # [7.2.0](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@7.1.3...@ornikar/repo-config@7.2.0) (2022-01-14)
 
 

package/bin/ornikar-repo-config-postinstall.js

@@ -22,4 +22,4 @@ if (!pm) {
 
 const pkg = JSON.parse(fs.readFileSync(path.resolve('package.json')));
 
-require('../lib/postinstall/install-husky.js')({ pkg, pm });
+require('../lib/postinstall/install-husky')({ pkg, pm });

package/lib/postinstall/install-husky.js

@@ -28,9 +28,13 @@ const ensureHuskyNotInDevDependencies = (pkg) => {
 };
 
 const writeHook = (hookName, hookContent) => {
-  fs.writeFileSync(path.resolve(`.husky/${hookName}`), `${hookContent}\n`, {
-    mode: '755',
-  });
+  fs.writeFileSync(
+    path.resolve(`.husky/${hookName}`),
+    `#!/usr/bin/env sh\n. "$(dirname "$0")/_/husky.sh"\n\n${hookContent.trim()}\n`,
+    {
+      mode: '755',
+    },
+  );
 };
 
 const ensureHookDeleted = (hookName) => {
@@ -97,28 +101,31 @@ module.exports = function installHusky({ pkg, pm }) {
   } else {
     const runYarnInstallOnDiff = `
 if [ -n "$(git diff HEAD@{1}..HEAD@{0} -- yarn.lock)" ]; then
-  ${
+  ${[
     // https://yarnpkg.com/features/zero-installs
     isYarnPnp
       ? ''
       : `yarn install ${
           isYarnBerry ? '--immutable --immutable-cache' : '--prefer-offline --pure-lockfile --ignore-optional'
-        } || true`
-  }
-  ${runCleanCache ? `${pmExec} clean:cache` : ''}
+        } || true`,
+    runCleanCache ? `${pmExec} clean:cache` : '',
+  ]
+    .filter(Boolean)
+    .join('\n  ')}
 fi`;
 
     let postHookContent = runYarnInstallOnDiff;
     const packageLocations = getPackagesLocations(pkg);
 
     packageLocations.forEach((packageLocation) => {
-      const cdToPackageLocation = packageLocation === '.' ? '' : `cd ${packageLocation} && `;
+      const cdToPackageLocation = packageLocation === '.' ? '' : `cd ${packageLocation}`;
+      const cdToRoot = packageLocation === '.' ? '' : `cd ${path.relative(packageLocation, '.')}`;
 
       const gemfilePath = path.join(packageLocation, 'Gemfile.lock');
       if (fs.existsSync(gemfilePath)) {
         postHookContent += `
 if [ -n "$(git diff HEAD@{1}..HEAD@{0} -- ${gemfilePath})" ]; then
-${cdToPackageLocation}bundle install --path vendor/bundle || true
+  ${[cdToPackageLocation, 'bundle install --path vendor/bundle || true', cdToRoot].filter(Boolean).join('\n  ')}
 fi
 `;
       }
@@ -127,7 +134,7 @@ fi
       if (fs.existsSync(podfilePath)) {
         postHookContent += `
 if [ -n "$(git diff HEAD@{1}..HEAD@{0} -- ${podfilePath})" ]; then
-${cdToPackageLocation}yarn pod-install || true
+  ${[cdToPackageLocation, 'yarn pod-install || true', cdToRoot].filter(Boolean).join('\n  ')}
 fi
       `;
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ornikar/repo-config",
-  "version": "7.2.0",
-  "description": "repo config",
+  "version": "7.2.4",
+  "description": "🔧 repo config",
   "repository": "ornikar/shared-configs",
   "license": "ISC",
   "engines": {
@@ -16,14 +16,14 @@
     "ornikar-prettier-fix": "./bin/ornikar-prettier-fix.sh"
   },
   "dependencies": {
-    "@commitlint/cli": "16.0.2",
-    "@ornikar/commitlint-config": "^4.0.2",
+    "@commitlint/cli": "16.1.0",
+    "@ornikar/commitlint-config": "^4.0.3",
     "husky": "7.0.4",
-    "lint-staged": "12.1.7",
+    "lint-staged": "12.3.3",
     "prettier-plugin-properties": "0.1.0",
     "semver": "^7.3.5",
     "which-pm-runs": "^1.0.0",
     "yarn-deduplicate": "3.1.0"
   },
-  "gitHead": "25bc80d21466f7723e2ecc3f1cf089c301e4a3ce"
+  "gitHead": "d9f6369372319663305f0cdafefa8e306f8a138d"
 }