Skip to content

Commit afbae33

Browse files
authored
Merge pull request #2050 from jaimergp/docusaurus-homepage
conda-forge.org redesign: Homepage
2 parents 502fb38 + 373e157 commit afbae33

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+38203
-801
lines changed

.ci_scripts/environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ dependencies:
1717
- pip
1818
- python-rapidjson
1919
- termcolor
20+
- nodejs 20.*

.ci_scripts/generate_html.py

Lines changed: 0 additions & 55 deletions
This file was deleted.

.ci_scripts/update_docs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,17 @@
33
set -ex
44

55
# configure bot account
6-
git config --global user.email "[email protected]"
7-
git config --global user.name "conda-forge-admin"
6+
if [[ "$CI" == "1" ]]; then
7+
git config --global user.email "[email protected]"
8+
git config --global user.name "conda-forge-admin"
9+
git checkout -b new_site_content
10+
fi
811

9-
git checkout -b new_site_content
1012

1113
pushd sphinx/newsfeed
1214
pip install --no-deps .
1315
popd
1416

15-
python .ci_scripts/generate_html.py
16-
17-
# build docs into docs
18-
rm -rf docs/
19-
2017
python .ci_scripts/generate_cfep_index.py
2118

2219
pushd sphinx/src
@@ -32,6 +29,13 @@ if [[ "${GHREF}" != "refs/heads/main" ]]; then
3229
test "$linkcheck_failed" -eq 0
3330
fi
3431

35-
mv _build/html ../../docs
32+
# Move rendered Sphinx docs to a static directory for Docusaurus to use
33+
rm -rf ../../static-sphinx || true
34+
mkdir -p ../../static-sphinx
35+
mv _build/html ../../static-sphinx/docs
3636
rm -rf _build
3737
popd
38+
39+
# Build docusaurus site
40+
npm install
41+
npm run build

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ jobs:
3838
with:
3939
github_token: ${{ secrets.GITHUB_TOKEN }}
4040
publish_branch: gh-pages
41-
publish_dir: .
41+
publish_dir: ./build
4242
user_name: conda-forge-admin
4343
user_email: [email protected]

.gitignore

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,26 @@ elm-stuff
1919
sphinx/rtd/_build
2020
sphinx/rtd/default.profraw
2121
sphinx/newsfeed/demo/_build
22+
23+
# Sphinx output gets moved to Docusaurus' static folder
24+
/static-sphinx
25+
26+
# Docusaurus dependencies
27+
/node_modules
28+
29+
# Docusaurus production
30+
/build
31+
32+
# Generated files
33+
.docusaurus
34+
.cache-loader
35+
36+
# Misc
37+
.env.local
38+
.env.development.local
39+
.env.test.local
40+
.env.production.local
41+
42+
npm-debug.log*
43+
yarn-debug.log*
44+
yarn-error.log*

babel.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = {
2+
presets: [require.resolve("@docusaurus/core/lib/babel/preset")],
3+
};

0 commit comments

Comments
 (0)