From 6176bd733e65aa1c5308e988fdee05c4c22e4678 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Mon, 27 Jul 2026 13:09:52 +0200 Subject: [PATCH] Update to coding standard 4.0.0 --- .github/workflows/ci.yml | 3 +- .github/workflows/publish-release.yml | 2 +- README.md | 2 +- dev.Dockerfile | 2 +- docker-compose.yml | 2 +- oxfmt.config.ts | 2 +- oxlint.config.ts | 2 +- package-lock.json | 63 ++++----------------------- package.json | 2 +- 9 files changed, 16 insertions(+), 64 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68634b8b..92e66eb4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,6 @@ jobs: ci: uses: shlinkio/github-actions/.github/workflows/web-app-ci.yml@main with: - node-version: 24.x + node-version: 26.x publish-coverage: true install-playwright: true - cs-script: true diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 8e374ca5..d5be84a5 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -16,7 +16,7 @@ jobs: with: node-version: 24.14 - name: Generate release assets - run: npm ci && VERSION=${GITHUB_REF#refs/tags/v} npm run build:dist + run: npm ci && VERSION=${GITHUB_REF#refs/tags/v} node --run build:dist - name: Publish release with assets uses: docker://antonyurchenko/git-release:latest env: diff --git a/README.md b/README.md index 11610708..bc83bc5d 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ If you need to host shlink-web-client yourself and serve it from a subpath, foll * For classic hosting: * Download [node](https://nodejs.org/en/download/package-manager/) 10.15 or later. * Install project dependencies by running `npm install`. - * Build the project by running `npm run build`. + * Build the project by running `node --run build`. * Once the command finishes, you will have a `build` folder with all the static assets you need to run shlink-web-client. Just place them wherever you want them to be served from. * For docker image: * Download [docker](https://docs.docker.com/install/). diff --git a/dev.Dockerfile b/dev.Dockerfile index 9d891179..61d78154 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/playwright:v1.61.1-noble +FROM mcr.microsoft.com/playwright:v1.62.0-noble ENV TINI_VERSION v0.19.0 diff --git a/docker-compose.yml b/docker-compose.yml index fcaf3697..50f2534a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: context: . dockerfile: ./dev.Dockerfile working_dir: /home/shlink/www - command: /bin/sh -c "npm install && npm run start" + command: /bin/sh -c "npm install && node --run start" volumes: - ./:/home/shlink/www ports: diff --git a/oxfmt.config.ts b/oxfmt.config.ts index 9785f64e..460fe526 100644 --- a/oxfmt.config.ts +++ b/oxfmt.config.ts @@ -1,4 +1,4 @@ // @ts-expect-error This lib does not expose type definitions -import shlink from '@shlinkio/eslint-config-js-coding-standard/oxc/oxfmt'; +import { oxfmt as shlink } from '@shlinkio/eslint-config-js-coding-standard'; export default shlink; diff --git a/oxlint.config.ts b/oxlint.config.ts index 406a5324..06659361 100644 --- a/oxlint.config.ts +++ b/oxlint.config.ts @@ -1,5 +1,5 @@ // @ts-expect-error This lib does not expose type definitions -import shlink from '@shlinkio/eslint-config-js-coding-standard/oxc/oxlint'; +import { oxlint as shlink } from '@shlinkio/eslint-config-js-coding-standard'; import { defineConfig } from 'oxlint'; export default defineConfig({ diff --git a/package-lock.json b/package-lock.json index 90a692f7..7cbbc20a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,7 @@ "workbox-strategies": "^7.4.0" }, "devDependencies": { - "@shlinkio/eslint-config-js-coding-standard": "~3.9.2", + "@shlinkio/eslint-config-js-coding-standard": "~4.0.0", "@tailwindcss/vite": "^4.3.3", "@testing-library/jest-dom": "^7.0.0", "@testing-library/react": "^16.3.2", @@ -3315,62 +3315,15 @@ "integrity": "sha512-3iCyKtxv/EAPhSv9Ht7KYu8sQOT4uj1zwSsXQCC7VeILuLhAW9SBdtJvjCI95rIYeGYto2fwW4QPghy9Qw2XCA==" }, "node_modules/@shlinkio/eslint-config-js-coding-standard": { - "version": "3.9.2", - "resolved": "https://registry.npmjs.org/@shlinkio/eslint-config-js-coding-standard/-/eslint-config-js-coding-standard-3.9.2.tgz", - "integrity": "sha512-G1/ZEfSgHETuN0UyaTyGtJPVkQ7YCVKlAN+np76uWQ7ZpG8+O94g5zwAMZoobd8P/TS/bDNqJPIs5GkUtrtptA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@shlinkio/eslint-config-js-coding-standard/-/eslint-config-js-coding-standard-4.0.0.tgz", + "integrity": "sha512-D6T2Y8eCFC6p/Vg69yxQUo8a1F1JxOssktpaO8oSjrsW7UJbbfUyvWU8r11pasvU+7xpgtG7WD1IN4mVv38f0g==", "dev": true, "license": "MIT", "peerDependencies": { - "@stylistic/eslint-plugin": ">=4.2.0", - "eslint": "^10.0.0 || ^9.20.1", - "eslint-plugin-import": "^2.31.0", - "eslint-plugin-jsx-a11y": "^6.8.0", - "eslint-plugin-react": "^7.34.2", - "eslint-plugin-react-compiler": "*", - "eslint-plugin-react-hooks": "^7.0.0", - "eslint-plugin-simple-import-sort": "^12.1.0", "oxfmt": ">=0.60.0", "oxlint": "^1.75.0", - "oxlint-tsgolint": "^7.0.2001", - "typescript-eslint": "^8.65.0" - }, - "peerDependenciesMeta": { - "@stylistic/eslint-plugin": { - "optional": true - }, - "eslint": { - "optional": true - }, - "eslint-plugin-import": { - "optional": true - }, - "eslint-plugin-jsx-a11y": { - "optional": true - }, - "eslint-plugin-react": { - "optional": true - }, - "eslint-plugin-react-compiler": { - "optional": true - }, - "eslint-plugin-react-hooks": { - "optional": true - }, - "eslint-plugin-simple-import-sort": { - "optional": true - }, - "oxfmt": { - "optional": true - }, - "oxlint": { - "optional": true - }, - "oxlint-tsgolint": { - "optional": true - }, - "typescript-eslint": { - "optional": true - } + "oxlint-tsgolint": "^7.0.2001" } }, "node_modules/@shlinkio/shlink-frontend-kit": { @@ -11133,9 +11086,9 @@ "integrity": "sha512-3iCyKtxv/EAPhSv9Ht7KYu8sQOT4uj1zwSsXQCC7VeILuLhAW9SBdtJvjCI95rIYeGYto2fwW4QPghy9Qw2XCA==" }, "@shlinkio/eslint-config-js-coding-standard": { - "version": "3.9.2", - "resolved": "https://registry.npmjs.org/@shlinkio/eslint-config-js-coding-standard/-/eslint-config-js-coding-standard-3.9.2.tgz", - "integrity": "sha512-G1/ZEfSgHETuN0UyaTyGtJPVkQ7YCVKlAN+np76uWQ7ZpG8+O94g5zwAMZoobd8P/TS/bDNqJPIs5GkUtrtptA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@shlinkio/eslint-config-js-coding-standard/-/eslint-config-js-coding-standard-4.0.0.tgz", + "integrity": "sha512-D6T2Y8eCFC6p/Vg69yxQUo8a1F1JxOssktpaO8oSjrsW7UJbbfUyvWU8r11pasvU+7xpgtG7WD1IN4mVv38f0g==", "dev": true, "requires": {} }, diff --git a/package.json b/package.json index 50d3e1cc..9f47ad8d 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "workbox-strategies": "^7.4.0" }, "devDependencies": { - "@shlinkio/eslint-config-js-coding-standard": "~3.9.2", + "@shlinkio/eslint-config-js-coding-standard": "~4.0.0", "@tailwindcss/vite": "^4.3.3", "@testing-library/jest-dom": "^7.0.0", "@testing-library/react": "^16.3.2",