@ornikar/repo-config 11.0.0 → 13.0.0

package/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [13.0.0](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@12.0.0...@ornikar/repo-config@13.0.0) (2023-10-25)
+
+
+### ⚠ BREAKING CHANGES
+
+* monorepo-config rename lerna-config to monrepo-config and reduce lerna dependencies [no issue] (#1000)
+
+### Features
+
+* monorepo-config rename lerna-config to monrepo-config and reduce lerna dependencies [no issue] ([#1000](https://github.com/ornikar/shared-configs/issues/1000)) ([63bab23](https://github.com/ornikar/shared-configs/commit/63bab23fb7f9fd2870cbf4259908afa3fe70e9cd))
+
+
+
+## [12.0.0](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@11.0.0...@ornikar/repo-config@12.0.0) (2023-10-18)
+
+
+### ⚠ BREAKING CHANGES
+
+* **repo-config:** automate nvmrc update in repo-config and update to 18.18.2 [no issue] (#993)
+
+### Features
+
+* **repo-config:** automate nvmrc update in repo-config and update to 18.18.2 [no issue] ([#993](https://github.com/ornikar/shared-configs/issues/993)) ([fc02ac8](https://github.com/ornikar/shared-configs/commit/fc02ac8e2db7b641faea1e5b27c4d73fcd9f5114))
+
+
+
 ## [11.0.0](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@10.6.0...@ornikar/repo-config@11.0.0) (2023-09-27)
 
 

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

@@ -4,6 +4,7 @@
 
 const fs = require('node:fs');
 const path = require('node:path');
+const semver = require('semver');
 const whichPmRuns = require('which-pm-runs');
 
 if (!process.env.INIT_CWD) {
@@ -20,6 +21,16 @@ if (!pm) {
   process.exit(1);
 }
 
+const yarnMajorVersion = pm.name === 'yarn' && semver.major(pm.version);
+const isYarnBerry = pm.name === 'yarn' && yarnMajorVersion >= 2;
+
+if (!isYarnBerry) {
+  console.error(`Invalid yarn version used ("${pm.version}"), please update to yarn berry!`);
+  console.error('https://ornikar.atlassian.net/wiki/spaces/TECH/pages/3196223545/How+to+migrate+to+yarn+berry');
+  process.exit(1);
+}
+
 const pkg = JSON.parse(fs.readFileSync(path.resolve('package.json')));
 
-require('../lib/postinstall/install-husky')({ pkg, pm });
+require('../lib/postinstall/install-husky')({ pkg });
+require('../lib/postinstall/update-nvmrc')();

package/createLintStagedConfig.js

@@ -32,8 +32,9 @@ module.exports = function createLintStagedConfig(options = {}) {
       return [
         'yarn dedupe',
         packagejsonFilenames.length === 0 ? undefined : `prettier --write ${packagejsonFilenames.join(' ')}`,
-        isLernaRepo && require.resolve('@ornikar/lerna-config/bin/generate-eslintrc-files.mjs'),
-        shouldGenerateTsconfigInLernaRepo && require.resolve('@ornikar/lerna-config/bin/generate-tsconfig-files.mjs'),
+        isLernaRepo && require.resolve('@ornikar/monorepo-config/bin/generate-eslintrc-files.mjs'),
+        shouldGenerateTsconfigInLernaRepo &&
+          require.resolve('@ornikar/monorepo-config/bin/generate-tsconfig-files.mjs'),
         shouldRunCheckPkgJSScript && 'node ./scripts/check-packagejson.js',
         shouldRunCheckPkgMJSScript && 'node ./scripts/check-packagejson.mjs',
         'git add yarn.lock .yarn',

package/lib/.nvmrc

@@ -0,0 +1 @@
+18.18.2

package/lib/postinstall/install-husky.js

@@ -5,7 +5,6 @@
 const fs = require('node:fs');
 const path = require('node:path');
 const husky = require('husky');
-const semver = require('semver');
 const { readYarnConfigFile } = require('../yarn');
 const { phrasePrePush } = require('./phrase-pre-push');
 
@@ -50,16 +49,14 @@ const getPackagesLocations = (pkg) => {
   const isMonorepo = !!pkg.workspaces;
 
   if (!isMonorepo) return ['.'];
-  // eslint-disable-next-line import/no-extraneous-dependencies, global-require
-  const { getSyncPackageLocations } = require('@ornikar/lerna-config');
-  const packageLocations = getSyncPackageLocations(pkg.workspaces);
+  // eslint-disable-next-line global-require, import/no-extraneous-dependencies
+  const { getSyncPackageLocations } = require('@ornikar/monorepo-config');
+  const packageLocations = getSyncPackageLocations({ pkg });
   return ['.', ...packageLocations];
 };
 
-module.exports = function installHusky({ pkg, pm }) {
-  const yarnMajorVersion = pm.name === 'yarn' && semver.major(pm.version);
-  const isYarnBerry = pm.name === 'yarn' && yarnMajorVersion >= 2;
-  const isYarnPnp = isYarnBerry && !readYarnConfigFile().includes('nodeLinker: node-modules');
+module.exports = function installHusky({ pkg }) {
+  const isYarnPnp = !readYarnConfigFile().includes('nodeLinker: node-modules');
 
   /* Check legacy */
 
@@ -79,17 +76,15 @@ module.exports = function installHusky({ pkg, pm }) {
     // if the directory already exists, continue
   }
 
-  const pmExec = pm.name === 'npm' ? 'npx --no-install' : pm.name;
-
-  writeHook('commit-msg', `${pmExec} commitlint --edit $1`);
+  writeHook('commit-msg', 'yarn commitlint --edit $1');
   writeHook(
     'pre-commit',
     `
 if [ ! -f node_modules/.bin/ornikar-lint-staged ]; then
-  ${pmExec}
+  yarn
 fi
 
-${pmExec} ornikar-lint-staged
+yarn ornikar-lint-staged
   `,
   );
 
@@ -103,12 +98,8 @@ ${pmExec} ornikar-lint-staged
 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:on-dependencies-changes` : '',
+    isYarnPnp ? '' : 'yarn install --immutable --immutable-cache || true',
+    runCleanCache ? 'yarn clean:cache:on-dependencies-changes' : '',
   ]
     .filter(Boolean)
     .join('\n  ')}
@@ -149,19 +140,19 @@ fi
 
   if (shouldRunTest()) {
     if (pkg.scripts.test === 'node --test') {
-      prePushHook.push(`CI=true ${pm.name} test`);
+      prePushHook.push('CI=true yarn test');
     } else {
       prePushHookPreCommands.push(
         '# autodetect main branch (usually master or main)',
         'mainBranch=$(LANG=en_US git remote show origin | grep "HEAD branch" | cut -d\' \' -f5)',
         '',
       );
-      prePushHook.push(`CI=true ${pm.name} test --changedSince=origin/$mainBranch`);
+      prePushHook.push('CI=true yarn test --changedSince=origin/$mainBranch');
     }
   }
 
   if (shouldRunChecks()) {
-    prePushHook.push(`${pm.name} run checks`);
+    prePushHook.push('yarn run checks');
   }
 
   if (prePushHook.length > 0) {

package/lib/postinstall/update-nvmrc.js

@@ -0,0 +1,12 @@
+'use strict';
+
+const fs = require('node:fs');
+const path = require('node:path');
+
+module.exports = function updateNvmrc() {
+  const nvmrcContent = fs.readFileSync(path.resolve(__dirname, '../.nvmrc'), 'utf8');
+
+  fs.writeFileSync(path.resolve('.nvmrc'), `${nvmrcContent.trim()}\n`, {
+    mode: '644',
+  });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ornikar/repo-config",
-  "version": "11.0.0",
+  "version": "13.0.0",
   "description": "🔧 repo config",
   "repository": {
     "directory": "@ornikar/repo-config",
@@ -22,7 +22,7 @@
     "ornikar-repo-config-postinstall": "./bin/ornikar-repo-config-postinstall.js"
   },
   "dependencies": {
-    "@commitlint/cli": "17.7.1",
+    "@commitlint/cli": "17.8.0",
     "@ornikar/commitlint-config": "6.0.0",
     "husky": "8.0.3",
     "lint-staged": "13.3.0",
@@ -32,6 +32,5 @@
   },
   "scripts": {
     "lint:eslint": "yarn ../.. eslint --report-unused-disable-directives --quiet @ornikar/repo-config"
-  },
-  "gitHead": "73a88449f791b3153ac71460f397eecb47a3ac18"
-}
+  }
+}