From c63512d02460066c35e65b77189799351940b9cb Mon Sep 17 00:00:00 2001 From: Sargun Vohra Date: Tue, 11 Sep 2018 23:45:40 -0700 Subject: [PATCH 01/11] Test out redirect for back compat --- netlify.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/netlify.toml b/netlify.toml index e764e3a04..07bd4373b 100644 --- a/netlify.toml +++ b/netlify.toml @@ -8,6 +8,12 @@ command = "pip install poetry && poetry install --no-dev && poetry run ditto tra [build.environment] BASE_URL = "https://pokeapi.netlify.com/" +[[redirects]] +from = "/api/v2/:endpoint/" +to = "https://pokeapi.co/api/v2/:endpoint/?offset=:offset&limit=:limit" +status = 200 +query = {offset = ":offset", limit = ":limit"} + [[redirects]] from = "/*/" to = "/:splat/index.json" From 7a082a79d92d40377337401df945120ced2f7979 Mon Sep 17 00:00:00 2001 From: Sargun Vohra Date: Wed, 12 Sep 2018 00:11:57 -0700 Subject: [PATCH 02/11] iterate --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 07bd4373b..5d064ecb1 100644 --- a/netlify.toml +++ b/netlify.toml @@ -10,7 +10,7 @@ BASE_URL = "https://pokeapi.netlify.com/" [[redirects]] from = "/api/v2/:endpoint/" -to = "https://pokeapi.co/api/v2/:endpoint/?offset=:offset&limit=:limit" +to = "https://pokeapi.co/api/v2/:endpoint/?limit=:limit&offset=:offset" status = 200 query = {offset = ":offset", limit = ":limit"} From 80495ec5b36f77f160787179836bd036a97c3031 Mon Sep 17 00:00:00 2001 From: Sargun Vohra Date: Wed, 12 Sep 2018 00:23:01 -0700 Subject: [PATCH 03/11] iterate --- netlify.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/netlify.toml b/netlify.toml index 5d064ecb1..1e6c65cf8 100644 --- a/netlify.toml +++ b/netlify.toml @@ -10,9 +10,10 @@ BASE_URL = "https://pokeapi.netlify.com/" [[redirects]] from = "/api/v2/:endpoint/" -to = "https://pokeapi.co/api/v2/:endpoint/?limit=:limit&offset=:offset" +to = "https://pokeapi.co/api/v2/:endpoint/?limit=:limit" status = 200 -query = {offset = ":offset", limit = ":limit"} +force = true +query = {limit = ":limit"} [[redirects]] from = "/*/" From 81bd324d065b8935c7c58bf6cd9d754d9236ce2d Mon Sep 17 00:00:00 2001 From: Sargun Vohra Date: Wed, 12 Sep 2018 01:47:20 -0700 Subject: [PATCH 04/11] wat --- netlify.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netlify.toml b/netlify.toml index 1e6c65cf8..c89eff46a 100644 --- a/netlify.toml +++ b/netlify.toml @@ -11,11 +11,11 @@ BASE_URL = "https://pokeapi.netlify.com/" [[redirects]] from = "/api/v2/:endpoint/" to = "https://pokeapi.co/api/v2/:endpoint/?limit=:limit" -status = 200 +status = 301 force = true query = {limit = ":limit"} [[redirects]] from = "/*/" to = "/:splat/index.json" -status = 200 +status = 301 From b3c7142653e378ef8b1c06168a74db59fc9cac40 Mon Sep 17 00:00:00 2001 From: Sargun Vohra Date: Wed, 12 Sep 2018 01:52:41 -0700 Subject: [PATCH 05/11] hmm --- netlify.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netlify.toml b/netlify.toml index c89eff46a..1e6c65cf8 100644 --- a/netlify.toml +++ b/netlify.toml @@ -11,11 +11,11 @@ BASE_URL = "https://pokeapi.netlify.com/" [[redirects]] from = "/api/v2/:endpoint/" to = "https://pokeapi.co/api/v2/:endpoint/?limit=:limit" -status = 301 +status = 200 force = true query = {limit = ":limit"} [[redirects]] from = "/*/" to = "/:splat/index.json" -status = 301 +status = 200 From 6e7b98beae219d9f8e4d72b905e441ce1622a863 Mon Sep 17 00:00:00 2001 From: Sargun Vohra Date: Wed, 12 Sep 2018 01:55:41 -0700 Subject: [PATCH 06/11] try this --- netlify.toml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/netlify.toml b/netlify.toml index 1e6c65cf8..0c5d2ee27 100644 --- a/netlify.toml +++ b/netlify.toml @@ -14,8 +14,3 @@ to = "https://pokeapi.co/api/v2/:endpoint/?limit=:limit" status = 200 force = true query = {limit = ":limit"} - -[[redirects]] -from = "/*/" -to = "/:splat/index.json" -status = 200 From 4f4f7dc1afc7e37ba47c5571edfdcaed520094db Mon Sep 17 00:00:00 2001 From: Sargun Vohra Date: Wed, 12 Sep 2018 02:16:32 -0700 Subject: [PATCH 07/11] make it work --- netlify.toml | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 0c5d2ee27..c321c837a 100644 --- a/netlify.toml +++ b/netlify.toml @@ -8,9 +8,40 @@ command = "pip install poetry && poetry install --no-dev && poetry run ditto tra [build.environment] BASE_URL = "https://pokeapi.netlify.com/" +[[redirects]] +from = "/api/v2/" +to = "/api/v2/index.json" +status = 200 + +[[redirects]] +from = "/api/v2/:endpoint/" +to = "https://pokeapi.co/api/v2/:endpoint/?limit=:limit&offset=:offset" +status = 200 +query = {offset = ":offset", limit = ":limit"} + +[[redirects]] +from = "/api/v2/:endpoint/" +to = "https://pokeapi.co/api/v2/:endpoint/?offset=:offset" +status = 200 +query = {offset = ":offset"} + [[redirects]] from = "/api/v2/:endpoint/" to = "https://pokeapi.co/api/v2/:endpoint/?limit=:limit" status = 200 -force = true query = {limit = ":limit"} + +[[redirects]] +from = "/api/v2/:endpoint/" +to = "/api/v2/:endpoint/index.json" +status = 200 + +[[redirects]] +from = "/api/v2/:endpoint/:id/" +to = "/api/v2/:endpoint/:id/index.json" +status = 200 + +[[redirects]] +from = "/api/v2/:endpoint/:id/:extra" +to = "/api/v2/:endpoint/:id/:extra/index.json" +status = 200 From 81ac2f8a66ec4511c302264bb376a978ce263083 Mon Sep 17 00:00:00 2001 From: Sargun Vohra Date: Wed, 12 Sep 2018 02:31:05 -0700 Subject: [PATCH 08/11] test out forwarding host --- netlify.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/netlify.toml b/netlify.toml index c321c837a..542499253 100644 --- a/netlify.toml +++ b/netlify.toml @@ -18,12 +18,16 @@ from = "/api/v2/:endpoint/" to = "https://pokeapi.co/api/v2/:endpoint/?limit=:limit&offset=:offset" status = 200 query = {offset = ":offset", limit = ":limit"} +[[redirects.headers]] +X-Forwarded-Host = "https://pokeapi.netlify.com/" [[redirects]] from = "/api/v2/:endpoint/" to = "https://pokeapi.co/api/v2/:endpoint/?offset=:offset" status = 200 query = {offset = ":offset"} +[[redirects.headers]] +Host = "https://pokeapi.netlify.com/" [[redirects]] from = "/api/v2/:endpoint/" From 6a4e42f6cb36a0cc66897cb93050d274e8bb6156 Mon Sep 17 00:00:00 2001 From: Sargun Vohra Date: Wed, 12 Sep 2018 02:33:10 -0700 Subject: [PATCH 09/11] . --- netlify.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/netlify.toml b/netlify.toml index 542499253..791e8bcae 100644 --- a/netlify.toml +++ b/netlify.toml @@ -18,8 +18,7 @@ from = "/api/v2/:endpoint/" to = "https://pokeapi.co/api/v2/:endpoint/?limit=:limit&offset=:offset" status = 200 query = {offset = ":offset", limit = ":limit"} -[[redirects.headers]] -X-Forwarded-Host = "https://pokeapi.netlify.com/" +headers = {X-Forwarded-Host = "https://pokeapi.netlify.com/"} [[redirects]] from = "/api/v2/:endpoint/" @@ -27,7 +26,7 @@ to = "https://pokeapi.co/api/v2/:endpoint/?offset=:offset" status = 200 query = {offset = ":offset"} [[redirects.headers]] -Host = "https://pokeapi.netlify.com/" +headers = {Host = "https://pokeapi.netlify.com/"} [[redirects]] from = "/api/v2/:endpoint/" From dae30702353713684948ae9f2a12c4ba3fa8220d Mon Sep 17 00:00:00 2001 From: Sargun Vohra Date: Wed, 12 Sep 2018 02:35:09 -0700 Subject: [PATCH 10/11] . --- netlify.toml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/netlify.toml b/netlify.toml index 791e8bcae..e5c8839b6 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,10 +3,7 @@ ID = "pokeapi" [build] publish = "dist" -command = "pip install poetry && poetry install --no-dev && poetry run ditto transform \"--base-url=$BASE_URL\"" - -[build.environment] -BASE_URL = "https://pokeapi.netlify.com/" +command = "pip install poetry && poetry install --no-dev && poetry run ditto transform --base-url='https://pokeapi.nelify.com/'" [[redirects]] from = "/api/v2/" @@ -25,7 +22,6 @@ from = "/api/v2/:endpoint/" to = "https://pokeapi.co/api/v2/:endpoint/?offset=:offset" status = 200 query = {offset = ":offset"} -[[redirects.headers]] headers = {Host = "https://pokeapi.netlify.com/"} [[redirects]] From d4ff1d494a239db430eba42d09de9b386150f615 Mon Sep 17 00:00:00 2001 From: Sargun Vohra Date: Wed, 12 Sep 2018 03:06:17 -0700 Subject: [PATCH 11/11] this is why I squash --- netlify.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/netlify.toml b/netlify.toml index e5c8839b6..40faa993a 100644 --- a/netlify.toml +++ b/netlify.toml @@ -15,14 +15,12 @@ from = "/api/v2/:endpoint/" to = "https://pokeapi.co/api/v2/:endpoint/?limit=:limit&offset=:offset" status = 200 query = {offset = ":offset", limit = ":limit"} -headers = {X-Forwarded-Host = "https://pokeapi.netlify.com/"} [[redirects]] from = "/api/v2/:endpoint/" to = "https://pokeapi.co/api/v2/:endpoint/?offset=:offset" status = 200 query = {offset = ":offset"} -headers = {Host = "https://pokeapi.netlify.com/"} [[redirects]] from = "/api/v2/:endpoint/"