Skip to content

Commit

Permalink
Merge pull request #44 from NiftyLeague/staging
Browse files Browse the repository at this point in the history
Staging
  • Loading branch information
NiftyAndy authored Apr 22, 2024
2 parents 35d2abe + f9795f2 commit f970071
Show file tree
Hide file tree
Showing 14 changed files with 500 additions and 507 deletions.
4 changes: 1 addition & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@
module.exports = {
ignorePatterns: ['apps/**', 'packages/**'],
extends: ['@nl/eslint-config/library.js'],
parserOptions: {
project: true,
},
parserOptions: { project: true },
};
10 changes: 9 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
name: Validate, lint, and test on every push

on: [push]
on:
push:
branches:
- main
- staging
pull_request_target:
branches:
- main
- staging

jobs:
test:
Expand Down
12 changes: 6 additions & 6 deletions apps/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@
"@cowprotocol/cow-sdk": "^5.2.0",
"@hookform/resolvers": "^3.3.4",
"@imtbl/imx-sdk": "~3.8.0",
"@mui/x-data-grid": "^7.2.0",
"@mui/x-data-grid": "^7.3.0",
"@nl/theme": "workspace:^",
"@nl/ui": "workspace:^",
"@openzeppelin/contracts": "^5.0.2",
"@reduxjs/toolkit": "^2.2.3",
"@sentry/nextjs": "^7.110.1",
"@sentry/nextjs": "^7.111.0",
"@tabler/icons-react": "3.2.0",
"@tanstack/react-query": "^5.29.2",
"@web3modal/wagmi": "^4.1.8",
"@web3modal/wagmi": "^4.1.9",
"axios": "^1.6.8",
"bnc-notify": "^1.9.8",
"bnc-sdk": "^4.6.8",
"date-fns": "^3.6.0",
"eth-rpc-errors": "^4.0.3",
"ethers": "^6.11.1",
"framer-motion": "^11.0.28",
"ethers": "^6.12.0",
"framer-motion": "^11.1.5",
"graphql": "^16.8.1",
"graphql-request": "^6.1.0",
"next": "^14.2.1",
"next": "^14.2.2",
"react-countdown": "^2.3.5",
"react-device-detect": "^2.2.3",
"react-draggable": "^4.4.6",
Expand Down
8 changes: 4 additions & 4 deletions apps/smashers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
"@metamask/eth-sig-util": "^7.0.1",
"@nl/theme": "workspace:^",
"@nl/ui": "workspace:^",
"@sentry/nextjs": "^7.110.1",
"@sentry/nextjs": "^7.111.0",
"@vercel/edge": "^1.1.1",
"ethers": "~6.11.1",
"ethers": "~6.12.0",
"https": "^1.0.0",
"iron-session": "^6.3.1",
"jose": "^5.2.4",
"lodash": "^4.17.21",
"next": "^14.2.1",
"next": "^14.2.2",
"next-auth": "^4.24.7",
"notistack": "^3.0.1",
"playfab-sdk": "^2.151.240401",
"playfab-sdk": "^2.152.240412",
"react-device-detect": "^2.2.3",
"react-unity-webgl": "^9.5.1",
"swr": "^2.2.5",
Expand Down
2 changes: 1 addition & 1 deletion apps/template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"dependencies": {
"@nl/theme": "workspace:^",
"@nl/ui": "workspace:^",
"next": "^14.2.1"
"next": "^14.2.2"
}
}
5 changes: 5 additions & 0 deletions apps/web/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@ const nextConfig = {
destination: 'https://api.niftyleague.com/NFTL/supply',
permanent: true,
},
{
source: '/HUB',
destination: 'https://hub.xyz/niftyleague',
permanent: false,
},
{
source: '/OS',
destination: 'https://opensea.io/collection/niftydegen',
Expand Down
8 changes: 4 additions & 4 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
"postbuild": "next-sitemap"
},
"dependencies": {
"@google/model-viewer": "^3.4.0",
"@google/model-viewer": "^3.5.0",
"@nl/theme": "workspace:^",
"@nl/ui": "workspace:^",
"@sentry/nextjs": "^7.110.1",
"next": "^14.2.1",
"@sentry/nextjs": "^7.111.0",
"next": "^14.2.2",
"next-sitemap": "^4.2.3",
"react-multi-carousel": "^2.8.5",
"three": "^0.160.1"
"three": "^0.163.0"
},
"devDependencies": {
"@types/gtag.js": "^0.0.19",
Expand Down
2 changes: 0 additions & 2 deletions apps/web/src/app/(special-routes)/gltf/[tokenId]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ export default function DegenViews() {

if (!tokenId) return null;

console.log('IMAGE_SRC', IMAGE_SRC);

return (
<>
<style jsx global>{`
Expand Down
Binary file added assets/img/logos/networks/imx_zkEVM.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sass": "^1.75.0",
"viem": "^2.9.21"
"viem": "^2.9.22"
},
"devDependencies": {
"@nl/eslint-config": "workspace:^",
"@nl/prettier-config": "workspace:^",
"@nl/typescript-config": "workspace:^",
"@testing-library/react": "^15.0.2",
"@types/eslint": "^8.56.9",
"@types/eslint": "^8.56.10",
"@types/jest": "^29.5.12",
"@types/lodash": "^4.17.0",
"@types/node": "^20.12.7",
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"react-internal.js"
],
"devDependencies": {
"@next/eslint-plugin-next": "^14.2.1",
"@next/eslint-plugin-next": "^14.2.2",
"@typescript-eslint/eslint-plugin": "^7.7.0",
"@typescript-eslint/parser": "^7.7.0",
"eslint-config-next": "^14.2.1",
"eslint-config-next": "^14.2.2",
"eslint-config-prettier": "^9.1.0",
"eslint-config-turbo": "^1.13.2",
"eslint-plugin-only-warn": "^1.1.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"dependencies": {
"@emotion/cache": "^11.11.0",
"@mui/material-nextjs": "^5.15.11",
"@next/font": "^14.2.1",
"@next/font": "^14.2.2",
"react-intl": "^6.6.5",
"stylis-plugin-rtl": "^2.1.1"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"dependencies": {
"@headlessui/react": "^1.7.19",
"@mui/x-data-grid": "^7.2.0",
"@mui/x-data-grid": "^7.3.0",
"@radix-ui/react-context-menu": "^2.1.5",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-dropdown-menu": "^2.0.6",
Expand All @@ -26,7 +26,7 @@
"@storybook/addon-essentials": "^8.0.8",
"@storybook/addon-links": "^8.0.8",
"@storybook/react": "^8.0.8",
"@supabase/supabase-js": "^2.42.4",
"@supabase/supabase-js": "^2.42.5",
"react-feather": "^2.0.10"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit f970071

Please sign in to comment.