@ornikar/repo-config 7.2.5 → 7.3.2

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.3.2](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@7.3.1...@ornikar/repo-config@7.3.2) (2022-03-08)
+
+**Note:** Version bump only for package @ornikar/repo-config
+
+
+
+
+
+## [7.3.1](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@7.3.0...@ornikar/repo-config@7.3.1) (2022-03-01)
+
+
+### Bug Fixes
+
+* use node to run check-packagejson script ([00a8219](https://github.com/ornikar/shared-configs/commit/00a8219761232c84bddc98124038a489f04d7e2c))
+
+
+
+
+
+# [7.3.0](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@7.2.5...@ornikar/repo-config@7.3.0) (2022-02-24)
+
+
+### Features
+
+* add check packagejson script to lint staged config [no issue] ([#658](https://github.com/ornikar/shared-configs/issues/658)) ([e362c15](https://github.com/ornikar/shared-configs/commit/e362c1511f5155557a19a53f0e97d2e21ab39a67))
+
+
+
+
+
 ## [7.2.5](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@7.2.4...@ornikar/repo-config@7.2.5) (2022-02-14)
 
 **Note:** Version bump only for package @ornikar/repo-config

package/createLintStagedConfig.js

@@ -1,6 +1,8 @@
 'use strict';
 
+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'));
@@ -8,6 +10,7 @@ const workspaces = pkg.workspaces || false;
 const isLernaRepo = Boolean(pkg.devDependencies && pkg.devDependencies.lerna);
 const hasTypescript = Boolean(pkg.devDependencies && pkg.devDependencies.typescript);
 const shouldGenerateTsconfigInLernaRepo = isLernaRepo && hasTypescript;
+const shouldRunCheckPkgScript = fs.existsSync('./scripts/check-packagejson.js');
 
 const getSrcDirectories = (srcDirectoryName = 'src') =>
   workspaces
@@ -19,6 +22,7 @@ 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${
@@ -26,13 +30,13 @@ module.exports = function createLintStagedConfig(options = {}) {
     }}`]: (filenames) => {
       const packagejsonFilenames = filenames.filter((filename) => filename.endsWith('.json'));
       return [
-        'yarn --prefer-offline',
-        'yarn-deduplicate -s fewer',
-        'yarn-deduplicate',
-        'yarn --prefer-offline',
+        ...(yarnConfigFile
+          ? ['yarn dedupe']
+          : ['yarn --prefer-offline', 'yarn-deduplicate -s fewer', 'yarn-deduplicate', 'yarn --prefer-offline']),
         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',
       ].filter(Boolean);
     },
     '!(package).json': ['prettier --write'],

package/lib/postinstall/install-husky.js

@@ -7,6 +7,7 @@ const fs = require('fs');
 const path = require('path');
 const husky = require('husky');
 const semver = require('semver');
+const { readYarnConfigFile } = require('../yarn');
 
 const ensureLegacyHuskyConfigDeleted = () => {
   try {
@@ -45,14 +46,6 @@ const ensureHookDeleted = (hookName) => {
   }
 };
 
-const readYarnConfigFile = () => {
-  try {
-    return fs.readFileSync(path.resolve('.yarnrc.yml'));
-  } catch {
-    return '';
-  }
-};
-
 const getPackagesLocations = (pkg) => {
   const isMonorepo = !!pkg.workspaces;
 

package/lib/yarn.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+const readYarnConfigFile = () => {
+  try {
+    return fs.readFileSync(path.resolve('.yarnrc.yml'));
+  } catch {
+    return '';
+  }
+};
+
+exports.readYarnConfigFile = readYarnConfigFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ornikar/repo-config",
-  "version": "7.2.5",
+  "version": "7.3.2",
   "description": "🔧 repo config",
   "repository": "ornikar/shared-configs",
   "license": "ISC",
@@ -11,9 +11,9 @@
     "access": "public"
   },
   "bin": {
-    "ornikar-repo-config-postinstall": "./bin/ornikar-repo-config-postinstall.js",
     "ornikar-prettier-check": "./bin/ornikar-prettier-check.sh",
-    "ornikar-prettier-fix": "./bin/ornikar-prettier-fix.sh"
+    "ornikar-prettier-fix": "./bin/ornikar-prettier-fix.sh",
+    "ornikar-repo-config-postinstall": "./bin/ornikar-repo-config-postinstall.js"
   },
   "dependencies": {
     "@commitlint/cli": "16.2.1",
@@ -25,5 +25,5 @@
     "which-pm-runs": "^1.0.0",
     "yarn-deduplicate": "3.1.0"
   },
-  "gitHead": "c0af7e67575a58362718865a4ca78dffadc2da3f"
+  "gitHead": "d436e7c9e103d89eba6c89c881659f501f9b08be"
 }