diff --git a/.devcontainer/post-install.sh b/.devcontainer/post-install.sh index 05f4d4d5..2ede09c3 100755 --- a/.devcontainer/post-install.sh +++ b/.devcontainer/post-install.sh @@ -2,4 +2,5 @@ cd StreamAwesome npm install +npm run render-version npm run dev diff --git a/.devcontainer/render-version.sh b/.devcontainer/render-version.sh new file mode 100755 index 00000000..c4befdbb --- /dev/null +++ b/.devcontainer/render-version.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +VERSION_FILE="src/version.ts" +LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null) + +if [ -z "$LATEST_TAG" ]; then + echo "No git tags found, using default version 0.0.0" + VERSION="0.0.0" +else + # Strip the 'v' prefix from the tag (e.g., v1.2.3 -> 1.2.3) + VERSION=${LATEST_TAG#v} + echo "Found git tag: $LATEST_TAG, extracted version: $VERSION" +fi + +echo "export const streamAwesomeVersion = '$VERSION'" > "$VERSION_FILE" +echo "Version $VERSION has been written to $VERSION_FILE" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c0ca86c1..04941774 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,4 +27,5 @@ jobs: working-directory: StreamAwesome run: | npm install + npm run render-version npm run build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5c112911..3fd4e341 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,6 +29,10 @@ jobs: working-directory: StreamAwesome run: npm install + - name: Render Version 🏷️ + working-directory: StreamAwesome + run: npm run render-version + - name: Build for Latest 🔨 working-directory: StreamAwesome run: npm run build diff --git a/StreamAwesome/.gitignore b/StreamAwesome/.gitignore index 96d5d923..521b2223 100644 --- a/StreamAwesome/.gitignore +++ b/StreamAwesome/.gitignore @@ -26,8 +26,5 @@ coverage *.njsproj *.sln *.sw? +.idea -# Ignore font awesome file -prototype/fontawesome/ -prototype/fontawesome_free/ -.idea \ No newline at end of file diff --git a/StreamAwesome/package.json b/StreamAwesome/package.json index 32b70bab..94353843 100644 --- a/StreamAwesome/package.json +++ b/StreamAwesome/package.json @@ -13,7 +13,8 @@ "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix", "format": "prettier --write src/", "prepare": "cd ../ && husky ./StreamAwesome/.husky", - "tidy": "npm run lint && npm run format" + "tidy": "npm run lint && npm run format", + "render-version": "../.devcontainer/render-version.sh" }, "dependencies": { "@vueuse/core": "^14.1.0", diff --git a/StreamAwesome/src/components/browser/IconBrowser.vue b/StreamAwesome/src/components/browser/IconBrowser.vue index 33b34d09..e5e2eddd 100644 --- a/StreamAwesome/src/components/browser/IconBrowser.vue +++ b/StreamAwesome/src/components/browser/IconBrowser.vue @@ -5,7 +5,7 @@ import Icon from '@/components/utils/IconDisplay.vue' import { FontAwesomeBrowser } from '@/logic/fontAwesomeBrowser' import type { FontAwesomeIcon } from '@/model/fontAwesomeIcon' import type { FontAwesomeIconType } from '@/model/fontAwesomeIconType' -import { fontAwesomeVersionInfo } from '@/model/versions' +import { fontAwesomeVersionInfo } from '@/model/fontAwesomeInfo' import { useIconsStore } from '@/stores/icons' import { ref } from 'vue' diff --git a/StreamAwesome/src/components/settings/GeneralOptions.vue b/StreamAwesome/src/components/settings/GeneralOptions.vue index 40cb994c..ca746e06 100644 --- a/StreamAwesome/src/components/settings/GeneralOptions.vue +++ b/StreamAwesome/src/components/settings/GeneralOptions.vue @@ -14,7 +14,7 @@ import { FontAwesomeIconType } from '@/model/fontAwesomeIconType' import Icon from '@/components/utils/IconDisplay.vue' import type { FontAwesomeIcon } from '@/model/fontAwesomeIcon' import { ref } from 'vue' -import { fontAwesomeVersionInfo } from '@/model/versions' +import { fontAwesomeVersionInfo } from '@/model/fontAwesomeInfo' const props = defineProps<{ icon: CustomIcon diff --git a/StreamAwesome/src/components/utils/AppFooter.vue b/StreamAwesome/src/components/utils/AppFooter.vue index 7d81ebfe..c7b97aeb 100644 --- a/StreamAwesome/src/components/utils/AppFooter.vue +++ b/StreamAwesome/src/components/utils/AppFooter.vue @@ -1,5 +1,5 @@