Skip to content

Commit 449e89d

Browse files
committed
build, doc: move to redesign
Signed-off-by: avivkeller <me@aviv.sh>
1 parent 5d8693e commit 449e89d

6 files changed

Lines changed: 2348 additions & 575 deletions

File tree

.github/workflows/build-tarball.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ env:
6565
PYTHON_VERSION: '3.14'
6666
FLAKY_TESTS: keep_retrying
6767
CLANG_VERSION: '19'
68+
NODE_VERSION: lts/*
6869

6970
permissions:
7071
contents: read
@@ -82,6 +83,10 @@ jobs:
8283
with:
8384
python-version: ${{ env.PYTHON_VERSION }}
8485
allow-prereleases: true
86+
- name: Use Node.js ${{ env.NODE_VERSION }}
87+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
88+
with:
89+
node-version: ${{ env.NODE_VERSION }}
8590
- name: Environment Information
8691
run: npx envinfo@7.21.0
8792
- name: Make tarball

Makefile

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ VERSION=v$(RAWVER)
856856

857857
.PHONY: doc-only
858858
.NOTPARALLEL: doc-only
859-
doc-only: $(apidoc_dirs) $(apidocs_html) $(apidocs_json) out/doc/api/all.html out/doc/api/all.json out/doc/llms.txt out/doc/apilinks.json ## Builds the docs with the local or the global Node.js binary.
859+
doc-only: $(apidoc_dirs) $(apidocs_html) $(apidocs_json) out/doc/api/all.json out/doc/apilinks.json ## Builds the docs with the local or the global Node.js binary.
860860

861861
.PHONY: doc
862862
doc: $(NODE_EXE) doc-only ## Build Node.js, and then build the documentation with the new binary.
@@ -871,49 +871,15 @@ out/doc/api: doc/api
871871
mkdir -p $@
872872
cp -r doc/api out/doc
873873

874-
# Generate all doc files (individual and all.html/all.json) in a single doc-kit call
875-
# Using grouped targets (&:) so Make knows one command produces all outputs
876-
ifeq ($(OSTYPE),aix)
877-
# TODO(@nodejs/web-infra): AIX is currently hanging during HTML minification
878-
$(apidocs_html) $(apidocs_json) out/doc/api/all.html out/doc/api/all.json:
879-
@echo "Skipping $@ (not currently supported by $(OSTYPE) machines)"
880-
else ifeq ($(OSTYPE),os400)
881-
# TODO(@nodejs/web-infra): IBMi is currently hanging during HTML minification
882-
$(apidocs_html) $(apidocs_json) out/doc/api/all.html out/doc/api/all.json:
883-
@echo "Skipping $@ (not currently supported by $(OSTYPE) machines)"
884-
else
885-
$(apidocs_html) $(apidocs_json) out/doc/api/all.html out/doc/api/all.json &: $(apidoc_sources) tools/doc/node_modules | out/doc/api
874+
$(apidocs_html) $(apidocs_json) out/doc/api/all.json &: $(apidoc_sources) tools/doc/node_modules | out/doc/api
886875
@if [ "$(shell $(node_use_openssl_and_icu))" != "true" ]; then \
887876
echo "Skipping $@ (no crypto and/or no ICU)"; \
888877
else \
889878
$(call available-node, \
890879
$(DOC_KIT) generate \
891-
-t legacy-html-all \
892-
-t legacy-json-all \
893-
-i doc/api/*.md \
894-
--ignore $(skip_apidoc_files) \
895-
-o out/doc/api \
896-
-c ./CHANGELOG.md \
880+
--config-file tools/doc/web.doc-kit.config.mjs \
897881
-v $(VERSION) \
898-
--index doc/api/index.md \
899-
--type-map doc/type-map.json \
900-
) \
901-
fi
902-
endif
903-
904-
out/doc/llms.txt: $(apidoc_sources) tools/doc/node_modules | out/doc
905-
@if [ "$(shell $(node_use_openssl_and_icu))" != "true" ]; then \
906-
echo "Skipping $@ (no crypto and/or no ICU)"; \
907-
else \
908-
$(call available-node, \
909-
$(DOC_KIT) generate \
910-
-t llms-txt \
911-
-i doc/api/*.md \
912-
--ignore $(skip_apidoc_files) \
913-
-o $(@D) \
914-
-c ./CHANGELOG.md \
915-
-v $(VERSION) \
916-
--type-map doc/type-map.json \
882+
$(if $(JOBS),-p $(JOBS)) \
917883
) \
918884
fi
919885

test/doctool/test-make-doc.mjs

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

0 commit comments

Comments
 (0)