Skip to content

Commit d5e1c0d

Browse files
Merge remote-tracking branch 'upstream/dev' into dev
2 parents 49c098c + ee0f2ec commit d5e1c0d

File tree

38 files changed

+452
-254
lines changed

38 files changed

+452
-254
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- before posting an issue, try chatting on https://gitter.im/pattern-lab/node -->
22

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

55
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.
66

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Continuous Integration
2+
on: [push, pull_request]
3+
4+
jobs:
5+
build:
6+
name: Build & Test
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: Check out the source code
10+
uses: actions/checkout@v2
11+
12+
- name: Set up NodeJS
13+
uses: actions/setup-node@v1.4.2
14+
with:
15+
node-version: '>=12.12.0'
16+
17+
- name: Setup the project
18+
run: |
19+
yarn run setup
20+
npx lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
21+
npx lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
22+
npx lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core
23+
npx lerna add @pattern-lab/engine-liquid --scope=@pattern-lab/core
24+
npx lerna add @pattern-lab/engine-twig --scope=@pattern-lab/core
25+
npx lerna add @pattern-lab/engine-react --scope=@pattern-lab/core
26+
27+
- name: Run Unit Tests
28+
run: yarn run test

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ If you'd like to see what a front-end project built with Pattern Lab looks like,
1313
![license](https://img.shields.io/github/license/pattern-lab/patternlab-node.svg)
1414
[![Coverage Status](https://coveralls.io/repos/github/pattern-lab/patternlab-node/badge.svg?branch=master)](https://coveralls.io/github/pattern-lab/patternlab-node?branch=master)
1515
[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
16-
[![node (scoped)](https://img.shields.io/node/v/@pattern-lab/patternlab-node.svg)]()
16+
[![node (scoped)](https://img.shields.io/node/v/@pattern-lab/core.svg)]()
1717
[![Join the chat at Gitter](https://badges.gitter.im/pattern-lab/node.svg)](https://gitter.im/pattern-lab/node)
1818

1919
Docs @ [![Netlify Status](https://api.netlify.com/api/v1/badges/d454dbde-02c5-4bd4-8393-4ab75e862b03/deploy-status)](https://app.netlify.com/sites/patternlab-docs-preview/deploys)

packages/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"bugs": "https://github.com/pattern-lab/patternlab-node/issues",
5656
"license": "MIT",
5757
"engines": {
58-
"node": ">=10.0"
58+
"node": ">=12.12.0"
5959
},
6060
"publishConfig": {
6161
"access": "public"

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"test": "tap test/*_tests.js --reporter spec --coverage"
7272
},
7373
"engines": {
74-
"node": ">=10.0"
74+
"node": ">=12.12.0"
7575
},
7676
"publishConfig": {
7777
"access": "public"

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": ">=10.0"
34+
"node": ">=12.12.0"
3535
}
3636
}

packages/development-edition-engine-twig/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": ">=10.0"
29+
"node": ">=12.12.0"
3030
},
3131
"dependencies": {
3232
"@pattern-lab/cli": "^5.9.3",

packages/docs/src/docs/advanced-keyboard-shortcuts.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ Pattern Lab comes with support for a number of special keyboard shortcuts to mak
1515

1616
Modifying the viewport:
1717

18-
- **ctrl+shift+0**: set the viewport to 320px
19-
- **ctrl+shift+s**: set the viewport to "small"
20-
- **ctrl+shift+m**: set the viewport to "medium"
21-
- **ctrl+shift+l**: set the viewport to "large"
22-
- **ctrl+shift+h**: toggle Hay mode
23-
- **ctrl+shift+d**: toggle disco mode
18+
- **ctrl+alt+0**: set the viewport to 320px
19+
- **ctrl+alt+s**: set the viewport to "small"
20+
- **ctrl+alt+m**: set the viewport to "medium"
21+
- **ctrl+alt+l**: set the viewport to "large"
22+
- **ctrl+alt+h**: toggle Hay mode
23+
- **ctrl+alt+d**: toggle disco mode
2424

2525
Modifying the views:
2626

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": ">=10.0"
30+
"node": ">=12.12.0"
3131
},
3232
"publishConfig": {
3333
"access": "public"

packages/edition-node/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": ">=10.0"
30+
"node": ">=12.12.0"
3131
},
3232
"publishConfig": {
3333
"access": "public"

0 commit comments

Comments
 (0)