Skip to content

Commit

Permalink
Merge branch 'upgrade.sharp.to.fix.yarn.install' into dependabot/npm_…
Browse files Browse the repository at this point in the history
…and_yarn/jest-29.7.0
  • Loading branch information
josephfrazier committed Jul 16, 2024
2 parents 4d2e304 + 8f68f9a commit 27e98d0
Show file tree
Hide file tree
Showing 9 changed files with 4,767 additions and 4,103 deletions.
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ module.exports = {
// setupFiles: // [array]
// setupTestFrameworkScriptFile: // [string]
// snapshotSerializers: // [array<string>]
// testEnvironment: // [string]
testEnvironment: "jsdom",

Check failure on line 83 in jest.config.js

View workflow job for this annotation

GitHub Actions / lint (20.8.0)

Replace `"jsdom"` with `'jsdom'`
// testMatch: // [array<string>]
// testPathIgnorePatterns: // [array<string>]
// testRegex: // [string]
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"react-toastify": "9.1.3",
"recompose": "^0.26.0",
"serialize-javascript": "^3.1.0",
"sharp": "^0.32.6",
"sharp": "^0.33.4",
"source-map-support": "^0.5.9",
"strftime": "^0.10.0",
"universal-router": "^6.0.0",
Expand All @@ -101,7 +101,7 @@
"@babel/preset-react": "^7.0.0",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^9.0.0",
"babel-jest": "^23.6.0",
"babel-jest": "^29.7.0",
"babel-loader": "^9.1.3",
"babel-plugin-transform-react-remove-prop-types": "^0.4.18",
"browser-sync": "^2.29.3",
Expand All @@ -126,6 +126,7 @@
"glob": "^10.3.3",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-mock-now": "^1.2.0",
"localtunnel": "^1.9.1",
"markdown-it": "^12.3.2",
Expand Down
28 changes: 14 additions & 14 deletions src/__snapshots__/alpr.test.js.snap
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`readLicenseViaALPR falling back to the second token 1`] = `
Object {
"box": Object {
{
"box": {
"xmax": 1842,
"xmin": 1638,
"ymax": 2113,
"ymin": 2009,
},
"candidates": Array [
Object {
"candidates": [
{
"plate": "t736394c",
"score": 0.9,
},
],
"dscore": 0.729,
"plate": "t736394c",
"region": Object {
"region": {
"code": "us-ny",
"score": 0.654,
},
"score": 0.9,
"vehicle": Object {
"box": Object {
"vehicle": {
"box": {
"xmax": 2439,
"xmin": 1258,
"ymax": 2238,
Expand All @@ -35,28 +35,28 @@ Object {
`;

exports[`readLicenseViaALPR using only the first token 1`] = `
Object {
"box": Object {
{
"box": {
"xmax": 1842,
"xmin": 1638,
"ymax": 2113,
"ymin": 2009,
},
"candidates": Array [
Object {
"candidates": [
{
"plate": "t736394c",
"score": 0.9,
},
],
"dscore": 0.729,
"plate": "t736394c",
"region": Object {
"region": {
"code": "us-ny",
"score": 0.654,
},
"score": 0.9,
"vehicle": Object {
"box": Object {
"vehicle": {
"box": {
"xmax": 2439,
"xmin": 1258,
"ymax": 2238,
Expand Down
Loading

0 comments on commit 27e98d0

Please sign in to comment.