From 09787e74072c2349e16afd4261a9c3fc7fdc1a57 Mon Sep 17 00:00:00 2001 From: Dennis Simon Date: Mon, 7 Mar 2022 15:02:37 +0100 Subject: [PATCH 01/14] Test out vercel.json redirects --- vercel.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 vercel.json diff --git a/vercel.json b/vercel.json new file mode 100644 index 000000000..1cd6b95c4 --- /dev/null +++ b/vercel.json @@ -0,0 +1,19 @@ +{ + "redirects": [ + { + "source": "/docs/api", + "destination": "https://docs.0x.org/0x-api-swap/api-references", + "permanent": true + }, + { + "source": "/docs/core-concepts", + "destination": "https://docs.0x.org/introduction/introduction-to-0x", + "permanent": true + }, + { + "source": "/docs/:path*", + "destination": "https://docs.0x.org/:path*", + "permanent": true + } + ] +} From 003de8454c617c5ba6adb1718baead3c6f354fc5 Mon Sep 17 00:00:00 2001 From: Dennis Simon Date: Mon, 7 Mar 2022 15:07:35 +0100 Subject: [PATCH 02/14] remove unused import --- ts/components/dropdowns/dropdown_docs.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/ts/components/dropdowns/dropdown_docs.tsx b/ts/components/dropdowns/dropdown_docs.tsx index 360817ae1..1a015477b 100644 --- a/ts/components/dropdowns/dropdown_docs.tsx +++ b/ts/components/dropdowns/dropdown_docs.tsx @@ -2,7 +2,6 @@ import * as React from 'react'; import styled from 'styled-components'; import { Heading, Paragraph } from 'ts/components/text'; import { WebsitePaths } from 'ts/types'; -import { constants } from 'ts/utils/constants'; import { Link } from '../documentation/shared/link'; From 2df5cbd06c7b3dfd8b169ccd420f20e7569aa171 Mon Sep 17 00:00:00 2001 From: Dennis Simon Date: Mon, 7 Mar 2022 15:30:21 +0100 Subject: [PATCH 03/14] Add base docs redirect --- vercel.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vercel.json b/vercel.json index 1cd6b95c4..0cf26f667 100644 --- a/vercel.json +++ b/vercel.json @@ -14,6 +14,11 @@ "source": "/docs/:path*", "destination": "https://docs.0x.org/:path*", "permanent": true + }, + { + "source": "/docs", + "destination": "https://docs.0x.org/", + "permanent": true } ] } From 163640409f35531dadaa58940885aa43681a34e5 Mon Sep 17 00:00:00 2001 From: Dennis Simon Date: Tue, 8 Mar 2022 11:32:56 +0100 Subject: [PATCH 04/14] Add more misc. links --- vercel.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/vercel.json b/vercel.json index 0cf26f667..e8bd27dcc 100644 --- a/vercel.json +++ b/vercel.json @@ -10,6 +10,16 @@ "destination": "https://docs.0x.org/introduction/introduction-to-0x", "permanent": true }, + { + "source": "/docs/tools", + "destination": "https://docs.0x.org/", + "permanent": true + }, + { + "source": "/docs/guides", + "destination": "https://docs.0x.org/introduction/guides", + "permanent": true + }, { "source": "/docs/:path*", "destination": "https://docs.0x.org/:path*", From 1b2965097977dd96a67ff60c5cffbf454c92c105 Mon Sep 17 00:00:00 2001 From: Dennis Simon Date: Wed, 9 Mar 2022 16:32:41 +0100 Subject: [PATCH 05/14] Add wildcard redirect for vercel --- vercel.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index e8bd27dcc..5dd5d176f 100644 --- a/vercel.json +++ b/vercel.json @@ -29,6 +29,7 @@ "source": "/docs", "destination": "https://docs.0x.org/", "permanent": true - } + }, + { "src": "/[^.]+", "dest": "/", "status": 200 } ] } From 1136c4f94d59774ec7325e2a881af7364c5eff73 Mon Sep 17 00:00:00 2001 From: Dennis Simon Date: Wed, 9 Mar 2022 16:37:11 +0100 Subject: [PATCH 06/14] Fix redirect naming --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 5dd5d176f..1bd2b8f0b 100644 --- a/vercel.json +++ b/vercel.json @@ -30,6 +30,6 @@ "destination": "https://docs.0x.org/", "permanent": true }, - { "src": "/[^.]+", "dest": "/", "status": 200 } + { "source": "/[^.]+", "destination": "/", "statusCode": 200 } ] } From b1974eb6dbc9301bda66626cb04a1866de767b82 Mon Sep 17 00:00:00 2001 From: Dennis Simon Date: Wed, 9 Mar 2022 16:40:35 +0100 Subject: [PATCH 07/14] Fix path-to-regexp pattern --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 1bd2b8f0b..e17e0f512 100644 --- a/vercel.json +++ b/vercel.json @@ -30,6 +30,6 @@ "destination": "https://docs.0x.org/", "permanent": true }, - { "source": "/[^.]+", "destination": "/", "statusCode": 200 } + { "source": "/:path+", "destination": "/", "statusCode": 200 } ] } From 00c15169d497d41dc57d45bfd48972efba73a64d Mon Sep 17 00:00:00 2001 From: Dennis Simon Date: Wed, 9 Mar 2022 17:14:49 +0100 Subject: [PATCH 08/14] try different source pattern and remove statusCode --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index e17e0f512..b69da2db9 100644 --- a/vercel.json +++ b/vercel.json @@ -30,6 +30,6 @@ "destination": "https://docs.0x.org/", "permanent": true }, - { "source": "/:path+", "destination": "/", "statusCode": 200 } + { "source": "/(.*)", "destination": "/" } ] } From 154f5c8aaab1df241f1b2792fd65769335464572 Mon Sep 17 00:00:00 2001 From: Dennis Simon Date: Wed, 9 Mar 2022 17:23:12 +0100 Subject: [PATCH 09/14] change path pattern --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index b69da2db9..45516020a 100644 --- a/vercel.json +++ b/vercel.json @@ -30,6 +30,6 @@ "destination": "https://docs.0x.org/", "permanent": true }, - { "source": "/(.*)", "destination": "/" } + { "source": "/(.+)", "destination": "/" } ] } From d4ea7c5589fb19bc7ba699ef88a9d5c520194a98 Mon Sep 17 00:00:00 2001 From: Dennis Simon Date: Thu, 10 Mar 2022 15:26:41 +0100 Subject: [PATCH 10/14] move wildcard route to routes section in vercel.json --- vercel.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vercel.json b/vercel.json index 45516020a..3649297a4 100644 --- a/vercel.json +++ b/vercel.json @@ -29,7 +29,7 @@ "source": "/docs", "destination": "https://docs.0x.org/", "permanent": true - }, - { "source": "/(.+)", "destination": "/" } - ] + } + ], + "routes": [{ "src": "/[^.]+", "dest": "/", "status": 200 }] } From fd15ee643aa2f55c6fd78dfd53d0c77129cd7447 Mon Sep 17 00:00:00 2001 From: Dennis Simon Date: Thu, 10 Mar 2022 15:35:52 +0100 Subject: [PATCH 11/14] try rewrites --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 3649297a4..6f877f107 100644 --- a/vercel.json +++ b/vercel.json @@ -31,5 +31,5 @@ "permanent": true } ], - "routes": [{ "src": "/[^.]+", "dest": "/", "status": 200 }] + "rewrites": [{ "source": "/:path+", "destination": "/" }] } From aef7b4c2f533023dd690e0784f7aca2fa1ef819e Mon Sep 17 00:00:00 2001 From: Dennis Simon Date: Fri, 11 Mar 2022 14:10:32 +0100 Subject: [PATCH 12/14] remove old 0x Docs link --- ts/components/dropdowns/dropdown_docs.tsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ts/components/dropdowns/dropdown_docs.tsx b/ts/components/dropdowns/dropdown_docs.tsx index 1a015477b..21616a0bf 100644 --- a/ts/components/dropdowns/dropdown_docs.tsx +++ b/ts/components/dropdowns/dropdown_docs.tsx @@ -1,7 +1,6 @@ import * as React from 'react'; import styled from 'styled-components'; import { Heading, Paragraph } from 'ts/components/text'; -import { WebsitePaths } from 'ts/types'; import { Link } from '../documentation/shared/link'; @@ -9,11 +8,6 @@ const navData = [ { title: '0x Docs', description: 'Learn and build with 0x', - url: WebsitePaths.Docs, - }, - { - title: '(Alpha Release) 0x Docs', - description: 'Get a sneak peek at our updated documentation', url: 'https://docs.0x.org/', shouldOpenInNewTab: true, }, From c567e82fabd8476ed06d97a154b67641fef7e996 Mon Sep 17 00:00:00 2001 From: Dennis Simon Date: Mon, 14 Mar 2022 15:07:52 +0100 Subject: [PATCH 13/14] remove dropdown and rename header link to 'Documentation' --- ts/components/header.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ts/components/header.tsx b/ts/components/header.tsx index 1d218b7c4..6ffee2466 100644 --- a/ts/components/header.tsx +++ b/ts/components/header.tsx @@ -7,7 +7,7 @@ import { Link } from 'ts/components/documentation/shared/link'; import { Button } from 'ts/components/button'; // import { DropdownProducts } from 'ts/components/dropdowns/dropdown_products'; // import { DropdownResources } from 'ts/components/dropdowns/dropdown_resources'; -import { DropdownDocs } from 'ts/components/dropdowns/dropdown_docs'; +// import { DropdownDocs } from 'ts/components/dropdowns/dropdown_docs'; import { Hamburger } from 'ts/components/hamburger'; import { Logo } from 'ts/components/logo'; import { MobileNav } from 'ts/components/mobile_nav'; @@ -41,9 +41,8 @@ interface DropdownWrapInterface { const navItems: NavItemProps[] = [ { id: 'docs', - text: 'Developers', - dropdownComponent: DropdownDocs, - dropdownWidth: 270, + text: 'Documentation', + url: 'https://docs.0x.org/', }, { id: 'zrx', From 68ca2ccab714440783df106e48b7e50ccd0f07d8 Mon Sep 17 00:00:00 2001 From: Dennis Simon Date: Thu, 17 Mar 2022 10:58:24 +0100 Subject: [PATCH 14/14] Add resolution to package.json to ensure websocket is pulled encrypted --- package.json | 3 +- yarn.lock | 110 ++------------------------------------------------- 2 files changed, 6 insertions(+), 107 deletions(-) diff --git a/package.json b/package.json index e3c684660..c1a0eb326 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,8 @@ }, "resolutions": { "node-hid": "2.1.1", - "scrypt": "github:barrysteyn/node-scrypt#fb60a8d" + "scrypt": "github:barrysteyn/node-scrypt#fb60a8d", + "websocket": "github:frozeman/WebSocket-Node#browserifyCompatible" }, "author": "Fabio Berger", "license": "Apache-2.0", diff --git a/yarn.lock b/yarn.lock index 172fae157..bfbc57937 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5227,13 +5227,6 @@ buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" -bufferutil@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.3.tgz#66724b756bed23cd7c28c4d306d7994f9943cc6b" - integrity sha512-yEYTwGndELGvfXsImMBLop58eaGW+YdONi1fNjTINSY98tmMmFijBG6WXgdkfuLNt4imzQNtIE+eBp1PVpMCSw== - dependencies: - node-gyp-build "^4.2.0" - builtin-modules@^1.0.0, builtin-modules@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" @@ -6652,14 +6645,6 @@ d@1: dependencies: es5-ext "^0.10.9" -d@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a" - integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA== - dependencies: - es5-ext "^0.10.50" - type "^1.0.1" - dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -7401,15 +7386,6 @@ es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: es6-symbol "~3.1.1" next-tick "1" -es5-ext@^0.10.50: - version "0.10.53" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1" - integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q== - dependencies: - es6-iterator "~2.0.3" - es6-symbol "~3.1.3" - next-tick "~1.0.0" - es6-iterator@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" @@ -7433,14 +7409,6 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.1: d "1" es5-ext "~0.10.14" -es6-symbol@~3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" - integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== - dependencies: - d "^1.0.1" - ext "^1.1.2" - escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -8561,13 +8529,6 @@ express@^4.17.1: utils-merge "1.0.1" vary "~1.1.2" -ext@^1.1.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244" - integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A== - dependencies: - type "^2.0.0" - extend-shallow@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" @@ -12775,10 +12736,6 @@ nan@2.13.2: resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7" integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw== -nan@^2.11.0: - version "2.12.1" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552" - nan@^2.12.1, nan@^2.13.2, nan@^2.14.0, nan@^2.2.1: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" @@ -12863,7 +12820,7 @@ new-array@^1.0.0: resolved "https://registry.yarnpkg.com/new-array/-/new-array-1.0.0.tgz#5dbc639d961eac7f1a9fbc1a7146ec12f2924fbf" integrity sha1-XbxjnZYerH8an7wacUbsEvKST78= -next-tick@1, next-tick@~1.0.0: +next-tick@1: version "1.0.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" @@ -17707,21 +17664,11 @@ type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -type@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0" - integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== - -type@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/type/-/type-2.3.0.tgz#ada7c045f07ead08abf9e2edd29be1a0c0661132" - integrity sha512-rgPIqOdfK/4J9FhiVrZ3cveAjRRo5rsQBAIhnylX874y1DX/kEKSVdLsnuHB6l1KTjHyU01VjiMBHgU2adejyg== - typed-styles@^0.0.5: version "0.0.5" resolved "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.5.tgz#a60df245d482a9b1adf9c06c078d0f06085ed1cf" -typedarray-to-buffer@3.1.5, typedarray-to-buffer@^3.1.2, typedarray-to-buffer@^3.1.5: +typedarray-to-buffer@3.1.5, typedarray-to-buffer@^3.1.2: version "3.1.5" resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" dependencies: @@ -18136,13 +18083,6 @@ use@^3.1.0: dependencies: kind-of "^6.0.2" -utf-8-validate@^5.0.2: - version "5.0.4" - resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.4.tgz#72a1735983ddf7a05a43a9c6b67c5ce1c910f9b8" - integrity sha512-MEF05cPSq3AwJ2C7B7sHAA6i53vONoZbMGX8My5auEVm6W+dJ2Jd/TZPyGJ5CH42V2XtbI5FD28HeHeqlPzZ3Q== - dependencies: - node-gyp-build "^4.2.0" - utf8@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.1.tgz#2e01db02f7d8d0944f77104f1609eb0c304cf768" @@ -19099,51 +19039,9 @@ websocket-extensions@>=0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" -websocket@1.0.26: - version "1.0.26" - resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.26.tgz#a03a01299849c35268c83044aa919c6374be8194" - dependencies: - debug "^2.2.0" - nan "^2.3.3" - typedarray-to-buffer "^3.1.2" - yaeti "^0.0.6" - -websocket@1.0.32: - version "1.0.32" - resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.32.tgz#1f16ddab3a21a2d929dec1687ab21cfdc6d3dbb1" - integrity sha512-i4yhcllSP4wrpoPMU2N0TQ/q0O94LRG/eUQjEAamRltjQ1oT1PFFKOG4i877OlJgCG8rw6LrrowJp+TYCEWF7Q== - dependencies: - bufferutil "^4.0.1" - debug "^2.2.0" - es5-ext "^0.10.50" - typedarray-to-buffer "^3.1.5" - utf-8-validate "^5.0.2" - yaeti "^0.0.6" - -websocket@^1.0.26: - version "1.0.28" - resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.28.tgz#9e5f6fdc8a3fe01d4422647ef93abdd8d45a78d3" - dependencies: - debug "^2.2.0" - nan "^2.11.0" - typedarray-to-buffer "^3.1.5" - yaeti "^0.0.6" - -websocket@^1.0.31: - version "1.0.33" - resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.33.tgz#407f763fc58e74a3fa41ca3ae5d78d3f5e3b82a5" - integrity sha512-XwNqM2rN5eh3G2CUQE3OHZj+0xfdH42+OFK6LdC2yqiC0YU8e5UK0nYre220T0IyyN031V/XOvtHvXozvJYFWA== - dependencies: - bufferutil "^4.0.1" - debug "^2.2.0" - es5-ext "^0.10.50" - typedarray-to-buffer "^3.1.5" - utf-8-validate "^5.0.2" - yaeti "^0.0.6" - -"websocket@git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible": +websocket@1.0.26, websocket@1.0.32, websocket@^1.0.26, websocket@^1.0.31, "websocket@git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible", "websocket@github:frozeman/WebSocket-Node#browserifyCompatible": version "1.0.26" - resolved "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2" + resolved "https://codeload.github.com/frozeman/WebSocket-Node/tar.gz/6c72925e3f8aaaea8dc8450f97627e85263999f2" dependencies: debug "^2.2.0" nan "^2.3.3"