Skip to content

Commit 8dd40f4

Browse files
mfranzkemfranzke
authored
Merge branch 'dev' into 1030-fully-support-htmltwig-suffix
2 parents 5386288 + 773909d commit 8dd40f4

File tree

92 files changed

+318
-99
lines changed

Some content is hidden

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

92 files changed

+318
-99
lines changed

‎.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion

‎.github/gitgraph/branching-scheme.html

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
11
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/gitgraph.js/1.11.4/gitgraph.min.css" />
5-
<style>
6-
body {
7-
margin: 0;
8-
padding: 0;
9-
}
10-
</style>
11-
</head>
12-
<body>
13-
<canvas id="gitGraph"></canvas>
14-
<script src="https://cdnjs.cloudflare.com/ajax/libs/gitgraph.js/1.11.4/gitgraph.min.js" integrity="sha384-2GjLPjUuz0uNoyw8YQ2zQoMBU8q/8opCOxpHOTvMjl1AY6IjI6Lat39y7JhmBpaZ" crossorigin="anonymous"></script>
15-
<script src="patternlab-flow.js"></script>
16-
</body>
17-
</head>
2+
<html lang="en">
3+
<head>
4+
<title>Branching scheme</title>
5+
<link
6+
rel="stylesheet"
7+
type="text/css"
8+
href="https://cdnjs.cloudflare.com/ajax/libs/gitgraph.js/1.11.4/gitgraph.min.css"
9+
/>
10+
<style>
11+
body {
12+
margin: 0;
13+
padding: 0;
14+
}
15+
</style>
16+
</head>
17+
<body>
18+
<canvas id="gitGraph"></canvas>
19+
<script
20+
src="https://cdnjs.cloudflare.com/ajax/libs/gitgraph.js/1.11.4/gitgraph.min.js"
21+
integrity="sha384-2GjLPjUuz0uNoyw8YQ2zQoMBU8q/8opCOxpHOTvMjl1AY6IjI6Lat39y7JhmBpaZ"
22+
crossorigin="anonymous"
23+
></script>
24+
<script src="patternlab-flow.js"></script>
25+
</body>
26+
</html>

‎.github/workflows/codeql-analysis.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
# the `language` matrix defined below to confirm you have the correct set of
1010
# supported CodeQL languages.
1111
#
12-
name: "CodeQL"
12+
name: 'CodeQL'
1313

1414
on:
1515
push:
16-
branches: [ dev, master ]
16+
branches: [dev, master]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ dev ]
19+
branches: [dev]
2020
schedule:
2121
- cron: '0 18 1 * *'
2222

@@ -28,40 +28,40 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
language: [ 'javascript' ]
31+
language: ['javascript']
3232
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
3333
# Learn more:
3434
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
3535

3636
steps:
37-
- name: Checkout repository
38-
uses: actions/checkout@v2
37+
- name: Checkout repository
38+
uses: actions/checkout@v2
3939

40-
# Initializes the CodeQL tools for scanning.
41-
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@v1
43-
with:
44-
languages: ${{ matrix.language }}
45-
# If you wish to specify custom queries, you can do so here or in a config file.
46-
# By default, queries listed here will override any specified in a config file.
47-
# Prefix the list here with "+" to use these queries and those in the config file.
48-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
40+
# Initializes the CodeQL tools for scanning.
41+
- name: Initialize CodeQL
42+
uses: github/codeql-action/init@v2
43+
with:
44+
languages: ${{ matrix.language }}
45+
# If you wish to specify custom queries, you can do so here or in a config file.
46+
# By default, queries listed here will override any specified in a config file.
47+
# Prefix the list here with "+" to use these queries and those in the config file.
48+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
4949

50-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
51-
# If this step fails, then you should remove it and run the build manually (see below)
52-
- name: Autobuild
53-
uses: github/codeql-action/autobuild@v1
50+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
51+
# If this step fails, then you should remove it and run the build manually (see below)
52+
- name: Autobuild
53+
uses: github/codeql-action/autobuild@v2
5454

55-
# ℹ️ Command-line programs to run using the OS shell.
56-
# 📚 https://git.io/JvXDl
55+
# ℹ️ Command-line programs to run using the OS shell.
56+
# 📚 https://git.io/JvXDl
5757

58-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
59-
# and modify them (or add more) to build your code if your project
60-
# uses a compiled language
58+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
59+
# and modify them (or add more) to build your code if your project
60+
# uses a compiled language
6161

62-
#- run: |
63-
# make bootstrap
64-
# make release
62+
#- run: |
63+
# make bootstrap
64+
# make release
6565

66-
- name: Perform CodeQL Analysis
67-
uses: github/codeql-action/analyze@v1
66+
- name: Perform CodeQL Analysis
67+
uses: github/codeql-action/analyze@v2

‎.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
uses: actions/checkout@v2
1111

1212
- name: Set up NodeJS
13-
uses: actions/setup-node@v2.1.4
13+
uses: actions/setup-node@v2
1414
with:
15-
node-version: '>=14.20.1'
15+
node-version: '14'
1616

1717
- name: Setup the project
1818
run: |

‎.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

‎.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ packages/**/annotations.js
1313
*.json
1414
*.md
1515
*.scss
16+
**/_meta/_head.*

‎packages/cli/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

‎packages/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"bugs": "https://github.com/pattern-lab/patternlab-node/issues",
5555
"license": "MIT",
5656
"engines": {
57-
"node": ">=14.20.1"
57+
"node": ">=14.21.1"
5858
},
5959
"publishConfig": {
6060
"access": "public"

‎packages/core/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

‎packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"test": "tap test/*_tests.js --reporter spec --coverage"
6565
},
6666
"engines": {
67-
"node": ">=14.20.1"
67+
"node": ">=14.21.1"
6868
},
6969
"publishConfig": {
7070
"access": "public"

‎packages/create/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
},
1616
"gitHead": "80f62be442223e09bafb30d0529cbd768e03f2ac",
1717
"engines": {
18-
"node": ">=14.20.1"
18+
"node": ">=14.21.1"
1919
}
2020
}

‎packages/development-edition-engine-handlebars/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"url": "git://github.com/pattern-lab/patternlab-node.git"
2727
},
2828
"engines": {
29-
"node": ">=14.20.1"
29+
"node": ">=14.21.1"
3030
},
3131
"dependencies": {
3232
"@pattern-lab/cli": "^5.17.0",

‎packages/development-edition-engine-handlebars/source/_meta/_head.hbs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
<link rel="stylesheet" href="../../css/style.css?{{ cacheBuster }}" media="all" />
99
<link rel="stylesheet" href="../../css/pattern-scaffolding.css?{{ cacheBuster }}" media="all" />
10-
<link href="https://fonts.googleapis.com/css?family=Abel|Raleway:400,400i,700" rel="stylesheet">
1110

1211
<!--<Deject>-->
1312
<!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->

‎packages/development-edition-engine-react/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
},
3232
"license": "MIT",
3333
"engines": {
34-
"node": ">=14.20.1"
34+
"node": ">=14.21.1"
3535
}
3636
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"url": "git://github.com/pattern-lab/patternlab-node.git"
2828
},
2929
"engines": {
30-
"node": ">=14.20.1"
30+
"node": ">=14.21.1"
3131
},
3232
"dependencies": {
3333
"@pattern-lab/cli": "^5.17.0",

‎packages/docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@
5555
"homepage": "https://github.com/bradfrost/pl-website-eleventy/#readme",
5656
"gitHead": "80f62be442223e09bafb30d0529cbd768e03f2ac",
5757
"engines": {
58-
"node": ">=14.20.1"
58+
"node": ">=14.21.1"
5959
}
6060
}

‎packages/docs/src/docs/advanced-ecosystem-overview.md

Lines changed: 1 addition & 1 deletion

‎packages/docs/src/docs/pattern-managing-assets.md

Lines changed: 1 addition & 1 deletion

‎packages/edition-node-gulp/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"license": "MIT",
2929
"engines": {
30-
"node": ">=14.20.1"
30+
"node": ">=14.21.1"
3131
},
3232
"publishConfig": {
3333
"access": "public"

‎packages/edition-node/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

‎packages/edition-node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
},
2929
"license": "MIT",
3030
"engines": {
31-
"node": ">=14.20.1"
31+
"node": ">=14.21.1"
3232
},
3333
"publishConfig": {
3434
"access": "public"

‎packages/edition-twig/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@pattern-lab/uikit-workshop": "^5.17.0"
3030
},
3131
"engines": {
32-
"node": ">=14.20.1"
32+
"node": ">=14.21.1"
3333
},
3434
"publishConfig": {
3535
"access": "public"

‎packages/engine-handlebars/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

‎packages/engine-handlebars/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"license": "MIT",
2424
"scripts": {},
2525
"engines": {
26-
"node": ">=14.20.1"
26+
"node": ">=14.21.1"
2727
},
2828
"publishConfig": {
2929
"access": "public"

‎packages/engine-liquid/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

‎packages/engine-liquid/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"license": "MIT",
2323
"scripts": {},
2424
"engines": {
25-
"node": ">=14.20.1"
25+
"node": ">=14.21.1"
2626
},
2727
"publishConfig": {
2828
"access": "public"

‎packages/engine-mustache/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

‎packages/engine-mustache/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"license": "MIT",
2323
"scripts": {},
2424
"engines": {
25-
"node": ">=14.20.1"
25+
"node": ">=14.21.1"
2626
},
2727
"publishConfig": {
2828
"access": "public"

‎packages/engine-nunjucks/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

‎packages/engine-nunjucks/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"nunjucks": "^3.2.3"
1212
},
1313
"engines": {
14-
"node": ">=14.20.1"
14+
"node": ">=14.21.1"
1515
},
1616
"keywords": [
1717
"Pattern Lab",

‎packages/engine-react/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

‎packages/engine-react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"license": "MIT",
3232
"scripts": {},
3333
"engines": {
34-
"node": ">=14.20.1"
34+
"node": ">=14.21.1"
3535
},
3636
"publishConfig": {
3737
"access": "public"

‎packages/engine-twig-php/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"license": "MIT",
2929
"scripts": {},
3030
"engines": {
31-
"node": ">=14.20.1"
31+
"node": ">=14.21.1"
3232
},
3333
"publishConfig": {
3434
"access": "public"

‎packages/engine-twig/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

‎packages/engine-twig/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"license": "MIT",
2323
"scripts": {},
2424
"engines": {
25-
"node": ">=14.20.1"
25+
"node": ">=14.21.1"
2626
},
2727
"publishConfig": {
2828
"access": "public"

‎packages/engine-underscore/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

‎packages/engine-underscore/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"lint": "eslint **/*.js"
2424
},
2525
"engines": {
26-
"node": ">=14.20.1"
26+
"node": ">=14.21.1"
2727
},
2828
"publishConfig": {
2929
"access": "public"

‎packages/live-server/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

‎packages/live-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/live-server",
4545
"bugs": "https://github.com/pattern-lab/patternlab-node/issues",
4646
"engines": {
47-
"node": ">=14.20.1"
47+
"node": ">=14.21.1"
4848
},
4949
"publishConfig": {
5050
"access": "public"

‎packages/plugin-tab/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.20.1
1+
14.21

0 commit comments

Comments
 (0)