@ornikar/repo-config 9.0.2 → 10.0.0

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [10.0.0](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@9.0.2...@ornikar/repo-config@10.0.0) (2022-08-17)
+
+
+### chore
+
+* **deps:** update dependency @ornikar/eslint-config to v19 ([#759](https://github.com/ornikar/shared-configs/issues/759)) ([e05eecb](https://github.com/ornikar/shared-configs/commit/e05eecb898d047b44277ce4f65fc724831bb2ece))
+
+
+### Features
+
+* phrase pre-push hook [no issue] ([#763](https://github.com/ornikar/shared-configs/issues/763)) ([9e399ea](https://github.com/ornikar/shared-configs/commit/9e399ea3b84925129bbd3a13e3152349217cec74))
+* **repo-config:** drop yarn-deduplicate [no issue] ([#770](https://github.com/ornikar/shared-configs/issues/770)) ([e26be3e](https://github.com/ornikar/shared-configs/commit/e26be3e72182aea4933a10331a76ef48facbd91e))
+* **repo-config:** only run tsc on pre-commit when ts file changed [no issue] ([#769](https://github.com/ornikar/shared-configs/issues/769)) ([e66fa5b](https://github.com/ornikar/shared-configs/commit/e66fa5be47e8694ead0773db8e62a7a2ab16e7ec))
+
+
+### BREAKING CHANGES
+
+* **repo-config:** drop yarn legacy (v1) support 
+* **deps:** drop node 14 
+
+
+
+
+
 ## [9.0.2](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@9.0.1...@ornikar/repo-config@9.0.2) (2022-08-12)
 
 **Note:** Version bump only for package @ornikar/repo-config

package/createLintStagedConfig.js

@@ -2,7 +2,6 @@
 
 const fs = require('fs');
 const path = require('path');
-const { readYarnConfigFile } = require('./lib/yarn');
 
 // eslint-disable-next-line import/no-dynamic-require
 const pkg = require(path.resolve('package.json'));
@@ -22,7 +21,6 @@ const getSrcDirectories = (srcDirectoryName = 'src') =>
 module.exports = function createLintStagedConfig(options = {}) {
   const srcExtensions = options.srcExtensions || ['js', 'mjs', 'ts'];
   const srcDirectories = getSrcDirectories(options.srcDirectoryName);
-  const yarnConfigFile = readYarnConfigFile();
 
   return {
     [`{yarn.lock,package.json${
@@ -30,19 +28,18 @@ module.exports = function createLintStagedConfig(options = {}) {
     }}`]: (filenames) => {
       const packagejsonFilenames = filenames.filter((filename) => filename.endsWith('.json'));
       return [
-        ...(yarnConfigFile
-          ? ['yarn dedupe']
-          : ['yarn --prefer-offline', 'yarn-deduplicate -s fewer', 'yarn-deduplicate', 'yarn --prefer-offline']),
+        'yarn dedupe',
         packagejsonFilenames.length === 0 ? undefined : `prettier --write ${packagejsonFilenames.join(' ')}`,
         isLernaRepo && require.resolve('@ornikar/lerna-config/bin/generate-eslintrc-files.js'),
         shouldGenerateTsconfigInLernaRepo && require.resolve('@ornikar/lerna-config/bin/generate-tsconfig-files.js'),
         shouldRunCheckPkgScript && 'node ./scripts/check-packagejson.js',
-        `git add yarn.lock${yarnConfigFile ? ' .yarn' : ''}`,
+        'git add yarn.lock .yarn',
       ].filter(Boolean);
     },
     '{.env*,!(package).json,*.{yml,yaml,md,html,env}}': ['prettier --write'],
     [`*.{${srcExtensions.join(',')}}`]: ['prettier --write', 'eslint --fix --quiet'],
     [`{.storybook,${srcDirectories}}/**/*.css`]: ['prettier --parser css --write', 'stylelint --quiet --fix'],
+    [`${srcDirectories}/**/*.{ts,tsx}`]: () => ['tsc'],
   };
 };
 

package/lib/postinstall/install-husky.js

@@ -7,6 +7,7 @@ const path = require('path');
 const husky = require('husky');
 const semver = require('semver');
 const { readYarnConfigFile } = require('../yarn');
+const { phrasePrePush } = require('./phrase-pre-push');
 
 const ensureLegacyHuskyConfigDeleted = () => {
   try {
@@ -81,10 +82,7 @@ module.exports = function installHusky({ pkg, pm }) {
   const pmExec = pm.name === 'npm' ? 'npx --no-install' : pm.name;
 
   writeHook('commit-msg', `${pmExec} commitlint --edit $1`);
-  writeHook(
-    'pre-commit',
-    `${pmExec} ornikar-lint-staged${pkg.devDependencies && pkg.devDependencies.typescript ? ` && ${pmExec} tsc` : ''}`,
-  );
+  writeHook('pre-commit', `${pmExec} ornikar-lint-staged`);
 
   const runCleanCache = shouldRunCleanCacheOnDependenciesChanges();
   if (isYarnPnp && !runCleanCache) {
@@ -154,9 +152,17 @@ fi
   }
 
   if (prePushHook.length > 0) {
+    let prePushHookPostContent = '';
+    const phraseConfigPath = '.phrase.yml';
+    if (fs.existsSync(phraseConfigPath)) {
+      prePushHookPostContent += phrasePrePush;
+    }
+
     writeHook(
       'pre-push',
-      (prePushHookPreCommands ? [...prePushHookPreCommands, ''].join('\n') : '') + prePushHook.join(' && '),
+      (prePushHookPreCommands ? [...prePushHookPreCommands, ''].join('\n') : '') +
+        prePushHook.join(' && ') +
+        prePushHookPostContent,
     );
   } else {
     ensureHookDeleted('pre-push');

package/lib/postinstall/phrase-pre-push.js

@@ -0,0 +1,32 @@
+'use strict';
+
+exports.phrasePrePush = `
+# z40 is the value matching the empty blob/commit/tree SHA (zero x 40)
+z40=0000000000000000000000000000000000000000
+
+while read local_ref local_sha remote_ref remote_sha
+do
+    branch_ref=$(git symbolic-ref HEAD)
+    if [ "$local_ref" = "$branch_ref" ]
+    then
+        if [ "$remote_sha" = $z40 ]
+        then
+            # New branch, examine all commits since first commit
+            range="$local_sha"
+        else
+            # Update to existing branch, examine new commits
+            range="$remote_sha..$local_sha"
+        fi
+
+        # Check for Translations in commit
+        translation=\`git --glob-pathspecs diff "$range" -- "@ornikar/*/translations/**" "@ornikar/*/src/translations/**"\`
+        if [ -n "$translation" ]
+        then
+            branch_name=$(git branch --show-current)
+            echo >&2 "🦜 Found translation(s) in commit in $range"
+            echo >&2 "Pushing $branch_name to Phrase"
+            yarn phrase push
+        fi
+    fi
+done
+`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ornikar/repo-config",
-  "version": "9.0.2",
+  "version": "10.0.0",
   "description": "🔧 repo config",
   "repository": {
     "type": "git",
@@ -9,7 +9,7 @@
   },
   "license": "ISC",
   "engines": {
-    "node": ">=14.17.5"
+    "node": ">=16.16.0"
   },
   "publishConfig": {
     "access": "public"
@@ -23,13 +23,12 @@
   },
   "dependencies": {
     "@commitlint/cli": "17.0.3",
-    "@ornikar/commitlint-config": "^4.1.0",
+    "@ornikar/commitlint-config": "^5.0.0",
     "husky": "8.0.1",
     "lint-staged": "13.0.3",
     "prettier-plugin-properties": "0.1.0",
     "semver": "^7.3.5",
-    "which-pm-runs": "^1.1.0",
-    "yarn-deduplicate": "3.1.0"
+    "which-pm-runs": "^1.1.0"
   },
-  "gitHead": "69634e55540520f3a74f635d74e4b7a491798ebb"
+  "gitHead": "fdf5cc641c6311c60b239dd9f7b77a7adb1c09c5"
 }