diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f3bec6e..96288cac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup Node.js - uses: actions/setup-node@v3.4.1 + uses: actions/setup-node@v3 with: cache: "yarn" - run: yarn install --prefer-offline diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index e522295c..e52ccb49 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -12,27 +12,31 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - name: Setup Node.js + uses: actions/setup-node@v3 with: - fetch-depth: 0 + cache: "yarn" + - run: yarn install --prefer-offline + - run: yarn build --out-dir dist-ci && sed -i 's/fonts.gstatic.com/fonts.kavin.rocks/g' dist-ci/assets/*.css - name: Set up QEMU - uses: docker/setup-qemu-action@v2.0.0 + uses: docker/setup-qemu-action@v2 with: platforms: all - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2.0.0 + uses: docker/setup-buildx-action@v2 with: version: latest - name: Login to DockerHub - uses: docker/login-action@v2.0.0 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push - uses: docker/build-push-action@v3.1.1 + uses: docker/build-push-action@v3 with: context: . - file: ./Dockerfile + file: ./Dockerfile.ci platforms: linux/amd64,linux/arm64 push: true tags: 1337kavin/piped-frontend:latest diff --git a/.github/workflows/ipfs-build.yml b/.github/workflows/ipfs-build.yml index 0541f7ed..8797fcde 100644 --- a/.github/workflows/ipfs-build.yml +++ b/.github/workflows/ipfs-build.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup Node.js - uses: actions/setup-node@v3.4.1 + uses: actions/setup-node@v3 with: cache: "yarn" - run: yarn install --prefer-offline diff --git a/.gitignore b/.gitignore index 11f5d714..3d872835 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules /dist +/dist-ci # local env files .env.local diff --git a/Dockerfile.ci b/Dockerfile.ci new file mode 100644 index 00000000..d020ebfc --- /dev/null +++ b/Dockerfile.ci @@ -0,0 +1,6 @@ +FROM nginx:alpine + +COPY ./dist-ci/ /usr/share/nginx/html/ +COPY docker/nginx.conf /etc/nginx/conf.d/default.conf + +EXPOSE 80 diff --git a/package.json b/package.json index f468c306..bb588158 100644 --- a/package.json +++ b/package.json @@ -20,13 +20,13 @@ "mux.js": "^6.2.0", "shaka-player": "4.2.1", "stream": "^0.0.2", - "vue": "^3.2.38", + "vue": "^3.2.39", "vue-i18n": "^9.2.2", "vue-router": "^4.1.5", "xml-js": "^1.6.11" }, "devDependencies": { - "@iconify/json": "^2.1.103", + "@iconify/json": "^2.1.108", "@intlify/vite-plugin-vue-i18n": "^6.0.1", "@unocss/preset-icons": "^0.45.13", "@unocss/preset-web-fonts": "^0.45.7", @@ -34,14 +34,14 @@ "@unocss/transformer-variant-group": "^0.45.13", "@vitejs/plugin-legacy": "^1.8.2", "@vitejs/plugin-vue": "^2.3.4", - "@vue/compiler-sfc": "3.2.38", + "@vue/compiler-sfc": "3.2.39", "babel-eslint": "^10.1.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-prettier": "^4.2.1", - "eslint-plugin-vue": "^9.4.0", + "eslint-plugin-vue": "^9.5.1", "prettier": "^2.7.1", - "unocss": "^0.45.18", + "unocss": "^0.45.21", "vite": "^2.9.14", "vite-plugin-eslint": "^1.8.1", "vite-plugin-pwa": "^0.12.7" diff --git a/src/components/CommentItem.vue b/src/components/CommentItem.vue index 8ea86078..32123803 100644 --- a/src/components/CommentItem.vue +++ b/src/components/CommentItem.vue @@ -19,7 +19,7 @@ -
+