Skip to content

Commit b747e63

Browse files
authored
Merge pull request #1524 from shlinkio/develop
Release 4.4.0
2 parents 5aa113e + 557cd4f commit b747e63

File tree

91 files changed

+6806
-7711
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+6806
-7711
lines changed

.github/dependabot.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@ updates:
2121
shlink:
2222
patterns:
2323
- '@shlinkio/*'
24-
types:
24+
react:
2525
patterns:
26-
- '@types/*'
26+
- 'react'
27+
- 'react-dom'
28+
- '@types/react'
29+
- '@types/react-dom'
2730
testing:
2831
patterns:
2932
- '@testing-library/*'
@@ -38,6 +41,10 @@ updates:
3841
workbox:
3942
patterns:
4043
- 'workbox*'
44+
tailwindcss:
45+
patterns:
46+
- 'tailwindcss'
47+
- '@tailwindcss/*'
4148
ignore:
4249
# Bootstrap can introduce visual breaking changes on styles
4350
# Ignore it, since the plan is to remove it anyway

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ jobs:
1313
with:
1414
node-version: 22.x
1515
publish-coverage: true
16+
install-playwright: true

.github/workflows/deploy-preview.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
deploy:
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-24.04
99
continue-on-error: true
1010
steps:
1111
- name: Checkout code
@@ -16,7 +16,7 @@ jobs:
1616
- name: Use node.js
1717
uses: actions/setup-node@v4
1818
with:
19-
node-version: 22.x
19+
node-version: 22.10
2020
- name: Build
2121
run: |
2222
npm ci && \

.github/workflows/publish-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ on:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
steps:
1212
- name: Checkout code
1313
uses: actions/checkout@v4
1414
- name: Use node.js
1515
uses: actions/setup-node@v4
1616
with:
17-
node-version: 22.x
17+
node-version: 22.10
1818
- name: Generate release assets
1919
run: npm ci && VERSION=${GITHUB_REF#refs/tags/v} npm run build:dist
2020
- name: Publish release with assets

.stylelintrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,31 @@ All notable changes to this project will be documented in this file.
44

55
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).
66

7+
## [4.4.0] - 2025-04-20
8+
### Added
9+
* [#1510](https://github.com/shlinkio/shlink-web-client/issues/1510) Existing HTTP credentials (cookies, TLS certs, authentication headers) can now be forwarded to the API server if appropriate [CORS headers](https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Access-Control-Allow-Credentials) are set
10+
* [shlink-web-component#637](https://github.com/shlinkio/shlink-web-component/pull/637) QR codes are now generated client-side, without hitting Shlink.
11+
* [shlink-web-component#641](https://github.com/shlinkio/shlink-web-component/issues/641) It is now possible to provide any logo to be used with QR codes.
12+
* [shlink-web-component#640](https://github.com/shlinkio/shlink-web-component/issues/640) Allow default QR code settings to be handled via app settings.
13+
14+
### Changed
15+
* Update to `react-router` 7.0
16+
* Update to `@shlinkio/shlink-frontend-kit` 0.8.x
17+
* Update to `@shlinkio/shlink-web-component` 0.13.x
18+
* Update to `@shlinkio/shlink-js-sdk` 2.0.0
19+
* Add `eslint-plugin-react-compiler`
20+
* Run unit tests in a headless browser using vitest browser mode and playwright.
21+
22+
### Deprecated
23+
* *Nothing*
24+
25+
### Removed
26+
* *Nothing*
27+
28+
### Fixed
29+
* *Nothing*
30+
31+
732
## [4.3.0] - 2024-11-30
833
### Added
934
* [#1360](https://github.com/shlinkio/shlink-web-client/issues/1360) Added ability for server IDs to be generated based on the server name and URL, instead of generating a random UUID.
@@ -298,7 +323,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
298323
* [#774](https://github.com/shlinkio/shlink-web-client/issues/774) Dropped support for Shlink older than 2.8.0.
299324

300325
### Fixed
301-
* [#715](https://github.com/shlinkio/shlink-web-client/issues/715) Fixed connection still failing on miss-configured servers, after editing their params to set proper values.
326+
* [#715](https://github.com/shlinkio/shlink-web-client/issues/715) Fixed connection still failing on misconfigured servers, after editing their params to set proper values.
302327

303328

304329
## [3.8.2] - 2022-12-17

CONTRIBUTING.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,8 @@ shlink-web-client
4545

4646
> Note: The `indocker` shell script is a helper used to run commands inside the docker container.
4747
48-
* `./indocker node --run lint`: Checks coding styles are fulfilled, both in JS/TS files and in stylesheets.
49-
* `./indocker node --run lint:js`: Checks coding styles are fulfilled in JS/TS files.
50-
* `./indocker node --run lint:css`: Checks coding styles are fulfilled in stylesheets.
51-
* `./indocker node --run lint:js:fix`: Fixes coding styles in JS/TS files.
52-
* `./indocker node --run lint:css:fix`: Fixes coding styles in stylesheets.
48+
* `./indocker node --run lint`: Checks coding styles are fulfilled in JS/TS files.
49+
* `./indocker node --run lint:fix`: Fixes coding styles in JS/TS files.
5350
* `./indocker node --run test`: Runs unit tests with Jest.
5451

5552
## Building the project

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:23.3-alpine AS node
1+
FROM node:23.11-alpine AS node
22
COPY . /shlink-web-client
33
ARG VERSION="latest"
44
ENV VERSION=${VERSION}

config/test/setupTests.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
11
import '@testing-library/jest-dom/vitest';
22
import { cleanup } from '@testing-library/react';
3-
import axe from 'axe-core';
43
import { afterEach } from 'vitest';
54

6-
axe.configure({
7-
checks: [
8-
{
9-
// Disable color contrast checking, as it doesn't work in jsdom
10-
id: 'color-contrast',
11-
enabled: false,
12-
},
13-
],
14-
});
15-
165
// Clear all mocks and cleanup DOM after every test
176
afterEach(() => {
187
vi.clearAllMocks();
198
cleanup();
209
});
21-
22-
HTMLCanvasElement.prototype.getContext = (() => {}) as any;
23-
(global as any).scrollTo = () => {};
24-
(global as any).matchMedia = () => ({ matches: false });

dev.Dockerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM mcr.microsoft.com/playwright:v1.52.0-noble
2+
3+
ENV NODE_VERSION 22.14
4+
ENV TINI_VERSION v0.19.0
5+
6+
# Install Node.js
7+
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.2/install.sh | bash && \
8+
\. "$HOME/.nvm/nvm.sh" && \
9+
nvm install ${NODE_VERSION}
10+
11+
# Install tini
12+
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
13+
RUN chmod +x /sbin/tini
14+
# Set tini as the entry point, as node does not properly handle signals
15+
ENTRYPOINT ["/sbin/tini", "--"]

0 commit comments

Comments
 (0)