Skip to content

Commit e9c8f1d

Browse files
JosefBredereckJosefBredereck
authored
Merge branch 'dev' into refactor-updated-depencencies-webpack
2 parents 6e1da0b + 7951a41 commit e9c8f1d

File tree

70 files changed

+314
-163
lines changed

Some content is hidden

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

70 files changed

+314
-163
lines changed

‎.github/gitgraph/branching-scheme.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</head>
1212
<body>
1313
<canvas id="gitGraph"></canvas>
14-
<script src="https://cdnjs.cloudflare.com/ajax/libs/gitgraph.js/1.11.4/gitgraph.min.js"></script>
14+
<script src="https://cdnjs.cloudflare.com/ajax/libs/gitgraph.js/1.11.4/gitgraph.min.js" integrity="sha384-2GjLPjUuz0uNoyw8YQ2zQoMBU8q/8opCOxpHOTvMjl1AY6IjI6Lat39y7JhmBpaZ" crossorigin="anonymous"></script>
1515
<script src="patternlab-flow.js"></script>
1616
</body>
1717
</head>

‎CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
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.16.2](https://github.com/pattern-lab/patternlab-node/compare/v5.16.1...v5.16.2) (2022-02-07)
7+
8+
9+
### Bug Fixes
10+
11+
* transformed asset types is ignored ([#1426](https://github.com/pattern-lab/patternlab-node/issues/1426)) ([8cbe189](https://github.com/pattern-lab/patternlab-node/commit/8cbe189d45afaa753ce6de41bdd9de1596e074f3)), closes [#1339](https://github.com/pattern-lab/patternlab-node/issues/1339)
12+
13+
14+
### Features
15+
16+
* remove sandbox attribute from iframe ([#1422](https://github.com/pattern-lab/patternlab-node/issues/1422)) ([4335660](https://github.com/pattern-lab/patternlab-node/commit/4335660bac6f87618baaef9d773e00d7e80c6eec))
17+
18+
19+
20+
21+
622
## [5.16.1](https://github.com/pattern-lab/patternlab-node/compare/v5.16.0...v5.16.1) (2022-01-29)
723

824
**Note:** Version bump only for package patternlab-node-main

‎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.16.1",
3+
"version": "5.16.2",
44
"packages": [
55
"packages/*"
66
],

‎packages/cli/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
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.16.2](https://github.com/pattern-lab/patternlab-node/compare/v5.16.1...v5.16.2) (2022-02-07)
7+
8+
**Note:** Version bump only for package @pattern-lab/cli
9+
10+
11+
12+
13+
614
## [5.16.1](https://github.com/pattern-lab/patternlab-node/compare/v5.16.0...v5.16.1) (2022-01-29)
715

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

‎packages/cli/package.json

Lines changed: 2 additions & 2 deletions
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.16.1",
4+
"version": "5.16.2",
55
"bin": {
66
"patternlab": "bin/patternlab.js"
77
},
88
"author": {
99
"name": "Patternlab contributors"
1010
},
1111
"dependencies": {
12-
"@pattern-lab/core": "^5.16.1",
12+
"@pattern-lab/core": "^5.16.2",
1313
"archiver": "5.3.0",
1414
"chalk": "4.1.0",
1515
"commander": "6.2.1",

‎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.16.2](https://github.com/pattern-lab/patternlab-node/compare/v5.16.1...v5.16.2) (2022-02-07)
7+
8+
9+
### Bug Fixes
10+
11+
* transformed asset types is ignored ([#1426](https://github.com/pattern-lab/patternlab-node/issues/1426)) ([8cbe189](https://github.com/pattern-lab/patternlab-node/commit/8cbe189d45afaa753ce6de41bdd9de1596e074f3)), closes [#1339](https://github.com/pattern-lab/patternlab-node/issues/1339)
12+
13+
14+
15+
16+
617
## [5.16.1](https://github.com/pattern-lab/patternlab-node/compare/v5.16.0...v5.16.1) (2022-01-29)
718

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

‎packages/core/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/core",
33
"description": "Create atomic design systems with Pattern Lab. This is the core API and orchestrator of the ecosystem.",
4-
"version": "5.16.1",
4+
"version": "5.16.2",
55
"main": "./src/index.js",
66
"dependencies": {
77
"@pattern-lab/engine-mustache": "^5.16.1",
@@ -15,8 +15,8 @@
1515
"js-beautify": "1.13.5",
1616
"js-yaml": "4.1.0",
1717
"lodash": "4.17.21",
18-
"markdown-it": "12.0.6",
19-
"node-fetch": "2.6.1",
18+
"markdown-it": "12.3.2",
19+
"node-fetch": "2.6.7",
2020
"recursive-copy": "2.0.13",
2121
"update-notifier": "5.1.0"
2222
},

‎packages/core/src/lib/copier.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ const copier = () => {
5555
debug: patternlab.config.logLevel === 'debug',
5656
};
5757

58+
// Adding assets to filter for in case of transformedAssetTypes defined; adapted regex from https://stackoverflow.com/a/6745455
59+
if (patternlab.config.transformedAssetTypes) {
60+
copyOptions.filter = new RegExp(
61+
`.*(?<![.](${patternlab.config.transformedAssetTypes.join('|')}))$`,
62+
'i'
63+
);
64+
}
65+
5866
//loop through each directory asset object (source / public pairing)
5967

6068
const copyPromises = [];
@@ -92,7 +100,7 @@ const copier = () => {
92100
copyPromises.push(
93101
_.map(patternlab.uikits, (uikit) => {
94102
copyFile(
95-
`${assetDirectories.source.root}/favicon.ico`,
103+
`${assetDirectories.source.root}favicon.ico`,
96104
path.join(
97105
basePath,
98106
uikit.outputDir,

‎packages/core/src/lib/parseLink.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const getPartial = require('./get');
77

88
module.exports = function (patternlab, obj, key) {
99
//check for 'link.patternPartial'
10-
const linkRE = /(?:'|")(link\.[A-z0-9-_]+)(?:'|")/g;
10+
const linkRE = /(?:'|")(link\.[\w-]+)(?:'|")/g;
1111

1212
//stringify the passed in object
1313
let dataObjAsString;

‎packages/core/test/files/_meta/_head.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html class="{{ htmlClass }}">
33
<head>
44
<title>{{ title }}</title>
5-
<meta charset="UTF-8">
5+
<meta charset="UTF-8" />
66
<meta name="viewport" content="width=device-width" />
77

88
<link rel="stylesheet" href="../../css/style.css?{{ cacheBuster }}" media="all" />

0 commit comments

Comments
 (0)