Skip to content

Commit 22b5d73

Browse files
authored
Merge pull request #985 from pattern-lab/dev
Next Release: v3.0.0-beta.2
2 parents 02764b2 + e387eca commit 22b5d73

File tree

114 files changed

+5330
-921
lines changed

Some content is hidden

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

114 files changed

+5330
-921
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.9.4
1+
10.0.0

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ packages/core/scripts/api.handlebars
99
packages/core/scripts/events.handlebars
1010
packages/core/test/files/annotations.js
1111
**/uikit-workshop/src/js/**/*
12+
*.json
13+
*.md
14+
*.scss

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ before_install:
55

66
before_script:
77
- npm install -g [email protected]
8-
- npm run bootstrap
8+
- npm run setup
99
- lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
1010
- lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
1111
- lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core

CODEOWNERS

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# This is a comment.
2+
# Each line is a file pattern followed by one or more owners.
3+
4+
# These owners will be the default owners for everything in
5+
# the repo. Unless a later match takes precedence,
6+
# @global-owner1 and @global-owner2 will be requested for
7+
# review when someone opens a pull request.
8+
@pattern-lab/trusted-committers
9+
10+
# CLI owner
11+
/packages/cli @raphaelokon
12+
13+
# uikit-workshop owner
14+
/packages/uikit-workshop @sghoweri
15+
16+
# engine-nunjucks owner
17+
/packages/engine-nunjucks @danwhite85

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
"private": true,
66
"scripts": {
77
"bootstrap": "lerna bootstrap",
8+
"setup": "npm run bootstrap && npm run build:uikit",
9+
"build:uikit": "lerna exec --scope @pattern-lab/uikit-workshop -- npm run build",
810
"precommit": "pretty-quick --staged",
9-
"prettier": "prettier --config .prettierrc --write ./**/*.js",
11+
"prettier": "prettier --config .prettierrc --write ./**/*.js --ignore-path .prettierignore",
1012
"test": "lerna run test",
1113
"clean": "git clean -dfx"
1214
},

packages/cli/.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
10.0.0

packages/cli/.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
22
node_js:
33
- node
4-
- 6
4+
- 8
55
before_script:
66
- npm install edition-node
77
- npm install starterkit-mustache-base

packages/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"bugs": "https://github.com/pattern-lab/patternlab-node/issues",
5050
"license": "MIT",
5151
"engines": {
52-
"node": ">=6.0"
52+
"node": ">=10.0"
5353
},
5454
"publishConfig": {
5555
"access": "public"

0 commit comments

Comments
 (0)