Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

get upstream #2

Merged
merged 9 commits into from
Apr 25, 2020
Merged

get upstream #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f56ba66
Update server to support asset change detection
JosefBredereck Apr 12, 2020
8c7cf5e
Add watch property for gulp watch task
JosefBredereck Apr 13, 2020
93ba4d0
Merge branch 'dev' into feature-server-asset-change
bmuenzenmeyer Apr 23, 2020
62cb698
chore(typo): corrected that typo in docs for config options
mfranzke Apr 24, 2020
6d90e3b
Merge branch 'dev' into feature-server-asset-change
bmuenzenmeyer Apr 24, 2020
5793d7f
Merge pull request #1144 from JosefBredereck/feature-server-asset-change
bmuenzenmeyer Apr 24, 2020
16942d6
Merge branch 'dev' into chore-typo-in-docs-for-config
bmuenzenmeyer Apr 24, 2020
d5c69a4
Merge pull request #1154 from mfranzke/chore-typo-in-docs-for-config
bmuenzenmeyer Apr 24, 2020
ff18eb5
fix(cli): fix test script glob
bmuenzenmeyer Apr 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
24 changes: 24 additions & 0 deletions packages/core/src/lib/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/docs/advanced-config-options.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):

Expand Down
1 change: 1 addition & 0 deletions packages/edition-node-gulp/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ function serve() {
return patternlab.server
.serve({
cleanPublic: config.cleanPublic,
watch: true,
})
.then(() => {
// do something else when this promise resolves
Expand Down
Loading