-
Notifications
You must be signed in to change notification settings - Fork 0
Set up a minimal D2 site #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
PR is now ready for review! :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @teikjun
Can you fix the netlify warning and ensure https is used on gravatar URLs?
https://github.com/react-native-website-migration/react-native-website/pull/2/checks?check_run_id=1041310406
Also I've noticed that some docs are different from upstream. I guess you cherry-picked existing commits but the original docs did change in the meantime right?
I think it's not a big deal for how, as we'll need to integrate the latest docs changes when we are ready (and maybe include a few more versions), we'll need to re-run the docs migration anyway.
docs/appregistry.md
Outdated
|
||
```jsx | ||
static getRunnable(appKey) | ||
static registerComponent(appKey, componentProvider, section?) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was wondering why this is changed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I may have resolved the merge conflict incorrectly. I will revert fix errors in docs
and try again
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's an issue with the original commit (not the merging), we'll check the other docs too
yup, I've made the changes already, will push soon (edit: done! it's in |
| ---- | ---- | -------- | ----------- | | ||
|
||
|
||
<<<<<<< HEAD | keyValuePairs | `Array<Array<string>>` | Yes | Array of key-value array for the items to set. | ======= | keyValuePairs | `Array<Array <string>>` | Yes | Array of key-value array for the items to set. | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merge headers present
| ---- | ---- | -------- | ----------- | | ||
|
||
|
||
<<<<<<< HEAD | keyValuePairs | `Array<Array<string>>` | Yes | Array of key-value array for the items to merge. | ======= | keyValuePairs | `Array<Array <string>>` | Yes | Array of key-value array for the items to merge. | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merge headers present
@teikjun Also, in asyncstorage.md ( all versions ) you should ideally merge the current change instead of the incoming while cherry-picking since the upstream files don't have a space while our versions do, less files with changes if we ignore the space. it's trivial |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still some unresolved merge headers present
#2 (comment)
#2 (comment)
@darshkpatel thanks, I'll make the changes! |
This reverts commit 0a314ba.
Its because commits there were referenced from an old master, the master has changed since then. |
we also shouldn't be merging PRs to master since the bot will reset all the changes |
made the requested changes, and opened a PR against |
Summary
This PR sets up a minimal D2 site.
With reference to
docs/v2-migration
branch:6d1057f: fix errors in docs
.a663bc7
and684e70b
) to keep the PR minimal.Log
class
toclassName
, changestyle="..."
tostyle={{...}}
.Suggestions for next PRs
a663bc7
and684e70b
)The next PRs should be much smaller
Remarks
The bug that results in disappearing doc content is already present at this stage.