Skip to content

Commit 3b8aceb

Browse files
hg-pyunhg-pyun
committed
fix: resolve conflict
1 parent 57282d1 commit 3b8aceb

File tree

6 files changed

+14
-65
lines changed

6 files changed

+14
-65
lines changed

‎package.json‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,29 @@
44
"scripts": {
55
"analyze": "ANALYZE=true next build",
66
"dev": "next-remote-watch ./src/content",
7-
<<<<<<< HEAD
87
"build": "yarn cache-reset && next build && node --experimental-modules ./scripts/downloadFonts.mjs",
9-
"lint": "next lint",
10-
"lint:fix": "next lint --fix",
11-
=======
12-
"build": "next build && node --experimental-modules ./scripts/downloadFonts.mjs",
138
"lint": "next lint && eslint \"src/content/**/*.md\"",
149
"lint:fix": "next lint --fix && eslint \"src/content/**/*.md\" --fix",
15-
>>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
1610
"format:source": "prettier --config .prettierrc --write \"{plugins,src}/**/*.{js,ts,jsx,tsx,css}\"",
1711
"nit:source": "prettier --config .prettierrc --list-different \"{plugins,src}/**/*.{js,ts,jsx,tsx,css}\"",
1812
"prettier": "yarn format:source",
1913
"prettier:diff": "yarn nit:source",
2014
"lint-heading-ids": "node scripts/headingIdLinter.js",
2115
"fix-headings": "node scripts/headingIdLinter.js --fix",
22-
<<<<<<< HEAD
23-
"ci-check": "npm-run-all prettier:diff --parallel lint tsc lint-heading-ids rss lint-editorconfig",
24-
=======
25-
"ci-check": "npm-run-all prettier:diff --parallel lint tsc lint-heading-ids rss deadlinks",
26-
>>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
16+
"ci-check": "npm-run-all prettier:diff --parallel lint tsc lint-heading-ids rss deadlinks lint-editorconfig",
2717
"tsc": "tsc --noEmit",
2818
"start": "next start",
2919
"postinstall": "yarn --cwd eslint-local-rules install && is-ci || husky install .husky",
3020
"check-all": "npm-run-all prettier lint:fix tsc rss",
3121
"rss": "node scripts/generateRss.js",
32-
<<<<<<< HEAD
3322
"cache-reset": "rm -rf node_modules/.cache && rm -rf .next && yarn cache clean",
3423
"lint-editorconfig": "yarn editorconfig-checker",
3524
"textlint-test": "yarn mocha ./textlint/tests/utils && yarn mocha ./textlint/tests/rules",
3625
"textlint-docs": "node ./textlint/generators/genTranslateGlossaryDocs.js && git add wiki/translate-glossary.md",
37-
"textlint-lint": "yarn textlint ./src/content --rulesdir ./textlint/rules -f pretty-error && npx --yes eslint@9 -c eslint.config.mjs"
38-
=======
26+
"textlint-lint": "yarn textlint ./src/content --rulesdir ./textlint/rules -f pretty-error && npx --yes eslint@9 -c eslint.config.mjs",
3927
"deadlinks": "node scripts/deadLinkChecker.js",
4028
"copyright": "node scripts/copyright.js",
4129
"test:eslint-local-rules": "yarn --cwd eslint-local-rules test"
42-
>>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
4330
},
4431
"dependencies": {
4532
"@codesandbox/sandpack-react": "2.13.5",
@@ -79,24 +66,17 @@
7966
"asyncro": "^3.0.0",
8067
"autoprefixer": "^10.4.2",
8168
"babel-eslint": "10.x",
82-
<<<<<<< HEAD
8369
"babel-plugin-react-compiler": "19.0.0-beta-e552027-20250112",
84-
"editorconfig-checker": "^6.0.1",
85-
=======
86-
"babel-plugin-react-compiler": "^1.0.0",
8770
"chalk": "4.1.2",
88-
>>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
71+
"editorconfig-checker": "^6.0.1",
8972
"eslint": "7.x",
9073
"eslint-config-next": "12.0.3",
9174
"eslint-config-react-app": "^5.2.1",
9275
"eslint-plugin-flowtype": "4.x",
9376
"eslint-plugin-import": "2.x",
9477
"eslint-plugin-jsx-a11y": "6.x",
95-
<<<<<<< HEAD
96-
"eslint-plugin-mark": "^0.1.0-canary.2",
97-
=======
9878
"eslint-plugin-local-rules": "link:eslint-local-rules",
99-
>>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
79+
"eslint-plugin-mark": "^0.1.0-canary.2",
10080
"eslint-plugin-react": "7.x",
10181
"eslint-plugin-react-compiler": "^19.0.0-beta-e552027-20250112",
10282
"eslint-plugin-react-hooks": "^0.0.0-experimental-fabef7a6b-20221215",

‎src/components/MDX/Sandpack/NavigationBar.tsx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,10 @@ export function NavigationBar({providedFiles}: {providedFiles: Array<string>}) {
111111
*
112112
* Plus, it should only prompt if there's any file changes
113113
*/
114-
<<<<<<< HEAD
115114
if (
116115
sandpack.editorState === 'dirty' &&
117116
confirm('모든 수정 사항이 초기화됩니다. 계속하시겠습니까?')
118117
) {
119-
=======
120-
if (sandpack.editorState === 'dirty' && confirm('Clear all your edits?')) {
121-
>>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
122118
sandpack.resetAllFiles();
123119
}
124120
refresh();

‎src/sidebarBlog.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"path": "/blog/2025/04/23/react-labs-view-transitions-activity-and-more"
3434
},
3535
{
36-
<<<<<<< HEAD
3736
"title": "React Compiler RC",
3837
"titleForHomepage": "React Compiler RC",
3938
"icon": "blog",
@@ -42,9 +41,6 @@
4241
},
4342
{
4443
"title": "Create React App 지원 종료",
45-
=======
46-
"title": "Sunsetting Create React App",
47-
>>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
4844
"titleForHomepage": "Sunsetting Create React App",
4945
"icon": "blog",
5046
"date": "February 14, 2025",

‎src/sidebarHome.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@
8484
},
8585
{
8686
"hasSectionHeader": true,
87-
<<<<<<< HEAD
88-
"sectionHeader": "참여하기"
89-
=======
9087
"sectionHeader": "REACT COMPILER API"
9188
},
9289
{
@@ -104,7 +101,6 @@
104101
{
105102
"hasSectionHeader": true,
106103
"sectionHeader": "GET INVOLVED"
107-
>>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
108104
},
109105
{
110106
"title": "React 커뮤니티",

‎src/sidebarLearn.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@
6666
"path": "/learn/react-compiler/introduction"
6767
},
6868
{
69-
<<<<<<< HEAD
70-
"title": "React 컴파일러",
71-
"path": "/learn/react-compiler",
72-
"canary": true
73-
=======
7469
"title": "Installation",
7570
"path": "/learn/react-compiler/installation"
7671
},
@@ -81,7 +76,6 @@
8176
{
8277
"title": "Debugging and Troubleshooting",
8378
"path": "/learn/react-compiler/debugging"
84-
>>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
8579
}
8680
]
8781
},

‎yarn.lock‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2521,12 +2521,12 @@ babel-plugin-dynamic-import-node@^2.3.3:
25212521
dependencies:
25222522
object.assign "^4.1.0"
25232523

2524-
babel-plugin-react-compiler@^1.0.0:
2525-
version "1.0.0"
2526-
resolved "https://registry.yarnpkg.com/babel-plugin-react-compiler/-/babel-plugin-react-compiler-1.0.0.tgz#bdf7360a23a4d5ebfca090255da3893efd07425f"
2527-
integrity sha512-Ixm8tFfoKKIPYdCCKYTsqv+Fd4IJ0DQqMyEimo+pxUOMUR9cVPlwTrFt9Avu+3cb6Zp3mAzl+t1MrG2fxxKsxw==
2524+
babel-plugin-react-compiler@19.0.0-beta-e552027-20250112:
2525+
version "19.0.0-beta-e552027-20250112"
2526+
resolved "https://registry.yarnpkg.com/babel-plugin-react-compiler/-/babel-plugin-react-compiler-19.0.0-beta-e552027-20250112.tgz#f06f0436420bd09df5abf37337ecd8fb43b0d847"
2527+
integrity sha512-pUTT0mAZ4XLewC6bvqVeX015nVRLVultcSQlkzGdC10G6YV6K2h4E7cwGlLAuLKWTj3Z08mTO9uTnPP/opUBsg==
25282528
dependencies:
2529-
"@babel/types" "^7.26.0"
2529+
"@babel/types" "^7.19.0"
25302530

25312531
bail@^1.0.0:
25322532
version "1.0.5"
@@ -2733,7 +2733,7 @@ ccount@^2.0.0:
27332733
resolved "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz"
27342734
integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==
27352735

2736-
chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.0:
2736+
chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
27372737
version "4.1.2"
27382738
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
27392739
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2750,22 +2750,11 @@ chalk@^2.0.0, chalk@^2.4.1:
27502750
escape-string-regexp "^1.0.5"
27512751
supports-color "^5.3.0"
27522752

2753-
<<<<<<< HEAD
2754-
chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
2755-
version "4.1.2"
2756-
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
2757-
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
2758-
dependencies:
2759-
ansi-styles "^4.1.0"
2760-
supports-color "^7.1.0"
2761-
27622753
chalk@^5.4.1:
27632754
version "5.4.1"
27642755
resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.4.1.tgz#1b48bf0963ec158dce2aacf69c093ae2dd2092d8"
27652756
integrity sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==
27662757

2767-
=======
2768-
>>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
27692758
character-entities-html4@^1.0.0:
27702759
version "1.1.4"
27712760
resolved "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz"
@@ -3883,7 +3872,10 @@ eslint-plugin-jsx-a11y@^6.4.1:
38833872
safe-regex-test "^1.0.3"
38843873
string.prototype.includes "^2.0.0"
38853874

3886-
<<<<<<< HEAD
3875+
"eslint-plugin-local-rules@link:eslint-local-rules":
3876+
version "0.0.0"
3877+
uid ""
3878+
38873879
eslint-plugin-mark@^0.1.0-canary.2:
38883880
version "0.1.0-canary.2"
38893881
resolved "https://registry.yarnpkg.com/eslint-plugin-mark/-/eslint-plugin-mark-0.1.0-canary.2.tgz#b7b05eb6201aab0f3225c99f1c7274c4a0fde3e3"
@@ -3893,11 +3885,6 @@ eslint-plugin-mark@^0.1.0-canary.2:
38933885
"@types/mdast" "^4.0.4"
38943886
cheerio "^1.0.0"
38953887
emoji-regex "^10.4.0"
3896-
=======
3897-
"eslint-plugin-local-rules@link:eslint-local-rules":
3898-
version "0.0.0"
3899-
uid ""
3900-
>>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
39013888

39023889
eslint-plugin-react-compiler@^19.0.0-beta-e552027-20250112:
39033890
version "19.0.0-beta-e552027-20250112"

0 commit comments

Comments
 (0)