From 799cf1e7feca1cb28157811e176edecbd16b0981 Mon Sep 17 00:00:00 2001 From: JF-Cozy Date: Wed, 5 Nov 2025 13:13:42 +0100 Subject: [PATCH 1/2] feat: Add cozy-ui-plus BREAKING CHANGE: You must have `cozy-ui-plus >= 2.1.0` --- package.json | 2 + src/components/UnlockForm.jsx | 2 +- yarn.lock | 69 ++++++++++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 12765dd..d9faa74 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "cozy-flags": "2.8.6", "cozy-intent": "2.13.1", "cozy-ui": "93.1.1", + "cozy-ui-plus": "^2.1.0", "eslint-config-cozy-app": "1.6.0", "jest": "26.2.2", "react": "16.14.0", @@ -88,6 +89,7 @@ "cozy-flags": "^2.8.6", "cozy-intent": "^2.0.2", "cozy-ui": "^93.1.1", + "cozy-ui-plus": ">=2.1.0", "react": "^16.9.0", "react-dom": "^16.9.0" } diff --git a/src/components/UnlockForm.jsx b/src/components/UnlockForm.jsx index 5caa980..08d13de 100644 --- a/src/components/UnlockForm.jsx +++ b/src/components/UnlockForm.jsx @@ -3,7 +3,7 @@ import get from 'lodash/get' import PropTypes from 'prop-types' import flag from 'cozy-flags' -import { AuthentificationDialog } from 'cozy-ui/transpiled/react/CozyDialogs' +import AuthentificationDialog from 'cozy-ui-plus/dist/Dialogs/AuthentificationDialog' import { useVaultClient } from './VaultContext' import { useClient } from 'cozy-client' diff --git a/yarn.lock b/yarn.lock index 26ad08d..e05987e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1318,6 +1318,11 @@ dependencies: regenerator-runtime "^0.13.11" +"@babel/runtime@^7.10.0", "@babel/runtime@^7.19.4": + version "7.28.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326" + integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ== + "@babel/template@^7.16.7", "@babel/template@^7.22.5", "@babel/template@^7.3.3": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec" @@ -3451,6 +3456,11 @@ classnames@^2.2.5, classnames@^2.2.6: resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924" integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw== +classnames@^2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b" + integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow== + clean-stack@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" @@ -3879,6 +3889,22 @@ cozy-stack-client@^40.2.1: mime "^2.4.0" qs "^6.7.0" +cozy-ui-plus@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cozy-ui-plus/-/cozy-ui-plus-2.1.0.tgz#cf01f3d9e0ead4a6763f9d3da84e17bd247350c2" + integrity sha512-d0vvXKMtNpHcrjSuAiTPLWVnK0R5DZ3C81VqSjDYSe56VwAe6DwsVOkUEShh/OhqXopUF1xsczXUjHNaq2BOXQ== + dependencies: + classnames "^2.5.1" + cozy-interapp "^0.5.4" + filesize "8.0.7" + final-form "4.20.9" + final-form-arrays "3.1.0" + lodash "^4.17.21" + mime-types "2.1.35" + react-final-form "6.5.9" + react-final-form-arrays "3.1.4" + rooks "7.14.1" + cozy-ui@93.1.1: version "93.1.1" resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-93.1.1.tgz#a09512a53a55a0b8ecab21e0572bbd12678ad128" @@ -4871,7 +4897,7 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== -fast-deep-equal@^3.1.1: +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== @@ -4990,6 +5016,18 @@ filter-obj@^1.1.0: resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b" integrity sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ== +final-form-arrays@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/final-form-arrays/-/final-form-arrays-3.1.0.tgz#8bdace2fccedd61f3cbd032ae429813ae5ea37af" + integrity sha512-TWBvun+AopgBLw9zfTFHBllnKMVNEwCEyDawphPuBGGqNsuhGzhT7yewHys64KFFwzIs6KEteGLpKOwvTQEscQ== + +final-form@4.20.9: + version "4.20.9" + resolved "https://registry.yarnpkg.com/final-form/-/final-form-4.20.9.tgz#647b459f8c504d77ec8f6e280015ab172982af2f" + integrity sha512-shA1X/7v8RmukWMNRHx0l7+Bm41hOivY78IvOiBrPVHjyWFIyqqIEMCz7yTVRc9Ea+EU4WkZ5r4MH6whSo5taw== + dependencies: + "@babel/runtime" "^7.10.0" + find-cache-dir@^3.3.1: version "3.3.2" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" @@ -9007,6 +9045,20 @@ react-fast-compare@^3.0.1: resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz#929a97a532304ce9fee4bcae44234f1ce2c21d49" integrity sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ== +react-final-form-arrays@3.1.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/react-final-form-arrays/-/react-final-form-arrays-3.1.4.tgz#2744941d8fd200fc648481022e515588f60bbac3" + integrity sha512-siVFAolUAe29rMR6u8VwepoysUcUdh6MLV2OWnCtKpsPRUdT9VUgECjAPaVMAH2GROZNiVB9On1H9MMrm9gdpg== + dependencies: + "@babel/runtime" "^7.19.4" + +react-final-form@6.5.9: + version "6.5.9" + resolved "https://registry.yarnpkg.com/react-final-form/-/react-final-form-6.5.9.tgz#644797d4c122801b37b58a76c87761547411190b" + integrity sha512-x3XYvozolECp3nIjly+4QqxdjSSWfcnpGEL5K8OBT6xmGrq5kBqbA6+/tOqoom9NwqIPPbxPNsOViFlbKgowbA== + dependencies: + "@babel/runtime" "^7.15.4" + react-input-autosize@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-3.0.0.tgz#6b5898c790d4478d69420b55441fcc31d5c50a85" @@ -9633,6 +9685,16 @@ rimraf@^3.0.0: dependencies: glob "^7.1.3" +rooks@7.14.1: + version "7.14.1" + resolved "https://registry.yarnpkg.com/rooks/-/rooks-7.14.1.tgz#f3660752c299da02eb6cc733c55f8270c3376a87" + integrity sha512-oPuLNGm3OaFm3WfZHzmDvJvRit8QrXGm9/Kn49Bz8lJUjkThSBtERWzuQ9wb5DveqrpUZvmNyBXjBE0KWVt13w== + dependencies: + fast-deep-equal "^3.1.3" + lodash.debounce "^4.0.8" + raf "^3.4.1" + use-sync-external-store "^1.2.0" + rooks@^5.11.2: version "5.14.1" resolved "https://registry.yarnpkg.com/rooks/-/rooks-5.14.1.tgz#424854e917efc951dd47c4ac9d9e0de5f7648a7e" @@ -11013,6 +11075,11 @@ use-sidecar@^1.1.2: detect-node-es "^1.1.0" tslib "^2.0.0" +use-sync-external-store@^1.2.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz#b174bfa65cb2b526732d9f2ac0a408027876f32d" + integrity sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w== + use@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" From 25ac26cfe5af51e46d726a655907b6c7429217dc Mon Sep 17 00:00:00 2001 From: JF-Cozy Date: Wed, 5 Nov 2025 13:42:57 +0100 Subject: [PATCH 2/2] chore: Replace travis by github actions --- .github/workflows/ci-cd.yml | 56 +++++++++++++++++++++++++++++++++++++ .travis.yml | 28 ------------------- 2 files changed, 56 insertions(+), 28 deletions(-) create mode 100644 .github/workflows/ci-cd.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml new file mode 100644 index 0000000..7896c20 --- /dev/null +++ b/.github/workflows/ci-cd.yml @@ -0,0 +1,56 @@ +name: CI/CD + +on: + pull_request: + push: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Setup Node.js + uses: actions/setup-node@v3 + with: + node-version: '14.16' + cache: 'yarn' + + - name: Install system dependencies + run: sudo apt-get install -y libsecret-1-dev + + - name: Install Yarn + run: | + curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.16.0 + export PATH="$HOME/.yarn/bin:$PATH" + + - name: Set python v3.10 + uses: actions/setup-python@v5 + with: + python-version: '3.10' + + - name: Install dependencies + run: yarn install --frozen-lockfile + + - name: Setup submodules + run: yarn setup:submodule + + - name: Lint + run: yarn lint + + - name: Build + run: yarn build + + - name: Test + run: yarn test + + - name: Publish to NPM + if: github.ref == 'refs/heads/master' + env: + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + run: yarn run semantic-release diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4ef82a2..0000000 --- a/.travis.yml +++ /dev/null @@ -1,28 +0,0 @@ -language: node_js -node_js: - - '14.16' -addons: - apt: - packages: - - libsecret-1-dev -cache: - yarn: true - directories: - - node_modules -before_install: - - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.16.0 - - export PATH="$HOME/.yarn/bin:$PATH" -script: - - set -e - - yarn setup:submodule - - yarn lint - - yarn build - - yarn test -deploy: - provider: script - skip_cleanup: true - script: - - yarn semantic-release -global: - env: - - secure: 'nBBPG+lGPNohjZabCO7V4tkTcYaUJysDVgVcWi++3xPe7JIL+LfOYuddV5h7oIcYpS0a+qy/VlZI4SSgh1/VzzXDgyWU3YC/bOjOajte8Z6KOEZ+2UDZZcMHjrAzjuXEhUgejLwppKz9GunSw0m6077sXJynv+xrwTvzFZVthjU+ueZ629fH2qNzgnha8RwSwQE2FgH+xW2SqVAo4EnaS8VD9nvxKA3HPFpRfaJGPkCLYbnqeocOfcCNimVIFbZ54OKUW7KRXAnNa2S/mNqExfX/HKplzb1vW9+hdp2zIBiJRbN+uF5Mq5/gs2EboJifZt8VNasJE0AAX5nPZG9F6ckVAhBM79wqwHBZqOpLmA6clq4QEtNRBP2e+uazeXqkY33enTWvT9KcSwXRl/tThD0zSHGdf0/ZtDINvmXAYGkOHjGBAymvXk/TVd4164skcmeP9WmpMA5c0m8eLkA32UMEheBP0RI6A5Wzl0+LQx2VmyAq+Ih0++a8mtnDBvUsnGPP+DVpnmC1CJ0YfypKmEI92X+F06qqMWrgioeq7t/WvFpMrgcLzYOHmWJwJgZVpYqwNvh0ocQOV35qsE3jHEhn2RRrdiTJd7nGkdL04WgRhvt7Kob1k0nLHm0zwBP/s4LzObavLFzdQJrGHkD6j3wUAD663/8TExUZWa0yjfo=' # NPM_TOKEN