diff --git a/.github/labeler.yml b/.github/labeler.yml index c4f309c..c03fbb0 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -9,9 +9,9 @@ PACKAGE: packages/** "Hiker's Book UI": ui/hikers-book/** '@hikers-book/cli-tools': packages/cli-tools/** '@hikers-book/config': packages/config/** -'@hikers-book/config-jest': packages/config-jest/** '@hikers-book/cryptography': packages/cryptography/** -'@hikers-book/eslint-config': packages/eslint-config/** +'@hikers-book/eslint-config': packages/eslint/** +'@hikers-book/jest': packages/jest/** '@hikers-book/tsed-swagger': packages/tsed-swagger/** ci: .github/** diff --git a/api/authentication/jest.config.ts b/api/authentication/jest.config.ts index e5a28b8..0c2d236 100644 --- a/api/authentication/jest.config.ts +++ b/api/authentication/jest.config.ts @@ -1,4 +1,4 @@ -import sharedConfig from '@hikers-book/config-jest/api'; +import sharedConfig from '@hikers-book/jest/api'; export default { ...sharedConfig, diff --git a/api/authentication/package.json b/api/authentication/package.json index a4f2dbd..7e9ae24 100644 --- a/api/authentication/package.json +++ b/api/authentication/package.json @@ -63,8 +63,8 @@ "devDependencies": { "@hikers-book/cli-tools": "workspace:*", "@hikers-book/config": "workspace:*", - "@hikers-book/config-jest": "workspace:*", "@hikers-book/eslint-config": "workspace:*", + "@hikers-book/jest": "workspace:*", "@tsed/cli-plugin-eslint": "4.6.4", "@tsed/cli-plugin-jest": "4.6.4", "@tsed/cli-plugin-mongoose": "4.6.4", diff --git a/api/graphql/jest.config.ts b/api/graphql/jest.config.ts index e5a28b8..0c2d236 100644 --- a/api/graphql/jest.config.ts +++ b/api/graphql/jest.config.ts @@ -1,4 +1,4 @@ -import sharedConfig from '@hikers-book/config-jest/api'; +import sharedConfig from '@hikers-book/jest/api'; export default { ...sharedConfig, diff --git a/api/graphql/package.json b/api/graphql/package.json index cd6b5ac..020765f 100644 --- a/api/graphql/package.json +++ b/api/graphql/package.json @@ -67,8 +67,8 @@ "devDependencies": { "@hikers-book/cli-tools": "workspace:*", "@hikers-book/config": "workspace:*", - "@hikers-book/config-jest": "workspace:*", "@hikers-book/eslint-config": "workspace:*", + "@hikers-book/jest": "workspace:*", "@tsed/apollo": "^7.36.8", "@tsed/cli-plugin-eslint": "4.6.4", "@tsed/cli-plugin-jest": "4.6.4", diff --git a/api/stages/jest.config.ts b/api/stages/jest.config.ts index e5a28b8..0c2d236 100644 --- a/api/stages/jest.config.ts +++ b/api/stages/jest.config.ts @@ -1,4 +1,4 @@ -import sharedConfig from '@hikers-book/config-jest/api'; +import sharedConfig from '@hikers-book/jest/api'; export default { ...sharedConfig, diff --git a/api/stages/package.json b/api/stages/package.json index 84252d7..af2275f 100644 --- a/api/stages/package.json +++ b/api/stages/package.json @@ -62,8 +62,8 @@ "devDependencies": { "@hikers-book/cli-tools": "workspace:*", "@hikers-book/config": "workspace:*", - "@hikers-book/config-jest": "workspace:*", "@hikers-book/eslint-config": "workspace:*", + "@hikers-book/jest": "workspace:*", "@tsed/cli-plugin-eslint": "4.6.4", "@tsed/cli-plugin-jest": "4.6.4", "@tsed/cli-plugin-mongoose": "4.6.4", diff --git a/api/trips/jest.config.ts b/api/trips/jest.config.ts index e5a28b8..0c2d236 100644 --- a/api/trips/jest.config.ts +++ b/api/trips/jest.config.ts @@ -1,4 +1,4 @@ -import sharedConfig from '@hikers-book/config-jest/api'; +import sharedConfig from '@hikers-book/jest/api'; export default { ...sharedConfig, diff --git a/api/trips/package.json b/api/trips/package.json index 40ff643..075528a 100644 --- a/api/trips/package.json +++ b/api/trips/package.json @@ -62,8 +62,8 @@ "devDependencies": { "@hikers-book/cli-tools": "workspace:*", "@hikers-book/config": "workspace:*", - "@hikers-book/config-jest": "workspace:*", "@hikers-book/eslint-config": "workspace:*", + "@hikers-book/jest": "workspace:*", "@tsed/cli-plugin-eslint": "4.6.4", "@tsed/cli-plugin-jest": "4.6.4", "@tsed/cli-plugin-mongoose": "4.6.4", diff --git a/packages/cryptography/jest.config.ts b/packages/cryptography/jest.config.ts index a01dec0..e6011b6 100644 --- a/packages/cryptography/jest.config.ts +++ b/packages/cryptography/jest.config.ts @@ -1,4 +1,4 @@ -import sharedConfig from '@hikers-book/config-jest/api'; +import sharedConfig from '@hikers-book/jest/api'; export default { ...sharedConfig diff --git a/packages/cryptography/package.json b/packages/cryptography/package.json index 26e0e30..4c8064f 100644 --- a/packages/cryptography/package.json +++ b/packages/cryptography/package.json @@ -19,8 +19,8 @@ "cross-env": "^7.0.3" }, "devDependencies": { - "@hikers-book/config-jest": "workspace:*", "@hikers-book/eslint-config": "workspace:*", + "@hikers-book/jest": "workspace:*", "@types/jest": "^29.5.5", "@types/node": "^20.5.7", "jest": "^29.7.0", diff --git a/packages/eslint/Readme.md b/packages/eslint/Readme.md new file mode 100644 index 0000000..fa6b994 --- /dev/null +++ b/packages/eslint/Readme.md @@ -0,0 +1,5 @@ +# @hikers-book/eslint-config + +Package name must stay `@hikers-book/eslint-config`! + +[Docs](https://eslint.org/docs/latest/extend/shareable-configs#creating-a-shareable-config) \ No newline at end of file diff --git a/packages/eslint-config/index.js b/packages/eslint/index.js similarity index 100% rename from packages/eslint-config/index.js rename to packages/eslint/index.js diff --git a/packages/eslint-config/package.json b/packages/eslint/package.json similarity index 100% rename from packages/eslint-config/package.json rename to packages/eslint/package.json diff --git a/packages/eslint-config/prettier.js b/packages/eslint/prettier.js similarity index 100% rename from packages/eslint-config/prettier.js rename to packages/eslint/prettier.js diff --git a/packages/config-jest/api.ts b/packages/jest/api.ts similarity index 100% rename from packages/config-jest/api.ts rename to packages/jest/api.ts diff --git a/packages/config-jest/package.json b/packages/jest/package.json similarity index 88% rename from packages/config-jest/package.json rename to packages/jest/package.json index 296dc95..90598bc 100644 --- a/packages/config-jest/package.json +++ b/packages/jest/package.json @@ -1,5 +1,5 @@ { - "name": "@hikers-book/config-jest", + "name": "@hikers-book/jest", "version": "0.7.0", "description": "Jest config for Hiker's Book", "exports": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8d2f7d4..b510ac3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -135,12 +135,12 @@ importers: '@hikers-book/config': specifier: workspace:* version: link:../../packages/config - '@hikers-book/config-jest': - specifier: workspace:* - version: link:../../packages/config-jest '@hikers-book/eslint-config': specifier: workspace:* - version: link:../../packages/eslint-config + version: link:../../packages/eslint + '@hikers-book/jest': + specifier: workspace:* + version: link:../../packages/jest '@tsed/cli-plugin-eslint': specifier: 4.6.4 version: 4.6.4 @@ -349,12 +349,12 @@ importers: '@hikers-book/config': specifier: workspace:* version: link:../../packages/config - '@hikers-book/config-jest': - specifier: workspace:* - version: link:../../packages/config-jest '@hikers-book/eslint-config': specifier: workspace:* - version: link:../../packages/eslint-config + version: link:../../packages/eslint + '@hikers-book/jest': + specifier: workspace:* + version: link:../../packages/jest '@tsed/apollo': specifier: ^7.36.8 version: 7.36.8(@tsed/common@7.36.8)(@tsed/core@7.36.8)(@tsed/di@7.36.8)(@tsed/logger@6.6.3)(apollo-datasource-rest@3.7.0)(apollo-datasource@3.3.2)(apollo-server-core@3.12.1)(graphql@15.8.0) @@ -560,12 +560,12 @@ importers: '@hikers-book/config': specifier: workspace:* version: link:../../packages/config - '@hikers-book/config-jest': - specifier: workspace:* - version: link:../../packages/config-jest '@hikers-book/eslint-config': specifier: workspace:* - version: link:../../packages/eslint-config + version: link:../../packages/eslint + '@hikers-book/jest': + specifier: workspace:* + version: link:../../packages/jest '@tsed/cli-plugin-eslint': specifier: 4.6.4 version: 4.6.4 @@ -759,12 +759,12 @@ importers: '@hikers-book/config': specifier: workspace:* version: link:../../packages/config - '@hikers-book/config-jest': - specifier: workspace:* - version: link:../../packages/config-jest '@hikers-book/eslint-config': specifier: workspace:* - version: link:../../packages/eslint-config + version: link:../../packages/eslint + '@hikers-book/jest': + specifier: workspace:* + version: link:../../packages/jest '@tsed/cli-plugin-eslint': specifier: 4.6.4 version: 4.6.4 @@ -855,7 +855,7 @@ importers: devDependencies: '@hikers-book/eslint-config': specifier: workspace:* - version: link:../eslint-config + version: link:../eslint '@types/node': specifier: ^20.5.7 version: 20.5.7 @@ -869,12 +869,6 @@ importers: specifier: workspace:* version: link:../cli-tools - packages/config-jest: - devDependencies: - '@jest/types': - specifier: ^29.6.3 - version: 29.6.3 - packages/cryptography: dependencies: argon2: @@ -887,12 +881,12 @@ importers: specifier: ^7.0.3 version: 7.0.3 devDependencies: - '@hikers-book/config-jest': - specifier: workspace:* - version: link:../config-jest '@hikers-book/eslint-config': specifier: workspace:* - version: link:../eslint-config + version: link:../eslint + '@hikers-book/jest': + specifier: workspace:* + version: link:../jest '@types/jest': specifier: ^29.5.5 version: 29.5.5 @@ -909,7 +903,7 @@ importers: specifier: ^5.2.2 version: 5.2.2 - packages/eslint-config: + packages/eslint: dependencies: '@typescript-eslint/eslint-plugin': specifier: ^6.5.0 @@ -940,6 +934,12 @@ importers: specifier: ^3.2.3 version: 3.2.3(prettier@3.0.3)(typescript@5.2.2) + packages/jest: + devDependencies: + '@jest/types': + specifier: ^29.6.3 + version: 29.6.3 + packages/tsed-swagger: dependencies: '@tsed/openspec': @@ -951,7 +951,7 @@ importers: devDependencies: '@hikers-book/eslint-config': specifier: workspace:* - version: link:../eslint-config + version: link:../eslint '@types/node': specifier: ^20.5.7 version: 20.5.7 @@ -1069,7 +1069,7 @@ importers: version: link:../../packages/config '@hikers-book/eslint-config': specifier: workspace:* - version: link:../../packages/eslint-config + version: link:../../packages/eslint '@types/jasmine': specifier: ~4.3.0 version: 4.3.6 @@ -4197,11 +4197,6 @@ packages: eslint: 8.48.0 eslint-visitor-keys: 3.4.3 - /@eslint-community/regexpp@4.5.1: - resolution: {integrity: sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==} - engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - dev: false - /@eslint-community/regexpp@4.8.0: resolution: {integrity: sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} @@ -7946,7 +7941,7 @@ packages: typescript: optional: true dependencies: - '@eslint-community/regexpp': 4.5.1 + '@eslint-community/regexpp': 4.8.0 '@typescript-eslint/parser': 6.5.0(eslint@8.48.0)(typescript@5.2.2) '@typescript-eslint/scope-manager': 6.5.0 '@typescript-eslint/type-utils': 6.5.0(eslint@8.48.0)(typescript@5.2.2) @@ -8165,7 +8160,7 @@ packages: engines: {node: ^16.0.0 || >=18.0.0} dependencies: '@typescript-eslint/types': 6.5.0 - eslint-visitor-keys: 3.4.1 + eslint-visitor-keys: 3.4.3 dev: false /@vitejs/plugin-basic-ssl@1.0.1(vite@4.4.7): @@ -9041,7 +9036,7 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.2.0 - es-abstract: 1.21.2 + es-abstract: 1.22.1 get-intrinsic: 1.2.1 is-string: 1.0.7 dev: false @@ -9067,7 +9062,7 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.2.0 - es-abstract: 1.21.2 + es-abstract: 1.22.1 es-shim-unscopables: 1.0.0 dev: false @@ -9077,7 +9072,7 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.2.0 - es-abstract: 1.21.2 + es-abstract: 1.22.1 es-shim-unscopables: 1.0.0 dev: false @@ -10961,45 +10956,6 @@ packages: dependencies: is-arrayish: 0.2.1 - /es-abstract@1.21.2: - resolution: {integrity: sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==} - engines: {node: '>= 0.4'} - dependencies: - array-buffer-byte-length: 1.0.0 - available-typed-arrays: 1.0.5 - call-bind: 1.0.2 - es-set-tostringtag: 2.0.1 - es-to-primitive: 1.2.1 - function.prototype.name: 1.1.5 - get-intrinsic: 1.2.1 - get-symbol-description: 1.0.0 - globalthis: 1.0.3 - gopd: 1.0.1 - has: 1.0.3 - has-property-descriptors: 1.0.0 - has-proto: 1.0.1 - has-symbols: 1.0.3 - internal-slot: 1.0.5 - is-array-buffer: 3.0.2 - is-callable: 1.2.7 - is-negative-zero: 2.0.2 - is-regex: 1.1.4 - is-shared-array-buffer: 1.0.2 - is-string: 1.0.7 - is-typed-array: 1.1.10 - is-weakref: 1.0.2 - object-inspect: 1.12.3 - object-keys: 1.1.1 - object.assign: 4.1.4 - regexp.prototype.flags: 1.5.0 - safe-regex-test: 1.0.0 - string.prototype.trim: 1.2.7 - string.prototype.trimend: 1.0.6 - string.prototype.trimstart: 1.0.6 - typed-array-length: 1.0.4 - unbox-primitive: 1.0.2 - which-typed-array: 1.1.9 - /es-abstract@1.22.1: resolution: {integrity: sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==} engines: {node: '>= 0.4'} @@ -11212,7 +11168,7 @@ packages: eslint-plugin-import: 2.28.1(@typescript-eslint/parser@6.5.0)(eslint-import-resolver-typescript@3.6.0)(eslint@8.48.0) fast-glob: 3.3.1 get-tsconfig: 4.6.2 - is-core-module: 2.12.1 + is-core-module: 2.13.0 is-glob: 4.0.3 transitivePeerDependencies: - '@typescript-eslint/parser' @@ -11322,11 +11278,6 @@ packages: esrecurse: 4.3.0 estraverse: 5.3.0 - /eslint-visitor-keys@3.4.1: - resolution: {integrity: sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dev: false - /eslint-visitor-keys@3.4.3: resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -12874,12 +12825,6 @@ packages: ci-info: 2.0.0 dev: true - /is-core-module@2.12.1: - resolution: {integrity: sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==} - dependencies: - has: 1.0.3 - dev: false - /is-core-module@2.13.0: resolution: {integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==} dependencies: @@ -15183,7 +15128,7 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.2.0 - es-abstract: 1.21.2 + es-abstract: 1.22.1 dev: false /object.getownpropertydescriptors@2.1.6: @@ -15212,7 +15157,7 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.2.0 - es-abstract: 1.21.2 + es-abstract: 1.22.1 dev: false /obuf@1.1.2: @@ -16879,7 +16824,7 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.2.0 - es-abstract: 1.21.2 + es-abstract: 1.22.1 /string.prototype.trimstart@1.0.6: resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==} @@ -18168,17 +18113,6 @@ packages: gopd: 1.0.1 has-tostringtag: 1.0.0 - /which-typed-array@1.1.9: - resolution: {integrity: sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==} - engines: {node: '>= 0.4'} - dependencies: - available-typed-arrays: 1.0.5 - call-bind: 1.0.2 - for-each: 0.3.3 - gopd: 1.0.1 - has-tostringtag: 1.0.0 - is-typed-array: 1.1.10 - /which@1.3.1: resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==} hasBin: true