From 4d2dbfc51c1e17bf71753f332eabb7fccfaae18c Mon Sep 17 00:00:00 2001 From: Eric Vicenti Date: Mon, 15 Oct 2018 10:00:24 -0700 Subject: [PATCH] Fix tests, pathToRegexp version --- packages/core/package.json | 2 +- .../core/src/routers/__tests__/StackRouter-test.js | 4 ++-- packages/core/yarn.lock | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 0971d678..c8ea9d22 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -41,7 +41,7 @@ "dependencies": { "create-react-context": "^0.2.3", "hoist-non-react-statics": "^3.0.1", - "path-to-regexp": "^2.4.0", + "path-to-regexp": "^1.7.0", "query-string": "^6.2.0" }, "devDependencies": { diff --git a/packages/core/src/routers/__tests__/StackRouter-test.js b/packages/core/src/routers/__tests__/StackRouter-test.js index 7a8dfd95..b0e3ee3a 100644 --- a/packages/core/src/routers/__tests__/StackRouter-test.js +++ b/packages/core/src/routers/__tests__/StackRouter-test.js @@ -448,7 +448,7 @@ describe('StackRouter', () => { routes: [ { index: 0, - key: 'id-4', + key: 'id-1', isTransitioning: false, routeName: 'foo', params: { @@ -457,7 +457,7 @@ describe('StackRouter', () => { routes: [ { routeName: 'bar', - key: 'id-3', + key: 'id-0', params: { barThing: 'hello', }, diff --git a/packages/core/yarn.lock b/packages/core/yarn.lock index 3cc21cbd..91b3b3c6 100644 --- a/packages/core/yarn.lock +++ b/packages/core/yarn.lock @@ -6501,10 +6501,12 @@ path-parse@^1.0.5: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== -path-to-regexp@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.4.0.tgz#35ce7f333d5616f1c1e1bfe266c3aba2e5b2e704" - integrity sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w== +path-to-regexp@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d" + integrity sha1-Wf3g9DW62suhA6hOnTvGTpa5k30= + dependencies: + isarray "0.0.1" path-type@^1.0.0: version "1.1.0"