diff --git a/.github/workflows/publish-dev-image.yaml b/.github/workflows/publish-dev-image.yaml index 8ad0b6b..0dc7bde 100644 --- a/.github/workflows/publish-dev-image.yaml +++ b/.github/workflows/publish-dev-image.yaml @@ -16,29 +16,16 @@ jobs: id: gathervars run: | # get a current BUILD_DATE - echo "::set-output name=BUILD_DATE::$(date +%Y%m%d-%H%M%S)" + echo "BUILD_DATE=$(date +%Y%m%d-%H%M%S)" >> $GITHUB_ENV # set version based on BUILD_DATE - echo "::set-output name=VERSION::$(date +%Y.%m.%d)-development" - - # setting tags - echo "::set-output name=TAG::development" + echo "VERSION=$(date +%Y.%m.%d)-development" >> $GITHUB_ENV - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: actions/checkout@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} - restore-keys: ${{ runner.os }}-buildx- - - name: Log in to the Container registry uses: docker/login-action@v1 with: @@ -47,16 +34,13 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push Docker Image - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: build-args: | - BUILD_DATE=${{ steps.gathervars.outputs.BUILD_DATE }} - VERSION=${{ steps.gathervars.outputs.VERSION }} + BUILD_DATE=${{ env.BUILD_DATE }} + VERSION=${{ env.VERSION }} context: ./docker/development tags: | ghcr.io/${{ github.repository }}-dev:latest - ghcr.io/${{ github.repository }}-dev:${{ steps.gathervars.outputs.VERSION }} - platforms: linux/amd64,linux/arm64,linux/arm32v7 - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache + ghcr.io/${{ github.repository }}-dev:${{ env.VERSION }} push: true diff --git a/.github/workflows/publish-release.yaml b/.github/workflows/publish-release.yaml index d8c94c5..b6c9bc2 100644 --- a/.github/workflows/publish-release.yaml +++ b/.github/workflows/publish-release.yaml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Variable Gathering id: gathervars @@ -18,22 +18,19 @@ jobs: NOT_PREVIOUSLY_PUBLISHED=0 # get a current BUILD_DATE VERSION=$(jq -r '.version' ./package.json) - echo "::set-output name=BUILD_DATE::$(date +%Y%m%d-%H%M%S)" - echo "::set-output name=VERSION::$VERSION" + echo "BUILD_DATE=$(date +%Y%m%d-%H%M%S)" >> $GITHUB_ENV + echo "VERSION=$VERSION" >> $GITHUB_ENV # setting tags if echo "$VERSION" | grep -q "beta"; then - TAGS="ghcr.io/${{ github.repository }}:beta, ghcr.io/${{ github.repository }}:$VERSION, ghcr.io/${{ github.repository }}:latest" - PRIMARY_TAG=latest + echo "TAGS=ghcr.io/${{ github.repository }}:beta, ghcr.io/${{ github.repository }}:$VERSION, ghcr.io/${{ github.repository }}:latest" >> $GITHUB_ENV else - TAGS="ghcr.io/${{ github.repository }}:release, ghcr.io/${{ github.repository }}:latest, ghcr.io/${{ github.repository }}:$VERSION" - PRIMARY_TAG=latest + echo "TAGS=ghcr.io/${{ github.repository }}:release, ghcr.io/${{ github.repository }}:latest, ghcr.io/${{ github.repository }}:$VERSION" >> $GITHUB_ENV fi - echo "::set-output name=TAG::$TAGS" - echo "::set-output name=PRIMARY_TAG::$PRIMARY_TAG" + echo "PRIMARY_TAG=latest" >> $GITHUB_ENV # check if version has already been published $(docker manifest inspect ghcr.io/${{ github.repository }}:$VERSION > /dev/null) || NOT_PREVIOUSLY_PUBLISHED=1 - echo "::set-output name=NOT_PREVIOUSLY_PUBLISHED::$NOT_PREVIOUSLY_PUBLISHED" + echo "NOT_PREVIOUSLY_PUBLISHED=$NOT_PREVIOUSLY_PUBLISHED" >> $GITHUB_ENV - name: Set up QEMU uses: docker/setup-qemu-action@v2 @@ -42,36 +39,36 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Log in to the Container registry - uses: docker/login-action@v1 - if: ${{ steps.gathervars.outputs.NOT_PREVIOUSLY_PUBLISHED != 0 }} + uses: docker/login-action@v2 + if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }} with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push Docker Image - uses: docker/build-push-action@v2 - if: ${{ steps.gathervars.outputs.NOT_PREVIOUSLY_PUBLISHED != 0 }} + uses: docker/build-push-action@v4 + if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }} with: build-args: | - BUILD_DATE=${{ steps.gathervars.outputs.BUILD_DATE }} - VERSION=${{ steps.gathervars.outputs.VERSION }} + BUILD_DATE=${{ env.BUILD_DATE }} + VERSION=${{ env.VERSION }} context: ./docker/production tags: | - ${{ steps.gathervars.outputs.TAG }} + ${{ env.TAGS }} platforms: linux/amd64,linux/arm/v7,linux/arm64/v8 push: true - name: Extract build out of docker image - uses: shrink/actions-docker-extract@v1 - if: ${{ steps.gathervars.outputs.NOT_PREVIOUSLY_PUBLISHED != 0 }} + uses: shrink/actions-docker-extract@v2 + if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }} id: extract with: - image: ghcr.io/${{ github.repository }}:${{ steps.gathervars.outputs.PRIMARY_TAG }} + image: ghcr.io/${{ github.repository }}:${{ env.PRIMARY_TAG }} path: web - name: create release asset - if: ${{ steps.gathervars.outputs.NOT_PREVIOUSLY_PUBLISHED != 0 }} + if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }} run: | cd "${{ steps.extract.outputs.destination }}" 7z a headscale-ui.zip web @@ -79,18 +76,18 @@ jobs: - name: Create Draft Release id: create_release uses: actions/create-release@v1 - if: ${{ steps.gathervars.outputs.NOT_PREVIOUSLY_PUBLISHED != 0 }} + if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ steps.gathervars.outputs.VERSION }} + tag_name: ${{ env.VERSION }} release_name: headscale-ui draft: true prerelease: false - name: upload asset to releases uses: actions/upload-release-asset@v1.0.1 - if: ${{ steps.gathervars.outputs.NOT_PREVIOUSLY_PUBLISHED != 0 }} + if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -101,7 +98,7 @@ jobs: - name: publish release uses: eregon/publish-release@v1 - if: ${{ steps.gathervars.outputs.NOT_PREVIOUSLY_PUBLISHED != 0 }} + if: ${{ env.NOT_PREVIOUSLY_PUBLISHED != 0 }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/docker/development/dockerfile b/docker/development/dockerfile index f90ae93..ad6281b 100644 --- a/docker/development/dockerfile +++ b/docker/development/dockerfile @@ -49,14 +49,4 @@ USER dev-user WORKDIR /data -ENTRYPOINT /bin/sh /staging/scripts/2-initialise.sh#!/bin/sh - -#----# -# placeholder for testing -# while true; do sleep 1; done -#----# - -# set file permissions if required -if [ $(id -u) -ne $(stat -c %u /data) ] -then -…fi \ No newline at end of file +ENTRYPOINT /bin/sh /staging/scripts/2-initialise.sh \ No newline at end of file diff --git a/docker/production/dockerfile b/docker/production/dockerfile index 6e4ccdf..2757cd8 100644 --- a/docker/production/dockerfile +++ b/docker/production/dockerfile @@ -1,10 +1,10 @@ +FROM node:lts AS build + # arguments ARG VERSION="master" # Branch to check out ARG CHECKOUT_BRANCH="master" -FROM node:lts AS build - #environment variables ENV PROJECT_NAME="headscale-ui" # URL for the github/git location diff --git a/docker/production/scripts/1-image-build.sh b/docker/production/scripts/1-image-build.sh index c041a71..d3fcda8 100644 --- a/docker/production/scripts/1-image-build.sh +++ b/docker/production/scripts/1-image-build.sh @@ -2,9 +2,8 @@ set -x # add dependencies -# jq for parsing version information # git for cloning the repository -apk add --no-cache jq git +apk add --no-cache git #clone the project git clone ${PROJECT_URL} ${PROJECT_NAME} @@ -15,7 +14,6 @@ git checkout ${CHECKOUT_BRANCH} npm install # inject the version number -VERSION=$(jq -r '.version' package.json) sed -i "s/insert-version/${VERSION}/g" ./src/routes/settings.html/+page.svelte # build the project diff --git a/package-lock.json b/package-lock.json index 6a125ff..0cb0469 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "headscale-ui", - "version": "2023.01.30-beta-1", + "version": "2023.06.25-beta", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "headscale-ui", - "version": "2023.01.30-beta-1", + "version": "2023.06.25-beta", "devDependencies": { "@sveltejs/adapter-auto": "^2.1.0", "@sveltejs/adapter-static": "^2.0.2", @@ -530,9 +530,9 @@ } }, "node_modules/@sveltejs/kit": { - "version": "1.20.4", - "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.20.4.tgz", - "integrity": "sha512-MmAzIuMrP7A+8fqDVbxm6ekGHRHL/+Fk8sQPAzPG4G2TxUDtHdn/WcIxeEqHzARMf0OtGSC+VPyOSFuw2Cy2Mg==", + "version": "1.20.5", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.20.5.tgz", + "integrity": "sha512-8rJYZ2boRlO75lwpbpB+DlSzIwmTuamXTpVlDtw4dBk86o3UaDe/+Ro4xCsV/4FtTw2U8xPHyV83edAWbQHG0w==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -561,31 +561,31 @@ } }, "node_modules/@sveltejs/vite-plugin-svelte": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-2.4.1.tgz", - "integrity": "sha512-bNNKvoRY89ptY7udeBSCmTdCVwkjmMcZ0j/z9J5MuedT8jPjq0zrknAo/jF1sToAza4NVaAgR9AkZoD9oJJmnA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-2.4.2.tgz", + "integrity": "sha512-ePfcC48ftMKhkT0OFGdOyycYKnnkT6i/buzey+vHRTR/JpQvuPzzhf1PtKqCDQfJRgoPSN2vscXs6gLigx/zGw==", "dev": true, "dependencies": { - "@sveltejs/vite-plugin-svelte-inspector": "^1.0.2", + "@sveltejs/vite-plugin-svelte-inspector": "^1.0.3", "debug": "^4.3.4", "deepmerge": "^4.3.1", "kleur": "^4.1.5", "magic-string": "^0.30.0", - "svelte-hmr": "^0.15.1", + "svelte-hmr": "^0.15.2", "vitefu": "^0.2.4" }, "engines": { "node": "^14.18.0 || >= 16" }, "peerDependencies": { - "svelte": "^3.54.0 || ^4.0.0-next.0", + "svelte": "^3.54.0 || ^4.0.0", "vite": "^4.0.0" } }, "node_modules/@sveltejs/vite-plugin-svelte-inspector": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-1.0.2.tgz", - "integrity": "sha512-Cy1dUMcYCnDVV/hPLXa43YZJ2jGKVW5rA0xuNL9dlmYhT0yoS1g7+FOFSRlgk0BXKk/Oc7grs+8BVA5Iz2fr8A==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-1.0.3.tgz", + "integrity": "sha512-Khdl5jmmPN6SUsVuqSXatKpQTMIifoQPDanaxC84m9JxIibWvSABJyHpyys0Z+1yYrxY5TTEQm+6elh0XCMaOA==", "dev": true, "dependencies": { "debug": "^4.3.4" @@ -595,7 +595,7 @@ }, "peerDependencies": { "@sveltejs/vite-plugin-svelte": "^2.2.0", - "svelte": "^3.54.0 || ^4.0.0-next.0", + "svelte": "^3.54.0 || ^4.0.0", "vite": "^4.0.0" } }, @@ -805,9 +805,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001504", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001504.tgz", - "integrity": "sha512-5uo7eoOp2mKbWyfMXnGO9rJWOGU8duvzEiYITW+wivukL7yHH4gX9yuRaobu6El4jPxo6jKZfG+N6fB621GD/Q==", + "version": "1.0.30001507", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001507.tgz", + "integrity": "sha512-SFpUDoSLCaE5XYL2jfqe9ova/pbQHEmbheDf5r4diNwbAgR3qxM9NQtfsiSscjqoya5K7kFcHPUQ+VsUkIJR4A==", "dev": true, "funding": [ { @@ -904,9 +904,9 @@ } }, "node_modules/daisyui": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-3.1.1.tgz", - "integrity": "sha512-+SPwlCvbk/dQd40Op3jv+C8s5pL/Ix4z/U+Q8KDKnF7oXNmvDYZlZ9e2RkouoevaW/Jta4e/iLTj5ve2WBoSkw==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-3.1.6.tgz", + "integrity": "sha512-P/2WUn4ZImEc2IfPSYw3qPCUnnJNju0P6ii0fUqtTURUj0oda6L0tm4EzrUmB2EbqB6grZ9nKHPTSniKaPYp1w==", "dev": true, "dependencies": { "colord": "^2.9", @@ -979,9 +979,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.433", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.433.tgz", - "integrity": "sha512-MGO1k0w1RgrfdbLVwmXcDhHHuxCn2qRgR7dYsJvWFKDttvYPx6FNzCGG0c/fBBvzK2LDh3UV7Tt9awnHnvAAUQ==", + "version": "1.4.440", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.440.tgz", + "integrity": "sha512-r6dCgNpRhPwiWlxbHzZQ/d9swfPaEJGi8ekqRBwQYaR3WmA5VkqQfBWSDDjuJU1ntO+W9tHx8OHV/96Q8e0dVw==", "dev": true }, "node_modules/es6-promise": { @@ -1184,14 +1184,6 @@ "node": ">= 0.4.0" } }, - "node_modules/immutable": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz", - "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==", - "dev": true, - "optional": true, - "peer": true - }, "node_modules/import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -1586,9 +1578,9 @@ } }, "node_modules/pirates": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz", - "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", "dev": true, "engines": { "node": ">= 6" @@ -1853,9 +1845,9 @@ } }, "node_modules/rollup": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.25.1.tgz", - "integrity": "sha512-tywOR+rwIt5m2ZAWSe5AIJcTat8vGlnPFAv15ycCrw33t6iFsXZ6mzHVFh2psSjxQPmI+xgzMZZizUAukBI4aQ==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.25.2.tgz", + "integrity": "sha512-VLnkxZMDr3jpxgtmS8pQZ0UvhslmF4ADq/9w4erkctbgjCqLW9oa89fJuXEs4ZmgyoF7Dm8rMDKSS5b5u2hHUg==", "dev": true, "peer": true, "bin": { @@ -1916,25 +1908,6 @@ "rimraf": "^2.5.2" } }, - "node_modules/sass": { - "version": "1.63.4", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.4.tgz", - "integrity": "sha512-Sx/+weUmK+oiIlI+9sdD0wZHsqpbgQg8wSwSnGBjwb5GwqFhYNwwnI+UWZtLjKvKyFlKkatRK235qQ3mokyPoQ==", - "dev": true, - "optional": true, - "peer": true, - "dependencies": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", - "source-map-js": ">=0.6.2 <2.0.0" - }, - "bin": { - "sass": "sass.js" - }, - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/set-cookie-parser": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz", @@ -2055,18 +2028,18 @@ } }, "node_modules/svelte": { - "version": "3.59.1", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.59.1.tgz", - "integrity": "sha512-pKj8fEBmqf6mq3/NfrB9SLtcJcUvjYSWyePlfCqN9gujLB25RitWK8PvFzlwim6hD/We35KbPlRteuA6rnPGcQ==", + "version": "3.59.2", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.59.2.tgz", + "integrity": "sha512-vzSyuGr3eEoAtT/A6bmajosJZIUWySzY2CzB3w2pgPvnkUjGqlDnsNnA0PMO+mMAhuyMul6C2uuZzY6ELSkzyA==", "dev": true, "engines": { "node": ">= 8" } }, "node_modules/svelte-check": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-3.4.3.tgz", - "integrity": "sha512-O07soQFY3X0VDt+bcGc6D5naz0cLtjwnmNP9JsEBPVyMemFEqUhL2OdLqvkl5H/u8Jwm50EiAU4BPRn5iin/kg==", + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-3.4.4.tgz", + "integrity": "sha512-Uys9+R65cj8TmP8f5UpS7B2xKpNLYNxEWJsA5ZoKcWq/uwvABFF7xS6iPQGLoa7hxz0DS6xU60YFpmq06E4JxA==", "dev": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.17", @@ -2701,9 +2674,9 @@ "requires": {} }, "@sveltejs/kit": { - "version": "1.20.4", - "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.20.4.tgz", - "integrity": "sha512-MmAzIuMrP7A+8fqDVbxm6ekGHRHL/+Fk8sQPAzPG4G2TxUDtHdn/WcIxeEqHzARMf0OtGSC+VPyOSFuw2Cy2Mg==", + "version": "1.20.5", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.20.5.tgz", + "integrity": "sha512-8rJYZ2boRlO75lwpbpB+DlSzIwmTuamXTpVlDtw4dBk86o3UaDe/+Ro4xCsV/4FtTw2U8xPHyV83edAWbQHG0w==", "dev": true, "requires": { "@sveltejs/vite-plugin-svelte": "^2.4.1", @@ -2721,24 +2694,24 @@ } }, "@sveltejs/vite-plugin-svelte": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-2.4.1.tgz", - "integrity": "sha512-bNNKvoRY89ptY7udeBSCmTdCVwkjmMcZ0j/z9J5MuedT8jPjq0zrknAo/jF1sToAza4NVaAgR9AkZoD9oJJmnA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-2.4.2.tgz", + "integrity": "sha512-ePfcC48ftMKhkT0OFGdOyycYKnnkT6i/buzey+vHRTR/JpQvuPzzhf1PtKqCDQfJRgoPSN2vscXs6gLigx/zGw==", "dev": true, "requires": { - "@sveltejs/vite-plugin-svelte-inspector": "^1.0.2", + "@sveltejs/vite-plugin-svelte-inspector": "^1.0.3", "debug": "^4.3.4", "deepmerge": "^4.3.1", "kleur": "^4.1.5", "magic-string": "^0.30.0", - "svelte-hmr": "^0.15.1", + "svelte-hmr": "^0.15.2", "vitefu": "^0.2.4" } }, "@sveltejs/vite-plugin-svelte-inspector": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-1.0.2.tgz", - "integrity": "sha512-Cy1dUMcYCnDVV/hPLXa43YZJ2jGKVW5rA0xuNL9dlmYhT0yoS1g7+FOFSRlgk0BXKk/Oc7grs+8BVA5Iz2fr8A==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-1.0.3.tgz", + "integrity": "sha512-Khdl5jmmPN6SUsVuqSXatKpQTMIifoQPDanaxC84m9JxIibWvSABJyHpyys0Z+1yYrxY5TTEQm+6elh0XCMaOA==", "dev": true, "requires": { "debug": "^4.3.4" @@ -2881,9 +2854,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001504", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001504.tgz", - "integrity": "sha512-5uo7eoOp2mKbWyfMXnGO9rJWOGU8duvzEiYITW+wivukL7yHH4gX9yuRaobu6El4jPxo6jKZfG+N6fB621GD/Q==", + "version": "1.0.30001507", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001507.tgz", + "integrity": "sha512-SFpUDoSLCaE5XYL2jfqe9ova/pbQHEmbheDf5r4diNwbAgR3qxM9NQtfsiSscjqoya5K7kFcHPUQ+VsUkIJR4A==", "dev": true }, "chokidar": { @@ -2943,9 +2916,9 @@ "dev": true }, "daisyui": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-3.1.1.tgz", - "integrity": "sha512-+SPwlCvbk/dQd40Op3jv+C8s5pL/Ix4z/U+Q8KDKnF7oXNmvDYZlZ9e2RkouoevaW/Jta4e/iLTj5ve2WBoSkw==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-3.1.6.tgz", + "integrity": "sha512-P/2WUn4ZImEc2IfPSYw3qPCUnnJNju0P6ii0fUqtTURUj0oda6L0tm4EzrUmB2EbqB6grZ9nKHPTSniKaPYp1w==", "dev": true, "requires": { "colord": "^2.9", @@ -2994,9 +2967,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.433", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.433.tgz", - "integrity": "sha512-MGO1k0w1RgrfdbLVwmXcDhHHuxCn2qRgR7dYsJvWFKDttvYPx6FNzCGG0c/fBBvzK2LDh3UV7Tt9awnHnvAAUQ==", + "version": "1.4.440", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.440.tgz", + "integrity": "sha512-r6dCgNpRhPwiWlxbHzZQ/d9swfPaEJGi8ekqRBwQYaR3WmA5VkqQfBWSDDjuJU1ntO+W9tHx8OHV/96Q8e0dVw==", "dev": true }, "es6-promise": { @@ -3154,14 +3127,6 @@ "function-bind": "^1.1.1" } }, - "immutable": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz", - "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==", - "dev": true, - "optional": true, - "peer": true - }, "import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -3450,9 +3415,9 @@ "dev": true }, "pirates": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz", - "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", "dev": true }, "postcss": { @@ -3603,9 +3568,9 @@ } }, "rollup": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.25.1.tgz", - "integrity": "sha512-tywOR+rwIt5m2ZAWSe5AIJcTat8vGlnPFAv15ycCrw33t6iFsXZ6mzHVFh2psSjxQPmI+xgzMZZizUAukBI4aQ==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.25.2.tgz", + "integrity": "sha512-VLnkxZMDr3jpxgtmS8pQZ0UvhslmF4ADq/9w4erkctbgjCqLW9oa89fJuXEs4ZmgyoF7Dm8rMDKSS5b5u2hHUg==", "dev": true, "peer": true, "requires": { @@ -3642,19 +3607,6 @@ "rimraf": "^2.5.2" } }, - "sass": { - "version": "1.63.4", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.4.tgz", - "integrity": "sha512-Sx/+weUmK+oiIlI+9sdD0wZHsqpbgQg8wSwSnGBjwb5GwqFhYNwwnI+UWZtLjKvKyFlKkatRK235qQ3mokyPoQ==", - "dev": true, - "optional": true, - "peer": true, - "requires": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", - "source-map-js": ">=0.6.2 <2.0.0" - } - }, "set-cookie-parser": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz", @@ -3743,15 +3695,15 @@ "dev": true }, "svelte": { - "version": "3.59.1", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.59.1.tgz", - "integrity": "sha512-pKj8fEBmqf6mq3/NfrB9SLtcJcUvjYSWyePlfCqN9gujLB25RitWK8PvFzlwim6hD/We35KbPlRteuA6rnPGcQ==", + "version": "3.59.2", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.59.2.tgz", + "integrity": "sha512-vzSyuGr3eEoAtT/A6bmajosJZIUWySzY2CzB3w2pgPvnkUjGqlDnsNnA0PMO+mMAhuyMul6C2uuZzY6ELSkzyA==", "dev": true }, "svelte-check": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-3.4.3.tgz", - "integrity": "sha512-O07soQFY3X0VDt+bcGc6D5naz0cLtjwnmNP9JsEBPVyMemFEqUhL2OdLqvkl5H/u8Jwm50EiAU4BPRn5iin/kg==", + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-3.4.4.tgz", + "integrity": "sha512-Uys9+R65cj8TmP8f5UpS7B2xKpNLYNxEWJsA5ZoKcWq/uwvABFF7xS6iPQGLoa7hxz0DS6xU60YFpmq06E4JxA==", "dev": true, "requires": { "@jridgewell/trace-mapping": "^0.3.17", diff --git a/package.json b/package.json index b4b0e0e..28b7796 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "headscale-ui", - "version": "2023.06.18-beta-1", + "version": "2023.06.25-beta1", "scripts": { "dev": "vite dev --https --port 443 --host 0.0.0.0", "build": "vite build", @@ -15,7 +15,7 @@ "devDependencies": { "@sveltejs/adapter-auto": "^2.1.0", "@sveltejs/adapter-static": "^2.0.2", - "@sveltejs/kit": "^1.0.0", + "@sveltejs/kit": "^1.20.4", "@tailwindcss/typography": "github:tailwindcss/typography", "@vitejs/plugin-basic-ssl": "^1.0.1", "autoprefixer": "^10.4.4", @@ -24,12 +24,12 @@ "postcss": "^8.4.12", "postcss-load-config": "^4.0.1", "prettier": "^2.6.2", - "prettier-plugin-svelte": "^2.7.0", - "svelte": "^3.44.0", + "prettier-plugin-svelte": "^2.10.1", + "svelte": "^4.0.0", "svelte-check": "^3.4.3", - "svelte-preprocess": "^5.0.0", + "svelte-preprocess": "^5.0.3", "tailwindcss": "^3.0.23", - "typescript": "^5.1.3" + "typescript": "^5.0.0" }, "type": "module" -} +} \ No newline at end of file diff --git a/src/lib/common/Alert.svelte b/src/lib/common/Alert.svelte index cd43ffc..8c778cc 100644 --- a/src/lib/common/Alert.svelte +++ b/src/lib/common/Alert.svelte @@ -31,7 +31,7 @@ {#if visible}
{ $alertStore = ''; diff --git a/src/lib/common/nav.svelte b/src/lib/common/nav.svelte index 6ac53fb..61a53a5 100644 --- a/src/lib/common/nav.svelte +++ b/src/lib/common/nav.svelte @@ -31,7 +31,7 @@ {#if componentLoaded} -