Use package.json to specify node deps

jgraham · jgraham · commit df23f9795f31 · 2021-11-23T14:06:54.000Z
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -26,8 +26,6 @@ jobs:
           node-version: '14'
       - name: Set up Virtualenv
         run: pip install virtualenv
-      - name: Set up jsdoc
-        run: npm install -g 'jsdoc@3.6.7'
       - name: Checkout
         uses: actions/checkout@v2
         with:
diff --git a/docs/Dockerfile b/docs/Dockerfile
@@ -29,7 +29,8 @@ RUN apt-get -qqy update \
 RUN pip install --upgrade pip \
   && pip install virtualenv
 
-# Pin to the same version that gecko is using, since that's well tested with sphinx-js.
-RUN npm install -g 'jsdoc@3.6.7'
-
 WORKDIR /app/
+
+COPY ./package.json ./
+RUN npm install .
+ENV PATH=/app/node_modules/.bin:$PATH
diff --git a/docs/frontend.py b/docs/frontend.py
@@ -71,7 +71,7 @@ def docker_build(tag="wpt:docs"):
                            "build",
                            "--pull",
                            "--tag", tag,
-                           os.path.join(here, "docker")])
+                           here])
 
 def docker_run(**kwargs):
     cmd = ["docker", "run"]
@@ -116,7 +116,7 @@ def build(_venv, **kwargs):
                       "--ignore", "**/.*",
                       "--ignore", "**/#*",
                       "--ignore", "docs/frontend.py",
-                      "--ignore", "docs/docker/Dockerfile"]
+                      "--ignore", "docs/Dockerfile"]
         else:
             executable = "sphinx-build"
             extras = []
diff --git a/docs/package.json b/docs/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "wpt-docs",
+  "description": "This package file is for node modules used in web-platform-tests docs",
+  "repository": {},
+  "license": "BSD",
+  "devDependencies": {
+    "jsdoc": "^3.6.7"
+  },
+  "version": "1.0.0",
+  "private": true
+}
diff --git a/tools/ci/website_build.sh b/tools/ci/website_build.sh
@@ -39,6 +39,9 @@ git rm -rf .
 
 # Build the website
 cd ../..
+npm install ./docs
+export PATH="$PWD/node_modules/.bin:$PATH"
+
 ./wpt build-docs
 
 cd docs/_build
