Skip to content

Commit

Permalink
Merge branch 'next' into fix/en-city-name-locales
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/locales/en_NG/location/index.ts
#	src/locales/en_ZA/location/index.ts
  • Loading branch information
matthewmayer committed May 1, 2023
2 parents 0f924dc + ec1ca12 commit 82781ed
Show file tree
Hide file tree
Showing 523 changed files with 1,293 additions and 1,313 deletions.
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,27 +96,27 @@
"@algolia/client-search": "~4.17.0",
"@types/glob": "~8.1.0",
"@types/markdown-it": "~12.2.3",
"@types/node": "~18.16.0",
"@types/node": "~18.16.3",
"@types/prettier": "~2.7.2",
"@types/react": "~18.0.38",
"@types/react": "~18.2.0",
"@types/sanitize-html": "~2.9.0",
"@types/semver": "~7.3.13",
"@types/validator": "~13.7.15",
"@typescript-eslint/eslint-plugin": "~5.59.0",
"@typescript-eslint/parser": "~5.59.0",
"@typescript-eslint/eslint-plugin": "~5.59.1",
"@typescript-eslint/parser": "~5.59.1",
"@vitest/coverage-c8": "~0.30.1",
"@vitest/ui": "~0.30.1",
"@vueuse/core": "~10.1.0",
"c8": "~7.13.0",
"conventional-changelog-cli": "~2.2.2",
"cypress": "~12.10.0",
"cypress": "~12.11.0",
"esbuild": "~0.17.18",
"eslint": "~8.39.0",
"eslint-config-prettier": "~8.8.0",
"eslint-define-config": "~1.19.0",
"eslint-define-config": "~1.20.0",
"eslint-gitignore": "~0.1.0",
"eslint-plugin-deprecation": "~1.4.1",
"eslint-plugin-jsdoc": "~43.0.7",
"eslint-plugin-jsdoc": "~43.1.1",
"eslint-plugin-prettier": "~4.2.1",
"glob": "~10.2.2",
"npm-run-all": "~4.1.5",
Expand All @@ -129,12 +129,12 @@
"sanitize-html": "~2.10.0",
"semver": "~7.5.0",
"standard-version": "~9.5.0",
"tsx": "~3.12.6",
"tsx": "~3.12.7",
"typedoc": "~0.24.6",
"typescript": "~4.9.5",
"validator": "~13.9.0",
"vite": "~4.3.1",
"vitepress": "1.0.0-alpha.73",
"vite": "~4.3.3",
"vitepress": "1.0.0-alpha.75",
"vitest": "~0.30.1",
"vue": "~3.2.47"
},
Expand Down
Loading

0 comments on commit 82781ed

Please sign in to comment.