diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index c0308f2..0000000 --- a/.prettierrc +++ /dev/null @@ -1,6 +0,0 @@ -{ - "singleQuote": true, - "trailingComma": "none", - "printWidth": 160, - "bracketSameLine": true -} diff --git a/eslint.config.mjs b/eslint.config.mjs index 4e9f827..ed996a7 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,6 +1,5 @@ // @ts-check import eslint from '@eslint/js'; -import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'; import globals from 'globals'; import tseslint from 'typescript-eslint'; @@ -10,7 +9,6 @@ export default tseslint.config( }, eslint.configs.recommended, ...tseslint.configs.recommendedTypeChecked, - eslintPluginPrettierRecommended, { languageOptions: { globals: { @@ -21,15 +19,14 @@ export default tseslint.config( parserOptions: { projectService: true, tsconfigRootDir: import.meta.dirname, - }, - }, + } + } }, { rules: { '@typescript-eslint/no-explicit-any': 'off', '@typescript-eslint/no-floating-promises': 'warn', - '@typescript-eslint/no-unsafe-argument': 'warn', - "prettier/prettier": ["error", { endOfLine: "auto" }], - }, - }, + '@typescript-eslint/no-unsafe-argument': 'warn' + } + } ); diff --git a/package-lock.json b/package-lock.json index 0e58022..1bca623 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,6 @@ "eslint-plugin-prettier": "^5.2.2", "globals": "^16.0.0", "jest": "^30.0.0", - "prettier": "^3.4.2", "source-map-support": "^0.5.21", "supertest": "^7.0.0", "ts-jest": "^29.2.5", @@ -9009,6 +9008,7 @@ "integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==", "dev": true, "license": "MIT", + "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, diff --git a/package.json b/package.json index 91d5e90..136a9d0 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,6 @@ "eslint-plugin-prettier": "^5.2.2", "globals": "^16.0.0", "jest": "^30.0.0", - "prettier": "^3.4.2", "source-map-support": "^0.5.21", "supertest": "^7.0.0", "ts-jest": "^29.2.5", diff --git a/src/app.module.ts b/src/app.module.ts index b10565f..0f6f586 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -1,9 +1,22 @@ import { Module } from '@nestjs/common'; import { AppController } from './app.controller'; import { MerchantsModule } from './merchants/merchants.module'; +import { TypeOrmModule } from '@nestjs/typeorm'; + +// const config: SqliteConnectionOptions = { +// type: "sqlite", +// database: "../db", +// entities: [Post], +// synchronize: true +// }; @Module({ - imports: [MerchantsModule], + imports: [ + MerchantsModule, + TypeOrmModule.forRoot({ + + }) + ], controllers: [AppController], providers: [] })