Merge remote-tracking branch 'upstream/dev' into dev

pattern-lab · Mar 26, 2021 · 6c18bdc · 6c18bdc
2 parents be17657 + 399d0e1
commit 6c18bdc
Show file tree

Hide file tree

Showing 3 changed files with 299 additions and 180 deletions.
diff --git a/packages/core/src/lib/readDocumentation.js b/packages/core/src/lib/readDocumentation.js
@@ -82,70 +82,74 @@ module.exports = function(pattern, patternlab, isVariant) {
 
   // Read Documentation for Pattern-Group
   // Use this approach, since pattern lab is a pattern driven software
-  try {
+  if (pattern.patternGroup) {
     const groupRelPath = pattern.relPath.split(path.sep);
-    const markdownFileNameGroup = path.resolve(
-      patternlab.config.paths.source.patterns,
-      groupRelPath[0] || pattern.subdir,
-      GROUP_DOC_PREFIX + pattern.patternGroup + FILE_EXTENSION
-    );
-    const markdownFileContentsGroup = fs.readFileSync(
-      markdownFileNameGroup,
-      'utf8'
-    );
-    const markdownObjectGroup = markdown_parser.parse(
-      markdownFileContentsGroup
-    );
-
-    if (!_.isEmpty(markdownObjectGroup)) {
-      pattern.patternGroupData = markdownObjectGroup;
-    }
-  } catch (err) {
-    // do nothing when file not found
-    if (err.code !== 'ENOENT') {
-      logger.warning(
-        `There was an error setting pattern group data after markdown parsing for ${path.join(
-          patternlab.config.paths.source.patterns,
-          path.parse(pattern.subdir).dir,
-          GROUP_DOC_PREFIX + pattern.patternGroup + FILE_EXTENSION
-        )}`
+    try {
+      const markdownFileNameGroup = path.resolve(
+        patternlab.config.paths.source.patterns,
+        groupRelPath[0] || pattern.subdir,
+        GROUP_DOC_PREFIX + pattern.patternGroup + FILE_EXTENSION
       );
-      logger.warning(err);
+      const markdownFileContentsGroup = fs.readFileSync(
+        markdownFileNameGroup,
+        'utf8'
+      );
+      const markdownObjectGroup = markdown_parser.parse(
+        markdownFileContentsGroup
+      );
+
+      if (!_.isEmpty(markdownObjectGroup)) {
+        pattern.patternGroupData = markdownObjectGroup;
+      }
+    } catch (err) {
+      // do nothing when file not found
+      if (err.code !== 'ENOENT' && err.code !== 'ENOTDIR') {
+        logger.warning(
+          `There was an error setting pattern group data after markdown parsing for ${path.join(
+            patternlab.config.paths.source.patterns,
+            groupRelPath[0] || pattern.subdir,
+            GROUP_DOC_PREFIX + pattern.patternGroup + FILE_EXTENSION
+          )}`
+        );
+        logger.warning(err);
+      }
     }
   }
 
   // Read Documentation for Pattern-Subgroup
-  try {
+  if (pattern.patternSubgroup) {
     const subgroupRelPath = pattern.relPath.split(path.sep);
-    const markdownFileNameSubgroup = path.resolve(
-      patternlab.config.paths.source.patterns,
-      subgroupRelPath[0],
-      subgroupRelPath[1],
-      GROUP_DOC_PREFIX + pattern.patternSubgroup + FILE_EXTENSION
-    );
-    const markdownFileContentsSubgroup = fs.readFileSync(
-      markdownFileNameSubgroup,
-      'utf8'
-    );
-    const markdownObjectSubgroup = markdown_parser.parse(
-      markdownFileContentsSubgroup
-    );
-
-    if (!_.isEmpty(markdownObjectSubgroup)) {
-      pattern.patternSubgroupData = markdownObjectSubgroup;
-    }
-  } catch (err) {
-    // do nothing when file not found
-    if (err.code !== 'ENOENT') {
-      logger.warning(
-        `There was an error setting pattern subgroup data after markdown parsing for ${path.join(
-          patternlab.config.paths.source.patterns,
-          path.parse(pattern.subdir).dir,
-          path.parse(pattern.subdir).base,
-          GROUP_DOC_PREFIX + pattern.patternSubgroup + FILE_EXTENSION
-        )}`
+    try {
+      const markdownFileNameSubgroup = path.resolve(
+        patternlab.config.paths.source.patterns,
+        subgroupRelPath[0],
+        subgroupRelPath[1],
+        GROUP_DOC_PREFIX + pattern.patternSubgroup + FILE_EXTENSION
       );
-      logger.warning(err);
+      const markdownFileContentsSubgroup = fs.readFileSync(
+        markdownFileNameSubgroup,
+        'utf8'
+      );
+      const markdownObjectSubgroup = markdown_parser.parse(
+        markdownFileContentsSubgroup
+      );
+
+      if (!_.isEmpty(markdownObjectSubgroup)) {
+        pattern.patternSubgroupData = markdownObjectSubgroup;
+      }
+    } catch (err) {
+      // do nothing when file not found
+      if (err.code !== 'ENOENT' && err.code !== 'ENOTDIR') {
+        logger.warning(
+          `There was an error setting pattern subgroup data after markdown parsing for ${path.join(
+            patternlab.config.paths.source.patterns,
+            subgroupRelPath[0],
+            subgroupRelPath[1],
+            GROUP_DOC_PREFIX + pattern.patternSubgroup + FILE_EXTENSION
+          )}`
+        );
+        logger.warning(err);
+      }
     }
   }
 };
diff --git a/packages/uikit-workshop/package.json b/packages/uikit-workshop/package.json
@@ -86,7 +86,7 @@
     "mini-css-extract-plugin": "^0.8.0",
     "mousetrap": "^1.6.3",
     "no-emit-webpack-plugin": "^1.0.0",
-    "node-sass": "^4.14.1",
+    "node-sass": "^5.0.0",
     "node-sass-selector-importer": "^5.2.0",
     "postcss-loader": "^3.0.0",
     "preact": "8.3.1",
@@ -104,7 +104,7 @@
     "react-popper-tooltip": "^2.7.0",
     "redux": "3.7.2",
     "redux-thunk": "^2.3.0",
-    "sass-loader": "^8.0.0",
+    "sass-loader": "^10.1.1",
     "scriptjs": "^2.5.8",
     "scroll-js": "^2.2.0",
     "skatejs": "^5.2.4",
@@ -117,7 +117,7 @@
     "webpack-cli": "^3.3.9",
     "webpack-merge": "^4.2.2",
     "wolfy87-eventemitter": "^5.2.6",
-    "yargs": "^14.2.0"
+    "yargs": "^16.2.0"
   },
   "browserslist": [
     "last 2 version",