Merge pull request #1279 from near/develop

2x weekly promotion of develop to main
near · Aug 6, 2024 · aff14b9 · aff14b9
2 parents 0ec01ba + c7296a7
commit aff14b9
Show file tree

Hide file tree

Showing 63 changed files with 1,215 additions and 1,912 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-pnpm prettier && pnpm lint
+pnpm pre-commit
diff --git a/next.config.js b/next.config.js
@@ -13,8 +13,7 @@ const nextConfig = {
       },
       {
         source: '/stakewars',
-        destination:
-          'https://github.com/near/stakewars-iv',
+        destination: 'https://github.com/near/stakewars-iv',
         permanent: false,
       },
       {
@@ -27,6 +26,11 @@ const nextConfig = {
         destination: 'https://near.org/blog/:path*',
         permanent: false,
       },
+      {
+        source: '/ecosystem/get-funding',
+        destination: 'https://near.org/ecosystem/get-funding',
+        permanent: false,
+      },
       {
         source: '/consensus',
         destination: 'https://nearconsensus2023.splashthat.com/',
@@ -62,10 +66,11 @@ const nextConfig = {
         destination: '/data-availability',
         permanent: true,
       },
-      { //TODO - remove in Q2 2024
+      {
+        //TODO - remove in Q2 2024
         source: '/files/:slug',
         destination: 'https://discovery-domain.org/papers/:slug.pdf',
-        permanent: false, 
+        permanent: false,
       },
       {
         source: '/papers/:slug',
@@ -86,8 +91,7 @@ const nextConfig = {
         source: '/signin',
         destination: '/applications?requestAuth=1',
         permanent: false,
-      }
-      ,
+      },
       {
         source: '/signup',
         destination: '/applications?requestAuth=1&createAccount=1',
@@ -101,8 +105,8 @@ const nextConfig = {
       {
         source: '/blog/getting-started-with-the-near-wallet',
         destination: 'https://wallet.near.org',
-        permanent: true
-      }
+        permanent: true,
+      },
     ];
   },
   rewrites: async () => [
@@ -113,17 +117,19 @@ const nextConfig = {
     {
       source: '/blog/:path*',
       destination: '/blog/:path*/index.html',
-    }
+    },
   ],
   headers: async () => [
     {
-        source: '/:path*',
-        headers: [{
+      source: '/:path*',
+      headers: [
+        {
           key: 'Referrer-Policy',
-          value: 'strict-origin-when-cross-origin'
-        }]
-      }
-  ]
+          value: 'strict-origin-when-cross-origin',
+        },
+      ],
+    },
+  ],
 };
 
 const withPWA = require('next-pwa')({
@@ -133,10 +139,10 @@ const withPWA = require('next-pwa')({
   importScripts: ['/pwa.js'],
   cacheStartUrl: false,
   cacheOnFrontEndNav: true,
-  skipWaiting: false
-})
+  skipWaiting: false,
+});
 const { loadEnvConfig } = require('@next/env');
-loadEnvConfig(".")
+loadEnvConfig('.');
 module.exports = withPWA(nextConfig);
 
 // Injected content via Sentry wizard below

diff --git a/package.json b/package.json
@@ -14,14 +14,17 @@
     "prettier": "prettier --check 'src/**/*.{js,jsx,ts,tsx,json}'",
     "prettier:write": "prettier --write 'src/**/*.{js,jsx,ts,tsx,json}'",
     "prepare": "is-ci || husky install && npm install commitizen -g",
+    "pre-commit": "pnpm prettier && pnpm lint --max-warnings 0 && pnpm ts:check",
     "commit": "cz",
-    "sync-submodules": "git submodule init && git submodule update --remote"
+    "sync-submodules": "git submodule init && git submodule update --remote",
+    "ts:check": "tsc --noEmit --incremental"
   },
   "dependencies": {
     "@idos-network/idos-sdk": "^0.0.30",
     "@keypom/selector": "1.2.3",
     "@monaco-editor/react": "^4.6.0",
     "@near-js/biometric-ed25519": "0.3.0",
+    "@near-pagoda/ui": "^0.2.6",
     "@near-wallet-selector/core": "8.9.7",
     "@near-wallet-selector/here-wallet": "8.9.7",
     "@near-wallet-selector/ledger": "^8.9.7",
@@ -34,12 +37,11 @@
     "@near-wallet-selector/nightly": "8.9.7",
     "@near-wallet-selector/sender": "8.9.7",
     "@near-wallet-selector/welldone-wallet": "8.9.7",
+    "@phosphor-icons/react": "^2.1.7",
     "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-dropdown-menu": "^2.0.6",
     "@radix-ui/react-hover-card": "^1.1.1",
     "@radix-ui/react-navigation-menu": "^1.1.4",
-    "@radix-ui/react-toast": "^1.1.5",
-    "@radix-ui/react-tooltip": "^1.0.7",
     "@sentry/nextjs": "^7.112.2",
     "@web3-onboard/core": "^2.21.6",
     "@web3-onboard/injected-wallets": "^2.10.16",
@@ -57,6 +59,7 @@
     "local-storage": "^2.0.0",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
+    "near-api-js": "^4.0.3",
     "near-fastauth-wallet": "2.0.1",
     "near-social-vm": "github:calebjacob/VM#dev",
     "next": "^13.5.6",