From ebff71f77a4ef80d5fbc3919befd46039c0ea9ba Mon Sep 17 00:00:00 2001 From: f0x52 Date: Thu, 10 Nov 2022 14:08:54 +0100 Subject: [PATCH] [chore/frontend] CI steps for frontend stuff (#997) * re-add eslint * fix oauth url getting too long * actually attach single emoji get and delete routes * basic emoji details + deletion using rtk query * refactor emoji upload to rtk query * clean up old redux api+reducers for custom emoji * fix validation order * refactor custom emoji form fields * remove unused requires * cleanup, fix most eslint errors * more small eslint fixes * eslint & web bundle in CI * fix directories, move lint+build to scripts * working dirs * test linter and build errors * upgrade skulk for better error handling * Revert "test linter and build errors" This reverts commit dc047d5b444c41a90209d02bb4ed4893ccf0885f. * fix max emoji size * tiny bit of function documentation * sign drone.yml Co-authored-by: tsmethurst --- .drone.yml | 39 ++++++++++++++++++++++++++++++++++++++- web/source/.eslintignore | 1 + web/source/package.json | 7 ++++++- web/source/yarn.lock | 8 ++++---- 4 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 web/source/.eslintignore diff --git a/.drone.yml b/.drone.yml index 7599dc48f..544555265 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,6 +44,43 @@ steps: include: - pull_request + - name: web-setup + image: node:14-alpine + when: + event: + include: + - pull_request + volumes: + - name: yarn_cache + path: /tmp/cache + commands: + - cd web/source + - yarn --frozen-lockfile --cache-folder /tmp/cache + + - name: web-lint + image: node:14-alpine + when: + event: + include: + - pull_request + depends_on: + - web-setup + commands: + - cd web/source + - yarn run lint + + - name: web-build + image: node:14-alpine + when: + event: + include: + - pull_request + depends_on: + - web-setup + commands: + - cd web/source + - yarn run build + - name: snapshot image: superseriousbusiness/gotosocial-drone-build:0.0.7 # https://github.com/superseriousbusiness/gotosocial-drone-build volumes: @@ -146,6 +183,6 @@ steps: --- kind: signature -hmac: 86caf3c98d6135ac53e05b728e999d03f8b35606f1b5bab63c2c521bf5084173 +hmac: db02a09af7262a2bab5a0cb4bfd82fa7e1dc566c29e55e6e0808e8f1dc92803b ... diff --git a/web/source/.eslintignore b/web/source/.eslintignore new file mode 100644 index 000000000..b512c09d4 --- /dev/null +++ b/web/source/.eslintignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file diff --git a/web/source/package.json b/web/source/package.json index 6625c4fd7..eb64e23be 100644 --- a/web/source/package.json +++ b/web/source/package.json @@ -5,6 +5,11 @@ "main": "index.js", "author": "f0x", "license": "AGPL-3.0", + "scripts": { + "lint": "eslint .", + "build": "node index.js", + "dev": "NODE_ENV=development node index.js" + }, "dependencies": { "@reduxjs/toolkit": "^1.8.6", "bluebird": "^3.7.2", @@ -22,7 +27,7 @@ "redux": "^4.2.0", "redux-devtools-extension": "^2.13.9", "redux-persist": "^6.0.0", - "skulk": "^0.0.5", + "skulk": "^0.0.6", "wouter": "^2.8.0-alpha.2" }, "devDependencies": { diff --git a/web/source/yarn.lock b/web/source/yarn.lock index 7b7f1de91..458732503 100644 --- a/web/source/yarn.lock +++ b/web/source/yarn.lock @@ -4805,10 +4805,10 @@ simple-concat@^1.0.0: resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== -skulk@^0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/skulk/-/skulk-0.0.5.tgz#98183af13f97df8da8f9a48a3dd2590e5543b955" - integrity sha512-EusaDqSIWx6uMzeBareaIZcwaA7zyY8CO8SiYxWfEj4KwzhDqBJvRad2QIXIFhds1CPLRZ/fo1j0GhANFVdyOg== +skulk@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/skulk/-/skulk-0.0.6.tgz#8c7d898c888b1fd6b79ece727e70b35a0f3612c6" + integrity sha512-K828rvj7qtfMk86JykuJ5Y3Ol/6G5lnRF6G7jGjNwuHMbvQzWH9WkH8k+ht7Omg7P03Zmbvj2WhWgq83HPw2+w== dependencies: "@babel/core" "^7.19.3" "@f0x52/spyfs" "^1.1.0"