Skip to content

Fix deploy error and deploy test case - #2346

Merged
tlylt merged 2 commits into
MarkBind:masterfrom
WillCWX:2333-fix-deploy
Jul 30, 2023
Merged

Fix deploy error and deploy test case#2346
tlylt merged 2 commits into
MarkBind:masterfrom
WillCWX:2333-fix-deploy

Conversation

@WillCWX

@WillCWXWillCWX commented Jul 24, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

What is the purpose of this pull request?

  • Documentation update
  • Bug fix
  • Feature addition or enhancement
  • Code maintenance
  • DevOps
  • Improve developer experience
  • Others, please explain:

Close#2333
Related to #2331

Overview of changes:

  • Migrate Site/index.js to TypeScript again.
  • Change options.remote to be defaultOptionConfig.remote instead of ''
    • This fixes the deploy error
  • Remove options.remote = defaultDeployConfig.remote in getDepUrl
    • This fixes the false negative for the deploy test case

Anything you'd like to highlight/discuss:

No

Testing instructions:

set up a test repo that with github pages
run markbind deploy

Proposed commit message: (wrap lines at 72 characters)

Fix deploy error and deploy test case

Checklist: ☑️

  • Updated the documentation for feature additions and enhancements
  • Added tests for bug fixes or features
  • Linked all related issues
  • No unrelated changes

tlylt
tlylt reviewed Jul 24, 2023
View reviewed changes
Comment threadpackages/core/template/default/index.md
tlylt
tlylt reviewed Jul 25, 2023
View reviewed changes
Comment threadpackages/core/template/default/site.json
@tlylt
tlylt self-requested a review July 26, 2023 12:13
tlylt
tlylt requested changes Jul 29, 2023
View reviewed changes

@tlylttlylt left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @WillCWX for working on this PR. I have a few comments. Main issues:

  • Could you take another look at the original PR and the changes made? https://github.com/MarkBind/markbind/pull/2270/files
    • I'm not sure why some changes (deletion, type assertions) that were made are not transferred back in this PR. I have pointed out a few places but I realized they are not done properly. If you have any concerns or comments as to why those are not necessary changes, please indicate for discussion.
  • After everything is done, will need to re-organize into 2 commits as specified in the DG, one for rename, and one for migration. (Please rebase first as well)

Comment thread.gitignore
Comment threadpackages/core/src/Site/index.ts Outdated
Comment threadpackages/core/src/Site/index.ts Outdated
Comment threadpackages/core/src/Site/index.ts Outdated
Comment threadpackages/core/src/Site/index.ts Outdated
Comment threadpackages/core/src/Site/index.ts
Comment threadpackages/core/src/Site/index.ts Outdated
Comment threadpackages/core/src/Site/index.ts
Comment threadpackages/core/src/Site/index.ts Outdated
Comment threadpackages/core/src/Site/index.ts
@WillCWX

WillCWX commented Jul 29, 2023

Copy link
Copy Markdown
ContributorAuthor

I've compared the current migration with the previous PR and also the v5.0.0 file and made the changes accordingly.
I have followed the previous versions, except for some small comment (deleting extra spaces) / positioning changes.

As requested, I've removed the comments noted and also all the {Type} in @param {Type}.

@WillCWX

WillCWX commented Jul 29, 2023

Copy link
Copy Markdown
ContributorAuthor

If its ok, I'll merge with master to update the branch and then rebase into two commits as mentioned in the docs.

@tlylt

tlylt commented Jul 29, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Oh wait sorry let me do a final check

@tlylt

tlylt commented Jul 30, 2023

Copy link
Copy Markdown
Contributor

👍 @WillCWX can organize and will merge after that's done

@WillCWX
Rename Site/index.js to TypeScript
de19656
@WillCWX
Adapt Site/index to TypeScript
da60c0d
Site/index.ts was previously bugged and caused errors with markbind
deploy. As a stopgap measure, Site/index.ts was re-adapted back to JS.
The bug has now been identified along with a fix, however,
Site/index will need to be remigrated back to TS. The false negative
test case in deploy has also been identifed and will be fixed as well.
Let's remigrate Site/index to TS, fix the deploy option that caused
the markbind deploy bug and also fix the negative test case that failed
to detect the bug.
Migration was made according to the original migration PR and the latest
v5.0.0.
@WillCWX
WillCWX requested a review from tlyltJuly 30, 2023 05:33
@tlylttlylt added this to the v5.0.2 milestone Jul 30, 2023
@tlylt
tlylt merged commit 77d6410 into MarkBind:masterJul 30, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tlylttlylttlylt approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v5.0.2

Development

Successfully merging this pull request may close these issues.

markbind deploy error after migrating Site/index.js to TypeScript

2 participants

@WillCWX@tlylt