Merge pull request #2 from pattern-lab/dev

get upstream
mfranzke · Apr 25, 2020 · 7812878 · 7812878
2 parents 26db979 + ff18eb5
commit 7812878
Show file tree

Hide file tree

Showing 5 changed files with 182 additions and 130 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -11,6 +11,7 @@
   "dependencies": {
     "@pattern-lab/core": "^5.9.0",
     "@pattern-lab/live-server": "^5.0.0",
+    "@pattern-lab/starterkit-mustache-base": "3.0.3",
     "archiver": "2.1.1",
     "chalk": "2.4.1",
     "commander": "2.15.1",
@@ -23,7 +24,11 @@
     "lodash": "4.17.15",
     "ora": "2.1.0",
     "path-exists": "3.0.0",
-    "sanitize-filename": "1.6.1"
+    "sanitize-filename": "1.6.1",
+    "starterkit-mustache-acidtest": "0.0.3",
+    "starterkit-mustache-bootstrap": "0.1.1",
+    "starterkit-mustache-foundation": "0.1.1",
+    "starterkit-mustache-materialdesign": "0.1.2"
   },
   "devDependencies": {
     "eslint": "4.18.2",
@@ -44,7 +49,7 @@
   ],
   "scripts": {
     "lint": "eslint ./{bin,test}",
-    "test:separate": "tap './test/*.test.js' --reporter spec --timeout=120"
+    "test:separate": "tap ./test/*.test.js --reporter spec --timeout=120"
   },
   "repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli",
   "bugs": "https://github.com/pattern-lab/patternlab-node/issues",

diff --git a/packages/core/src/lib/server.js b/packages/core/src/lib/server.js
@@ -36,6 +36,30 @@ const server = patternlab => {
             patternlab.config.paths.public.root
           )
         );
+        defaults.assets = [
+          path.resolve(
+            path.join(
+              process.cwd(),
+              patternlab.config.paths.source.js,
+              '**',
+              '*.js' // prevent preprocessors like typescript from reloading
+            )
+          ),
+          path.resolve(
+            path.join(process.cwd(), patternlab.config.paths.source.images)
+          ),
+          path.resolve(
+            path.join(process.cwd(), patternlab.config.paths.source.fonts)
+          ),
+          path.resolve(
+            path.join(
+              process.cwd(),
+              patternlab.config.paths.source.css,
+              '**',
+              '*.css' // prevent preprocessors from reloading
+            )
+          ),
+        ];
 
         // allow for overrides should they exist inside patternlab-config.json
         const liveServerConfig = Object.assign(

diff --git a/packages/docs/src/docs/advanced-config-options.md b/packages/docs/src/docs/advanced-config-options.md
@@ -27,7 +27,7 @@ Sets whether or not to delete `public.patterns/` upon each build of Pattern Lab.
 
 **default**: `true`
 
-### defaultPatttern
+### defaultPattern
 
 Sets a specific pattern upon launch of the styleguide. This pattern will not be available in the navigation, or in view all pages. The only way to get to it will be via a refresh. Set it using the [short-hand pattern-include syntax](http://localhost:4000/docs/pattern-including.html):
 

diff --git a/packages/edition-node-gulp/gulpfile.js b/packages/edition-node-gulp/gulpfile.js
@@ -27,6 +27,7 @@ function serve() {
   return patternlab.server
     .serve({
       cleanPublic: config.cleanPublic,
+      watch: true,
     })
     .then(() => {
       // do something else when this promise resolves