Merge pull request #840 from pattern-lab/feature/uikit-refactor

Feature/uikit refactor
pattern-lab · Apr 27, 2018 · d6ba41c · d6ba41c
2 parents 3d121b7 + 87c9d0d
commit d6ba41c
Show file tree

Hide file tree

Showing 44 changed files with 1,612 additions and 910 deletions.
diff --git a/package.json b/package.json
@@ -10,7 +10,9 @@
   },
   "nyc": {
     "exclude": [
-      "**/*_tests.js"
+      "**/*_tests.js",
+      "packages/core/test/**",
+      "packages/live-server/*"
     ]
   }
 }
diff --git a/packages/cli/bin/cli-actions/version.js b/packages/cli/bin/cli-actions/version.js
@@ -5,4 +5,4 @@ const config = Object.assign(patternlab.getDefaultConfig(), {
 });
 
 module.exports = ({ version }) =>
-	`${version} (PatternLab Node Core version: ${patternlab(config).v()})`;
+	`${version} (PatternLab Node Core version: ${patternlab(config).version()})`;
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -8,7 +8,6 @@
   "author": {
     "name": "Raphael Okon"
   },
-  "private": true,
   "dependencies": {
     "@pattern-lab/core": "^3.0.0-alpha.11",
     "@pattern-lab/live-server": "^1.3.3-alpha.2",

diff --git a/packages/core/docs/README.md b/packages/core/docs/README.md
@@ -26,12 +26,7 @@ Many of these functions are exposed to users within [Editions](https://github.co
   Returns the standardized default config used to run Pattern Lab. This method can be called statically or after instantiation.
 
 **Returns**: <code>object</code> - Returns the object representation of the `patternlab-config.json`  
-## `version()` ⇒ <code>void</code>
-
-  Logs current version to standard output
-
-**Returns**: <code>void</code> - current patternlab-node version as defined in `package.json`  
-## `v()` ⇒ <code>string</code>
+## `version()` ⇒ <code>string</code>
 
   Returns current version
 
@@ -63,7 +58,7 @@ Many of these functions are exposed to users within [Editions](https://github.co
 
   Logs usage to standard output
 
-**Returns**: <code>void</code> - pattern lab API usage, as console output  
+**Returns**: <code>void</code> - Pattern Lab API usage, as console output  
 ## `installplugin(pluginName)` ⇒ <code>void</code>
 
   Installs plugin already available via `node_modules/`

diff --git a/packages/core/patternlab-config.json b/packages/core/patternlab-config.json
@@ -32,35 +32,40 @@
     "markupOnly": ".markup-only"
   },
   "paths" : {
-    "source" : {
+    "source": {
       "root": "./source/",
-      "patterns" : "./source/_patterns/",
-      "data" : "./source/_data/",
+      "patterns": "./source/_patterns/",
+      "data": "./source/_data/",
       "meta": "./source/_meta/",
-      "annotations" : "./source/_annotations/",
-      "styleguide" : "./node_modules/@pattern-lab/uikit-workshop/dist/",
-      "patternlabFiles" : {
-        "general-header": "./node_modules/@pattern-lab/uikit-workshop/views/partials/general-header.mustache",
-        "general-footer": "./node_modules/@pattern-lab/uikit-workshop/views/partials/general-footer.mustache",
-        "patternSection": "./node_modules/@pattern-lab/uikit-workshop/views/partials/patternSection.mustache",
-        "patternSectionSubtype": "./node_modules/@pattern-lab/uikit-workshop/views/partials/patternSectionSubtype.mustache",
-        "viewall": "./node_modules/@pattern-lab/uikit-workshop/views/viewall.mustache"
+      "annotations": "./source/_annotations/",
+      "styleguide": "dist/",
+      "patternlabFiles": {
+        "general-header":
+          "views/partials/general-header.mustache",
+        "general-footer":
+          "views/partials/general-footer.mustache",
+        "patternSection":
+          "views/partials/patternSection.mustache",
+        "patternSectionSubtype":
+          "views/partials/patternSectionSubtype.mustache",
+        "viewall":
+          "views/viewall.mustache"
       },
-      "js" : "./source/js",
-      "images" : "./source/images",
-      "fonts" : "./source/fonts",
-      "css" : "./source/css/"
+      "js": "./source/js",
+      "images": "./source/images",
+      "fonts": "./source/fonts",
+      "css": "./source/css"
     },
-    "public" : {
-      "root" : "./public/",
-      "patterns" : "./public/patterns/",
-      "data" : "./public/styleguide/data/",
-      "annotations" : "./public/annotations/",
-      "styleguide" : "./public/styleguide/",
-      "js" : "./public/js",
-      "images" : "./public/images",
-      "fonts" : "./public/fonts",
-      "css" : "./public/css"
+    "public": {
+      "root": "public/",
+      "patterns": "public/patterns/",
+      "data": "public/styleguide/data/",
+      "annotations": "public/annotations/",
+      "styleguide": "public/styleguide/",
+      "js": "public/js",
+      "images": "public/images",
+      "fonts": "public/fonts",
+      "css": "public/css"
     }
   },
   "patternExtension": "mustache",
@@ -77,5 +82,14 @@
     "color": "dark",
     "density": "compact",
     "layout": "horizontal"
-  }
+  },
+  "uikits": [
+    {
+      "name": "uikit-workshop",
+      "outputDir": "",
+      "enabled": true,
+      "excludedPatternStates": [],
+      "excludedTags": []
+    }
+  ]
 }