merge v3 into v-3/beta-color-changes

reown-com · Sep 7, 2023 · 23a70d0 · 23a70d0
2 parents c9c1dda + 2bf7e57
commit 23a70d0
Show file tree

Hide file tree

Showing 33 changed files with 282 additions and 198 deletions.
diff --git a/apps/gallery/package.json b/apps/gallery/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apps/gallery",
-  "version": "3.0.0-73ed03f2",
+  "version": "3.0.0-924c61f0",
   "private": true,
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
-    "@web3modal/ui": "3.0.0-73ed03f2",
+    "@web3modal/ui": "3.0.0-924c61f0",
     "lit": "2.8.0",
     "storybook": "7.4.0"
   },

diff --git a/apps/gallery/utils/PresetUtils.ts b/apps/gallery/utils/PresetUtils.ts
@@ -20,7 +20,6 @@ import type {
   LogoType,
   PlacementType,
   SpacingType,
-  TagLabelType,
   TagType,
   TextAlign,
   TextType,
@@ -261,9 +260,9 @@ export const accountEntryOptions: AccountEntryType[] = ['icon', 'image']
 
 export const themeOptions: ThemeType[] = ['dark', 'light']
 
-export const tagLabelOptions: TagLabelType[] = ['get wallet', 'installed', 'qr code', 'recent']
-
 export const iconBoxBorderOptions: IconBoxBorderType[] = [
   'wui-color-bg-125',
   'wui-overlay-accent-010'
 ]
+
+export const tagLabelOptions = ['get wallet', 'installed', 'qr code', 'recent']
diff --git a/apps/laboratory/package.json b/apps/laboratory/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apps/laboratory",
-  "version": "3.0.0-73ed03f2",
+  "version": "3.0.0-924c61f0",
   "private": true,
   "scripts": {
     "dev:laboratory": "next dev",
@@ -11,12 +11,12 @@
     "@chakra-ui/react": "2.8.0",
     "@emotion/react": "11.11.1",
     "@emotion/styled": "11.11.0",
-    "@sentry/browser": "7.67.0",
-    "@sentry/react": "7.67.0",
-    "@web3modal/wagmi": "3.0.0-73ed03f2",
+    "@sentry/browser": "7.68.0",
+    "@sentry/react": "7.68.0",
+    "@web3modal/wagmi": "3.0.0-924c61f0",
     "framer-motion": "10.16.4",
     "next": "13.4.19",
-    "react-icons": "4.10.1",
+    "react-icons": "4.11.0",
     "valtio": "1.11.2"
   }
 }
diff --git a/apps/laboratory/src/pages/index.tsx b/apps/laboratory/src/pages/index.tsx
@@ -46,8 +46,7 @@ export const wagmiConfig = defaultWagmiConfig({ chains, projectId, appName: 'Web
 export const modal = createWeb3Modal({
   wagmiConfig,
   projectId,
-  chains,
-  defaultChain: zora
+  chains
 })
 
 export default function HomePage() {

diff --git a/apps/laboratory/tsconfig.json b/apps/laboratory/tsconfig.json
@@ -2,8 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "jsx": "preserve",
-    "noEmit": true,
-    "incremental": true
+    "noEmit": true
   },
   "include": ["next-env.d.ts", "src"]
 }
diff --git a/dangerfile.ts b/dangerfile.ts
@@ -1,6 +1,7 @@
 /* eslint-disable no-await-in-loop */
 import { danger, fail, message, warn } from 'danger'
 import corePackageJson from './packages/core/package.json' assert { type: 'json' }
+import { VERSION as WAGMI_PACKAGE_VERSION } from './packages/wagmi/src/utils/constants'
 
 // -- Constants ---------------------------------------------------------------
 const TYPE_COMMENT = `// -- Types --------------------------------------------- //`
@@ -242,17 +243,9 @@ async function checkClientPackages() {
 checkClientPackages()
 
 // -- Check sdkVersion ------------------------------------------------------------
-async function checkSdkVersion() {
-  const wagmiConstantsPath = 'packages/wagmi/src/utils/constants.ts'
-  const wagmiConstants = all_files.find(f => f.includes(wagmiConstantsPath))
-
-  if (wagmiConstants) {
-    const diff = await diffForFile(wagmiConstants)
-    if (!diff?.after.includes(`VERSION = '${corePackageJson.version}'`)) {
-      fail(`VERSION in ${wagmiConstantsPath} does not match latest packages/core version`)
-    }
-  } else {
-    warn(`No version updates in ${wagmiConstantsPath} file`)
+function checkSdkVersion() {
+  if (WAGMI_PACKAGE_VERSION !== corePackageJson.version) {
+    fail(`VERSION in wagmi/utils/constants does't match core package.json version`)
   }
 }
 checkSdkVersion()
diff --git a/examples/react-wagmi/package.json b/examples/react-wagmi/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@examples/react-wagmi",
   "private": true,
-  "version": "3.0.0-73ed03f2",
+  "version": "3.0.0-924c61f0",
   "scripts": {
     "dev:example": "vite --port 3001",
     "build:examples": "vite build"
   },
   "dependencies": {
-    "@web3modal/wagmi": "3.0.0-73ed03f2"
+    "@web3modal/wagmi": "3.0.0-924c61f0"
   },
   "devDependencies": {
     "@vitejs/plugin-react": "4.0.4"

diff --git a/examples/vue-wagmi/package.json b/examples/vue-wagmi/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@examples/vue-wagmi",
   "private": true,
-  "version": "3.0.0-73ed03f2",
+  "version": "3.0.0-924c61f0",
   "scripts": {
     "dev:example": "vite --port 3002",
     "build:examples": "vite build"
   },
   "dependencies": {
-    "@web3modal/wagmi": "3.0.0-73ed03f2"
+    "@web3modal/wagmi": "3.0.0-924c61f0"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "4.3.4"

diff --git a/lerna.json b/lerna.json
@@ -9,6 +9,6 @@
     "apps/*",
     "examples/*"
   ],
-  "version": "3.0.0-73ed03f2",
+  "version": "3.0.0-924c61f0",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }