Skip to content

Commit 27779e2

Browse files
Khakim AidarkhanovKhakim Aidarkhanov
Khakim Aidarkhanov
authored and
Khakim Aidarkhanov
committed
Merge main into sync-a1cc2ab4, resolve conflicts
2 parents fe856fb + 33bcea5 commit 27779e2

File tree

5 files changed

+21
-44
lines changed

5 files changed

+21
-44
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<<<<<<< HEAD
3939
"next": "15.4.8",
4040
=======
41-
"next": "15.1.12",
42-
>>>>>>> a1cc2ab4bf06b530f86a7049923c402baf86aca1
41+
"next": "15.1.9",
42+
>>>>>>> e22544e68d6fffda33332771efe27034739f35a4
4343
"next-remote-watch": "^1.0.0",
4444
"parse-numeric-range": "^1.2.0",
4545
"react": "^19.0.0",

‎src/components/Layout/HomeContent.js‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -251,20 +251,12 @@ export function HomeContent() {
251251
фулл-стекке өтіңіз
252252
</Header>
253253
<Para>
254-
<<<<<<< HEAD
255254
React - бұл бағдарламалық қосымша. Ол компоненттерді біріктіруге
256255
мүмкіндік береді, бірақ маршруттау мен деректерді алу жолын
257-
көрсетпейді. React көмегімен толық бағдарлама құру үшін{' '}
258-
<Link href="https://nextjs.org">Next.js</Link> немесе{' '}
259-
<Link href="https://remix.run">Remix</Link> сияқты фулл-стекті
256+
көрсетпейді. React көмегімен толық бағдарлама құру үшін{‘ ‘}
257+
<Link href="https://nextjs.org">Next.js</Link> немесе{‘ ‘}
258+
<Link href="https://reactrouter.com">React Router</Link> сияқты фулл-стекті
260259
ұсынамыз
261-
=======
262-
React is a library. It lets you put components together, but it
263-
doesn’t prescribe how to do routing and data fetching. To build an
264-
entire app with React, we recommend a full-stack React framework
265-
like <Link href="https://nextjs.org">Next.js</Link> or{' '}
266-
<Link href="https://reactrouter.com">React Router</Link>.
267-
>>>>>>> a1cc2ab4bf06b530f86a7049923c402baf86aca1
268260
</Para>
269261
</Center>
270262
<FullBleed>
@@ -282,13 +274,8 @@ export function HomeContent() {
282274
<CTA
283275
color="gray"
284276
icon="framework"
285-
<<<<<<< HEAD
286277
href="/learn/start-a-new-react-project">
287278
Фреймворктен бастаңыз
288-
=======
289-
href="/learn/creating-a-react-app">
290-
Get started with a framework
291-
>>>>>>> a1cc2ab4bf06b530f86a7049923c402baf86aca1
292279
</CTA>
293280
</div>
294281
</Center>

‎src/content/learn/thinking-in-react.md‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,9 @@ React қосымшасымен UI жасаған кезде әдетте бір
3737

3838
Сіз өзіңіздің тәжірибеңізге байланысты дизайнды компонентерге бөлyге болытын жолдар:
3939

40-
<<<<<<< HEAD
41-
* **Программалау**--қарапайым функцияны немесе объект жасау туралы шешім қабылдаған кездегі тәсілді қолданыңыз. Техниканың бірі [single responsibility principle](https://en.wikipedia.org/wiki/Single_responsibility_principle), бір компонент бір тапсырманы орындауы тиіс. Егер функционал уақыт өте келе ұлғайса, оны кішірек ішкі құрамдастарға бөлу керек.
40+
* **Программалау**--қарапайым функцияны немесе объект жасау туралы шешім қабылдаған кездегі тәсілді қолданыңыз. Техниканың бірі [separation of concerns](https://en.wikipedia.org/wiki/Separation_of_concerns), бір компонент бір тапсырманы орындауы тиіс. Егер функционал уақыт өте келе ұлғайса, оны кішірек ішкі құрамдастарға бөлу керек.
4241
* **CSS**--ойлаңыз, неліктен класс селектірін жасайтындығыңызды. (Дегенмен компоненттер соншалықты кішірейтілмегенін есте сақтаңыз.)
4342
* **Дизайн**--дизайн қабаттарын қалай ұйымдастыратыныңызды ойлаңыз.
44-
=======
45-
* **Programming**--use the same techniques for deciding if you should create a new function or object. One such technique is the [separation of concerns](https://en.wikipedia.org/wiki/Separation_of_concerns), that is, a component should ideally only be concerned with one thing. If it ends up growing, it should be decomposed into smaller subcomponents.
46-
* **CSS**--consider what you would make class selectors for. (However, components are a bit less granular.)
47-
* **Design**--consider how you would organize the design's layers.
48-
>>>>>>> a1cc2ab4bf06b530f86a7049923c402baf86aca1
4943

5044
Егер сіздің JSON жақсы құрылымдалған болса, cіз оның UI компонент құрылымына табиғи түрде сәйкес келетінін жиі байқайсыз. Себебі UI және деректер үлгілері жиі бірдей ақпараттық архитектураға, яғни бірдей пішінге ие болады. Пайдаланушы интерфейсін компонентерге бөліңіз, олардың әрқайсысы деректер үлгісінің бір бөлігін көрсетеді.
5145

‎src/content/reference/react/Activity.md‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,8 @@ In this way, Activity can thought of as a mechanism for rendering "background ac
4747

4848
#### Caveats {/*caveats*/}
4949

50-
<<<<<<< HEAD
51-
- When used with `<ViewTransition>`, hidden activities that reveal in a transition will activate an "enter" animation. Visible Activities hidden in a transition will activate an "exit" animation.
52-
=======
53-
- If an Activity is rendered inside of a [ViewTransition](/reference/react/ViewTransition), and it becomes visible as a result of an update caused by [startTransition](/reference/react/startTransition), it will activate the ViewTransition's `enter` animation. If it becomes hidden, it will activate its `exit` animation.
54-
- A *hidden* Activity that just renders text will not render anything rather than rendering hidden text, because there’s no corresponding DOM element to apply visibility changes to. For example, `<Activity mode="hidden"><ComponentThatJustReturnsText /></Activity>` will not produce any output in the DOM for `const ComponentThatJustReturnsText = () => "Hello, World!"`. `<Activity mode="visible"><ComponentThatJustReturnsText /></Activity>` will render visible text.
55-
>>>>>>> a1cc2ab4bf06b530f86a7049923c402baf86aca1
50+
- If an Activity is rendered inside of a [ViewTransition](/reference/react/ViewTransition), and it becomes visible as a result of an update caused by [startTransition](/reference/react/startTransition), it will activate the ViewTransition’s `enter` animation. If it becomes hidden, it will activate its `exit` animation.
51+
- An Activity that just renders text will not render anything rather than rendering hidden text, because there’s no corresponding DOM element to apply visibility changes to. For example, `<Activity mode="hidden"><ComponentThatJustReturnsText /></Activity>` will not produce any output in the DOM for `const ComponentThatJustReturnsText = () => "Hello, World!"`.
5652

5753
---
5854

‎yarn.lock‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,11 +1265,11 @@
12651265
resolved "https://registry.yarnpkg.com/@next/env/-/env-15.4.8.tgz#f41741d07651958bccb31fb685da0303a9ef1373"
12661266
integrity sha512-LydLa2MDI1NMrOFSkO54mTc8iIHSttj6R6dthITky9ylXV2gCGi0bHQjVCtLGRshdRPjyh2kXbxJukDtBWQZtQ==
12671267
=======
1268-
"@next/env@15.1.12":
1269-
version "15.1.12"
1270-
resolved "https://registry.yarnpkg.com/@next/env/-/env-15.1.12.tgz#0821510fa71871f1970cd216963d25a5970fe58a"
1271-
integrity sha512-EWKXZKsd9ZNn+gLqOtfwH2PQyWuWFmpLldjStw7mZgWgKu56vaqNkAGQrys2g5ER4CNXEDz3Khj2tD1pnsT9Uw==
1272-
>>>>>>> a1cc2ab4bf06b530f86a7049923c402baf86aca1
1268+
"@next/env@15.1.9":
1269+
version "15.1.9"
1270+
resolved "https://registry.yarnpkg.com/@next/env/-/env-15.1.9.tgz#3569b6dd6a9b0af998fc6e4902da6b9ed2fc36c9"
1271+
integrity sha512-Te1wbiJ//I40T7UePOUG8QBwh+VVMCc0OTuqesOcD3849TVOVOyX4Hdrkx7wcpLpy/LOABIcGyLX5P/SzzXhFA==
1272+
>>>>>>> e22544e68d6fffda33332771efe27034739f35a4
12731273

12741274
"@next/eslint-plugin-next@12.0.3":
12751275
version "12.0.3"
@@ -1358,7 +1358,7 @@
13581358
version "15.1.9"
13591359
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.1.9.tgz#92044825d0f9e017d6a27ab69fc8c8f5ca9dc239"
13601360
integrity sha512-SBB0oA4E2a0axUrUwLqXlLkSn+bRx9OWU6LheqmRrO53QEAJP7JquKh3kF0jRzmlYOWFZtQwyIWJMEJMtvvDcQ==
1361-
>>>>>>> a1cc2ab4bf06b530f86a7049923c402baf86aca1
1361+
>>>>>>> e22544e68d6fffda33332771efe27034739f35a4
13621362

13631363
"@nodelib/fs.scandir@2.1.5":
13641364
version "2.1.5"
@@ -5845,14 +5845,14 @@ next@15.4.8:
58455845
dependencies:
58465846
"@next/env" "15.4.8"
58475847
=======
5848-
next@15.1.12:
5849-
version "15.1.12"
5850-
resolved "https://registry.yarnpkg.com/next/-/next-15.1.12.tgz#6d308fe6cb295faed724481b57f77b8abf4f5468"
5851-
integrity sha512-fClyhVCGTATGYBnETgKAi7YU5+bSwzM5rqNsY3Dg5wBoBMwE0NSvWA3fzwYj0ijl+LMeiV8P2QAnUFpeqDfTgw==
5848+
next@15.1.9:
5849+
version "15.1.9"
5850+
resolved "https://registry.yarnpkg.com/next/-/next-15.1.9.tgz#eaab46d7a57c881fadf748d8ba2a8c65ec27ad8f"
5851+
integrity sha512-OoQpDPV2i3o5Hnn46nz2x6fzdFxFO+JsU4ZES12z65/feMjPHKKHLDVQ2NuEvTaXTRisix/G5+6hyTkwK329kA==
58525852
dependencies:
5853-
"@next/env" "15.1.12"
5853+
"@next/env" "15.1.9"
58545854
"@swc/counter" "0.1.3"
5855-
>>>>>>> a1cc2ab4bf06b530f86a7049923c402baf86aca1
5855+
>>>>>>> e22544e68d6fffda33332771efe27034739f35a4
58565856
"@swc/helpers" "0.5.15"
58575857
caniuse-lite "^1.0.30001579"
58585858
postcss "8.4.31"
@@ -5878,7 +5878,7 @@ next@15.1.12:
58785878
"@next/swc-win32-arm64-msvc" "15.1.9"
58795879
"@next/swc-win32-x64-msvc" "15.1.9"
58805880
sharp "^0.33.5"
5881-
>>>>>>> a1cc2ab4bf06b530f86a7049923c402baf86aca1
5881+
>>>>>>> e22544e68d6fffda33332771efe27034739f35a4
58825882

58835883
nice-try@^1.0.4:
58845884
version "1.0.5"

0 commit comments

Comments
 (0)