diff --git a/.github/workflows/npm_release_tchap.yml b/.github/workflows/npm_release_tchap.yml index 774adcef..49777583 100644 --- a/.github/workflows/npm_release_tchap.yml +++ b/.github/workflows/npm_release_tchap.yml @@ -24,12 +24,23 @@ jobs: # a build run: yarn install --pure-lockfile + - name: 🏷️ Extract version from tag + id: extract-version + run: | + TAG="${GITHUB_REF_NAME#toto-}" + if [[ "$TAG" == *"rc"* ]]; then + echo "dist_tag=next" >> $GITHUB_OUTPUT + else + echo "dist_tag=latest" >> $GITHUB_OUTPUT + fi + - name: 🚀 Publish to npm id: npm-publish uses: JS-DevTools/npm-publish@v3 with: token: ${{ secrets.TCHAP_NPM_TOKEN }} access: public + tag: ${{ steps.extract-version.outputs.dist_tag }} - name: 🧬 Create release uses: actions/create-release@v1 diff --git a/package.json b/package.json index 2c1b0c55..31f3b075 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "compound-web-tchap", - "version": "4.18.4", + "version": "1.1.0-rc1", "version_element": "8.3.4", "description": "Compound components for Tchap Web", "type": "module", @@ -74,7 +74,7 @@ "@types/react": "^19.0.0", "@typescript-eslint/eslint-plugin": "^8.0.0", "@typescript-eslint/parser": "^8.0.0", - "@vector-im/compound-design-tokens": "https://github.com/tchapgouv/compound-design-tokens.git#main", + "@vector-im/compound-design-tokens": "git+https://github.com/tchapgouv/compound-design-tokens.git#angelo-update6.10", "@vitejs/plugin-react": "^5.0.0", "@vitest/coverage-v8": "^4.0.0", "browserslist-to-esbuild": "^2.0.0", @@ -117,12 +117,13 @@ "@fontsource/inconsolata": "^5", "@fontsource/inter": "^5", "@types/react": "*", - "@vector-im/compound-design-tokens": ">=1.6.1 <7.0.0", + "@vector-im/compound-design-tokens": "*", "react": "^18 || ^19.0.0" }, "peerDependenciesMeta": { "@types/react": { "optional": true } - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/yarn.lock b/yarn.lock index 7404a745..9b8bd95f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1711,9 +1711,9 @@ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8" integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g== -"@vector-im/compound-design-tokens@https://github.com/tchapgouv/compound-design-tokens.git#main": - version "6.7.0" - resolved "https://github.com/tchapgouv/compound-design-tokens.git#cf16c8b05cc3f081b738e1c2861951497830a886" +"@vector-im/compound-design-tokens@git+https://github.com/tchapgouv/compound-design-tokens.git#angelo-update6.10": + version "6.10.0" + resolved "git+https://github.com/tchapgouv/compound-design-tokens.git#9202f026831d365725245008e63d5afd8aa11cc7" "@vitejs/plugin-react@^5.0.0": version "5.1.3" @@ -5720,7 +5720,16 @@ string-argv@~0.3.1: resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6" integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -5811,7 +5820,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -6535,7 +6551,16 @@ word-wrap@^1.2.5: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==