diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index dd84ea782..b5c68e55b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -4,7 +4,6 @@ about: Create a report to help us improve title: '' labels: '' assignees: '' - --- **Describe the bug** @@ -12,6 +11,7 @@ A clear and concise description of what the bug is. **To Reproduce** Steps to reproduce the behavior: + 1. Go to '...' 2. Click on '....' 3. Scroll down to '....' @@ -24,15 +24,17 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **Desktop (please complete the following information):** - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] - - Version [e.g. 22] + +- OS: [e.g. iOS] +- Browser [e.g. chrome, safari] +- Version [e.g. 22] **Smartphone (please complete the following information):** - - Device: [e.g. iPhone6] - - OS: [e.g. iOS8.1] - - Browser [e.g. stock browser, safari] - - Version [e.g. 22] + +- Device: [e.g. iPhone6] +- OS: [e.g. iOS8.1] +- Browser [e.g. stock browser, safari] +- Version [e.g. 22] **Additional context** Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md index 48d5f81fa..96a47352a 100644 --- a/.github/ISSUE_TEMPLATE/custom.md +++ b/.github/ISSUE_TEMPLATE/custom.md @@ -4,7 +4,4 @@ about: Describe this issue template's purpose here. title: '' labels: '' assignees: '' - --- - - diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index bbcbbe7d6..2f28cead0 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -4,7 +4,6 @@ about: Suggest an idea for this project title: '' labels: '' assignees: '' - --- **Is your feature request related to a problem? Please describe.** diff --git a/.github/renovate.json b/.github/renovate.json index 4865bd9ac..c4d5c7beb 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,5 +1,5 @@ { - "enabledManagers": [ "github-actions", "npm"], + "enabledManagers": ["github-actions", "npm"], "extends": ["config:base", ":combinePatchMinorReleases"], "assignees": ["team:console"], "assigneesSampleSize": 1, diff --git a/.prettierignore b/.prettierignore index d3abefcb3..be84c79a0 100644 --- a/.prettierignore +++ b/.prettierignore @@ -4,3 +4,4 @@ dist/ # Specific to prettier package.json +CHANGELOG.md \ No newline at end of file diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 7d70b9fd5..daa97f4e4 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,22 +14,22 @@ appearance, race, religion, or sexual identity and orientation. Examples of behavior that contributes to creating a positive environment include: -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members +- Using welcoming and inclusive language +- Being respectful of differing viewpoints and experiences +- Gracefully accepting constructive criticism +- Focusing on what is best for the community +- Showing empathy towards other community members Examples of unacceptable behavior by participants include: -* The use of sexualized language or imagery and unwelcome sexual attention or - advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting +- The use of sexualized language or imagery and unwelcome sexual attention or + advances +- Trolling, insulting/derogatory comments, and personal or political attacks +- Public or private harassment +- Publishing others' private information, such as a physical or electronic + address, without explicit permission +- Other conduct which could reasonably be considered inappropriate in a + professional setting ## Our Responsibilities diff --git a/README.md b/README.md index de571da63..7deac1610 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ scaleway-lib is a set of NPM packages used at Scaleway. ![npm](https://img.shields.io/npm/v/@scaleway/use-query-params) - [`@scaleway/use-segment`](./packages/use-segment/README.md): - A tiny hooks to handle segment events. + A tiny hooks to handle segment events. ![npm](https://img.shields.io/npm/dm/@scaleway/use-segment) ![npm bundle size](https://img.shields.io/bundlephobia/min/@scaleway/use-segment) diff --git a/babel.config.json b/babel.config.json index d3063d30c..35c8aec47 100644 --- a/babel.config.json +++ b/babel.config.json @@ -1,4 +1,8 @@ { - "presets": ["@babel/preset-env", "@babel/preset-react", ["@babel/preset-typescript", { "allowDeclareFields": true }]], + "presets": [ + "@babel/preset-env", + "@babel/preset-react", + ["@babel/preset-typescript", { "allowDeclareFields": true }] + ], "plugins": ["@babel/plugin-transform-runtime"] } diff --git a/package.json b/package.json index 30d28c746..edfd50679 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "build": "lerna exec --stream --ignore @scaleway/eslint-config-react --ignore @scaleway/countries -- rollup -c ../../rollup.config.mjs", "build:profile": "cross-env PROFILE=true pnpm run build", "commit": "npx git-cz -a", + "format": "prettier --write '**/*.{ts,tsx,js,json,md,mdx}'", "test": "TZ=UTC jest", "test:watch": "pnpm run test -- --watch", "test:coverage": "pnpm run test -- --coverage", @@ -56,9 +57,15 @@ ] }, "lint-staged": { - "*.js": [ + "*.(j|t)s?(x)": [ "prettier --write", "eslint --fix" + ], + "*.json": [ + "prettier --write" + ], + "*.mdx": [ + "prettier --write" ] }, "config": { diff --git a/packages/countries/README.md b/packages/countries/README.md index 5f59ae34b..b7de2b537 100644 --- a/packages/countries/README.md +++ b/packages/countries/README.md @@ -28,6 +28,7 @@ console.log(frenchSubdivisions) // => [{ "code": "FR-01", "country_code": "FR", This package is generated manually from a pypi library [pycountry](https://pypi.org/project/pycountry/) To update the database, first make sure that you have: + - [python](https://www.python.org) >= 3.0 - [poetry](https://python-poetry.org) >= 1.0 diff --git a/packages/countries/countries.d.ts b/packages/countries/countries.d.ts index a21199e89..bd41a7581 100644 --- a/packages/countries/countries.d.ts +++ b/packages/countries/countries.d.ts @@ -1 +1,239 @@ -export type AvailableCountries = 'AF' | 'AX' | 'AL' | 'DZ' | 'AS' | 'AD' | 'AO' | 'AI' | 'AG' | 'AR' | 'AM' | 'AW' | 'AU' | 'AT' | 'AZ' | 'BS' | 'BH' | 'BD' | 'BB' | 'BY' | 'BE' | 'BZ' | 'BJ' | 'BM' | 'BT' | 'BO' | 'BA' | 'BW' | 'BR' | 'IO' | 'BN' | 'BG' | 'BF' | 'BI' | 'KH' | 'CM' | 'CA' | 'CV' | 'KY' | 'CF' | 'TD' | 'CL' | 'CN' | 'CX' | 'CC' | 'CO' | 'KM' | 'CG' | 'CD' | 'CK' | 'CR' | 'CI' | 'HR' | 'CU' | 'CY' | 'CZ' | 'DK' | 'DJ' | 'DM' | 'DO' | 'EC' | 'EG' | 'SV' | 'GQ' | 'ER' | 'EE' | 'ET' | 'FK' | 'FO' | 'FJ' | 'FI' | 'FR' | 'GF' | 'PF' | 'GA' | 'GM' | 'GE' | 'DE' | 'GH' | 'GI' | 'GR' | 'GL' | 'GD' | 'GP' | 'GU' | 'GT' | 'GG' | 'GN' | 'GW' | 'GY' | 'HT' | 'VA' | 'HN' | 'HK' | 'HU' | 'IS' | 'IN' | 'ID' | 'IR' | 'IQ' | 'IE' | 'IM' | 'IL' | 'IT' | 'JM' | 'JP' | 'JE' | 'JO' | 'KZ' | 'KE' | 'KI' | 'KP' | 'KR' | 'KW' | 'KG' | 'LA' | 'LV' | 'LB' | 'LS' | 'LR' | 'LY' | 'LI' | 'LT' | 'LU' | 'MO' | 'MK' | 'MG' | 'MW' | 'MY' | 'MV' | 'ML' | 'MT' | 'MH' | 'MQ' | 'MR' | 'MU' | 'YT' | 'MX' | 'FM' | 'MD' | 'MC' | 'MN' | 'ME' | 'MS' | 'MA' | 'MZ' | 'MM' | 'NA' | 'NR' | 'NP' | 'NL' | 'NC' | 'NZ' | 'NI' | 'NE' | 'NG' | 'NU' | 'NF' | 'MP' | 'NO' | 'OM' | 'PK' | 'PW' | 'PS' | 'PA' | 'PG' | 'PY' | 'PE' | 'PH' | 'PL' | 'PT' | 'PR' | 'QA' | 'RO' | 'RU' | 'RW' | 'RE' | 'BL' | 'SH' | 'KN' | 'LC' | 'MF' | 'PM' | 'VC' | 'WS' | 'SM' | 'ST' | 'SA' | 'SN' | 'RS' | 'SC' | 'SL' | 'SG' | 'SK' | 'SI' | 'SB' | 'SO' | 'ZA' | 'SS' | 'ES' | 'LK' | 'SD' | 'SR' | 'SJ' | 'SZ' | 'SE' | 'CH' | 'SY' | 'TW' | 'TJ' | 'TZ' | 'TH' | 'TL' | 'TG' | 'TK' | 'TO' | 'TT' | 'TN' | 'TR' | 'TM' | 'TC' | 'TV' | 'UG' | 'UA' | 'AE' | 'GB' | 'US' | 'UY' | 'UZ' | 'VU' | 'VE' | 'VN' | 'VG' | 'VI' | 'WF' | 'YE' | 'ZM' | 'ZW' +export type AvailableCountries = + | 'AF' + | 'AX' + | 'AL' + | 'DZ' + | 'AS' + | 'AD' + | 'AO' + | 'AI' + | 'AG' + | 'AR' + | 'AM' + | 'AW' + | 'AU' + | 'AT' + | 'AZ' + | 'BS' + | 'BH' + | 'BD' + | 'BB' + | 'BY' + | 'BE' + | 'BZ' + | 'BJ' + | 'BM' + | 'BT' + | 'BO' + | 'BA' + | 'BW' + | 'BR' + | 'IO' + | 'BN' + | 'BG' + | 'BF' + | 'BI' + | 'KH' + | 'CM' + | 'CA' + | 'CV' + | 'KY' + | 'CF' + | 'TD' + | 'CL' + | 'CN' + | 'CX' + | 'CC' + | 'CO' + | 'KM' + | 'CG' + | 'CD' + | 'CK' + | 'CR' + | 'CI' + | 'HR' + | 'CU' + | 'CY' + | 'CZ' + | 'DK' + | 'DJ' + | 'DM' + | 'DO' + | 'EC' + | 'EG' + | 'SV' + | 'GQ' + | 'ER' + | 'EE' + | 'ET' + | 'FK' + | 'FO' + | 'FJ' + | 'FI' + | 'FR' + | 'GF' + | 'PF' + | 'GA' + | 'GM' + | 'GE' + | 'DE' + | 'GH' + | 'GI' + | 'GR' + | 'GL' + | 'GD' + | 'GP' + | 'GU' + | 'GT' + | 'GG' + | 'GN' + | 'GW' + | 'GY' + | 'HT' + | 'VA' + | 'HN' + | 'HK' + | 'HU' + | 'IS' + | 'IN' + | 'ID' + | 'IR' + | 'IQ' + | 'IE' + | 'IM' + | 'IL' + | 'IT' + | 'JM' + | 'JP' + | 'JE' + | 'JO' + | 'KZ' + | 'KE' + | 'KI' + | 'KP' + | 'KR' + | 'KW' + | 'KG' + | 'LA' + | 'LV' + | 'LB' + | 'LS' + | 'LR' + | 'LY' + | 'LI' + | 'LT' + | 'LU' + | 'MO' + | 'MK' + | 'MG' + | 'MW' + | 'MY' + | 'MV' + | 'ML' + | 'MT' + | 'MH' + | 'MQ' + | 'MR' + | 'MU' + | 'YT' + | 'MX' + | 'FM' + | 'MD' + | 'MC' + | 'MN' + | 'ME' + | 'MS' + | 'MA' + | 'MZ' + | 'MM' + | 'NA' + | 'NR' + | 'NP' + | 'NL' + | 'NC' + | 'NZ' + | 'NI' + | 'NE' + | 'NG' + | 'NU' + | 'NF' + | 'MP' + | 'NO' + | 'OM' + | 'PK' + | 'PW' + | 'PS' + | 'PA' + | 'PG' + | 'PY' + | 'PE' + | 'PH' + | 'PL' + | 'PT' + | 'PR' + | 'QA' + | 'RO' + | 'RU' + | 'RW' + | 'RE' + | 'BL' + | 'SH' + | 'KN' + | 'LC' + | 'MF' + | 'PM' + | 'VC' + | 'WS' + | 'SM' + | 'ST' + | 'SA' + | 'SN' + | 'RS' + | 'SC' + | 'SL' + | 'SG' + | 'SK' + | 'SI' + | 'SB' + | 'SO' + | 'ZA' + | 'SS' + | 'ES' + | 'LK' + | 'SD' + | 'SR' + | 'SJ' + | 'SZ' + | 'SE' + | 'CH' + | 'SY' + | 'TW' + | 'TJ' + | 'TZ' + | 'TH' + | 'TL' + | 'TG' + | 'TK' + | 'TO' + | 'TT' + | 'TN' + | 'TR' + | 'TM' + | 'TC' + | 'TV' + | 'UG' + | 'UA' + | 'AE' + | 'GB' + | 'US' + | 'UY' + | 'UZ' + | 'VU' + | 'VE' + | 'VN' + | 'VG' + | 'VI' + | 'WF' + | 'YE' + | 'ZM' + | 'ZW' diff --git a/packages/countries/subdivisions/AD.json b/packages/countries/subdivisions/AD.json index 85a6a1024..762713a90 100644 --- a/packages/countries/subdivisions/AD.json +++ b/packages/countries/subdivisions/AD.json @@ -48,4 +48,4 @@ "parent_code": null, "type": "Parish" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/AE.json b/packages/countries/subdivisions/AE.json index ca30841f6..557990bbc 100644 --- a/packages/countries/subdivisions/AE.json +++ b/packages/countries/subdivisions/AE.json @@ -48,4 +48,4 @@ "parent_code": null, "type": "Emirate" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/AF.json b/packages/countries/subdivisions/AF.json index 0a6b6e685..4a4f5938c 100644 --- a/packages/countries/subdivisions/AF.json +++ b/packages/countries/subdivisions/AF.json @@ -237,4 +237,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/AG.json b/packages/countries/subdivisions/AG.json index 0cb87368d..f5c596932 100644 --- a/packages/countries/subdivisions/AG.json +++ b/packages/countries/subdivisions/AG.json @@ -55,4 +55,4 @@ "parent_code": null, "type": "Dependency" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/AL.json b/packages/countries/subdivisions/AL.json index db77f8c1a..65ce63f2c 100644 --- a/packages/countries/subdivisions/AL.json +++ b/packages/countries/subdivisions/AL.json @@ -335,4 +335,4 @@ "parent_code": "AL-12", "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/AM.json b/packages/countries/subdivisions/AM.json index 8d98d742e..94f277736 100644 --- a/packages/countries/subdivisions/AM.json +++ b/packages/countries/subdivisions/AM.json @@ -76,4 +76,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/AO.json b/packages/countries/subdivisions/AO.json index 37be22f82..804dfbecf 100644 --- a/packages/countries/subdivisions/AO.json +++ b/packages/countries/subdivisions/AO.json @@ -125,4 +125,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/AR.json b/packages/countries/subdivisions/AR.json index 51fa21109..2032d9f92 100644 --- a/packages/countries/subdivisions/AR.json +++ b/packages/countries/subdivisions/AR.json @@ -160,4 +160,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/AT.json b/packages/countries/subdivisions/AT.json index 1899f49fc..50e87de93 100644 --- a/packages/countries/subdivisions/AT.json +++ b/packages/countries/subdivisions/AT.json @@ -62,4 +62,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/AU.json b/packages/countries/subdivisions/AU.json index 1ade71df8..d1935b524 100644 --- a/packages/countries/subdivisions/AU.json +++ b/packages/countries/subdivisions/AU.json @@ -55,4 +55,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/AZ.json b/packages/countries/subdivisions/AZ.json index f5a47710c..74b441a29 100644 --- a/packages/countries/subdivisions/AZ.json +++ b/packages/countries/subdivisions/AZ.json @@ -545,4 +545,4 @@ "parent_code": null, "type": "Rayon" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BA.json b/packages/countries/subdivisions/BA.json index 7351128fe..0a9f71598 100644 --- a/packages/countries/subdivisions/BA.json +++ b/packages/countries/subdivisions/BA.json @@ -90,4 +90,4 @@ "parent_code": null, "type": "Entity" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BB.json b/packages/countries/subdivisions/BB.json index d6201f5e0..62d3f89f4 100644 --- a/packages/countries/subdivisions/BB.json +++ b/packages/countries/subdivisions/BB.json @@ -76,4 +76,4 @@ "parent_code": null, "type": "Parish" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BD.json b/packages/countries/subdivisions/BD.json index 069066b1c..7310acd15 100644 --- a/packages/countries/subdivisions/BD.json +++ b/packages/countries/subdivisions/BD.json @@ -496,4 +496,4 @@ "parent_code": null, "type": "Division" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BE.json b/packages/countries/subdivisions/BE.json index c5f6a0ffc..02ecac87c 100644 --- a/packages/countries/subdivisions/BE.json +++ b/packages/countries/subdivisions/BE.json @@ -90,4 +90,4 @@ "parent_code": "BE-WAL", "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BF.json b/packages/countries/subdivisions/BF.json index 3d0fe9960..67dc16c27 100644 --- a/packages/countries/subdivisions/BF.json +++ b/packages/countries/subdivisions/BF.json @@ -405,4 +405,4 @@ "parent_code": "BF-07", "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BG.json b/packages/countries/subdivisions/BG.json index 4cbeefd7f..8c94afe55 100644 --- a/packages/countries/subdivisions/BG.json +++ b/packages/countries/subdivisions/BG.json @@ -195,4 +195,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BH.json b/packages/countries/subdivisions/BH.json index 426357af2..8d5ae7214 100644 --- a/packages/countries/subdivisions/BH.json +++ b/packages/countries/subdivisions/BH.json @@ -34,4 +34,4 @@ "parent_code": null, "type": "Governorate" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BI.json b/packages/countries/subdivisions/BI.json index 851f444eb..37ffd933f 100644 --- a/packages/countries/subdivisions/BI.json +++ b/packages/countries/subdivisions/BI.json @@ -111,4 +111,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BJ.json b/packages/countries/subdivisions/BJ.json index b0edb1e02..8a7196384 100644 --- a/packages/countries/subdivisions/BJ.json +++ b/packages/countries/subdivisions/BJ.json @@ -83,4 +83,4 @@ "parent_code": null, "type": "Department" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BN.json b/packages/countries/subdivisions/BN.json index 91b5f8b05..dd61014c4 100644 --- a/packages/countries/subdivisions/BN.json +++ b/packages/countries/subdivisions/BN.json @@ -27,4 +27,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BO.json b/packages/countries/subdivisions/BO.json index 268bb3d1b..517415322 100644 --- a/packages/countries/subdivisions/BO.json +++ b/packages/countries/subdivisions/BO.json @@ -62,4 +62,4 @@ "parent_code": null, "type": "Department" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BR.json b/packages/countries/subdivisions/BR.json index 08f7c9e00..5b1622636 100644 --- a/packages/countries/subdivisions/BR.json +++ b/packages/countries/subdivisions/BR.json @@ -195,4 +195,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BS.json b/packages/countries/subdivisions/BS.json index bf83f87bf..be3bf2b05 100644 --- a/packages/countries/subdivisions/BS.json +++ b/packages/countries/subdivisions/BS.json @@ -216,4 +216,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BT.json b/packages/countries/subdivisions/BT.json index f86df1d7e..f3f22cc57 100644 --- a/packages/countries/subdivisions/BT.json +++ b/packages/countries/subdivisions/BT.json @@ -139,4 +139,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BW.json b/packages/countries/subdivisions/BW.json index 1c0b87a04..4a50f9670 100644 --- a/packages/countries/subdivisions/BW.json +++ b/packages/countries/subdivisions/BW.json @@ -62,4 +62,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BY.json b/packages/countries/subdivisions/BY.json index 2080a3c20..abbf29efa 100644 --- a/packages/countries/subdivisions/BY.json +++ b/packages/countries/subdivisions/BY.json @@ -48,4 +48,4 @@ "parent_code": null, "type": "Oblast" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/BZ.json b/packages/countries/subdivisions/BZ.json index 502df09d5..efce279e6 100644 --- a/packages/countries/subdivisions/BZ.json +++ b/packages/countries/subdivisions/BZ.json @@ -41,4 +41,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/CA.json b/packages/countries/subdivisions/CA.json index 07eef9fc8..a3f0d735a 100644 --- a/packages/countries/subdivisions/CA.json +++ b/packages/countries/subdivisions/CA.json @@ -90,4 +90,4 @@ "parent_code": null, "type": "Territory" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/CD.json b/packages/countries/subdivisions/CD.json index 48303bcaa..8bf751b5a 100644 --- a/packages/countries/subdivisions/CD.json +++ b/packages/countries/subdivisions/CD.json @@ -76,4 +76,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/CF.json b/packages/countries/subdivisions/CF.json index 5687e98be..fcc225e47 100644 --- a/packages/countries/subdivisions/CF.json +++ b/packages/countries/subdivisions/CF.json @@ -118,4 +118,4 @@ "parent_code": null, "type": "Prefecture" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/CG.json b/packages/countries/subdivisions/CG.json index 4041213a0..814c4d1f0 100644 --- a/packages/countries/subdivisions/CG.json +++ b/packages/countries/subdivisions/CG.json @@ -76,4 +76,4 @@ "parent_code": null, "type": "Capital District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/CH.json b/packages/countries/subdivisions/CH.json index b6bf46b69..48aecdf1f 100644 --- a/packages/countries/subdivisions/CH.json +++ b/packages/countries/subdivisions/CH.json @@ -181,4 +181,4 @@ "parent_code": null, "type": "Canton" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/CI.json b/packages/countries/subdivisions/CI.json index 7f142f848..13037e5a0 100644 --- a/packages/countries/subdivisions/CI.json +++ b/packages/countries/subdivisions/CI.json @@ -132,4 +132,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/CL.json b/packages/countries/subdivisions/CL.json index 6de0f0e26..1a4a845ba 100644 --- a/packages/countries/subdivisions/CL.json +++ b/packages/countries/subdivisions/CL.json @@ -104,4 +104,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/CM.json b/packages/countries/subdivisions/CM.json index e9f5a6f9a..51aebccdf 100644 --- a/packages/countries/subdivisions/CM.json +++ b/packages/countries/subdivisions/CM.json @@ -69,4 +69,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/CN.json b/packages/countries/subdivisions/CN.json index e6d16f77d..e9179aa03 100644 --- a/packages/countries/subdivisions/CN.json +++ b/packages/countries/subdivisions/CN.json @@ -237,4 +237,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/CO.json b/packages/countries/subdivisions/CO.json index feeed63ec..d42e480b9 100644 --- a/packages/countries/subdivisions/CO.json +++ b/packages/countries/subdivisions/CO.json @@ -230,4 +230,4 @@ "parent_code": null, "type": "Department" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/CR.json b/packages/countries/subdivisions/CR.json index 41cb5435e..8e952f8ae 100644 --- a/packages/countries/subdivisions/CR.json +++ b/packages/countries/subdivisions/CR.json @@ -48,4 +48,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/CU.json b/packages/countries/subdivisions/CU.json index a4f42a5f0..e54c38564 100644 --- a/packages/countries/subdivisions/CU.json +++ b/packages/countries/subdivisions/CU.json @@ -104,4 +104,4 @@ "parent_code": null, "type": "Special municipality" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/CV.json b/packages/countries/subdivisions/CV.json index 13af19459..6c5f6b13f 100644 --- a/packages/countries/subdivisions/CV.json +++ b/packages/countries/subdivisions/CV.json @@ -167,4 +167,4 @@ "parent_code": "CV-S", "type": "Municipality" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/CY.json b/packages/countries/subdivisions/CY.json index 38bddb825..82b3534b3 100644 --- a/packages/countries/subdivisions/CY.json +++ b/packages/countries/subdivisions/CY.json @@ -41,4 +41,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/CZ.json b/packages/countries/subdivisions/CZ.json index 5bf29a004..925a1e985 100644 --- a/packages/countries/subdivisions/CZ.json +++ b/packages/countries/subdivisions/CZ.json @@ -783,4 +783,4 @@ "parent_code": "CZ-80", "type": "district" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/DE.json b/packages/countries/subdivisions/DE.json index bcdb85f11..bbc585558 100644 --- a/packages/countries/subdivisions/DE.json +++ b/packages/countries/subdivisions/DE.json @@ -111,4 +111,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/DJ.json b/packages/countries/subdivisions/DJ.json index db1393d7a..c305ecb82 100644 --- a/packages/countries/subdivisions/DJ.json +++ b/packages/countries/subdivisions/DJ.json @@ -41,4 +41,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/DK.json b/packages/countries/subdivisions/DK.json index b293a61d4..0cad21527 100644 --- a/packages/countries/subdivisions/DK.json +++ b/packages/countries/subdivisions/DK.json @@ -34,4 +34,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/DM.json b/packages/countries/subdivisions/DM.json index 50b2650e0..c56715401 100644 --- a/packages/countries/subdivisions/DM.json +++ b/packages/countries/subdivisions/DM.json @@ -69,4 +69,4 @@ "parent_code": null, "type": "Parish" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/DO.json b/packages/countries/subdivisions/DO.json index 063da246f..81ffc0e9e 100644 --- a/packages/countries/subdivisions/DO.json +++ b/packages/countries/subdivisions/DO.json @@ -209,4 +209,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/DZ.json b/packages/countries/subdivisions/DZ.json index bb72d43e6..b586cc0d8 100644 --- a/packages/countries/subdivisions/DZ.json +++ b/packages/countries/subdivisions/DZ.json @@ -335,4 +335,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/EC.json b/packages/countries/subdivisions/EC.json index 5ec1e8088..925f27c0c 100644 --- a/packages/countries/subdivisions/EC.json +++ b/packages/countries/subdivisions/EC.json @@ -167,4 +167,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/EE.json b/packages/countries/subdivisions/EE.json index 662206707..d8213363d 100644 --- a/packages/countries/subdivisions/EE.json +++ b/packages/countries/subdivisions/EE.json @@ -104,4 +104,4 @@ "parent_code": null, "type": "County" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/EG.json b/packages/countries/subdivisions/EG.json index fe9204799..08ad746a1 100644 --- a/packages/countries/subdivisions/EG.json +++ b/packages/countries/subdivisions/EG.json @@ -195,4 +195,4 @@ "parent_code": null, "type": "Governorate" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/ER.json b/packages/countries/subdivisions/ER.json index bf4275646..cb0484c7b 100644 --- a/packages/countries/subdivisions/ER.json +++ b/packages/countries/subdivisions/ER.json @@ -41,4 +41,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/ES.json b/packages/countries/subdivisions/ES.json index 5ee5ed03b..2aba35610 100644 --- a/packages/countries/subdivisions/ES.json +++ b/packages/countries/subdivisions/ES.json @@ -482,4 +482,4 @@ "parent_code": "ES-CL", "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/ET.json b/packages/countries/subdivisions/ET.json index db76875bb..1b1a10002 100644 --- a/packages/countries/subdivisions/ET.json +++ b/packages/countries/subdivisions/ET.json @@ -76,4 +76,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/FI.json b/packages/countries/subdivisions/FI.json index 684f3b068..889f43520 100644 --- a/packages/countries/subdivisions/FI.json +++ b/packages/countries/subdivisions/FI.json @@ -132,4 +132,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/FJ.json b/packages/countries/subdivisions/FJ.json index 0a3d7a0fa..36e164a9d 100644 --- a/packages/countries/subdivisions/FJ.json +++ b/packages/countries/subdivisions/FJ.json @@ -34,4 +34,4 @@ "parent_code": null, "type": "Division" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/FM.json b/packages/countries/subdivisions/FM.json index f213b3838..d7701474a 100644 --- a/packages/countries/subdivisions/FM.json +++ b/packages/countries/subdivisions/FM.json @@ -27,4 +27,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/FR.json b/packages/countries/subdivisions/FR.json index 349a739f4..087de7746 100644 --- a/packages/countries/subdivisions/FR.json +++ b/packages/countries/subdivisions/FR.json @@ -874,4 +874,4 @@ "parent_code": "FR-MAY", "type": "Overseas department" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/GA.json b/packages/countries/subdivisions/GA.json index c92ddf26d..9587d0939 100644 --- a/packages/countries/subdivisions/GA.json +++ b/packages/countries/subdivisions/GA.json @@ -62,4 +62,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/GB.json b/packages/countries/subdivisions/GB.json index 6cc6e0b35..a2f849709 100644 --- a/packages/countries/subdivisions/GB.json +++ b/packages/countries/subdivisions/GB.json @@ -1567,4 +1567,4 @@ "parent_code": "GB-SCT", "type": "Council area" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/GD.json b/packages/countries/subdivisions/GD.json index e3cb6d99d..d076c9d3f 100644 --- a/packages/countries/subdivisions/GD.json +++ b/packages/countries/subdivisions/GD.json @@ -48,4 +48,4 @@ "parent_code": null, "type": "Dependency" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/GE.json b/packages/countries/subdivisions/GE.json index 500910b3c..d699ea0a3 100644 --- a/packages/countries/subdivisions/GE.json +++ b/packages/countries/subdivisions/GE.json @@ -83,4 +83,4 @@ "parent_code": null, "type": "City" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/GH.json b/packages/countries/subdivisions/GH.json index fdf94c6c7..f84ab8ae5 100644 --- a/packages/countries/subdivisions/GH.json +++ b/packages/countries/subdivisions/GH.json @@ -69,4 +69,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/GL.json b/packages/countries/subdivisions/GL.json index dc0f6b32c..83fbf090f 100644 --- a/packages/countries/subdivisions/GL.json +++ b/packages/countries/subdivisions/GL.json @@ -27,4 +27,4 @@ "parent_code": null, "type": "Municipality" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/GM.json b/packages/countries/subdivisions/GM.json index 08d1a2efe..ebc1ac5b3 100644 --- a/packages/countries/subdivisions/GM.json +++ b/packages/countries/subdivisions/GM.json @@ -41,4 +41,4 @@ "parent_code": null, "type": "Division" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/GN.json b/packages/countries/subdivisions/GN.json index 8b30d9e86..025cbba77 100644 --- a/packages/countries/subdivisions/GN.json +++ b/packages/countries/subdivisions/GN.json @@ -286,4 +286,4 @@ "parent_code": "GN-N", "type": "Prefecture" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/GQ.json b/packages/countries/subdivisions/GQ.json index 8fc39eaf7..a7e246b25 100644 --- a/packages/countries/subdivisions/GQ.json +++ b/packages/countries/subdivisions/GQ.json @@ -62,4 +62,4 @@ "parent_code": "GQ-C", "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/GR.json b/packages/countries/subdivisions/GR.json index 30d8d0e82..352db5f4b 100644 --- a/packages/countries/subdivisions/GR.json +++ b/packages/countries/subdivisions/GR.json @@ -454,4 +454,4 @@ "parent_code": null, "type": "Administrative region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/GT.json b/packages/countries/subdivisions/GT.json index 52ebf58f5..ec993db30 100644 --- a/packages/countries/subdivisions/GT.json +++ b/packages/countries/subdivisions/GT.json @@ -153,4 +153,4 @@ "parent_code": null, "type": "Department" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/GW.json b/packages/countries/subdivisions/GW.json index 336168abe..42a26f8cc 100644 --- a/packages/countries/subdivisions/GW.json +++ b/packages/countries/subdivisions/GW.json @@ -83,4 +83,4 @@ "parent_code": "GW-S", "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/GY.json b/packages/countries/subdivisions/GY.json index 123221c77..73b25acf6 100644 --- a/packages/countries/subdivisions/GY.json +++ b/packages/countries/subdivisions/GY.json @@ -69,4 +69,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/HN.json b/packages/countries/subdivisions/HN.json index 1c7a712d4..94794e892 100644 --- a/packages/countries/subdivisions/HN.json +++ b/packages/countries/subdivisions/HN.json @@ -125,4 +125,4 @@ "parent_code": null, "type": "Department" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/HR.json b/packages/countries/subdivisions/HR.json index 0498cf7ba..028087090 100644 --- a/packages/countries/subdivisions/HR.json +++ b/packages/countries/subdivisions/HR.json @@ -146,4 +146,4 @@ "parent_code": null, "type": "City" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/HT.json b/packages/countries/subdivisions/HT.json index a55b97350..eb01bdad2 100644 --- a/packages/countries/subdivisions/HT.json +++ b/packages/countries/subdivisions/HT.json @@ -62,4 +62,4 @@ "parent_code": null, "type": "Department" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/HU.json b/packages/countries/subdivisions/HU.json index f80b805c7..92392bf47 100644 --- a/packages/countries/subdivisions/HU.json +++ b/packages/countries/subdivisions/HU.json @@ -300,4 +300,4 @@ "parent_code": null, "type": "City with county rights" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/ID.json b/packages/countries/subdivisions/ID.json index 4c5849e1c..c09dba0e3 100644 --- a/packages/countries/subdivisions/ID.json +++ b/packages/countries/subdivisions/ID.json @@ -279,4 +279,4 @@ "parent_code": "ID-JW", "type": "Special Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/IE.json b/packages/countries/subdivisions/IE.json index ad825194c..4239be743 100644 --- a/packages/countries/subdivisions/IE.json +++ b/packages/countries/subdivisions/IE.json @@ -209,4 +209,4 @@ "parent_code": "IE-L", "type": "County" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/IL.json b/packages/countries/subdivisions/IL.json index 5e2db59d5..01bafb5d3 100644 --- a/packages/countries/subdivisions/IL.json +++ b/packages/countries/subdivisions/IL.json @@ -41,4 +41,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/IN.json b/packages/countries/subdivisions/IN.json index e0d8b9f1a..b54211d7d 100644 --- a/packages/countries/subdivisions/IN.json +++ b/packages/countries/subdivisions/IN.json @@ -251,4 +251,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/IQ.json b/packages/countries/subdivisions/IQ.json index 08aa8b092..c0b80edca 100644 --- a/packages/countries/subdivisions/IQ.json +++ b/packages/countries/subdivisions/IQ.json @@ -125,4 +125,4 @@ "parent_code": null, "type": "Governorate" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/IR.json b/packages/countries/subdivisions/IR.json index f3b4000eb..6904d59ba 100644 --- a/packages/countries/subdivisions/IR.json +++ b/packages/countries/subdivisions/IR.json @@ -209,4 +209,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/IS.json b/packages/countries/subdivisions/IS.json index 762b525e0..dc8f414c0 100644 --- a/packages/countries/subdivisions/IS.json +++ b/packages/countries/subdivisions/IS.json @@ -62,4 +62,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/IT.json b/packages/countries/subdivisions/IT.json index dbd6a90e4..c7365bee8 100644 --- a/packages/countries/subdivisions/IT.json +++ b/packages/countries/subdivisions/IT.json @@ -909,4 +909,4 @@ "parent_code": "IT-78", "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/JM.json b/packages/countries/subdivisions/JM.json index 6148a00d3..4b192d1f0 100644 --- a/packages/countries/subdivisions/JM.json +++ b/packages/countries/subdivisions/JM.json @@ -97,4 +97,4 @@ "parent_code": null, "type": "Parish" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/JO.json b/packages/countries/subdivisions/JO.json index 37e7631e8..63dbac565 100644 --- a/packages/countries/subdivisions/JO.json +++ b/packages/countries/subdivisions/JO.json @@ -83,4 +83,4 @@ "parent_code": null, "type": "Governorate" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/JP.json b/packages/countries/subdivisions/JP.json index baac3f4a7..12ffe8493 100644 --- a/packages/countries/subdivisions/JP.json +++ b/packages/countries/subdivisions/JP.json @@ -328,4 +328,4 @@ "parent_code": null, "type": "Prefecture" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/KE.json b/packages/countries/subdivisions/KE.json index 56ea92367..ce521d10d 100644 --- a/packages/countries/subdivisions/KE.json +++ b/packages/countries/subdivisions/KE.json @@ -328,4 +328,4 @@ "parent_code": null, "type": "County" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/KG.json b/packages/countries/subdivisions/KG.json index dc94d75ae..b227de5af 100644 --- a/packages/countries/subdivisions/KG.json +++ b/packages/countries/subdivisions/KG.json @@ -55,4 +55,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/KH.json b/packages/countries/subdivisions/KH.json index 3ba4953a6..92dd31a06 100644 --- a/packages/countries/subdivisions/KH.json +++ b/packages/countries/subdivisions/KH.json @@ -167,4 +167,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/KI.json b/packages/countries/subdivisions/KI.json index 4a8306200..1fdfc13a6 100644 --- a/packages/countries/subdivisions/KI.json +++ b/packages/countries/subdivisions/KI.json @@ -20,4 +20,4 @@ "parent_code": null, "type": "Island group" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/KM.json b/packages/countries/subdivisions/KM.json index 8586bc3bf..d5d85048a 100644 --- a/packages/countries/subdivisions/KM.json +++ b/packages/countries/subdivisions/KM.json @@ -20,4 +20,4 @@ "parent_code": null, "type": "Island" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/KN.json b/packages/countries/subdivisions/KN.json index 79760fea9..d0eae290c 100644 --- a/packages/countries/subdivisions/KN.json +++ b/packages/countries/subdivisions/KN.json @@ -111,4 +111,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/KP.json b/packages/countries/subdivisions/KP.json index f8df2ed43..d39bde239 100644 --- a/packages/countries/subdivisions/KP.json +++ b/packages/countries/subdivisions/KP.json @@ -76,4 +76,4 @@ "parent_code": null, "type": "Special city" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/KR.json b/packages/countries/subdivisions/KR.json index 58f73043d..3a0d027d1 100644 --- a/packages/countries/subdivisions/KR.json +++ b/packages/countries/subdivisions/KR.json @@ -111,4 +111,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/KW.json b/packages/countries/subdivisions/KW.json index 6a8034b17..ee5b00e50 100644 --- a/packages/countries/subdivisions/KW.json +++ b/packages/countries/subdivisions/KW.json @@ -41,4 +41,4 @@ "parent_code": null, "type": "Governorate" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/KZ.json b/packages/countries/subdivisions/KZ.json index 58862285a..258b944ed 100644 --- a/packages/countries/subdivisions/KZ.json +++ b/packages/countries/subdivisions/KZ.json @@ -111,4 +111,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/LA.json b/packages/countries/subdivisions/LA.json index 6375c83f0..0225a1b83 100644 --- a/packages/countries/subdivisions/LA.json +++ b/packages/countries/subdivisions/LA.json @@ -125,4 +125,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/LB.json b/packages/countries/subdivisions/LB.json index 5bc83c0f6..d76405bfe 100644 --- a/packages/countries/subdivisions/LB.json +++ b/packages/countries/subdivisions/LB.json @@ -55,4 +55,4 @@ "parent_code": null, "type": "Governorate" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/LI.json b/packages/countries/subdivisions/LI.json index 0344f8d83..cf2fd944c 100644 --- a/packages/countries/subdivisions/LI.json +++ b/packages/countries/subdivisions/LI.json @@ -76,4 +76,4 @@ "parent_code": null, "type": "Commune" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/LK.json b/packages/countries/subdivisions/LK.json index c916e78d6..200780415 100644 --- a/packages/countries/subdivisions/LK.json +++ b/packages/countries/subdivisions/LK.json @@ -237,4 +237,4 @@ "parent_code": "LK-9", "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/LR.json b/packages/countries/subdivisions/LR.json index fcb4d46f5..3abee2d33 100644 --- a/packages/countries/subdivisions/LR.json +++ b/packages/countries/subdivisions/LR.json @@ -90,4 +90,4 @@ "parent_code": null, "type": "County" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/LS.json b/packages/countries/subdivisions/LS.json index 6411a901f..5d2b23ec9 100644 --- a/packages/countries/subdivisions/LS.json +++ b/packages/countries/subdivisions/LS.json @@ -69,4 +69,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/LT.json b/packages/countries/subdivisions/LT.json index 1f9bc5ba5..3d0a05853 100644 --- a/packages/countries/subdivisions/LT.json +++ b/packages/countries/subdivisions/LT.json @@ -69,4 +69,4 @@ "parent_code": null, "type": "County" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/LU.json b/packages/countries/subdivisions/LU.json index 7d320f29e..c2b8cbfa9 100644 --- a/packages/countries/subdivisions/LU.json +++ b/packages/countries/subdivisions/LU.json @@ -20,4 +20,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/LV.json b/packages/countries/subdivisions/LV.json index 59389288b..35f4530bc 100644 --- a/packages/countries/subdivisions/LV.json +++ b/packages/countries/subdivisions/LV.json @@ -832,4 +832,4 @@ "parent_code": null, "type": "Republican City" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/LY.json b/packages/countries/subdivisions/LY.json index 7d4e86418..5008b3e2b 100644 --- a/packages/countries/subdivisions/LY.json +++ b/packages/countries/subdivisions/LY.json @@ -160,4 +160,4 @@ "parent_code": null, "type": "Popularates" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MA.json b/packages/countries/subdivisions/MA.json index 40fadef39..cd74639c5 100644 --- a/packages/countries/subdivisions/MA.json +++ b/packages/countries/subdivisions/MA.json @@ -608,4 +608,4 @@ "parent_code": "MA-08", "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MC.json b/packages/countries/subdivisions/MC.json index 82e7a29c0..055600d0e 100644 --- a/packages/countries/subdivisions/MC.json +++ b/packages/countries/subdivisions/MC.json @@ -118,4 +118,4 @@ "parent_code": null, "type": "Quarter" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MD.json b/packages/countries/subdivisions/MD.json index 19d4ed5b0..7a75595e2 100644 --- a/packages/countries/subdivisions/MD.json +++ b/packages/countries/subdivisions/MD.json @@ -258,4 +258,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/ME.json b/packages/countries/subdivisions/ME.json index 76c4cf067..d61d0fa3d 100644 --- a/packages/countries/subdivisions/ME.json +++ b/packages/countries/subdivisions/ME.json @@ -146,4 +146,4 @@ "parent_code": null, "type": "Municipality" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MG.json b/packages/countries/subdivisions/MG.json index 97b045a07..dbc5926d2 100644 --- a/packages/countries/subdivisions/MG.json +++ b/packages/countries/subdivisions/MG.json @@ -41,4 +41,4 @@ "parent_code": null, "type": "Autonomous province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MH.json b/packages/countries/subdivisions/MH.json index 83cc51282..4f3129b29 100644 --- a/packages/countries/subdivisions/MH.json +++ b/packages/countries/subdivisions/MH.json @@ -181,4 +181,4 @@ "parent_code": "MH-L", "type": "Municipality" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MK.json b/packages/countries/subdivisions/MK.json index d183cd2ec..f8574fa5d 100644 --- a/packages/countries/subdivisions/MK.json +++ b/packages/countries/subdivisions/MK.json @@ -587,4 +587,4 @@ "parent_code": null, "type": "Municipality" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/ML.json b/packages/countries/subdivisions/ML.json index 368bf3d70..ea549f327 100644 --- a/packages/countries/subdivisions/ML.json +++ b/packages/countries/subdivisions/ML.json @@ -62,4 +62,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MM.json b/packages/countries/subdivisions/MM.json index b5a4b1dff..60fa2dd59 100644 --- a/packages/countries/subdivisions/MM.json +++ b/packages/countries/subdivisions/MM.json @@ -97,4 +97,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MN.json b/packages/countries/subdivisions/MN.json index fb13e3087..8106d39ae 100644 --- a/packages/countries/subdivisions/MN.json +++ b/packages/countries/subdivisions/MN.json @@ -153,4 +153,4 @@ "parent_code": null, "type": "Municipality" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MR.json b/packages/countries/subdivisions/MR.json index 72b0a18ac..111251d51 100644 --- a/packages/countries/subdivisions/MR.json +++ b/packages/countries/subdivisions/MR.json @@ -90,4 +90,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MT.json b/packages/countries/subdivisions/MT.json index 0ddb145a7..76f5fb589 100644 --- a/packages/countries/subdivisions/MT.json +++ b/packages/countries/subdivisions/MT.json @@ -475,4 +475,4 @@ "parent_code": null, "type": "Local council" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MU.json b/packages/countries/subdivisions/MU.json index 4b07eb0b3..37adc5aec 100644 --- a/packages/countries/subdivisions/MU.json +++ b/packages/countries/subdivisions/MU.json @@ -118,4 +118,4 @@ "parent_code": null, "type": "City" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MV.json b/packages/countries/subdivisions/MV.json index c5312ea28..58a9875a2 100644 --- a/packages/countries/subdivisions/MV.json +++ b/packages/countries/subdivisions/MV.json @@ -195,4 +195,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MW.json b/packages/countries/subdivisions/MW.json index 47f4cad82..baceeb03d 100644 --- a/packages/countries/subdivisions/MW.json +++ b/packages/countries/subdivisions/MW.json @@ -216,4 +216,4 @@ "parent_code": "MW-S", "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MX.json b/packages/countries/subdivisions/MX.json index 77d0298ee..54e7de799 100644 --- a/packages/countries/subdivisions/MX.json +++ b/packages/countries/subdivisions/MX.json @@ -223,4 +223,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MY.json b/packages/countries/subdivisions/MY.json index 7f3b7c2e8..92c8a431a 100644 --- a/packages/countries/subdivisions/MY.json +++ b/packages/countries/subdivisions/MY.json @@ -111,4 +111,4 @@ "parent_code": null, "type": "Federal Territories" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/MZ.json b/packages/countries/subdivisions/MZ.json index 62dd9ac5e..164b21641 100644 --- a/packages/countries/subdivisions/MZ.json +++ b/packages/countries/subdivisions/MZ.json @@ -76,4 +76,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/NA.json b/packages/countries/subdivisions/NA.json index acb8ce230..635cfe355 100644 --- a/packages/countries/subdivisions/NA.json +++ b/packages/countries/subdivisions/NA.json @@ -90,4 +90,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/NE.json b/packages/countries/subdivisions/NE.json index 1d2424a88..0069e2957 100644 --- a/packages/countries/subdivisions/NE.json +++ b/packages/countries/subdivisions/NE.json @@ -55,4 +55,4 @@ "parent_code": null, "type": "Capital District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/NG.json b/packages/countries/subdivisions/NG.json index 32e6b2522..c3f670dcc 100644 --- a/packages/countries/subdivisions/NG.json +++ b/packages/countries/subdivisions/NG.json @@ -258,4 +258,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/NI.json b/packages/countries/subdivisions/NI.json index 178042e62..3cbbfe62c 100644 --- a/packages/countries/subdivisions/NI.json +++ b/packages/countries/subdivisions/NI.json @@ -118,4 +118,4 @@ "parent_code": null, "type": "Department" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/NL.json b/packages/countries/subdivisions/NL.json index e34c1edaa..0bf1a5b76 100644 --- a/packages/countries/subdivisions/NL.json +++ b/packages/countries/subdivisions/NL.json @@ -125,4 +125,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/NO.json b/packages/countries/subdivisions/NO.json index 0781407d5..053d5617d 100644 --- a/packages/countries/subdivisions/NO.json +++ b/packages/countries/subdivisions/NO.json @@ -139,4 +139,4 @@ "parent_code": null, "type": "County" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/NP.json b/packages/countries/subdivisions/NP.json index 6b318c149..a40daaf69 100644 --- a/packages/countries/subdivisions/NP.json +++ b/packages/countries/subdivisions/NP.json @@ -132,4 +132,4 @@ "parent_code": "NP-5", "type": "Zone" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/NR.json b/packages/countries/subdivisions/NR.json index 508e12477..1219f88b5 100644 --- a/packages/countries/subdivisions/NR.json +++ b/packages/countries/subdivisions/NR.json @@ -97,4 +97,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/NZ.json b/packages/countries/subdivisions/NZ.json index 440a4e4cf..9c3fab2b1 100644 --- a/packages/countries/subdivisions/NZ.json +++ b/packages/countries/subdivisions/NZ.json @@ -132,4 +132,4 @@ "parent_code": "NZ-S", "type": "Regional council" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/OM.json b/packages/countries/subdivisions/OM.json index 9ddf3235d..b56d5521e 100644 --- a/packages/countries/subdivisions/OM.json +++ b/packages/countries/subdivisions/OM.json @@ -62,4 +62,4 @@ "parent_code": null, "type": "Governorate" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/PA.json b/packages/countries/subdivisions/PA.json index 8e5c505ba..2f494171b 100644 --- a/packages/countries/subdivisions/PA.json +++ b/packages/countries/subdivisions/PA.json @@ -83,4 +83,4 @@ "parent_code": null, "type": "Indigenous region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/PE.json b/packages/countries/subdivisions/PE.json index ff132fdba..d36e8fb5b 100644 --- a/packages/countries/subdivisions/PE.json +++ b/packages/countries/subdivisions/PE.json @@ -181,4 +181,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/PG.json b/packages/countries/subdivisions/PG.json index f3bd5959f..dfc2a401b 100644 --- a/packages/countries/subdivisions/PG.json +++ b/packages/countries/subdivisions/PG.json @@ -139,4 +139,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/PH.json b/packages/countries/subdivisions/PH.json index bd4cfb713..6560e0d26 100644 --- a/packages/countries/subdivisions/PH.json +++ b/packages/countries/subdivisions/PH.json @@ -678,4 +678,4 @@ "parent_code": "PH-09", "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/PK.json b/packages/countries/subdivisions/PK.json index b1ce2bd97..632a9235d 100644 --- a/packages/countries/subdivisions/PK.json +++ b/packages/countries/subdivisions/PK.json @@ -55,4 +55,4 @@ "parent_code": null, "type": "Territory" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/PL.json b/packages/countries/subdivisions/PL.json index 58b5645c2..dbd708a90 100644 --- a/packages/countries/subdivisions/PL.json +++ b/packages/countries/subdivisions/PL.json @@ -111,4 +111,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/PS.json b/packages/countries/subdivisions/PS.json index ecbf21664..8c1d1b54b 100644 --- a/packages/countries/subdivisions/PS.json +++ b/packages/countries/subdivisions/PS.json @@ -111,4 +111,4 @@ "parent_code": null, "type": "Governorate" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/PT.json b/packages/countries/subdivisions/PT.json index 4d0afc33a..3cb4f8837 100644 --- a/packages/countries/subdivisions/PT.json +++ b/packages/countries/subdivisions/PT.json @@ -139,4 +139,4 @@ "parent_code": null, "type": "Autonomous region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/PW.json b/packages/countries/subdivisions/PW.json index 8ff62ac3f..fede1839a 100644 --- a/packages/countries/subdivisions/PW.json +++ b/packages/countries/subdivisions/PW.json @@ -111,4 +111,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/PY.json b/packages/countries/subdivisions/PY.json index 9fd746921..932ac38bd 100644 --- a/packages/countries/subdivisions/PY.json +++ b/packages/countries/subdivisions/PY.json @@ -125,4 +125,4 @@ "parent_code": null, "type": "Capital district" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/QA.json b/packages/countries/subdivisions/QA.json index 57a1ac25b..64071161e 100644 --- a/packages/countries/subdivisions/QA.json +++ b/packages/countries/subdivisions/QA.json @@ -48,4 +48,4 @@ "parent_code": null, "type": "Municipality" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/RO.json b/packages/countries/subdivisions/RO.json index de761fb40..e8c522744 100644 --- a/packages/countries/subdivisions/RO.json +++ b/packages/countries/subdivisions/RO.json @@ -293,4 +293,4 @@ "parent_code": null, "type": "Department" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/RS.json b/packages/countries/subdivisions/RS.json index 1cad1cbeb..df1266e88 100644 --- a/packages/countries/subdivisions/RS.json +++ b/packages/countries/subdivisions/RS.json @@ -223,4 +223,4 @@ "parent_code": null, "type": "Autonomous province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/RU.json b/packages/countries/subdivisions/RU.json index 790d5379e..50a565a27 100644 --- a/packages/countries/subdivisions/RU.json +++ b/packages/countries/subdivisions/RU.json @@ -580,4 +580,4 @@ "parent_code": null, "type": "Administrative Territory" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/RW.json b/packages/countries/subdivisions/RW.json index 005ebe881..e3fd15095 100644 --- a/packages/countries/subdivisions/RW.json +++ b/packages/countries/subdivisions/RW.json @@ -34,4 +34,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SA.json b/packages/countries/subdivisions/SA.json index fbba2db20..e60dd4a45 100644 --- a/packages/countries/subdivisions/SA.json +++ b/packages/countries/subdivisions/SA.json @@ -90,4 +90,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SB.json b/packages/countries/subdivisions/SB.json index a9c45fe35..c24d461b6 100644 --- a/packages/countries/subdivisions/SB.json +++ b/packages/countries/subdivisions/SB.json @@ -69,4 +69,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SC.json b/packages/countries/subdivisions/SC.json index c742d41ce..826965d55 100644 --- a/packages/countries/subdivisions/SC.json +++ b/packages/countries/subdivisions/SC.json @@ -174,4 +174,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SD.json b/packages/countries/subdivisions/SD.json index ac2b41e45..4eef8f845 100644 --- a/packages/countries/subdivisions/SD.json +++ b/packages/countries/subdivisions/SD.json @@ -118,4 +118,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SE.json b/packages/countries/subdivisions/SE.json index 631ca72b4..02a765ad7 100644 --- a/packages/countries/subdivisions/SE.json +++ b/packages/countries/subdivisions/SE.json @@ -146,4 +146,4 @@ "parent_code": null, "type": "County" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SG.json b/packages/countries/subdivisions/SG.json index ef9a76fc7..79829d2e8 100644 --- a/packages/countries/subdivisions/SG.json +++ b/packages/countries/subdivisions/SG.json @@ -34,4 +34,4 @@ "parent_code": null, "type": "district" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SH.json b/packages/countries/subdivisions/SH.json index fb615df59..f9d45f1ae 100644 --- a/packages/countries/subdivisions/SH.json +++ b/packages/countries/subdivisions/SH.json @@ -20,4 +20,4 @@ "parent_code": null, "type": "Geographical Entity" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SI.json b/packages/countries/subdivisions/SI.json index e0a8a5052..0da122ac4 100644 --- a/packages/countries/subdivisions/SI.json +++ b/packages/countries/subdivisions/SI.json @@ -1469,4 +1469,4 @@ "parent_code": null, "type": "Municipality" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SK.json b/packages/countries/subdivisions/SK.json index 3490ae56b..10d592231 100644 --- a/packages/countries/subdivisions/SK.json +++ b/packages/countries/subdivisions/SK.json @@ -55,4 +55,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SL.json b/packages/countries/subdivisions/SL.json index aeb3606b8..adba3ecdb 100644 --- a/packages/countries/subdivisions/SL.json +++ b/packages/countries/subdivisions/SL.json @@ -27,4 +27,4 @@ "parent_code": null, "type": "Area" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SM.json b/packages/countries/subdivisions/SM.json index 415b3870f..468ae9888 100644 --- a/packages/countries/subdivisions/SM.json +++ b/packages/countries/subdivisions/SM.json @@ -62,4 +62,4 @@ "parent_code": null, "type": "Municipalities" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SN.json b/packages/countries/subdivisions/SN.json index 11bdaefdf..8b8bba9cb 100644 --- a/packages/countries/subdivisions/SN.json +++ b/packages/countries/subdivisions/SN.json @@ -97,4 +97,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SO.json b/packages/countries/subdivisions/SO.json index b6038cd2f..771378cce 100644 --- a/packages/countries/subdivisions/SO.json +++ b/packages/countries/subdivisions/SO.json @@ -125,4 +125,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SR.json b/packages/countries/subdivisions/SR.json index 22b3ae50d..6af2bfc6b 100644 --- a/packages/countries/subdivisions/SR.json +++ b/packages/countries/subdivisions/SR.json @@ -69,4 +69,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SS.json b/packages/countries/subdivisions/SS.json index 1cfa92c83..df225e41c 100644 --- a/packages/countries/subdivisions/SS.json +++ b/packages/countries/subdivisions/SS.json @@ -69,4 +69,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/ST.json b/packages/countries/subdivisions/ST.json index f8f0a4cfb..8873ec524 100644 --- a/packages/countries/subdivisions/ST.json +++ b/packages/countries/subdivisions/ST.json @@ -13,4 +13,4 @@ "parent_code": null, "type": "Municipality" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SV.json b/packages/countries/subdivisions/SV.json index ab3661c6a..cf84337d7 100644 --- a/packages/countries/subdivisions/SV.json +++ b/packages/countries/subdivisions/SV.json @@ -97,4 +97,4 @@ "parent_code": null, "type": "Department" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SY.json b/packages/countries/subdivisions/SY.json index e6d531783..6091f87bb 100644 --- a/packages/countries/subdivisions/SY.json +++ b/packages/countries/subdivisions/SY.json @@ -97,4 +97,4 @@ "parent_code": null, "type": "Governorate" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/SZ.json b/packages/countries/subdivisions/SZ.json index 158dfccbd..57347a6ea 100644 --- a/packages/countries/subdivisions/SZ.json +++ b/packages/countries/subdivisions/SZ.json @@ -27,4 +27,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/TD.json b/packages/countries/subdivisions/TD.json index 056f93b7f..00419df03 100644 --- a/packages/countries/subdivisions/TD.json +++ b/packages/countries/subdivisions/TD.json @@ -153,4 +153,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/TG.json b/packages/countries/subdivisions/TG.json index 7676f2bab..15b5b6355 100644 --- a/packages/countries/subdivisions/TG.json +++ b/packages/countries/subdivisions/TG.json @@ -34,4 +34,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/TH.json b/packages/countries/subdivisions/TH.json index ce735229f..32aa58d9e 100644 --- a/packages/countries/subdivisions/TH.json +++ b/packages/countries/subdivisions/TH.json @@ -538,4 +538,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/TJ.json b/packages/countries/subdivisions/TJ.json index f121e6081..97b7de4a7 100644 --- a/packages/countries/subdivisions/TJ.json +++ b/packages/countries/subdivisions/TJ.json @@ -20,4 +20,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/TL.json b/packages/countries/subdivisions/TL.json index 662950633..2b87fd495 100644 --- a/packages/countries/subdivisions/TL.json +++ b/packages/countries/subdivisions/TL.json @@ -90,4 +90,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/TM.json b/packages/countries/subdivisions/TM.json index e069cd761..ea2642f97 100644 --- a/packages/countries/subdivisions/TM.json +++ b/packages/countries/subdivisions/TM.json @@ -41,4 +41,4 @@ "parent_code": null, "type": "City" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/TN.json b/packages/countries/subdivisions/TN.json index 30caaa079..d28ca586d 100644 --- a/packages/countries/subdivisions/TN.json +++ b/packages/countries/subdivisions/TN.json @@ -167,4 +167,4 @@ "parent_code": null, "type": "Governorate" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/TO.json b/packages/countries/subdivisions/TO.json index 355df8a9d..0bf722794 100644 --- a/packages/countries/subdivisions/TO.json +++ b/packages/countries/subdivisions/TO.json @@ -34,4 +34,4 @@ "parent_code": null, "type": "Division" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/TR.json b/packages/countries/subdivisions/TR.json index 05feeda49..3f466f1cf 100644 --- a/packages/countries/subdivisions/TR.json +++ b/packages/countries/subdivisions/TR.json @@ -566,4 +566,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/TT.json b/packages/countries/subdivisions/TT.json index 143ca32ad..a4a5a5673 100644 --- a/packages/countries/subdivisions/TT.json +++ b/packages/countries/subdivisions/TT.json @@ -111,4 +111,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/TV.json b/packages/countries/subdivisions/TV.json index ff8f05539..1ce6036d8 100644 --- a/packages/countries/subdivisions/TV.json +++ b/packages/countries/subdivisions/TV.json @@ -55,4 +55,4 @@ "parent_code": null, "type": "Island council" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/TW.json b/packages/countries/subdivisions/TW.json index 8b14423ed..15bee8d2f 100644 --- a/packages/countries/subdivisions/TW.json +++ b/packages/countries/subdivisions/TW.json @@ -160,4 +160,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/TZ.json b/packages/countries/subdivisions/TZ.json index eeb640029..2c9c2671e 100644 --- a/packages/countries/subdivisions/TZ.json +++ b/packages/countries/subdivisions/TZ.json @@ -181,4 +181,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/UA.json b/packages/countries/subdivisions/UA.json index c5707a8cd..041229195 100644 --- a/packages/countries/subdivisions/UA.json +++ b/packages/countries/subdivisions/UA.json @@ -188,4 +188,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/UG.json b/packages/countries/subdivisions/UG.json index 86f62b360..4ce95e6a6 100644 --- a/packages/countries/subdivisions/UG.json +++ b/packages/countries/subdivisions/UG.json @@ -587,4 +587,4 @@ "parent_code": null, "type": "Geographical region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/US.json b/packages/countries/subdivisions/US.json index 23bc2a4d4..dc419dc98 100644 --- a/packages/countries/subdivisions/US.json +++ b/packages/countries/subdivisions/US.json @@ -398,4 +398,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/UY.json b/packages/countries/subdivisions/UY.json index 2d4017f57..f6ecaa5e8 100644 --- a/packages/countries/subdivisions/UY.json +++ b/packages/countries/subdivisions/UY.json @@ -132,4 +132,4 @@ "parent_code": null, "type": "Department" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/UZ.json b/packages/countries/subdivisions/UZ.json index 494492fce..257673f16 100644 --- a/packages/countries/subdivisions/UZ.json +++ b/packages/countries/subdivisions/UZ.json @@ -97,4 +97,4 @@ "parent_code": null, "type": "Region" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/VC.json b/packages/countries/subdivisions/VC.json index fc82cdddc..043f25a13 100644 --- a/packages/countries/subdivisions/VC.json +++ b/packages/countries/subdivisions/VC.json @@ -41,4 +41,4 @@ "parent_code": null, "type": "Parish" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/VE.json b/packages/countries/subdivisions/VE.json index 8d814fac2..916b17f34 100644 --- a/packages/countries/subdivisions/VE.json +++ b/packages/countries/subdivisions/VE.json @@ -174,4 +174,4 @@ "parent_code": null, "type": "State" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/VN.json b/packages/countries/subdivisions/VN.json index 401d41c8b..6b90128de 100644 --- a/packages/countries/subdivisions/VN.json +++ b/packages/countries/subdivisions/VN.json @@ -447,4 +447,4 @@ "parent_code": null, "type": "Municipality" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/VU.json b/packages/countries/subdivisions/VU.json index 7a73f028e..1de26bf89 100644 --- a/packages/countries/subdivisions/VU.json +++ b/packages/countries/subdivisions/VU.json @@ -41,4 +41,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/WS.json b/packages/countries/subdivisions/WS.json index 1982c5c0d..304cac567 100644 --- a/packages/countries/subdivisions/WS.json +++ b/packages/countries/subdivisions/WS.json @@ -76,4 +76,4 @@ "parent_code": null, "type": "District" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/YE.json b/packages/countries/subdivisions/YE.json index 6f10beefc..57fa97f04 100644 --- a/packages/countries/subdivisions/YE.json +++ b/packages/countries/subdivisions/YE.json @@ -139,4 +139,4 @@ "parent_code": null, "type": "Governorate" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/ZA.json b/packages/countries/subdivisions/ZA.json index 01a37fa8a..831543139 100644 --- a/packages/countries/subdivisions/ZA.json +++ b/packages/countries/subdivisions/ZA.json @@ -62,4 +62,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/ZM.json b/packages/countries/subdivisions/ZM.json index db5a832ba..48061680b 100644 --- a/packages/countries/subdivisions/ZM.json +++ b/packages/countries/subdivisions/ZM.json @@ -62,4 +62,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/countries/subdivisions/ZW.json b/packages/countries/subdivisions/ZW.json index b814caff0..540f920ae 100644 --- a/packages/countries/subdivisions/ZW.json +++ b/packages/countries/subdivisions/ZW.json @@ -69,4 +69,4 @@ "parent_code": null, "type": "Province" } -] \ No newline at end of file +] diff --git a/packages/eslint-config-react/README.md b/packages/eslint-config-react/README.md index aa1281901..c6b517fc9 100644 --- a/packages/eslint-config-react/README.md +++ b/packages/eslint-config-react/README.md @@ -23,6 +23,7 @@ Add to your `.eslintrc` ``` Or for Typescript + ```json { "extends": "@scaleway/react/typescript", diff --git a/packages/jest-helpers/README.md b/packages/jest-helpers/README.md index 81c783235..394844c83 100644 --- a/packages/jest-helpers/README.md +++ b/packages/jest-helpers/README.md @@ -15,9 +15,7 @@ $ pnpm add @scaleway/jest-functions ```tsx import makeHelpers from '@scaleway/jest-helpers' -const Wrapper = ({ children }) => ( - {children} -) +const Wrapper = ({ children }) => {children} export const { renderWithTheme, @@ -52,9 +50,7 @@ export const { ```tsx import makeHelpers from '@scaleway/jest-helpers' -const Wrapper = ({ children }) => ( - {children} -) +const Wrapper = ({ children }) => {children} export const { renderWithTheme, diff --git a/packages/jest-helpers/src/__tests__/index.test.tsx b/packages/jest-helpers/src/__tests__/index.test.tsx index beefd9578..208b5a6e8 100644 --- a/packages/jest-helpers/src/__tests__/index.test.tsx +++ b/packages/jest-helpers/src/__tests__/index.test.tsx @@ -1,6 +1,6 @@ import React from 'react' -import makeHelpers from ".." -import { RenderWithThemeFn } from "../helpers/renderWithTheme" +import makeHelpers from '..' +import { RenderWithThemeFn } from '../helpers/renderWithTheme' import { ShouldMatchEmotionSnapshotFn } from '../helpers/shouldMatchEmotionSnapshot' import { ShouldMatchEmotionSnapshotWithPortalFn } from '../helpers/shouldMatchEmotionSnapshotWithPortal' @@ -11,19 +11,18 @@ describe('@jest-helpers', () => { beforeAll(() => { const helpers = makeHelpers(({ children }) => ( -
- {children} -
+
{children}
)) renderWithTheme = helpers.renderWithTheme shouldMatchEmotionSnapshot = helpers.shouldMatchEmotionSnapshot - shouldMatchEmotionSnapshotWithPortal = helpers.shouldMatchEmotionSnapshotWithPortal + shouldMatchEmotionSnapshotWithPortal = + helpers.shouldMatchEmotionSnapshotWithPortal }) test('should render with renderWithTheme', () => { const node = renderWithTheme(
) - const element = node.getByTestId("test") + const element = node.getByTestId('test') expect(element).toMatchSnapshot() }) @@ -49,4 +48,4 @@ describe('@jest-helpers', () => { expect(transform).toHaveBeenCalledTimes(1) }) -}) \ No newline at end of file +}) diff --git a/packages/jest-helpers/src/helpers/renderWithTheme.tsx b/packages/jest-helpers/src/helpers/renderWithTheme.tsx index 877b1e914..62d8b8a36 100644 --- a/packages/jest-helpers/src/helpers/renderWithTheme.tsx +++ b/packages/jest-helpers/src/helpers/renderWithTheme.tsx @@ -9,14 +9,19 @@ const emotionCache = createCache({ emotionCache.compat = true -export type RenderWithThemeFn = (component: ReactNode, options?: RenderOptions, theme?: Theme) => ReturnType +export type RenderWithThemeFn = ( + component: ReactNode, + options?: RenderOptions, + theme?: Theme, +) => ReturnType -export default function makeRenderWithTheme(Wrapper: FC<{ theme?: Theme }>): RenderWithThemeFn { - return (component, options, theme) => render( +export default function makeRenderWithTheme( + Wrapper: FC<{ theme?: Theme }>, +): RenderWithThemeFn { + return (component, options, theme) => + render( - - {component} - + {component} , options, ) diff --git a/packages/jest-helpers/src/helpers/shouldMatchEmotionSnapshot.ts b/packages/jest-helpers/src/helpers/shouldMatchEmotionSnapshot.ts index ffbb096e0..b77eaa60b 100644 --- a/packages/jest-helpers/src/helpers/shouldMatchEmotionSnapshot.ts +++ b/packages/jest-helpers/src/helpers/shouldMatchEmotionSnapshot.ts @@ -8,9 +8,14 @@ interface Options { theme?: Theme } -export type ShouldMatchEmotionSnapshotFn = (component: ReactNode, options?: Options) => Promise +export type ShouldMatchEmotionSnapshotFn = ( + component: ReactNode, + options?: Options, +) => Promise -export default function makeShouldMatchEmotionSnapshot(renderWithTheme: RenderWithThemeFn): ShouldMatchEmotionSnapshotFn { +export default function makeShouldMatchEmotionSnapshot( + renderWithTheme: RenderWithThemeFn, +): ShouldMatchEmotionSnapshotFn { return async (component, { options, transform, theme } = {}) => { const node = renderWithTheme(component, options, theme) if (transform) await transform(node) diff --git a/packages/jest-helpers/src/helpers/shouldMatchEmotionSnapshotWithPortal.ts b/packages/jest-helpers/src/helpers/shouldMatchEmotionSnapshotWithPortal.ts index 81dd95769..4fedd1059 100644 --- a/packages/jest-helpers/src/helpers/shouldMatchEmotionSnapshotWithPortal.ts +++ b/packages/jest-helpers/src/helpers/shouldMatchEmotionSnapshotWithPortal.ts @@ -8,9 +8,14 @@ interface Options { theme?: Theme } -export type ShouldMatchEmotionSnapshotWithPortalFn = (component: ReactNode, options?: Options) => Promise +export type ShouldMatchEmotionSnapshotWithPortalFn = ( + component: ReactNode, + options?: Options, +) => Promise -export default function makeShouldMatchEmotionSnapshotWithPortal(renderWithTheme: RenderWithThemeFn): ShouldMatchEmotionSnapshotWithPortalFn { +export default function makeShouldMatchEmotionSnapshotWithPortal( + renderWithTheme: RenderWithThemeFn, +): ShouldMatchEmotionSnapshotWithPortalFn { return async (component, { options, transform, theme } = {}) => { // Save the instance of console (disable warning about adding element directly to document.body which is necessary when testing portal components) const { console } = global diff --git a/packages/jest-helpers/src/index.ts b/packages/jest-helpers/src/index.ts index d5f9c1cab..69782ad0c 100644 --- a/packages/jest-helpers/src/index.ts +++ b/packages/jest-helpers/src/index.ts @@ -1,8 +1,14 @@ import { CreateSerializerOptions, createSerializer } from '@emotion/jest' import { FC } from 'react' -import makeRenderWithTheme, { RenderWithThemeFn } from './helpers/renderWithTheme' -import makeShouldMatchEmotionSnapshot, { ShouldMatchEmotionSnapshotFn } from './helpers/shouldMatchEmotionSnapshot' -import makeShouldMatchEmotionSnapshotWithPortal, { ShouldMatchEmotionSnapshotWithPortalFn } from './helpers/shouldMatchEmotionSnapshotWithPortal' +import makeRenderWithTheme, { + RenderWithThemeFn, +} from './helpers/renderWithTheme' +import makeShouldMatchEmotionSnapshot, { + ShouldMatchEmotionSnapshotFn, +} from './helpers/shouldMatchEmotionSnapshot' +import makeShouldMatchEmotionSnapshotWithPortal, { + ShouldMatchEmotionSnapshotWithPortalFn, +} from './helpers/shouldMatchEmotionSnapshotWithPortal' export { default as makeRenderWithTheme } from './helpers/renderWithTheme' @@ -12,14 +18,17 @@ type Helpers = { shouldMatchEmotionSnapshotWithPortal: ShouldMatchEmotionSnapshotWithPortalFn } -export default function makeHelpers(Wrapper: FC<{ theme?: Theme }>, createSerializerOptions?: CreateSerializerOptions): Helpers { - expect.addSnapshotSerializer( - createSerializer(createSerializerOptions), - ) +export default function makeHelpers( + Wrapper: FC<{ theme?: Theme }>, + createSerializerOptions?: CreateSerializerOptions, +): Helpers { + expect.addSnapshotSerializer(createSerializer(createSerializerOptions)) const renderWithTheme = makeRenderWithTheme(Wrapper) - const shouldMatchEmotionSnapshot = makeShouldMatchEmotionSnapshot(renderWithTheme) - const shouldMatchEmotionSnapshotWithPortal = makeShouldMatchEmotionSnapshotWithPortal(renderWithTheme) + const shouldMatchEmotionSnapshot = + makeShouldMatchEmotionSnapshot(renderWithTheme) + const shouldMatchEmotionSnapshotWithPortal = + makeShouldMatchEmotionSnapshotWithPortal(renderWithTheme) return { renderWithTheme, diff --git a/packages/regex/README.md b/packages/regex/README.md index bba159b94..399edcf4d 100644 --- a/packages/regex/README.md +++ b/packages/regex/README.md @@ -13,8 +13,7 @@ $ pnpm add @scaleway/regex ## Usage ```js -import { fourDigitsCode } from '@scaleway/regex' +import { fourDigitsCode } from '@scaleway/regex' const isFourDigit = fourDigitsCode.test('1234') - ``` diff --git a/packages/regex/src/__tests__/index.ts b/packages/regex/src/__tests__/index.ts index d92d73e6b..166e31c80 100644 --- a/packages/regex/src/__tests__/index.ts +++ b/packages/regex/src/__tests__/index.ts @@ -427,7 +427,6 @@ describe('@regex', () => { }) }) - describe('cron', () => { test.each([ [asciiLetters, false], diff --git a/packages/regex/src/index.ts b/packages/regex/src/index.ts index 0fe3080de..a196baf4a 100644 --- a/packages/regex/src/index.ts +++ b/packages/regex/src/index.ts @@ -1,5 +1,5 @@ export const alpha = /^[a-zA-Z]*$/ -export const alphaLower = /^[a-z]+$/ +export const alphaLower = /^[a-z]+$/ export const alphanum = /^[a-zA-Z0-9]*$/ export const alphanumdash = /^[a-zA-Z0-9-]*$/ export const alphanumdashdots = /^[a-zA-Z0-9-.]*$/ diff --git a/packages/use-i18n/README.md b/packages/use-i18n/README.md index f246435c6..3b0637dd9 100644 --- a/packages/use-i18n/README.md +++ b/packages/use-i18n/README.md @@ -169,6 +169,7 @@ The first parameter is anything that can be accepted as a valid JS Date (Date, n It accepts an `options` as second parameter which can eiter be one of predefined shorthand formats (see below) or an [Intl.DateTimeFormat `options` object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat) Shorthand formats: + ``` "long" => "February 13, 2020" "short" => (default) "Feb 13, 2020" @@ -189,23 +190,19 @@ const App = () => { formatDate(new Date(2020, 1, 13, 16, 28)), // "Feb 13, 2020" formatDate(1581607680000, 'long'), // "February 13, 2020" formatDate('2020-02-13T15:28:00.000Z', { - day: "numeric", - era: "short", - hour: "2-digit", - minute: "numeric", - month: "narrow", - second: "2-digit", - timeZoneName: "long", - weekday: "long", - year: "2-digit", - }) // "Thursday, F 13, 20 AD, 04:28:00 PM Central European Standard Time"" + day: 'numeric', + era: 'short', + hour: '2-digit', + minute: 'numeric', + month: 'narrow', + second: '2-digit', + timeZoneName: 'long', + weekday: 'long', + year: '2-digit', + }), // "Thursday, F 13, 20 AD, 04:28:00 PM Central European Standard Time"" ] - return ( -
- {units} -
- ) + return
{units}
} ``` @@ -226,15 +223,11 @@ const App = () => { const cities = [ formatList(['Paris', 'New York', 'London']), // Paris, New York and London formatList(['Paris', 'New York', 'London'], { - type: 'disjunction' - }) // Paris, New York or London + type: 'disjunction', + }), // Paris, New York or London ] - return ( -
- {cities} -
- ) + return
{cities}
} ``` @@ -245,12 +238,12 @@ This hook also exposes a `formatUnit` function which can be used to format bits/ We follow the IEC standard (base 10) with SI units (kilo,mega,giga,...) [more info here](https://en.wikipedia.org/wiki/Binary_prefix) It accepts an `options` as second parameter: + - `unit`: Manadatory (see below) - `maximumFractionDigits`: The maximum number of fraction digits to use - `minimumFractionDigits`: The minimum number of fraction digits to use - `short`: if it should output the short or long form of the unit (think `Kb` vs `kilobits`) - ```js import { useI18n } from '@scaleway/use-i18n' @@ -260,22 +253,20 @@ const App = () => { const units = [ formatUnit(12, { unit: 'kilobyte' }), // "12 KB" or "12 Ko" in fr an ro formatUnit(10 ** 8, { unit: 'bytes-humanized' }), // "100 MB" or "100 Mo" in fr an ro - formatUnit(10 ** 8, { unit: 'bits-per-second-humanized' }) // "100Mbs" + formatUnit(10 ** 8, { unit: 'bits-per-second-humanized' }), // "100Mbs" ] - return ( -
- {units} -
- ) + return
{units}
} ``` We currently support two different unit: + - byte - bit With each some variants : + - `(kilo|mega|giga|tera|peta|exa|zetta|yotta)(bit|byte)`: This is the bare unit - `formatUnit(12, { unit: 'megabyte' })` => `"12 MB"` or `"12 Mo"` (in fr/ro) - `formatUnit(12, { unit: 'kilobit' })` => `"12 Kb"` @@ -288,6 +279,7 @@ With each some variants : - `formatUnit(123456789, { unit: 'kilobyte-humanized' })` => `"123456.78 KB"` or `"123456.78 Ko"` (in fr/ro) There is also a compound variant which can only be used with bits: + - `(kilo|mega|giga|tera|peta|exa|zetta|yotta)bit-per-second` - `formatUnit(1.6, { unit: 'gigabit-per-second' })` => `1.6 Gbps` - `formatUnit(1.6, { unit: 'bit-per-second' })` => `1.6 bps` @@ -297,8 +289,8 @@ There is also a compound variant which can only be used with bits: - `formatUnit(123456789, { unit: 'gigabit-per-second-humanized' })` => `0.12 Gbps` - `formatUnit(123456789, { unit: 'kilobit-per-second-humanized' })` => `123456.78 Kbps` - Here is the full list of available units: + ``` bits-humanized bits-per-second-humanized diff --git a/packages/use-i18n/src/__tests__/formatDate.ts b/packages/use-i18n/src/__tests__/formatDate.ts index 71e466a94..f9979c709 100644 --- a/packages/use-i18n/src/__tests__/formatDate.ts +++ b/packages/use-i18n/src/__tests__/formatDate.ts @@ -9,7 +9,7 @@ const tests = [ 'new Date(2020, 1, 13, 16, 28)', locale, new Date(2020, 1, 13, 16, 28), - ]) + ]), ]), ...locales.map(locale => [ ...supportedFormats.map(format => [ @@ -17,7 +17,7 @@ const tests = [ '1581607680000', locale, 1581607680000, - ]) + ]), ]), ...locales.map(locale => [ ...supportedFormats.map(format => [ @@ -25,36 +25,35 @@ const tests = [ '2020-02-13T15:28:00.000Z', locale, '2020-02-13T15:28:00.000Z', - ]) + ]), ]), ].flat() as [FormatDateOptions, string, string, Date | string | number][] describe('formatDate', () => { - test.each(tests)('should work with format "%s", for date = "%s" and locale "%s"', (format, _, locale, date) => { - expect( - formatDate(locale, date, format), - ).toMatchSnapshot() - }) + test.each(tests)( + 'should work with format "%s", for date = "%s" and locale "%s"', + (format, _, locale, date) => { + expect(formatDate(locale, date, format)).toMatchSnapshot() + }, + ) - test.each(locales)('should work with custom format and locale %s', (locale) => { + test.each(locales)('should work with custom format and locale %s', locale => { const format: FormatDateOptions = { - day: "numeric", - era: "short", - hour: "2-digit", - minute: "numeric", - month: "narrow", - second: "2-digit", - timeZoneName: "long", - weekday: "long", - year: "2-digit", + day: 'numeric', + era: 'short', + hour: '2-digit', + minute: 'numeric', + month: 'narrow', + second: '2-digit', + timeZoneName: 'long', + weekday: 'long', + year: '2-digit', } expect( formatDate(locale, new Date(2020, 1, 13, 16, 28), format), ).toMatchSnapshot() - expect( - formatDate(locale, 1581607680000, format), - ).toMatchSnapshot() + expect(formatDate(locale, 1581607680000, format)).toMatchSnapshot() expect( formatDate(locale, '2020-02-13T15:28:00.000Z', format), ).toMatchSnapshot() @@ -71,6 +70,8 @@ describe('formatDate', () => { expect(() => // @ts-expect-error we check a failing case formatDate('fr', 1581607680000, 'not a valid format'), - ).toThrowError('format "not a valid format" should be one of hour, hourOnly, long, short, shortWithoutDay, numeric, numericHour or a valid Intl.DateTimeFormat options object') + ).toThrowError( + 'format "not a valid format" should be one of hour, hourOnly, long, short, shortWithoutDay, numeric, numericHour or a valid Intl.DateTimeFormat options object', + ) }) }) diff --git a/packages/use-i18n/src/__tests__/formatUnit.ts b/packages/use-i18n/src/__tests__/formatUnit.ts index 0dd2892ca..b229278ca 100644 --- a/packages/use-i18n/src/__tests__/formatUnit.ts +++ b/packages/use-i18n/src/__tests__/formatUnit.ts @@ -53,7 +53,11 @@ describe('formatUnit', () => { test.each(tests)('%s %o', (_, options, locale, amount) => { expect( - formatUnit(locale as string, amount as number, options as FormatUnitOptions), + formatUnit( + locale as string, + amount as number, + options as FormatUnitOptions, + ), ).toMatchSnapshot() }) }) diff --git a/packages/use-i18n/src/__tests__/locales/en.json b/packages/use-i18n/src/__tests__/locales/en.json index bf5782609..31bf99601 100644 --- a/packages/use-i18n/src/__tests__/locales/en.json +++ b/packages/use-i18n/src/__tests__/locales/en.json @@ -1,6 +1,5 @@ { - "plurals": - "You have {numPhotos, plural, =0 {no photos.} =1 {one photo.} other {# photos.}}", + "plurals": "You have {numPhotos, plural, =0 {no photos.} =1 {one photo.} other {# photos.}}", "subtitle": "Here is a subtitle", "tests.test.namespaces": "test", "title": "Welcome on @scaelway/ui i18n hook" diff --git a/packages/use-i18n/src/__tests__/locales/es.json b/packages/use-i18n/src/__tests__/locales/es.json index 6a504bd59..88d1da05d 100644 --- a/packages/use-i18n/src/__tests__/locales/es.json +++ b/packages/use-i18n/src/__tests__/locales/es.json @@ -1,6 +1,5 @@ { - "plurals": - "You have {numPhotos, plural, =0 {no photos.} =1 {one photo.} other {# photos.}}", + "plurals": "You have {numPhotos, plural, =0 {no photos.} =1 {one photo.} other {# photos.}}", "subtitle": "Aquí hay un subtítulo", "tests.test.namespaces": "test", "title": "Bienvenido @scaelway/ui i18n hook" diff --git a/packages/use-i18n/src/__tests__/locales/fr.json b/packages/use-i18n/src/__tests__/locales/fr.json index 7b70b685d..d3bd10a59 100644 --- a/packages/use-i18n/src/__tests__/locales/fr.json +++ b/packages/use-i18n/src/__tests__/locales/fr.json @@ -1,6 +1,5 @@ { - "plurals": - "You have {numPhotos, plural, =0 {no photos.} =1 {one photo.} other {# photos.}}", + "plurals": "You have {numPhotos, plural, =0 {no photos.} =1 {one photo.} other {# photos.}}", "subtitle": "Voici un sous-titre", "tests.test.namespaces": "test", "title": "Bienvenue sur @scaelway/ui i18n hook" diff --git a/packages/use-i18n/src/__tests__/locales/namespaces/en/user.json b/packages/use-i18n/src/__tests__/locales/namespaces/en/user.json index d19192699..5f1bbd56f 100644 --- a/packages/use-i18n/src/__tests__/locales/namespaces/en/user.json +++ b/packages/use-i18n/src/__tests__/locales/namespaces/en/user.json @@ -1,6 +1,6 @@ { - "prefix":"user", + "prefix": "user", "name": "Name", "lastName": "Last Name", - "languages":"Languages" + "languages": "Languages" } diff --git a/packages/use-i18n/src/__tests__/locales/namespaces/fr/user.json b/packages/use-i18n/src/__tests__/locales/namespaces/fr/user.json index f5255d91c..14303b2e6 100644 --- a/packages/use-i18n/src/__tests__/locales/namespaces/fr/user.json +++ b/packages/use-i18n/src/__tests__/locales/namespaces/fr/user.json @@ -1,5 +1,5 @@ { - "prefix":"user", + "prefix": "user", "name": "Prénom", "lastName": "Nom" } diff --git a/packages/use-i18n/src/__tests__/usei18n.tsx b/packages/use-i18n/src/__tests__/usei18n.tsx index 83b2458d7..0f03b45b7 100644 --- a/packages/use-i18n/src/__tests__/usei18n.tsx +++ b/packages/use-i18n/src/__tests__/usei18n.tsx @@ -10,8 +10,10 @@ const LOCALE_ITEM_STORAGE = 'locales' const wrapper = ({ - loadDateLocale = async (locale: string) => import(`date-fns/locale/${locale}/index`), - defaultLoad = async ({ locale }: { locale: string }) => import(`./locales/${locale}.json`), + loadDateLocale = async (locale: string) => + import(`date-fns/locale/${locale}/index`), + defaultLoad = async ({ locale }: { locale: string }) => + import(`./locales/${locale}.json`), defaultLocale = 'en', defaultTranslations = {}, enableDebugKey = false, @@ -85,8 +87,13 @@ describe('i18n hook', () => { }) it('should use specific load on useTranslation', async () => { - const load = async ({ locale, namespace }: { locale: string, namespace: string }) => - import(`./locales/namespaces/${locale}/${namespace}.json`) + const load = async ({ + locale, + namespace, + }: { + locale: string + namespace: string + }) => import(`./locales/namespaces/${locale}/${namespace}.json`) const { result, waitForNextUpdate } = renderHook( () => useTranslation(['user', 'profile'], load), @@ -144,8 +151,13 @@ describe('i18n hook', () => { }) it("should use specific load and fallback default local if the key doesn't exist", async () => { - const load = async ({ locale, namespace }: { locale: string, namespace: string }) => - import(`./locales/namespaces/${locale}/${namespace}.json`) + const load = async ({ + locale, + namespace, + }: { + locale: string + namespace: string + }) => import(`./locales/namespaces/${locale}/${namespace}.json`) const { result, waitForNextUpdate } = renderHook( () => useTranslation(['user'], load), @@ -183,10 +195,13 @@ describe('i18n hook', () => { }) it('should set current locale from navigator languages', async () => { - jest.spyOn(window, 'navigator', 'get').mockImplementation(() => ({ - language: 'en-US', - languages: ['en-US', 'en'], - }) as unknown as Navigator) + jest.spyOn(window, 'navigator', 'get').mockImplementation( + () => + ({ + language: 'en-US', + languages: ['en-US', 'en'], + } as unknown as Navigator), + ) const { result, waitForNextUpdate } = renderHook(() => useI18n(), { wrapper: wrapper({ defaultLocale: 'fr', @@ -198,10 +213,13 @@ describe('i18n hook', () => { }) it('should set current locale from navigator language', async () => { - jest.spyOn(window, 'navigator', 'get').mockImplementation(() => ({ - language: 'en', - languages: undefined, - }) as unknown as Navigator) + jest.spyOn(window, 'navigator', 'get').mockImplementation( + () => + ({ + language: 'en', + languages: undefined, + } as unknown as Navigator), + ) const { result, waitForNextUpdate } = renderHook(() => useI18n(), { wrapper: wrapper({ defaultLocale: 'fr', diff --git a/packages/use-i18n/src/formatDate.ts b/packages/use-i18n/src/formatDate.ts index 032c6df6b..220d143e6 100644 --- a/packages/use-i18n/src/formatDate.ts +++ b/packages/use-i18n/src/formatDate.ts @@ -37,32 +37,59 @@ const complexFormatOptions = { // Expected output format: 2020-02-13 numeric: (date: Date): string => formatISO(date, { representation: 'date' }), // Expected output format: 2020-02-13 4:28 PM - numericHour: (date: Date, locale: string): string => `${formatISO(date, { representation: 'date' })} ${intlFormat(date, formatOptions.hourOnly as Intl.DateTimeFormatOptions, { locale })}`, + numericHour: (date: Date, locale: string): string => + `${formatISO(date, { representation: 'date' })} ${intlFormat( + date, + formatOptions.hourOnly as Intl.DateTimeFormatOptions, + { locale }, + )}`, } -export const supportedFormats = [...Object.keys(formatOptions), ...Object.keys(complexFormatOptions)] +export const supportedFormats = [ + ...Object.keys(formatOptions), + ...Object.keys(complexFormatOptions), +] -export type FormatDateOptions = keyof typeof formatOptions | keyof typeof complexFormatOptions | Intl.DateTimeFormatOptions +export type FormatDateOptions = + | keyof typeof formatOptions + | keyof typeof complexFormatOptions + | Intl.DateTimeFormatOptions const formatDate = ( locale: string, date: Date | number | string, format: FormatDateOptions = 'short', ): string => { - if (typeof format === 'string' && !((`${format}` in formatOptions) || (`${format}` in complexFormatOptions))) { - throw new Error(`format "${format}" should be one of ${supportedFormats.join(', ')} or a valid Intl.DateTimeFormat options object`) + if ( + typeof format === 'string' && + !(`${format}` in formatOptions || `${format}` in complexFormatOptions) + ) { + throw new Error( + `format "${format}" should be one of ${supportedFormats.join( + ', ', + )} or a valid Intl.DateTimeFormat options object`, + ) } - const properDate: Date = typeof date === 'string' || typeof date === 'number' ? new Date(date) : date + const properDate: Date = + typeof date === 'string' || typeof date === 'number' ? new Date(date) : date if (typeof format === 'string' && `${format}` in complexFormatOptions) { - return complexFormatOptions[format as keyof typeof complexFormatOptions](properDate, locale) + return complexFormatOptions[format as keyof typeof complexFormatOptions]( + properDate, + locale, + ) } - const options = typeof format === 'string' ? formatOptions[format as keyof typeof formatOptions] : format + const options = + typeof format === 'string' + ? formatOptions[format as keyof typeof formatOptions] + : format if (properDate instanceof Date) { - return intlFormat(properDate, options as Intl.DateTimeFormatOptions, { locale }) + return intlFormat(properDate, options as Intl.DateTimeFormatOptions, { + locale, + }) } return properDate diff --git a/packages/use-i18n/src/formatUnit.ts b/packages/use-i18n/src/formatUnit.ts index 28c989b46..03602c817 100644 --- a/packages/use-i18n/src/formatUnit.ts +++ b/packages/use-i18n/src/formatUnit.ts @@ -15,7 +15,16 @@ const exponents = [ ] type Exponent = typeof exponents[number] -type ExponentName = '' | 'kilo' | 'mega' | 'giga' | 'tera' | 'peta' | 'exa' | 'zetta' | 'yotta' +type ExponentName = + | '' + | 'kilo' + | 'mega' + | 'giga' + | 'tera' + | 'peta' + | 'exa' + | 'zetta' + | 'yotta' const frOctet = { plural: 'octets', @@ -57,7 +66,12 @@ const compoundUnitsSymbols = { type Unit = 'bit' | 'byte' type CompoundUnit = 'second' -const formatShortUnit = (locale: string, exponent: Exponent, unit: Unit, compoundUnit?: CompoundUnit) => { +const formatShortUnit = ( + locale: string, + exponent: Exponent, + unit: Unit, + compoundUnit?: CompoundUnit, +) => { let shortenedUnit = symbols.short[unit] if ( @@ -72,37 +86,62 @@ const formatShortUnit = (locale: string, exponent: Exponent, unit: Unit, compoun }` } -const formatLongUnit = (locale: string, exponent: Exponent, unit: Unit, amount: number) => { +const formatLongUnit = ( + locale: string, + exponent: Exponent, + unit: Unit, + amount: number, +) => { let translation = symbols.long[unit] if ( unit === 'byte' && Object.keys(localesWhoFavorOctetOverByte).includes(locale) ) { - translation = localesWhoFavorOctetOverByte[locale as keyof typeof localesWhoFavorOctetOverByte] + translation = + localesWhoFavorOctetOverByte[ + locale as keyof typeof localesWhoFavorOctetOverByte + ] } - return `${exponent.name}${formatters.getTranslationFormat( - `{amount, plural, + return `${exponent.name}${ + formatters + .getTranslationFormat( + `{amount, plural, =0 {${translation.singular}} =1 {${translation.singular}} other {${translation.plural}} }`, - locale, - ).format({ amount }) as string}` + locale, + ) + .format({ amount }) as string + }` } const format = - ({ compoundUnit, exponent, unit, humanize = false }: { - compoundUnit?: CompoundUnit, - unit: Unit, - exponent?: Exponent, - humanize?: boolean, + ({ + compoundUnit, + exponent, + unit, + humanize = false, + }: { + compoundUnit?: CompoundUnit + unit: Unit + exponent?: Exponent + humanize?: boolean }) => ( locale: string, amount: number, - { maximumFractionDigits, minimumFractionDigits, short = true }: { maximumFractionDigits?: number, minimumFractionDigits?: number, short?: boolean }, + { + maximumFractionDigits, + minimumFractionDigits, + short = true, + }: { + maximumFractionDigits?: number + minimumFractionDigits?: number + short?: boolean + }, ): string => { let computedExponent = exponent let computedValue = amount @@ -116,14 +155,14 @@ const format = ), output: 'object', round: maximumFractionDigits, - }) as unknown as { value: number, symbol: string, exponent: number } + }) as unknown as { value: number; symbol: string; exponent: number } computedValue = value.value } else { const value = filesize(amount, { base: 10, output: 'object', round: maximumFractionDigits, - }) as unknown as { value: number, symbol: string, exponent: number } + }) as unknown as { value: number; symbol: string; exponent: number } computedExponent = exponents[value.exponent] computedValue = value.value } @@ -134,7 +173,12 @@ const format = minimumFractionDigits, }).format(computedValue)} ${ short - ? formatShortUnit(locale, computedExponent as Exponent, unit, compoundUnit) + ? formatShortUnit( + locale, + computedExponent as Exponent, + unit, + compoundUnit, + ) : formatLongUnit( locale, computedExponent as Exponent, @@ -149,7 +193,9 @@ type ComplexUnits = `${Unit}${'s' | ''}${'-humanized' | ''}` type PerSecondUnit = `bit${'s' | ''}${'-per-second' | ''}${'-humanized' | ''}` type SupportedUnits = SimpleUnits | ComplexUnits | PerSecondUnit -export const supportedUnits: Partial>> = { +export const supportedUnits: Partial< + Record> +> = { // bits 'bits-humanized': format({ humanize: true, unit: 'bit' }), 'bits-per-second-humanized': format({ @@ -202,7 +248,10 @@ export interface FormatUnitOptions { short?: boolean } -const formatUnit = (locale: string, number: number, { unit, ...options }: FormatUnitOptions): string => - supportedUnits?.[unit]?.(locale, number, options) ?? '' +const formatUnit = ( + locale: string, + number: number, + { unit, ...options }: FormatUnitOptions, +): string => supportedUnits?.[unit]?.(locale, number, options) ?? '' export default formatUnit diff --git a/packages/use-i18n/src/formatters.ts b/packages/use-i18n/src/formatters.ts index f3b1adc51..f3a6cd506 100644 --- a/packages/use-i18n/src/formatters.ts +++ b/packages/use-i18n/src/formatters.ts @@ -15,14 +15,15 @@ export interface IntlListFormatOptions { } declare abstract class IntlListFormat { - constructor(locales?: string | string[], options?: IntlListFormatOptions); + constructor(locales?: string | string[], options?: IntlListFormatOptions) - format: (items: string[]) => string; + format: (items: string[]) => string } interface BaseFormatters { getNumberFormat( - locales?: string | string[], opts?: NumberFormatOptions + locales?: string | string[], + opts?: NumberFormatOptions, ): Intl.NumberFormat getDateTimeFormat( ...args: ConstructorParameters @@ -53,24 +54,40 @@ function createFastMemoizeCache(): Cache { } const baseFormatters: BaseFormatters = { - getDateTimeFormat: memoize((...args: ConstructorParameters) => new Intl.DateTimeFormat(...args), { - cache: createFastMemoizeCache(), - strategy: strategies.variadic, - }), - // @ts-expect-error we assume Intl.ListFormat exists in our current context - // eslint-disable-next-line @typescript-eslint/no-unsafe-call - getListFormat: memoize((...args) => new Intl.ListFormat(...args) as IntlListFormat, { - cache: createFastMemoizeCache(), - strategy: strategies.variadic, - }), - getNumberFormat: memoize((...args: ConstructorParameters) => new Intl.NumberFormat(...args), { - cache: createFastMemoizeCache(), - strategy: strategies.variadic, - }), - getPluralRules: memoize((...args: ConstructorParameters) => new Intl.PluralRules(...args), { - cache: createFastMemoizeCache(), - strategy: strategies.variadic, - }), + getDateTimeFormat: memoize( + (...args: ConstructorParameters) => + new Intl.DateTimeFormat(...args), + { + cache: createFastMemoizeCache(), + strategy: strategies.variadic, + }, + ), + + getListFormat: memoize( + // @ts-expect-error we assume Intl.ListFormat exists in our current context + // eslint-disable-next-line @typescript-eslint/no-unsafe-call + (...args) => new Intl.ListFormat(...args) as IntlListFormat, + { + cache: createFastMemoizeCache(), + strategy: strategies.variadic, + }, + ), + getNumberFormat: memoize( + (...args: ConstructorParameters) => + new Intl.NumberFormat(...args), + { + cache: createFastMemoizeCache(), + strategy: strategies.variadic, + }, + ), + getPluralRules: memoize( + (...args: ConstructorParameters) => + new Intl.PluralRules(...args), + { + cache: createFastMemoizeCache(), + strategy: strategies.variadic, + }, + ), } type Formatters = BaseFormatters & { @@ -79,17 +96,28 @@ type Formatters = BaseFormatters & { ): IntlTranslationFormat } -type TranslationFormatParameter = ConstructorParameters +type TranslationFormatParameter = ConstructorParameters< + typeof IntlTranslationFormat +> const formatters: Formatters = { ...baseFormatters, - getTranslationFormat: memoize((message: TranslationFormatParameter[0], locales: TranslationFormatParameter[1], overrideFormats: TranslationFormatParameter[2], opts: TranslationFormatParameter[3]) => new IntlTranslationFormat(message, locales, overrideFormats, { - formatters: baseFormatters, - ...opts, - }), { - cache: createFastMemoizeCache(), - strategy: strategies.variadic, - }), + getTranslationFormat: memoize( + ( + message: TranslationFormatParameter[0], + locales: TranslationFormatParameter[1], + overrideFormats: TranslationFormatParameter[2], + opts: TranslationFormatParameter[3], + ) => + new IntlTranslationFormat(message, locales, overrideFormats, { + formatters: baseFormatters, + ...opts, + }), + { + cache: createFastMemoizeCache(), + strategy: strategies.variadic, + }, + ), } export default formatters diff --git a/packages/use-i18n/src/usei18n.tsx b/packages/use-i18n/src/usei18n.tsx index b3c1ccc2e..3b6a1f273 100644 --- a/packages/use-i18n/src/usei18n.tsx +++ b/packages/use-i18n/src/usei18n.tsx @@ -1,5 +1,9 @@ import type { NumberFormatOptions } from '@formatjs/ecma402-abstract' -import { Locale, formatDistanceToNow, formatDistanceToNowStrict } from 'date-fns' +import { + Locale, + formatDistanceToNow, + formatDistanceToNowStrict, +} from 'date-fns' import PropTypes from 'prop-types' import React, { ReactElement, @@ -18,21 +22,26 @@ import formatters, { IntlListFormatOptions } from './formatters' const LOCALE_ITEM_STORAGE = 'locale' -type PrimitiveType = string | number | boolean | null | undefined | Date; +type PrimitiveType = string | number | boolean | null | undefined | Date type Translations = Record & { prefix?: string } type TranslationsByLocales = Record -type TranslateFn = (key: string, context?: Record) => string +type TranslateFn = ( + key: string, + context?: Record, +) => string const prefixKeys = (prefix: string) => (obj: { [key: string]: string }) => - Object.keys(obj).reduce((acc: { [key: string ]: string }, key) => { + Object.keys(obj).reduce((acc: { [key: string]: string }, key) => { acc[`${prefix}${key}`] = obj[key] return acc }, {}) -const areNamespacesLoaded = (namespaces: string[], loadedNamespaces: string[] = []) => - namespaces.every(n => loadedNamespaces.includes(n)) +const areNamespacesLoaded = ( + namespaces: string[], + loadedNamespaces: string[] = [], +) => namespaces.every(n => loadedNamespaces.includes(n)) const getLocaleFallback = (locale: string) => locale.split('-')[0].split('_')[0] @@ -41,9 +50,9 @@ const getCurrentLocale = ({ supportedLocales, localeItemStorage, }: { - defaultLocale: string, - supportedLocales: string[], - localeItemStorage: string, + defaultLocale: string + supportedLocales: string[] + localeItemStorage: string }): string => { const languages = navigator.languages || [navigator.language] const browserLocales = [...new Set(languages.map(getLocaleFallback))] @@ -58,29 +67,44 @@ const getCurrentLocale = ({ interface Context { currentLocale: string - dateFnsLocale?: Locale, - datetime: (date: Date | number, options?: Intl.DateTimeFormatOptions) => string, - formatDate: (value: Date | number | string, options?: FormatDateOptions) => string, - formatList: (listFormat: string[], options?: IntlListFormatOptions) => string, - formatNumber: (numb: number, options?: NumberFormatOptions) => string, - formatUnit: (value: number, options: FormatUnitOptions) => string, - loadTranslations: (namespace: string, load?: LoadTranslationsFn) => Promise, - locales: string[], - namespaces: string[], + dateFnsLocale?: Locale + datetime: ( + date: Date | number, + options?: Intl.DateTimeFormatOptions, + ) => string + formatDate: ( + value: Date | number | string, + options?: FormatDateOptions, + ) => string + formatList: (listFormat: string[], options?: IntlListFormatOptions) => string + formatNumber: (numb: number, options?: NumberFormatOptions) => string + formatUnit: (value: number, options: FormatUnitOptions) => string + loadTranslations: ( + namespace: string, + load?: LoadTranslationsFn, + ) => Promise + locales: string[] + namespaces: string[] namespaceTranslation: (namespace: string, t?: TranslateFn) => TranslateFn - relativeTime: (date: Date | number, options?: { - includeSeconds?: boolean; - addSuffix?: boolean; - }) => string, - relativeTimeStrict: (date: Date | number, options?: { - addSuffix?: boolean; - unit?: 'second' | 'minute' | 'hour' | 'day' | 'month' | 'year'; - roundingMethod?: 'floor' | 'ceil' | 'round'; - }) => string, - setTranslations: React.Dispatch>, - switchLocale: (locale: string) => void, - t: TranslateFn, - translations: TranslationsByLocales, + relativeTime: ( + date: Date | number, + options?: { + includeSeconds?: boolean + addSuffix?: boolean + }, + ) => string + relativeTimeStrict: ( + date: Date | number, + options?: { + addSuffix?: boolean + unit?: 'second' | 'minute' | 'hour' | 'day' | 'month' | 'year' + roundingMethod?: 'floor' | 'ceil' | 'round' + }, + ) => string + setTranslations: React.Dispatch> + switchLocale: (locale: string) => void + t: TranslateFn + translations: TranslationsByLocales } const I18nContext = createContext(undefined) @@ -94,7 +118,10 @@ export const useI18n = (): Context => { return context } -export const useTranslation = (namespaces: string[] = [], load: LoadTranslationsFn | undefined = undefined): Context & { isLoaded: boolean } => { +export const useTranslation = ( + namespaces: string[] = [], + load: LoadTranslationsFn | undefined = undefined, +): Context & { isLoaded: boolean } => { const context = useContext(I18nContext) if (context === undefined) { throw new Error('useTranslation must be used within a I18nProvider') @@ -103,7 +130,9 @@ export const useTranslation = (namespaces: string[] = [], load: LoadTranslations const key = namespaces.join(',') useEffect(() => { - key.split(',').map(async (namespace: string) => loadTranslations?.(namespace, load)) + key + .split(',') + .map(async (namespace: string) => loadTranslations?.(namespace, load)) }, [loadTranslations, key, load]) const isLoaded = useMemo( @@ -114,7 +143,13 @@ export const useTranslation = (namespaces: string[] = [], load: LoadTranslations return { ...context, isLoaded } } -type LoadTranslationsFn = ({ namespace, locale }: { namespace: string, locale: string}) => Promise<{ default: Translations}> +type LoadTranslationsFn = ({ + namespace, + locale, +}: { + namespace: string + locale: string +}) => Promise<{ default: Translations }> type LoadLocaleFn = (locale: string) => Promise const I18nContextProvider = ({ @@ -129,23 +164,26 @@ const I18nContextProvider = ({ localeItemStorage = LOCALE_ITEM_STORAGE, supportedLocales, }: { - children: ReactNode, - defaultLoad: LoadTranslationsFn, - loadDateLocale?: LoadLocaleFn, - defaultDateLocale?: Locale, - defaultLocale: string, - defaultTranslations: TranslationsByLocales, - enableDefaultLocale: boolean, - enableDebugKey: boolean, - localeItemStorage: string, - supportedLocales: string[], + children: ReactNode + defaultLoad: LoadTranslationsFn + loadDateLocale?: LoadLocaleFn + defaultDateLocale?: Locale + defaultLocale: string + defaultTranslations: TranslationsByLocales + enableDefaultLocale: boolean + enableDebugKey: boolean + localeItemStorage: string + supportedLocales: string[] }): ReactElement => { const [currentLocale, setCurrentLocale] = useState( getCurrentLocale({ defaultLocale, localeItemStorage, supportedLocales }), ) - const [translations, setTranslations] = useState(defaultTranslations) + const [translations, setTranslations] = + useState(defaultTranslations) const [namespaces, setNamespaces] = useState([]) - const [dateFnsLocale, setDateFnsLocale] = useState(defaultDateLocale ?? undefined) + const [dateFnsLocale, setDateFnsLocale] = useState( + defaultDateLocale ?? undefined, + ) useEffect(() => { loadDateLocale?.(currentLocale === 'en' ? 'en-GB' : currentLocale) @@ -212,13 +250,14 @@ const I18nContextProvider = ({ ) const formatNumber = useCallback( - (numb: number, options?: NumberFormatOptions) => formatters.getNumberFormat(currentLocale, options).format(numb), + (numb: number, options?: NumberFormatOptions) => + formatters.getNumberFormat(currentLocale, options).format(numb), [currentLocale], ) const formatList = useCallback( (listFormat: string[], options?: IntlListFormatOptions) => - formatters.getListFormat(currentLocale, options).format(listFormat), + formatters.getListFormat(currentLocale, options).format(listFormat), [currentLocale], ) @@ -238,16 +277,20 @@ const I18nContextProvider = ({ ) const datetime = useCallback( - (date: Date | number, options?: Intl.DateTimeFormatOptions): string => formatters.getDateTimeFormat(currentLocale, options).format(date), + (date: Date | number, options?: Intl.DateTimeFormatOptions): string => + formatters.getDateTimeFormat(currentLocale, options).format(date), [currentLocale], ) const relativeTimeStrict = useCallback( - (date: Date | number, options: { - addSuffix?: boolean - unit?: 'second' | 'minute' | 'hour' | 'day' | 'month' | 'year' - roundingMethod?: 'floor' | 'ceil' | 'round' - } = { addSuffix: true, unit: 'day' }) => { + ( + date: Date | number, + options: { + addSuffix?: boolean + unit?: 'second' | 'minute' | 'hour' | 'day' | 'month' | 'year' + roundingMethod?: 'floor' | 'ceil' | 'round' + } = { addSuffix: true, unit: 'day' }, + ) => { const finalDate = new Date(date) return formatDistanceToNowStrict(finalDate, { @@ -259,10 +302,13 @@ const I18nContextProvider = ({ ) const relativeTime = useCallback( - (date: Date | number, options: { - includeSeconds?: boolean - addSuffix?: boolean - } = { addSuffix: true }) => { + ( + date: Date | number, + options: { + includeSeconds?: boolean + addSuffix?: boolean + } = { addSuffix: true }, + ) => { const finalDate = new Date(date) return formatDistanceToNow(finalDate, { @@ -284,7 +330,9 @@ const I18nContextProvider = ({ return '' } if (context) { - return formatters.getTranslationFormat(value, currentLocale).format(context) as string + return formatters + .getTranslationFormat(value, currentLocale) + .format(context) as string } return value diff --git a/packages/use-query-params/README.md b/packages/use-query-params/README.md index 74e508632..de2c905e7 100644 --- a/packages/use-query-params/README.md +++ b/packages/use-query-params/README.md @@ -9,10 +9,11 @@ $ pnpm add @scaleway/use-query-params react-router-dom ``` ## Usage + ```js import React from 'react' import { render } from 'react-dom' -import { BrowserRouter as Router } from "react-router-dom"; +import { BrowserRouter as Router } from 'react-router-dom' import useQueryParams from '@scaleway/use-query-params' const App = () => { diff --git a/packages/use-query-params/src/__tests__/index.tsx b/packages/use-query-params/src/__tests__/index.tsx index 0c0a2531c..12f5448d0 100644 --- a/packages/use-query-params/src/__tests__/index.tsx +++ b/packages/use-query-params/src/__tests__/index.tsx @@ -5,19 +5,30 @@ import { MemoryRouter, Router } from 'react-router-dom' import useQueryParams from '..' const wrapper = - ({ pathname = '/one', search, history }: { pathname?: string, search: string, history?: History }) => + ({ + pathname = '/one', + search, + history, + }: { + pathname?: string + search: string + history?: History + }) => ({ children }: { children: ReactNode }) => { - if (history) { const [state, setState] = useState({ action: history.action, - location: history.location - }); + location: history.location, + }) - useLayoutEffect(() => history.listen(setState), []); + useLayoutEffect(() => history.listen(setState), []) return ( - + {children} ) @@ -30,7 +41,6 @@ const wrapper = ) } - describe('useQueryParam', () => { it('should correctly push instead of replacing history', () => { const history = createMemoryHistory({ diff --git a/packages/use-query-params/src/index.ts b/packages/use-query-params/src/index.ts index 777a8a4c0..e3ff87868 100644 --- a/packages/use-query-params/src/index.ts +++ b/packages/use-query-params/src/index.ts @@ -8,7 +8,7 @@ interface Options { } const useQueryParams = (): { - queryParams: ParsedQuery; + queryParams: ParsedQuery /** * Replace the query params in the url. It erase all current values and put the new ones * @@ -49,26 +49,28 @@ const useQueryParams = (): { ) const replaceInUrlIfNeeded = useCallback( - (newState: Record, options?: Options) => { + (newState: Record, options?: Options) => { const stringifiedParams = stringyFormat(newState) const searchToCompare = location.search || '?' if (searchToCompare !== `?${stringifiedParams}`) { - navigate(`${location.pathname}?${stringifiedParams}`, { replace: !options?.push }) + navigate(`${location.pathname}?${stringifiedParams}`, { + replace: !options?.push, + }) } }, [navigate, location.pathname, location.search, stringyFormat], ) const setQueryParams = useCallback( - (nextParams: Record, options?: Options): void => { + (nextParams: Record, options?: Options): void => { replaceInUrlIfNeeded({ ...currentState, ...nextParams }, options) }, [currentState, replaceInUrlIfNeeded], ) const replaceQueryParams = useCallback( - (newParams: Record, options?: Options): void => { + (newParams: Record, options?: Options): void => { replaceInUrlIfNeeded(newParams, options) }, [replaceInUrlIfNeeded], diff --git a/packages/use-random-name/README.md b/packages/use-random-name/README.md index 5622b8fc9..359818dde 100644 --- a/packages/use-random-name/README.md +++ b/packages/use-random-name/README.md @@ -15,6 +15,7 @@ $ pnpm add @scaleway/use-random-name ## Usage As a React hook + ```js import React from 'react' import useRandomName from '@scaleway/random-name' @@ -22,13 +23,12 @@ import useRandomName from '@scaleway/random-name' const Component = () => { const name = useRandomName() - return ( - {name} - ) + return {name} } ``` You can also access the underlying @scaleway/random-name package with a named export + ```js import { randomName } from '@scaleway/use-random-name' diff --git a/packages/use-segment/README.md b/packages/use-segment/README.md index f43ddbfdf..3639f6d4f 100644 --- a/packages/use-segment/README.md +++ b/packages/use-segment/README.md @@ -39,21 +39,16 @@ const pageVisited = export default pageVisited ``` - - ```typescript - import pageTypes from './pageTypes' import testEvents from './testEvents' export default { - pageTypes, - testEvents, + pageTypes, + testEvents, } - ``` - ### Context Load Inside you global app you have to use our Segment Provider to allow loading of segment from your settting app. diff --git a/tsconfig.json b/tsconfig.json index bc626263d..29eb1bafe 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,10 +2,7 @@ "compilerOptions": { "noEmit": true, "target": "esnext", - "lib": [ - "DOM", - "ES2019" - ], + "lib": ["DOM", "ES2019"], "allowJs": true, "strict": true, "module": "esnext", @@ -13,7 +10,7 @@ "esModuleInterop": true, "allowSyntheticDefaultImports": true, "resolveJsonModule": true, - "jsx": "preserve", + "jsx": "preserve" }, "include": ["**/*.ts", "**/*.js", "**/.*.js", "**/*.tsx"] }