diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 2097dd51d..10119eef2 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -22,9 +22,13 @@ jobs: with: node-version: ${{ matrix.node-version }} - - name: Build docs + - name: Build mockup run: | npx yarn + npm run build:webpack:docs + + - name: Build docs + run: | npm run build:docs - name: Deploy docs diff --git a/_includes/layout.liquid b/_includes/layout.liquid index dea515410..c0fdd152e 100644 --- a/_includes/layout.liquid +++ b/_includes/layout.liquid @@ -7,8 +7,9 @@ - - + + diff --git a/package.json b/package.json index 470a32d04..eff8d2224 100644 --- a/package.json +++ b/package.json @@ -68,6 +68,7 @@ "build:webpack": "NODE_ENV=production webpack --config webpack.config.js", "build:webpack:dev": "NODE_ENV=development webpack --config webpack.config.js", "build:webpack:plone": "NODE_ENV=production DEPLOYMENT=plone webpack --config webpack.config.js", + "build:webpack:docs": "NODE_ENV=production DEPLOYMENT=docs webpack --config webpack.config.js", "build:webpack:dev:plone": "NODE_ENV=development DEPLOYMENT=plone webpack --config webpack.config.js", "build:docs": "ELEVENTY_ENV=production npx @11ty/eleventy --pathprefix=mockup", "build:stats": "NODE_ENV=production webpack --config webpack.config.js --json > stats.json", diff --git a/webpack.config.js b/webpack.config.js index 30b3d9c92..20be6205b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -118,9 +118,15 @@ module.exports = () => { // Note: ``publicPath`` is set to "auto" in Patternslib, // so for the devServer the public path set to "/". config.devServer.port = "8000"; - config.devServer.static.directory = path.resolve(__dirname, "./docs/_site/"); + config.devServer.static.directory = path.resolve(__dirname, "./_site/"); } + if (process.env.DEPLOYMENT === "docs") { + config.output.path = path.resolve( + __dirname, + "./_site/dist/mockup/" + ); + } if (process.env.DEPLOYMENT === "plone") { config.output.path = path.resolve( __dirname,