Skip to content

Commit 8c3a7d3

Browse files
committed
Merge branch 'dev' into feature/js-export-data-module-export
2 parents d545b44 + 5aa0d00 commit 8c3a7d3

File tree

86 files changed

+263
-219
lines changed

Some content is hidden

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

86 files changed

+263
-219
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: 0 additions & 79 deletions
This file was deleted.

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+
};

lerna.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"eslin*",
1515
"husky",
1616
"prettier",
17-
"pretty-quick"
17+
"pretty-quick",
18+
"babel-eslint"
1819
]
1920
},
2021
"publish": {

package.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
11
{
22
"dependencies": {
3+
"@babel/plugin-proposal-decorators": "^7.4.4",
4+
"@babel/plugin-syntax-jsx": "^7.2.0",
5+
"babel-eslint": "^10.0.2",
6+
"eslint": "^6.1.0",
7+
"eslint-config-airbnb-base": "^14.0.0",
8+
"eslint-config-prettier": "^6.0.0",
9+
"eslint-plugin-import": "^2.18.2",
10+
"eslint-plugin-prettier": "^3.1.0",
311
"lerna": "3.11.0",
412
"prettier": "^1.14.3",
5-
"pretty-quick": "^1.8.0"
13+
"pretty-quick": "^1.11.1"
614
},
715
"private": true,
816
"scripts": {
17+
"postinstall": "npm run bootstrap",
918
"bootstrap": "lerna bootstrap",
10-
"setup": "npm install && npm run bootstrap && npm run build:uikit",
19+
"setup": "npm install && npm run build:uikit",
1120
"build:uikit": "cd packages/uikit-workshop && npm run build",
1221
"precommit": "pretty-quick --staged",
13-
"prettier": "prettier --config .prettierrc --write ./**/*.js --ignore-path .prettierignore",
22+
"lint:fix": "npm run lint -- --fix",
23+
"lint": "eslint --max-warnings 0 './packages/{core,cli,uikit-workshop}/**/*.js ' --ignore-path .eslintignore",
1424
"test": "lerna run test",
1525
"clean": "git clean -dfx"
1626
},

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ const writeJsonAsync = require('../utils').writeJsonAsync;
1212
*/
1313
const enable = options =>
1414
wrapAsync(function*() {
15-
const { parent: { config: configPath }, plugins } = options;
15+
const {
16+
parent: { config: configPath },
17+
plugins,
18+
} = options;
1619
const config = yield resolveConfig(configPath);
1720

1821
const spinner = ora(`⊙ patternlab → Disable …`).start();

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ const writeJsonAsync = require('../utils').writeJsonAsync;
1212
*/
1313
const enable = options =>
1414
wrapAsync(function*() {
15-
const { parent: { config: configPath }, plugins } = options;
15+
const {
16+
parent: { config: configPath },
17+
plugins,
18+
} = options;
1619
const config = yield resolveConfig(configPath);
1720

1821
const spinner = ora(`⊙ patternlab → Enable …`).start();

packages/cli/bin/install-edition.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable no-param-reassign */
12
'use strict';
23

34
const path = require('path');
@@ -35,7 +36,9 @@ const installEdition = (edition, config, projectDir) => {
3536
pkg.dependencies || {},
3637
yield getJSONKey(edition, 'dependencies')
3738
); // 3
38-
switch (edition) { // 4
39+
switch (
40+
edition // 4
41+
) {
3942
// 4.1
4043
case '@pattern-lab/edition-node-gulp': {
4144
yield copyAsync(

packages/cli/bin/patternlab.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env node
2+
/* eslint-disable no-unused-vars */
23
'use strict';
34
const cli = require('commander');
45
const path = require('path');

0 commit comments

Comments
 (0)