Skip to content

Commit 98a32a5

Browse files
authored
Merge branch 'main' into patch-1
Signed-off-by: Viacheslav Muravyev <slavamuravey@mail.ru>
2 parents 05f5e10 + fa01ac6 commit 98a32a5

File tree

76 files changed

+3921
-1830
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+3921
-1830
lines changed

.github/workflows/publish-packages.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,11 @@ jobs:
116116
# Check if a custom publish script exists in package.json
117117
if jq -e '.scripts.release' package.json > /dev/null; then
118118
pnpm run release
119-
else
120-
pnpm publish --access public --no-git-checks
121119
fi
122120
121+
# Then publish the package to npm
122+
pnpm publish --access public --no-git-checks
123+
123124
- name: Notify on Manual Release
124125
if: ${{ github.event_name == 'workflow_dispatch' }}
125126
uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # 2.3.3

apps/site/components/Common/Partners/index.module.css

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,3 @@
1414
grid-cols-[repeat(auto-fill,minmax(240px,1fr))]
1515
gap-4;
1616
}
17-
18-
.tooltip {
19-
@apply p-2
20-
text-neutral-900
21-
dark:text-neutral-200;
22-
}

apps/site/components/Common/Partners/index.tsx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import Tooltip from '@node-core/ui-components/Common/Tooltip';
21
import * as PartnerLogos from '@node-core/ui-components/Icons/PartnerLogos';
32

43
import providePartners from '#site/next-data/providers/partners';
@@ -36,15 +35,15 @@ const renderSmallPartner = (partner: Partner) => {
3635
const Logo = PartnerLogos[partner.id];
3736

3837
return (
39-
<Tooltip
38+
<PartnerButton
39+
aria-label={partner.name}
4040
key={partner.id}
41-
asChild
42-
content={<div className={style.tooltip}>{partner.name}</div>}
41+
size="small"
42+
href={partner.href}
43+
data-tooltip={partner.name}
4344
>
44-
<PartnerButton aria-label={partner.name} size="small" href={partner.href}>
45-
<Logo.Favicon />
46-
</PartnerButton>
47-
</Tooltip>
45+
<Logo.Favicon />
46+
</PartnerButton>
4847
);
4948
};
5049

apps/site/components/withMetaBar.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ const WithMetaBar: FC = () => {
3535
// Since we cannot show the same number of avatars in Mobile / Tablet
3636
// resolution as we do on desktop and there is overflow, we are adjusting
3737
// the number of avatars manually for the resolutions below
38-
const isMobileResolution = useMediaQuery('(max-width: 890px)');
39-
40-
const isTabletResolution = useMediaQuery(
41-
'(min-width: 890px) and (max-width: 1280px)'
42-
);
38+
const isSmallerThanDesktop = useMediaQuery('(max-width: 1280px)');
4339

4440
return (
4541
<MetaBar
@@ -55,7 +51,7 @@ const WithMetaBar: FC = () => {
5551
)]: (
5652
<WithAvatarGroup
5753
usernames={usernames}
58-
limit={isMobileResolution ? 7 : isTabletResolution ? 5 : 9}
54+
limit={isSmallerThanDesktop ? 5 : 8}
5955
/>
6056
),
6157
}),

apps/site/layouts/Post.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ const PostLayout: FC<PropsWithChildren> = ({ children }) => {
2626
<WithNavBar />
2727

2828
<div className={styles.contentLayout}>
29+
<div></div>
30+
2931
<div className={styles.postLayout}>
3032
<main id="main" tabIndex={-1}>
3133
{type === 'vulnerability' && <EOLAlert />}

apps/site/layouts/layouts.module.css

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
@reference "../styles/index.css";
22

33
.baseLayout {
4-
@apply grid
4+
@apply ml:grid
5+
ml:grid-cols-[1fr]
6+
ml:grid-rows-[auto_1fr_auto]
57
h-max
68
min-h-full
7-
w-full
8-
grid-cols-[1fr]
9-
grid-rows-[auto_1fr_auto];
9+
w-full;
1010
}
1111

1212
.centeredLayout {
@@ -104,7 +104,7 @@
104104
justify-center;
105105

106106
main {
107-
@apply max-w-5xl
107+
@apply max-w-7xl
108108
gap-4
109109
px-4
110110
py-12
@@ -135,17 +135,19 @@
135135
}
136136

137137
.contentLayout {
138-
@apply max-w-8xl
138+
@apply max-w-10xl
139139
max-ml:m-0
140-
max-ml:block
140+
3xl:grid-cols-[--spacing(80)_1fr_--spacing(80)]
141+
ml:grid-cols-[0_1fr_--spacing(56)]
142+
ml:grid
141143
mx-auto
142-
grid
144+
block
143145
w-full
144146
grid-rows-[1fr]
145-
sm:grid-cols-[1fr_--spacing(52)]
146-
xl:grid-cols-[1fr_--spacing(80)];
147+
xl:grid-cols-[--spacing(56)_1fr_--spacing(64)]
148+
2xl:grid-cols-[--spacing(72)_1fr_--spacing(72)];
147149

148-
> *:nth-child(1) {
150+
> *:nth-child(2) {
149151
@apply bg-gradient-subtle
150152
dark:bg-gradient-subtle-dark
151153
max-ml:border-l-0
@@ -164,13 +166,12 @@
164166
dark:border-l-neutral-900;
165167

166168
main {
167-
@apply max-w-[660px]
168-
gap-4
169+
@apply gap-4
169170
wrap-anywhere;
170171
}
171172
}
172173

173-
> *:nth-child(2) {
174+
> *:nth-child(3) {
174175
@apply ml:mt-0
175176
ml:max-w-xs
176177
ml:border-l

apps/site/next-data/generators/majorNodeReleases.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import nodevu from '@nodevu/core';
44

5-
import { fetchWithRetry } from '#site/util/fetch';
5+
import { fetchWithRetry } from '#site/next.fetch.mjs';
66

77
/**
88
* Filters Node.js release data to return only major releases with documented support.

apps/site/next-data/generators/supportersData.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { OPENCOLLECTIVE_MEMBERS_URL } from '#site/next.constants.mjs';
2-
import { fetchWithRetry } from '#site/util/fetch';
2+
import { fetchWithRetry } from '#site/next.fetch.mjs';
33

44
/**
55
* Fetches supporters data from Open Collective API, filters active backers,

apps/site/next-data/generators/vulnerabilities.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { VULNERABILITIES_URL } from '#site/next.constants.mjs';
2-
import { fetchWithRetry } from '#site/util/fetch';
2+
import { fetchWithRetry } from '#site/next.fetch.mjs';
33

44
const RANGE_REGEX = /([<>]=?)\s*(\d+)(?:\.(\d+))?/;
55
const V0_REGEX = /^0\.\d+(\.x)?$/;

apps/site/next.calendar.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
BASE_CALENDAR_URL,
55
SHARED_CALENDAR_KEY,
66
} from './next.calendar.constants.mjs';
7-
import { fetchWithRetry } from './util/fetch';
7+
import { fetchWithRetry } from './next.fetch.mjs';
88

99
/**
1010
*

0 commit comments

Comments
 (0)