Skip to content

Commit 502fde7

Browse files
Merge pull request #1038 from pattern-lab/starterkit-handlebars-demo
feat(starterkits): add starterkit-handlebars-demo
2 parents d245b3b + f04fd26 commit 502fde7

File tree

7 files changed

+49
-39
lines changed

7 files changed

+49
-39
lines changed

packages/cli/bin/inquiries/edition.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,15 @@ const editionSetup = [
1515
message: 'Which edition do you want to use (defaults to edition-node)?',
1616
choices: [
1717
{
18-
name: 'edition-twig (php engine)',
19-
value: '@pattern-lab/edition-twig',
20-
},
21-
{
22-
name: 'edition-node',
18+
name: 'edition-node (handlebars engine)',
2319
value: '@pattern-lab/edition-node',
2420
},
2521
{
26-
name: 'edition-node-grunt',
27-
value: '@pattern-lab/edition-node-grunt',
22+
name: 'edition-twig (php engine)',
23+
value: '@pattern-lab/edition-twig',
2824
},
2925
{
30-
name: 'edition-node-gulp',
26+
name: 'edition-node-gulp (legacy)',
3127
value: '@pattern-lab/edition-node-gulp',
3228
},
3329
new inquirer.Separator(),

packages/cli/bin/inquiries/starterkit.js

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,45 +10,34 @@ const starterkitSetup = [
1010
message: 'Which starterkit do you want to use?',
1111
choices: [
1212
{
13-
name: 'starterkit-mustache-demo',
14-
value: '@pattern-lab/starterkit-mustache-demo',
13+
name: 'starterkit-handlebars-demo [Recommended]',
14+
value: '@pattern-lab/starterkit-handlebars-demo',
1515
},
16+
{
17+
name: 'starterkit-twig-demo [Recommended]',
18+
value: '@pattern-lab/starterkit-twig-demo',
19+
},
1620
{
1721
name: 'starterkit-mustache-bootstrap',
1822
value: 'starterkit-mustache-bootstrap',
19-
},
23+
},
24+
{
25+
name: 'starterkit-mustache-demo',
26+
value: '@pattern-lab/starterkit-mustache-demo',
27+
},
2028
{
2129
name: 'starterkit-mustache-foundation',
2230
value: 'starterkit-mustache-foundation',
23-
},
24-
// {
25-
// name: 'starterkit-twig-base',
26-
// value: 'starterkit-twig-base',
27-
// },
28-
{
29-
name: 'starterkit-twig-demo',
30-
value: '@pattern-lab/starterkit-twig-demo',
31-
},
31+
},
3232
{
3333
name: 'starterkit-mustache-materialdesign',
3434
value: 'starterkit-mustache-materialdesign',
35-
},
36-
// {
37-
// name: 'starterkit-twig-drupal-demo',
38-
// value: 'starterkit-twig-drupal-demo',
39-
// },
40-
// {
41-
// name: 'starterkit-twig-drupal-minimal',
42-
// value: 'starterkit-twig-drupal-minimal',
43-
// },
44-
{
45-
name: 'starterkit-mustache-webdesignday',
46-
value: 'starterkit-mustache-webdesignday',
47-
},
35+
},
4836
{
4937
name: 'starterkit-mustache-base',
5038
value: '@pattern-lab/starterkit-mustache-base',
5139
},
40+
5241
new inquirer.Separator(),
5342
{
5443
name: 'Custom starterkit',
@@ -61,8 +50,8 @@ const starterkitSetup = [
6150
},
6251
],
6352
default: {
64-
name: 'starterkit-mustache-base',
65-
value: 'starterkit-mustache-base',
53+
name: 'starterkit-handlebars-demo',
54+
value: 'starterkit-handlebars-demo',
6655
},
6756
},
6857
{

packages/cli/bin/install-edition.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,26 @@ const installEdition = (edition, config, projectDir) => {
4949
}
5050
// 4.2
5151
case '@pattern-lab/edition-node': {
52+
const editionPath = path.resolve('./node_modules', edition);
53+
const editionConfigPath = path.resolve(
54+
editionPath,
55+
'patternlab-config.json'
56+
);
57+
58+
const editionConfig = require(editionConfigPath);
59+
5260
pkg.scripts = Object.assign(
5361
{},
5462
pkg.scripts || {},
5563
yield getJSONKey(edition, 'scripts')
5664
);
65+
66+
yield copyAsync(
67+
path.resolve(editionPath, '/helpers/test.js'),
68+
path.resolve(sourceDir, '../', 'helpers/test.js')
69+
);
70+
71+
config = merge(config, editionConfig);
5772
break;
5873
}
5974
// 4.3

packages/edition-node/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This Edition comes with the following components:
1515

1616
* `@pattern-lab/core`: [GitHub](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core) | [npm](https://www.npmjs.com/package/@pattern-lab/core)
1717
* `@pattern-lab/cli`: [GitHub](https://github.com/pattern-lab/tree/master/packages/cli) | [npm](https://www.npmjs.com/package/@pattern-lab/cli)
18-
* `@pattern-lab/engine-mustache`: [GitHub](https://github.com/pattern-lab/tree/master/packages/engine-mustache) | [npm](https://www.npmjs.com/package/@pattern-lab/engine-mustache)
18+
* `@pattern-lab/engine-handlebars`: [GitHub](https://github.com/pattern-lab/tree/master/packages/engine-handlebars) | [npm](https://www.npmjs.com/package/@pattern-lab/engine-handlebars)
1919
* `@pattern-lab/uikit-workshop`: [GitHub](https://github.com/pattern-lab/tree/master/packages/uikit-workshop) | [npm](https://www.npmjs.com/package/@pattern-lab/uikit-workshop)
2020

2121
## Prerequisites

packages/edition-node/helpers/test.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module.exports = function(Handlebars) {
2+
Handlebars.registerHelper('test', function() {
3+
return 'This is a test helper';
4+
});
5+
};

packages/edition-node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dependencies": {
77
"@pattern-lab/cli": "^0.0.3",
88
"@pattern-lab/core": "^3.0.1",
9-
"@pattern-lab/engine-mustache": "^2.0.1-alpha.0",
9+
"@pattern-lab/engine-handlebars": "^2.0.0-beta.1",
1010
"@pattern-lab/uikit-workshop": "^1.0.1"
1111
},
1212
"keywords": [

packages/edition-node/patternlab-config.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"css": "public/css"
6969
}
7070
},
71-
"patternExtension": "mustache",
71+
"patternExtension": "hbs",
7272
"patternStateCascade": ["inprogress", "inreview", "complete"],
7373
"patternExportDirectory": "./pattern_exports/",
7474
"patternExportPatternPartials": [],
@@ -90,5 +90,10 @@
9090
"excludedPatternStates": [],
9191
"excludedTags": []
9292
}
93-
]
93+
],
94+
"engines": {
95+
"handlebars": {
96+
"extend": "helpers/*.js"
97+
}
98+
}
9499
}

0 commit comments

Comments
 (0)