From 181faba3a6e40daed7ee47c5a925eabfe26838b7 Mon Sep 17 00:00:00 2001 From: Felicio Mununga Date: Thu, 29 Jun 2023 11:04:52 +0100 Subject: [PATCH] [*] prepare packages for release (#432) * upgrade changeset * fix eslint config name * remove publishConfig * remove changesets * tmp: scope * Revert "remove publishConfig" This reverts commit 3a085e3f8571175a6e3b84124aad39650d520e7f. * add publishConfig * v0.0.0 * remove private flag * tmp: scope * docs(changeset): changeset config * changeset commit config * docs(changeset): changeset config * RELEASING: Releasing 6 package(s) Releases: @felicio/eslint-config@0.1.3 @felicio/components@0.0.4 @felicio/js@0.2.3 @felicio/colors@0.0.4 @felicio/icons@0.0.4 website@0.1.3 [skip ci] * rm changeset * fix eslint config deps * docs(changeset): fix lint config deps * RELEASING: Releasing 1 package(s) Releases: @felicio/eslint-config@0.1.4 [skip ci] * upgrade @tamagui * upgrade react-native-web * update yarn.lock * use Presable instead of Stack for styled button * fix defaultVariants.blurred after upgrade * update changeset config * release * add tamagui deps * release * release * export popover * release * revert @status-im scope * rm version from root package.json * rm changelogs * revet package versions * add changeset --- .changeset/breezy-zebras-invite.md | 5 - .changeset/itchy-apes-sin.md | 5 - .changeset/thin-humans-cover.md | 9 + apps/mobile/package.json | 2 +- apps/web/package.json | 4 +- apps/website/package.json | 12 +- package.json | 4 +- packages/colors/package.json | 4 +- packages/components/package.json | 25 +- packages/components/src/button/button.tsx | 11 +- .../src/dynamic-button/dynamic-button.tsx | 12 +- .../src/hooks/use-pressable-colors.tsx | 5 +- .../src/icon-button/icon-button.tsx | 10 +- packages/components/src/index.tsx | 1 + packages/components/src/input/input.tsx | 8 +- .../src/react-button/react-button.tsx | 15 +- packages/components/src/tabs/tabs.tsx | 3 +- packages/eslint-config/package.json | 7 +- packages/icons/package.json | 9 +- yarn.lock | 2560 +++++++++-------- 20 files changed, 1395 insertions(+), 1316 deletions(-) delete mode 100644 .changeset/breezy-zebras-invite.md delete mode 100644 .changeset/itchy-apes-sin.md create mode 100644 .changeset/thin-humans-cover.md diff --git a/.changeset/breezy-zebras-invite.md b/.changeset/breezy-zebras-invite.md deleted file mode 100644 index ad86e470..00000000 --- a/.changeset/breezy-zebras-invite.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@status-im/js': patch ---- - -get peer based on environment diff --git a/.changeset/itchy-apes-sin.md b/.changeset/itchy-apes-sin.md deleted file mode 100644 index da4d052a..00000000 --- a/.changeset/itchy-apes-sin.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@status-im/js': patch ---- - -use built-in crypto for pbkdf2 diff --git a/.changeset/thin-humans-cover.md b/.changeset/thin-humans-cover.md new file mode 100644 index 00000000..8efb1d14 --- /dev/null +++ b/.changeset/thin-humans-cover.md @@ -0,0 +1,9 @@ +--- +'@status-im/eslint-config': minor +'@status-im/components': minor +'@status-im/js': minor +'@status-im/colors': minor +'@status-im/icons': minor +--- + +prepare packages for release diff --git a/apps/mobile/package.json b/apps/mobile/package.json index a8a7c5c7..58bb0bfd 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -34,7 +34,7 @@ "devDependencies": { "@babel/core": "^7.17.9", "@expo/metro-config": "^0.3.21", - "@tamagui/babel-plugin": "1.11.1", + "@tamagui/babel-plugin": "1.36.4", "@types/react-native": "~0.70.6", "babel-plugin-module-resolver": "^4.1.0", "babel-plugin-transform-inline-environment-variables": "^0.4.4", diff --git a/apps/web/package.json b/apps/web/package.json index 8a34f007..7074ed43 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -13,14 +13,14 @@ "dependencies": { "@status-im/components": "*", "@status-im/icons": "*", - "@tamagui/core": "1.11.1", + "@tamagui/core": "1.36.4", "react": "^18.2.0", "react-dom": "^18.2.0", "react-native-web": "^0.18.12", "use-resize-observer": "^9.1.0" }, "devDependencies": { - "@tamagui/vite-plugin": "1.11.1", + "@tamagui/vite-plugin": "1.36.4", "@types/react": "^18.0.33", "@types/react-dom": "^18.0.11", "@vitejs/plugin-react-swc": "^3.2.0", diff --git a/apps/website/package.json b/apps/website/package.json index b1e63223..43208fe6 100644 --- a/apps/website/package.json +++ b/apps/website/package.json @@ -21,13 +21,13 @@ "@status-im/components": "*", "@status-im/icons": "*", "@status-im/js": "*", - "@tamagui/next-theme": "1.11.1", - "@visx/visx": "^2.18.0", + "@tamagui/next-theme": "1.36.4", + "@tanstack/react-query": "^4.29.7", "@vercel/og": "^0.5.4", + "@tryghost/content-api": "^1.11.13", + "@visx/visx": "^2.18.0", "class-variance-authority": "^0.6.0", "contentlayer": "^0.3.3", - "@tanstack/react-query": "^4.29.7", - "@tryghost/content-api": "^1.11.13", "d3-array": "^3.2.3", "d3-time-format": "^4.1.0", "date-fns": "^2.30.0", @@ -38,7 +38,7 @@ "qrcode.react": "^3.1.0", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-native-web": "^0.18.12", + "react-native-web": "^0.19.5", "tinykeys": "^1.4.0", "title": "^3.5.3", "github-slugger": "^2.0.0", @@ -48,7 +48,7 @@ "devDependencies": { "@achingbrain/ssdp": "^4.0.1", "@tailwindcss/typography": "^0.5.9", - "@tamagui/next-plugin": "1.11.1", + "@tamagui/next-plugin": "1.36.4", "@types/d3-array": "^3.0.4", "@types/d3-time-format": "^4.0.0", "@types/highlight-words-core": "^1.2.1", diff --git a/package.json b/package.json index a3b8b21a..ef5e0b33 100644 --- a/package.json +++ b/package.json @@ -33,10 +33,10 @@ "@types/react-dom": "18.0.11" }, "devDependencies": { - "@changesets/cli": "^2.23.0", + "@changesets/cli": "^2.26.2", + "@status-im/eslint-config": "*", "@tsconfig/strictest": "^2.0.0", "@types/prettier": "^2.7.2", - "@status-im/eslint-config": "*", "husky": "^8.0.3", "lint-staged": "^13.2.0", "patch-package": "^6.5.1", diff --git a/packages/colors/package.json b/packages/colors/package.json index ae6eb0ed..1a4f40ec 100644 --- a/packages/colors/package.json +++ b/packages/colors/package.json @@ -1,7 +1,6 @@ { "name": "@status-im/colors", "version": "0.0.1", - "private": true, "files": [ "types", "dist", @@ -41,6 +40,9 @@ "vite": "^4.1.4", "vite-node": "^0.29.7" }, + "publishConfig": { + "access": "public" + }, "lint-staged": { "*.{ts,tsx,js,jsx,mjs}": [ "eslint", diff --git a/packages/components/package.json b/packages/components/package.json index 58334e21..37626c0b 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -4,7 +4,6 @@ "sideEffects": [ "*.css" ], - "private": true, "#module": "./src/index.tsx", "types": "./src/index.tsx", "main": "./dist/index.js", @@ -40,18 +39,19 @@ "@radix-ui/react-tooltip": "^1.0.5", "@status-im/colors": "*", "@status-im/icons": "*", - "@tamagui/animations-css": "1.11.1", - "@tamagui/animations-react-native": "1.11.1", - "@tamagui/core": "1.11.1", - "@tamagui/font-inter": "1.11.1", - "@tamagui/react-native-media-driver": "1.11.1", - "@tamagui/shorthands": "1.11.1", - "@tamagui/theme-base": "1.11.1", + "@tamagui/animations-css": "1.36.4", + "@tamagui/animations-react-native": "1.36.4", + "@tamagui/core": "1.36.4", + "@tamagui/font-inter": "1.36.4", + "@tamagui/react-native-media-driver": "1.36.4", + "@tamagui/shorthands": "1.36.4", + "@tamagui/theme-base": "1.36.4", + "@tamagui/web": "1.36.4", "date-fns": "^2.30.0", "expo-blur": "^12.2.2", "expo-linear-gradient": "^12.1.2", "react-day-picker": "^8.7.1", - "tamagui": "1.11.1", + "tamagui": "1.36.4", "zustand": "^4.3.7" }, "devDependencies": { @@ -62,18 +62,21 @@ "@storybook/react": "7.0.2", "@storybook/react-vite": "7.0.2", "@storybook/testing-library": "^0.1.0", - "@tamagui/vite-plugin": "1.11.1", + "@tamagui/vite-plugin": "1.36.4", "@vitejs/plugin-react-swc": "^3.2.0", "@status-im/eslint-config": "*", "react": "^18.2.0", "react-dom": "^18.2.0", "react-native-svg": "^13.8.0", - "react-native-web": "^0.18.12", + "react-native-web": "^0.19.5", "storybook": "7.0.2", "storybook-addon-designs": "7.0.0-beta.2", "storybook-dark-mode": "^3.0.0", "vite": "^4.2.1" }, + "publishConfig": { + "access": "public" + }, "lint-staged": { "*.{ts,tsx,js,jsx,mjs}": [ "eslint", diff --git a/packages/components/src/button/button.tsx b/packages/components/src/button/button.tsx index ac502b08..2b766d62 100644 --- a/packages/components/src/button/button.tsx +++ b/packages/components/src/button/button.tsx @@ -1,13 +1,14 @@ import { cloneElement, forwardRef } from 'react' -import { Stack, styled } from '@tamagui/core' +import { styled } from '@tamagui/core' +import { Pressable } from 'react-native' import { Text } from '../text' import type { TextProps } from '../text' import type { GetVariants, MapVariant, PressableProps } from '../types' -import type { StackProps } from '@tamagui/core' import type { Ref } from 'react' +import type { View } from 'react-native' type Variants = GetVariants @@ -51,7 +52,7 @@ const textSizes: Record, TextProps['size']> = { '24': 13, } -const Button = (props: Props, ref: Ref) => { +const Button = (props: Props, ref: Ref) => { const { variant = 'primary', shape = 'default', @@ -71,7 +72,7 @@ const Button = (props: Props, ref: Ref) => { return ( @@ -17,8 +19,8 @@ type Props = PressableProps & { count: number } -const DynamicButton = (props: Props, ref: Ref) => { - const { type, count, ...pressableProps } = props +const DynamicButton = (props: Props, ref: Ref) => { + const { type, count, ...buttonProps } = props const color: ColorTokens = '$white-100' const showCount = Boolean(count) @@ -26,7 +28,7 @@ const DynamicButton = (props: Props, ref: Ref) => { return (