Skip to content

Commit

Permalink
chore: lib updates (#653)
Browse files Browse the repository at this point in the history
  • Loading branch information
martines3000 committed May 10, 2024
1 parent cfbcadb commit 18cd66e
Show file tree
Hide file tree
Showing 26 changed files with 23,844 additions and 22,333 deletions.
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
enable-pre-post-scripts=true

public-hoist-pattern[]=*@nextui-org/*

link-workspace-packages=true
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.10.0
v20.13.1
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
"editor.codeActionsOnSave": {
"source.fixAll": "always",
"source.organizeImports": "never"
}
},
"vitest.disableWorkspaceWarning": true
}
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM node:20.10.0-alpine3.18
FROM node:20.13.1-alpine3.18

WORKDIR /app

# Install pnpm
RUN npm i -g pnpm@8.11.0
RUN npm i -g pnpm@9.1.0

# Copy patches
COPY ./patches ./patches
Expand Down
5 changes: 3 additions & 2 deletions biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/1.6.2/schema.json",
"$schema": "https://biomejs.dev/schemas/1.7.3/schema.json",
"files": {
"include": [
"**/*.js",
Expand Down Expand Up @@ -44,7 +44,8 @@
},
"suspicious": {
"noExplicitAny": "off",
"noImplicitAnyLet": "off"
"noImplicitAnyLet": "off",
"noExportsInTest": "off"
},
"security": {
"noDangerouslySetInnerHtml": "off"
Expand Down
2 changes: 1 addition & 1 deletion configs/biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/1.6.2/schema.json",
"$schema": "https://biomejs.dev/schemas/1.7.3/schema.json",
"extends": ["../biome.json"],
"files": {
"ignore": ["**/packages/**", "**/libs/**"]
Expand Down
8 changes: 4 additions & 4 deletions libs/did-provider-key/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@
"@veramo/did-resolver": "6.0.0",
"@veramo/key-manager": "6.0.0",
"@veramo/kms-local": "6.0.0",
"@vitest/coverage-v8": "1.5.1",
"better-sqlite3": "^9.4.3",
"@vitest/coverage-v8": "1.6.0",
"better-sqlite3": "^9.6.0",
"jest-extended": "4.0.2",
"multiformats": "^13.1.0",
"tsup": "^8.0.2",
"typeorm": "^0.3.20",
"vite": "^5.2.10",
"vite": "^5.2.11",
"vite-tsconfig-paths": "^4.3.2",
"vitest": "1.5.1"
"vitest": "1.6.0"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions libs/extended-verification/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
"@veramo/did-provider-ethr": "6.0.0",
"@veramo/key-manager": "6.0.0",
"@veramo/kms-local": "6.0.0",
"@vitest/coverage-v8": "1.5.1",
"@vitest/coverage-v8": "1.6.0",
"desm": "^1.3.1",
"did-jwt": "^8.0.1",
"tsup": "^8.0.2",
"vite": "^5.2.10",
"vite": "^5.2.11",
"vite-tsconfig-paths": "^4.3.2",
"vitest": "1.5.1"
"vitest": "1.6.0"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions libs/oidc/client-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
"devDependencies": {
"@sphereon/ssi-types": "^0.11.0",
"@types/qs": "^6.9.12",
"@vitest/coverage-v8": "1.5.1",
"@vitest/coverage-v8": "1.6.0",
"jest-extended": "4.0.2",
"tsup": "^8.0.2",
"vite": "^5.2.10",
"vite": "^5.2.11",
"vite-tsconfig-paths": "^4.3.2",
"vitest": "1.5.1"
"vitest": "1.6.0"
},
"veramo": {
"pluginInterfaces": {
Expand Down
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,34 +40,34 @@
"@changesets/cli": "2.27.1"
},
"devDependencies": {
"@biomejs/biome": "1.6.2",
"@biomejs/biome": "1.7.3",
"@changesets/changelog-github": "0.5.0",
"@commitlint/cli": "^19.0.3",
"@commitlint/config-conventional": "^19.0.3",
"@nx/devkit": "18.0.7",
"@nx/jest": "18.0.7",
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"@nx/devkit": "19.0.2",
"@nx/jest": "19.0.2",
"@types/jest": "^29.5.12",
"@types/node": "^20.11.24",
"@types/node": "^20.12.11",
"concurrently": "^8.2.2",
"cross-env": "^7.0.3",
"execa": "^8.0.1",
"execa": "^9.0.2",
"husky": "^9.0.11",
"is-ci": "^3.0.1",
"jest-extended": "^4.0.2",
"lint-staged": "^15.2.2",
"nx": "18.0.7",
"nx-cloud": "^18.0.0",
"nx": "19.0.2",
"nx-cloud": "^18.0.1",
"rimraf": "^5.0.5",
"ts-node": "^10.9.2",
"typescript": "^5.4.2"
"typescript": "^5.4.5"
},
"packageManager": "pnpm@8.11.0",
"packageManager": "pnpm@9.1.0",
"engines": {
"node": ">=20.10.0"
"node": ">=20.13.1"
},
"volta": {
"node": "20.10.0",
"pnpm": "8.11.0"
"node": "20.13.1",
"pnpm": "9.1.0"
},
"pnpm": {
"patchedDependencies": {
Expand All @@ -77,10 +77,10 @@
"cross-fetch@4.0.0": "patches/cross-fetch@4.0.0.patch",
"@ceramicnetwork/common@2.30.0": "patches/@ceramicnetwork__common@2.30.0.patch",
"@changesets/assemble-release-plan@6.0.0": "patches/@changesets__assemble-release-plan@6.0.0.patch",
"ffjavascript@0.2.63": "patches/ffjavascript@0.2.63.patch",
"did-jwt@6.11.6": "patches/did-jwt@6.11.6.patch",
"web-worker@1.3.0": "patches/web-worker@1.3.0.patch",
"@iden3/js-jsonld-merklization@1.2.0": "patches/@iden3__js-jsonld-merklization@1.2.0.patch"
"@iden3/js-jsonld-merklization@1.2.0": "patches/@iden3__js-jsonld-merklization@1.2.0.patch",
"@metamask/snaps-sdk@3.2.0": "patches/@metamask__snaps-sdk@3.2.0.patch",
"did-jwt@8.0.4": "patches/did-jwt@8.0.4.patch"
},
"allowNonAppliedPatches": false
}
Expand Down
2 changes: 1 addition & 1 deletion packages/dapp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM blockchain-lab-um/masca:latest as builder

FROM node:20.10.0-alpine3.18
FROM node:20.13.1-alpine3.18

# Create app directory
RUN mkdir -p /app
Expand Down
54 changes: 27 additions & 27 deletions packages/dapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@
"@blockchain-lab-um/extended-verification": "0.2.0-beta.1",
"@blockchain-lab-um/masca-connector": "1.4.0-beta.1",
"@blockchain-lab-um/oidc-types": "0.1.0-beta.0",
"@headlessui/react": "^1.7.18",
"@heroicons/react": "^2.1.1",
"@nextui-org/react": "^2.2.10",
"@headlessui/react": "^2.0.3",
"@heroicons/react": "^2.1.3",
"@nextui-org/react": "^2.3.6",
"@radix-ui/react-dropdown-menu": "^2.0.6",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-switch": "^1.0.3",
"@radix-ui/react-toast": "^1.1.5",
"@react-oauth/google": "^0.12.1",
"@supabase/supabase-js": "^2.39.7",
"@tanstack/react-query": "^5.32.0",
"@tanstack/react-table": "^8.13.2",
"@supabase/supabase-js": "^2.43.1",
"@tanstack/react-query": "^5.35.1",
"@tanstack/react-table": "^8.16.0",
"@types/dompurify": "^3.0.5",
"@types/js-cookie": "^3.0.6",
"@types/jsdom": "^21.1.6",
Expand All @@ -52,17 +52,17 @@
"@vercel/og": "^0.6.2",
"@vercel/speed-insights": "^1.0.10",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.0",
"date-fns": "^3.3.1",
"clsx": "^2.1.1",
"date-fns": "^3.6.0",
"did-jwt-vc": "^3.2.13",
"did-resolver": "4.1.0",
"dompurify": "^3.0.9",
"dompurify": "^3.1.2",
"encoding": "^0.1.13",
"ens-did-resolver": "^1.0.4",
"ethers": "6.11.1",
"ethr-did-resolver": "10.1.5",
"file-saver": "^2.0.5",
"framer-motion": "^11.0.8",
"framer-motion": "^11.1.9",
"googleapis": "^133.0.0",
"headless-stepper": "^1.10.0",
"html5-qrcode": "^2.3.8",
Expand All @@ -71,39 +71,39 @@
"jsonwebtoken": "^9.0.2",
"lucide-react": "^0.367.0",
"luxon": "^3.4.4",
"marked": "^12.0.1",
"next": "14.1.3",
"next-intl": "3.9.4",
"marked": "^12.0.2",
"next": "14.2.3",
"next-intl": "3.13.0",
"next-sitemap": "^4.2.3",
"next-themes": "^0.2.1",
"next-themes": "^0.3.0",
"qrcode.react": "^3.1.0",
"qs": "^6.11.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-share": "^5.1.0",
"sharp": "^0.33.2",
"siwe": "^2.1.4",
"sharp": "^0.33.3",
"siwe": "^2.3.2",
"swr": "^2.2.5",
"tailwind-merge": "^2.2.2",
"tailwind-merge": "^2.3.0",
"tailwind-scrollbar": "^3.1.0",
"tailwindcss-animate": "^1.0.7",
"viem": "^2.9.23",
"wagmi": "^2.5.20",
"wagmi": "^2.8.5",
"zustand": "^4.5.2"
},
"devDependencies": {
"@svgr/webpack": "^8.1.0",
"@tanstack/react-query-devtools": "^5.28.4",
"@tanstack/react-query-devtools": "^5.35.1",
"@types/file-saver": "^2.0.7",
"@types/jsonwebtoken": "^9.0.6",
"@types/luxon": "^3.4.2",
"@types/qs": "^6.9.12",
"@types/react": "18.2.64",
"@types/react-dom": "18.2.21",
"autoprefixer": "^10.4.18",
"postcss": "^8.4.35",
"supabase": "^1.148.6",
"tailwindcss": "^3.4.1"
"@types/react": "18.3.1",
"@types/react-dom": "18.3.0",
"autoprefixer": "^10.4.19",
"postcss": "^8.4.38",
"supabase": "^1.165.0",
"tailwindcss": "^3.4.3"
},
"nx": {
"namedInputs": {
Expand Down
3 changes: 1 addition & 2 deletions packages/dapp/src/components/CampaignsDisplay/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ export const CampaignsDisplay = () => {
<p className="text-justify">{t('description')}</p>
</div>
{campaigns.map((campaign) => (
<div className="pb-2">
<div key={campaign.id} className="pb-2">
<CampaignDisplay
key={campaign.id}
campaign={campaign}
alreadyClaimed={
!!claimsData?.claims?.find(
Expand Down
11 changes: 6 additions & 5 deletions packages/dapp/src/components/EncryptedSessionDisplay/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { VerifiableCredential } from '@veramo/core';
import clsx from 'clsx';
import { useStepper } from 'headless-stepper';
import { useTranslations } from 'next-intl';
import { useEffect, useMemo, useState } from 'react';
import { Fragment, useEffect, useMemo, useState } from 'react';
import { useAccount } from 'wagmi';

import Button from '@/components/Button';
Expand Down Expand Up @@ -149,11 +149,12 @@ const EncryptedSessionDisplay = () => {
{...stepperInstance.stepperProps}
>
{stepperInstance.stepsProps?.map((_, index) => (
<>
<Fragment
// biome-ignore lint/suspicious/noArrayIndexKey:
key={index}
>
{index < 4 && (
<ol
// biome-ignore lint/suspicious/noArrayIndexKey:
key={index}
className={clsx(
index + 2 < stepperInstance.state.totalSteps && 'grow'
)}
Expand Down Expand Up @@ -202,7 +203,7 @@ const EncryptedSessionDisplay = () => {
</div>
</ol>
)}
</>
</Fragment>
))}
</nav>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useState } from 'react';
import { useTheme } from 'next-themes';

interface DropdownMenuItemProps {
children: Network;
network: Network;
handleBtn: (text: string) => void;
selected: boolean;
variant?:
Expand Down Expand Up @@ -55,7 +55,7 @@ const variantsSelectedElse: Record<string, string> = {
};

export default function NetworkDropdownMenuItem({
children,
network,
handleBtn,
selected,
variant = 'primary',
Expand All @@ -66,7 +66,7 @@ export default function NetworkDropdownMenuItem({
const handleMouseLeave = () => setIsActive(false);

const networkBackgroundColor =
resolvedTheme === 'dark' ? '#ffffffbf' : children.backgroundColor;
resolvedTheme === 'dark' ? '#ffffffbf' : network.backgroundColor;

return (
<DropdownMenuItem className="p-0">
Expand All @@ -77,15 +77,15 @@ export default function NetworkDropdownMenuItem({
isActive ? variants[variant] : null,
selected ? variantsSelected[variant] : variantsSelectedElse[variant]
)}
onClick={() => handleBtn(children.name as string)}
onClick={() => handleBtn(network.name as string)}
onMouseEnter={handleMouseEnter}
onMouseLeave={handleMouseLeave}
>
<div className="grid grid-cols-8 items-center">
<span className="col-span-2 flex items-center justify-center">
<Image
src={children.logo}
alt={`${children.name} logo`}
src={network.logo}
alt={`${network.name} logo`}
style={{
width: '50%',
height: 'auto',
Expand All @@ -97,7 +97,7 @@ export default function NetworkDropdownMenuItem({
/>
</span>
<span className="col-span-4 flex justify-start">
<div className="text-left">{children.name}</div>
<div className="text-left">{network.name}</div>
</span>
<span className="col-span-2">
{selected && <CheckIcon className="ml-3 h-4 w-4 lg:h-5 lg:w-5" />}
Expand Down
2 changes: 1 addition & 1 deletion packages/dapp/src/components/NetworkDropDownMenu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export default function NetworkDropDownMenu({
{filteredNetworks.map((item) => (
<NetworkDropdownMenuItem
key={item.name}
children={item}
network={item}
selected={selected === item.name}
handleBtn={setSelected}
variant={variant}
Expand Down
Loading

0 comments on commit 18cd66e

Please sign in to comment.