fix: add better pre-rendering support

pattern-lab · Apr 16, 2019 · 8ecd615 · 8ecd615
1 parent 70fe9b6
commit 8ecd615
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 12 deletions.
diff --git a/packages/edition-twig/.patternlabrc.js b/packages/edition-twig/.patternlabrc.js
@@ -0,0 +1,5 @@
+module.exports = {
+  buildDir: __dirname + '/public',
+  wwwDir: __dirname + '/public/',
+  publicPath: '/public/styleguide/',
+};
diff --git a/packages/edition-twig/package.json b/packages/edition-twig/package.json
@@ -13,10 +13,11 @@
   ],
   "main": "patternlab-config.json",
   "scripts": {
-    "build": "patternlab build --config ./patternlab-config.json",
+    "build:uikit": "npm run build --prefix node_modules/@pattern-lab/uikit-workshop -- --patternlabrc $INIT_CWD/.patternlabrc.js",
+    "build": "npm run build:uikit && patternlab build --config ./patternlab-config.json",
     "help": "patternlab --help",
     "install": "patternlab install --config ./patternlab-config.json",
-    "serve": "patternlab serve --config ./patternlab-config.json",
+    "serve": "npm run build:uikit && patternlab serve --config ./patternlab-config.json",
     "start": "npm run serve",
     "version": "patternlab --version"
   },

diff --git a/packages/uikit-workshop/dist/index.html b/packages/uikit-workshop/dist/index.html
diff --git a/packages/uikit-workshop/dist/styleguide/js/patternlab-pattern.js b/packages/uikit-workshop/dist/styleguide/js/patternlab-pattern.js
diff --git a/packages/uikit-workshop/dist/styleguide/js/patternlab-viewer.js b/packages/uikit-workshop/dist/styleguide/js/patternlab-viewer.js
diff --git a/...odal-viewer-chunk-28648a3aa047d1ce4010.js → ...odal-viewer-chunk-37ca3c39c5ede5fa4f4c.js b/...odal-viewer-chunk-28648a3aa047d1ce4010.js → ...odal-viewer-chunk-37ca3c39c5ede5fa4f4c.js
diff --git a/packages/uikit-workshop/src/scripts/components/pl-viewport/pl-viewport.js b/packages/uikit-workshop/src/scripts/components/pl-viewport/pl-viewport.js
@@ -344,9 +344,13 @@ class IFrame extends BaseComponent {
 
     if (!patternParam) {
       if (window.patternData) {
-        patternParam = window.patternData.patternPartial;
+        if (window.patternData.patternPartial) {
+          patternParam = window.patternData.patternPartial;
+        } else {
+          patternParam = 'all';
+        }
       } else {
-        patternParam = 'components-overview';
+        patternParam = 'all';
       }
     }
 

diff --git a/packages/uikit-workshop/views/partials/general-footer.mustache b/packages/uikit-workshop/views/partials/general-footer.mustache
@@ -2,6 +2,10 @@
   {{{ patternData }}}
 </script>
 
+<script>
+  window.patternData = {{{ patternData }}};
+</script>
+
 <script>
   /*!
    * scriptLoader - v0.1

diff --git a/packages/uikit-workshop/webpack.config.js b/packages/uikit-workshop/webpack.config.js
@@ -11,6 +11,7 @@ const selectorImporter = require('node-sass-selector-importer');
 const PrerenderSPAPlugin = require('prerender-spa-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
 const path = require('path');
+const argv = require('yargs').argv;
 
 const cosmiconfig = require('cosmiconfig');
 const explorer = cosmiconfig('patternlab');
@@ -27,8 +28,14 @@ const defaultConfig = {
 module.exports = async function() {
   return new Promise(async (resolve, reject) => {
     let customConfig = defaultConfig;
+    let configToSearchFor;
+
+    if (argv.patternlabrc) {
+      configToSearchFor = await explorer.loadSync(argv.patternlabrc);
+    } else {
+      configToSearchFor = await explorer.searchSync();
+    }
 
-    const configToSearchFor = await explorer.searchSync();
     if (configToSearchFor) {
       if (configToSearchFor.config) {
         customConfig = configToSearchFor.config;
@@ -100,7 +107,7 @@ module.exports = async function() {
       },
       output: {
         path: path.resolve(process.cwd(), `${config.buildDir}/styleguide`),
-        publicPath: '/pattern-lab/styleguide/',
+        publicPath: `${config.publicPath}`,
         filename: '[name].js',
         chunkFilename: `js/[name]-chunk-[chunkhash].js`,
       },
@@ -311,6 +318,9 @@ module.exports = async function() {
 
           // @todo: troubleshoot why forceInclude works w/ Penthouse directly but not w/ Critical
           forceInclude: [
+            'pl-logo',
+            '.pl-c-logo',
+            '.pl-c-logo__img',
             '.pl-c-body--theme-light',
             '.pl-c-body--theme-sidebar',
             '.pl-c-body--theme-sidebar .pl-c-viewport',