Skip to content

Commit a82d4bc

Browse files
authored
Merge branch 'dev' into feature/exclude-tags
2 parents 47c1dd2 + ee0f2ec commit a82d4bc

File tree

82 files changed

+691
-345
lines changed

Some content is hidden

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

82 files changed

+691
-345
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ This ensures that any changes you've made will still result in a clean and funct
3737
3838
* _ALWAYS_ submit pull requests against the [dev branch](https://github.com/pattern-lab/patternlab-node/tree/dev). If this does not occur, I will first, try to redirect you gently, second, attempt to redirect the target branch myself, thirdly, port over your contribution manually if time allows, and/or lastly, close your pull request. If you have a major feature to stabilize over time, talk to @bmuenzenmeyer via an issue about making a dedicated `feature-branch`
3939
* Keep your pull requests concise and limited to **ONE** substantive change at a time. This makes reviewing and testing so much easier.
40+
* If it takes you considerable time to finish your work, submit a [draft pull request](https://github.blog/2019-02-14-introducing-draft-pull-requests/). This is Github's way to indicate work in progress but allows for feedback.
4041
* Commits should reference the issue you are adressing. For any Pull Request that you send, use the template provided.
4142
* Commits are best formatted using the [conventional commits pattern](https://conventionalcommits.org/).
4243
* If you can, add some unit tests using the existing patterns in the `.packages/core/test` directory

.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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
This monorepo contains the core of Pattern Lab / Node and all related engines, UI kits, plugins and utilities. Pattern Lab helps you and your team build thoughtful, pattern-driven user interfaces using atomic design principles.
88

9-
If you'd like to see what a front-end project built with Pattern Lab looks like, check out this [online demo of Pattern Lab output](http://demo.patternlab.io/).
9+
If you'd like to see what a front-end project built with Pattern Lab looks like, check out this [online demo of Pattern Lab output](https://demo.patternlab.io/).
1010

1111
[![Build Status](https://travis-ci.org/pattern-lab/patternlab-node.svg?branch=master)](https://travis-ci.org/pattern-lab/patternlab-node)
1212
![current release](https://img.shields.io/npm/v/@pattern-lab/core.svg)
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)
@@ -26,7 +26,7 @@ Refer to the [core usage guidelines](https://github.com/pattern-lab/patternlab-n
2626

2727
### Installation
2828

29-
As of Pattern Lab Node 3.0.0, installation of [Editions](http://patternlab.io/docs/advanced-ecosystem-overview.html) is accomplished via the command line interface.
29+
As of Pattern Lab Node 3.0.0, installation of [Editions](https://patternlab.io/docs/overview-of-pattern-lab's-ecosystem/) is accomplished via the command line interface.
3030

3131
The below assumes a new directory and project is required. This is likely what you want to do if starting from scratch. You could also run this within an existing project. The CLI will ask you for the installation location.
3232

@@ -46,9 +46,9 @@ The below assumes a new directory and project is required. This is likely what y
4646

4747
## Ecosystem
4848

49-
![Pattern Lab Ecosystem](http://patternlab.io/assets/pattern-lab-2-image_18-large-opt.png)
49+
![Pattern Lab Ecosystem](https://patternlab.io/images/pattern-lab-2-image_18-large-opt.png)
5050

51-
Core, and Editions, are part of the [Pattern Lab Ecosystem](http://patternlab.io/docs/advanced-ecosystem-overview.html). With this architecture, we encourage people to write and maintain their own Editions, Starterkits, and even PatternEngines.
51+
Core, and Editions, are part of the [Pattern Lab Ecosystem](https://patternlab.io/docs/overview-of-pattern-lab's-ecosystem/). With this architecture, we encourage people to write and maintain their own Editions, Starterkits, and even PatternEngines.
5252
5353
## Changelog
5454

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/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
# Pattern Lab Node Core
1212

13-
This is the core API and orchestrator of the [Pattern Lab ecosystem](http://patternlab.io/docs/advanced-ecosystem-overview.html).
13+
This is the core API and orchestrator of the [Pattern Lab ecosystem](https://patternlab.io/docs/overview-of-pattern-lab's-ecosystem/).
1414

1515
## Installation
1616

@@ -35,9 +35,9 @@ For users wanting a more pre-packaged experience several editions are available.
3535

3636
## Ecosystem
3737

38-
![Pattern Lab Ecosystem](http://patternlab.io/assets/pattern-lab-2-image_18-large-opt.png)
38+
![Pattern Lab Ecosystem](https://patternlab.io/images/pattern-lab-2-image_18-large-opt.png)
3939

40-
Core, and Editions, are part of the [Pattern Lab Ecosystem](http://patternlab.io/docs/advanced-ecosystem-overview.html). With this architecture, we encourage people to write and maintain their own Editions, Starterkits, and even PatternEngines.
40+
Core, and Editions, are part of the [Pattern Lab Ecosystem](https://patternlab.io/docs/overview-of-pattern-lab's-ecosystem/). With this architecture, we encourage people to write and maintain their own Editions, Starterkits, and even PatternEngines.
4141

4242
## Usage
4343

@@ -59,7 +59,7 @@ patternlab.serve({
5959
});
6060
```
6161

62-
* Read more about [configuration](http://patternlab.io/docs/advanced-config-options.html#node) via `patternlab-config.json`.
62+
* Read more about [configuration](https://patternlab.io/docs/editing-the-configuration-options/) via `patternlab-config.json`.
6363

6464
* Read more about the rest of [Public API](./docs), and already implemented for you within [Editions](#editions).
6565

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/core/src/lib/loadPattern.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ module.exports = function(relPath, patternlab) {
4848
'While Pattern Lab may still function, assets may 404 and frontend links may break. Consider yourself warned. '
4949
);
5050
logger.warning(
51-
'Read More: http://patternlab.io/docs/pattern-organization.html'
51+
'Read More: https://patternlab.io/docs/overview-of-patterns/'
5252
);
5353
logger.warning('');
5454
}

packages/core/test/engine_handlebars_tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function testFindPartials(test, partialTests) {
6161

6262
// setup current pattern from what we would have during execution
6363
// docs on partial syntax are here:
64-
// http://patternlab.io/docs/pattern-including.html
64+
// https://patternlab.io/docs/including-patterns/
6565
var currentPattern = Pattern.create(
6666
'01-molecules/00-testing/00-test-mol.hbs', // relative path now
6767
null, // data

packages/core/test/engine_liquid_tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function testFindPartials(test, partialTests) {
4949

5050
// setup current pattern from what we would have during execution
5151
// docs on partial syntax are here:
52-
// http://patternlab.io/docs/pattern-including.html
52+
// https://patternlab.io/docs/including-patterns/
5353
var currentPattern = Pattern.create(
5454
'01-molecules/00-testing/00-test-mol.liquid', // relative path now
5555
null, // data

0 commit comments

Comments
 (0)