From 76537a485a10c778f1059ed73b721420a6098e2e Mon Sep 17 00:00:00 2001
From: svub <>
Date: Sun, 6 Oct 2024 06:41:14 +0200
Subject: [PATCH] merged version issue
---
package-lock.json | 120 +++++++++++++++++++
package.json | 7 +-
packages/nextjs/components/Footer.tsx | 9 +-
packages/nextjs/components/Header.tsx | 9 +-
packages/secret-upload-contract/package.json | 4 +-
yarn.lock | 15 +--
6 files changed, 133 insertions(+), 31 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 5680e54..4459b87 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19467,6 +19467,126 @@
"optional": true
}
}
+ },
+ "packages/nextjs/node_modules/@next/swc-darwin-arm64": {
+ "version": "14.2.14",
+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.14.tgz",
+ "integrity": "sha512-bsxbSAUodM1cjYeA4o6y7sp9wslvwjSkWw57t8DtC8Zig8aG8V6r+Yc05/9mDzLKcybb6EN85k1rJDnMKBd9Gw==",
+ "cpu": [
+ "arm64"
+ ],
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "packages/nextjs/node_modules/@next/swc-darwin-x64": {
+ "version": "14.2.14",
+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.14.tgz",
+ "integrity": "sha512-cC9/I+0+SK5L1k9J8CInahduTVWGMXhQoXFeNvF0uNs3Bt1Ub0Azb8JzTU9vNCr0hnaMqiWu/Z0S1hfKc3+dww==",
+ "cpu": [
+ "x64"
+ ],
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "packages/nextjs/node_modules/@next/swc-linux-arm64-gnu": {
+ "version": "14.2.14",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.14.tgz",
+ "integrity": "sha512-RMLOdA2NU4O7w1PQ3Z9ft3PxD6Htl4uB2TJpocm+4jcllHySPkFaUIFacQ3Jekcg6w+LBaFvjSPthZHiPmiAUg==",
+ "cpu": [
+ "arm64"
+ ],
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "packages/nextjs/node_modules/@next/swc-linux-arm64-musl": {
+ "version": "14.2.14",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.14.tgz",
+ "integrity": "sha512-WgLOA4hT9EIP7jhlkPnvz49iSOMdZgDJVvbpb8WWzJv5wBD07M2wdJXLkDYIpZmCFfo/wPqFsFR4JS4V9KkQ2A==",
+ "cpu": [
+ "arm64"
+ ],
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "packages/nextjs/node_modules/@next/swc-linux-x64-musl": {
+ "version": "14.2.14",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.14.tgz",
+ "integrity": "sha512-7TcQCvLQ/hKfQRgjxMN4TZ2BRB0P7HwrGAYL+p+m3u3XcKTraUFerVbV3jkNZNwDeQDa8zdxkKkw2els/S5onQ==",
+ "cpu": [
+ "x64"
+ ],
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "packages/nextjs/node_modules/@next/swc-win32-arm64-msvc": {
+ "version": "14.2.14",
+ "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.14.tgz",
+ "integrity": "sha512-8i0Ou5XjTLEje0oj0JiI0Xo9L/93ghFtAUYZ24jARSeTMXLUx8yFIdhS55mTExq5Tj4/dC2fJuaT4e3ySvXU1A==",
+ "cpu": [
+ "arm64"
+ ],
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "packages/nextjs/node_modules/@next/swc-win32-ia32-msvc": {
+ "version": "14.2.14",
+ "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.14.tgz",
+ "integrity": "sha512-2u2XcSaDEOj+96eXpyjHjtVPLhkAFw2nlaz83EPeuK4obF+HmtDJHqgR1dZB7Gb6V/d55FL26/lYVd0TwMgcOQ==",
+ "cpu": [
+ "ia32"
+ ],
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "packages/nextjs/node_modules/@next/swc-win32-x64-msvc": {
+ "version": "14.2.14",
+ "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.14.tgz",
+ "integrity": "sha512-MZom+OvZ1NZxuRovKt1ApevjiUJTcU2PmdJKL66xUPaJeRywnbGGRWUlaAOwunD6dX+pm83vj979NTC8QXjGWg==",
+ "cpu": [
+ "x64"
+ ],
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
}
}
}
diff --git a/package.json b/package.json
index 8e2f51f..c193749 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
"packages/*"
],
"engines": {
- "node": "20"
+ "node": ">=18.18.0"
},
"devDependencies": {
"husky": "~8.0.3",
@@ -43,8 +43,5 @@
"secret:clean:instantiateContract": "yarn workspace secret-instantiate-contract clean",
"secret:start:instantiateContract": "yarn workspace secret-instantiate-contract start"
},
- "packageManager": "yarn@4.2.2",
- "engines": {
- "node": ">=18.18.0"
- }
+ "packageManager": "yarn@4.2.2"
}
diff --git a/packages/nextjs/components/Footer.tsx b/packages/nextjs/components/Footer.tsx
index 92b3c62..7df3ee6 100644
--- a/packages/nextjs/components/Footer.tsx
+++ b/packages/nextjs/components/Footer.tsx
@@ -47,14 +47,14 @@ export const Footer = () => {
·
- Built with at
+ Forked with from
{
·
-
diff --git a/packages/nextjs/components/Header.tsx b/packages/nextjs/components/Header.tsx
index 22d8c40..9117fe3 100644
--- a/packages/nextjs/components/Header.tsx
+++ b/packages/nextjs/components/Header.tsx
@@ -1,10 +1,9 @@
"use client";
import React, { useCallback, useRef, useState } from "react";
-import Image from "next/image";
import Link from "next/link";
import { usePathname } from "next/navigation";
-import { Bars3Icon, BugAntIcon, MagnifyingGlassIcon } from "@heroicons/react/24/outline";
+import { ArrowLongRightIcon, Bars3Icon, BugAntIcon, MagnifyingGlassIcon } from "@heroicons/react/24/outline";
import { FaucetButton, RainbowKitCustomConnectButton } from "~~/components/scaffold-eth";
import { useOutsideClick } from "~~/hooks/scaffold-eth";
@@ -95,11 +94,11 @@ export const Header = () => {
- Scaffold-ETH
- Ethereum dev stack
+ Nunya.business
+ Receive business payments.
diff --git a/packages/secret-upload-contract/package.json b/packages/secret-upload-contract/package.json
index 93b12bc..8aa0253 100644
--- a/packages/secret-upload-contract/package.json
+++ b/packages/secret-upload-contract/package.json
@@ -9,9 +9,9 @@
"start": "yarn build && node ./dist/index.js"
},
"dependencies": {
+ "@types/node": "^22.7.4",
"dotenv": "^16.4.5",
"secretjs": "^1.12.5",
- "typescript": "^5.6.2",
- "@types/node": "^22.7.4"
+ "typescript": "^5.6.2"
}
}
diff --git a/yarn.lock b/yarn.lock
index 9d87deb..14ed323 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2778,7 +2778,7 @@ __metadata:
languageName: node
linkType: hard
-"@types/node@npm:*, @types/node@npm:>=13.7.0":
+"@types/node@npm:*, @types/node@npm:>=13.7.0, @types/node@npm:^22.7.4":
version: 22.7.4
resolution: "@types/node@npm:22.7.4"
dependencies:
@@ -9286,7 +9286,7 @@ __metadata:
"json-stream-stringify@npm:^3.1.4":
version: 3.1.6
resolution: "json-stream-stringify@npm:3.1.6"
- checksum: ce873e09fe18461960b7536f63e2f913a2cb242819513856ed1af58989d41846976e7177cb1fe3c835220023aa01e534d56b6d5c3290a5b23793a6f4cb93785e
+ checksum: 10/ce873e09fe18461960b7536f63e2f913a2cb242819513856ed1af58989d41846976e7177cb1fe3c835220023aa01e534d56b6d5c3290a5b23793a6f4cb93785e
languageName: node
linkType: hard
@@ -12194,20 +12194,11 @@ __metadata:
languageName: node
linkType: hard
-"secret-instantiate-contract@workspace:packages/secret-instantiate-contract":
- version: 0.0.0-use.local
- resolution: "secret-instantiate-contract@workspace:packages/secret-instantiate-contract"
- dependencies:
- dotenv: "npm:^16.4.5"
- secretjs: "npm:^1.12.5"
- typescript: "npm:^5.6.2"
- languageName: unknown
- linkType: soft
-
"secret-upload-contract@workspace:packages/secret-upload-contract":
version: 0.0.0-use.local
resolution: "secret-upload-contract@workspace:packages/secret-upload-contract"
dependencies:
+ "@types/node": "npm:^22.7.4"
dotenv: "npm:^16.4.5"
secretjs: "npm:^1.12.5"
typescript: "npm:^5.6.2"