Skip to content

Commit 9d619e9

Browse files
authored
Merge pull request #6 from aboutbits/update-packages-and-configs
Update packages and configs
2 parents a788b23 + eea2911 commit 9d619e9

5 files changed

Lines changed: 25 additions & 18 deletions

File tree

.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"prettier",
1515
"plugin:prettier/recommended",
1616
"plugin:@typescript-eslint/recommended",
17-
"plugin:import/typescript"
17+
"plugin:import/typescript",
18+
"plugin:jest/recommended"
1819
],
1920
"parserOptions": {
2021
"sourceType": "module",

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
prerelease: false
1919
- uses: actions/setup-node@v1
2020
with:
21-
node-version: '12.x'
21+
node-version: '16.x'
2222
registry-url: 'https://registry.npmjs.org'
2323
- run: npm install
2424
- run: npm publish

jestconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"testEnvironment": "jsdom",
23
"transform": {
34
"^.+\\.(t|j)sx?$": "ts-jest"
45
},

package.json

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
"private": false,
1414
"main": "dist/index.js",
1515
"typings": "dist/index.d.ts",
16+
"engines": {
17+
"npm": "^8",
18+
"node": "^16"
19+
},
1620
"scripts": {
1721
"build": "tsc",
1822
"lint": "eslint --ext js,ts,tsx src",
@@ -39,18 +43,19 @@
3943
},
4044
"homepage": "https://github.com/aboutbits/internationalization#readme",
4145
"devDependencies": {
42-
"@types/node": "^14.11.5",
43-
"@types/jest": "^26.0.9",
44-
"@typescript-eslint/eslint-plugin": "^3.8.0",
45-
"@typescript-eslint/parser": "^3.8.0",
46-
"eslint": "^7.6.0",
47-
"eslint-config-prettier": "^6.11.0",
48-
"eslint-plugin-import": "^2.22.0",
49-
"eslint-plugin-jest": "^23.20.0",
50-
"eslint-plugin-prettier": "^3.1.4",
51-
"jest": "^26.2.2",
52-
"prettier": "^2.0.5",
53-
"ts-jest": "^26.1.4",
54-
"typescript": "^3.9.7"
46+
"@types/jest": "^28.1.3",
47+
"@types/node": "^16.0.0",
48+
"@typescript-eslint/eslint-plugin": "^5.30.0",
49+
"@typescript-eslint/parser": "^5.30.0",
50+
"eslint": "^8.18.0",
51+
"eslint-config-prettier": "^8.5.0",
52+
"eslint-plugin-import": "^2.26.0",
53+
"eslint-plugin-jest": "^26.5.3",
54+
"eslint-plugin-prettier": "^4.1.0",
55+
"jest": "^28.1.2",
56+
"jest-environment-jsdom": "^28.1.2",
57+
"prettier": "^2.7.1",
58+
"ts-jest": "^28.0.5",
59+
"typescript": "^4.7.4"
5560
}
5661
}

src/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ class Internationalization<T extends string> {
113113
)
114114

115115
// Check if the potential locale is not undefined else return the fallback language
116-
return (potentialLocale
117-
? potentialLocale.locale
118-
: this.fallbackLanguage) as T
116+
return (
117+
potentialLocale ? potentialLocale.locale : this.fallbackLanguage
118+
) as T
119119
}
120120
}
121121

0 commit comments

Comments
 (0)