From 8e61e28672f6715772ba0defd5a1a633f1ea3344 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 14:18:43 +0300 Subject: [PATCH 01/23] ci: add step for deploying storybook to gh-pages --- .github/workflows/ui-tests.yaml | 4 +- package.json | 5 +- yarn.lock | 133 ++++++++++++++++++++++++++++++-- 3 files changed, 134 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ui-tests.yaml b/.github/workflows/ui-tests.yaml index 0a7be752..e13f0129 100644 --- a/.github/workflows/ui-tests.yaml +++ b/.github/workflows/ui-tests.yaml @@ -65,8 +65,10 @@ jobs: run: npx playwright install --with-deps - name: Build Storybook run: yarn build-storybook --quiet - - name: Serve Storybook and run tests + - name: Run Storybook tests run: | npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \ "npx http-server storybook-static --port 6006 --silent" \ "npx wait-on tcp:127.0.0.1:6006 && yarn test-storybook" + - name: Update GitHub pages with built Storybook + run: yarn deploy-storybook diff --git a/package.json b/package.json index 6cd4f00f..f5dd9a73 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "nimbus-gui", "private": true, "version": "0.0.0", + "homepage": "https://nimbus-gui.github.io/nimbus-gui", "scripts": { "dev": "NODE_ENV=development vite", "build": "tsc -p . && vite build", @@ -9,7 +10,8 @@ "preview": "vite preview", "storybook": "storybook dev -p 6006", "build-storybook": "storybook build", - "test-storybook": "test-storybook" + "test-storybook": "test-storybook", + "deploy-storybook": "gh-pages -d storybook-static" }, "resolutions": { "@tamagui/web": "1.36.4", @@ -58,6 +60,7 @@ "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.3", "eslint-plugin-storybook": "^0.6.13", + "gh-pages": "^6.0.0", "prettier": "^3.0.1", "storybook": "^7.2.0", "storybook-addon-react-router-v6": "^2.0.5", diff --git a/yarn.lock b/yarn.lock index 7d92fd5a..fd762528 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7799,6 +7799,15 @@ __metadata: languageName: node linkType: hard +"array-union@npm:^1.0.1": + version: 1.0.2 + resolution: "array-union@npm:1.0.2" + dependencies: + array-uniq: ^1.0.1 + checksum: 82cec6421b6e6766556c484835a6d476a873f1b71cace5ab2b4f1b15b1e3162dc4da0d16f7a2b04d4aec18146c6638fe8f661340b31ba8e469fd811a1b45dc8d + languageName: node + linkType: hard + "array-union@npm:^2.1.0": version: 2.1.0 resolution: "array-union@npm:2.1.0" @@ -7806,6 +7815,13 @@ __metadata: languageName: node linkType: hard +"array-uniq@npm:^1.0.1": + version: 1.0.3 + resolution: "array-uniq@npm:1.0.3" + checksum: 1625f06b093d8bf279b81adfec6e72951c0857d65b5e3f65f053fffe9f9dd61c2fc52cff57e38a4700817e7e3f01a4faa433d505ea9e33cdae4514c334e0bf9e + languageName: node + linkType: hard + "asap@npm:~2.0.3, asap@npm:~2.0.6": version: 2.0.6 resolution: "asap@npm:2.0.6" @@ -7866,7 +7882,7 @@ __metadata: languageName: node linkType: hard -"async@npm:^3.2.2, async@npm:^3.2.3": +"async@npm:^3.2.2, async@npm:^3.2.3, async@npm:^3.2.4": version: 3.2.4 resolution: "async@npm:3.2.4" checksum: 43d07459a4e1d09b84a20772414aa684ff4de085cbcaec6eea3c7a8f8150e8c62aa6cd4e699fe8ee93c3a5b324e777d34642531875a0817a35697522c1b02e89 @@ -8673,6 +8689,13 @@ __metadata: languageName: node linkType: hard +"commander@npm:^11.0.0": + version: 11.0.0 + resolution: "commander@npm:11.0.0" + checksum: 6621954e1e1d078b4991c1f5bbd9439ad37aa7768d6ab4842de1dbd4d222c8a27e1b8e62108b3a92988614af45031d5bb2a2aaa92951f4d0c934d1a1ac564bb4 + languageName: node + linkType: hard + "commander@npm:^2.19.0, commander@npm:^2.20.0": version: 2.20.3 resolution: "commander@npm:2.20.3" @@ -9523,6 +9546,13 @@ __metadata: languageName: node linkType: hard +"email-addresses@npm:^5.0.0": + version: 5.0.0 + resolution: "email-addresses@npm:5.0.0" + checksum: e58a510e9caf105313025e1c81488d5391c6404f0bbd7874e8e36a4c14d1ced02ff271748146c13edfa3bd9ce9b25f1194f5369971d77087325f37ab193129bb + languageName: node + linkType: hard + "emittery@npm:^0.10.2": version: 0.10.2 resolution: "emittery@npm:0.10.2" @@ -9872,7 +9902,7 @@ __metadata: languageName: node linkType: hard -"escape-string-regexp@npm:^1.0.5": +"escape-string-regexp@npm:^1.0.2, escape-string-regexp@npm:^1.0.5": version: 1.0.5 resolution: "escape-string-regexp@npm:1.0.5" checksum: 6092fda75c63b110c706b6a9bfde8a612ad595b628f0bd2147eea1d3406723020810e591effc7db1da91d80a71a737a313567c5abb3813e8d9c71f4aa595b410 @@ -10400,6 +10430,24 @@ __metadata: languageName: node linkType: hard +"filename-reserved-regex@npm:^2.0.0": + version: 2.0.0 + resolution: "filename-reserved-regex@npm:2.0.0" + checksum: 323a0020fd7f243238ffccab9d728cbc5f3a13c84b2c10e01efb09b8324561d7a51776be76f36603c734d4f69145c39a5d12492bf6142a28b50d7f90bd6190bc + languageName: node + linkType: hard + +"filenamify@npm:^4.3.0": + version: 4.3.0 + resolution: "filenamify@npm:4.3.0" + dependencies: + filename-reserved-regex: ^2.0.0 + strip-outer: ^1.0.1 + trim-repeated: ^1.0.0 + checksum: 5b71a7ff8e958c8621957e6fbf7872024126d3b5da50f59b1634af3343ba1a69d4cc15cfe4ca4bbfa7c959ad4d98614ee51e6f1d9fa7326eef8ceda2da8cd74e + languageName: node + linkType: hard + "fill-range@npm:^7.0.1": version: 7.0.1 resolution: "fill-range@npm:7.0.1" @@ -10450,7 +10498,7 @@ __metadata: languageName: node linkType: hard -"find-cache-dir@npm:^3.0.0, find-cache-dir@npm:^3.2.0, find-cache-dir@npm:^3.3.2": +"find-cache-dir@npm:^3.0.0, find-cache-dir@npm:^3.2.0, find-cache-dir@npm:^3.3.1, find-cache-dir@npm:^3.3.2": version: 3.3.2 resolution: "find-cache-dir@npm:3.3.2" dependencies: @@ -10666,7 +10714,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:11.1.1, fs-extra@npm:^11.1.0": +"fs-extra@npm:11.1.1, fs-extra@npm:^11.1.0, fs-extra@npm:^11.1.1": version: 11.1.1 resolution: "fs-extra@npm:11.1.1" dependencies: @@ -10832,6 +10880,24 @@ __metadata: languageName: node linkType: hard +"gh-pages@npm:^6.0.0": + version: 6.0.0 + resolution: "gh-pages@npm:6.0.0" + dependencies: + async: ^3.2.4 + commander: ^11.0.0 + email-addresses: ^5.0.0 + filenamify: ^4.3.0 + find-cache-dir: ^3.3.1 + fs-extra: ^11.1.1 + globby: ^6.1.0 + bin: + gh-pages: bin/gh-pages.js + gh-pages-clean: bin/gh-pages-clean.js + checksum: 031f9070cdcd4fb71a2a8eabec049c885faa17e489a6e37e8f7dfa9bd649607560b0778b8e19a1d9295ebd614668e3854d860d48313cb7b23ee9f3884adef517 + languageName: node + linkType: hard + "giget@npm:^1.0.0": version: 1.1.2 resolution: "giget@npm:1.1.2" @@ -10907,7 +10973,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": +"glob@npm:^7.0.3, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": version: 7.2.3 resolution: "glob@npm:7.2.3" dependencies: @@ -10986,6 +11052,19 @@ __metadata: languageName: node linkType: hard +"globby@npm:^6.1.0": + version: 6.1.0 + resolution: "globby@npm:6.1.0" + dependencies: + array-union: ^1.0.1 + glob: ^7.0.3 + object-assign: ^4.0.1 + pify: ^2.0.0 + pinkie-promise: ^2.0.0 + checksum: 18109d6b9d55643d2b98b59c3cfae7073ccfe39829632f353d516cc124d836c2ddebe48a23f04af63d66a621b6d86dd4cbd7e6af906f2458a7fe510ffc4bd424 + languageName: node + linkType: hard + "gopd@npm:^1.0.1": version: 1.0.1 resolution: "gopd@npm:1.0.1" @@ -13847,6 +13926,7 @@ __metadata: eslint-plugin-react-refresh: ^0.4.3 eslint-plugin-storybook: ^0.6.13 expo-modules-core: ^1.5.9 + gh-pages: ^6.0.0 prettier: ^3.0.1 react: 18 react-color: ^2.19.3 @@ -14076,7 +14156,7 @@ __metadata: languageName: node linkType: hard -"object-assign@npm:^4.1.0, object-assign@npm:^4.1.1": +"object-assign@npm:^4.0.1, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1": version: 4.1.1 resolution: "object-assign@npm:4.1.1" checksum: fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f @@ -14466,6 +14546,13 @@ __metadata: languageName: node linkType: hard +"pify@npm:^2.0.0": + version: 2.3.0 + resolution: "pify@npm:2.3.0" + checksum: 9503aaeaf4577acc58642ad1d25c45c6d90288596238fb68f82811c08104c800e5a7870398e9f015d82b44ecbcbef3dc3d4251a1cbb582f6e5959fe09884b2ba + languageName: node + linkType: hard + "pify@npm:^4.0.1": version: 4.0.1 resolution: "pify@npm:4.0.1" @@ -14473,6 +14560,22 @@ __metadata: languageName: node linkType: hard +"pinkie-promise@npm:^2.0.0": + version: 2.0.1 + resolution: "pinkie-promise@npm:2.0.1" + dependencies: + pinkie: ^2.0.0 + checksum: b53a4a2e73bf56b6f421eef711e7bdcb693d6abb474d57c5c413b809f654ba5ee750c6a96dd7225052d4b96c4d053cdcb34b708a86fceed4663303abee52fcca + languageName: node + linkType: hard + +"pinkie@npm:^2.0.0": + version: 2.0.4 + resolution: "pinkie@npm:2.0.4" + checksum: b12b10afea1177595aab036fc220785488f67b4b0fc49e7a27979472592e971614fa1c728e63ad3e7eb748b4ec3c3dbd780819331dad6f7d635c77c10537b9db + languageName: node + linkType: hard + "pirates@npm:^3.0.2": version: 3.0.2 resolution: "pirates@npm:3.0.2" @@ -16349,6 +16452,15 @@ __metadata: languageName: node linkType: hard +"strip-outer@npm:^1.0.1": + version: 1.0.1 + resolution: "strip-outer@npm:1.0.1" + dependencies: + escape-string-regexp: ^1.0.2 + checksum: f8d65d33ca2b49aabc66bb41d689dda7b8b9959d320e3a40a2ef4d7079ff2f67ffb72db43f179f48dbf9495c2e33742863feab7a584d180fa62505439162c191 + languageName: node + linkType: hard + "strnum@npm:^1.0.5": version: 1.0.5 resolution: "strnum@npm:1.0.5" @@ -16692,6 +16804,15 @@ __metadata: languageName: node linkType: hard +"trim-repeated@npm:^1.0.0": + version: 1.0.0 + resolution: "trim-repeated@npm:1.0.0" + dependencies: + escape-string-regexp: ^1.0.2 + checksum: e25c235305b82c43f1d64a67a71226c406b00281755e4c2c4f3b1d0b09c687a535dd3c4483327f949f28bb89dc400a0bc5e5b749054f4b99f49ebfe48ba36496 + languageName: node + linkType: hard + "ts-api-utils@npm:^1.0.1": version: 1.0.1 resolution: "ts-api-utils@npm:1.0.1" From ae9253ed984b045f16984bcc7d103df5b139831e Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 14:40:54 +0300 Subject: [PATCH 02/23] fix(ci): use `storybook-deployer` package --- package.json | 3 +- yarn.lock | 124 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 122 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f5dd9a73..b66627c5 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "storybook": "storybook dev -p 6006", "build-storybook": "storybook build", "test-storybook": "test-storybook", - "deploy-storybook": "gh-pages -d storybook-static" + "deploy-storybook": "storybook-to-ghpages" }, "resolutions": { "@tamagui/web": "1.36.4", @@ -49,6 +49,7 @@ "@storybook/cli": "^7.2.0", "@storybook/react": "^7.2.0", "@storybook/react-vite": "^7.2.0", + "@storybook/storybook-deployer": "^2.8.16", "@storybook/test-runner": "^0.12.0", "@storybook/testing-library": "^0.2.0", "@types/react-color": "^3.0.6", diff --git a/yarn.lock b/yarn.lock index fd762528..b29cbbe7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5182,6 +5182,22 @@ __metadata: languageName: node linkType: hard +"@storybook/storybook-deployer@npm:^2.8.16": + version: 2.8.16 + resolution: "@storybook/storybook-deployer@npm:2.8.16" + dependencies: + git-url-parse: ^12.0.0 + glob: ^7.1.3 + parse-repo: ^1.0.4 + shelljs: ^0.8.1 + yargs: ^15.0.0 + bin: + storybook-to-aws-s3: bin/storybook_to_aws_s3 + storybook-to-ghpages: bin/storybook_to_ghpages + checksum: 06d02d9da9e6242de89436973e0a0d8126bcac5a89e7356815b095073d7c3b8c5ec7e9216183b18a9ec9c120455634a08388ddf67b1192cda748577768f07bd2 + languageName: node + linkType: hard + "@storybook/telemetry@npm:7.2.1, @storybook/telemetry@npm:^7.1.0-alpha.32": version: 7.2.1 resolution: "@storybook/telemetry@npm:7.2.1" @@ -10915,6 +10931,25 @@ __metadata: languageName: node linkType: hard +"git-up@npm:^6.0.0": + version: 6.0.0 + resolution: "git-up@npm:6.0.0" + dependencies: + is-ssh: ^1.4.0 + parse-url: ^7.0.2 + checksum: 145a1f546d7a078cdfc2616556e518e634d134e34a31c6bf2ed89e44158659cb525dbd451c338121f7107f55cef066d0b37a7bbf178555befc9304b3940b435e + languageName: node + linkType: hard + +"git-url-parse@npm:^12.0.0": + version: 12.0.0 + resolution: "git-url-parse@npm:12.0.0" + dependencies: + git-up: ^6.0.0 + checksum: b4c8530b816202ecf9d4dabf755f785a314a096b56145018385b3d7171e862f9d0d9b38cce620c0af354b269750fe7b2d9aa95815c7150922090a11dac4ab1e6 + languageName: node + linkType: hard + "github-slugger@npm:^1.0.0": version: 1.5.0 resolution: "github-slugger@npm:1.5.0" @@ -10973,7 +11008,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.0.3, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": +"glob@npm:^7.0.0, glob@npm:^7.0.3, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": version: 7.2.3 resolution: "glob@npm:7.2.3" dependencies: @@ -11501,6 +11536,13 @@ __metadata: languageName: node linkType: hard +"interpret@npm:^1.0.0": + version: 1.4.0 + resolution: "interpret@npm:1.4.0" + checksum: 2e5f51268b5941e4a17e4ef0575bc91ed0ab5f8515e3cf77486f7c14d13f3010df9c0959f37063dcc96e78d12dc6b0bb1b9e111cdfe69771f4656d2993d36155 + languageName: node + linkType: hard + "invariant@npm:*, invariant@npm:^2.2.4": version: 2.2.4 resolution: "invariant@npm:2.2.4" @@ -11823,6 +11865,15 @@ __metadata: languageName: node linkType: hard +"is-ssh@npm:^1.4.0": + version: 1.4.0 + resolution: "is-ssh@npm:1.4.0" + dependencies: + protocols: ^2.0.1 + checksum: 75eaa17b538bee24b661fbeb0f140226ac77e904a6039f787bea418431e2162f1f9c4c4ccad3bd169e036cd701cc631406e8c505d9fa7e20164e74b47f86f40f + languageName: node + linkType: hard + "is-stream@npm:^2.0.0": version: 2.0.1 resolution: "is-stream@npm:2.0.1" @@ -13909,6 +13960,7 @@ __metadata: "@storybook/cli": ^7.2.0 "@storybook/react": ^7.2.0 "@storybook/react-vite": ^7.2.0 + "@storybook/storybook-deployer": ^2.8.16 "@storybook/test-runner": ^0.12.0 "@storybook/testing-library": ^0.2.0 "@tamagui/config": 1.36.4 @@ -14075,6 +14127,13 @@ __metadata: languageName: node linkType: hard +"normalize-url@npm:^6.1.0": + version: 6.1.0 + resolution: "normalize-url@npm:6.1.0" + checksum: 4a4944631173e7d521d6b80e4c85ccaeceb2870f315584fa30121f505a6dfd86439c5e3fdd8cd9e0e291290c41d0c3599f0cb12ab356722ed242584c30348e50 + languageName: node + linkType: hard + "npm-run-path@npm:^4.0.1": version: 4.0.1 resolution: "npm-run-path@npm:4.0.1" @@ -14434,6 +14493,34 @@ __metadata: languageName: node linkType: hard +"parse-path@npm:^5.0.0": + version: 5.0.0 + resolution: "parse-path@npm:5.0.0" + dependencies: + protocols: ^2.0.0 + checksum: e9f670559cd8e535f39f548bf5d41ad96a220190ea98df33d0babd9dfaa7c3c70ee2e55394078517d5e7e93c6a39c8eac1261ed3f9e68033656614fc954262e8 + languageName: node + linkType: hard + +"parse-repo@npm:^1.0.4": + version: 1.0.4 + resolution: "parse-repo@npm:1.0.4" + checksum: b0d32a182cdb2287adfb1d9141f7f694890e0ad659e80f75ec2e266339c5a728328f08cb72caf85cb7524b5dbbc4122b17efdd48e0d17d96ed9863ec512e0141 + languageName: node + linkType: hard + +"parse-url@npm:^7.0.2": + version: 7.0.2 + resolution: "parse-url@npm:7.0.2" + dependencies: + is-ssh: ^1.4.0 + normalize-url: ^6.1.0 + parse-path: ^5.0.0 + protocols: ^2.0.1 + checksum: 3e26852706bebe9fac409909316716dee52883d2fb5c82d65577effba1507abb7bc42bb59ce0ba6c8659168fb99acf89000bd8fe096ed3ad7124fa85227436d7 + languageName: node + linkType: hard + "parseurl@npm:~1.3.2, parseurl@npm:~1.3.3": version: 1.3.3 resolution: "parseurl@npm:1.3.3" @@ -14823,6 +14910,13 @@ __metadata: languageName: node linkType: hard +"protocols@npm:^2.0.0, protocols@npm:^2.0.1": + version: 2.0.1 + resolution: "protocols@npm:2.0.1" + checksum: 4a9bef6aa0449a0245ded319ac3cbfd032c3e76ebb562777037a3a832c99253d0e8bc2847f7be350236df620a11f7d4fe683ea7f59a2cc14c69f746b6259eda4 + languageName: node + linkType: hard + "proxy-addr@npm:~2.0.7": version: 2.0.7 resolution: "proxy-addr@npm:2.0.7" @@ -15484,6 +15578,15 @@ __metadata: languageName: node linkType: hard +"rechoir@npm:^0.6.2": + version: 0.6.2 + resolution: "rechoir@npm:0.6.2" + dependencies: + resolve: ^1.1.6 + checksum: fe76bf9c21875ac16e235defedd7cbd34f333c02a92546142b7911a0f7c7059d2e16f441fe6fb9ae203f459c05a31b2bcf26202896d89e390eda7514d5d2702b + languageName: node + linkType: hard + "redux-thunk@npm:^2.4.2": version: 2.4.2 resolution: "redux-thunk@npm:2.4.2" @@ -15704,7 +15807,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1": +"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1": version: 1.22.4 resolution: "resolve@npm:1.22.4" dependencies: @@ -15717,7 +15820,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.22.1#~builtin": +"resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.22.1#~builtin": version: 1.22.4 resolution: "resolve@patch:resolve@npm%3A1.22.4#~builtin::version=1.22.4&hash=c3c19d" dependencies: @@ -16009,6 +16112,19 @@ __metadata: languageName: node linkType: hard +"shelljs@npm:^0.8.1": + version: 0.8.5 + resolution: "shelljs@npm:0.8.5" + dependencies: + glob: ^7.0.0 + interpret: ^1.0.0 + rechoir: ^0.6.2 + bin: + shjs: bin/shjs + checksum: 7babc46f732a98f4c054ec1f048b55b9149b98aa2da32f6cf9844c434b43c6251efebd6eec120937bd0999e13811ebd45efe17410edb3ca938f82f9381302748 + languageName: node + linkType: hard + "side-channel@npm:^1.0.4": version: 1.0.4 resolution: "side-channel@npm:1.0.4" @@ -17697,7 +17813,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^15.0.2, yargs@npm:^15.1.0": +"yargs@npm:^15.0.0, yargs@npm:^15.0.2, yargs@npm:^15.1.0": version: 15.4.1 resolution: "yargs@npm:15.4.1" dependencies: From b9beb27b86cfe0b0dcb3593d889ae60dc312ecab Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 14:57:13 +0300 Subject: [PATCH 03/23] fix(ci): add `viteFinal` step to set proper asset path --- .storybook/main.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.storybook/main.ts b/.storybook/main.ts index 7e29894c..774a0610 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -16,6 +16,14 @@ const config: StorybookConfig = { docs: { autodocs: 'tag', }, + + async viteFinal(config, { configType }) { + if (configType === 'PRODUCTION') { + config.base = './' + } + + return config + }, } export default config From a95ae1ada73cfa29251cb385d68b9db8074ac143 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 15:07:08 +0300 Subject: [PATCH 04/23] fix(ci): add `.nojekyll` file in root --- .nojekyll | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .nojekyll diff --git a/.nojekyll b/.nojekyll new file mode 100644 index 00000000..e69de29b From 4b2f4f0f3bde086eb94f1175a34c58ac81155b6e Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 15:19:46 +0300 Subject: [PATCH 05/23] fix(ci): use manual gh pages step --- .github/workflows/ui-tests.yaml | 14 ++++++++++++-- package.json | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ui-tests.yaml b/.github/workflows/ui-tests.yaml index e13f0129..adffa161 100644 --- a/.github/workflows/ui-tests.yaml +++ b/.github/workflows/ui-tests.yaml @@ -44,6 +44,9 @@ jobs: run: yarn build interaction-and-and-accessibility: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest needs: cache-dependencies steps: @@ -70,5 +73,12 @@ jobs: npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \ "npx http-server storybook-static --port 6006 --silent" \ "npx wait-on tcp:127.0.0.1:6006 && yarn test-storybook" - - name: Update GitHub pages with built Storybook - run: yarn deploy-storybook + - name: Setup Pages + uses: actions/configure-pages@v3 + - name: Upload artifact + uses: actions/upload-pages-artifact@v2 + with: + path: './storybook-static' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v2 diff --git a/package.json b/package.json index b66627c5..3859637a 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "storybook": "storybook dev -p 6006", "build-storybook": "storybook build", "test-storybook": "test-storybook", - "deploy-storybook": "storybook-to-ghpages" + "deploy-storybook": "gh-pages -d storybook-static -t true" }, "resolutions": { "@tamagui/web": "1.36.4", From 1b7eab6ccc6b7f170e4b4e38504ebaff4b0b290f Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 15:33:30 +0300 Subject: [PATCH 06/23] ci: make separate workflow for deploying to GH pages --- .github/workflows/deploy-storybook.yaml | 71 +++++++++++++++++++++++++ .github/workflows/ui-tests.yaml | 12 ----- 2 files changed, 71 insertions(+), 12 deletions(-) create mode 100644 .github/workflows/deploy-storybook.yaml diff --git a/.github/workflows/deploy-storybook.yaml b/.github/workflows/deploy-storybook.yaml new file mode 100644 index 00000000..81608c78 --- /dev/null +++ b/.github/workflows/deploy-storybook.yaml @@ -0,0 +1,71 @@ +name: 'Deploy Storybook' + +on: + push: + branches: + - main + workflow_dispatch: + +permissions: + contents: read + pages: write + id-token: write + +concurrency: + group: "pages" + cancel-in-progress: false + +jobs: + cache-dependencies: + runs-on: ubuntu-latest + steps: + - name: Checkout Commit + uses: actions/checkout@v2 + - name: Cache yarn dependencies and cypress + uses: actions/cache@v2 + id: yarn-cache + with: + path: | + ~/.cache/Cypress + node_modules + key: ${{ runner.os }}-yarn-v3-${{ hashFiles('**/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-yarn-v3 + - name: Install dependencies if cache invalid + if: steps.yarn-cache.outputs.cache-hit != 'true' + run: yarn + + build-and-deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + needs: cache-dependencies + steps: + - uses: actions/setup-node@v2 + with: + node-version: '18.x' + - name: Setup Pages + uses: actions/configure-pages@v3 + - name: Restore yarn dependencies + uses: actions/cache@v2 + id: yarn-cache + with: + path: | + ~/.cache/Cypress + node_modules + key: ${{ runner.os }}-yarn-v3-${{ hashFiles('**/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-yarn-v3 + - name: Install Playwright + run: npx playwright install --with-deps + - name: Build Storybook + run: yarn build-storybook --quiet + - name: Upload artifact + uses: actions/upload-pages-artifact@v2 + with: + path: './storybook-static' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v2 + - uses: actions/checkout@v2 diff --git a/.github/workflows/ui-tests.yaml b/.github/workflows/ui-tests.yaml index adffa161..b2557b70 100644 --- a/.github/workflows/ui-tests.yaml +++ b/.github/workflows/ui-tests.yaml @@ -44,9 +44,6 @@ jobs: run: yarn build interaction-and-and-accessibility: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest needs: cache-dependencies steps: @@ -73,12 +70,3 @@ jobs: npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \ "npx http-server storybook-static --port 6006 --silent" \ "npx wait-on tcp:127.0.0.1:6006 && yarn test-storybook" - - name: Setup Pages - uses: actions/configure-pages@v3 - - name: Upload artifact - uses: actions/upload-pages-artifact@v2 - with: - path: './storybook-static' - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v2 From 3d0426549835c3f7fb87dcfeef0a87dd6bebae35 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 15:44:27 +0300 Subject: [PATCH 07/23] fix(ci): add missing checkout step --- .github/workflows/deploy-storybook.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-storybook.yaml b/.github/workflows/deploy-storybook.yaml index 81608c78..0aa7cf96 100644 --- a/.github/workflows/deploy-storybook.yaml +++ b/.github/workflows/deploy-storybook.yaml @@ -42,6 +42,7 @@ jobs: runs-on: ubuntu-latest needs: cache-dependencies steps: + - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: node-version: '18.x' From 7d1c6913d8d4b059f502214dc12f26a4313fe798 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 15:57:29 +0300 Subject: [PATCH 08/23] fix(ci): remove `viteFinal` in config --- .storybook/main.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.storybook/main.ts b/.storybook/main.ts index 774a0610..7e29894c 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -16,14 +16,6 @@ const config: StorybookConfig = { docs: { autodocs: 'tag', }, - - async viteFinal(config, { configType }) { - if (configType === 'PRODUCTION') { - config.base = './' - } - - return config - }, } export default config From 766b0b5b7b2740c359dc77f7919f8d6847d71eee Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 16:06:12 +0300 Subject: [PATCH 09/23] cleanup(ci): remove duplicate checkout --- .github/workflows/deploy-storybook.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy-storybook.yaml b/.github/workflows/deploy-storybook.yaml index 0aa7cf96..804a4d97 100644 --- a/.github/workflows/deploy-storybook.yaml +++ b/.github/workflows/deploy-storybook.yaml @@ -69,4 +69,3 @@ jobs: - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v2 - - uses: actions/checkout@v2 From a85ab537e115fafcc4a279c0a4feda27b56e2ef1 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 16:11:42 +0300 Subject: [PATCH 10/23] fix(ci): set `GH_PAGES` to `true` for storybook build --- .github/workflows/deploy-storybook.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy-storybook.yaml b/.github/workflows/deploy-storybook.yaml index 804a4d97..d5a0e769 100644 --- a/.github/workflows/deploy-storybook.yaml +++ b/.github/workflows/deploy-storybook.yaml @@ -40,6 +40,8 @@ jobs: name: github-pages url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest + env: + GH_PAGES: true needs: cache-dependencies steps: - uses: actions/checkout@v2 From fbbcdf5669310e985b1a5353bdd0a8ba93464124 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 16:21:42 +0300 Subject: [PATCH 11/23] fix(ci): set basepath to account for GH pages root dir --- .github/workflows/deploy-storybook.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-storybook.yaml b/.github/workflows/deploy-storybook.yaml index d5a0e769..269bc4ba 100644 --- a/.github/workflows/deploy-storybook.yaml +++ b/.github/workflows/deploy-storybook.yaml @@ -42,6 +42,7 @@ jobs: runs-on: ubuntu-latest env: GH_PAGES: true + BASE_PATH: /nimbus-gui needs: cache-dependencies steps: - uses: actions/checkout@v2 From a9546b4a25667f1e4adc08e154b1de982c915b67 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 16:27:33 +0300 Subject: [PATCH 12/23] fix(ci): add back `viteFinal` for base path --- .github/workflows/deploy-storybook.yaml | 1 - .storybook/main.ts | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-storybook.yaml b/.github/workflows/deploy-storybook.yaml index 269bc4ba..d5a0e769 100644 --- a/.github/workflows/deploy-storybook.yaml +++ b/.github/workflows/deploy-storybook.yaml @@ -42,7 +42,6 @@ jobs: runs-on: ubuntu-latest env: GH_PAGES: true - BASE_PATH: /nimbus-gui needs: cache-dependencies steps: - uses: actions/checkout@v2 diff --git a/.storybook/main.ts b/.storybook/main.ts index 7e29894c..774a0610 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -16,6 +16,14 @@ const config: StorybookConfig = { docs: { autodocs: 'tag', }, + + async viteFinal(config, { configType }) { + if (configType === 'PRODUCTION') { + config.base = './' + } + + return config + }, } export default config From 254fc66e68ef5b81f04386254ed37defaea2ff18 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 16:50:03 +0300 Subject: [PATCH 13/23] debug(ci): add bogus base path to storybook config --- .storybook/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.storybook/main.ts b/.storybook/main.ts index 774a0610..8c3f5641 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -19,7 +19,7 @@ const config: StorybookConfig = { async viteFinal(config, { configType }) { if (configType === 'PRODUCTION') { - config.base = './' + config.base = './lul' } return config From 8a322bf241fea74d6a1b1a426a9647bf5c584c07 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 16:57:51 +0300 Subject: [PATCH 14/23] debug(ci): add `nimbus-gui` base URL --- .storybook/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.storybook/main.ts b/.storybook/main.ts index 8c3f5641..e2543b65 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -19,7 +19,7 @@ const config: StorybookConfig = { async viteFinal(config, { configType }) { if (configType === 'PRODUCTION') { - config.base = './lul' + config.base = '/nimbus-gui/' } return config From aa247b1c222a1e6596c2c6ad17b00580047908e3 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 17:07:31 +0300 Subject: [PATCH 15/23] debug(ci): set base URL up to be pulled from env --- .github/workflows/deploy-storybook.yaml | 1 + .storybook/main.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-storybook.yaml b/.github/workflows/deploy-storybook.yaml index d5a0e769..62bd9937 100644 --- a/.github/workflows/deploy-storybook.yaml +++ b/.github/workflows/deploy-storybook.yaml @@ -42,6 +42,7 @@ jobs: runs-on: ubuntu-latest env: GH_PAGES: true + BASE_URL: "/nimbus-gui/" needs: cache-dependencies steps: - uses: actions/checkout@v2 diff --git a/.storybook/main.ts b/.storybook/main.ts index e2543b65..a8d24446 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -19,7 +19,7 @@ const config: StorybookConfig = { async viteFinal(config, { configType }) { if (configType === 'PRODUCTION') { - config.base = '/nimbus-gui/' + config.base = process.env.BASE_URL || './' } return config From ccc851ee3f924c56077574e7a7b47e7b86c375a6 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 17:24:53 +0300 Subject: [PATCH 16/23] fix(ci): use relative paths for icons --- src/pages/PairDevice/SyncStatus.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/PairDevice/SyncStatus.tsx b/src/pages/PairDevice/SyncStatus.tsx index 763239e8..67634e21 100644 --- a/src/pages/PairDevice/SyncStatus.tsx +++ b/src/pages/PairDevice/SyncStatus.tsx @@ -3,10 +3,10 @@ import { XStack, YStack } from 'tamagui' import { Button, IconButton, InformationBox, Text } from '@status-im/components' import Icon from '../../components/General/Icon' -import RefreshBlackIcon from '/icons/refresh-black.svg' -import RefreshIcon from '/icons/refresh.svg' -import BlockIcon from '/icons/block.svg' -import ConnectionIcon from '/icons/connection.svg' +import RefreshBlackIcon from '../../../public/icons/refresh-black.svg' +import RefreshIcon from '../../../public/icons/refresh.svg' +import BlockIcon from '../../../public/icons/block.svg' +import ConnectionIcon from '../../../public/icons/connection.svg' import { convertSecondsToTimerFormat } from '../../utilities' type SyncStatusProps = { From 993621c943e6ef6bd0f70fa673a1496cf223240d Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 17:29:05 +0300 Subject: [PATCH 17/23] debug(ci): remove `viteFinal` after change to imports --- .storybook/main.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.storybook/main.ts b/.storybook/main.ts index a8d24446..ccec5642 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -17,13 +17,13 @@ const config: StorybookConfig = { autodocs: 'tag', }, - async viteFinal(config, { configType }) { - if (configType === 'PRODUCTION') { - config.base = process.env.BASE_URL || './' - } - - return config - }, + // async viteFinal(config, { configType }) { + // if (configType === 'PRODUCTION') { + // config.base = process.env.BASE_URL || './' + // } + // + // return config + // }, } export default config From 814abf68c8fb53db130fd305e7c4813db759aeaf Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 18:15:34 +0300 Subject: [PATCH 18/23] debug(ci): set base url in vite config --- vite.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/vite.config.ts b/vite.config.ts index 93fd2fe8..32a84398 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -10,6 +10,7 @@ export default defineConfig({ 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV), 'process.env.TAMAGUI_TARGET': JSON.stringify('web'), }, + base: process.env.BASE_URL || './', resolve: { extensions, alias: { From a2635e919077401026bfdc3fde573dab9bfac7c8 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 19:56:37 +0300 Subject: [PATCH 19/23] debug(ci): set env variables only for storybook build --- .github/workflows/deploy-storybook.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/deploy-storybook.yaml b/.github/workflows/deploy-storybook.yaml index 62bd9937..3c5f7a0b 100644 --- a/.github/workflows/deploy-storybook.yaml +++ b/.github/workflows/deploy-storybook.yaml @@ -40,9 +40,6 @@ jobs: name: github-pages url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest - env: - GH_PAGES: true - BASE_URL: "/nimbus-gui/" needs: cache-dependencies steps: - uses: actions/checkout@v2 @@ -64,7 +61,7 @@ jobs: - name: Install Playwright run: npx playwright install --with-deps - name: Build Storybook - run: yarn build-storybook --quiet + run: GH_PAGES=true BASE_URL="/nimbus-gui/" yarn build-storybook --quiet - name: Upload artifact uses: actions/upload-pages-artifact@v2 with: From 7ef07e59555d7fd6b6072f4231c6ca876618d91e Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Mon, 21 Aug 2023 20:49:21 +0300 Subject: [PATCH 20/23] debug(ci): set base URL in `.storybook/main` --- .storybook/main.ts | 10 +++------- vite.config.ts | 1 - 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.storybook/main.ts b/.storybook/main.ts index ccec5642..2e58a01c 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -17,13 +17,9 @@ const config: StorybookConfig = { autodocs: 'tag', }, - // async viteFinal(config, { configType }) { - // if (configType === 'PRODUCTION') { - // config.base = process.env.BASE_URL || './' - // } - // - // return config - // }, + async viteFinal(config, {}) { + return { ...config, base: process.env.BASE_URL || config.base } + }, } export default config diff --git a/vite.config.ts b/vite.config.ts index 32a84398..93fd2fe8 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -10,7 +10,6 @@ export default defineConfig({ 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV), 'process.env.TAMAGUI_TARGET': JSON.stringify('web'), }, - base: process.env.BASE_URL || './', resolve: { extensions, alias: { From 88eeaf281b83a76309704149b31e7c3bed9a9a53 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Tue, 22 Aug 2023 08:11:38 +0300 Subject: [PATCH 21/23] debug(ci): set icon paths to be relative --- src/components/Charts/DeviceCPULoad.tsx | 2 +- src/components/Charts/DeviceMemoryHealth.tsx | 2 +- src/components/Charts/DeviceNetworkHealth.tsx | 2 +- src/components/Charts/DeviceStorageHealth.tsx | 2 +- src/components/General/Titles.tsx | 2 +- src/components/Logos/NimbusLogo.tsx | 4 ++-- src/components/Logos/NodesLogo.tsx | 2 +- src/constants.ts | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/Charts/DeviceCPULoad.tsx b/src/components/Charts/DeviceCPULoad.tsx index 518bf92b..79cb64ce 100644 --- a/src/components/Charts/DeviceCPULoad.tsx +++ b/src/components/Charts/DeviceCPULoad.tsx @@ -67,7 +67,7 @@ const DeviceCPULoad: React.FC = ({ load }) => { {message} diff --git a/src/components/Charts/DeviceMemoryHealth.tsx b/src/components/Charts/DeviceMemoryHealth.tsx index 444674c8..b7b2d2bc 100644 --- a/src/components/Charts/DeviceMemoryHealth.tsx +++ b/src/components/Charts/DeviceMemoryHealth.tsx @@ -70,7 +70,7 @@ const DeviceMemoryHealth = ({ currentMemory, maxMemory }: DeviceMemoryHealthProp - + {message} {message === 'Poor' && ( diff --git a/src/components/Charts/DeviceNetworkHealth.tsx b/src/components/Charts/DeviceNetworkHealth.tsx index c74fc9c7..967002b9 100644 --- a/src/components/Charts/DeviceNetworkHealth.tsx +++ b/src/components/Charts/DeviceNetworkHealth.tsx @@ -75,7 +75,7 @@ const DeviceNetworkHealth = ({ uploadRate, downloadRate }: DeviceNetworkHealthPr - + {message} {message === 'Poor' && ( diff --git a/src/components/Charts/DeviceStorageHealth.tsx b/src/components/Charts/DeviceStorageHealth.tsx index 6c6da6c5..356c22aa 100644 --- a/src/components/Charts/DeviceStorageHealth.tsx +++ b/src/components/Charts/DeviceStorageHealth.tsx @@ -69,7 +69,7 @@ const DeviceStorageHealth: React.FC = ({ storage, maxS {message} diff --git a/src/components/General/Titles.tsx b/src/components/General/Titles.tsx index fb24683a..4e5f790a 100644 --- a/src/components/General/Titles.tsx +++ b/src/components/General/Titles.tsx @@ -15,7 +15,7 @@ const Titles = ({ title, subtitle, isAdvancedSettings }: TitlesProps) => { {title} {isAdvancedSettings && ( - )} diff --git a/src/components/Logos/NimbusLogo.tsx b/src/components/Logos/NimbusLogo.tsx index 729c7c16..d074174c 100644 --- a/src/components/Logos/NimbusLogo.tsx +++ b/src/components/Logos/NimbusLogo.tsx @@ -11,8 +11,8 @@ const NimbusLogo = () => { }} space={'$3'} > - marks - marks + marks + marks ) diff --git a/src/components/Logos/NodesLogo.tsx b/src/components/Logos/NodesLogo.tsx index 5647e56d..be18b2e1 100644 --- a/src/components/Logos/NodesLogo.tsx +++ b/src/components/Logos/NodesLogo.tsx @@ -12,7 +12,7 @@ const NodesLogo = () => { }} space={'$2'} > - + nodes diff --git a/src/constants.ts b/src/constants.ts index 2467e6ef..592cd99d 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -1,5 +1,5 @@ -export const GREEN_CHECKMARK_ICON = '/icons/checkmark-circle-green.png' -export const RED_CHECKMARK_ICON = '/icons/remove-circle-red.png' +export const GREEN_CHECKMARK_ICON = './icons/checkmark-circle-green.png' +export const RED_CHECKMARK_ICON = './icons/remove-circle-red.png' export const GOOD_STORAGE_TEXT = 'You have plenty of storage available for additional node services.' From ca88e48ffcde3bb1ab170b357d0f146e40f08d29 Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Tue, 22 Aug 2023 08:18:57 +0300 Subject: [PATCH 22/23] fix: fix more asset paths to be relative --- .github/workflows/deploy-storybook.yaml | 2 +- .storybook/main.ts | 4 ---- src/components/General/BreadcrumbBar/BreadcrumbBar.css | 2 +- src/pages/ConnectDevicePage/ConnectDevicePage.tsx | 2 +- src/pages/CreateLocalNodePage/CreateLocalNodePage.tsx | 2 +- src/pages/DeviceHealthCheck/DeviceHealthCheck.tsx | 5 ++--- src/pages/DeviceSyncStatus/DeviceSyncStatus.tsx | 2 +- src/pages/DeviceSyncStatus/SyncStatusCardConsensus.tsx | 4 ++-- src/pages/DeviceSyncStatus/SyncStatusCardExecution.tsx | 2 +- src/pages/LandingPage/LandingPage.tsx | 2 +- src/pages/PairDevice/PairDevice.tsx | 2 +- 11 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/deploy-storybook.yaml b/.github/workflows/deploy-storybook.yaml index 3c5f7a0b..804a4d97 100644 --- a/.github/workflows/deploy-storybook.yaml +++ b/.github/workflows/deploy-storybook.yaml @@ -61,7 +61,7 @@ jobs: - name: Install Playwright run: npx playwright install --with-deps - name: Build Storybook - run: GH_PAGES=true BASE_URL="/nimbus-gui/" yarn build-storybook --quiet + run: yarn build-storybook --quiet - name: Upload artifact uses: actions/upload-pages-artifact@v2 with: diff --git a/.storybook/main.ts b/.storybook/main.ts index 2e58a01c..7e29894c 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -16,10 +16,6 @@ const config: StorybookConfig = { docs: { autodocs: 'tag', }, - - async viteFinal(config, {}) { - return { ...config, base: process.env.BASE_URL || config.base } - }, } export default config diff --git a/src/components/General/BreadcrumbBar/BreadcrumbBar.css b/src/components/General/BreadcrumbBar/BreadcrumbBar.css index e4dbdae6..5730f82e 100644 --- a/src/components/General/BreadcrumbBar/BreadcrumbBar.css +++ b/src/components/General/BreadcrumbBar/BreadcrumbBar.css @@ -14,7 +14,7 @@ } .breadcrumb-bar-li::after { display: inline-block; - content: url("/icons/chevron.svg"); + content: url("./icons/chevron.svg"); color: #09101C; position: absolute; top: 2px; diff --git a/src/pages/ConnectDevicePage/ConnectDevicePage.tsx b/src/pages/ConnectDevicePage/ConnectDevicePage.tsx index e9b22cc1..9c785f32 100644 --- a/src/pages/ConnectDevicePage/ConnectDevicePage.tsx +++ b/src/pages/ConnectDevicePage/ConnectDevicePage.tsx @@ -18,7 +18,7 @@ const ConnectDevicePage = () => { return ( } - rightImageSrc="/background-images/day-night-bg.png" + rightImageSrc="./background-images/day-night-bg.png" >
diff --git a/src/pages/CreateLocalNodePage/CreateLocalNodePage.tsx b/src/pages/CreateLocalNodePage/CreateLocalNodePage.tsx index dcc4b61f..2807a4b9 100644 --- a/src/pages/CreateLocalNodePage/CreateLocalNodePage.tsx +++ b/src/pages/CreateLocalNodePage/CreateLocalNodePage.tsx @@ -14,7 +14,7 @@ const CreateLocalNodePage = () => { const [autoConnectChecked, setAutoConnectChecked] = useState(false) return ( - +
diff --git a/src/pages/DeviceHealthCheck/DeviceHealthCheck.tsx b/src/pages/DeviceHealthCheck/DeviceHealthCheck.tsx index 72e90471..727f5138 100644 --- a/src/pages/DeviceHealthCheck/DeviceHealthCheck.tsx +++ b/src/pages/DeviceHealthCheck/DeviceHealthCheck.tsx @@ -13,11 +13,10 @@ import { useSelector } from 'react-redux' import { RootState } from '../../redux/store' const DeviceHealthCheck = () => { - const deviceHealthState = useSelector((state: RootState) => state.deviceHealth) console.log(deviceHealthState) return ( - + { networkLatency={75} /> } + icon={} message="The information provided in the Nodes Health Check is meant to utilized as a guide to guage the readiness of your device, however please do your own due diligence prior to commiting any funds. Read our Health Check Disclosure for more information." /> diff --git a/src/pages/DeviceSyncStatus/DeviceSyncStatus.tsx b/src/pages/DeviceSyncStatus/DeviceSyncStatus.tsx index a0fa7cba..91be8038 100644 --- a/src/pages/DeviceSyncStatus/DeviceSyncStatus.tsx +++ b/src/pages/DeviceSyncStatus/DeviceSyncStatus.tsx @@ -23,7 +23,7 @@ const DeviceSyncStatus = () => { ) }, [dispatch]) return ( - + = ({ synced, t Consensus Client - + = ({ synced, t - {message} + {message} {formatNumber(synced)} / {formatNumber(total)} diff --git a/src/pages/DeviceSyncStatus/SyncStatusCardExecution.tsx b/src/pages/DeviceSyncStatus/SyncStatusCardExecution.tsx index fc8e5588..92143096 100644 --- a/src/pages/DeviceSyncStatus/SyncStatusCardExecution.tsx +++ b/src/pages/DeviceSyncStatus/SyncStatusCardExecution.tsx @@ -72,7 +72,7 @@ const SyncStatusCardExecution: React.FC = ({ synced, t - {message} + {message} {' '} diff --git a/src/pages/LandingPage/LandingPage.tsx b/src/pages/LandingPage/LandingPage.tsx index 733fe697..83f83190 100644 --- a/src/pages/LandingPage/LandingPage.tsx +++ b/src/pages/LandingPage/LandingPage.tsx @@ -10,7 +10,7 @@ import { XStack, YStack } from 'tamagui' function LandingPage() { return ( <> - +
diff --git a/src/pages/PairDevice/PairDevice.tsx b/src/pages/PairDevice/PairDevice.tsx index 21696fee..b9bf4446 100644 --- a/src/pages/PairDevice/PairDevice.tsx +++ b/src/pages/PairDevice/PairDevice.tsx @@ -24,7 +24,7 @@ const PairDevice = () => { } return ( - + Date: Tue, 22 Aug 2023 08:24:03 +0300 Subject: [PATCH 23/23] cleanup: remove unneeded gh pages packages --- package.json | 5 +- yarn.lock | 255 ++------------------------------------------------- 2 files changed, 10 insertions(+), 250 deletions(-) diff --git a/package.json b/package.json index 3859637a..9f5c7e7a 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,7 @@ "preview": "vite preview", "storybook": "storybook dev -p 6006", "build-storybook": "storybook build", - "test-storybook": "test-storybook", - "deploy-storybook": "gh-pages -d storybook-static -t true" + "test-storybook": "test-storybook" }, "resolutions": { "@tamagui/web": "1.36.4", @@ -49,7 +48,6 @@ "@storybook/cli": "^7.2.0", "@storybook/react": "^7.2.0", "@storybook/react-vite": "^7.2.0", - "@storybook/storybook-deployer": "^2.8.16", "@storybook/test-runner": "^0.12.0", "@storybook/testing-library": "^0.2.0", "@types/react-color": "^3.0.6", @@ -61,7 +59,6 @@ "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.3", "eslint-plugin-storybook": "^0.6.13", - "gh-pages": "^6.0.0", "prettier": "^3.0.1", "storybook": "^7.2.0", "storybook-addon-react-router-v6": "^2.0.5", diff --git a/yarn.lock b/yarn.lock index b29cbbe7..7d92fd5a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5182,22 +5182,6 @@ __metadata: languageName: node linkType: hard -"@storybook/storybook-deployer@npm:^2.8.16": - version: 2.8.16 - resolution: "@storybook/storybook-deployer@npm:2.8.16" - dependencies: - git-url-parse: ^12.0.0 - glob: ^7.1.3 - parse-repo: ^1.0.4 - shelljs: ^0.8.1 - yargs: ^15.0.0 - bin: - storybook-to-aws-s3: bin/storybook_to_aws_s3 - storybook-to-ghpages: bin/storybook_to_ghpages - checksum: 06d02d9da9e6242de89436973e0a0d8126bcac5a89e7356815b095073d7c3b8c5ec7e9216183b18a9ec9c120455634a08388ddf67b1192cda748577768f07bd2 - languageName: node - linkType: hard - "@storybook/telemetry@npm:7.2.1, @storybook/telemetry@npm:^7.1.0-alpha.32": version: 7.2.1 resolution: "@storybook/telemetry@npm:7.2.1" @@ -7815,15 +7799,6 @@ __metadata: languageName: node linkType: hard -"array-union@npm:^1.0.1": - version: 1.0.2 - resolution: "array-union@npm:1.0.2" - dependencies: - array-uniq: ^1.0.1 - checksum: 82cec6421b6e6766556c484835a6d476a873f1b71cace5ab2b4f1b15b1e3162dc4da0d16f7a2b04d4aec18146c6638fe8f661340b31ba8e469fd811a1b45dc8d - languageName: node - linkType: hard - "array-union@npm:^2.1.0": version: 2.1.0 resolution: "array-union@npm:2.1.0" @@ -7831,13 +7806,6 @@ __metadata: languageName: node linkType: hard -"array-uniq@npm:^1.0.1": - version: 1.0.3 - resolution: "array-uniq@npm:1.0.3" - checksum: 1625f06b093d8bf279b81adfec6e72951c0857d65b5e3f65f053fffe9f9dd61c2fc52cff57e38a4700817e7e3f01a4faa433d505ea9e33cdae4514c334e0bf9e - languageName: node - linkType: hard - "asap@npm:~2.0.3, asap@npm:~2.0.6": version: 2.0.6 resolution: "asap@npm:2.0.6" @@ -7898,7 +7866,7 @@ __metadata: languageName: node linkType: hard -"async@npm:^3.2.2, async@npm:^3.2.3, async@npm:^3.2.4": +"async@npm:^3.2.2, async@npm:^3.2.3": version: 3.2.4 resolution: "async@npm:3.2.4" checksum: 43d07459a4e1d09b84a20772414aa684ff4de085cbcaec6eea3c7a8f8150e8c62aa6cd4e699fe8ee93c3a5b324e777d34642531875a0817a35697522c1b02e89 @@ -8705,13 +8673,6 @@ __metadata: languageName: node linkType: hard -"commander@npm:^11.0.0": - version: 11.0.0 - resolution: "commander@npm:11.0.0" - checksum: 6621954e1e1d078b4991c1f5bbd9439ad37aa7768d6ab4842de1dbd4d222c8a27e1b8e62108b3a92988614af45031d5bb2a2aaa92951f4d0c934d1a1ac564bb4 - languageName: node - linkType: hard - "commander@npm:^2.19.0, commander@npm:^2.20.0": version: 2.20.3 resolution: "commander@npm:2.20.3" @@ -9562,13 +9523,6 @@ __metadata: languageName: node linkType: hard -"email-addresses@npm:^5.0.0": - version: 5.0.0 - resolution: "email-addresses@npm:5.0.0" - checksum: e58a510e9caf105313025e1c81488d5391c6404f0bbd7874e8e36a4c14d1ced02ff271748146c13edfa3bd9ce9b25f1194f5369971d77087325f37ab193129bb - languageName: node - linkType: hard - "emittery@npm:^0.10.2": version: 0.10.2 resolution: "emittery@npm:0.10.2" @@ -9918,7 +9872,7 @@ __metadata: languageName: node linkType: hard -"escape-string-regexp@npm:^1.0.2, escape-string-regexp@npm:^1.0.5": +"escape-string-regexp@npm:^1.0.5": version: 1.0.5 resolution: "escape-string-regexp@npm:1.0.5" checksum: 6092fda75c63b110c706b6a9bfde8a612ad595b628f0bd2147eea1d3406723020810e591effc7db1da91d80a71a737a313567c5abb3813e8d9c71f4aa595b410 @@ -10446,24 +10400,6 @@ __metadata: languageName: node linkType: hard -"filename-reserved-regex@npm:^2.0.0": - version: 2.0.0 - resolution: "filename-reserved-regex@npm:2.0.0" - checksum: 323a0020fd7f243238ffccab9d728cbc5f3a13c84b2c10e01efb09b8324561d7a51776be76f36603c734d4f69145c39a5d12492bf6142a28b50d7f90bd6190bc - languageName: node - linkType: hard - -"filenamify@npm:^4.3.0": - version: 4.3.0 - resolution: "filenamify@npm:4.3.0" - dependencies: - filename-reserved-regex: ^2.0.0 - strip-outer: ^1.0.1 - trim-repeated: ^1.0.0 - checksum: 5b71a7ff8e958c8621957e6fbf7872024126d3b5da50f59b1634af3343ba1a69d4cc15cfe4ca4bbfa7c959ad4d98614ee51e6f1d9fa7326eef8ceda2da8cd74e - languageName: node - linkType: hard - "fill-range@npm:^7.0.1": version: 7.0.1 resolution: "fill-range@npm:7.0.1" @@ -10514,7 +10450,7 @@ __metadata: languageName: node linkType: hard -"find-cache-dir@npm:^3.0.0, find-cache-dir@npm:^3.2.0, find-cache-dir@npm:^3.3.1, find-cache-dir@npm:^3.3.2": +"find-cache-dir@npm:^3.0.0, find-cache-dir@npm:^3.2.0, find-cache-dir@npm:^3.3.2": version: 3.3.2 resolution: "find-cache-dir@npm:3.3.2" dependencies: @@ -10730,7 +10666,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:11.1.1, fs-extra@npm:^11.1.0, fs-extra@npm:^11.1.1": +"fs-extra@npm:11.1.1, fs-extra@npm:^11.1.0": version: 11.1.1 resolution: "fs-extra@npm:11.1.1" dependencies: @@ -10896,24 +10832,6 @@ __metadata: languageName: node linkType: hard -"gh-pages@npm:^6.0.0": - version: 6.0.0 - resolution: "gh-pages@npm:6.0.0" - dependencies: - async: ^3.2.4 - commander: ^11.0.0 - email-addresses: ^5.0.0 - filenamify: ^4.3.0 - find-cache-dir: ^3.3.1 - fs-extra: ^11.1.1 - globby: ^6.1.0 - bin: - gh-pages: bin/gh-pages.js - gh-pages-clean: bin/gh-pages-clean.js - checksum: 031f9070cdcd4fb71a2a8eabec049c885faa17e489a6e37e8f7dfa9bd649607560b0778b8e19a1d9295ebd614668e3854d860d48313cb7b23ee9f3884adef517 - languageName: node - linkType: hard - "giget@npm:^1.0.0": version: 1.1.2 resolution: "giget@npm:1.1.2" @@ -10931,25 +10849,6 @@ __metadata: languageName: node linkType: hard -"git-up@npm:^6.0.0": - version: 6.0.0 - resolution: "git-up@npm:6.0.0" - dependencies: - is-ssh: ^1.4.0 - parse-url: ^7.0.2 - checksum: 145a1f546d7a078cdfc2616556e518e634d134e34a31c6bf2ed89e44158659cb525dbd451c338121f7107f55cef066d0b37a7bbf178555befc9304b3940b435e - languageName: node - linkType: hard - -"git-url-parse@npm:^12.0.0": - version: 12.0.0 - resolution: "git-url-parse@npm:12.0.0" - dependencies: - git-up: ^6.0.0 - checksum: b4c8530b816202ecf9d4dabf755f785a314a096b56145018385b3d7171e862f9d0d9b38cce620c0af354b269750fe7b2d9aa95815c7150922090a11dac4ab1e6 - languageName: node - linkType: hard - "github-slugger@npm:^1.0.0": version: 1.5.0 resolution: "github-slugger@npm:1.5.0" @@ -11008,7 +10907,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.0.0, glob@npm:^7.0.3, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": +"glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": version: 7.2.3 resolution: "glob@npm:7.2.3" dependencies: @@ -11087,19 +10986,6 @@ __metadata: languageName: node linkType: hard -"globby@npm:^6.1.0": - version: 6.1.0 - resolution: "globby@npm:6.1.0" - dependencies: - array-union: ^1.0.1 - glob: ^7.0.3 - object-assign: ^4.0.1 - pify: ^2.0.0 - pinkie-promise: ^2.0.0 - checksum: 18109d6b9d55643d2b98b59c3cfae7073ccfe39829632f353d516cc124d836c2ddebe48a23f04af63d66a621b6d86dd4cbd7e6af906f2458a7fe510ffc4bd424 - languageName: node - linkType: hard - "gopd@npm:^1.0.1": version: 1.0.1 resolution: "gopd@npm:1.0.1" @@ -11536,13 +11422,6 @@ __metadata: languageName: node linkType: hard -"interpret@npm:^1.0.0": - version: 1.4.0 - resolution: "interpret@npm:1.4.0" - checksum: 2e5f51268b5941e4a17e4ef0575bc91ed0ab5f8515e3cf77486f7c14d13f3010df9c0959f37063dcc96e78d12dc6b0bb1b9e111cdfe69771f4656d2993d36155 - languageName: node - linkType: hard - "invariant@npm:*, invariant@npm:^2.2.4": version: 2.2.4 resolution: "invariant@npm:2.2.4" @@ -11865,15 +11744,6 @@ __metadata: languageName: node linkType: hard -"is-ssh@npm:^1.4.0": - version: 1.4.0 - resolution: "is-ssh@npm:1.4.0" - dependencies: - protocols: ^2.0.1 - checksum: 75eaa17b538bee24b661fbeb0f140226ac77e904a6039f787bea418431e2162f1f9c4c4ccad3bd169e036cd701cc631406e8c505d9fa7e20164e74b47f86f40f - languageName: node - linkType: hard - "is-stream@npm:^2.0.0": version: 2.0.1 resolution: "is-stream@npm:2.0.1" @@ -13960,7 +13830,6 @@ __metadata: "@storybook/cli": ^7.2.0 "@storybook/react": ^7.2.0 "@storybook/react-vite": ^7.2.0 - "@storybook/storybook-deployer": ^2.8.16 "@storybook/test-runner": ^0.12.0 "@storybook/testing-library": ^0.2.0 "@tamagui/config": 1.36.4 @@ -13978,7 +13847,6 @@ __metadata: eslint-plugin-react-refresh: ^0.4.3 eslint-plugin-storybook: ^0.6.13 expo-modules-core: ^1.5.9 - gh-pages: ^6.0.0 prettier: ^3.0.1 react: 18 react-color: ^2.19.3 @@ -14127,13 +13995,6 @@ __metadata: languageName: node linkType: hard -"normalize-url@npm:^6.1.0": - version: 6.1.0 - resolution: "normalize-url@npm:6.1.0" - checksum: 4a4944631173e7d521d6b80e4c85ccaeceb2870f315584fa30121f505a6dfd86439c5e3fdd8cd9e0e291290c41d0c3599f0cb12ab356722ed242584c30348e50 - languageName: node - linkType: hard - "npm-run-path@npm:^4.0.1": version: 4.0.1 resolution: "npm-run-path@npm:4.0.1" @@ -14215,7 +14076,7 @@ __metadata: languageName: node linkType: hard -"object-assign@npm:^4.0.1, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1": +"object-assign@npm:^4.1.0, object-assign@npm:^4.1.1": version: 4.1.1 resolution: "object-assign@npm:4.1.1" checksum: fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f @@ -14493,34 +14354,6 @@ __metadata: languageName: node linkType: hard -"parse-path@npm:^5.0.0": - version: 5.0.0 - resolution: "parse-path@npm:5.0.0" - dependencies: - protocols: ^2.0.0 - checksum: e9f670559cd8e535f39f548bf5d41ad96a220190ea98df33d0babd9dfaa7c3c70ee2e55394078517d5e7e93c6a39c8eac1261ed3f9e68033656614fc954262e8 - languageName: node - linkType: hard - -"parse-repo@npm:^1.0.4": - version: 1.0.4 - resolution: "parse-repo@npm:1.0.4" - checksum: b0d32a182cdb2287adfb1d9141f7f694890e0ad659e80f75ec2e266339c5a728328f08cb72caf85cb7524b5dbbc4122b17efdd48e0d17d96ed9863ec512e0141 - languageName: node - linkType: hard - -"parse-url@npm:^7.0.2": - version: 7.0.2 - resolution: "parse-url@npm:7.0.2" - dependencies: - is-ssh: ^1.4.0 - normalize-url: ^6.1.0 - parse-path: ^5.0.0 - protocols: ^2.0.1 - checksum: 3e26852706bebe9fac409909316716dee52883d2fb5c82d65577effba1507abb7bc42bb59ce0ba6c8659168fb99acf89000bd8fe096ed3ad7124fa85227436d7 - languageName: node - linkType: hard - "parseurl@npm:~1.3.2, parseurl@npm:~1.3.3": version: 1.3.3 resolution: "parseurl@npm:1.3.3" @@ -14633,13 +14466,6 @@ __metadata: languageName: node linkType: hard -"pify@npm:^2.0.0": - version: 2.3.0 - resolution: "pify@npm:2.3.0" - checksum: 9503aaeaf4577acc58642ad1d25c45c6d90288596238fb68f82811c08104c800e5a7870398e9f015d82b44ecbcbef3dc3d4251a1cbb582f6e5959fe09884b2ba - languageName: node - linkType: hard - "pify@npm:^4.0.1": version: 4.0.1 resolution: "pify@npm:4.0.1" @@ -14647,22 +14473,6 @@ __metadata: languageName: node linkType: hard -"pinkie-promise@npm:^2.0.0": - version: 2.0.1 - resolution: "pinkie-promise@npm:2.0.1" - dependencies: - pinkie: ^2.0.0 - checksum: b53a4a2e73bf56b6f421eef711e7bdcb693d6abb474d57c5c413b809f654ba5ee750c6a96dd7225052d4b96c4d053cdcb34b708a86fceed4663303abee52fcca - languageName: node - linkType: hard - -"pinkie@npm:^2.0.0": - version: 2.0.4 - resolution: "pinkie@npm:2.0.4" - checksum: b12b10afea1177595aab036fc220785488f67b4b0fc49e7a27979472592e971614fa1c728e63ad3e7eb748b4ec3c3dbd780819331dad6f7d635c77c10537b9db - languageName: node - linkType: hard - "pirates@npm:^3.0.2": version: 3.0.2 resolution: "pirates@npm:3.0.2" @@ -14910,13 +14720,6 @@ __metadata: languageName: node linkType: hard -"protocols@npm:^2.0.0, protocols@npm:^2.0.1": - version: 2.0.1 - resolution: "protocols@npm:2.0.1" - checksum: 4a9bef6aa0449a0245ded319ac3cbfd032c3e76ebb562777037a3a832c99253d0e8bc2847f7be350236df620a11f7d4fe683ea7f59a2cc14c69f746b6259eda4 - languageName: node - linkType: hard - "proxy-addr@npm:~2.0.7": version: 2.0.7 resolution: "proxy-addr@npm:2.0.7" @@ -15578,15 +15381,6 @@ __metadata: languageName: node linkType: hard -"rechoir@npm:^0.6.2": - version: 0.6.2 - resolution: "rechoir@npm:0.6.2" - dependencies: - resolve: ^1.1.6 - checksum: fe76bf9c21875ac16e235defedd7cbd34f333c02a92546142b7911a0f7c7059d2e16f441fe6fb9ae203f459c05a31b2bcf26202896d89e390eda7514d5d2702b - languageName: node - linkType: hard - "redux-thunk@npm:^2.4.2": version: 2.4.2 resolution: "redux-thunk@npm:2.4.2" @@ -15807,7 +15601,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1": +"resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1": version: 1.22.4 resolution: "resolve@npm:1.22.4" dependencies: @@ -15820,7 +15614,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.22.1#~builtin": +"resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.22.1#~builtin": version: 1.22.4 resolution: "resolve@patch:resolve@npm%3A1.22.4#~builtin::version=1.22.4&hash=c3c19d" dependencies: @@ -16112,19 +15906,6 @@ __metadata: languageName: node linkType: hard -"shelljs@npm:^0.8.1": - version: 0.8.5 - resolution: "shelljs@npm:0.8.5" - dependencies: - glob: ^7.0.0 - interpret: ^1.0.0 - rechoir: ^0.6.2 - bin: - shjs: bin/shjs - checksum: 7babc46f732a98f4c054ec1f048b55b9149b98aa2da32f6cf9844c434b43c6251efebd6eec120937bd0999e13811ebd45efe17410edb3ca938f82f9381302748 - languageName: node - linkType: hard - "side-channel@npm:^1.0.4": version: 1.0.4 resolution: "side-channel@npm:1.0.4" @@ -16568,15 +16349,6 @@ __metadata: languageName: node linkType: hard -"strip-outer@npm:^1.0.1": - version: 1.0.1 - resolution: "strip-outer@npm:1.0.1" - dependencies: - escape-string-regexp: ^1.0.2 - checksum: f8d65d33ca2b49aabc66bb41d689dda7b8b9959d320e3a40a2ef4d7079ff2f67ffb72db43f179f48dbf9495c2e33742863feab7a584d180fa62505439162c191 - languageName: node - linkType: hard - "strnum@npm:^1.0.5": version: 1.0.5 resolution: "strnum@npm:1.0.5" @@ -16920,15 +16692,6 @@ __metadata: languageName: node linkType: hard -"trim-repeated@npm:^1.0.0": - version: 1.0.0 - resolution: "trim-repeated@npm:1.0.0" - dependencies: - escape-string-regexp: ^1.0.2 - checksum: e25c235305b82c43f1d64a67a71226c406b00281755e4c2c4f3b1d0b09c687a535dd3c4483327f949f28bb89dc400a0bc5e5b749054f4b99f49ebfe48ba36496 - languageName: node - linkType: hard - "ts-api-utils@npm:^1.0.1": version: 1.0.1 resolution: "ts-api-utils@npm:1.0.1" @@ -17813,7 +17576,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^15.0.0, yargs@npm:^15.0.2, yargs@npm:^15.1.0": +"yargs@npm:^15.0.2, yargs@npm:^15.1.0": version: 15.4.1 resolution: "yargs@npm:15.4.1" dependencies: