Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #598

Merged
merged 43 commits into from
Nov 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
d27e259
feat: Init v1 ingredients
philipbrembeck Oct 27, 2024
54a4920
Merge pull request #572 from frontendnetwork/feat/v1ingredients
philipbrembeck Oct 27, 2024
b45eaf8
feat(ESLint): Use flatConfig (#574)
philipbrembeck Oct 27, 2024
5ee4f16
build(deps-dev): Bump @typescript-eslint/eslint-plugin
dependabot[bot] Oct 29, 2024
0a94827
Merge pull request #576 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Oct 29, 2024
e5c5295
build(deps-dev): Bump @nestjs/schematics from 10.2.2 to 10.2.3
dependabot[bot] Oct 29, 2024
642240c
Merge pull request #578 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Oct 29, 2024
c2132e2
build(deps-dev): Bump @typescript-eslint/parser from 8.11.0 to 8.12.1
dependabot[bot] Oct 29, 2024
69ac6ee
Merge pull request #577 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Oct 29, 2024
58229a6
build(deps-dev): Bump @typescript-eslint/parser from 8.12.1 to 8.12.2
dependabot[bot] Oct 30, 2024
dc07754
Merge pull request #579 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Oct 30, 2024
da91623
build(deps): Bump @nestjs/axios from 3.1.0 to 3.1.1
dependabot[bot] Oct 30, 2024
b322621
Merge pull request #580 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Oct 30, 2024
1c18cbf
build(deps-dev): Bump @types/lodash from 4.17.12 to 4.17.13
dependabot[bot] Oct 30, 2024
abbd6fe
Merge pull request #582 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Oct 30, 2024
1df2415
build(deps-dev): Bump @typescript-eslint/eslint-plugin
dependabot[bot] Oct 30, 2024
fc996b8
Merge pull request #581 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Oct 30, 2024
6766244
build(deps-dev): Bump eslint-plugin-n from 17.11.1 to 17.12.0
dependabot[bot] Oct 31, 2024
4bf810f
Merge pull request #584 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Oct 31, 2024
5774e2f
build(deps-dev): Bump eslint from 9.13.0 to 9.14.0
dependabot[bot] Nov 4, 2024
ea1d422
Merge pull request #585 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Nov 4, 2024
9b58773
build(deps-dev): Bump @nestjs/cli from 10.4.5 to 10.4.7
dependabot[bot] Nov 5, 2024
19fce0e
Merge pull request #586 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Nov 5, 2024
ec5e6bf
build(deps-dev): Bump @typescript-eslint/eslint-plugin
dependabot[bot] Nov 5, 2024
0015506
Merge pull request #587 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Nov 5, 2024
858ca46
build(deps): Bump @nestjs/common from 10.4.6 to 10.4.7
dependabot[bot] Nov 6, 2024
922ebec
Merge pull request #589 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Nov 6, 2024
e196b06
build(deps-dev): Bump @typescript-eslint/parser from 8.12.2 to 8.13.0
dependabot[bot] Nov 6, 2024
26045b5
Merge pull request #588 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Nov 6, 2024
b8ecd3a
build(deps-dev): Bump @nestjs/testing from 10.4.6 to 10.4.7
dependabot[bot] Nov 6, 2024
14fcc0b
Merge pull request #590 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Nov 6, 2024
a61cf04
build(deps): Bump @nestjs/platform-express from 10.4.6 to 10.4.7
dependabot[bot] Nov 6, 2024
c9e5f7a
Merge pull request #591 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Nov 6, 2024
97efe7e
build(deps): Bump @nestjs/core from 10.4.6 to 10.4.7
dependabot[bot] Nov 6, 2024
d765903
Merge pull request #593 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Nov 6, 2024
fabc832
build(deps-dev): Bump eslint-plugin-n from 17.12.0 to 17.13.0
dependabot[bot] Nov 7, 2024
fe3a592
Merge pull request #594 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Nov 7, 2024
d27ce49
build(deps): Bump @nestjs/axios from 3.1.1 to 3.1.2
dependabot[bot] Nov 8, 2024
1b1db15
Merge pull request #595 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Nov 8, 2024
88be93b
build(deps-dev): Bump eslint-plugin-n from 17.13.0 to 17.13.1
dependabot[bot] Nov 8, 2024
ed9f2e8
Merge pull request #596 from frontendnetwork/dependabot/npm_and_yarn/…
kodiakhq[bot] Nov 8, 2024
6e07932
build(deps): Bump @nestjs/swagger from 7.4.2 to 8.0.3 (#597)
dependabot[bot] Nov 9, 2024
785c939
Merge remote-tracking branch 'origin/main' into staging
philipbrembeck Nov 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

14 changes: 0 additions & 14 deletions .eslintrc.js

This file was deleted.

50 changes: 50 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import tsPlugin from "@typescript-eslint/eslint-plugin";
import tsParser from "@typescript-eslint/parser";
import importPlugin from "eslint-plugin-import";

export default [
{
languageOptions: {
ecmaVersion: 2022,
sourceType: "module",
parser: tsParser,
parserOptions: {
project: "./tsconfig.json"
}
},
plugins: {
"@typescript-eslint": tsPlugin,
"import": importPlugin
},
files: ["**/*.{js,ts}"],
ignores: ["dist/**", "**/*.js"],
rules: {
...tsPlugin.configs["recommended"].rules,
"import/order": [
"error",
{
"groups": [
"builtin",
"external",
"internal",
"parent",
"sibling",
"index"
],
"newlines-between": "always",
"alphabetize": {
"order": "asc",
"caseInsensitive": true
}
}
]
},
settings: {
"import/resolver": {
"typescript": {
"alwaysTryTypes": true
}
}
}
}
];
1 change: 0 additions & 1 deletion ismaybenotvegan.json
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,6 @@
"lactoflavin",
"laktoflavin",
"lard",
"lecithin",
"leim",
"leucin",
"leucine",
Expand Down
1 change: 1 addition & 0 deletions isvegan.json
Original file line number Diff line number Diff line change
Expand Up @@ -2837,6 +2837,7 @@
"larcharabinogalactan",
"lavender",
"laver",
"lecithin",
"leek",
"leeks",
"lehua honey",
Expand Down
34 changes: 15 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"start:prod": "node dist/main",
"build": "nest build",
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"get:peta": "node .github/scripts/peta-cron.js",
"test": "jest",
"test:cov": "jest --coverage",
Expand All @@ -22,17 +23,14 @@
"author": "JokeNetwork, Veganify Contributors",
"license": "MIT",
"dependencies": {
"@nestjs/axios": "^3.1.0",
"@nestjs/common": "^10.4.6",
"@nestjs/axios": "^3.1.2",
"@nestjs/common": "^10.4.7",
"@nestjs/config": "^3.3.0",
"@nestjs/core": "^10.4.6",
"@nestjs/platform-express": "^10.4.6",
"@nestjs/swagger": "^7.4.2",
"@nestjs/core": "^10.4.7",
"@nestjs/platform-express": "^10.4.7",
"@nestjs/swagger": "^8.0.3",
"@nestjs/terminus": "^10.2.3",
"@types/axios": "^0.14.4",
"@types/body-parser": "^1.19.5",
"@types/dotenv": "^8.2.3",
"@types/iconv-lite": "^0.0.1",
"@types/ini": "^4.1.1",
"axios": "^1.7.7",
"body-parser": "^1.20.3",
Expand All @@ -51,27 +49,25 @@
"nestjs-pino": "^4.1.0",
"pino": "^9.5.0",
"pino-http": "^10.3.0",
"querystring": "^0.2.1",
"reflect-metadata": "^0.2.2",
"request": "^2.88.2",
"rxjs": "^7.8.1"
},
"devDependencies": {
"@nestjs/cli": "^10.4.5",
"@nestjs/schematics": "^10.2.2",
"@nestjs/testing": "^10.4.6",
"@nestjs/cli": "^10.4.7",
"@nestjs/schematics": "^10.2.3",
"@nestjs/testing": "^10.4.7",
"@types/express": "^5.0.0",
"@types/jest": "^29.5.14",
"@types/js-yaml": "^4.0.9",
"@types/jsdom": "^21.1.7",
"@types/lodash": "^4.17.12",
"@types/lodash": "^4.17.13",
"@types/pump": "^1.1.3",
"@types/request": "^2.48.12",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"eslint": "^8.57.1",
"@typescript-eslint/eslint-plugin": "^8.13.0",
"@typescript-eslint/parser": "^8.13.0",
"eslint": "^9.14.0",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-n": "^17.11.1",
"eslint-plugin-n": "^17.13.1",
"eslint-plugin-promise": "^7.1.0",
"jest": "^29.7.0",
"supertest": "^7.0.0",
Expand Down
Loading
Loading