@w5s/eslint-config 1.0.0-alpha.37 → 1.0.0-alpha.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/eslint-config",
-  "version": "1.0.0-alpha.37",
+  "version": "1.0.0-alpha.39",
   "description": "ESLint configuration presets",
   "keywords": [
     "eslint",
@@ -51,7 +51,7 @@
     "@rushstack/eslint-patch": "^1.1.0",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
-    "@w5s/prettier-config": "^1.0.0-alpha.1",
+    "@w5s/prettier-config": "^1.0.2",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.0.0",
     "eslint-plugin-functional": "^4.2.0",
@@ -97,5 +97,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e6b57fb4d5c15057b66ccef776ec225496b012b7"
+  "gitHead": "a0e28715a049dcfffbde753363f3133f69549a28"
 }

package/rules/prettier.js

@@ -1,25 +1,44 @@
 const { error } = require('./_rule.js');
 
-// Try require '@w5s/prettier-config'
-const prettierConfig = (() => {
+const getPackageScope = () => {
   try {
-    // eslint-disable-next-line global-require
-    return require('@w5s/prettier-config');
+    // eslint-disable-next-line global-require, import/no-dynamic-require
+    const { name } = require('../package.json');
+    const prefixMatch = (name || '').match(/(@\w+)\//);
+    const packageScope = prefixMatch ? prefixMatch[1] : undefined;
+    return packageScope;
   } catch (error_) {
     // eslint-disable-next-line no-console
     console.warn(error_);
-    /** @type {import('@w5s/prettier-config')} */
-    const defaultConfig = {
-      trailingComma: 'es5',
-    };
-    return defaultConfig;
+
+    return undefined;
+  }
+};
+const getPrettierConfig = (/** @type {string} */ moduleName) => {
+  try {
+    /** @type {import('prettier').Config} */
+    // eslint-disable-next-line global-require, import/no-dynamic-require
+    const moduleConfig = require(moduleName);
+    return moduleConfig;
+  } catch {
+    return undefined;
   }
-})();
+};
+
+// Try require '@my-organization/prettier-config'
+const getPrettierConfigDefault = () => {
+  /** @type {import('prettier').Config} */
+  const defaultConfig = {
+    trailingComma: 'es5',
+  };
+  const packageScope = getPackageScope();
+  return getPrettierConfig(`${packageScope}/prettier-config`) || defaultConfig;
+};
 
 module.exports = {
   extends: ['prettier'],
   plugins: ['prettier'],
   rules: {
-    'prettier/prettier': [error, prettierConfig],
+    'prettier/prettier': [error, getPrettierConfigDefault()],
   },
 };