From b1d9ab3c53c6a4f15bd9ecb7503ec920e8cd3d20 Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Sat, 30 Mar 2024 15:26:44 +0100 Subject: [PATCH] Remove unusued postprocess --- .eslintignore | 1 + .github/workflows/workflow.yml | 10 ++++---- .prettierignore | 1 + .vscode/settings.json | 6 ++--- src/lib/i18n/index.ts | 2 +- src/routes/+layout.svelte | 20 +++------------- src/routes/+page.svelte | 44 ++++++++++++++++++---------------- static/manifests/epd2_13.json | 28 ++++++++++------------ static/manifests/epd2_9.json | 28 ++++++++++------------ static/manifests/oc_pcb.json | 26 ++++++++++---------- svelte.config.js | 4 ++-- 11 files changed, 75 insertions(+), 95 deletions(-) diff --git a/.eslintignore b/.eslintignore index 3897265..55229e5 100644 --- a/.eslintignore +++ b/.eslintignore @@ -11,3 +11,4 @@ node_modules pnpm-lock.yaml package-lock.json yarn.lock +dist/ \ No newline at end of file diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 1104321..82958bc 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -43,7 +43,7 @@ jobs: ~/node_modules key: ${{ runner.os }}-webflasher - name: Install yarn - run: yarn && yarn postinstall + run: yarn - name: Run linter run: yarn lint # - name: Run vitest tests @@ -52,22 +52,22 @@ jobs: # run: npx playwright install --with-deps # - name: Run Playwright tests # run: npx playwright test - - name: Build + - name: Build run: yarn build - name: Create tarball run: tar czf webflasher.tgz --strip-components=1 dist - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: "github-pages" + name: 'github-pages' path: | webflasher.tgz deploy: # Add a dependency to the build job needs: build permissions: - pages: write # to deploy to Pages - id-token: write # to verify the deployment originates from an appropriate source + pages: write # to deploy to Pages + id-token: write # to verify the deployment originates from an appropriate source environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} diff --git a/.prettierignore b/.prettierignore index cc41cea..0bcbebb 100644 --- a/.prettierignore +++ b/.prettierignore @@ -2,3 +2,4 @@ pnpm-lock.yaml package-lock.json yarn.lock +dist/ \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 0eae535..30de97f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,3 @@ { - "i18n-ally.localesPaths": [ - "src/lib/i18n" - ] -} \ No newline at end of file + "i18n-ally.localesPaths": ["src/lib/i18n"] +} diff --git a/src/lib/i18n/index.ts b/src/lib/i18n/index.ts index b2d51bc..eae1977 100644 --- a/src/lib/i18n/index.ts +++ b/src/lib/i18n/index.ts @@ -1,5 +1,5 @@ import { browser } from '$app/environment'; -import { init, register } from 'svelte-i18n'; +import { init } from 'svelte-i18n'; const defaultLocale = 'en'; diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index b5aeb56..02eeb54 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,19 +1,7 @@ @@ -37,12 +32,12 @@ Wemos S2/S3 mini - - - + + + - - + + @@ -52,18 +47,25 @@ OrangeClock PCB - - - - + + + + - - -

How it works

-

ESP Web Tools works by using Web Serial and a manifest which describes the firmware. ESP Web Tools detects the chipset of the connected ESP device and automatically selects the right firmware variant from the manifest.

-

Web Serial is available in Google Chrome and Microsoft Edge browsers. Android support should be possible but has not been implemented yet.

- - + + +

How it works

+

+ ESP Web Tools works by using Web Serial and a manifest which describes the firmware. ESP Web + Tools detects the chipset of the connected ESP device and automatically selects the right + firmware variant from the manifest. +

+

+ Web Serial is available in Google Chrome and Microsoft Edge browsers. Android support should + be possible but has not been implemented yet. +

+ + diff --git a/static/manifests/epd2_13.json b/static/manifests/epd2_13.json index 999049c..d2202a3 100644 --- a/static/manifests/epd2_13.json +++ b/static/manifests/epd2_13.json @@ -1,17 +1,13 @@ { - "name": "OrangeClock 2.13 inch", - "builds": [ - { - "chipFamily": "ESP32-S2", - "parts": [ - { "path": "/firmwares/lolin_s2_mini_213epd.bin", "offset": 0 } - ] - }, - { - "chipFamily": "ESP32-S3", - "parts": [ - { "path": "/firmwares/lolin_s3_mini_213epd.bin", "offset": 0 } - ] - } - ] - } \ No newline at end of file + "name": "OrangeClock 2.13 inch", + "builds": [ + { + "chipFamily": "ESP32-S2", + "parts": [{ "path": "/firmwares/lolin_s2_mini_213epd.bin", "offset": 0 }] + }, + { + "chipFamily": "ESP32-S3", + "parts": [{ "path": "/firmwares/lolin_s3_mini_213epd.bin", "offset": 0 }] + } + ] +} diff --git a/static/manifests/epd2_9.json b/static/manifests/epd2_9.json index 872a233..c65e2cd 100644 --- a/static/manifests/epd2_9.json +++ b/static/manifests/epd2_9.json @@ -1,17 +1,13 @@ { - "name": "OrangeClock 2.9 inch", - "builds": [ - { - "chipFamily": "ESP32-S2", - "parts": [ - { "path": "lolin_s2_mini_29epd.bin", "offset": 0 } - ] - }, - { - "chipFamily": "ESP32-S3", - "parts": [ - { "path": "lolin_s3_mini_29epd.bin", "offset": 0 } - ] - } - ] - } \ No newline at end of file + "name": "OrangeClock 2.9 inch", + "builds": [ + { + "chipFamily": "ESP32-S2", + "parts": [{ "path": "lolin_s2_mini_29epd.bin", "offset": 0 }] + }, + { + "chipFamily": "ESP32-S3", + "parts": [{ "path": "lolin_s3_mini_29epd.bin", "offset": 0 }] + } + ] +} diff --git a/static/manifests/oc_pcb.json b/static/manifests/oc_pcb.json index 2d0ef86..925db7b 100644 --- a/static/manifests/oc_pcb.json +++ b/static/manifests/oc_pcb.json @@ -1,14 +1,14 @@ { - "name": "OrangeClock PCB", - "builds": [ - { - "chipFamily": "ESP32-S3", - "parts": [ - { - "path": "/firmwares/orangeclock_29epd.bin", - "offset": 0 - } - ] - } - ] -} \ No newline at end of file + "name": "OrangeClock PCB", + "builds": [ + { + "chipFamily": "ESP32-S3", + "parts": [ + { + "path": "/firmwares/orangeclock_29epd.bin", + "offset": 0 + } + ] + } + ] +} diff --git a/svelte.config.js b/svelte.config.js index a0a73ea..fc9a81a 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -20,8 +20,8 @@ const config = { }), appDir: 'build', paths: { - base: process.env.NODE_ENV === 'production' ? '/oc-flasher' : '', - } + base: process.env.NODE_ENV === 'production' ? '/oc-flasher' : '' + } } };