From 2ec48a58e35843217fec9b070699c238c03ca19c Mon Sep 17 00:00:00 2001 From: David Crespo Date: Fri, 10 Jun 2022 17:56:31 -0500 Subject: [PATCH 1/4] latest prerelease. fixes bugs that prevented us from upgrading from prev prerelease --- package.json | 2 +- yarn.lock | 34 ++++++++++++++-------------------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 83a72e1c11..23244a8995 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "react-is": "^17.0.2", "react-popper": "^2.2.5", "react-query": "^4.0.0-alpha.20", - "react-router-dom": "^6.4.0-pre.2", + "react-router-dom": "^6.4.0-pre.7", "react-transition-group": "^4.4.1", "recharts": "^2.1.6", "tiny-invariant": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index 9355eb498f..f7fa88d571 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2199,10 +2199,10 @@ prop-types "^15.7.2" tslib "^2.3.0" -"@remix-run/router@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-0.1.0.tgz#9dee1610f5ba730e4c67e5de517912f71c627031" - integrity sha512-mK2wZWAFsijTGIk7ZhKvEAzU7qIS6F6RhPy5AiEosaEs3mB3J2NvUWRoN3W74V+5Jju/AisT5NaM2pIbnfGXWg== +"@remix-run/router@0.2.0-pre.2": + version "0.2.0-pre.2" + resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-0.2.0-pre.2.tgz#66ac8e95fcbf8a2cc48cd25823f3df29040ca83c" + integrity sha512-DRgTrJZ7R1nGI0EUNsEYYcXU+AASz6CE7rnksTYnIdVEBztygwbOlKRNnPyufQIcQs2kV/0cKf1FpfZfPMhMjQ== "@rollup/pluginutils@^4.1.2": version "4.1.2" @@ -12020,12 +12020,12 @@ react-router-dom@^6.0.0: history "^5.2.0" react-router "6.2.1" -react-router-dom@^6.4.0-pre.2: - version "6.4.0-pre.2" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.4.0-pre.2.tgz#6c34e3a96db3712a79dd78416b01dbb40f18aae7" - integrity sha512-Y6tOV4zs7uS+7pTbMoOcMWP9H5hVKINIyLIO1oWVVQEKv2KDEQx0njyPnhso4LkbOK6l7JhUMNO5DLwMqZVWFQ== +react-router-dom@^6.4.0-pre.7: + version "6.4.0-pre.7" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.4.0-pre.7.tgz#50824b38bd966b56d918d28de8359692d9e9fe0c" + integrity sha512-xoaXhd58Up5/yLFEhHnyB3uKFR4M5kLXirC17jDxotI+b5XXE2lVZ+pCkMiS4uei3Z2ymLjT/gi+V+X1DVMHwA== dependencies: - react-router "6.4.0-pre.2" + react-router "6.4.0-pre.7" react-router@6.2.1, react-router@^6.0.0: version "6.2.1" @@ -12034,13 +12034,12 @@ react-router@6.2.1, react-router@^6.0.0: dependencies: history "^5.2.0" -react-router@6.4.0-pre.2: - version "6.4.0-pre.2" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.4.0-pre.2.tgz#f80856faae0a1163ca58aad6ddf82e00a03264a3" - integrity sha512-JFwatrS+QFmyoOrjUNpHFeAO72Y1FUZ9wOfQoCm1a6cRglAbLXAdKll/WEGUtGUb3LwLx3uAZ57kPXHQX5vutw== +react-router@6.4.0-pre.7: + version "6.4.0-pre.7" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.4.0-pre.7.tgz#54f54430a956a408d23f243b117fb8e84d036488" + integrity sha512-b9D5X7ibScbdXIUHp0+0Z83ygLpPyI8gJs2hcIp1YyqqCHGrpj+DtuQBPN7nxKfbr9vjipcdpStp6IXK0XUD0g== dependencies: - "@remix-run/router" "^0.1.0" - use-sync-external-store "1.1.0" + "@remix-run/router" "0.2.0-pre.2" react-sizeme@^3.0.1: version "3.0.2" @@ -14238,11 +14237,6 @@ use-sidecar@^1.0.1, use-sidecar@^1.0.5: detect-node-es "^1.1.0" tslib "^1.9.3" -use-sync-external-store@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.1.0.tgz#3343c3fe7f7e404db70f8c687adf5c1652d34e82" - integrity sha512-SEnieB2FPKEVne66NpXPd1Np4R1lTNKfjuy3XdIoPQKYBAFdzbzSZlSn1KJZUiihQLQC5Znot4SBz1EOTBwQAQ== - use@^3.1.0: version "3.1.1" resolved "https://registry.npmjs.org/use/-/use-3.1.1.tgz" From 1618e28c469dfa0a1191a983520372ea35e93cd7 Mon Sep 17 00:00:00 2001 From: David Crespo Date: Tue, 14 Jun 2022 15:10:01 -0500 Subject: [PATCH 2/4] ../.. workaround no longer needed --- app/pages/project/disks/DisksPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/pages/project/disks/DisksPage.tsx b/app/pages/project/disks/DisksPage.tsx index ac1338c38b..b79d5c90ff 100644 --- a/app/pages/project/disks/DisksPage.tsx +++ b/app/pages/project/disks/DisksPage.tsx @@ -28,7 +28,7 @@ function AttachedInstance(props: { }) const instance = instances?.items.find((i) => i.id === props.instanceId) return instance ? ( - + {instance.name} ) : null From add705e6360d422eedbc8c9a338fe94658d1ba11 Mon Sep 17 00:00:00 2001 From: David Crespo Date: Wed, 22 Jun 2022 13:58:29 -0500 Subject: [PATCH 3/4] actually pre.8 --- package.json | 2 +- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 23244a8995..2dba78f3af 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "react-is": "^17.0.2", "react-popper": "^2.2.5", "react-query": "^4.0.0-alpha.20", - "react-router-dom": "^6.4.0-pre.7", + "react-router-dom": "^6.4.0-pre.8", "react-transition-group": "^4.4.1", "recharts": "^2.1.6", "tiny-invariant": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index f7fa88d571..cdf355d363 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2199,10 +2199,10 @@ prop-types "^15.7.2" tslib "^2.3.0" -"@remix-run/router@0.2.0-pre.2": - version "0.2.0-pre.2" - resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-0.2.0-pre.2.tgz#66ac8e95fcbf8a2cc48cd25823f3df29040ca83c" - integrity sha512-DRgTrJZ7R1nGI0EUNsEYYcXU+AASz6CE7rnksTYnIdVEBztygwbOlKRNnPyufQIcQs2kV/0cKf1FpfZfPMhMjQ== +"@remix-run/router@0.2.0-pre.3": + version "0.2.0-pre.3" + resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-0.2.0-pre.3.tgz#2864cf275433ec39d2370a1aec28a5957060f47a" + integrity sha512-/1vRiMh8j31PBgLgB2lqcwDDEBEwsnucOouZ8GvJTRNHULkPOU3kvQ1ZUpt9IPd1lS5AVC93I9pVLnFhlNA4Mw== "@rollup/pluginutils@^4.1.2": version "4.1.2" @@ -12020,12 +12020,12 @@ react-router-dom@^6.0.0: history "^5.2.0" react-router "6.2.1" -react-router-dom@^6.4.0-pre.7: - version "6.4.0-pre.7" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.4.0-pre.7.tgz#50824b38bd966b56d918d28de8359692d9e9fe0c" - integrity sha512-xoaXhd58Up5/yLFEhHnyB3uKFR4M5kLXirC17jDxotI+b5XXE2lVZ+pCkMiS4uei3Z2ymLjT/gi+V+X1DVMHwA== +react-router-dom@^6.4.0-pre.8: + version "6.4.0-pre.8" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.4.0-pre.8.tgz#1f784fa09719801250070431703dd02c5fdcde6e" + integrity sha512-5hxQdiPOG98YOANbJ8IBUKbRgU6k4/TSX4VyO6jRWoG6KY0K2EG5wjEZgZ0tlAN9fXFgnHsro/HKi/r+HxugAg== dependencies: - react-router "6.4.0-pre.7" + react-router "6.4.0-pre.8" react-router@6.2.1, react-router@^6.0.0: version "6.2.1" @@ -12034,12 +12034,12 @@ react-router@6.2.1, react-router@^6.0.0: dependencies: history "^5.2.0" -react-router@6.4.0-pre.7: - version "6.4.0-pre.7" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.4.0-pre.7.tgz#54f54430a956a408d23f243b117fb8e84d036488" - integrity sha512-b9D5X7ibScbdXIUHp0+0Z83ygLpPyI8gJs2hcIp1YyqqCHGrpj+DtuQBPN7nxKfbr9vjipcdpStp6IXK0XUD0g== +react-router@6.4.0-pre.8: + version "6.4.0-pre.8" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.4.0-pre.8.tgz#90ce4cc590b453fc26ad2d131f51d908783c9091" + integrity sha512-xwt2s9jW5NaakymlSRG0hZoGda6E/Skfgmj/4vlwvRX/kqoO8jU0g+Vi3sHDCatH/V+GjDyTQkdMEDm8qGsBsQ== dependencies: - "@remix-run/router" "0.2.0-pre.2" + "@remix-run/router" "0.2.0-pre.3" react-sizeme@^3.0.1: version "3.0.2" From 024f5e9325f8d824b83b964b934794c08dc9fcb9 Mon Sep 17 00:00:00 2001 From: David Crespo Date: Wed, 22 Jun 2022 14:07:41 -0500 Subject: [PATCH 4/4] update comment about absolute paths in OrgLayout --- app/layouts/OrgLayout.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/layouts/OrgLayout.tsx b/app/layouts/OrgLayout.tsx index c66b0fc2e1..011ad7158c 100644 --- a/app/layouts/OrgLayout.tsx +++ b/app/layouts/OrgLayout.tsx @@ -18,8 +18,9 @@ import { PageContainer, } from './helpers' -// absolute paths are a workaround for -// https://github.com/remix-run/react-router/pull/8985 not being released yet +// We need to use absolute paths here because sometimes this layout is rendered +// at `/orgs/:orgName` and other times it's rendered at `/orgs/:orgName/access`. +// Relative paths would resolve differently in the two locations. const OrgLayout = () => { const { orgName } = useParams('orgName')