diff --git a/examples/demo/package-lock.json b/examples/demo/package-lock.json index d5ab6c8dd..25717a1cd 100644 --- a/examples/demo/package-lock.json +++ b/examples/demo/package-lock.json @@ -6,11 +6,7 @@ "dependencies": { "@axa-fr/react-toolkit-action": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-action/-/react-toolkit-action-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-action/-/react-toolkit-action-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-5xH9Mw8eo97MKIouatXRqqIFNAAykWXwQURWjw1pDXKiLKOBqI8x9bL6TXhX6B/0GPsEdivP5LpAGQxo3BWtng==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -19,11 +15,7 @@ }, "@axa-fr/react-toolkit-alert": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-alert/-/react-toolkit-alert-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-alert/-/react-toolkit-alert-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-O1R+FxTrNtkF+6NOawXNpW2oNMuCiDGubjmlmYq4xkQBFWE3RpPd+1BDGzSeu9r5JtCfib7g4wAY3WkMf+y/ug==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -32,11 +24,7 @@ }, "@axa-fr/react-toolkit-all": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-all/-/react-toolkit-all-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-all/-/react-toolkit-all-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-qXXrZuTmXi9LXDvQIXq68gixxATbX1Bze5IPxlOmaYaIFY5ved5D8lHOyfV70sTMRtxgkqLcp9LWXOm2qJxg1Q==", "requires": { "@axa-fr/react-toolkit-action": "^1.3.2-alpha.0", @@ -86,11 +74,7 @@ }, "@axa-fr/react-toolkit-badge": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-badge/-/react-toolkit-badge-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-badge/-/react-toolkit-badge-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-RCUj/+l9aHQS3hEHV7CJU2U8lFdVnU5fI2h4gu6PRK7WlhR/I4XJeTH/TxdCs7/UrUdbhrjenyI/qGXVtwLPkw==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -99,11 +83,7 @@ }, "@axa-fr/react-toolkit-button": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-button/-/react-toolkit-button-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-button/-/react-toolkit-button-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-2xJ4Pp/37hi+gNsw4F8nXKoNwgTNQkbAqEiBLZKKmlRTdrCQVJDoQQpfNmaFTV30xFeGthjNGOZU3aLPMErPPA==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -112,11 +92,7 @@ }, "@axa-fr/react-toolkit-collapse": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-collapse/-/react-toolkit-collapse-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-collapse/-/react-toolkit-collapse-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-3oNsbVfIyqVVL68uJ03r9vknfVKwDjpdUOVVWqMV9UeDcpWpqOCmyCTgJZaRVOJM0k15SV1B7Tt+jetA7Ek3yA==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -125,11 +101,7 @@ }, "@axa-fr/react-toolkit-core": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-core/-/react-toolkit-core-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-core/-/react-toolkit-core-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-ka9IHjp7FfJ5Ek/D+U5p10sPgLA3yX/RxWpdjsSSQp1N5kFpvSiWvhGd0zzIWIdQLd3vIcKFRIwgogeNqpGtCg==", "requires": { "classnames": "^2.2.6", @@ -139,11 +111,7 @@ }, "@axa-fr/react-toolkit-form-core": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-core/-/react-toolkit-form-core-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-core/-/react-toolkit-form-core-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-WSv56EY2ZjoSr+pOOLLFA/RXuaF+/Iw/SG1K4Ws0Dkp0Pg3jTHJGoYY2C1rUNIztafTiE3o22W8gB9FD1JadVA==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -153,11 +121,7 @@ }, "@axa-fr/react-toolkit-form-filter": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-filter/-/react-toolkit-form-filter-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-filter/-/react-toolkit-form-filter-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-p+6vkt6tdJNwfcLsJN/JWwTeG7C1dz5IAUcCcfLDtFFFujw+BjXZHKXB4vxIAvH/a6sDD6TuxXw1AqGMAiD3MA==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -166,11 +130,7 @@ }, "@axa-fr/react-toolkit-form-filter-inline": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-filter-inline/-/react-toolkit-form-filter-inline-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-filter-inline/-/react-toolkit-form-filter-inline-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-M4J9iQVR2ZLUtQxv4nUe80xSSMsQHiQBT2jKXnPcfcQiY7Phu20jTO/SazawHreyFJzQy3pafW1eIZRqouT8QA==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -179,11 +139,7 @@ }, "@axa-fr/react-toolkit-form-input-card": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-input-card/-/react-toolkit-form-input-card-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-input-card/-/react-toolkit-form-input-card-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-+qvu2ahXs21Wquj2MlurEq+VPtHRg7bsbXxSQFkmRhB0Etw8x+kpX1ms8mrk6rt9XAb8XCLcDl6N1kxiIw87iA==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -195,11 +151,7 @@ }, "@axa-fr/react-toolkit-form-input-checkbox": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-input-checkbox/-/react-toolkit-form-input-checkbox-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-input-checkbox/-/react-toolkit-form-input-checkbox-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-R7IZQ/48fed5kdG2iUJ39MifH7UKC2esAbVGmQwJNeRB8EFE6JcwgwNywsWBU8Q+r6iYeiApWnFHH20oZvMJJw==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -209,11 +161,7 @@ }, "@axa-fr/react-toolkit-form-input-choice": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-input-choice/-/react-toolkit-form-input-choice-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-input-choice/-/react-toolkit-form-input-choice-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-Agfq7Jh3E9jk2SK4tE0nyDHsIR6O68DgmxQ/xtgq9wVL086REoGSoCaYX4hAphRq/M+kHokIlSNozYewof1gEw==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -224,11 +172,7 @@ }, "@axa-fr/react-toolkit-form-input-date": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-input-date/-/react-toolkit-form-input-date-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-input-date/-/react-toolkit-form-input-date-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-pniWziNIPaZuy74oIjVvsvnRkdgNi20WwoQwr0zfY0PZ5nhjIBkwSpzy7kYm4kC1ahVqmWZczB7GIdTG1vY1zw==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -240,11 +184,7 @@ }, "@axa-fr/react-toolkit-form-input-file": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-input-file/-/react-toolkit-form-input-file-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-input-file/-/react-toolkit-form-input-file-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-UTEz0DKDXVt4gXve7++67ENyLeqBZTiobWw9usrNzO0s25PGWmRP/zOmhF8E7A6gO57+Oj9MoveSqgEn3kEahg==", "requires": { "@axa-fr/react-toolkit-button": "^1.3.2-alpha.0", @@ -257,11 +197,7 @@ "dependencies": { "react-dropzone": { "version": "4.3.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/react-dropzone/-/react-dropzone-4.3.0.tgz", -======= - "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-4.3.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-ULfrLaTSsd8BDa9KVAGCueuq1AN3L14dtMsGGqtP0UwYyjG4Vhf158f/ITSHuSPYkZXbvfcIiOlZsH+e3QWm+Q==", "requires": { "attr-accept": "^1.1.3", @@ -272,11 +208,7 @@ }, "@axa-fr/react-toolkit-form-input-number": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-input-number/-/react-toolkit-form-input-number-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-input-number/-/react-toolkit-form-input-number-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-1RJLvCtkdYeNGnSU5ZROkRVhel48wuSBja9LCJdZFMAhgbqzdXhaFEqs6u6F0LqOPS4GKjnIms/S0KBAogxQlQ==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -286,11 +218,7 @@ }, "@axa-fr/react-toolkit-form-input-pass": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-input-pass/-/react-toolkit-form-input-pass-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-input-pass/-/react-toolkit-form-input-pass-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-M8CIYrLe1xul2XuE7hRjrwBNiuVL0+/o3Bxu1Bcs5EqvCsoGEfJs/6hLIot+B07YL0eQI+QAmbeZ5Tq4AaJzVw==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -301,22 +229,14 @@ "dependencies": { "moment": { "version": "2.22.2", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/moment/-/moment-2.22.2.tgz", -======= - "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=" } } }, "@axa-fr/react-toolkit-form-input-radio": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-input-radio/-/react-toolkit-form-input-radio-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-input-radio/-/react-toolkit-form-input-radio-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-vdv9ICEHKsGJPF6n3vhdHdCDi9ibeiiHPlSlxPtnSzxZkp+4T0tXfoR9G9y6UX8P4FFWhly01VZueKKmJySQdw==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -327,22 +247,14 @@ "dependencies": { "moment": { "version": "2.22.2", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/moment/-/moment-2.22.2.tgz", -======= - "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=" } } }, "@axa-fr/react-toolkit-form-input-select": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-input-select/-/react-toolkit-form-input-select-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-input-select/-/react-toolkit-form-input-select-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-xrPkeT693J1f3c+Tg0lOWcW/P8jUrkiJypJGBleA/atZwjtoXx/5+oaJrTDxc/FZ0QZo0X6djupgoLjrMiPDcg==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -352,11 +264,7 @@ }, "@axa-fr/react-toolkit-form-input-select-multi": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-input-select-multi/-/react-toolkit-form-input-select-multi-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-input-select-multi/-/react-toolkit-form-input-select-multi-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-7M2jBW8LU1JEBuwnkwZBVMhGBkCnD4H43+d3AsuB2wDtubmUouMQntP9CDj6Df+pPMkuqzkiGUTsPf3DsmJfJQ==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -367,11 +275,7 @@ }, "@axa-fr/react-toolkit-form-input-slider": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-input-slider/-/react-toolkit-form-input-slider-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-input-slider/-/react-toolkit-form-input-slider-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-0dmBcYZxarm8n/gr7frjvDBs31NqG21VtStRcNHUCLSumKdYR+baa58yFScJ2DXyStOqagRUlGsvHKZqtMhavg==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -382,11 +286,7 @@ }, "@axa-fr/react-toolkit-form-input-switch": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-input-switch/-/react-toolkit-form-input-switch-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-input-switch/-/react-toolkit-form-input-switch-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-rAi0K0sGg9d5y3kdovjZE+//Od9BG8l6YsJzuFzxeHiM9X/t7fwD9KwKfTe6BRj10ioJybC+/yOgu8n61wlirA==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -396,11 +296,7 @@ }, "@axa-fr/react-toolkit-form-input-text": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-input-text/-/react-toolkit-form-input-text-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-input-text/-/react-toolkit-form-input-text-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-dY/z3mq6NugOWNwD3wShFuPVlS4uPDikC4iZRYgYBO5d8FY0DC0eWkcoSPUJROWFMFfKrrKnb6jUnlhiXTIzdg==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -410,11 +306,7 @@ }, "@axa-fr/react-toolkit-form-input-textarea": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-input-textarea/-/react-toolkit-form-input-textarea-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-input-textarea/-/react-toolkit-form-input-textarea-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-4ylUTbHW80BDxffMztXL/zk9pHShPWWWXmwReDRdWdr3AfhAal/ry0AAyEDvrRGfUv6l2rGXBZtrIbykE5ra9w==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -423,11 +315,7 @@ }, "@axa-fr/react-toolkit-form-steps": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-steps/-/react-toolkit-form-steps-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-steps/-/react-toolkit-form-steps-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-L8svWPRpTNN3ufU/dkcnrCug4tGoB2fEFGWnRM2w4d5EIXblS5cgbKo3+dL04zka94k944kI506jFbbm6Uw8QQ==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -436,11 +324,7 @@ }, "@axa-fr/react-toolkit-form-summary": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-form-summary/-/react-toolkit-form-summary-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-form-summary/-/react-toolkit-form-summary-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-y/cTmDDeXHk1g+VcU1J0pHRtd8GfEN/B6Rbm7IAzDA+zTCMHQdGHRhkFh6uMwegCCp+JxInvMQF+zlTQ2ouGwg==", "requires": { "@axa-fr/react-toolkit-alert": "^1.3.2-alpha.0", @@ -450,11 +334,7 @@ }, "@axa-fr/react-toolkit-help": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-help/-/react-toolkit-help-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-help/-/react-toolkit-help-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-QG+F9oyTJiGzZbE8DirI+d2ZVZxBaUjAxqTp3PWrj15eExrUS/z770IzakWOEhF8mGEpnVyHFxMtkA1bXG0HgQ==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -464,11 +344,7 @@ }, "@axa-fr/react-toolkit-highlight": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-highlight/-/react-toolkit-highlight-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-highlight/-/react-toolkit-highlight-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-hb/iI3t3DIhNYrBROIISaVBwNq5fRWMiXyk7ZxGHhgYuPcXNTd5IBvdIwm/U99X0x+mg8pLbXT3z9Vzdr331hA==", "requires": { "@axa-fr/react-toolkit-action": "^1.3.2-alpha.0", @@ -478,11 +354,7 @@ }, "@axa-fr/react-toolkit-icon": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-icon/-/react-toolkit-icon-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-icon/-/react-toolkit-icon-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-pXrRoz2VbrM2eibUyIIKMgeloUcy29m8VGe2Qypqe7JgiKL/JRBfPj7TJv8zdFNdI/h6Sjni46SWfzJ0INTc4Q==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -491,11 +363,7 @@ }, "@axa-fr/react-toolkit-layout-footer": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-layout-footer/-/react-toolkit-layout-footer-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-layout-footer/-/react-toolkit-layout-footer-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-q9aEn0tBXzxtMyt4WYTI+JQX0PDE0kKWmTk9/6CJHmyS+MqhnDDNO7sSGsNfRiag21XLjXsy2cy2qEtKuBOa4A==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -504,11 +372,7 @@ }, "@axa-fr/react-toolkit-layout-footer-client": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-layout-footer-client/-/react-toolkit-layout-footer-client-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-layout-footer-client/-/react-toolkit-layout-footer-client-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-CwLoNTKwfvvHASfBJBSszo74b6OJm3/XiyGacq+MYEUO38OejZtnRF4dWLQwd5UFvSWXnvrIe2oPlmhPMoC7tg==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -517,7 +381,6 @@ }, "@axa-fr/react-toolkit-layout-header": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-layout-header/-/react-toolkit-layout-header-1.3.2-alpha.0.tgz", "integrity": "sha512-lfSDslG6mxqAMmzMFEirup0R+Ds9MXjuBrb0vmRCx/hQasirOXDlSpohOMgsv872ENf5q78H+X+OwnNqXUaACQ==", "requires": { @@ -540,41 +403,13 @@ "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-list/-/react-toolkit-list-1.3.2-alpha.0.tgz", "integrity": "sha512-yHRwhZLBoehonY1b9ECPE/7++f24h9CbAvdzOnizfpWokhrr4dgfL+2NCPLNvROSpZNNnmWDa8p6wEdpRK5h+Q==", "requires": { -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-layout-header/-/react-toolkit-layout-header-1.3.2-alpha.0.tgz", - "integrity": "sha512-lfSDslG6mxqAMmzMFEirup0R+Ds9MXjuBrb0vmRCx/hQasirOXDlSpohOMgsv872ENf5q78H+X+OwnNqXUaACQ==", - "requires": { - "@axa-fr/react-toolkit-action": "^1.3.2-alpha.0", - "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", - "prop-types": "^15.5.10" - } - }, - "@axa-fr/react-toolkit-link": { - "version": "1.3.2-alpha.0", - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-link/-/react-toolkit-link-1.3.2-alpha.0.tgz", - "integrity": "sha512-axa/ZndR1boG29mY7hN6ca7YwszKslJscKSpLZhzoh8WMP4SzyBb8o8+H3PFqw/TvQ+HvMmPiV03mcJWCzYOnQ==", - "requires": { - "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", - "prop-types": "^15.5.10" - } - }, - "@axa-fr/react-toolkit-list": { - "version": "1.3.2-alpha.0", - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-list/-/react-toolkit-list-1.3.2-alpha.0.tgz", - "integrity": "sha512-yHRwhZLBoehonY1b9ECPE/7++f24h9CbAvdzOnizfpWokhrr4dgfL+2NCPLNvROSpZNNnmWDa8p6wEdpRK5h+Q==", - "requires": { ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", "prop-types": "^15.5.10" } }, "@axa-fr/react-toolkit-loader": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-loader/-/react-toolkit-loader-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-loader/-/react-toolkit-loader-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-gHvVbhtk6AXXa79AvNJKaFCThr1Yog4+N2VVmET7fwuTqSI4cn4lS7o0m7JarZuZ3Emik3oH7xIzjg91I6GIQg==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -583,11 +418,7 @@ }, "@axa-fr/react-toolkit-modal-boolean": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-modal-boolean/-/react-toolkit-modal-boolean-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-modal-boolean/-/react-toolkit-modal-boolean-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-VnYEQQANkZ7SGgHUdASWLHrRRdDopskCl75BTAob5K3GBGGnGXH4xViCN3t7iMgLO/rmzmKYZwaY9eybsCvuUA==", "requires": { "@axa-fr/react-toolkit-button": "^1.3.2-alpha.0", @@ -598,11 +429,7 @@ }, "@axa-fr/react-toolkit-modal-default": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-modal-default/-/react-toolkit-modal-default-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-modal-default/-/react-toolkit-modal-default-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-hwRPJlrBRyzJVJPHj1nDQDzCBhe+d5r5mKn6xnxp/c6cI9DeAZ3WAX938XSmCI5jjMXVEGP7l5phiwtB1Wu4Rw==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -612,11 +439,7 @@ }, "@axa-fr/react-toolkit-panel": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-panel/-/react-toolkit-panel-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-panel/-/react-toolkit-panel-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-HizbpIhtSxSpj/0XpFcj5kHNxAcTyLa63J7Y+SizzeUlqXQOFLGLyreCv+NfisrhJpsTc04i1xNc9BCzfcaRyA==", "requires": { "@axa-fr/react-toolkit-action": "^1.3.2-alpha.0", @@ -626,11 +449,7 @@ }, "@axa-fr/react-toolkit-popover": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-popover/-/react-toolkit-popover-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-popover/-/react-toolkit-popover-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-WNG8J8gdZ1acGkDx0A+wMbMeF2U++hjD1/RxsxKm95C03eN6EXSY/tLf/q+I76UmSShOY3Lf4QX+POJtJQGsPA==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -641,11 +460,7 @@ "dependencies": { "create-react-context": { "version": "0.3.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/create-react-context/-/create-react-context-0.3.0.tgz", -======= - "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.3.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==", "requires": { "gud": "^1.0.0", @@ -654,11 +469,7 @@ }, "deep-equal": { "version": "1.1.1", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/deep-equal/-/deep-equal-1.1.1.tgz", -======= - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", "requires": { "is-arguments": "^1.0.4", @@ -671,20 +482,12 @@ }, "object-keys": { "version": "1.1.1", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/object-keys/-/object-keys-1.1.1.tgz", -======= - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" }, "react-popper": { "version": "1.3.7", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/react-popper/-/react-popper-1.3.7.tgz", -======= - "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.7.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-nmqYTx7QVjCm3WUZLeuOomna138R1luC4EqkW3hxJUrAe+3eNz3oFCLYdnPwILfn0mX1Ew2c3wctrjlUMYYUww==", "requires": { "@babel/runtime": "^7.1.2", @@ -698,20 +501,12 @@ }, "typed-styles": { "version": "0.0.7", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/typed-styles/-/typed-styles-0.0.7.tgz", -======= - "resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q==" }, "warning": { "version": "4.0.3", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/warning/-/warning-4.0.3.tgz", -======= - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", "requires": { "loose-envify": "^1.0.0" @@ -721,11 +516,7 @@ }, "@axa-fr/react-toolkit-restitution": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-restitution/-/react-toolkit-restitution-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-restitution/-/react-toolkit-restitution-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-CX4kVgU6wULgW/Q8NOGODfRVxmjaR1RKMoIDUR3n47CpbFNQpKYKoU+MH4tM05iEPQP5szJriL8PVE9KJPvcWQ==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0" @@ -733,11 +524,7 @@ }, "@axa-fr/react-toolkit-status": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-status/-/react-toolkit-status-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-status/-/react-toolkit-status-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-dvkb6V6dvMVFmSnREB5vsigG39ixba+WSyvTJL35opAYhy/8ciB45yJTCk6bJ5W/WsxW14RW28ERkyQhV13mkQ==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -746,11 +533,7 @@ }, "@axa-fr/react-toolkit-table": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-table/-/react-toolkit-table-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-table/-/react-toolkit-table-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-wo53DTtQGZV8zFECSqZE/PVuRxJ1DYPtjxrZ3i17eDFMt+0l+j/kzSJZZof81Bjuw5uG4ZS9Eh+HVoeSFzUvEQ==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -759,11 +542,7 @@ }, "@axa-fr/react-toolkit-tabs": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-tabs/-/react-toolkit-tabs-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-tabs/-/react-toolkit-tabs-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-cI3auzgPFluaKCk6fpJcUCJ/mCTRlT7gGQSbMboIOV6UZvMplxNnzVTo6+XLAPCH73XAuVfWQ4s3qwhPG4JyOg==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -773,11 +552,7 @@ }, "@axa-fr/react-toolkit-title": { "version": "1.3.2-alpha.0", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/@axa-fr/react-toolkit-title/-/react-toolkit-title-1.3.2-alpha.0.tgz", -======= - "resolved": "https://registry.npmjs.org/@axa-fr/react-toolkit-title/-/react-toolkit-title-1.3.2-alpha.0.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-l0f9npMESlN/ZWD6OlsX78SZpSIsx+O9Bkb9t4FotWb3Ci4KZht7Sqf8GeAi/1RvbraLQ7WNkMNJ2UxifUUt2g==", "requires": { "@axa-fr/react-toolkit-core": "^1.3.2-alpha.0", @@ -17419,11 +17194,7 @@ }, "is-arguments": { "version": "1.0.4", -<<<<<<< HEAD "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/is-arguments/-/is-arguments-1.0.4.tgz", -======= - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==" }, "is-arrayish": { @@ -20446,15 +20217,9 @@ "dev": true }, "object-is": { -<<<<<<< HEAD "version": "1.0.1", "resolved": "https://afa-nrepo.azure-paas.intraxa/repository/npmjs-group/object-is/-/object-is-1.0.1.tgz", "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=" -======= - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz", - "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==" ->>>>>>> 800425ea7c0ba1e65578a27c6dbeb7a94826807b }, "object-keys": { "version": "1.0.12",