fix(carousel): fix @past3lle/carousel type bug (#106)

* fix(carousel): use data.length not global length * chore: use yarn 4 w/ node_modules - yarn files - remove glob resolutions from packages * chore: ignore .yarn * chore: lint * chore: format * chore: remove .yarn * chore: add .yarn folder * chore: format * chore: update github workflow scripts * chore: format * chore: update .prettierignore * chore: format * chore: update .gitignore and remove install-state --------- Co-authored-by: W3stside <[email protected]>
PAST3LLE · Sep 28, 2024 · 3106674 · 3106674
1 parent 2a65688
commit 3106674
Show file tree

Hide file tree

Showing 19 changed files with 33,321 additions and 23,873 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -22,7 +22,7 @@ jobs:
             clean: true
 
         - name: Install dependencies
-          run: yarn install --frozen-lockfile
+          run: yarn install --immutable
 
         - name: Build packages
           # skip building apps

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
 
       - name: Lint code
         run: yarn lint
@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
 
       - name: Build
         run: yarn build:packages

diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,5 @@ coverage
 /example/gatsby-example/
 /example/.parcel-cache
 /example/.cache
-*.tgz
+.yarn/*
+!.yarn/releases
diff --git a/.prettierignore b/.prettierignore
@@ -3,6 +3,7 @@
 .DS_Store
 
 node_modules
+.yarn
 
 .parcel-cache
 .cache
@@ -27,6 +28,7 @@ tsconfig.json
 tsconfig.*.json
 tsconfig.tsbuildinfo
 version.json
+*.gz
 
 .eslintrc.json
 

diff --git a/.yarn/releases/yarn-4.5.0.cjs b/.yarn/releases/yarn-4.5.0.cjs
diff --git a/.yarnrc b/.yarnrc
@@ -0,0 +1,5 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+yarn-path ".yarn/releases/yarn-1.22.22.cjs"
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,2 @@
+yarnPath: .yarn/releases/yarn-4.5.0.cjs
+nodeLinker: node-modules
diff --git a/package.json b/package.json
@@ -41,35 +41,32 @@
     "version:update": "node scripts/updateVersions.mjs"
   },
   "devDependencies": {
+    "@babel/cli": "^7.20.7",
+    "@babel/preset-env": "^7.20.2",
     "@babel/preset-typescript": "^7.18.6",
     "@trivago/prettier-plugin-sort-imports": "^4.0.0",
     "@types/jest": "^29.4.0",
     "@typescript-eslint/eslint-plugin": "^5.48.2",
     "@typescript-eslint/parser": "^5.48.2",
-    "glob": "^10.3.10",
     "eslint": "^8.32.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
+    "glob": "^10.3.10",
     "is-ci": "^3.0.1",
     "jest": "^29.4.0",
     "lerna": "^6.4.1",
     "prettier": "^2.8.3",
     "ts-jest": "^29.0.5",
-    "typescript": "^5.2.2",
-    "@babel/cli": "^7.20.7",
-    "@babel/preset-env": "^7.20.2"
+    "typescript": "^5.2.2"
   },
-  "dependencies": {},
   "resolutions": {
     "@tanstack/react-query": "^5.x",
-    "**/*/@tanstack/react-query": "^5.x",
-    "**/*/viem": ">=2.10.0 < 3",
     "viem": ">=2.10.0 < 3",
-    "**/*/wagmi": ">=2.5.5 < 3",
     "wagmi": ">=2.5.5 < 3"
   },
   "workspaces": [
     "packages/*",
     "apps/*"
-  ]
+  ],
+  "packageManager": "[email protected]"
 }
diff --git a/packages/carousel/src/components/ButtonCarousel.tsx b/packages/carousel/src/components/ButtonCarousel.tsx
@@ -98,7 +98,7 @@ export default function ButtonCarousel<D extends any[]>({
             onPrev={onPrevious}
             onNext={onNext}
           >
-            {children({ index, defaultImageTransforms, isLast: index === length - 1 })}
+            {children({ index, defaultImageTransforms, isLast: index === data.length - 1 })}
           </CarouselItem>
         )
       })}

diff --git a/packages/forge-cli/package.json b/packages/forge-cli/package.json
@@ -15,9 +15,7 @@
   "author": "pastelle",
   "homepage": "https://github.com/past3lle/monorepo/tree/main/packages/forge-cli#readme",
   "license": "MIT",
-  "bin": {
-    "forge-cli": "./bin/forge-cli.js"
-  },
+  "bin": "./bin/forge-cli.js",
   "type": "commonjs",
   "main": "dist/index.js",
   "module": "dist/forge-cli.esm.js",

diff --git a/packages/forge-web3/package.json b/packages/forge-web3/package.json
@@ -96,10 +96,7 @@
     "wagmi": "^2.12.8"
   },
   "resolutions": {
-    "**/*/@tanstack/react-query": "^5.x",
-    "**/*/viem": ">=2.10.0 < 3",
     "viem": ">=2.10.0 < 3",
-    "**/*/wagmi": ">=2.5.5 < 3",
     "wagmi": ">=2.5.5 < 3"
   },
   "browserslist": {

diff --git a/packages/skillforge-widget/package.json b/packages/skillforge-widget/package.json
@@ -102,10 +102,7 @@
     "polished": "^4.2.2"
   },
   "resolutions": {
-    "**/*/@tanstack/react-query": "^5.x",
-    "**/*/viem": ">=2.10.0 < 3",
     "viem": ">=2.10.0 < 3",
-    "**/*/wagmi": ">=2.5.5 < 3",
     "wagmi": ">=2.5.5 < 3"
   },
   "bugs": {

diff --git a/packages/skillforge-widget/src/components/Panels/ActiveSkillPanel/index.tsx b/packages/skillforge-widget/src/components/Panels/ActiveSkillPanel/index.tsx
@@ -66,7 +66,7 @@ export function ActiveSkillPanel() {
       deps: activeSkill?.properties?.dependencies || [],
       get cardColour() {
         return isLocked
-          ? 'black' || baseTheme.gradients.lockedSkill
+          ? baseTheme.gradients.lockedSkill || BLACK
           : this.rarity
           ? baseTheme.gradients.unlockedSkill + `${customTheme.rarity[this.rarity].backgroundColor})`
           : null

diff --git a/packages/wagmi-connectors/package.json b/packages/wagmi-connectors/package.json
@@ -143,10 +143,7 @@
     "wagmi": "^2.12.8"
   },
   "resolutions": {
-    "**/*/@tanstack/react-query": "^5.x",
-    "**/*/viem": ">=2.10.0 < 3",
     "viem": ">=2.10.0 < 3",
-    "**/*/wagmi": ">=2.5.5 < 3",
     "wagmi": ">=2.5.5 < 3"
   },
   "browserslist": {

diff --git a/packages/web3-modal/package.json b/packages/web3-modal/package.json
@@ -110,11 +110,8 @@
     "wagmi": ">=2.5.5 < 3"
   },
   "resolutions": {
-    "**/*/@tanstack/react-query": "^5.x",
     "@tanstack/react-query": "^5.x",
-    "**/*/viem": ">=2.10.0 < 3",
     "viem": ">=2.10.0 < 3",
-    "**/*/wagmi": ">=2.5.5 < 3",
     "wagmi": ">=2.5.5 < 3",
     "styled-components": "^5.x"
   },

diff --git a/packages/web3-modal/src/fixtures/connectorsAndPlugins.ts b/packages/web3-modal/src/fixtures/connectorsAndPlugins.ts
@@ -61,7 +61,7 @@ export const INJECTED_CONNECTORS = [
           if (IS_SERVER) return undefined
           try {
             const provider = window?.tally
-            if (!provider) devWarn('Connector', 'Taho' || 'unknown', 'not found!')
+            if (!provider) devWarn('Connector', 'Taho', 'not found!')
             return provider
           } catch (error) {
             return undefined

diff --git a/packages/web3-modal/src/hooks/misc/useTimeout.ts b/packages/web3-modal/src/hooks/misc/useTimeout.ts
@@ -28,7 +28,7 @@ export function useTimeoutClearingError(
   }, [error, time])
 
   const resetError = useCallback(() => {
-    clearTimeout(timeout)
+    if (timeout) clearTimeout(timeout)
     setShowError(false)
     callback?.(null)
     // eslint-disable-next-line react-hooks/exhaustive-deps

diff --git a/packages/web3-modal/src/theme/baseTheme.ts b/packages/web3-modal/src/theme/baseTheme.ts
@@ -170,7 +170,7 @@ export const PstlModalTheme: ThemeByModes<PstlModalThemeExtension> = {
             font: {
               color: 'ghostwhite'
             },
-            background: 'black' || '#000000de'
+            background: 'black' // was --> || '#000000de'
           },
           helpers: {
             show: true,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		yarnPath: .yarn/releases/yarn-4.5.0.cjs
		nodeLinker: node-modules