Skip to content

Commit

Permalink
Merge branch 'next' into infra/scripts/enhance-generate-locales
Browse files Browse the repository at this point in the history
  • Loading branch information
ST-DDT authored Oct 18, 2023
2 parents c487847 + a193693 commit cf5f72e
Show file tree
Hide file tree
Showing 28 changed files with 496 additions and 543 deletions.
12 changes: 7 additions & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,13 @@ module.exports = defineConfig({
// TODO @Shinigami92 2023-09-23: The following rules currently conflict with our code.
// Each rule should be checked whether it should be enabled/configured and the problems fixed, or stay disabled permanently.
'unicorn/better-regex': 'off',
'unicorn/catch-error-name': 'off',
'unicorn/consistent-function-scoping': 'off',
'unicorn/escape-case': 'off',
'unicorn/filename-case': 'off',
'unicorn/import-style': 'off',
'unicorn/no-array-callback-reference': 'off',
'unicorn/no-array-reduce': 'off',
'unicorn/no-await-expression-member': 'off',
'unicorn/no-for-loop': 'off',
'unicorn/no-instanceof-array': 'off',
'unicorn/no-negated-condition': 'off',
'unicorn/no-object-as-default-parameter': 'off',
'unicorn/no-useless-switch-case': 'off',
Expand All @@ -71,14 +68,12 @@ module.exports = defineConfig({
'unicorn/prefer-negative-index': 'off',
'unicorn/prefer-number-properties': 'off',
'unicorn/prefer-optional-catch-binding': 'off',
'unicorn/prefer-spread': 'off',
'unicorn/prefer-string-slice': 'off',
'unicorn/prefer-ternary': 'off',
'unicorn/prefer-top-level-await': 'off',
'unicorn/prevent-abbreviations': 'off',
'unicorn/require-array-join-separator': 'off',
'unicorn/switch-case-braces': 'off',
'unicorn/text-encoding-identifier-case': 'off',

'@typescript-eslint/array-type': [
'error',
Expand Down Expand Up @@ -115,6 +110,7 @@ module.exports = defineConfig({
'error',
{ blankLine: 'always', prev: 'block-like', next: '*' },
],
'@typescript-eslint/prefer-regexp-exec': 'error',
'@typescript-eslint/restrict-template-expressions': [
'error',
{ allowNumber: true, allowBoolean: true },
Expand Down Expand Up @@ -155,6 +151,12 @@ module.exports = defineConfig({
'jsdoc/require-jsdoc': 'error',
},
},
{
files: ['src/locales/**/*.ts'],
rules: {
'unicorn/text-encoding-identifier-case': 'off',
},
},
{
files: ['test/**/*.spec.ts'],
extends: ['plugin:vitest/recommended'],
Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [8.2.0](https://github.com/faker-js/faker/compare/v8.1.0...v8.2.0) (2023-10-14)


### Features

* support custom randomizer ([#2284](https://github.com/faker-js/faker/issues/2284)) ([5410239](https://github.com/faker-js/faker/commit/5410239245b4a6fe8c1976f8aa33c970923f9f40))


### Bug Fixes

* **docs:** revert filter code that breaks search in docs ([#2425](https://github.com/faker-js/faker/issues/2425)) ([c498c09](https://github.com/faker-js/faker/commit/c498c091f488db287684690ab4ff109b1589523f))
* **locale:** Dutch phone number ([#2400](https://github.com/faker-js/faker/issues/2400)) ([005369b](https://github.com/faker-js/faker/commit/005369b29c7ee290a870396ff0acc85e3f715e10))


### New Locales

* **locale:** add airline database science commerce and vehicle for zh_CN ([#2395](https://github.com/faker-js/faker/issues/2395)) ([9c96c0a](https://github.com/faker-js/faker/commit/9c96c0a131e0609a21dc5ee110cc407e76852373))
* **locale:** add street_name to `en_US`, `en_GB` and `en` ([#2371](https://github.com/faker-js/faker/issues/2371)) ([491d319](https://github.com/faker-js/faker/commit/491d3191213e2ceaaee46dcc50ac25c3995ba2d5))
* **locale:** add unionpay credit card for zh_CN ([#2338](https://github.com/faker-js/faker/issues/2338)) ([74eeccc](https://github.com/faker-js/faker/commit/74eecccd3af702d8a1d8072f94032ccb54293cb1))

## [8.1.0](https://github.com/faker-js/faker/compare/v8.0.2...v8.1.0) (2023-09-19)


Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@faker-js/faker",
"version": "8.1.0",
"version": "8.2.0",
"description": "Generate massive amounts of fake contextual data",
"keywords": [
"faker",
Expand Down Expand Up @@ -87,28 +87,28 @@
"preflight": "pnpm install && run-s generate format lint build test:update-snapshots ts-check"
},
"devDependencies": {
"@actions/github": "~5.1.1",
"@actions/github": "~6.0.0",
"@algolia/client-search": "~4.19.1",
"@types/markdown-it": "~13.0.2",
"@types/node": "~20.8.3",
"@types/sanitize-html": "~2.9.1",
"@types/node": "~20.8.6",
"@types/sanitize-html": "~2.9.2",
"@types/semver": "~7.5.3",
"@types/validator": "~13.11.2",
"@typescript-eslint/eslint-plugin": "~6.7.4",
"@typescript-eslint/parser": "~6.7.4",
"@types/validator": "~13.11.3",
"@typescript-eslint/eslint-plugin": "~6.7.5",
"@typescript-eslint/parser": "~6.7.5",
"@vitest/coverage-v8": "~0.34.6",
"@vitest/ui": "~0.34.7",
"@vueuse/core": "~10.5.0",
"conventional-changelog-cli": "~4.1.0",
"cypress": "~13.3.0",
"cypress": "~13.3.1",
"esbuild": "~0.19.4",
"eslint": "~8.51.0",
"eslint-config-prettier": "~9.0.0",
"eslint-define-config": "~1.24.1",
"eslint-gitignore": "~0.1.0",
"eslint-plugin-deprecation": "~2.0.0",
"eslint-plugin-jsdoc": "~46.8.2",
"eslint-plugin-prettier": "~5.0.0",
"eslint-plugin-prettier": "~5.0.1",
"eslint-plugin-unicorn": "~48.0.1",
"eslint-plugin-vitest": "~0.3.2",
"glob": "~10.3.10",
Expand Down
Loading

0 comments on commit cf5f72e

Please sign in to comment.