From b8aa068876b7f58920b158a05607b4ee69e20447 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 19 Jul 2022 18:28:55 +0200 Subject: [PATCH 1/4] Updated react-copy-to-clipboard --- package-lock.json | 24 ++++++++++++------------ package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7beed8ef..ca80f84f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,7 +29,7 @@ "react": "^18.1.0", "react-chartjs-2": "^4.1.0", "react-colorful": "^5.5.1", - "react-copy-to-clipboard": "^5.0.4", + "react-copy-to-clipboard": "^5.1.0", "react-datepicker": "^4.7.0", "react-dom": "^18.1.0", "react-external-link": "^2.0.0", @@ -19314,15 +19314,15 @@ } }, "node_modules/react-copy-to-clipboard": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.4.tgz", - "integrity": "sha512-IeVAiNVKjSPeGax/Gmkqfa/+PuMTBhutEvFUaMQLwE2tS0EXrAdgOpWDX26bWTXF3HrioorR7lr08NqeYUWQCQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz", + "integrity": "sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==", "dependencies": { - "copy-to-clipboard": "^3", - "prop-types": "^15.5.8" + "copy-to-clipboard": "^3.3.1", + "prop-types": "^15.8.1" }, "peerDependencies": { - "react": "^15.3.0 || ^16.0.0 || ^17.0.0" + "react": "^15.3.0 || 16 || 17 || 18" } }, "node_modules/react-datepicker": { @@ -40758,12 +40758,12 @@ "requires": {} }, "react-copy-to-clipboard": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.4.tgz", - "integrity": "sha512-IeVAiNVKjSPeGax/Gmkqfa/+PuMTBhutEvFUaMQLwE2tS0EXrAdgOpWDX26bWTXF3HrioorR7lr08NqeYUWQCQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz", + "integrity": "sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==", "requires": { - "copy-to-clipboard": "^3", - "prop-types": "^15.5.8" + "copy-to-clipboard": "^3.3.1", + "prop-types": "^15.8.1" } }, "react-datepicker": { diff --git a/package.json b/package.json index 84f8d26c..41472716 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "react": "^18.1.0", "react-chartjs-2": "^4.1.0", "react-colorful": "^5.5.1", - "react-copy-to-clipboard": "^5.0.4", + "react-copy-to-clipboard": "^5.1.0", "react-datepicker": "^4.7.0", "react-dom": "^18.1.0", "react-external-link": "^2.0.0", From 3b938251d9ae9286249ab1458eaf09d8f3c77b2a Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 19 Jul 2022 18:34:48 +0200 Subject: [PATCH 2/4] Updated react-datepicker --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index ca80f84f..804f1330 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "react-chartjs-2": "^4.1.0", "react-colorful": "^5.5.1", "react-copy-to-clipboard": "^5.1.0", - "react-datepicker": "^4.7.0", + "react-datepicker": "^4.8.0", "react-dom": "^18.1.0", "react-external-link": "^2.0.0", "react-leaflet": "^4.0.0", @@ -19326,9 +19326,9 @@ } }, "node_modules/react-datepicker": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.7.0.tgz", - "integrity": "sha512-FS8KgbwqpxmJBv/bUdA42MYqYZa+fEYcpc746DZiHvVE2nhjrW/dg7c5B5fIUuI8gZET6FOzuDgezNcj568Czw==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.8.0.tgz", + "integrity": "sha512-u69zXGHMpxAa4LeYR83vucQoUCJQ6m/WBsSxmUMu/M8ahTSVMMyiyQzauHgZA2NUr9y0FUgOAix71hGYUb6tvg==", "dependencies": { "@popperjs/core": "^2.9.2", "classnames": "^2.2.6", @@ -19338,8 +19338,8 @@ "react-popper": "^2.2.5" }, "peerDependencies": { - "react": "^16.9.0 || ^17", - "react-dom": "^16.9.0 || ^17" + "react": "^16.9.0 || ^17 || ^18", + "react-dom": "^16.9.0 || ^17 || ^18" } }, "node_modules/react-datepicker/node_modules/react-onclickoutside": { @@ -40767,9 +40767,9 @@ } }, "react-datepicker": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.7.0.tgz", - "integrity": "sha512-FS8KgbwqpxmJBv/bUdA42MYqYZa+fEYcpc746DZiHvVE2nhjrW/dg7c5B5fIUuI8gZET6FOzuDgezNcj568Czw==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.8.0.tgz", + "integrity": "sha512-u69zXGHMpxAa4LeYR83vucQoUCJQ6m/WBsSxmUMu/M8ahTSVMMyiyQzauHgZA2NUr9y0FUgOAix71hGYUb6tvg==", "requires": { "@popperjs/core": "^2.9.2", "classnames": "^2.2.6", diff --git a/package.json b/package.json index 41472716..49fae947 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "react-chartjs-2": "^4.1.0", "react-colorful": "^5.5.1", "react-copy-to-clipboard": "^5.1.0", - "react-datepicker": "^4.7.0", + "react-datepicker": "^4.8.0", "react-dom": "^18.1.0", "react-external-link": "^2.0.0", "react-leaflet": "^4.0.0", From d41c1a2a52c7f78de3365da9a9ea1bf3dd349ed4 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 19 Jul 2022 18:38:29 +0200 Subject: [PATCH 3/4] Updated react-swipeable --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 804f1330..ff560248 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "react-leaflet": "^4.0.0", "react-redux": "^8.0.0", "react-router-dom": "^6.3.0", - "react-swipeable": "^6.2.0", + "react-swipeable": "^7.0.0", "react-tag-autocomplete": "^6.3.0", "reactstrap": "^9.0.1", "redux": "^4.2.0", @@ -22130,11 +22130,11 @@ } }, "node_modules/react-swipeable": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/react-swipeable/-/react-swipeable-6.2.0.tgz", - "integrity": "sha512-nWQ8dEM8e/uswZLSIkXUsAnQmnX4MTcryOHBQIQYRMJFDpgDBSiVbKsz/BZVCIScF4NtJh16oyxwaNOepR6xSw==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/react-swipeable/-/react-swipeable-7.0.0.tgz", + "integrity": "sha512-NI7KGfQ6gwNFN0Hor3vytYW3iRfMMaivGEuxcADOOfBCx/kqwXE8IfHFxEcxSUkxCYf38COLKYd9EMYZghqaUA==", "peerDependencies": { - "react": "^16.8.3 || ^17" + "react": "^16.8.3 || ^17 || ^18" } }, "node_modules/react-tag-autocomplete": { @@ -42726,9 +42726,9 @@ } }, "react-swipeable": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/react-swipeable/-/react-swipeable-6.2.0.tgz", - "integrity": "sha512-nWQ8dEM8e/uswZLSIkXUsAnQmnX4MTcryOHBQIQYRMJFDpgDBSiVbKsz/BZVCIScF4NtJh16oyxwaNOepR6xSw==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/react-swipeable/-/react-swipeable-7.0.0.tgz", + "integrity": "sha512-NI7KGfQ6gwNFN0Hor3vytYW3iRfMMaivGEuxcADOOfBCx/kqwXE8IfHFxEcxSUkxCYf38COLKYd9EMYZghqaUA==", "requires": {} }, "react-tag-autocomplete": { diff --git a/package.json b/package.json index 49fae947..90dabbe2 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "react-leaflet": "^4.0.0", "react-redux": "^8.0.0", "react-router-dom": "^6.3.0", - "react-swipeable": "^6.2.0", + "react-swipeable": "^7.0.0", "react-tag-autocomplete": "^6.3.0", "reactstrap": "^9.0.1", "redux": "^4.2.0", From d67b8c053087ae742568958e905fdb423e286713 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 19 Jul 2022 18:45:18 +0200 Subject: [PATCH 4/4] Recovered --force on npm ci, as some components still do not officially suport react 18 --- .github/workflows/deploy-preview.yml | 2 +- .github/workflows/publish-release.yml | 2 +- Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml index b958cc37..76b02a48 100644 --- a/.github/workflows/deploy-preview.yml +++ b/.github/workflows/deploy-preview.yml @@ -19,7 +19,7 @@ jobs: node-version: 16.15 - name: Build run: | - npm ci && \ + npm ci --force && \ node ./scripts/set-homepage.js /shlink-web-client/${GITHUB_HEAD_REF#refs/heads/} && \ rm src/service-worker.ts && \ npm run build diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 1ab257a4..52d82e65 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -16,7 +16,7 @@ jobs: with: node-version: 16.15 - name: Generate release assets - run: npm ci && VERSION=${GITHUB_REF#refs/tags/v} npm run build:dist + run: npm ci --force && VERSION=${GITHUB_REF#refs/tags/v} npm run build:dist - name: Publish release with assets uses: docker://antonyurchenko/git-release:latest env: diff --git a/Dockerfile b/Dockerfile index d907daa8..c6ce8170 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM node:16.15-alpine as node COPY . /shlink-web-client ARG VERSION="latest" ENV VERSION ${VERSION} -RUN cd /shlink-web-client && npm ci && NODE_ENV=production npm run build +RUN cd /shlink-web-client && npm ci --force && NODE_ENV=production npm run build FROM nginx:1.21-alpine LABEL maintainer="Alejandro Celaya "