diff --git a/.eslintrc.js b/.eslintrc.js index 3f520fd..1349979 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -10,12 +10,7 @@ module.exports = { sourceType: 'module', }, plugins: ['@typescript-eslint/eslint-plugin'], - extends: [ - 'plugin:@typescript-eslint/eslint-recommended', - 'plugin:@typescript-eslint/recommended', - 'prettier', - 'prettier/@typescript-eslint', - ], + extends: ['plugin:@typescript-eslint/eslint-recommended', 'plugin:@typescript-eslint/recommended', 'prettier'], rules: { '@typescript-eslint/interface-name-prefix': 'off', '@typescript-eslint/explicit-function-return-type': 'off', @@ -24,4 +19,4 @@ module.exports = { '@typescript-eslint/no-use-before-define': 'off', '@typescript-eslint/no-var-requires': 'off', }, -}; +} diff --git a/.prettierrc b/.prettierrc index 92ad44f..1bb5f91 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,6 +3,6 @@ "semi": false, "trailingComma": "all", "tabWidth": 2, - "jsxBracketSameLine": true, + "bracketSameLine": true, "printWidth": 120 } diff --git a/package.json b/package.json index 2fa234a..55c7dee 100644 --- a/package.json +++ b/package.json @@ -44,10 +44,10 @@ "@typescript-eslint/parser": "^2.27.0", "bcryptjs": "^2.4.3", "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.1", + "eslint-config-prettier": "^8.3.0", "eslint-plugin-import": "^2.20.2", "jest": "^25.3.0", - "prettier": "^2.0.4", + "prettier": "^2.4.1", "rimraf": "^3.0.2", "semantic-release": "^17.0.4", "sqlite": "^4.0.6", diff --git a/src/typeorm-seeding.ts b/src/typeorm-seeding.ts index 7c84778..e158568 100644 --- a/src/typeorm-seeding.ts +++ b/src/typeorm-seeding.ts @@ -34,11 +34,13 @@ export const define = (entity: ObjectType, factoryFn: F }) } -export const factory: Factory = (entity: ObjectType) => (context?: Context) => { - const name = getNameOfEntity(entity) - const entityFactoryObject = (global as any).seeder.entityFactories.get(name) - return new EntityFactory(name, entity, entityFactoryObject.factory, context) -} +export const factory: Factory = + (entity: ObjectType) => + (context?: Context) => { + const name = getNameOfEntity(entity) + const entityFactoryObject = (global as any).seeder.entityFactories.get(name) + return new EntityFactory(name, entity, entityFactoryObject.factory, context) + } export const runSeeder = async (clazz: SeederConstructor): Promise => { const seeder: Seeder = new clazz() diff --git a/yarn.lock b/yarn.lock index 6d15e15..83808a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2369,12 +2369,10 @@ escodegen@^1.11.1: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^6.10.1: - version "6.10.1" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.1.tgz#129ef9ec575d5ddc0e269667bf09defcd898642a" - integrity sha512-svTy6zh1ecQojvpbJSgH3aei/Rt7C6i090l5f2WQ4aB05lYHeZIR1qL4wZyyILTbtmnbHP5Yn8MrsOJMGa8RkQ== - dependencies: - get-stdin "^6.0.0" +eslint-config-prettier@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a" + integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew== eslint-import-resolver-node@^0.3.2: version "0.3.3" @@ -2967,11 +2965,6 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-stdin@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" - integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g== - get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" @@ -5917,10 +5910,10 @@ prepend-http@^1.0.1: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= -prettier@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.4.tgz#2d1bae173e355996ee355ec9830a7a1ee05457ef" - integrity sha512-SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w== +prettier@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c" + integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA== pretty-format@^25.2.1, pretty-format@^25.3.0: version "25.3.0"