Merge pull request #5847 from thematters/develop

Release: 6.7.0

Author: ham-76

.env.prod-next

@@ -0,0 +1,44 @@
+###
+# Used by production environment
+#
+# @see `./github/workflows/deploy.yml`
+# @see {@url https://nextjs.org/docs/basic-features/environment-variables}
+#
+###
+NEXT_PUBLIC_RUNTIME_ENV=production
+NEXT_PUBLIC_SITE_DOMAIN=matters.town
+NEXT_PUBLIC_SITE_BRAND_NAME=Matters.Town
+NEXT_PUBLIC_SITE_DOMAIN_TLD=matters.town
+NEXT_PUBLIC_SITE_DOMAIN_TLD_OLD=matters.news
+NEXT_PUBLIC_ADMIN_VIEW=false
+NEXT_PUBLIC_EMBED_ASSET_DOMAIN=assets.matters.news
+NEXT_PUBLIC_CF_IMAGE_URL=https://imagedelivery.net/kDRCweMmqLnTPNlbum-pYA/prod
+NEXT_PUBLIC_NEXT_ASSET_DOMAIN=assets-next.mattersprotocol.io
+NEXT_PUBLIC_API_URL=https://server.matters.town/graphql
+NEXT_PUBLIC_OAUTH_URL=https://server.matters.town/oauth
+NEXT_PUBLIC_SEGMENT_KEY=Yk2ao5JvhOCyvCh9SCVBT1iTN4kfTpy7
+NEXT_PUBLIC_FB_APP_ID=1415638158583454
+NEXT_PUBLIC_WALLETCONNECT_ID=e7fc7d3ee120ec6611ea433a5bbb6613
+NEXT_PUBLIC_SENTRY_PUBLIC_KEY=5af839b6d42044548d8ec70f00af8c10
+NEXT_PUBLIC_SENTRY_PROJECT_ID=6153512
+NEXT_PUBLIC_SENTRY_DOMAIN=o1089931.ingest.us.sentry.io
+NEXT_PUBLIC_FIREBASE_CONFIG=eyJhcGlLZXkiOiJBSXphU3lEajFCV2tNa2tpaXdYYkpOQUFtSFVWX3hjVGZrRnQxWGciLCJhdXRoRG9tYWluIjoibWF0dGVycy0yZGQ3OC5maXJlYmFzZWFwcC5jb20iLCJkYXRhYmFzZVVSTCI6Imh0dHBzOi8vbWF0dGVycy0yZGQ3OC5maXJlYmFzZWlvLmNvbSIsInByb2plY3RJZCI6Im1hdHRlcnMtMmRkNzgiLCJzdG9yYWdlQnVja2V0IjoibWF0dGVycy0yZGQ3OC5hcHBzcG90LmNvbSIsIm1lc3NhZ2luZ1NlbmRlcklkIjoiNzE3MTM1MDcyNTcwIiwiYXBwSWQiOiIxOjcxNzEzNTA3MjU3MDp3ZWI6ODJjNWYwNjk0MmMwMjBkYThkZDQwMyIsIm1lYXN1cmVtZW50SWQiOiJHLU05VDM2MTRRSzEifQ
+NEXT_PUBLIC_STRIPE_PUBLIC_KEY=pk_live_NfdCmUIPzQxKEMjLkInsjULK00W7AXBBrG
+NEXT_PUBLIC_TRAVELOGGERS_URL=https://traveloggers.matters.town
+NEXT_PUBLIC_LOGBOOKS_URL=https://logbook.matters.town
+NEXT_PUBLIC_ALCHEMY_KEY=bOu-fCphi9mvePsxg968Qe-pidHQNdlT
+NEXT_PUBLIC_CF_TURNSTILE_SITE_KEY=0x4AAAAAAAKVODkJMwfIxG78
+NEXT_PUBLIC_GOOGLE_CLIENT_ID=751677068109-rkml7q9ujf8ems09cclh7qckf14svcgs.apps.googleusercontent.com
+NEXT_PUBLIC_TWITTER_CLIENT_ID=cmdKbUlyd1ZZZDZYa3dTampidGo6MTpjaQ
+NEXT_PUBLIC_NOMAD_MATTERS_CAMPAIGN_LINK_EN=/@hi176/476405-a-guide-to-invite
+NEXT_PUBLIC_NOMAD_MATTERS_CAMPAIGN_LINK=/@hi176/476404
+NEXT_PUBLIC_CAMPAIGN_APPLICATION_LINK=https://docs.google.com/forms/d/e/1FAIpQLSeQzWJ8g2fZk5a9DD-1P_Y4pyQCTE1cbTI6T8-5K8PQXAZ6pA/viewform?usp=dialog
+NEXT_PUBLIC_BILLBOARD_OPERATOR_ADDRESS=0x92a117aeA74963Cd0CEdF9C50f99435451a291F7
+NEXT_PUBLIC_BILLBOARD_REGISTRY_ADDRESS=0x95bEFe8E08a56dCEBBa8d40BE3e9c3cb2fF81806
+NEXT_PUBLIC_BILLBOARD_TOKEN_ID=1
+NEXT_PUBLIC_BILLBOARD_IMAGE_URL=matters-billboard-ad.s3.ap-southeast-1.amazonaws.com/
+NEXT_PUBLIC_SITE_DOMAIN=web-next.matters.town
+NEXT_PUBLIC_ADMIN_VIEW=true
+
+SENTRY_ORG=matters-lab
+SENTRY_PROJECT=matters-web-prod

.github/workflows/deploy.yml

@@ -6,6 +6,7 @@ on:
       - master
       - main
       - develop
+      - release/next
     types: [closed]
 
 concurrency:
@@ -34,7 +35,7 @@ jobs:
           cache: 'npm'
 
       - name: Setup rclone
-        if: github.base_ref == 'develop' || github.base_ref == 'master' || github.base_ref == 'main'
+        if: github.base_ref == 'develop' || github.base_ref == 'master' || github.base_ref == 'main' || github.base_ref == 'release/next'
         uses: AnimMouse/setup-rclone@v1
         with:
           rclone_config: |
@@ -72,7 +73,8 @@ jobs:
         run: npm run gen:type
 
       - name: Generate Types (production)
-        if: github.base_ref == 'master' || github.base_ref == 'main'
+        if: github.base_ref == 'master' || github.base_ref == 'main' || github.base_ref == 'release/next'
+
         run: npm run gen:type:prod
 
       - name: Lint
@@ -100,21 +102,26 @@ jobs:
         if: github.base_ref == 'master' || github.base_ref == 'main'
         run: cp .env.prod .env.local && npm run build
 
+      # === `webnext` branch ===
+      - name: Build (webnext)
+        if: github.base_ref == 'release/next'
+        run: cp .env.prod-next .env.local && npm run build
+
       - name: Setup AWS
-        if: github.base_ref == 'develop' || github.base_ref == 'master' || github.base_ref == 'main'
+        if: github.base_ref == 'develop' || github.base_ref == 'master' || github.base_ref == 'main' || github.base_ref == 'release/next'
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ${{ github.base_ref == 'develop' && secrets.AWS_REGION_DEV || secrets.AWS_REGION_PROD }}
 
       - name: Generate deployment package
-        if: github.base_ref == 'develop' || github.base_ref == 'master' || github.base_ref == 'main'
+        if: github.base_ref == 'develop' || github.base_ref == 'master' || github.base_ref == 'main' || github.base_ref == 'release/next'
         run: |
           zip -r --symlinks deploy.zip . -x .git/\* node_modules/\*
 
       - name: Upload Assets (develop - R2)
-        if: github.base_ref == 'develop' || github.base_ref == 'main'
+        if: github.base_ref == 'develop'
         run: rclone copy .next r2:matters-assets-next-develop/_next --include "/*" --include "/static/**" -P
 
       - name: Deploy to EB (develop)
@@ -133,7 +140,7 @@ jobs:
           wait_for_deployment: true
 
       - name: Upload Assets (production - R2)
-        if: github.base_ref == 'master' || github.base_ref == 'main'
+        if: github.base_ref == 'master' || github.base_ref == 'main' || github.base_ref == 'release/next'
         run: rclone copy .next r2:matters-assets-next/_next --include "/*" --include "/static/**" -P
 
       - name: Deploy to EB (production)
@@ -151,6 +158,21 @@ jobs:
           use_existing_version_if_available: true
           wait_for_deployment: true
 
+      - name: Deploy to EB (webnext)
+        if: github.base_ref == 'release/next'
+        uses: einaregilsson/beanstalk-deploy@v22
+        with:
+          aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          application_name: matters-prod
+          environment_name: ${{ secrets.AWS_EB_ENV_NAME_WEBNEXT }}
+          version_label: matters-web-webnext-${{ hashFiles('deploy.zip') }}
+          version_description: ${{ github.SHA }}
+          region: ${{ secrets.AWS_REGION_DEV }}
+          deployment_package: deploy.zip
+          use_existing_version_if_available: true
+          wait_for_deployment: true
+
       - name: Slack Notification
         if: always()
         uses: 8398a7/action-slack@v3

bin/vercel-build.js

@@ -40,14 +40,7 @@ function setEnvLocal(key, value) {
 }
 
 // Check the branch and configure environment accordingly
-if (gitCommitRef && gitCommitRef === 'release/next') {
-  // Production release/next branch
-  // Deployed to web-next.matters.town
-  console.log('Configuring for production (release/next)')
-  exec('npm run gen:type:prod')
-  exec('cp -va .env.prod .env.local')
-  appendToEnvLocal('NEXT_PUBLIC_SITE_DOMAIN', 'web-next.matters.town')
-} else if (gitCommitRef && gitCommitRef === 'release/next-beta') {
+if (gitCommitRef && gitCommitRef === 'release/next-beta') {
   // Production release/next-beta branch
   // Deployed to beta-new-home.matters.town
   console.log('Configuring for production (release/next-beta)')

lang/default.json

@@ -213,6 +213,10 @@
   "0xVT+0": {
     "defaultMessage": "Curated"
   },
+  "11nXAM": {
+    "defaultMessage": "Your schedule article published successfully, but failed to submit because the selection event has ended",
+    "description": "src/components/Notice/ArticleNotice/ScheduledArticlePublishedNotice.tsx"
+  },
   "18HJlm": {
     "defaultMessage": "Tag"
   },
@@ -299,6 +303,10 @@
   "2J3mz4": {
     "defaultMessage": "Add to event featured"
   },
+  "2LRzPc": {
+    "defaultMessage": "Matters",
+    "description": "src/components/Notice/ActorAction/index.tsx"
+  },
   "2P5JII": {
     "defaultMessage": "Disconnect",
     "description": "src/components/Dialogs/RemoveSocialLoginDialog/Content.tsx"
@@ -478,6 +486,9 @@
   "5jlQTx": {
     "defaultMessage": "Manage Invitation"
   },
+  "5mu8HJ": {
+    "defaultMessage": "Moment deleted"
+  },
   "5rxHb7": {
     "defaultMessage": "May contain pornography, violence, gore, etc. Click here to expand all.",
     "description": "src/views/ArticleDetail/Wall/Sensitive/index.tsx"
@@ -929,6 +940,10 @@
     "defaultMessage": "Copy comment",
     "description": "src/components/Comment/DropdownActions/index.tsx"
   },
+  "CZJdSn": {
+    "defaultMessage": "mentioned you in a comment",
+    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
+  },
   "CbRvzm": {
     "defaultMessage": "Schedule publish"
   },
@@ -999,6 +1014,10 @@
   "DjIpR6": {
     "defaultMessage": "Set Cover"
   },
+  "DoOt1q": {
+    "defaultMessage": "Your channel suggestion has been accepted by the editor. Thank you for supporting Matters!",
+    "description": "src/components/Notice/ArticleNotice/TopicChannelFeedbackAcceptedNotice.tsx"
+  },
   "Dom0EF": {
     "defaultMessage": "Verification successful",
     "description": "src/components/GlobalToast/index.tsx"
@@ -1180,6 +1199,10 @@
     "defaultMessage": "Subscription cancellations",
     "description": "src/views/Me/Settings/Notifications/Circle/index.tsx"
   },
+  "Gju939": {
+    "defaultMessage": "mentioned you",
+    "description": "src/components/Notice/ArticleNotice/ArticleMentionedYouNotice.tsx"
+  },
   "Gt7K6r": {
     "defaultMessage": "Wallet address",
     "description": "src/views/Me/Settings/Settings/Wallet/index.tsx"
@@ -1209,6 +1232,10 @@
   "HBxXD/": {
     "defaultMessage": "License"
   },
+  "HDkifr": {
+    "defaultMessage": "Your schedule article has been published",
+    "description": "src/components/Notice/ArticleNotice/ScheduledArticlePublishedNotice.tsx"
+  },
   "HFVDeB": {
     "defaultMessage": "Related Tags",
     "description": "src/views/TagDetail/RelatedTags/index.tsx"
@@ -1420,6 +1447,10 @@
   "KhbWu2": {
     "defaultMessage": "Your suggestion has been submitted to the editor."
   },
+  "KkMtuC": {
+    "defaultMessage": "Claim for free",
+    "description": "src/components/Notice/TransactionNotice/PaymentReceivedDonationNotice.tsx"
+  },
   "KlJEP9": {
     "defaultMessage": "Wallet connected",
     "description": "src/components/Forms/WalletAuthForm/Connect.tsx"
@@ -1601,6 +1632,10 @@
   "O7ozeo": {
     "defaultMessage": "Update profile"
   },
+  "O9lnpa": {
+    "defaultMessage": "mentioned you in broadcast comment",
+    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
+  },
   "ODncRd": {
     "defaultMessage": "Claiming..."
   },
@@ -1897,6 +1932,10 @@
   "T9oZC8": {
     "defaultMessage": "Are you sure you want to delete this collection ‘{collection}’?"
   },
+  "TDcpi1": {
+    "defaultMessage": "Great! Your work has been featured in the event!",
+    "description": "src/components/Notice/CampaignArticleNotice/CampaignArticleFeaturedNotice.tsx"
+  },
   "TF1OhT": {
     "defaultMessage": "This login code has expired, please try to resend"
   },
@@ -2148,6 +2187,10 @@
   "XZ8IJ3": {
     "defaultMessage": "After the modification is completed, the new version will be released to IPFS again. You can view the historical version from \"IPFS\" under the article title."
   },
+  "Xcz2mz": {
+    "defaultMessage": "mentioned you in your circle",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  },
   "XdLnXf": {
     "defaultMessage": "Insufficient wallet balance.",
     "description": "PAYMENT_BALANCE_INSUFFICIENT"
@@ -2574,6 +2617,10 @@
     "defaultMessage": "Confirm",
     "description": "src/views/CampaignDetail/Apply/Dialog/index.tsx"
   },
+  "fAhR69": {
+    "defaultMessage": "invites you to join the circle {circleName}",
+    "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
+  },
   "fBzH+2": {
     "defaultMessage": "Disallow readers to respond to this article (you can enable responses later by editing this article)"
   },
@@ -2808,6 +2855,10 @@
     "defaultMessage": "Reviewing...",
     "description": "type:apply"
   },
+  "jOgBV9": {
+    "defaultMessage": "replied you",
+    "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
+  },
   "jiB0Z2": {
     "defaultMessage": "Unable to bind wallet",
     "description": "src/components/Forms/PaymentForm/BindWallet/index.tsx"
@@ -2869,6 +2920,10 @@
     "defaultMessage": "Liker ID",
     "description": "src/views/Me/Settings/Misc/LikerID.tsx"
   },
+  "kSWA0M": {
+    "defaultMessage": "commented in your circle",
+    "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
+  },
   "kc79d3": {
     "defaultMessage": "Topics"
   },
@@ -3086,6 +3141,13 @@
     "defaultMessage": "Cancel schedule",
     "description": "confirm cancel schedule button"
   },
+  "oKcye/": {
+    "defaultMessage": "mentioned you in a moment"
+  },
+  "oNi7K5": {
+    "defaultMessage": "Your schedule article published successfully, but some full collections failed to be added",
+    "description": "src/components/Notice/ArticleNotice/ScheduledArticlePublishedNotice.tsx"
+  },
   "ob+HDS": {
     "defaultMessage": "View Circle"
   },
@@ -3349,6 +3411,9 @@
   "tQV8l8": {
     "defaultMessage": "Unknown Error"
   },
+  "tWCQCd": {
+    "defaultMessage": "The contract has sent {amount} USDT to the connected wallet"
+  },
   "tZKvnZ": {
     "defaultMessage": "Unlike moment"
   },
@@ -3383,6 +3448,10 @@
   "uQrkG8": {
     "defaultMessage": "3 steps, migrate to Matters immediately"
   },
+  "uQxskc": {
+    "defaultMessage": "Your work has been published to IPFS",
+    "description": "src/components/Notice/ArticleNotice/ArticlePublished.tsx"
+  },
   "uVCg1l": {
     "defaultMessage": "Explore Matters"
   },
@@ -3422,6 +3491,10 @@
   "v+hbfO": {
     "defaultMessage": "fixed amount"
   },
+  "v2dMFZ": {
+    "defaultMessage": "mentioned you",
+    "description": "src/components/Notice/CommentNotice/CommentMentionedYouNotice.tsx"
+  },
   "v4ddaP": {
     "defaultMessage": "Bind your wallet immediately, and link it to your personal account",
     "description": "src/components/Forms/PaymentForm/BindWallet/index.tsx"
@@ -3515,6 +3588,10 @@
     "defaultMessage": "left a comment in {circleName} and mentioned you",
     "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
   },
+  "wHAfde": {
+    "defaultMessage": "Your schedule article published successfully, some archived articles failed to be curated",
+    "description": "src/components/Notice/ArticleNotice/ScheduledArticlePublishedNotice.tsx"
+  },
   "wK4kLf": {
     "defaultMessage": "Continue",
     "description": "src/components/Forms/EmailSignUpForm/Init.tsx"
@@ -3549,6 +3626,10 @@
   "wbcwKd": {
     "defaultMessage": "View All"
   },
+  "wcWAWv": {
+    "defaultMessage": "commented in broadcast",
+    "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
+  },
   "wclk7z": {
     "defaultMessage": "Summary to help readers quickly grasp the topic"
   },