Skip to content

Commit 1d58ebd

Browse files
author
Dan White
committed
Merge remote-tracking branch 'upstream/master' into fix-nunjucks-caching
2 parents f061aad + de86738 commit 1d58ebd

Some content is hidden

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

57 files changed

+691
-664
lines changed
File renamed without changes.

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ This ensures that any changes you've made will still result in a clean and funct
4747
4848
## Coding style
4949
50-
Formatting is automated via [Prettier](https://prettier.io/), setup to run on precommit. We suggest [editor integration](https://prettier.io/docs/en/editors.html) for this and for eslint. Prettier is further configured within `.prettierrc`. Eslint validates syntax and usage that Prettier doesn't handle. Configuration for both is found within the `.eslintrc` file.
50+
Formatting is automated via [Prettier](https://prettier.io/), setup to run on precommit. We suggest [editor integration](https://prettier.io/docs/en/editors.html) for this and for eslint. Prettier is further configured within `.prettierrc`. Eslint validates syntax and usage that Prettier doesn't handle. Configuration for both is found within the `.eslintrc.json` file.
5151
5252
The `.editorconfig` controls spaces / tabs within supported editors. Check out their [site](http://editorconfig.org/).
5353

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ before_install:
44
- phantomjs --version
55

66
before_script:
7-
- npm install -g lerna@3.0.0-beta.21
7+
- npm install -g lerna@3.2.1
88
- npm run bootstrap
99
- lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
1010
- lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"lerna": "3.0.0-rc.0",
2+
"lerna": "3.2.1",
33
"packages": [
44
"packages/*"
55
],

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"devDependencies": {
3-
"lerna": "3.0.0-rc.0"
3+
"lerna": "3.2.1"
44
},
55
"private": true,
66
"scripts": {
7-
"bootstrap": "npx lerna bootstrap",
7+
"bootstrap": "lerna bootstrap",
88
"precommit": "pretty-quick --staged",
99
"prettier": "prettier --config .prettierrc --write ./**/*.js",
1010
"test": "lerna run test",

packages/cli/CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@
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+
<a name="0.0.1-beta.0"></a>
7+
## [0.0.1-beta.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/[email protected]...@pattern-lab/[email protected]) (2018-09-07)
8+
9+
10+
### Bug Fixes
11+
12+
* **cli:** set initialized to false during plugin installation ([88cce3f](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/88cce3f))
13+
* **cli:** support scoped plugins ([4ae13ce](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/4ae13ce))
14+
* **package:** update tap dependency ([2b70ff4](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/commit/2b70ff4))
15+
16+
17+
18+
19+
620
<a name="0.0.1-alpha.23"></a>
721

822
## [0.0.1-alpha.23](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/[email protected]...@pattern-lab/[email protected]) (2018-07-09)

packages/cli/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"name": "@pattern-lab/cli",
33
"description": "Command-line interface (CLI) for the @pattern-lab/core.",
4-
"version": "0.0.1-alpha.23",
4+
"version": "0.0.1-beta.0",
55
"bin": {
66
"patternlab": "bin/patternlab.js"
77
},
88
"author": {
99
"name": "Raphael Okon"
1010
},
1111
"dependencies": {
12-
"@pattern-lab/core": "^3.0.0-alpha.16",
13-
"@pattern-lab/live-server": "^1.3.3-alpha.6",
12+
"@pattern-lab/core": "^3.0.0-beta.0",
13+
"@pattern-lab/live-server": "^1.3.3-beta.0",
1414
"archiver": "2.1.1",
1515
"chalk": "2.4.1",
1616
"commander": "2.15.1",

packages/core/CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,27 @@
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+
<a name="3.0.0-beta.0"></a>
7+
# [3.0.0-beta.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/compare/@pattern-lab/[email protected]...@pattern-lab/[email protected]) (2018-09-07)
8+
9+
10+
### Bug Fixes
11+
12+
* **docs:** update event info with tab example ([0f227a3](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/commit/0f227a3))
13+
* **package:** Allow .json extension on annotations file (issue [#836](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/issues/836)) ([b92e62b](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/commit/b92e62b))
14+
* **package:** update tap dependency ([2b70ff4](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/commit/2b70ff4))
15+
* **plugins:** support scoped packages ([44f0f8e](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/commit/44f0f8e))
16+
17+
18+
### Features
19+
20+
* **API:** remove reliance on patternlab object during plugin install ([0850fd6](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/commit/0850fd6))
21+
* **core:** remove plugin install / disable / enable logic ([5a58824](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/commit/5a58824)), closes [#872](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/issues/872)
22+
23+
24+
25+
26+
627
<a name="3.0.0-alpha.16"></a>
728

829
# [3.0.0-alpha.16](https://github.com/pattern-lab/patternlab-node/tree/master/packages/core/compare/@pattern-lab/[email protected]...@pattern-lab/[email protected]) (2018-07-06)

packages/core/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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": "3.0.0-alpha.16",
4+
"version": "3.0.0-beta.0",
55
"main": "./src/index.js",
66
"dependencies": {
7-
"@pattern-lab/engine-mustache": "^2.0.0-alpha.8",
8-
"@pattern-lab/live-server": "^1.3.3-alpha.6",
7+
"@pattern-lab/engine-mustache": "^2.0.0-beta.0",
8+
"@pattern-lab/live-server": "^1.3.3-beta.0",
99
"chalk": "1.1.3",
1010
"chokidar": "1.7.0",
1111
"dive": "0.5.0",

packages/development-edition-engine-react/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
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+
<a name="0.1.1-beta.0"></a>
7+
## [0.1.1-beta.0](https://github.com/pattern-lab/edition-node-gulp/compare/@pattern-lab/[email protected]...@pattern-lab/[email protected]) (2018-09-07)
8+
9+
**Note:** Version bump only for package @pattern-lab/engine-react-testing-tree
10+
11+
12+
13+
14+
615
<a name="0.1.1-alpha.4"></a>
716

817
## [0.1.1-alpha.4](https://github.com/pattern-lab/edition-node-gulp/compare/@pattern-lab/[email protected]...@pattern-lab/[email protected]) (2018-07-06)

0 commit comments

Comments
 (0)