build and lint passes

omermorad · omermorad · commit 84be70fed3db · 2025-01-23T14:45:28.000+02:00
diff --git a/.eslintrc b/.eslintrc
@@ -60,7 +60,7 @@
     "import/no-extraneous-dependencies": [
       "error",
       {
-        "devDependencies": [],
+        "devDependencies": true,
         "optionalDependencies": false,
         "peerDependencies": false,
         "packageDir": "./"
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn lint-staged
+pnpm lint-staged
diff --git a/package.json b/package.json
@@ -41,7 +41,6 @@
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-prettier": "^5.0.1",
     "follow-redirects": "1.15.6",
-    "husky": "^8.0.3",
     "ip": "2.0.1",
     "lerna": "^7.3.1",
     "lint-staged": "^14.0.1",
@@ -75,5 +74,8 @@
     "classNameTemplate": "{classname}",
     "titleTemplate": "{title}"
   },
-  "packageManager": "pnpm@9.15.4"
+  "packageManager": "pnpm@9.15.4",
+  "devDependencies": {
+    "husky": "^8.0.3"
+  }
 }
diff --git a/packages/cli/.eslintrc b/packages/cli/.eslintrc
@@ -1,3 +1,6 @@
 {
-  "extends": "../../.eslintrc"
+  "extends": "../../.eslintrc",
+  "ignorePatterns": [
+    "bin/"
+  ]
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -40,7 +40,7 @@
     "build": "tsc -p tsconfig.build.json",
     "build:watch": "tsc -p tsconfig.build.json --watch",
     "tester": "jest --coverage --verbose",
-    "lint": "pnpm eslint '{src,test}/**/*.ts'"
+    "lint": "eslint '{src,test}/**/*.ts'"
   },
   "files": [
     "bin",
diff --git a/packages/cli/src/commands/generate.command.ts b/packages/cli/src/commands/generate.command.ts
@@ -1,5 +1,5 @@
 import { generateSpecification } from '@contractual/generators.spec';
-import { generateContract } from '@contractual/generators.client';
+import { generateContract } from '@contractual/generators.contract';
 import type inquirer from 'inquirer';
 
 export function regenerateContract() {
@@ -8,4 +8,4 @@ export function regenerateContract() {
 
 export function generateSpec(inq: typeof inquirer) {
   return generateSpecification(inq);
-}
+}
diff --git a/packages/cli/tsconfig.build.json b/packages/cli/tsconfig.build.json
@@ -1,9 +1,6 @@
 {
   "extends": "../../tsconfig.build.json",
   "compilerOptions": {
-    "module": "esnext",
-    "moduleResolution": "node",
-    "target": "esnext",
     "rootDir": "src",
     "baseUrl": ".",
     "outDir": "dist",
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
@@ -1,4 +1,3 @@
 {
-  "extends": "../../tsconfig.json",
-  "include": ["test"]
+  "extends": "../../tsconfig.json"
 }
diff --git a/packages/contract/package.json b/packages/contract/package.json
@@ -42,12 +42,11 @@
     "prebuild": "pnpm rimraf dist",
     "build": "exit 0",
     "build:watch": "tsc -p tsconfig.build.json --watch",
-    "test": "pnpm vitest run",
-    "lint": "pnpm eslint '{src,test}/**/*.ts'"
+    "test": "vitest run",
+    "lint": "exit 0"
   },
   "files": [
     "contract",
-    "generator",
     "dist",
     "README.md"
   ],
diff --git a/packages/contract/tsconfig.build.json b/packages/contract/tsconfig.build.json
@@ -4,14 +4,13 @@
     "rootDir": "contract",
     "baseUrl": ".",
     "outDir": "dist",
-    "skipLibCheck": true
-  },
+    "esModuleInterop": true},
   "exclude": [
     "index.ts",
     "contract",
     "dist",
     "node_modules",
-    "__test__/**/*",
+    "test",
     "**/*.spec.ts",
     "jest.config.ts"
   ]
diff --git a/packages/generators/contract/package.json b/packages/generators/contract/package.json
@@ -45,7 +45,7 @@
     "build": "tsc -p tsconfig.build.json",
     "build:watch": "tsc -p tsconfig.build.json --watch",
     "tester": "jest --coverage --verbose",
-    "lint": "pnpm eslint '{src,test}/**/*.ts'"
+    "lint": "eslint '{src,test}/**/*.ts'"
   },
   "files": [
     "client.template.hbs",
diff --git a/packages/generators/diff/package.json b/packages/generators/diff/package.json
@@ -45,7 +45,7 @@
     "build": "tsc -p tsconfig.build.json",
     "test": "pnpm vitest run --watch",
     "build:watch": "tsc -p tsconfig.build.json --watch",
-    "lint": "pnpm eslint '{src,test}/**/*.ts'"
+    "lint": "eslint '{src,test}/**/*.ts'"
   },
   "files": [
     "dist",
@@ -64,6 +64,8 @@
   },
   "devDependencies": {
     "@types/semver": "^7.5.8",
-    "typescript": "~5.7.2"
+    "@vitest/coverage-c8": "^0.33.0",
+    "typescript": "~5.7.2",
+    "vitest": "^3.0.3"
   }
 }
diff --git a/packages/generators/spec/package.json b/packages/generators/spec/package.json
@@ -45,7 +45,7 @@
     "build": "tsc -p tsconfig.build.json",
     "build:watch": "tsc -p tsconfig.build.json --watch",
     "tester": "jest --coverage --verbose",
-    "lint": "pnpm eslint '{src,test}/**/*.ts'"
+    "lint": "eslint '{src,test}/**/*.ts'"
   },
   "files": [
     "dist",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@`
`60`	`60`	`"import/no-extraneous-dependencies": [`
`61`	`61`	`"error",`
`62`	`62`	`{`
`63`		`- "devDependencies": [],`
	`63`	`+ "devDependencies": true,`
`64`	`64`	`"optionalDependencies": false,`
`65`	`65`	`"peerDependencies": false,`
`66`	`66`	`"packageDir": "./"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
`1`	`1`	`{`
`2`		`- "extends": "../../.eslintrc"`
	`2`	`+ "extends": "../../.eslintrc",`
	`3`	`+ "ignorePatterns": [`
	`4`	`+ "bin/"`
	`5`	`+ ]`
`3`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`{`
`2`		`- "extends": "../../tsconfig.json",`
`3`		`- "include": ["test"]`
	`2`	`+ "extends": "../../tsconfig.json"`
`4`	`3`	`}`