Skip to content

Commit 7812878

Browse files
authored
Merge pull request pattern-lab#2 from pattern-lab/dev
get upstream
2 parents 26db979 + ff18eb5 commit 7812878

File tree

5 files changed

+182
-130
lines changed

5 files changed

+182
-130
lines changed

packages/cli/package.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"dependencies": {
1212
"@pattern-lab/core": "^5.9.0",
1313
"@pattern-lab/live-server": "^5.0.0",
14+
"@pattern-lab/starterkit-mustache-base": "3.0.3",
1415
"archiver": "2.1.1",
1516
"chalk": "2.4.1",
1617
"commander": "2.15.1",
@@ -23,7 +24,11 @@
2324
"lodash": "4.17.15",
2425
"ora": "2.1.0",
2526
"path-exists": "3.0.0",
26-
"sanitize-filename": "1.6.1"
27+
"sanitize-filename": "1.6.1",
28+
"starterkit-mustache-acidtest": "0.0.3",
29+
"starterkit-mustache-bootstrap": "0.1.1",
30+
"starterkit-mustache-foundation": "0.1.1",
31+
"starterkit-mustache-materialdesign": "0.1.2"
2732
},
2833
"devDependencies": {
2934
"eslint": "4.18.2",
@@ -44,7 +49,7 @@
4449
],
4550
"scripts": {
4651
"lint": "eslint ./{bin,test}",
47-
"test:separate": "tap './test/*.test.js' --reporter spec --timeout=120"
52+
"test:separate": "tap ./test/*.test.js --reporter spec --timeout=120"
4853
},
4954
"repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli",
5055
"bugs": "https://github.com/pattern-lab/patternlab-node/issues",

packages/core/src/lib/server.js

+24
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,30 @@ const server = patternlab => {
3636
patternlab.config.paths.public.root
3737
)
3838
);
39+
defaults.assets = [
40+
path.resolve(
41+
path.join(
42+
process.cwd(),
43+
patternlab.config.paths.source.js,
44+
'**',
45+
'*.js' // prevent preprocessors like typescript from reloading
46+
)
47+
),
48+
path.resolve(
49+
path.join(process.cwd(), patternlab.config.paths.source.images)
50+
),
51+
path.resolve(
52+
path.join(process.cwd(), patternlab.config.paths.source.fonts)
53+
),
54+
path.resolve(
55+
path.join(
56+
process.cwd(),
57+
patternlab.config.paths.source.css,
58+
'**',
59+
'*.css' // prevent preprocessors from reloading
60+
)
61+
),
62+
];
3963

4064
// allow for overrides should they exist inside patternlab-config.json
4165
const liveServerConfig = Object.assign(

packages/docs/src/docs/advanced-config-options.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Sets whether or not to delete `public.patterns/` upon each build of Pattern Lab.
2727

2828
**default**: `true`
2929

30-
### defaultPatttern
30+
### defaultPattern
3131

3232
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):
3333

packages/edition-node-gulp/gulpfile.js

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ function serve() {
2727
return patternlab.server
2828
.serve({
2929
cleanPublic: config.cleanPublic,
30+
watch: true,
3031
})
3132
.then(() => {
3233
// do something else when this promise resolves

0 commit comments

Comments
 (0)