Skip to content

Commit

Permalink
Merge pull request #309 from near/develop
Browse files Browse the repository at this point in the history
weekly promotion of develop to main
  • Loading branch information
charleslavon authored Jul 20, 2023
2 parents b003b66 + 4366da0 commit 0973934
Show file tree
Hide file tree
Showing 27 changed files with 1,022 additions and 462 deletions.
34 changes: 17 additions & 17 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
{
"name": "Node.js & TypeScript",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/typescript-node:0-18-bullseye",
"features": {
"ghcr.io/devcontainers/features/common-utils:2": {},
"ghcr.io/devcontainers/features/rust:1": {}
}
"name": "Node.js & TypeScript",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/typescript-node:0-18-bullseye",
"features": {
"ghcr.io/devcontainers/features/common-utils:2": {},
"ghcr.io/devcontainers/features/rust:1": {}
}

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "yarn install",
// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "yarn install",

// Configure tool-specific properties.
// "customizations": {},
// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE/broken-link-or-new-url-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: Broken link or New URL request
about: Use this template to report a broken link or request a URL redirection
title: 'Add or Fix a URL '
labels: bug, good first issue
assignees: ''

---

## Replace the highlighted/quoted text in whichever of the these phrases is more appropriate
1. Please add a `temporary, permanent` redirection of requests from `from this URL` to `to this URL`
1. The page at `URL address` contains a broken link which points to `broken link`. This link should be `removed or replaced with URL address`.
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
43 changes: 43 additions & 0 deletions .github/workflows/continuous-integration-workflow.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: CI
on:
pull_request:
push:
branches:
- main
- develop

jobs:
prettier:
name: Prettier
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: latest
- uses: actions/setup-node@v3
with:
node-version: 20
cache: 'pnpm'
- name: Install dependencies
run: pnpm install
- name: Run code formatting check
run: pnpm run prettier

lint:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: latest
- uses: actions/setup-node@v3
with:
node-version: 20
cache: 'pnpm'
- name: Install dependencies
run: pnpm install
- name: Run lint check
run: pnpm run build

22 changes: 22 additions & 0 deletions .github/workflows/promote-develop-to-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: weekly-production-release

on:
schedule:
- cron: '0 0 * * THU'

permissions:
pull-requests: write

jobs:
pull-request:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/develop'
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: pull-request
run: |
gh pr create --base main --head develop -f -a mpeterdev -a marcinbodnar --title "weekly promotion of develop to main"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ yarn-error.log*
# typescript
*.tsbuildinfo
next-env.d.ts

# Sentry Auth Token
.sentryclirc
38 changes: 38 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,41 @@ const nextConfig = {
};

module.exports = nextConfig;


// Injected content via Sentry wizard below

const { withSentryConfig } = require("@sentry/nextjs");

module.exports = withSentryConfig(
module.exports,
{
// For all available options, see:
// https://github.com/getsentry/sentry-webpack-plugin#options

// Suppresses source map uploading logs during build
silent: true,

org: "near-protocol",
project: "near-discovery",
},
{
// For all available options, see:
// https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/

// Upload a larger set of source maps for prettier stack traces (increases build time)
widenClientFileUpload: true,

// Transpiles SDK to be compatible with IE11 (increases bundle size)
transpileClientSDK: true,

// Routes browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers (increases server load)
tunnelRoute: "/monitoring",

// Hides source maps from generated client bundles
hideSourceMaps: true,

// Automatically tree-shake Sentry logger statements to reduce bundle size
disableLogger: true,
}
);
157 changes: 80 additions & 77 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,79 +1,82 @@
{
"name": "near-discovery",
"version": "0.1.0",
"private": true,
"engines": {
"node": ">=18.0.0",
"npm": ">=0.39.0"
},
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint"
},
"dependencies": {
"@braintree/sanitize-url": "6.0.0",
"@monaco-editor/react": "^4.4.6",
"@near-js/biometric-ed25519": "0.2.0",
"@near-wallet-selector/core": "8.1.1",
"@near-wallet-selector/here-wallet": "8.1.1",
"@near-wallet-selector/meteor-wallet": "8.1.1",
"@near-wallet-selector/modal-ui": "8.1.1",
"@near-wallet-selector/my-near-wallet": "8.1.1",
"@near-wallet-selector/near-wallet": "8.1.1",
"@near-wallet-selector/neth": "8.1.1",
"@near-wallet-selector/nightly": "8.1.1",
"@near-wallet-selector/sender": "8.1.1",
"@near-wallet-selector/wallet-utils": "8.1.1",
"@near-wallet-selector/welldone-wallet": "8.1.1",
"@keypom/selector": "^1.2.1",
"@radix-ui/react-accordion": "^1.1.1",
"@radix-ui/react-dropdown-menu": "^2.0.4",
"@radix-ui/react-navigation-menu": "^1.1.2",
"@radix-ui/react-toast": "^1.1.3",
"@types/node": "18.16.3",
"@types/react": "18.2.0",
"@types/react-dom": "18.2.1",
"@web3-onboard/core": "^2.20.2",
"@web3-onboard/injected-wallets": "^2.10.1",
"@web3-onboard/ledger": "^2.4.6",
"@web3-onboard/react": "^2.8.7",
"@web3-onboard/walletconnect": "^2.3.9",
"analytics-node": "^6.2.0",
"rudder-sdk-js": "^2.36.0",
"big.js": "^6.1.1",
"bn.js": "^5.1.1",
"bootstrap": "^5.2.1",
"bootstrap-icons": "^1.9.0",
"classnames": "^2.3.2",
"eslint": "8.39.0",
"eslint-config-next": "13.3.4",
"firebase": "^9.19.1",
"iframe-resizer-react": "^1.1.0",
"local-storage": "^2.0.0",
"lodash": "^4.17.21",
"near-api-js": "2.1.3",
"near-social-vm": "github:NearSocial/VM#2.2.3",
"next": "13.3.4",
"prettier": "^2.7.1",
"react": "18.2.0",
"react-bootstrap": "^2.5.0",
"react-bootstrap-typeahead": "^6.1.2",
"react-dom": "18.2.0",
"react-hook-form": "^7.43.9",
"react-singleton-hook": "^3.1.1",
"styled-components": "^5.3.6",
"typescript": "5.0.4",
"zustand": "^4.3.7"
},
"devDependencies": {
"@types/analytics-node": "^3.1.11",
"@types/big.js": "^6.1.6",
"@types/lodash": "^4.14.194",
"@types/styled-components": "^5.1.26",
"@typescript-eslint/eslint-plugin": "^5.59.2",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-simple-import-sort": "^10.0.0"
}
"name": "near-discovery",
"version": "0.1.0",
"private": true,
"engines": {
"node": ">=18.0.0",
"npm": ">=0.39.0"
},
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"prettier": "prettier --check 'src/**/*.{js,jsx,ts,tsx,json}'",
"prettier:write": "prettier --write 'src/**/*.{js,jsx,ts,tsx,json}'"
},
"dependencies": {
"@braintree/sanitize-url": "6.0.0",
"@keypom/selector": "^1.2.0",
"@monaco-editor/react": "^4.4.6",
"@near-js/biometric-ed25519": "0.2.0",
"@near-wallet-selector/core": "8.1.1",
"@near-wallet-selector/here-wallet": "8.1.1",
"@near-wallet-selector/meteor-wallet": "8.1.1",
"@near-wallet-selector/modal-ui": "8.1.1",
"@near-wallet-selector/my-near-wallet": "8.1.1",
"@near-wallet-selector/near-wallet": "8.1.1",
"@near-wallet-selector/neth": "8.1.1",
"@near-wallet-selector/nightly": "8.1.1",
"@near-wallet-selector/sender": "8.1.1",
"@near-wallet-selector/wallet-utils": "8.1.1",
"@near-wallet-selector/welldone-wallet": "8.1.1",
"@radix-ui/react-accordion": "^1.1.1",
"@radix-ui/react-dropdown-menu": "^2.0.4",
"@radix-ui/react-navigation-menu": "^1.1.2",
"@radix-ui/react-toast": "^1.1.3",
"@sentry/nextjs": "^7.58.1",
"@types/node": "18.16.3",
"@types/react": "18.2.0",
"@types/react-dom": "18.2.1",
"@web3-onboard/core": "^2.20.2",
"@web3-onboard/injected-wallets": "^2.10.1",
"@web3-onboard/ledger": "^2.4.6",
"@web3-onboard/react": "^2.8.7",
"@web3-onboard/walletconnect": "^2.3.9",
"analytics-node": "^6.2.0",
"big.js": "^6.1.1",
"bn.js": "^5.1.1",
"bootstrap": "^5.2.1",
"bootstrap-icons": "^1.9.0",
"classnames": "^2.3.2",
"eslint": "8.39.0",
"eslint-config-next": "13.3.4",
"firebase": "^9.19.1",
"iframe-resizer-react": "^1.1.0",
"local-storage": "^2.0.0",
"lodash": "^4.17.21",
"near-api-js": "2.1.3",
"near-social-vm": "github:NearSocial/VM#2.2.3",
"next": "13.3.4",
"prettier": "^2.7.1",
"react": "18.2.0",
"react-bootstrap": "^2.5.0",
"react-bootstrap-typeahead": "^6.1.2",
"react-dom": "18.2.0",
"react-hook-form": "^7.43.9",
"react-singleton-hook": "^3.1.1",
"rudder-sdk-js": "^2.36.0",
"styled-components": "^5.3.6",
"typescript": "5.0.4",
"zustand": "^4.3.7"
},
"devDependencies": {
"@types/analytics-node": "^3.1.11",
"@types/big.js": "^6.1.6",
"@types/lodash": "^4.14.194",
"@types/styled-components": "^5.1.26",
"@typescript-eslint/eslint-plugin": "^5.59.2",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-simple-import-sort": "^10.0.0"
}
}
Loading

2 comments on commit 0973934

@vercel
Copy link

@vercel vercel bot commented on 0973934 Jul 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on 0973934 Jul 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.