Skip to content
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

Nue 1.0 (beta) #316

Merged
merged 190 commits into from
Aug 15, 2024
Merged

Nue 1.0 (beta) #316

merged 190 commits into from
Aug 15, 2024

Conversation

tipiirai
Copy link
Contributor

A major release

nobkd and others added 30 commits March 28, 2024 01:21
chore(cli): make executable filtering more robust
docs: update cli options help
chore: ignore coverage directory
fix: page router fixed and tests added - #263
@tipiirai
Copy link
Contributor Author

@nobkd as expected, the dev branch has conflicts with the master. Do you know if there is anything worth taking from the master? Do you have experience in merging these big changes? Is there an easy way to do a force-merge without conflicts and then maybe cherry pick only what is needed. Thanks!

@nobkd
Copy link
Collaborator

nobkd commented Aug 14, 2024

I'm not sure.

Here are the commits you did to master after you moved most commits to dev: dev...master

These should be the only changes you did, so maybe you can just remove them from master and redo them, when they are important?


That's just 3 commits:

  • 0813c6c (skip long header id's. Is the largest commit, and I don't know if it is already done differently on dev)
  • 9338c80 (monster update notice, can probably removed)
  • 043ce76 (small readme changes)

Of course you can also just try a local merge if you want to, and decide for/against changes in a merge editor. Will probably be the easiest, if the changes aren't too huge... 🤷‍♂️


You can also create a new branch based on up to date dev, merge master in the new branch, run tests, etc. and then merge that new branch into dev. then the merge conflicts between master and dev should be resolved.

@tipiirai
Copy link
Contributor Author

True. There are far less conflicts than I thought. I'll probably just use the web editor to resolve them, which is my favourite Git client :)

@tipiirai
Copy link
Contributor Author

btw: does Nue work on Windows?

@nobkd
Copy link
Collaborator

nobkd commented Aug 15, 2024

btw: does Nue work on Windows?

It should. The PRs that fixed the path issues, have been merged looong ago, there just was no release after that.

The old create-nue package still fails because of nuejs/create-nue#43 not being merged+released, but as we now have a new command that should be irrelevant.

I can still do some tests now, to confirm that it works. (I'll start my vm now)

btw: when I tested stuff with bun on windows, there were no issues. so bun seems to be stable there.

@nobkd
Copy link
Collaborator

nobkd commented Aug 15, 2024

Found no issues with nue on windows for now. I'll try to find a way to start nue with node, but where.exe doesn't work as i would expect, and that there are extra executables on windows doesn't make it better...


Okay... when running nue -r .\simple-blog\ (auto-completed), I get a problem real fast.....

\.dist\dev\.dist\dev\.dist\dev\.dist\dev\.dist\dev\.dist\dev\.dist\dev\.dist\dev\.dist\dev\.dist\dev\.dist\dev\.dist\dev\.dist\dev\.dist\dev\.dist\dev\.dist\dev\.dist\dev\.dist\dev\.dist\dev\img\favicon.jpg

not sure what happened there, but I'll investigate that sooner or later.. okay. seems like somewhere there are issues with \es... running with just nue -r simple-blog\ also triggers the issue. nue -r Desktop\simple-blog and .\Desktop\simple-blog doesn't, so it has to have to do with ending with backslash.

Will try to find the reason tomorrow, but can't predict to really resolve it 😅


running create works flawlessly, building nuejs.org as well, page-router test project also works.

Only problem for now stays the backslashes on end of root

@tipiirai
Copy link
Contributor Author

Sounds very promising! Looks like we can get Windows support for the official 1.0

@tipiirai tipiirai merged commit d591370 into master Aug 15, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants