Skip to content

Commit 02e6858

Browse files
bmuenzenmeyerbmuenzenmeyer
committed
Merge branch 'dev' into 🔌
2 parents 320eaf4 + d2aa1be commit 02e6858

File tree

18 files changed

+77
-36
lines changed

18 files changed

+77
-36
lines changed

‎packages/cli/bin/install-starterkit.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ const installStarterkit = (starterkit, config) =>
1212
wrapAsync(function*() {
1313
const sourceDir = config.paths.source.root;
1414
const name = starterkit.value || starterkit;
15-
const url = name.startsWith('@pattern-lab/') ? name : `pattern-lab/${name}`;
16-
yield checkAndInstallPackage(name, url);
15+
yield checkAndInstallPackage(name);
1716
const kitPath = path.resolve('./node_modules', name);
1817
yield copyAsync(path.resolve(kitPath, 'dist'), path.resolve(sourceDir));
1918
let kitConfig;

‎packages/cli/bin/utils.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,15 @@ const copyWithPattern = (cwd, pattern, dest) =>
126126
* @func fetchPackage
127127
* @desc Fetches and saves packages from npm into node_modules and adds a reference in the package.json under dependencies
128128
* @param {string} packageName - The package name
129-
* @param {string} [url] - A URL which will be used to fetch the package from
130129
*/
131-
const fetchPackage = (packageName, url) =>
130+
const fetchPackage = packageName =>
132131
wrapAsync(function*() {
133132
const useYarn = hasYarn();
134133
const pm = useYarn ? 'yarn' : 'npm';
135134
const installCmd = useYarn ? 'add' : 'install';
136135
try {
137-
if (packageName || url) {
138-
const cmd = yield spawn(pm, [installCmd, url || packageName]);
136+
if (packageName) {
137+
const cmd = yield spawn(pm, [installCmd, packageName]);
139138
error(cmd.stderr);
140139
}
141140
} catch (err) {
@@ -150,10 +149,9 @@ const fetchPackage = (packageName, url) =>
150149
* @func checkAndInstallPackage
151150
* Checks whether a package for a given packageName is installed locally. If package cannot be found, fetch and install it
152151
* @param {string} packageName - The package name
153-
* @param {string} [url] - A URL which will be used to fetch the package from
154152
* @return {boolean}
155153
*/
156-
const checkAndInstallPackage = (packageName, url) =>
154+
const checkAndInstallPackage = packageName =>
157155
wrapAsync(function*() {
158156
try {
159157
require.resolve(packageName);
@@ -162,7 +160,7 @@ const checkAndInstallPackage = (packageName, url) =>
162160
debug(
163161
`checkAndInstallPackage: ${packageName} not installed. Fetching it now …`
164162
);
165-
yield fetchPackage(packageName, url);
163+
yield fetchPackage(packageName);
166164
return false;
167165
}
168166
});

‎packages/cli/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"glob": "7.1.2",
2121
"has-yarn": "1.0.0",
2222
"inquirer": "5.1.0",
23-
"lodash": "4.17.10",
23+
"lodash": "4.17.15",
2424
"ora": "2.1.0",
2525
"path-exists": "3.0.0",
2626
"sanitize-filename": "1.6.1"
@@ -31,7 +31,7 @@
3131
"eslint-plugin-prettier": "2.6.0",
3232
"prettier": "1.11.1",
3333
"proxyquire": "2.0.1",
34-
"tap": "11.1.1"
34+
"tap": "14.6.4"
3535
},
3636
"files": [
3737
"bin"

‎packages/core/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"glob": "7.0.0",
1414
"graphlib": "2.1.1",
1515
"js-beautify": "1.6.3",
16-
"js-yaml": "3.6.1",
17-
"lodash": "4.17.5",
16+
"js-yaml": "3.13.1",
17+
"lodash": "4.17.15",
1818
"markdown-it": "6.0.1",
1919
"node-fetch": "1.6.0",
2020
"recursive-copy": "2.0.8",
@@ -31,12 +31,12 @@
3131
"eslint-plugin-import": "^2.18.2",
3232
"eslint-plugin-prettier": "^3.1.0",
3333
"husky": "0.14.3",
34-
"jsdoc-to-markdown": "3.0.0",
34+
"jsdoc-to-markdown": "5.0.1",
3535
"prettier": "^1.14.3",
3636
"pretty-quick": "^1.11.1",
3737
"rewire": "2.5.2",
3838
"standard-version": "4.3.0",
39-
"tap": "11.1.1"
39+
"tap": "14.6.4"
4040
},
4141
"keywords": [
4242
"Pattern Lab",
@@ -51,8 +51,7 @@
5151
"author": {
5252
"name": "Brian Muenzenmeyer"
5353
},
54-
"contributors": [
55-
{
54+
"contributors": [{
5655
"name": "Geoff Pursell"
5756
},
5857
{

‎packages/development-edition-engine-handlebars/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@pattern-lab/development-edition-engine-handlebars",
33
"private": true,
4-
"version": "0.1.2",
4+
"version": "0.1.3",
55
"description": "The tree of components we use to test, develop and validate the Handlebars engine",
66
"scripts": {
77
"pl:build": "patternlab build --config ./patternlab-config.json",
@@ -32,7 +32,7 @@
3232
"@pattern-lab/engine-handlebars": "^2.0.1",
3333
"@pattern-lab/engine-mustache": "^2.0.1-alpha.0",
3434
"@pattern-lab/starterkit-mustache-demo": "^5.0.0",
35-
"@pattern-lab/uikit-workshop": "^1.0.3",
36-
"@pattern-lab/plugin-tab": "2.0.3-beta.1"
35+
"@pattern-lab/plugin-tab": "2.0.3-beta.1",
36+
"@pattern-lab/uikit-workshop": "^1.0.4"
3737
}
3838
}

‎packages/development-edition-engine-react/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "@pattern-lab/engine-react-testing-tree",
33
"description": "The tree of components we use to test, develop and validate the React engine",
4-
"version": "0.1.4",
4+
"version": "0.1.5",
55
"private": true,
66
"main": "gulpfile.js",
77
"dependencies": {
88
"@pattern-lab/core": "^3.0.3",
99
"@pattern-lab/engine-mustache": "^2.0.1-alpha.0",
1010
"@pattern-lab/engine-react": "^0.2.1-beta.1",
11-
"@pattern-lab/uikit-workshop": "^1.0.3",
11+
"@pattern-lab/uikit-workshop": "^1.0.4",
1212
"gulp": "3.9.1",
1313
"minimist": "^1.2.0",
1414
"react": "16.2.0"

‎packages/edition-node-gulp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@pattern-lab/edition-node-gulp",
33
"description": "The gulp wrapper around patternlab-node core, providing tasks to interact with the core library and move supporting frontend assets.",
4-
"version": "2.0.5",
4+
"version": "2.0.6",
55
"main": "gulpfile.js",
66
"dependencies": {
77
"@pattern-lab/cli": "^1.0.1",
88
"@pattern-lab/core": "^3.0.3",
99
"@pattern-lab/engine-mustache": "^2.0.1-alpha.0",
10-
"@pattern-lab/uikit-workshop": "^1.0.3",
10+
"@pattern-lab/uikit-workshop": "^1.0.4",
1111
"gulp": "3.9.1",
1212
"minimist": "1.2.0"
1313
},

‎packages/edition-node/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@pattern-lab/edition-node",
33
"description": "A pure wrapper around patternlab-node core, the default pattern engine, and supporting frontend assets.",
4-
"version": "2.0.2",
4+
"version": "2.0.3",
55
"main": "patternlab-config.json",
66
"dependencies": {
77
"@pattern-lab/cli": "^1.0.1",
88
"@pattern-lab/core": "^3.0.3",
99
"@pattern-lab/engine-handlebars": "^2.0.1",
10-
"@pattern-lab/uikit-workshop": "^1.0.3"
10+
"@pattern-lab/uikit-workshop": "^1.0.4"
1111
},
1212
"keywords": [
1313
"Pattern Lab",

‎packages/edition-twig/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@pattern-lab/edition-twig",
3-
"version": "3.1.4",
3+
"version": "3.1.5",
44
"description": "Pattern Lab node with Twig PHP Engine",
55
"author": {
66
"name": "Evan Lovely",
@@ -25,7 +25,7 @@
2525
"@pattern-lab/cli": "^1.0.1",
2626
"@pattern-lab/core": "^3.0.3",
2727
"@pattern-lab/engine-twig-php": "^3.0.3",
28-
"@pattern-lab/uikit-workshop": "^1.0.3"
28+
"@pattern-lab/uikit-workshop": "^1.0.4"
2929
},
3030
"engines": {
3131
"node": ">=6.0"

‎packages/edition-twig/patternlab-config.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,41 @@
88
"paths": [
99
"./node_modules/@pattern-lab/uikit-workshop/views-twig"
1010
]
11+
},
12+
{
13+
"id": "atoms",
14+
"recursive": true,
15+
"paths": [
16+
"./source/_patterns/00-atoms"
17+
]
18+
},
19+
{
20+
"id": "molecules",
21+
"recursive": true,
22+
"paths": [
23+
"./source/_patterns/01-molecules"
24+
]
25+
},
26+
{
27+
"id": "organisms",
28+
"recursive": true,
29+
"paths": [
30+
"./source/_patterns/02-organisms"
31+
]
32+
},
33+
{
34+
"id": "templates",
35+
"recursive": true,
36+
"paths": [
37+
"./source/_patterns/03-templates"
38+
]
39+
},
40+
{
41+
"id": "pages",
42+
"recursive": true,
43+
"paths": [
44+
"./source/_patterns/04-pages"
45+
]
1146
}
1247
],
1348
"alterTwigEnv": [

0 commit comments

Comments
 (0)