Skip to content

Commit d124ed7

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into refactor-updated-depencencies-webpack
2 parents e2b9c0e + ef0a60f commit d124ed7

File tree

143 files changed

+4797
-3539
lines changed

Some content is hidden

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

143 files changed

+4797
-3539
lines changed

.eslintrc.json

Lines changed: 0 additions & 79 deletions
This file was deleted.

.github/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ This ensures that any changes you've made will still result in a clean and funct
4848
4949
## Coding style
5050
51-
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.
51+
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.js` file.
5252
53-
The `.editorconfig` controls spaces / tabs within supported editors. Check out their [site](http://editorconfig.org/).
53+
The `.editorconfig` controls spaces / tabs within supported editors. Check out their [site](https://editorconfig.org/).
5454
5555
## Tests
5656
57-
Add unit and integration tests if you can. It's always nice if our code coverage improves bit by bit (literally!). We are using [Node Tap](http://www.node-tap.org/) as test framework and [Rewire](https://github.com/jhnns/rewire) for mocking things like file system access.
57+
Add unit and integration tests if you can. It's always nice if our code coverage improves bit by bit (literally!). We are using [Node Tap](https://node-tap.org/) as test framework and [Rewire](https://github.com/jhnns/rewire) for mocking things like file system access.
5858
5959
## Branching Scheme
6060

.github/gitgraph/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Generating a new graph
22
======================
33

4-
This folder uses http://gitgraphjs.com/ for generating the git graph model.
4+
This folder uses https://www.nicoespeon.com/gitgraph.js for generating the git graph model.
55

6-
1. Change `patternlab-flow.js` to your needs according to the documentation on http://gitgraphjs.com/
6+
1. Change `patternlab-flow.js` to your needs according to the documentation on https://www.nicoespeon.com/gitgraph.js
77
2. Open branching-scheme.html in browse, right click the graph and "Save as...".
88
3. Overwrite `/.github/branching-scheme.png`

.husky/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

CODE_OF_CONDUCT.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai
4040

4141
## Attribution
4242

43-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version]
4444

45-
[homepage]: http://contributor-covenant.org
46-
[version]: http://contributor-covenant.org/version/1/4/
45+
[homepage]: https://contributor-covenant.org
46+
[version]: https://contributor-covenant.org/version/1/4/

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2018 Brian Muenzenmeyer, http://brianmuenzenmeyer.com & Brad Frost, http://bradfrostweb.com
3+
Copyright (c) 2018 Brian Muenzenmeyer, https://brianmuenzenmeyer.com & Brad Frost, https://bradfrost.com
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

README.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<img src='/patternlab.png' width="300" alt="Pattern Lab Logo" style="max-width: 100%;" />
2+
<img src='/patternlab.png' width="300" height="166" alt="Pattern Lab Logo" style="max-width: 100%;" />
33
</p>
44

55
# Pattern Lab
@@ -65,6 +65,23 @@ Pattern Lab / Node wouldn't be what it is today without the support of the commu
6565

6666
Thanks to [Netlify](https://www.netlify.com/) for build tooling and hosting.
6767

68+
## Node Support Policy
69+
70+
We only support actively [maintained](https://github.com/nodejs/Release#release-schedule) versions of Node.
71+
72+
We specifically limit our support to maintenance versions of Node, not because this package won't work on other versions, but because we have a limited amount of time, and supporting the oldest maintenance offers the greatest return on that investment while still providing the lowest standard level for installations on any possible actively maintained environment out there.
73+
74+
This package may work correctly on newer versions of Node. It may even be possible to use this package on older versions of Node. However, that's more unlikely as we'll make every effort to take advantage of features available in the oldest maintenance Node version we support.
75+
76+
As each Node maintenance version reaches its end-of-life, we will replace that version from the `node` `engines` property of our package's `package.json` file with the newer oldest one. As this replacement would be considered a breaking change, we will publish a new major version of this package. We will not accept any requests to support an end-of-life version of Node. Any merge requests or issues supporting an end-of-life version of Node will be closed.
77+
78+
And we might even update the minor and patch version of that supported maintenance Node version regularly, without making this a breaking change than as it should be in everybody's interest even also to follow this concept of using patched software as their development system basis, especially on those older Node versions.
79+
80+
We will accept code that allows this package to run on newer, non-maintenance versions of Node. Furthermore, we will attempt to ensure our changes work on the latest version of Node. To help in that commitment, we even test that out by ourselves and get feedback from the community regularly regarding all LTS versions of Node and the most recent Node release called current.
81+
82+
JavaScript package managers like e.g. [NVM](https://github.com/nvm-sh/nvm) should allow you to install this package with any version of Node, with, at most, a warning if your version of Node does not fall within the range specified by our `node` `engines` property. If you encounter issues installing this package, please report the issue to your package manager.
83+
84+
This policy has been adapted from <https://github.com/conventional-changelog/conventional-changelog#node-support-policy>.
6885
6986
## Contributing
7087

package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@
1010
]
1111
},
1212
"dependencies": {
13-
"@auto-it/released": "^9.40.5",
13+
"@auto-it/released": "^10.27.0",
1414
"@babel/plugin-proposal-decorators": "^7.13.5",
1515
"@babel/plugin-syntax-jsx": "^7.12.13",
16-
"auto": "^9.40.5",
16+
"auto": "^10.27.0",
1717
"babel-eslint": "^10.0.2",
1818
"eslint": "^6.1.0",
19-
"eslint-config-airbnb-base": "^14.0.0",
2019
"eslint-config-prettier": "^6.0.0",
21-
"eslint-plugin-import": "^2.18.2",
2220
"eslint-plugin-prettier": "^3.1.0",
2321
"lerna": "4.0.0",
2422
"prettier": "^2.2.1",
@@ -53,6 +51,6 @@
5351
]
5452
},
5553
"devDependencies": {
56-
"husky": "^6.0.0"
54+
"husky": "^7.0.4"
5755
}
5856
}

packages/cli/.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ coverage
1717
# nyc test coverage
1818
.nyc_output
1919

20-
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
20+
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
2121
.grunt
2222

2323
# node-waf configuration
2424
.lock-wscript
2525

26-
# Compiled binary addons (http://nodejs.org/api/addons.html)
26+
# Compiled binary addons (https://nodejs.org/api/addons.html)
2727
build/Release
2828

2929
# Dependency directories

packages/cli/bin/cli-actions/init.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const writeJsonAsync = require('../utils').writeJsonAsync;
1414
const defaultPatternlabConfig = patternlab.getDefaultConfig();
1515

1616
// https://github.com/TehShrike/deepmerge#overwrite-array
17-
const overwriteMerge = (destinationArray, sourceArray, options) => sourceArray;
17+
const overwriteMerge = (destinationArray, sourceArray) => sourceArray;
1818

1919
const init = (options) =>
2020
wrapAsync(function* () {

0 commit comments

Comments
 (0)