Merge pull request #1324 from shlinkio/develop

Release 4.2.0

.github/dependabot.yml

@@ -12,11 +12,11 @@ updates:
       fontawesome:
         patterns:
           - '@fortawesome/*'
-      eslint:
+      eslint-plugins: # TODO Add eslint back once updated to v9
         patterns:
           - '@shlinkio/eslint-config-js-coding-standard'
-          - '@typescript-eslint/*'
-          - 'eslint'
+          - 'typescript-eslint'
+          - '*eslint-plugin*'
       shlink:
         patterns:
           - '@shlinkio/*'
@@ -34,6 +34,9 @@ updates:
         patterns:
           - 'vitest'
           - '@vitest/*'
+      workbox:
+        patterns:
+          - 'workbox*'
     ignore:
       # Bootstrap can introduce visual breaking changes on styles
       # Ignore it, since the plan is to remove it anyway

.github/workflows/docker-image-build.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    uses: shlinkio/github-actions/.github/workflows/docker-build-and-publish.yml@main
+    uses: shlinkio/github-actions/.github/workflows/docker-publish-image.yml@main
     secrets: inherit
     with:
       image-name: shlinkio/shlink-web-client

CHANGELOG.md

@@ -4,12 +4,36 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [4.2.0] - 2024-10-07
+### Added
+* [shlink-web-component#411](https://github.com/shlinkio/shlink-web-component/issues/411) Add support for `ip-address` redirect conditions when Shlink server is >=4.2
+* [shlink-web-component#196](https://github.com/shlinkio/shlink-web-component/issues/196) Allow active date range to be changed by selecting a range in visits and visits-comparison line charts.
+* [shlink-web-component#307](https://github.com/shlinkio/shlink-web-component/issues/307) Add new setting to disable short URL deletions confirmation.
+* [shlink-web-component#435](https://github.com/shlinkio/shlink-web-component/issues/435) Allow toggling between displaying raw user agent and parsed browser/OS in visits table.
+* [shlink-web-component#197](https://github.com/shlinkio/shlink-web-component/issues/197) Allow line charts to be expanded to the full size of the viewport, both in individual visits views, and when comparing visits.
+* [shlink-web-component#382](https://github.com/shlinkio/shlink-web-component/issues/382) Initialize QR code modal with all params unset, so that they fall back to the server defaults. Additionally, allow them to be unset if desired.
+
+### Changed
+* Use `ShlinkWebSettings` from `@shlinkio/shlink-web-component` to replace local settings UI.
+* Update to `@shlinkio/eslint-config-js-coding-standard` 3.0, and migrate to ESLint flat config.
+* Remove dependency on `uuid` package, and use `crypto.randomUUID()` instead.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* *Nothing*
+
+
 ## [4.1.2] - 2024-04-17
 ### Added
 * *Nothing*
 
 ### Changed
-* *Nothing*
+* Use new reusable workflow to publish docker image
 
 ### Deprecated
 * *Nothing*

Dockerfile

@@ -1,10 +1,10 @@
-FROM node:21.7-alpine as node
+FROM node:22.9-alpine as node
 COPY . /shlink-web-client
 ARG VERSION="latest"
 ENV VERSION ${VERSION}
 RUN cd /shlink-web-client && npm ci && npm run build
 
-FROM nginxinc/nginx-unprivileged:1.25-alpine
+FROM nginxinc/nginx-unprivileged:1.27-alpine
 ARG UID=101
 LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
 

README.md

@@ -31,7 +31,7 @@ The application runs 100% in the browser, so you can safely access any shlink in
 
 If you want to deploy shlink-web-client in a container-based cluster (kubernetes, docker swarm, etc), just pick the [shlinkio/shlink-web-client](https://hub.docker.com/r/shlinkio/shlink-web-client/) image and do it.
 
-It's a lightweight [nginx:alpine](https://hub.docker.com/r/library/nginx/) image serving the static app on port 80.
+It's a lightweight [nginx:alpine](https://hub.docker.com/r/library/nginx/) image serving the static app on port 8080.
 
 ### Self-hosted
 

docker-compose.override.yml.dist

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   shlink_web_client_node:
     user: 1000:1000

docker-compose.yml

@@ -1,9 +1,7 @@
-version: '3'
-
 services:
   shlink_web_client_node:
     container_name: shlink_web_client_node
-    image: node:20.7-alpine
+    image: node:22.3-alpine
     command: /bin/sh -c "cd /home/shlink/www && npm install && npm run start"
     volumes:
       - ./:/home/shlink/www

eslint.config.js

@@ -0,0 +1,4 @@
+import shlink from '@shlinkio/eslint-config-js-coding-standard';
+
+/* eslint-disable-next-line no-restricted-exports */
+export default shlink;