From a78348092556f35133a088bdad9e0a232a8819b1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 12:13:04 +0000 Subject: [PATCH 01/31] chore(deps): update dependency @phase21/chains to v4 --- package.json | 2 +- pnpm-lock.yaml | 12 ++++++------ viewer/package.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index fb1aae5b..ea1025c0 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@changesets/changelog-github": "^0.5.0", "@changesets/cli": "^2.27.1", "@phase21/api-integrations": "^1.1.0", - "@phase21/chains": "^0.5.0", + "@phase21/chains": "^4.5.1", "dropbox": "^10.34.0", "node-fetch": "^2.7.0", "dotenv": "^16.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ffc15aaf..cbc71202 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,8 +28,8 @@ importers: specifier: ^1.1.0 version: 1.1.0(eslint@8.56.0)(jest@27.5.1)(typescript@5.3.3) '@phase21/chains': - specifier: ^0.5.0 - version: 0.5.0(typescript@5.3.3) + specifier: ^4.5.1 + version: 4.5.1(typescript@5.3.3) dotenv: specifier: ^16.4.1 version: 16.4.1 @@ -67,8 +67,8 @@ importers: specifier: ^1.1.0 version: 1.1.0(eslint@8.56.0)(jest@27.5.1)(typescript@5.3.3) '@phase21/chains': - specifier: ^0.5.0 - version: 0.5.0(typescript@5.3.3) + specifier: ^4.5.1 + version: 4.5.1(typescript@5.3.3) '@phase21/logos': specifier: file:../ version: 'file:' @@ -4897,8 +4897,8 @@ packages: - utf-8-validate dev: true - /@phase21/chains@0.5.0(typescript@5.3.3): - resolution: {integrity: sha512-JOgYJfVYDK0w87gdDHClmKekDdDDoxjHcZHhWHjMzeKX9GX1keWhpheT8crjJI4E7TSNPaq9uZo7qF8D1ePxHA==} + /@phase21/chains@4.5.1(typescript@5.3.3): + resolution: {integrity: sha512-1ZLZ+qoKMcvl7KRQANt4LTSklGqQ1/DZJS656/ruI8vZwBWAOdtErTjhHs6idPb4xMHInQLjlspf9yWtgWoTmQ==} dependencies: viem: 2.5.0(typescript@5.3.3)(zod@3.22.4) zod: 3.22.4 diff --git a/viewer/package.json b/viewer/package.json index 3b46a21d..56a6525d 100644 --- a/viewer/package.json +++ b/viewer/package.json @@ -4,7 +4,7 @@ "homepage": "https://api3dao.github.io/logos/", "private": true, "devDependencies": { - "@phase21/chains": "^0.5.0", + "@phase21/chains": "^4.5.1", "@chakra-ui/icons": "^2.1.1", "@chakra-ui/react": "^2.8.2", "@emotion/react": "^11.11.3", From 83799c115d7f7c67fd31998c77b18456e7d74871 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 15:06:49 +0000 Subject: [PATCH 02/31] chore(deps): update other minor updates --- pnpm-lock.yaml | 38 +++++++++++++++++++------------------- viewer/package.json | 6 +++--- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cbc71202..d1d69424 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -73,11 +73,11 @@ importers: specifier: file:../ version: 'file:' '@testing-library/jest-dom': - specifier: ^6.3.0 - version: 6.3.0(jest@27.5.1) + specifier: ^6.4.1 + version: 6.4.1(jest@27.5.1) '@testing-library/react': - specifier: ^14.1.2 - version: 14.1.2(react-dom@18.2.0)(react@18.2.0) + specifier: ^14.2.1 + version: 14.2.1(react-dom@18.2.0)(react@18.2.0) '@testing-library/user-event': specifier: ^14.5.2 version: 14.5.2(@testing-library/dom@9.3.4) @@ -97,8 +97,8 @@ importers: specifier: ^9.0.1 version: 9.0.1(@types/react@18.2.48)(react@18.2.0) react-router-dom: - specifier: ^6.21.3 - version: 6.21.3(react-dom@18.2.0)(react@18.2.0) + specifier: ^6.22.0 + version: 6.22.0(react-dom@18.2.0)(react@18.2.0) react-scripts: specifier: 5.0.1 version: 5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(eslint@8.56.0)(react@18.2.0)(typescript@5.3.3) @@ -4959,8 +4959,8 @@ packages: resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} dev: true - /@remix-run/router@1.14.2: - resolution: {integrity: sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==} + /@remix-run/router@1.15.0: + resolution: {integrity: sha512-HOil5aFtme37dVQTB6M34G95kPM3MMuqSmIRVCC52eKV+Y/tGSqw9P3rWhlAx6A+mz+MoX+XxsGsNJbaI5qCgQ==} engines: {node: '>=14.0.0'} dev: true @@ -5605,8 +5605,8 @@ packages: pretty-format: 27.5.1 dev: true - /@testing-library/jest-dom@6.3.0(jest@27.5.1): - resolution: {integrity: sha512-hJVIrkFizEQxoWsGBlycTcQhrpoCH4DhXfrnHFFXgkx3Xdm15zycsq5Ep+vpw4W8S0NJa8cxDHcuJib+1tEbhg==} + /@testing-library/jest-dom@6.4.1(jest@27.5.1): + resolution: {integrity: sha512-Z7qMM3J2Zw5H/nC2/5CYx5YcuaD56JmDFKNIozZ89VIo6o6Y9FMhssics4e2madEKYDNEpZz3+glPGz0yWMOag==} engines: {node: '>=14', npm: '>=6', yarn: '>=1'} peerDependencies: '@jest/globals': '>= 28' @@ -5637,8 +5637,8 @@ packages: redent: 3.0.0 dev: true - /@testing-library/react@14.1.2(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-z4p7DVBTPjKM5qDZ0t5ZjzkpSNb+fZy1u6bzO7kk8oeGagpPCAtgh4cx1syrfp7a+QWkM021jGqjJaxJJnXAZg==} + /@testing-library/react@14.2.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-sGdjws32ai5TLerhvzThYFbpnF9XtL65Cjf+gB0Dhr29BGqK+mAeN7SURSdu+eqgET4ANcWoC7FQpkaiGvBr+A==} engines: {node: '>=14'} peerDependencies: react: ^18.0.0 @@ -14077,26 +14077,26 @@ packages: use-sidecar: 1.1.2(@types/react@18.2.48)(react@18.2.0) dev: true - /react-router-dom@6.21.3(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-kNzubk7n4YHSrErzjLK72j0B5i969GsuCGazRl3G6j1zqZBLjuSlYBdVdkDOgzGdPIffUOc9nmgiadTEVoq91g==} + /react-router-dom@6.22.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-z2w+M4tH5wlcLmH3BMMOMdrtrJ9T3oJJNsAlBJbwk+8Syxd5WFJ7J5dxMEW0/GEXD1BBis4uXRrNIz3mORr0ag==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' react-dom: '>=16.8' dependencies: - '@remix-run/router': 1.14.2 + '@remix-run/router': 1.15.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-router: 6.21.3(react@18.2.0) + react-router: 6.22.0(react@18.2.0) dev: true - /react-router@6.21.3(react@18.2.0): - resolution: {integrity: sha512-a0H638ZXULv1OdkmiK6s6itNhoy33ywxmUFT/xtSoVyf9VnC7n7+VT4LjVzdIHSaF5TIh9ylUgxMXksHTgGrKg==} + /react-router@6.22.0(react@18.2.0): + resolution: {integrity: sha512-q2yemJeg6gw/YixRlRnVx6IRJWZD6fonnfZhN1JIOhV2iJCPeRNSH3V1ISwHf+JWcESzLC3BOLD1T07tmO5dmg==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' dependencies: - '@remix-run/router': 1.14.2 + '@remix-run/router': 1.15.0 react: 18.2.0 dev: true diff --git a/viewer/package.json b/viewer/package.json index 56a6525d..67de2e13 100644 --- a/viewer/package.json +++ b/viewer/package.json @@ -9,8 +9,8 @@ "@chakra-ui/react": "^2.8.2", "@emotion/react": "^11.11.3", "@emotion/styled": "^11.11.0", - "@testing-library/jest-dom": "^6.3.0", - "@testing-library/react": "^14.1.2", + "@testing-library/jest-dom": "^6.4.1", + "@testing-library/react": "^14.2.1", "@testing-library/user-event": "^14.5.2", "@phase21/logos": "file:../", "framer-motion": "^11.0.3", @@ -18,7 +18,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-markdown": "^9.0.1", - "react-router-dom": "^6.21.3", + "react-router-dom": "^6.22.0", "react-scripts": "5.0.1", "react-syntax-highlighter": "^15.5.0", "web-vitals": "^3.5.2", From 16ac90340b4b230727ed7de45f4c9207aee30acc Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 11:01:50 +0300 Subject: [PATCH 03/31] Update image placeholder function and package dependencies --- helpers/utils.js | 8 ++++---- pnpm-lock.yaml | 11 ++--------- scripts/build-svg.js | 2 +- viewer/package.json | 4 ++-- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/helpers/utils.js b/helpers/utils.js index beba04da..68c7dd30 100644 --- a/helpers/utils.js +++ b/helpers/utils.js @@ -13,8 +13,8 @@ module.exports = { renameFiles }; -function getErrorImage(mode) { - return camelcase(mode, { pascalCase: true }) + 'Error'; +function getPlaceholderImage(mode) { + return camelcase(mode, { pascalCase: true }) + 'Placeholder'; } function sanitizeName(name, suffix = '', prefix = '') { @@ -69,13 +69,13 @@ function generateFunction(batchName, switchCase, mode) { function ${batchName}(id, light = false) { if (!id) { - return ${getErrorImage(mode)} + return ${getPlaceholderImage(mode)} } switch (sanitizeName(\`\${id}\${light ? "l" : ""}\`).toLowerCase()) { ${switchCase} default: - return light ? ${batchName}(id) : ${getErrorImage(mode)} + return light ? ${batchName}(id) : ${getPlaceholderImage(mode)} } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d1d69424..5d7f7ffa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -70,8 +70,8 @@ importers: specifier: ^4.5.1 version: 4.5.1(typescript@5.3.3) '@phase21/logos': - specifier: file:../ - version: 'file:' + specifier: workspace:* + version: link:.. '@testing-library/jest-dom': specifier: ^6.4.1 version: 6.4.1(jest@27.5.1) @@ -16756,10 +16756,3 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} dev: true - - 'file:': - resolution: {directory: '', type: directory} - name: '@phase21/logos' - dependencies: - camelcase: 6.3.0 - dev: true diff --git a/scripts/build-svg.js b/scripts/build-svg.js index bd8e1453..908dcb48 100644 --- a/scripts/build-svg.js +++ b/scripts/build-svg.js @@ -66,7 +66,7 @@ function buildSwitchCase(mode) { function buildLogoImports(files, mode, format) { let options = getLogoList(mode); - options.push('error'); + options.push('placeholder'); const prefix = mode === 'chain' ? 'Chain' : ''; return utils.generateImports(files, options, camelcase(mode, { pascalCase: true }), prefix, mode, format); } diff --git a/viewer/package.json b/viewer/package.json index 67de2e13..df276098 100644 --- a/viewer/package.json +++ b/viewer/package.json @@ -12,7 +12,7 @@ "@testing-library/jest-dom": "^6.4.1", "@testing-library/react": "^14.2.1", "@testing-library/user-event": "^14.5.2", - "@phase21/logos": "file:../", + "@phase21/logos": "workspace:*", "framer-motion": "^11.0.3", "gh-pages": "^6.1.1", "react": "^18.2.0", @@ -50,4 +50,4 @@ "last 1 safari version" ] } -} +} \ No newline at end of file From f090c9615096e47778e386e53fe2e83f01000a47 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 13:43:31 +0300 Subject: [PATCH 04/31] Add release script to create changeset files --- scripts/release.js | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 scripts/release.js diff --git a/scripts/release.js b/scripts/release.js new file mode 100644 index 00000000..bc2ef809 --- /dev/null +++ b/scripts/release.js @@ -0,0 +1,35 @@ +const fs = require('fs/promises'); + +async function getChangeset() { + return await fs.readdir('./.changeset'); +} + +async function createChangeset() { + const changeset = `--- +"@phase21/logos": patch +--- + +# What's Changed +Auto-generated changeset by the release script. +`; + await fs.writeFile('./.changeset/changeset.md', changeset); + console.log('✨ Created changeset file.'); +} + + +async function checkChangeset() { + const changeset = await getChangeset(); + if (changeset.some(file => file.endsWith('.md'))) { + console.log('There is already a .md file in the .changeset directory.'); + } else { + await createChangeset(); + } + await createChangeset(); +} + +async function main() { + console.log('🏗 Checking changeset files...'); + Promise.all([checkChangeset()]).then(() => console.log('✅ Finished checking changeset files.')); +} + +main(); From f547bfdeb82be8c47080f35d3e41f1ff24a665ba Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 13:43:53 +0300 Subject: [PATCH 05/31] Delete changeset README.md file --- .changeset/README.md | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .changeset/README.md diff --git a/.changeset/README.md b/.changeset/README.md deleted file mode 100644 index 7d3e451a..00000000 --- a/.changeset/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Changesets - -Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works with -multi-package repos, or single-package repos to help you version and publish your code. You can find the full -documentation for it [in our repository](https://github.com/changesets/changesets) - -We have a quick list of common questions to get you started engaging with this project in -[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md) From d3c08e0f6dae0d76c25f962490cefb586fd1ed7b Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 13:43:57 +0300 Subject: [PATCH 06/31] Add auto-release script to package.json --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ea1025c0..e0f1b48e 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "fetch": "node scripts/fetch-missing.js", "package": "pnpm run build", "prettier": "prettier --write \"**/*.{js,jsx,json,md}\"", - "release": "pnpm changeset publish" + "release": "pnpm changeset publish", + "auto-release": "node scripts/release.js" }, "dependencies": { "camelcase": "^6.3.0" @@ -35,4 +36,4 @@ "files": [ "dist" ] -} +} \ No newline at end of file From 67517d131bb42fabe1329b8a1bc9b53844c37721 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:03:20 +0300 Subject: [PATCH 07/31] Update release script and logos --- scripts/release.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/release.js b/scripts/release.js index bc2ef809..abe89dec 100644 --- a/scripts/release.js +++ b/scripts/release.js @@ -10,7 +10,8 @@ async function createChangeset() { --- # What's Changed -Auto-generated changeset by the release script. +Release created by the release script. +Logos updated. `; await fs.writeFile('./.changeset/changeset.md', changeset); console.log('✨ Created changeset file.'); From 4c2ab66bcb7ff5cda11d9c6cd1260aa1c2bc4676 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:04:38 +0300 Subject: [PATCH 08/31] Add conditional step to run if changes have been detected --- .github/workflows/deployfe.yml | 4 ++++ raw/symbols/api3.svg | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 raw/symbols/api3.svg diff --git a/.github/workflows/deployfe.yml b/.github/workflows/deployfe.yml index 598c3dbc..121d66ec 100644 --- a/.github/workflows/deployfe.yml +++ b/.github/workflows/deployfe.yml @@ -41,10 +41,14 @@ jobs: if : github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'fetch') run: pnpm run fetch - uses: stefanzweifel/git-auto-commit-action@v5 + id: auto-commit-action if : github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'fetch') with: commit_message: Fetch Logos from Dropbox commit_options: '--no-verify --signoff' + - name: "Run if changes have been detected" + if: steps.auto-commit-action.outputs.changes_detected == 'true' + run: echo "Changes!" - name: Build Package run: pnpm run package - name: Install Frontend Packages diff --git a/raw/symbols/api3.svg b/raw/symbols/api3.svg deleted file mode 100644 index ff09b0fd..00000000 --- a/raw/symbols/api3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From 0ec8fd566be0ee7134f01ff04befaa6c0f4fbde6 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 11:05:14 +0000 Subject: [PATCH 09/31] Fetch Logos from Dropbox Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- raw/symbols/api3.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 raw/symbols/api3.svg diff --git a/raw/symbols/api3.svg b/raw/symbols/api3.svg new file mode 100644 index 00000000..ff09b0fd --- /dev/null +++ b/raw/symbols/api3.svg @@ -0,0 +1 @@ + \ No newline at end of file From 039bd863a42256385d59333eebfaf75c7a4f678e Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:08:23 +0300 Subject: [PATCH 10/31] Add changeset automatically --- .github/workflows/deployfe.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deployfe.yml b/.github/workflows/deployfe.yml index 121d66ec..2afae1f6 100644 --- a/.github/workflows/deployfe.yml +++ b/.github/workflows/deployfe.yml @@ -47,8 +47,14 @@ jobs: commit_message: Fetch Logos from Dropbox commit_options: '--no-verify --signoff' - name: "Run if changes have been detected" + id: add-changeset if: steps.auto-commit-action.outputs.changes_detected == 'true' - run: echo "Changes!" + run: pnpm run auto-release + - uses: stefanzweifel/git-auto-commit-action@v5 + if : steps.add-changeset.outputs.changes_detected == 'true' + with: + commit_message: Added changeset + commit_options: '--no-verify --signoff' - name: Build Package run: pnpm run package - name: Install Frontend Packages From 2813dc2554125617ebdda8acadb37dbe235d32bc Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:09:40 +0300 Subject: [PATCH 11/31] Remove logo --- raw/symbols/api3.svg | 1 - 1 file changed, 1 deletion(-) delete mode 100644 raw/symbols/api3.svg diff --git a/raw/symbols/api3.svg b/raw/symbols/api3.svg deleted file mode 100644 index ff09b0fd..00000000 --- a/raw/symbols/api3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From e57bbd761d3fbb540ee56e72f4aab88780872d9d Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 11:10:22 +0000 Subject: [PATCH 12/31] Fetch Logos from Dropbox Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- raw/symbols/api3.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 raw/symbols/api3.svg diff --git a/raw/symbols/api3.svg b/raw/symbols/api3.svg new file mode 100644 index 00000000..ff09b0fd --- /dev/null +++ b/raw/symbols/api3.svg @@ -0,0 +1 @@ + \ No newline at end of file From ef96161dd23f36bb762284030a9405b9a3be47cb Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:11:46 +0300 Subject: [PATCH 13/31] Updated auto-commit action condition --- .github/workflows/deployfe.yml | 2 +- raw/symbols/api3.svg | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 raw/symbols/api3.svg diff --git a/.github/workflows/deployfe.yml b/.github/workflows/deployfe.yml index 2afae1f6..a2d0e816 100644 --- a/.github/workflows/deployfe.yml +++ b/.github/workflows/deployfe.yml @@ -51,7 +51,7 @@ jobs: if: steps.auto-commit-action.outputs.changes_detected == 'true' run: pnpm run auto-release - uses: stefanzweifel/git-auto-commit-action@v5 - if : steps.add-changeset.outputs.changes_detected == 'true' + if : steps.auto-commit-action.outputs.changes_detected == 'true' with: commit_message: Added changeset commit_options: '--no-verify --signoff' diff --git a/raw/symbols/api3.svg b/raw/symbols/api3.svg deleted file mode 100644 index ff09b0fd..00000000 --- a/raw/symbols/api3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From f059b8daabad5770bc18ccc17b61f50e33be04fd Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 11:12:15 +0000 Subject: [PATCH 14/31] Fetch Logos from Dropbox Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- raw/symbols/api3.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 raw/symbols/api3.svg diff --git a/raw/symbols/api3.svg b/raw/symbols/api3.svg new file mode 100644 index 00000000..ff09b0fd --- /dev/null +++ b/raw/symbols/api3.svg @@ -0,0 +1 @@ + \ No newline at end of file From e06efcde4a5ffb5ebb57f1718a5577f748963f45 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 11:12:17 +0000 Subject: [PATCH 15/31] Added changeset Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .changeset/changeset.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changeset/changeset.md diff --git a/.changeset/changeset.md b/.changeset/changeset.md new file mode 100644 index 00000000..fb7f7be3 --- /dev/null +++ b/.changeset/changeset.md @@ -0,0 +1,7 @@ +--- +"@phase21/logos": patch +--- + +# What's Changed +Release created by the release script. +Logos updated. From d6bd57e78bb6bcdbe6f408a4cb35d6e6fc573709 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:14:49 +0300 Subject: [PATCH 16/31] Update git-auto-commit-action in deployfe.yml --- .github/workflows/deployfe.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deployfe.yml b/.github/workflows/deployfe.yml index a2d0e816..653ff33c 100644 --- a/.github/workflows/deployfe.yml +++ b/.github/workflows/deployfe.yml @@ -40,7 +40,8 @@ jobs: - name: Fetch Logos if : github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'fetch') run: pnpm run fetch - - uses: stefanzweifel/git-auto-commit-action@v5 + - name: Commit changes + uses: stefanzweifel/git-auto-commit-action@v5 id: auto-commit-action if : github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'fetch') with: @@ -50,7 +51,8 @@ jobs: id: add-changeset if: steps.auto-commit-action.outputs.changes_detected == 'true' run: pnpm run auto-release - - uses: stefanzweifel/git-auto-commit-action@v5 + - name: Add changeset + uses: stefanzweifel/git-auto-commit-action@v5 if : steps.auto-commit-action.outputs.changes_detected == 'true' with: commit_message: Added changeset From b83d4bd92110a484651ce09ed709ce00ecafe5ca Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:24:02 +0300 Subject: [PATCH 17/31] Remove test changeset file --- .changeset/changeset.md | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 .changeset/changeset.md diff --git a/.changeset/changeset.md b/.changeset/changeset.md deleted file mode 100644 index fb7f7be3..00000000 --- a/.changeset/changeset.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"@phase21/logos": patch ---- - -# What's Changed -Release created by the release script. -Logos updated. From ba964e992778dcc7e633d3905d4cd2916503341c Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:30:09 +0300 Subject: [PATCH 18/31] Add auto-release workflow --- .github/workflows/auto-release.yml | 56 ++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .github/workflows/auto-release.yml diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml new file mode 100644 index 00000000..b22f1664 --- /dev/null +++ b/.github/workflows/auto-release.yml @@ -0,0 +1,56 @@ +# https://github.com/changesets/action +name: Release + +on: + push: + pull_request: + branches: [ main ] + +env: + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + +jobs: + + check-file: + name: Release + runs-on: ubuntu-latest + steps: + - name: Check file existence + id: check_files + uses: andstor/file-existence-action@v1 + with: + files: "./.changeset/changeset.md" + + - name: File exists + if: steps.check_files.outputs.files_exists == 'true' + run: echo "It exists !" + + release: + needs: check-file + name: Release + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits + fetch-depth: 0 + + - name: Setup pnpm + uses: pnpm/action-setup@v2 + with: + version: 8.12.1 + - uses: actions/setup-node@v4 + with: + node-version: "18.x" + cache: 'pnpm' + - name: Install dependencies + run: pnpm install --frozen-lockfile + + - name: Build package + run: pnpm run build + +# - name: Changeset version +# run: pnpm run changeset version +# +# - name: Changeset publish +# run: pnpm run changeset publish From 5232912e43fff8100838d047f8fc593790ae0cf7 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:39:27 +0300 Subject: [PATCH 19/31] Update auto-release workflow --- .github/workflows/auto-release.yml | 38 ++++++++++++------------------ 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index b22f1664..d3d88ffa 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -1,5 +1,5 @@ # https://github.com/changesets/action -name: Release +name: Auto-release on: push: @@ -9,24 +9,8 @@ on: env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} -jobs: - - check-file: - name: Release - runs-on: ubuntu-latest - steps: - - name: Check file existence - id: check_files - uses: andstor/file-existence-action@v1 - with: - files: "./.changeset/changeset.md" - - - name: File exists - if: steps.check_files.outputs.files_exists == 'true' - run: echo "It exists !" - +jobs: release: - needs: check-file name: Release runs-on: ubuntu-latest steps: @@ -49,8 +33,16 @@ jobs: - name: Build package run: pnpm run build -# - name: Changeset version -# run: pnpm run changeset version -# -# - name: Changeset publish -# run: pnpm run changeset publish + - name: Check file existence + id: check_files + uses: andstor/file-existence-action@v1 + with: + files: "./.changeset/changeset.md" + + - name: Changeset version + if: steps.check_files.outputs.files_exists == 'true' + run: pnpm run changeset version + + - name: Changeset publish + if: steps.check_files.outputs.files_exists == 'true' + run: pnpm run changeset publish From 50d87a2450e973e580d65cabcc0a265fe2e736c2 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:41:59 +0300 Subject: [PATCH 20/31] Update file-existence-action version --- .github/workflows/auto-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index d3d88ffa..9c7d77bf 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -35,7 +35,7 @@ jobs: - name: Check file existence id: check_files - uses: andstor/file-existence-action@v1 + uses: andstor/file-existence-action@v3 with: files: "./.changeset/changeset.md" From e24b74b1fcdb0bb2384985da220e558aa2ee07f4 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:43:18 +0300 Subject: [PATCH 21/31] Update auto-release workflow --- .github/workflows/auto-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index 9c7d77bf..cf703180 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -3,8 +3,8 @@ name: Auto-release on: push: - pull_request: - branches: [ main ] + branches: + - main env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} From f0b6addc0500dddf96d7353884cd72de3ebcd6a4 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:45:48 +0300 Subject: [PATCH 22/31] Remove logo to test --- raw/symbols/api3.svg | 1 - 1 file changed, 1 deletion(-) delete mode 100644 raw/symbols/api3.svg diff --git a/raw/symbols/api3.svg b/raw/symbols/api3.svg deleted file mode 100644 index ff09b0fd..00000000 --- a/raw/symbols/api3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From a26aada24bfc6343b4d8c2c2ec5c963041bd4f65 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 11:46:38 +0000 Subject: [PATCH 23/31] Fetch Logos from Dropbox Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- raw/symbols/api3.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 raw/symbols/api3.svg diff --git a/raw/symbols/api3.svg b/raw/symbols/api3.svg new file mode 100644 index 00000000..ff09b0fd --- /dev/null +++ b/raw/symbols/api3.svg @@ -0,0 +1 @@ + \ No newline at end of file From e7817768cac695d4675f44cde198bf7e8760509d Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 11:46:40 +0000 Subject: [PATCH 24/31] Added changeset Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .changeset/changeset.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changeset/changeset.md diff --git a/.changeset/changeset.md b/.changeset/changeset.md new file mode 100644 index 00000000..fb7f7be3 --- /dev/null +++ b/.changeset/changeset.md @@ -0,0 +1,7 @@ +--- +"@phase21/logos": patch +--- + +# What's Changed +Release created by the release script. +Logos updated. From ce176f1f80dc4f4345bd35d0f38b1bdc9e73583c Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:48:24 +0300 Subject: [PATCH 25/31] Remove duplicate createChangeset() call --- scripts/release.js | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/release.js b/scripts/release.js index abe89dec..293b1751 100644 --- a/scripts/release.js +++ b/scripts/release.js @@ -25,7 +25,6 @@ async function checkChangeset() { } else { await createChangeset(); } - await createChangeset(); } async function main() { From cbd622eb8a1252be17ab51a979e4aeab41397d35 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:50:23 +0300 Subject: [PATCH 26/31] Add build package step to deploy workflow --- .github/workflows/deployfe.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deployfe.yml b/.github/workflows/deployfe.yml index 653ff33c..39881912 100644 --- a/.github/workflows/deployfe.yml +++ b/.github/workflows/deployfe.yml @@ -47,6 +47,8 @@ jobs: with: commit_message: Fetch Logos from Dropbox commit_options: '--no-verify --signoff' + - name: Build Package + run: pnpm run package - name: "Run if changes have been detected" id: add-changeset if: steps.auto-commit-action.outputs.changes_detected == 'true' @@ -57,8 +59,6 @@ jobs: with: commit_message: Added changeset commit_options: '--no-verify --signoff' - - name: Build Package - run: pnpm run package - name: Install Frontend Packages if : github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'deploy') run: pnpm install From c4363d3992b7e40a34b550809c0425c200fbbee1 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:54:22 +0300 Subject: [PATCH 27/31] Update changeset commands in auto-release workflow --- .github/workflows/auto-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index cf703180..a650d8a8 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -41,8 +41,8 @@ jobs: - name: Changeset version if: steps.check_files.outputs.files_exists == 'true' - run: pnpm run changeset version + run: pnpm changeset version - name: Changeset publish if: steps.check_files.outputs.files_exists == 'true' - run: pnpm run changeset publish + run: pnpm changeset publish From 14eb906639ebc8a486ec02ef75a1b9d61a487dfb Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 14:56:53 +0300 Subject: [PATCH 28/31] Add release workflow for logos package --- .github/workflows/auto-release.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index a650d8a8..d843511c 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -43,6 +43,11 @@ jobs: if: steps.check_files.outputs.files_exists == 'true' run: pnpm changeset version - - name: Changeset publish + - name: Create Release if: steps.check_files.outputs.files_exists == 'true' - run: pnpm changeset publish + id: changesets + uses: changesets/action@v1 + with: + publish: pnpm run release + commit: "ci: release logos package" + title: "ci: release logos package" From a7c234429d330c2867796665d44d7bc3bddad116 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 15:00:15 +0300 Subject: [PATCH 29/31] Add sleep step to auto-release workflow --- .github/workflows/auto-release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index d843511c..2fae160e 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -42,6 +42,9 @@ jobs: - name: Changeset version if: steps.check_files.outputs.files_exists == 'true' run: pnpm changeset version + + - name: Sleep for 5 seconds + run: sleep 5 - name: Create Release if: steps.check_files.outputs.files_exists == 'true' @@ -51,3 +54,5 @@ jobs: publish: pnpm run release commit: "ci: release logos package" title: "ci: release logos package" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 377794a9f4ddd707666b936a04c25fa2fc961f77 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 15:03:00 +0300 Subject: [PATCH 30/31] Update version --- .github/workflows/auto-release.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index 2fae160e..05aa0fde 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -43,8 +43,13 @@ jobs: if: steps.check_files.outputs.files_exists == 'true' run: pnpm changeset version - - name: Sleep for 5 seconds - run: sleep 5 + - name: Commit changes + uses: stefanzweifel/git-auto-commit-action@v5 + id: auto-commit-action + if: steps.check_files.outputs.files_exists == 'true' + with: + commit_message: Update version + commit_options: '--no-verify --signoff' - name: Create Release if: steps.check_files.outputs.files_exists == 'true' From a14cd9af311a918a698cdca76fe14a069e048517 Mon Sep 17 00:00:00 2001 From: hiletmis Date: Mon, 5 Feb 2024 12:03:36 +0000 Subject: [PATCH 31/31] Update version Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .changeset/changeset.md | 7 ------- CHANGELOG.md | 8 ++++++++ package.json | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 .changeset/changeset.md diff --git a/.changeset/changeset.md b/.changeset/changeset.md deleted file mode 100644 index fb7f7be3..00000000 --- a/.changeset/changeset.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"@phase21/logos": patch ---- - -# What's Changed -Release created by the release script. -Logos updated. diff --git a/CHANGELOG.md b/CHANGELOG.md index 135cf54b..298b4e5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # @api3/logos +## 2.8.3 + +### Patch Changes + +- e781776: # What's Changed + Release created by the release script. + Logos updated. + ## 2.8.2 ### Patch Changes diff --git a/package.json b/package.json index 626ac73a..b0e7b69c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@phase21/logos", - "version": "2.8.2", + "version": "2.8.3", "license": "MIT", "sideEffects": false, "scripts": {