Skip to content

Commit 351b613

Browse files
bmuenzenmeyerbmuenzenmeyer
authored
Merge branch 'dev' into feature/multilevel-patterns
2 parents 83509fb + 7102306 commit 351b613

File tree

484 files changed

+36887
-6791
lines changed

Some content is hidden

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

484 files changed

+36887
-6791
lines changed

‎.eslintignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
**/node_modules/**
2+
node_modules
3+
**/vendor/**
4+
vendor
5+
**/test/**
6+
**/dist/**
7+
8+
// being refactored / removed
9+
packages/uikit-workshop/src/scripts/components/styleguide.js

‎.eslintrc.js

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
module.exports = {
2+
root: true,
3+
env: {
4+
node: true,
5+
builtin: true,
6+
es6: true,
7+
browser: true,
8+
},
9+
parser: 'babel-eslint',
10+
parserOptions: {
11+
ecmaVersion: 2018,
12+
sourceType: 'module',
13+
allowImportExportEverywhere: true,
14+
ecmaFeatures: {
15+
jsx: true,
16+
experimentalDecorators: true,
17+
},
18+
},
19+
globals: {},
20+
plugins: ['prettier'],
21+
extends: ['eslint-config-prettier'].map(require.resolve),
22+
rules: {
23+
'prettier/prettier': 'error',
24+
'block-scoped-var': 0,
25+
camelcase: 0,
26+
'consistent-return': 2,
27+
curly: [2, 'all'],
28+
'dot-notation': [1, { allowKeywords: true }],
29+
eqeqeq: [2, 'allow-null'],
30+
'global-strict': [0, 'never'],
31+
'guard-for-in': 2,
32+
'key-spacing': 0,
33+
'new-cap': 0,
34+
'no-alert': 2,
35+
'no-bitwise': 2,
36+
'no-caller': 2,
37+
'no-cond-assign': [2, 'except-parens'],
38+
'no-debugger': 2,
39+
'no-dupe-args': 2,
40+
'no-dupe-keys': 2,
41+
'no-empty': 2,
42+
'no-eval': 2,
43+
'no-extend-native': 2,
44+
'no-extra-bind': 2,
45+
'no-extra-parens': 0,
46+
'no-func-assign': 2,
47+
'no-implied-eval': 2,
48+
'no-invalid-regexp': 2,
49+
'no-irregular-whitespace': 1,
50+
'no-iterator': 2,
51+
'no-loop-func': 2,
52+
'no-mixed-requires': 0,
53+
'no-multi-str': 2,
54+
'no-native-reassign': 2,
55+
'no-new': 2,
56+
'no-param-reassign': 1,
57+
'no-proto': 2,
58+
'no-redeclare': 0,
59+
'no-script-url': 2,
60+
'no-self-assign': 2,
61+
'no-self-compare': 2,
62+
'no-sequences': 2,
63+
'no-shadow': 2,
64+
'no-undef': 2,
65+
'no-underscore-dangle': 0,
66+
'no-unreachable': 1,
67+
'no-unused-vars': 1,
68+
'no-use-before-define': 1,
69+
'no-useless-call': 2,
70+
'no-useless-concat': 2,
71+
'no-var': 2,
72+
'no-with': 2,
73+
quotes: [0, 'single'],
74+
radix: 2,
75+
strict: 0,
76+
'valid-typeof': 2,
77+
'vars-on-top': 0,
78+
'prefer-const': [
79+
'error',
80+
{
81+
destructuring: 'any',
82+
ignoreReadBeforeAssign: false,
83+
},
84+
],
85+
},
86+
};

‎.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
2+
"root": true,
23
"env": {
34
"node": true,
45
"builtin": true,
56
"es6": true
67
},
78
"parserOptions": {
8-
"ecmaVersion": 6,
9+
"ecmaVersion": 2017,
910
"sourceType": "module"
1011
},
1112
"globals": {},

‎.github/FUNDING.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# These are supported funding model platforms
2+
3+
patreon: patternlab

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ Thumbs.db
55
.nyc_output/
66
.vscode/
77
.idea/
8+
.env
89
packages/core/test/public
910
packages/*/public
1011
!packages/core/test/patterns/public/.gitkeep
1112
!packages/core/test/patterns/testDependencyGraph.json
1213
lerna-debug.log
1314
packages/edition-node-gulp/dependencyGraph.json
15+
packages/uikit-workshop/dist

‎.nvmrc

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

‎.travis.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
language: node_js
22

3+
addons:
4+
chrome: stable
5+
36
before_install:
4-
- phantomjs --version
7+
# version lifted from `.nvmrc`
8+
- nvm install
9+
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.19.0
10+
- export PATH="$HOME/.yarn/bin:$PATH"
511

612
before_script:
7-
- npm install -g [email protected]
8-
- npm run setup
9-
- lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
10-
- lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
11-
- lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core
12-
- lerna add @pattern-lab/engine-liquid --scope=@pattern-lab/core
13-
- lerna add @pattern-lab/engine-twig --scope=@pattern-lab/core
14-
- lerna add @pattern-lab/engine-react --scope=@pattern-lab/core
13+
- yarn run setup
14+
- npx lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
15+
- npx lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
16+
- npx lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core
17+
- npx lerna add @pattern-lab/engine-liquid --scope=@pattern-lab/core
18+
- npx lerna add @pattern-lab/engine-twig --scope=@pattern-lab/core
19+
- npx lerna add @pattern-lab/engine-react --scope=@pattern-lab/core
20+
21+
script: travis_wait yarn run test
1522

1623
branches:
1724
only:

‎CHANGELOG.md

Lines changed: 290 additions & 0 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Pattern Lab / Node wouldn't be what it is today without the support of the commu
6161
6262
* **[Brad Frost](http://bradfrost.com/)**
6363
* [Marcos Peebles](https://twitter.com/marcospeebles)
64+
* [Maximilian Franzke](https://twitter.com/maedmaex)
6465
* [Susan Simkins](https://twitter.com/susanmsimkins)
6566
6667
## Contributing

‎babel.config.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
module.exports = {
2+
presets: [
3+
[
4+
'@babel/preset-env',
5+
{
6+
targets: {
7+
node: 'current',
8+
},
9+
},
10+
],
11+
],
12+
plugins: [
13+
/**
14+
* 1. Helps with our Web Component Preact renderer
15+
*/
16+
'@babel/plugin-syntax-jsx' /* [1] */,
17+
[
18+
'@babel/plugin-transform-react-jsx' /* [1] */,
19+
{
20+
pragma: 'h',
21+
pragmaFrag: '"span"',
22+
throwIfNamespace: false,
23+
useBuiltIns: false,
24+
},
25+
],
26+
],
27+
};

0 commit comments

Comments
 (0)