Conversation
bugra9
force-pushed
the
v2
branch
4 times, most recently
from
0616eec to
94e641e
Compare
bugra9
force-pushed
the
v2
branch
4 times, most recently
from
fe9dd23 to
b105380
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
erenkucuker
added a commit
to erenkucuker/cpp.js
that referenced
this pull request
May 2, 2026
Both branches independently performed the v2 directory restructure
(packages/* → cppjs-{core,packages,plugins,samples}/*). Conflicts
resolved per the agreed grouping:
Group 1 — v2 restructure (cppjs-packages/*, cppjs-core/*): take main.
Main holds the canonical v2 PR (bugra9#53) with newer dependency versions
and the new target-system architecture (getTargetParams,
getFilteredBuildTargets, target.path = platform-arch-runtime-buildtype).
Group 2 — mobile templates: take main. Main upgraded
reactnative-cli/expo to Swift AppDelegate + the new expo `src/`
layout; v2-new-samples still had the older Objective-C / flat layout.
Group 4 — false-positive UD/AA from rename detection: restored from
origin/v2-new-samples (959ee3a). Git's rename detection paired
v2-new-samples' new *-multithread/* and nuxt/remix native files
with main's deleted packages/* paths, marking them as conflicts
even though main never had those paths. 50 files restored.
Group 5 — workspace/CI/lockfile: take main. cppjs-core-create-app's
package.json kept main's structure but manually merged in the new
multithread/next/nuxt sample workspace dependencies.
Plugins (cppjs-plugins/*) currently hold main's clean version. The
SSR + multithread enhancements from v2-new-samples (commit a5299ca)
will be ported on top of main's new target API in a separate commit.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
[x] Add multithreading support
[x] Introduce extension system
[x] Integrate OpenSSL
[x] Integrate cURL
[x] Refactor directory structure
[x] Split platforms into separate packages
[x] Implement JSPI
[ ] Add pointer support
[ ] Add Conan2 package support
[ ] Add react-native-web support
Considered, but may not be included in the package
[ ] Add Windows build support
[ ] Add MacOS build support
[ ] Add Linux build support
[ ] Add react-native-macos support
[ ] Add react-native-windows support
[ ] Add Rust language support
[ ] Add Go language support
[ ] Add Kotlin language support