Skip to content

Commit 4837662

Browse files
maschinomaschino
authored
Merge pull request #12 from environment-agency-austria/hotfix/typing-issues
Hotfix/typing issues
2 parents 3ddb95a + 851988a commit 4837662

File tree

5 files changed

+43
-30
lines changed

5 files changed

+43
-30
lines changed

‎CHANGELOG.MD

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4+
## [2.0.1] - 2018-11-28
5+
- Added `@types/react-intl` dependency to fix possible typescript compiler issues
6+
47
## [2.0.0] - 2018-11-19
58
### Breaking changes
69
- IntlForm is now a named export. Use `import { IntlForm } from 'react-ocean-forms-react-intl';` now

‎package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-ocean-forms-react-intl",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"description": "Library that adds react-intl support to react-ocean-forms.",
55
"main": "build/index.js",
66
"typings": "build/index.d.ts",
@@ -47,6 +47,9 @@
4747
"node"
4848
]
4949
},
50+
"dependencies": {
51+
"@types/react-intl": "^2.3.14"
52+
},
5053
"peerDependencies": {
5154
"prop-types": "^15.6.2",
5255
"react": "^16.4.0",
@@ -60,9 +63,8 @@
6063
"@babel/preset-env": "^7.1.6",
6164
"@types/enzyme": "^3.1.15",
6265
"@types/enzyme-adapter-react-16": "^1.0.3",
63-
"@types/jest": "^23.3.9",
64-
"@types/react": "^16.6.6",
65-
"@types/react-intl": "^2.3.12",
66+
"@types/jest": "^23.3.10",
67+
"@types/react": "^16.7.8",
6668
"babel-loader": "^8.0.4",
6769
"babel-preset-react-app": "^6.1.0",
6870
"case-sensitive-paths-webpack-plugin": "^2.1.2",
@@ -76,15 +78,15 @@
7678
"react-dom": "^16.6.3",
7779
"react-intl": "^2.7.2",
7880
"react-ocean-forms": "^2.0.0",
79-
"ts-jest": "^23.10.4",
80-
"ts-loader": "^5.3.0",
81+
"ts-jest": "^23.10.5",
82+
"ts-loader": "^5.3.1",
8183
"tslint": "^5.11.0",
8284
"tslint-consistent-codestyle": "^1.14.1",
8385
"tslint-eaa-contrib": "^0.1.3",
8486
"tslint-microsoft-contrib": "^5.2.1",
8587
"tslint-react": "^3.6.0",
8688
"typescript": "^3.1.6",
87-
"webpack": "^4.26.0",
89+
"webpack": "^4.26.1",
8890
"webpack-cli": "^3.1.2",
8991
"webpack-dev-server": "^3.1.10"
9092
},

‎src/IntlForm/IntlForm.test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe('<IntlForm />', () => {
1414
}
1515

1616
const setup = (): ISetupResult => {
17-
const intl = {
17+
const intl: InjectedIntl = {
1818
formatDate: jest.fn(),
1919
formatTime: jest.fn(),
2020
formatRelative: jest.fn(),
@@ -28,6 +28,7 @@ describe('<IntlForm />', () => {
2828
defaultLocale: 'en',
2929
defaultFormats: null,
3030
now: jest.fn(),
31+
onError: jest.fn(),
3132
};
3233

3334
const wrapper = shallow((

‎src/IntlForm/__snapshots__/IntlForm.test.tsx.snap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ ShallowWrapper {
1919
"locale": "en",
2020
"messages": Object {},
2121
"now": [MockFunction],
22+
"onError": [MockFunction],
2223
}
2324
}
2425
/>,
@@ -55,6 +56,7 @@ ShallowWrapper {
5556
"locale": "en",
5657
"messages": Object {},
5758
"now": [MockFunction],
59+
"onError": [MockFunction],
5860
},
5961
"plaintext": false,
6062
},
@@ -88,6 +90,7 @@ ShallowWrapper {
8890
"locale": "en",
8991
"messages": Object {},
9092
"now": [MockFunction],
93+
"onError": [MockFunction],
9194
},
9295
"plaintext": false,
9396
},

‎yarn.lock

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -876,9 +876,10 @@
876876
"@types/cheerio" "*"
877877
"@types/react" "*"
878878

879-
"@types/jest@^23.3.9":
880-
version "23.3.9"
881-
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.9.tgz#c16b55186ee73ae65e001fbee69d392c51337ad1"
879+
"@types/jest@^23.3.10":
880+
version "23.3.10"
881+
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.10.tgz#4897974cc317bf99d4fe6af1efa15957fa9c94de"
882+
integrity sha512-DC8xTuW/6TYgvEg3HEXS7cu9OijFqprVDXXiOcdOKZCU/5PJNLZU37VVvmZHdtMiGOa8wAA/We+JzbdxFzQTRQ==
882883

883884
"@types/node@*":
884885
version "10.11.7"
@@ -888,10 +889,10 @@
888889
version "15.5.6"
889890
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.6.tgz#9c03d3fed70a8d517c191b7734da2879b50ca26c"
890891

891-
"@types/react-intl@^2.3.12":
892-
version "2.3.12"
893-
resolved "https://registry.yarnpkg.com/@types/react-intl/-/react-intl-2.3.12.tgz#38361a467277719d0a350bab8d7917000934a730"
894-
integrity sha512-ic6K89pktpAETRkmseDR8KQyEUhdUW9PJaNXomeDu/tjxw18Xj8oPW0+18LXTLMPgHszI6vAULQUj/ueymeekg==
892+
"@types/react-intl@^2.3.14":
893+
version "2.3.14"
894+
resolved "https://registry.yarnpkg.com/@types/react-intl/-/react-intl-2.3.14.tgz#dbb973c20908a8e7468974a329df35c256cb459d"
895+
integrity sha512-NPj7mYJ6LjKZOxknobs9t3FKJto6btG9KSP9K7kSIzEhkWoA/2i+RAcHRqs3/6cMMflnt2FxajyIdmkl71B2VA==
895896

896897
"@types/react@*":
897898
version "16.4.16"
@@ -900,10 +901,10 @@
900901
"@types/prop-types" "*"
901902
csstype "^2.2.0"
902903

903-
"@types/react@^16.6.6":
904-
version "16.7.6"
905-
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.7.6.tgz#80e4bab0d0731ad3ae51f320c4b08bdca5f03040"
906-
integrity sha512-QBUfzftr/8eg/q3ZRgf/GaDP6rTYc7ZNem+g4oZM38C9vXyV8AWRWaTQuW5yCoZTsfHrN7b3DeEiUnqH9SrnpA==
904+
"@types/react@^16.7.8":
905+
version "16.7.8"
906+
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.7.8.tgz#ca24ba280f79debfc86578278a503c6d917d402e"
907+
integrity sha512-7Vua2IYokMiPBk0WWXaDt4Cg3XVcwU6HpkuPhvwhBrVEy4SafpcvEfGYByoY9jxyFMiegYQPaSOT+H+AY00CPw==
907908
dependencies:
908909
"@types/prop-types" "*"
909910
csstype "^2.2.0"
@@ -5478,7 +5479,7 @@ [email protected]:
54785479
version "1.1.7"
54795480
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
54805481

5481-
resolve@^1.3.2, resolve@^1.8.1:
5482+
resolve@1.x, resolve@^1.3.2, resolve@^1.8.1:
54825483
version "1.8.1"
54835484
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
54845485
dependencies:
@@ -6122,22 +6123,25 @@ trim-right@^1.0.1:
61226123
version "1.0.1"
61236124
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
61246125

6125-
ts-jest@^23.10.4:
6126-
version "23.10.4"
6127-
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-23.10.4.tgz#a7a953f55c9165bcaa90ff91014a178e87fe0df8"
6126+
ts-jest@^23.10.5:
6127+
version "23.10.5"
6128+
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-23.10.5.tgz#cdb550df4466a30489bf70ba867615799f388dd5"
6129+
integrity sha512-MRCs9qnGoyKgFc8adDEntAOP64fWK1vZKnOYU1o2HxaqjdJvGqmkLCPCnVq1/If4zkUmEjKPnCiUisTrlX2p2A==
61286130
dependencies:
61296131
bs-logger "0.x"
61306132
buffer-from "1.x"
61316133
fast-json-stable-stringify "2.x"
61326134
json5 "2.x"
61336135
make-error "1.x"
61346136
mkdirp "0.x"
6137+
resolve "1.x"
61356138
semver "^5.5"
61366139
yargs-parser "10.x"
61376140

6138-
ts-loader@^5.3.0:
6139-
version "5.3.0"
6140-
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.3.0.tgz#4bac24e57bc5189391ab14987d9898ce53ef5cf7"
6141+
ts-loader@^5.3.1:
6142+
version "5.3.1"
6143+
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.3.1.tgz#70614c8ec4354a9c8b89c9f97b2becb7a98a3980"
6144+
integrity sha512-fDDgpBH3SR8xlt2MasLdz3Yy611PQ/UY/KGyo7TgXhTRU/6sS8uGG0nJYnU1OdFBNKcoYbId1UTNaAOUn+i41g==
61416145
dependencies:
61426146
chalk "^2.3.0"
61436147
enhanced-resolve "^4.0.0"
@@ -6505,10 +6509,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0:
65056509
source-list-map "^2.0.0"
65066510
source-map "~0.6.1"
65076511

6508-
webpack@^4.26.0:
6509-
version "4.26.0"
6510-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.26.0.tgz#adbe80b869148c8d108b7d88965d00d72b3178de"
6511-
integrity sha512-J/dP9SJIc5OtX2FZ/+U9ikQtd6H6Mcbqt0xeXtmPwYGDKf8nkbOQQA9KL2Y0rJOsN1Al9Pdn+/j63X58ub8gvQ==
6512+
webpack@^4.26.1:
6513+
version "4.26.1"
6514+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.26.1.tgz#ff3a9283d363c07b3494dfa702d08f4f2ef6cb39"
6515+
integrity sha512-i2oOvEvuvLLSuSCkdVrknaxAhtUZ9g+nLSoHCWV0gDzqGX2DXaCrMmMUpbRsTSSLrUqAI56PoEiyMUZIZ1msug==
65126516
dependencies:
65136517
"@webassemblyjs/ast" "1.7.11"
65146518
"@webassemblyjs/helper-module-context" "1.7.11"

0 commit comments

Comments
 (0)