Merge pull request #47 from ChoTotOSS/infra/change-structures-deps

infra: change structures deps
ChoTotOSS · Sep 14, 2023 · 80c796b · 80c796b
2 parents c595bab + 2ca3014
commit 80c796b
Show file tree

Hide file tree

Showing 11 changed files with 666 additions and 694 deletions.
diff --git a/.changeset/gorgeous-llamas-sparkle.md b/.changeset/gorgeous-llamas-sparkle.md
@@ -0,0 +1,6 @@
+---
+'@chotot/eslint-config-base': minor
+'@chotot/eslint-config-next': minor
+---
+
+change structures, chotot-next depends on chotot-base
diff --git a/packages/eslint-config-bare/CHANGELOG.md → packages/eslint-config-base/CHANGELOG.md b/packages/eslint-config-bare/CHANGELOG.md → packages/eslint-config-base/CHANGELOG.md
diff --git a/packages/eslint-config-bare/package.json → packages/eslint-config-base/package.json b/packages/eslint-config-bare/package.json → packages/eslint-config-base/package.json
@@ -1,16 +1,16 @@
 {
-  "name": "@chotot/eslint-config-bare",
+  "name": "@chotot/eslint-config-base",
   "version": "1.3.1",
   "description": "Chotot's ESLint config for Typescript/Javascript application",
-  "main": "index.js",
+  "main": "src/index.js",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/ChoTotOSS/chotot-web-standards",
-    "directory": "packages/eslint-config-bare"
+    "directory": "packages/eslint-config-base"
   },
   "files": [
-    "index.js"
+    "src"
   ],
   "peerDependencies": {
     "eslint": "^7.23.0 || ^8.0.0",
@@ -22,12 +22,11 @@
     }
   },
   "dependencies": {
-    "@rushstack/eslint-patch": "1.3.2",
-    "@typescript-eslint/eslint-plugin": "5.62.0",
-    "@typescript-eslint/parser": "5.62.0",
-    "eslint-import-resolver-node": "0.3.7",
-    "eslint-import-resolver-typescript": "3.5.5",
-    "eslint-plugin-import": "2.27.5",
-    "@chotot/eslint-ruleset": "workspace:*"
+    "@rushstack/eslint-patch": "^1.3.2",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
+    "eslint-import-resolver-node": "^0.3.7",
+    "eslint-import-resolver-typescript": "^3.5.5",
+    "eslint-plugin-import": "^2.27.5"
   }
 }
diff --git a/packages/eslint-config-bare/index.js → packages/eslint-config-base/src/index.js b/packages/eslint-config-bare/index.js → packages/eslint-config-base/src/index.js
@@ -6,7 +6,7 @@ const {
   eslintBuiltInRules,
   importPluginRules,
   typescriptEslintPluginRules,
-} = require('@chotot/eslint-ruleset');
+} = require('./rulesets');
 
 module.exports = {
   root: true,

diff --git a/packages/eslint-ruleset/src/index.js → packages/eslint-config-base/src/rulesets.js b/packages/eslint-ruleset/src/index.js → packages/eslint-config-base/src/rulesets.js
diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -2,18 +2,19 @@
   "name": "@chotot/eslint-config-next",
   "version": "1.4.1",
   "description": "Chotot's ESLint config for Next.js application",
-  "main": "index.js",
+  "main": "src/index.js",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/ChoTotOSS/chotot-web-standards",
     "directory": "packages/eslint-config-next"
   },
   "files": [
-    "index.js"
+    "src"
   ],
   "dependencies": {
     "@chotot/eslint-plugin-chotot": "workspace:*",
+    "@chotot/eslint-config-base": "workspace:*",
     "@typescript-eslint/eslint-plugin": "5.62.0",
     "eslint-config-next": "13.4.8",
     "@chotot/eslint-ruleset": "workspace:*"

diff --git a/packages/eslint-config-next/index.js → packages/eslint-config-next/src/index.js b/packages/eslint-config-next/index.js → packages/eslint-config-next/src/index.js
@@ -2,12 +2,15 @@ const {
   chototPluginRules,
   eslintBuiltInRules,
   importPluginRules,
+  typescriptEslintPluginRules,
+} = require('@chotot/eslint-config-base');
+
+const {
   reactJSXA11yPluginRules,
   reactPluginRules,
   reactHooksPluginRules,
   nextPluginRules,
-  typescriptEslintPluginRules
-} = require('@chotot/eslint-ruleset');
+} = require('./rulesets');
 
 /* eslint-env node */
 module.exports = {
@@ -28,7 +31,7 @@ module.exports = {
     ...reactJSXA11yPluginRules,
     ...reactPluginRules,
     ...reactHooksPluginRules,
-    ...nextPluginRules
+    ...nextPluginRules,
   },
   overrides: [
     {
@@ -37,7 +40,7 @@ module.exports = {
         project: ['./tsconfig.json'], // Specify it only for TypeScript files
       },
       rules: {
-        ...typescriptEslintPluginRules
+        ...typescriptEslintPluginRules,
       },
     },
   ],