From 7642899503862c311bb79aabcb5577279bae0709 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Tue, 23 Aug 2022 16:06:19 +0200 Subject: [PATCH] move react-router compat deps to core-app-api + fix beta version Signed-off-by: Patrik Oldsberg --- packages/app/package.json | 2 -- packages/core-app-api/package.json | 6 +++- .../src/routing/FlatRoutes.compat.test.tsx | 4 +-- .../src/routing/RouteResolver.compat.test.ts | 4 +-- .../routing/RoutingProvider.compat.test.tsx | 4 +-- .../src/routing/collectors.compat.test.tsx | 4 +-- yarn.lock | 32 +++++++++---------- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index 35b157aafc..927dc88da2 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -76,8 +76,6 @@ "react-dom": "^17.0.2", "react-router": "^6.3.0", "react-router-dom": "^6.3.0", - "react-router-stable": "npm:react-router@^6.3.0", - "react-router-dom-stable": "npm:react-router-dom@^6.3.0", "react-use": "^17.2.4", "zen-observable": "^0.8.15" }, diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json index ad6f69c380..7b5e8742fc 100644 --- a/packages/core-app-api/package.json +++ b/packages/core-app-api/package.json @@ -59,7 +59,11 @@ "@types/node": "^16.11.26", "@types/zen-observable": "^0.8.0", "cross-fetch": "^3.1.5", - "msw": "^0.45.0" + "msw": "^0.45.0", + "react-router-beta": "npm:react-router@6.0.0-beta.0", + "react-router-dom-beta": "npm:react-router-dom@6.0.0-beta.0", + "react-router-stable": "npm:react-router@^6.3.0", + "react-router-dom-stable": "npm:react-router-dom@^6.3.0" }, "files": [ "dist", diff --git a/packages/core-app-api/src/routing/FlatRoutes.compat.test.tsx b/packages/core-app-api/src/routing/FlatRoutes.compat.test.tsx index c5b65c1461..f889019550 100644 --- a/packages/core-app-api/src/routing/FlatRoutes.compat.test.tsx +++ b/packages/core-app-api/src/routing/FlatRoutes.compat.test.tsx @@ -27,12 +27,12 @@ describe.each(['beta', 'stable'])('FlatRoutes %s', rrVersion => { jest.doMock('react', () => React); jest.doMock('react-router', () => rrVersion === 'beta' - ? jest.requireActual('react-router') + ? jest.requireActual('react-router-beta') : jest.requireActual('react-router-stable'), ); jest.doMock('react-router-dom', () => rrVersion === 'beta' - ? jest.requireActual('react-router-dom') + ? jest.requireActual('react-router-dom-beta') : jest.requireActual('react-router-dom-stable'), ); }); diff --git a/packages/core-app-api/src/routing/RouteResolver.compat.test.ts b/packages/core-app-api/src/routing/RouteResolver.compat.test.ts index 8e7dbbf63f..ecc854f474 100644 --- a/packages/core-app-api/src/routing/RouteResolver.compat.test.ts +++ b/packages/core-app-api/src/routing/RouteResolver.compat.test.ts @@ -66,12 +66,12 @@ describe.each(['beta', 'stable'])('react-router %s', rrVersion => { beforeAll(() => { jest.doMock('react-router', () => rrVersion === 'beta' - ? jest.requireActual('react-router') + ? jest.requireActual('react-router-beta') : jest.requireActual('react-router-stable'), ); jest.doMock('react-router-dom', () => rrVersion === 'beta' - ? jest.requireActual('react-router-dom') + ? jest.requireActual('react-router-dom-beta') : jest.requireActual('react-router-dom-stable'), ); }); diff --git a/packages/core-app-api/src/routing/RoutingProvider.compat.test.tsx b/packages/core-app-api/src/routing/RoutingProvider.compat.test.tsx index e1e06b2498..c355fea9a7 100644 --- a/packages/core-app-api/src/routing/RoutingProvider.compat.test.tsx +++ b/packages/core-app-api/src/routing/RoutingProvider.compat.test.tsx @@ -113,12 +113,12 @@ describe.each(['beta', 'stable'])('react-router %s', rrVersion => { jest.doMock('react', () => React); jest.doMock('react-router', () => rrVersion === 'beta' - ? jest.requireActual('react-router') + ? jest.requireActual('react-router-beta') : jest.requireActual('react-router-stable'), ); jest.doMock('react-router-dom', () => rrVersion === 'beta' - ? jest.requireActual('react-router-dom') + ? jest.requireActual('react-router-dom-beta') : jest.requireActual('react-router-dom-stable'), ); diff --git a/packages/core-app-api/src/routing/collectors.compat.test.tsx b/packages/core-app-api/src/routing/collectors.compat.test.tsx index 8566f22a0c..7ee19b9fd2 100644 --- a/packages/core-app-api/src/routing/collectors.compat.test.tsx +++ b/packages/core-app-api/src/routing/collectors.compat.test.tsx @@ -29,12 +29,12 @@ describe.each(['beta', 'stable'])('react-router %s', rrVersion => { beforeAll(() => { jest.doMock('react-router', () => rrVersion === 'beta' - ? jest.requireActual('react-router') + ? jest.requireActual('react-router-beta') : jest.requireActual('react-router-stable'), ); jest.doMock('react-router-dom', () => rrVersion === 'beta' - ? jest.requireActual('react-router-dom') + ? jest.requireActual('react-router-dom-beta') : jest.requireActual('react-router-dom-stable'), ); }); diff --git a/yarn.lock b/yarn.lock index 6c504065da..88ae3982c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13459,8 +13459,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: react-dom "^17.0.2" react-router "^6.3.0" react-router-dom "^6.3.0" - react-router-dom-stable "npm:react-router-dom@^6.3.0" - react-router-stable "npm:react-router@^6.3.0" react-use "^17.2.4" zen-observable "^0.8.15" @@ -22402,6 +22400,21 @@ react-resize-detector@^6.6.3: lodash "^4.17.21" resize-observer-polyfill "^1.5.1" +"react-router-beta@npm:react-router@6.0.0-beta.0", react-router@6.0.0-beta.0: + version "6.0.0-beta.0" + resolved "https://registry.npmjs.org/react-router/-/react-router-6.0.0-beta.0.tgz#3e11f39b6ded4412c2fed9e4f989dd4c8156724d" + integrity sha512-VgMdfpVcmFQki/LZuLh8E/MNACekDetz4xqft+a6fBZvvJnVqKbLqebF7hyoawGrV1HcO5tVaUang2Og4W2j1Q== + dependencies: + prop-types "^15.7.2" + +"react-router-dom-beta@npm:react-router-dom@6.0.0-beta.0", react-router-dom@6.0.0-beta.0: + version "6.0.0-beta.0" + resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.0.0-beta.0.tgz#9dcc8555365f22f7fbd09f26b6b82543f3eb97d6" + integrity sha512-36yNNGMT8RB9FRPL9nKJi6HKDkgOakU+o/2hHpSzR6e37gN70MpOU6QQlmif4oAWWBwjyGc3ZNOMFCsFuHUY5w== + dependencies: + prop-types "^15.7.2" + react-router "6.0.0-beta.0" + "react-router-dom-stable@npm:react-router-dom@^6.3.0", react-router-dom@^6.3.0: version "6.3.0" resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d" @@ -22410,14 +22423,6 @@ react-resize-detector@^6.6.3: history "^5.2.0" react-router "6.3.0" -react-router-dom@6.0.0-beta.0: - version "6.0.0-beta.0" - resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.0.0-beta.0.tgz#9dcc8555365f22f7fbd09f26b6b82543f3eb97d6" - integrity sha512-36yNNGMT8RB9FRPL9nKJi6HKDkgOakU+o/2hHpSzR6e37gN70MpOU6QQlmif4oAWWBwjyGc3ZNOMFCsFuHUY5w== - dependencies: - prop-types "^15.7.2" - react-router "6.0.0-beta.0" - "react-router-stable@npm:react-router@^6.3.0", react-router@6.3.0, react-router@^6.3.0: name react-router-stable version "6.3.0" @@ -22426,13 +22431,6 @@ react-router-dom@6.0.0-beta.0: dependencies: history "^5.2.0" -react-router@6.0.0-beta.0: - version "6.0.0-beta.0" - resolved "https://registry.npmjs.org/react-router/-/react-router-6.0.0-beta.0.tgz#3e11f39b6ded4412c2fed9e4f989dd4c8156724d" - integrity sha512-VgMdfpVcmFQki/LZuLh8E/MNACekDetz4xqft+a6fBZvvJnVqKbLqebF7hyoawGrV1HcO5tVaUang2Og4W2j1Q== - dependencies: - prop-types "^15.7.2" - react-router@^6.0.0-beta.0: version "6.2.1" resolved "https://registry.npmjs.org/react-router/-/react-router-6.2.1.tgz#be2a97a6006ce1d9123c28934e604faef51448a3"