Skip to content

Commit fbf5f46

Browse files
mfranzkemfranzke
committed
Merge remote-tracking branch 'upstream/dev' into dev
2 parents 47d0fad + acca120 commit fbf5f46

File tree

29 files changed

+173
-53
lines changed

29 files changed

+173
-53
lines changed

Diff for: ‎CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.15.2](https://github.com/pattern-lab/patternlab-node/compare/v5.15.1...v5.15.2) (2021-11-03)
7+
8+
9+
### Bug Fixes
10+
11+
* **core:** Subgroup cannot be hidden ([#1368](https://github.com/pattern-lab/patternlab-node/issues/1368)) ([3ce13ab](https://github.com/pattern-lab/patternlab-node/commit/3ce13abffaab2810194003aeca88be671fedd38f))
12+
13+
14+
15+
16+
617
## [5.15.1](https://github.com/pattern-lab/patternlab-node/compare/v5.15.0...v5.15.1) (2021-10-16)
718

819

Diff for: ‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"lerna": "3.11.0",
3-
"version": "5.15.1",
3+
"version": "5.15.2",
44
"packages": [
55
"packages/*"
66
],

Diff for: ‎packages/cli/CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.15.2](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/v5.15.1...v5.15.2) (2021-11-03)
7+
8+
**Note:** Version bump only for package @pattern-lab/cli
9+
10+
11+
12+
13+
14+
615
## [5.15.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/v5.15.0...v5.15.1) (2021-10-16)
716

817
**Note:** Version bump only for package @pattern-lab/cli

Diff for: ‎packages/cli/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "@pattern-lab/cli",
33
"description": "Command-line interface (CLI) for the @pattern-lab/core.",
4-
"version": "5.15.1",
4+
"version": "5.15.2",
55
"bin": {
66
"patternlab": "bin/patternlab.js"
77
},
88
"author": {
99
"name": "Patternlab contributors"
1010
},
1111
"dependencies": {
12-
"@pattern-lab/core": "^5.15.1",
12+
"@pattern-lab/core": "^5.15.2",
1313
"@pattern-lab/live-server": "^5.15.1",
1414
"@pattern-lab/starterkit-mustache-base": "3.0.3",
1515
"archiver": "2.1.1",

Diff for: ‎packages/core/CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.15.2](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/compare/v5.15.1...v5.15.2) (2021-11-03)
7+
8+
9+
### Bug Fixes
10+
11+
* **core:** Subgroup cannot be hidden ([#1368](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/issues/1368)) ([3ce13ab](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/commit/3ce13abffaab2810194003aeca88be671fedd38f))
12+
13+
14+
15+
16+
617
## [5.15.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/compare/v5.15.0...v5.15.1) (2021-10-16)
718

819

Diff for: ‎packages/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@pattern-lab/core",
33
"description": "Create atomic design systems with Pattern Lab. This is the core API and orchestrator of the ecosystem.",
4-
"version": "5.15.1",
4+
"version": "5.15.2",
55
"main": "./src/index.js",
66
"dependencies": {
77
"@pattern-lab/engine-mustache": "^5.15.1",

Diff for: ‎packages/core/src/lib/pattern_engines.js

+23-15
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,21 @@ const engineMatcher = /^engine-(.*)$/;
99

1010
const logger = require('./log');
1111

12+
const { resolvePackageFolder } = require('@pattern-lab/core/src/lib/resolver');
13+
1214
const enginesDirectories = [
1315
{
1416
displayName: 'the core',
15-
path: path.resolve(__dirname, '..', '..', 'node_modules')
17+
path: path.resolve(__dirname, '..', '..', 'node_modules'),
1618
},
1719
{
1820
displayName: 'the edition or test directory',
19-
path: path.join(process.cwd(), 'node_modules')
20-
}
21+
path: path.join(process.cwd(), 'node_modules'),
22+
},
23+
{
24+
displayName: 'the general node_modules directory',
25+
path: path.resolve(resolvePackageFolder('@pattern-lab/core'), '..', '..'),
26+
},
2127
];
2228

2329
/**
@@ -77,21 +83,23 @@ const PatternEngines = Object.create({
7783
* @param patternLabConfig
7884
* @memberof PatternEngines
7985
*/
80-
loadAllEngines: function(patternLabConfig) {
86+
loadAllEngines: function (patternLabConfig) {
8187
const self = this;
8288

8389
// Try to load engines! We scan for engines at each path specified above. This
8490
// function is kind of a big deal.
85-
enginesDirectories.forEach(function(engineDirectory) {
91+
enginesDirectories.forEach(function (engineDirectory) {
8692
const enginesInThisDir = findEngineModulesInDirectory(
8793
engineDirectory.path
8894
);
8995

90-
logger.debug(`Loading engines from ${engineDirectory.displayName}...`);
96+
logger.debug(
97+
`Loading engines from ${engineDirectory.displayName}: ${engineDirectory.path} ...`
98+
);
9199

92100
// find all engine-named things in this directory and try to load them,
93101
// unless it's already been loaded.
94-
enginesInThisDir.forEach(function(engineDiscovery) {
102+
enginesInThisDir.forEach(function (engineDiscovery) {
95103
let errorMessage;
96104
const successMessage = 'good to go';
97105

@@ -138,7 +146,7 @@ const PatternEngines = Object.create({
138146
* @param pattern
139147
* @returns engine name matching pattern
140148
*/
141-
getEngineNameForPattern: function(pattern) {
149+
getEngineNameForPattern: function (pattern) {
142150
// avoid circular dependency by putting this in here. TODO: is this slow?
143151
const of = require('./object_factory');
144152
if (
@@ -175,7 +183,7 @@ const PatternEngines = Object.create({
175183
* @param pattern
176184
* @returns name of engine for pattern
177185
*/
178-
getEngineForPattern: function(pattern) {
186+
getEngineForPattern: function (pattern) {
179187
if (pattern.isPseudoPattern) {
180188
return this.getEngineForPattern(pattern.basePattern);
181189
} else {
@@ -189,9 +197,9 @@ const PatternEngines = Object.create({
189197
* @memberof PatternEngines
190198
* @returns Array all supported file extensions
191199
*/
192-
getSupportedFileExtensions: function() {
200+
getSupportedFileExtensions: function () {
193201
const engineNames = Object.keys(PatternEngines);
194-
const allEnginesExtensions = engineNames.map(engineName => {
202+
const allEnginesExtensions = engineNames.map((engineName) => {
195203
return PatternEngines[engineName].engineFileExtension;
196204
});
197205
return [].concat.apply([], allEnginesExtensions);
@@ -203,7 +211,7 @@ const PatternEngines = Object.create({
203211
* @param fileExtension
204212
* @returns Boolean
205213
*/
206-
isFileExtensionSupported: function(fileExtension) {
214+
isFileExtensionSupported: function (fileExtension) {
207215
const supportedExtensions = PatternEngines.getSupportedFileExtensions();
208216
return supportedExtensions.lastIndexOf(fileExtension) !== -1;
209217
},
@@ -214,7 +222,7 @@ const PatternEngines = Object.create({
214222
* @param filename
215223
* @return boolean
216224
*/
217-
isPseudoPatternJSON: function(filename) {
225+
isPseudoPatternJSON: function (filename) {
218226
const extension = path.extname(filename);
219227
return extension === '.json' && filename.indexOf('~') > -1;
220228
},
@@ -229,7 +237,7 @@ const PatternEngines = Object.create({
229237
* @param filename
230238
* @returns boolean
231239
*/
232-
isPatternFile: function(filename) {
240+
isPatternFile: function (filename) {
233241
// skip hidden patterns/files without a second thought
234242
const extension = path.extname(filename);
235243
if (
@@ -245,7 +253,7 @@ const PatternEngines = Object.create({
245253
supportedPatternFileExtensions.lastIndexOf(extension) !== -1 ||
246254
PatternEngines.isPseudoPatternJSON(filename)
247255
);
248-
}
256+
},
249257
});
250258

251259
module.exports = PatternEngines;

Diff for: ‎packages/core/src/lib/ui_builder.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ const ui_builder = function () {
102102
// this pattern is contained with a directory documented as hidden (a handy way to hide whole directories from the nav
103103
isOmitted =
104104
(pattern.patternGroupData && pattern.patternGroupData.hidden) ||
105-
(pattern.patternSubGroupData && pattern.patternSubGroupData.hidden) ||
105+
(pattern.patternSubgroupData && pattern.patternSubgroupData.hidden) ||
106106
// TODO: Remove next two lines when removing support & deprecation waring for underscore prefix hiding
107107
pattern.relPath.charAt(0) === '_' ||
108108
pattern.relPath.indexOf(path.sep + '_') > -1;

Diff for: ‎packages/core/test/ui_builder_tests.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ tap.test(
145145
patternPartial: 'shown-foo',
146146
});
147147

148-
pattern.patternSubGroupData = {
148+
pattern.patternSubgroupData = {
149149
hidden: true,
150150
};
151151

Diff for: ‎packages/create/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.15.2](https://github.com/pattern-lab/patternlab-node/compare/v5.15.1...v5.15.2) (2021-11-03)
7+
8+
**Note:** Version bump only for package create-pattern-lab
9+
10+
11+
12+
13+
614
## [5.15.1](https://github.com/pattern-lab/patternlab-node/compare/v5.15.0...v5.15.1) (2021-10-16)
715

816
**Note:** Version bump only for package create-pattern-lab

Diff for: ‎packages/create/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "create-pattern-lab",
3-
"version": "5.15.1",
3+
"version": "5.15.2",
44
"description": "",
55
"bin": "index.js",
66
"main": "index.js",
77
"scripts": {},
88
"dependencies": {
9-
"@pattern-lab/cli": "^5.15.1"
9+
"@pattern-lab/cli": "^5.15.2"
1010
},
1111
"author": "",
1212
"license": "MIT",

Diff for: ‎packages/development-edition-engine-handlebars/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.15.2](https://github.com/pattern-lab/patternlab-node/compare/v5.15.1...v5.15.2) (2021-11-03)
7+
8+
**Note:** Version bump only for package @pattern-lab/development-edition-engine-handlebars
9+
10+
11+
12+
13+
614
## [5.15.1](https://github.com/pattern-lab/patternlab-node/compare/v5.15.0...v5.15.1) (2021-10-16)
715

816
**Note:** Version bump only for package @pattern-lab/development-edition-engine-handlebars

Diff for: ‎packages/development-edition-engine-handlebars/package.json

+5-5
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": "5.15.1",
4+
"version": "5.15.2",
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",
@@ -29,12 +29,12 @@
2929
"node": ">=12.13.1"
3030
},
3131
"dependencies": {
32-
"@pattern-lab/cli": "^5.15.1",
33-
"@pattern-lab/core": "^5.15.1",
32+
"@pattern-lab/cli": "^5.15.2",
33+
"@pattern-lab/core": "^5.15.2",
3434
"@pattern-lab/engine-handlebars": "^5.15.1",
3535
"@pattern-lab/engine-mustache": "^5.15.1",
3636
"@pattern-lab/plugin-tab": "^5.15.1",
37-
"@pattern-lab/starterkit-handlebars-demo": "^5.15.1",
38-
"@pattern-lab/uikit-workshop": "^5.15.1"
37+
"@pattern-lab/starterkit-handlebars-demo": "^5.15.2",
38+
"@pattern-lab/uikit-workshop": "^5.15.2"
3939
}
4040
}

Diff for: ‎packages/development-edition-engine-react/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.15.2](https://github.com/pattern-lab/edition-node-gulp/compare/v5.15.1...v5.15.2) (2021-11-03)
7+
8+
**Note:** Version bump only for package @pattern-lab/engine-react-testing-tree
9+
10+
11+
12+
13+
614
## [5.15.1](https://github.com/pattern-lab/edition-node-gulp/compare/v5.15.0...v5.15.1) (2021-10-16)
715

816
**Note:** Version bump only for package @pattern-lab/engine-react-testing-tree

Diff for: ‎packages/development-edition-engine-react/package.json

+3-3
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": "5.15.1",
4+
"version": "5.15.2",
55
"private": true,
66
"main": "gulpfile.js",
77
"dependencies": {
8-
"@pattern-lab/core": "^5.15.1",
8+
"@pattern-lab/core": "^5.15.2",
99
"@pattern-lab/engine-mustache": "^5.15.1",
1010
"@pattern-lab/engine-react": "^5.15.1",
11-
"@pattern-lab/uikit-workshop": "^5.15.1",
11+
"@pattern-lab/uikit-workshop": "^5.15.2",
1212
"gulp": "3.9.1",
1313
"minimist": "^1.2.5",
1414
"react": "16.2.0"

Diff for: ‎packages/development-edition-engine-twig/CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.15.2](https://github.com/pattern-lab/patternlab-node/compare/v5.15.1...v5.15.2) (2021-11-03)
7+
8+
**Note:** Version bump only for package @pattern-lab/development-edition-engine-twig
9+
10+
11+
12+
13+
14+
615
## [5.15.1](https://github.com/pattern-lab/patternlab-node/compare/v5.15.0...v5.15.1) (2021-10-16)
716

817
**Note:** Version bump only for package @pattern-lab/development-edition-engine-twig

Diff for: ‎packages/development-edition-engine-twig/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@pattern-lab/development-edition-engine-twig",
33
"private": true,
4-
"version": "5.15.1",
4+
"version": "5.15.2",
55
"description": "The tree of components we use to test, develop and validate the twig engine (not engine-twig-php)",
66
"scripts": {
77
"postbootstrap": "patternlab install --starterkits @pattern-lab/starterkit-twig-demo",
@@ -30,11 +30,11 @@
3030
"node": ">=12.13.1"
3131
},
3232
"dependencies": {
33-
"@pattern-lab/cli": "^5.15.1",
34-
"@pattern-lab/core": "^5.15.1",
33+
"@pattern-lab/cli": "^5.15.2",
34+
"@pattern-lab/core": "^5.15.2",
3535
"@pattern-lab/engine-twig": "^5.15.1",
3636
"@pattern-lab/starterkit-twig-demo": "^5.15.1",
37-
"@pattern-lab/uikit-workshop": "^5.15.1"
37+
"@pattern-lab/uikit-workshop": "^5.15.2"
3838
},
3939
"workspaces": {
4040
"nohoist": [

Diff for: ‎packages/edition-node-gulp/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.15.2](https://github.com/pattern-lab/patternlab-node/tree/master/packages/edition-node-gulp/compare/v5.15.1...v5.15.2) (2021-11-03)
7+
8+
**Note:** Version bump only for package @pattern-lab/edition-node-gulp
9+
10+
11+
12+
13+
614
## [5.15.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/edition-node-gulp/compare/v5.15.0...v5.15.1) (2021-10-16)
715

816
**Note:** Version bump only for package @pattern-lab/edition-node-gulp

0 commit comments

Comments
 (0)