Skip to content

Commit 373ea94

Browse files
committed
Merge branch 'dev' into refactor-updated-even-further-dependencies
2 parents cb69bed + 4617540 commit 373ea94

File tree

60 files changed

+2098
-1980
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2098
-1980
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
<!-- before posting an issue, verify you are running at least Node 12.12.x -->
44

5+
<!-- Please consider to even also contribute by analyzing the problem within the codebase and suggesting a solution, either in this ticket or – even better and easier – with a pull request. All of our activities are non-profit and open source work is highly benefiting by any possible support from the community. -->
6+
57
I am using Pattern Lab Node `vX.X.X` on `Windows | Mac | Linux`, with Node `vX.X.X`, using a `Gulp | Grunt | Vanilla | Custom` Edition.
68

79
##### Expected Behavior

CHANGELOG.md

Lines changed: 284 additions & 267 deletions
Large diffs are not rendered by default.

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"lerna": "4.0.0",
3-
"version": "5.14.3",
3+
"version": "5.15.0",
44
"packages": [
55
"packages/*"
66
],

packages/cli/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
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.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/v5.14.3...v5.15.0) (2021-07-01)
7+
8+
**Note:** Version bump only for package @pattern-lab/cli
9+
10+
11+
12+
13+
14+
615
## [5.14.3](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/v5.14.2...v5.14.3) (2021-05-17)
716

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

packages/cli/bin/scaffold.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22
const path = require('path');
33
const execa = require('execa');
4-
const fs = require('fs-extra');
4+
const fs = require('fs');
55
const wrapAsync = require('./utils').wrapAsync;
66
const mkdirsAsync = require('./utils').mkdirsAsync;
77

@@ -18,7 +18,6 @@ const scaffold = (projectDir, sourceDir, publicDir, exportDir) =>
1818
wrapAsync(function* () {
1919
const projectPath = path.join(process.cwd(), projectDir);
2020
if (!fs.existsSync(path.join(projectPath, 'package.json'))) {
21-
fs.ensureDirSync(projectPath);
2221
execa.sync('npm', ['init', '-y'], {
2322
cwd: projectPath,
2423
});

packages/cli/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"name": "@pattern-lab/cli",
33
"description": "Command-line interface (CLI) for the @pattern-lab/core.",
4-
"version": "5.14.3",
4+
"version": "5.15.0",
55
"bin": {
66
"patternlab": "bin/patternlab.js"
77
},
88
"author": {
99
"name": "Patternlab contributors"
1010
},
1111
"dependencies": {
12-
"@pattern-lab/core": "^5.14.3",
13-
"@pattern-lab/live-server": "^5.14.3",
12+
"@pattern-lab/core": "^5.15.0",
13+
"@pattern-lab/live-server": "^5.15.0",
1414
"@pattern-lab/starterkit-mustache-base": "3.0.3",
1515
"archiver": "5.3.0",
1616
"chalk": "4.1.0",
@@ -49,7 +49,7 @@
4949
],
5050
"scripts": {
5151
"lint": "eslint ./{bin,test}",
52-
"test:separate": "tap ./test/*.test.js --reporter spec --timeout=120"
52+
"test:separate": "tap './test/*.test.js' --reporter spec --timeout=120"
5353
},
5454
"repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli",
5555
"bugs": "https://github.com/pattern-lab/patternlab-node/issues",

packages/core/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
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.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/compare/v5.14.3...v5.15.0) (2021-07-01)
7+
8+
9+
### Features
10+
11+
* **documentation:** added (sub)groups documentation again [#1262](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/issues/1262) ([#1334](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/issues/1334)) ([9fac269](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/commit/9fac2699d2f6c64c4544e8e4d8e18c1a1ce7e49f))
12+
13+
14+
15+
16+
617
## [5.14.3](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/compare/v5.14.2...v5.14.3) (2021-05-17)
718

819
**Note:** Version bump only for package @pattern-lab/core

packages/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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.14.3",
4+
"version": "5.15.0",
55
"main": "./src/index.js",
66
"dependencies": {
77
"@pattern-lab/engine-mustache": "^5.14.3",
8-
"@pattern-lab/live-server": "^5.14.3",
8+
"@pattern-lab/live-server": "^5.15.0",
99
"chalk": "4.1.0",
1010
"chokidar": "3.5.1",
1111
"dive": "0.5.0",

packages/core/src/lib/server.js

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,6 @@ const server = (patternlab) => {
3636
patternlab.config.paths.public.root
3737
)
3838
);
39-
defaults.assets = [
40-
path.resolve(
41-
path.join(
42-
process.cwd(),
43-
patternlab.config.paths.source.js,
44-
'**',
45-
'*.js' // prevent preprocessors like typescript from reloading
46-
)
47-
),
48-
path.resolve(
49-
path.join(process.cwd(), patternlab.config.paths.source.images)
50-
),
51-
path.resolve(
52-
path.join(process.cwd(), patternlab.config.paths.source.fonts)
53-
),
54-
path.resolve(
55-
path.join(
56-
process.cwd(),
57-
patternlab.config.paths.source.css,
58-
'**',
59-
'*.css' // prevent preprocessors from reloading
60-
)
61-
),
62-
];
6339

6440
// allow for overrides should they exist inside patternlab-config.json
6541
const liveServerConfig = Object.assign(
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Hello world!
2-
{{ subtitle }}
2+
{{subtitle}}

0 commit comments

Comments
 (0)