make mockup working in docs

plone · Jul 15, 2023 · 231c8ee · 231c8ee
1 parent eede511
commit 231c8ee
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git 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
@@ -7,8 +7,9 @@
     <link rel="stylesheet" href="/dist/main.css" />
     <link rel="stylesheet" href="/dist/prismjs/themes/prism-okaidia.css" />
     <link rel="stylesheet" href="/dist/bootstrap/dist/css/bootstrap.min.css" />
-    <script type="text/javascript" src="http://localhost:8000/bundle.min.js"></script>
-    <!-- <script type="text/javascript" src="/dist/bundle.min.js"></script> -->
+    <!--<script type="text/javascript"
+	    src="http://localhost:8000/bundle.min.js"></script>-->
+    <script type="text/javascript" src="/dist/mockup/bundle.min.js"></script>
     <script type="module" src="/dist/fakeserver.js"></script>
   </head>
   <body>

diff --git 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
@@ -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,