Skip to content

Commit

Permalink
Merge branch 'develop' into chore/prettier
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
#	tests/nutripatrol.spec.ts
  • Loading branch information
bengeois committed Nov 1, 2024
2 parents b9e576b + 4921033 commit d47f51d
Show file tree
Hide file tree
Showing 7 changed files with 1,868 additions and 2,230 deletions.
893 changes: 0 additions & 893 deletions .yarn/releases/yarn-4.0.2.cjs

This file was deleted.

934 changes: 934 additions & 0 deletions .yarn/releases/yarn-4.5.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.0.2.cjs
yarnPath: .yarn/releases/yarn-4.5.1.cjs
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
"@jest/globals": "^29.7.0",
"@types/jest": "^29.5.14",
"@types/node": "^22.8.5",
"@typescript-eslint/eslint-plugin": "^7.0.0",
"@typescript-eslint/parser": "^7.8.0",
"eslint": "^9.1.1",
"@typescript-eslint/eslint-plugin": "^8.12.2",
"@typescript-eslint/parser": "^8.12.2",
"eslint": "^9.13.0",
"formdata-node": "^6.0.3",
"globals": "^15.11.0",
"jest": "^29.7.0",
Expand All @@ -77,5 +77,5 @@
"typescript": "^5.6.3",
"typescript-eslint": "^8.12.2"
},
"packageManager": "yarn@4.0.2"
}
"packageManager": "yarn@4.5.1"
}
4 changes: 2 additions & 2 deletions tests/folksonomy.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Folksonomy, FolksonomyTag, FolksonomyKey } from "../src/folksonomy";
import { ApiError } from "../src/error";
import { Folksonomy, FolksonomyTag } from "../src/folksonomy";

describe("Folksonomy Wrapper", () => {
let fetchMock: jest.Mock;
Expand Down Expand Up @@ -32,6 +31,7 @@ describe("Folksonomy Wrapper", () => {
},
},
json: async () => data,
text: async () => JSON.stringify(data),
clone: () => ({ json: async () => data }),
};
};
Expand Down
3 changes: 2 additions & 1 deletion tests/nutripatrol.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Flag, NutriPatrol, Ticket } from "../src/nutripatrol";
import { NutriPatrolError } from "../src/error";
import { Flag, NutriPatrol, Ticket } from "../src/nutripatrol";

describe("NutriPatrol Wrapper", () => {
let fetchMock: jest.Mock;
Expand Down Expand Up @@ -32,6 +32,7 @@ describe("NutriPatrol Wrapper", () => {
},
},
json: async () => data,
text: async () => JSON.stringify(data),
clone: () => ({ json: async () => data }),
};
};
Expand Down
2,252 changes: 924 additions & 1,328 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit d47f51d

Please sign in to comment.