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.

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

Feature/uikit refactor #840

Merged
merged 49 commits into from
Apr 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
64c2e9f
feat(config): add uikits config
bmuenzenmeyer Mar 23, 2018
2760972
chore(compose): factor renderSinglePattern into its own module
bmuenzenmeyer Mar 23, 2018
a4961bd
feat(config): remove hard-coded base module path from pattern lab paths
bmuenzenmeyer Mar 23, 2018
4565202
feat(uikits): load uikits before build
bmuenzenmeyer Mar 23, 2018
a607db9
refactor(index): move helper functions to separate files
bmuenzenmeyer Mar 23, 2018
4c314a1
refactor(core): use findModules where possible
bmuenzenmeyer Mar 23, 2018
60ec66a
chore(buildPatterns): fix import paths
bmuenzenmeyer Mar 23, 2018
06196c0
chore(cleanBuildDirectory): fix import path
bmuenzenmeyer Mar 23, 2018
d9fd7e6
chore(loadPatternGraph): move file to proper location
bmuenzenmeyer Mar 23, 2018
e78200d
chore(loadPatternGraph): fix import path
bmuenzenmeyer Mar 23, 2018
250f62f
chore(buildPatterns): add parameter
bmuenzenmeyer Mar 23, 2018
cea2c45
fix(buildPatterns): move meta processing back into function for now
bmuenzenmeyer Mar 23, 2018
812bab3
feat(config): simplify relative public paths
bmuenzenmeyer Mar 23, 2018
e1598d3
feat(uikits): create MVP output to disk
bmuenzenmeyer Mar 23, 2018
5df87b0
feat(uikits): output pattern files to each location
bmuenzenmeyer Mar 26, 2018
b0a84ca
feat(uikits): output assets and annotations to each location
bmuenzenmeyer Mar 26, 2018
19b1860
chore(uikits): TODO
bmuenzenmeyer Mar 26, 2018
dd3e708
feat(uikits): promote dependencyGraph.json output to root
bmuenzenmeyer Mar 30, 2018
8e11342
feat(uikits): clean each build directory if configured
bmuenzenmeyer Mar 30, 2018
3ac93dc
feat(uikits): copy pattern-specific javascript
bmuenzenmeyer Mar 30, 2018
cdbd11f
fix(pattern watch): Defensively add change listeners
bmuenzenmeyer Mar 30, 2018
4f05311
feat(uikits): support watched-asset copying
bmuenzenmeyer Mar 30, 2018
afb154e
chore(copier): code cleanup
bmuenzenmeyer Mar 30, 2018
6670364
feat(uikits): support incremental builds
bmuenzenmeyer Mar 30, 2018
39dba71
chore(uikits): debug files
bmuenzenmeyer Mar 30, 2018
06c6123
fix(build): improve stability of changes causing a live-server reload
bmuenzenmeyer Apr 13, 2018
f2a6f23
feat(uikits): render header and footer data correctly
bmuenzenmeyer Apr 13, 2018
5ead1f0
chore(lint): fix lint
bmuenzenmeyer Apr 13, 2018
43a2017
feat(uikits): add uikits to test config
bmuenzenmeyer Apr 13, 2018
e75f434
fix(uikits): fix ui_builder_tests
bmuenzenmeyer Apr 13, 2018
bb9ef3c
fix(pattern graph): move support and coverage of graph file to root
bmuenzenmeyer Apr 13, 2018
0d9c57e
fix(tests): prevent dependency graph output file from being written
bmuenzenmeyer Apr 13, 2018
027e56c
feat(uikits): uikits config
bmuenzenmeyer Apr 13, 2018
a393851
feat(uikits): uikits config to default
bmuenzenmeyer Apr 13, 2018
55570ff
feat(uikits): remove workshop for default config
bmuenzenmeyer Apr 13, 2018
8b34be0
fix(test): sledgehammer a test
bmuenzenmeyer Apr 16, 2018
cdc6c38
fix(test): fix the test please and thank you
bmuenzenmeyer Apr 16, 2018
a1b6bf2
chore(loaduikits): wip tests
bmuenzenmeyer Apr 17, 2018
f5b60b2
feat(uikits): additional test coverage
bmuenzenmeyer Apr 17, 2018
6309e69
feat(API): standardize v() and version() into a single call
bmuenzenmeyer Apr 20, 2018
fbcacfb
feat(uikits): additional test coverage of the main API
bmuenzenmeyer Apr 20, 2018
a2ade57
chore(index): remove flawed test between local and CI
bmuenzenmeyer Apr 20, 2018
df87a13
chore(coverage): ignore live-server
bmuenzenmeyer Apr 20, 2018
98a4aa1
chore(uikits): move uikit loading to patternlab instantiation
bmuenzenmeyer Apr 27, 2018
a52b487
feat(package): add cli as a dependency
bmuenzenmeyer Apr 27, 2018
d3b7f64
chore(uikits): fix tests
bmuenzenmeyer Apr 27, 2018
8a6fca0
chore(package): make cli package public
bmuenzenmeyer Apr 27, 2018
ef882d0
chore(tests): ignore all files under test
bmuenzenmeyer Apr 27, 2018
87c9d0d
feat(uikits): filter out excluded pattern states from uikit output
bmuenzenmeyer Apr 27, 2018
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
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
},
"nyc": {
"exclude": [
"**/*_tests.js"
"**/*_tests.js",
"packages/core/test/**",
"packages/live-server/*"
]
}
}
2 changes: 1 addition & 1 deletion packages/cli/bin/cli-actions/version.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()})`;
1 change: 0 additions & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 2 additions & 7 deletions packages/core/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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/`
Expand Down
66 changes: 40 additions & 26 deletions packages/core/patternlab-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -77,5 +82,14 @@
"color": "dark",
"density": "compact",
"layout": "horizontal"
}
},
"uikits": [
{
"name": "uikit-workshop",
"outputDir": "",
"enabled": true,
"excludedPatternStates": [],
"excludedTags": []
}
]
}
Loading