Skip to content

Commit

Permalink
style: make all image own card style (#171)
Browse files Browse the repository at this point in the history
* style: make all image own card style

* chore: add bundle size analysis

* chore(CI): fix yarn4

* chore(CI): fix CI
  • Loading branch information
PaiJi authored Apr 21, 2024
1 parent 6369535 commit c61aca8
Show file tree
Hide file tree
Showing 5 changed files with 151 additions and 10 deletions.
136 changes: 136 additions & 0 deletions .github/workflows/nextjs_bundle_analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0

name: 'Next.js Bundle Analysis'

on:
pull_request:
push:
branches:
- main # change this if your default branch is named differently
workflow_dispatch:

defaults:
run:
# change this if your nextjs app does not live at the root of the repo
working-directory: ./

permissions:
contents: read # for checkout repository
actions: read # for fetching base branch bundle stats
pull-requests: write # for comments

jobs:
analyze:
runs-on: ubuntu-latest
environment: Develop
env:
XATA_API_KEY: ${{ secrets.XATA_API_KEY }}
XATA_FALLBACK_BRANCH: ${{ vars.XATA_FALLBACK_BRANCH }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
ENABLE_TRACK: ${{ vars.ENABLE_TRACK }}
steps:
- uses: actions/checkout@v3

- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version: lts/hydrogen
- run: "corepack enable"

- name: Install dependencies
uses: bahmutov/npm-install@v1

# If pnpm is used, you need to switch the previous step with the following one. pnpm does not create a package-lock.json
# so the step above will fail to pull dependencies
# - uses: pnpm/action-setup@v2
# name: Install pnpm
# id: pnpm-install
# with:
# version: 7
# run_install: true

- name: Restore next build
uses: actions/cache@v3
id: restore-build-cache
env:
cache-name: cache-next-build
with:
# if you use a custom build directory, replace all instances of `.next` in this file with your build directory
# ex: if your app builds to `dist`, replace `.next` with `dist`
path: .next/cache
# change this if you prefer a more strict cache
key: ${{ runner.os }}-build-${{ env.cache-name }}

- name: Build next.js app
# change this if your site requires a custom build command
run: ./node_modules/.bin/next build

# Here's the first place where next-bundle-analysis' own script is used
# This step pulls the raw bundle stats for the current bundle
- name: Analyze bundle
run: npx -p nextjs-bundle-analysis report

- name: Upload bundle
uses: actions/upload-artifact@v3
with:
name: bundle
path: .next/analyze/__bundle_analysis.json

- name: Download base branch bundle stats
uses: dawidd6/action-download-artifact@v2
if: success() && github.event.number
with:
workflow: nextjs_bundle_analysis.yml
branch: ${{ github.event.pull_request.base.ref }}
path: .next/analyze/base

# And here's the second place - this runs after we have both the current and
# base branch bundle stats, and will compare them to determine what changed.
# There are two configurable arguments that come from package.json:
#
# - budget: optional, set a budget (bytes) against which size changes are measured
# it's set to 350kb here by default, as informed by the following piece:
# https://infrequently.org/2021/03/the-performance-inequality-gap/
#
# - red-status-percentage: sets the percent size increase where you get a red
# status indicator, defaults to 20%
#
# Either of these arguments can be changed or removed by editing the `nextBundleAnalysis`
# entry in your package.json file.
- name: Compare with base branch bundle
if: success() && github.event.number
run: ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare

- name: Get Comment Body
id: get-comment-body
if: success() && github.event.number
# https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
run: |
echo "body<<EOF" >> $GITHUB_OUTPUT
echo "$(cat .next/analyze/__bundle_analysis_comment.txt)" >> $GITHUB_OUTPUT
echo EOF >> $GITHUB_OUTPUT
- name: Find Comment
uses: peter-evans/find-comment@v2
if: success() && github.event.number
id: fc
with:
issue-number: ${{ github.event.number }}
body-includes: '<!-- __NEXTJS_BUNDLE -->'

- name: Create Comment
uses: peter-evans/create-or-update-comment@v2
if: success() && github.event.number && steps.fc.outputs.comment-id == 0
with:
issue-number: ${{ github.event.number }}
body: ${{ steps.get-comment-body.outputs.body }}

- name: Update Comment
uses: peter-evans/create-or-update-comment@v2
if: success() && github.event.number && steps.fc.outputs.comment-id != 0
with:
issue-number: ${{ github.event.number }}
body: ${{ steps.get-comment-body.outputs.body }}
comment-id: ${{ steps.fc.outputs.comment-id }}
edit-mode: replace
5 changes: 4 additions & 1 deletion next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// https://nextjs.org/docs/api-reference/next.config.js/introduction
// https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/
const { format } = require("date-fns");
const { zhCN } = require("date-fns/locale");

const { withSentryConfig } = require("@sentry/nextjs");
const { GitRevisionPlugin } = require("git-revision-webpack-plugin");
Expand Down Expand Up @@ -52,7 +53,9 @@ const nextConfig = {
// LASTCOMMITDATETIME: JSON.stringify(
// gitRevisionPlugin.lastcommitdatetime()
// ),
LASTCOMMITDATETIME: JSON.stringify(format(Date.now(), "yyyy/MM/dd")),
LASTCOMMITDATETIME: JSON.stringify(
format(Date.now(), "yyyy/MM/dd", { locale: zhCN })
),
__SENTRY_DEBUG__: false,
})
);
Expand Down
10 changes: 8 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,11 @@
"@types/react": "18.2.59",
"@types/react-dom": "18.2.19"
},
"packageManager": "[email protected]"
}
"packageManager": "[email protected]",
"nextBundleAnalysis": {
"budget": 358400,
"budgetPercentIncreaseRed": 20,
"minimumChangeThreshold": 0,
"showDetails": true
}
}
8 changes: 2 additions & 6 deletions src/components/eventCard/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Event } from "@/xata/xata";
import Link from "next/link";
import React, { useState } from "react";
import React from "react";
import styles from "@/components/eventCard/index.module.css";
import { IoLocation } from "react-icons/io5";
import { BsCalendar2DateFill } from "react-icons/bs";
Expand All @@ -18,7 +18,6 @@ export default function EventCard({
event: Event;
sizes?: string;
}) {
const [isWiderImage, setIsWiderImage] = useState(true);

const finalEventCoverImage = getEventCoverUrl(event);
const isDefaultCover = finalEventCoverImage.includes(
Expand Down Expand Up @@ -58,15 +57,12 @@ export default function EventCard({
>
{finalEventCoverImage && (
<Image
onLoadingComplete={(img) => {
img.naturalWidth < img.naturalHeight && setIsWiderImage(false);
}}
src={finalEventCoverImage}
alt={`${event.name}的活动封面`}
containerClassName="absolute h-full w-full"
className={clsx(
"event-cover object-cover h-full w-full",
isWiderImage && styles["event-vertical-cover"]
styles["event-vertical-cover"]
)}
sizes={sizes}
autoFormat
Expand Down
2 changes: 1 addition & 1 deletion src/pages/[organization]/[slug].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import clsx from "clsx";
import { format } from "date-fns";
import { GetStaticPropsContext } from "next";
import NextImage from "@/components/image";
import { useCallback, useEffect, useState } from "react";
import { useState } from "react";
import { BsCalendar2DateFill } from "react-icons/bs";
import { VscLoading } from "react-icons/vsc";
import { IoLocation } from "react-icons/io5";
Expand Down

0 comments on commit c61aca8

Please sign in to comment.