Conversation
mdo
force-pushed
the
mv-docs
branch
2 times, most recently
from
62b4535 to
f91e7ff
Compare
|
Oops, sorry for the conflicts. I haven't tested this myself, I will try it, but I'm not sure how many things one can catch locally :/ I mean, most, if not all of the issues, emerged in the live site. |
That's right, and those all resulted from the versioning of our docs and me manually moving directories around and then globally find-and-replacing paths. Was bound to blow up in my face :). We'll know soon enough! And no worries on conflicts, I can resolve. |
mdo
force-pushed
the
mv-docs
branch
3 times, most recently
from
322726c to
0ce65aa
Compare
|
Looks good to me. Are there any other such changes in the branch? I still haven't had the time to test the branch :/ I'll do it later today. |
|
@XhmikosR Pushed some more changes to fine tune the |
| "bundlesize": "^0.15.3", | ||
| "clean-css-cli": "^4.1.11", | ||
| "coveralls": "^3.0.1", | ||
| "cpx": "^1.5.0", |
There was a problem hiding this comment.
Why do we need cpx? We already have shx.
| - sache.json | ||
| - twbsconfig.yml | ||
| - docs/4.1/assets/scss/ | ||
| - docs/4.1/assets/js/src/ |
There was a problem hiding this comment.
This is needed for development.
|
Service worker generation is currently broken ( Also, I'm not sure the redirects make sense any more; we'd need to check each one. And it seems one has to manually run the In that case, we are better off hooking up a |
|
@XhmikosR For our service worker file, do we need to version that as well I assume? Would replacing it with v4.2's cause issues for the docs in |
|
I'm not sure about it, TBH. In theory, since the service worker is registered in the root, it will cover everything for us. I still need to test this locally and try and see if there's something else broken. |
|
@mdo: can you do a rebase against v4-dev? |
|
@XhmikosR I added some script changes to simplify local dev and more. Check out 21c3af9 and 492d3b5 when you have time—this should ensure the copy tasks happen at all times. I've tested changes to docs CSS and JS, as well as the main CSS and JS. Also tested running the
|
|
@mdo: I'm gonna try to test this branch in the next days and let you know. A couple of things:
|
|
Oh, might be one of your extensions for issue 2. |
|
Can confirm, it's from an extension. Disabled them and it's clear. Broken tests appear to be from broken links—reviewing those now. And yes, feel free to force push after tests are fixed :). |
|
@mdo: what should I do with https://github.com/twbs/bootstrap/compare/mv-docs-rebased? |
|
Also, @mdo do you want this in 4.1.2 or 4.2.0? If it's 4.1.2 I'll test it ASAP today or tomorrow. |
With the current docs directory setup, I'm making too many mistakes and have to manually address path changes and directory moves on deploy. This makes for a frustrating experience developing locally and shipping releases. With this PR, we're basically back to the same setup from v3—duplicating the dist directory into our docs directory. Not the most ideal, but very straightforward for me as the release manager.
- Updates nodemon scripts to watch specific directories instead of ignoring several - Split watch tasks for CSS and JS into main and docs - Add docs-watch script to serve the docs instead of just build - Add new start script so that instead of two tabs, one for docs-watch and one for watch, we just run npm start
|
CI failures are very likely rate limits, so merging away! |
5 participants
With the current docs directory setup, I'm making too many mistakes and have to manually address path changes and directory moves on deploy. This makes for a frustrating experience developing locally and shipping releases. With this PR, we're basically back to the same setup from v3—duplicating the
dist/directory into oursite/docs/directory. Not the most ideal, but very straightforward for me as the release manager.I still need to double check the service worker stuff, asset paths, and confirm the watch tasks pickup the copy-pasta.
/cc @twbs/team
mkdir sitegit mv docs/ site/docs/git mv _layouts/ site/_layouts/git mv _data/ site/_data/git mv _includes site/_includes/git mv assets site/docs/4.1/assets/_config.yml'ssourceto"site"git mv favicon.ico site/favicon.icogit mv index.html site/index.htmlgit mv sw.js site/sw.jsgit mv robots.txt site/robots.txtsw.jspathpackage.jsonscripts do duplicatedistintositedirectorycss-mainneeds&& cp -r dist/css/ site/docs/4.1/dist/css/addedjs-mainneeds&& cp -r dist/js/ site/docs/4.1/dist/js/addedFixes #26637 and fixes #26267 along the way.