Skip to content

Commit

Permalink
Merge branch 'master' of github.com:elastic/kibana into renovate/cmd-…
Browse files Browse the repository at this point in the history
…shim
  • Loading branch information
spalger committed Aug 28, 2019
2 parents 110618c + f162ff0 commit 01fa777
Show file tree
Hide file tree
Showing 81 changed files with 41,156 additions and 3,758 deletions.
29 changes: 11 additions & 18 deletions .sass-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,29 @@ files:
- 'x-pack/legacy/plugins/rollup/**/*.s+(a|c)ss'
- 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
- 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
ignore:
- 'x-pack/legacy/plugins/canvas/external_runtime/**/*.s+(a|c)ss'
rules:
quotes:
- 2
-
style: 'single'
- style: 'single'
# } else { style on one line, like our JS
brace-style:
- 2
-
style: '1tbs'
- style: '1tbs'
variable-name-format:
- 2
-
convention: 'camelcase'
- convention: 'camelcase'
# Needs regex, right now we ignore
class-name-format: 0
# Order how you please
property-sort-order: 0
hex-notation:
- 2
-
style: 'uppercase'
- style: 'uppercase'
mixin-name-format:
- 2
-
allow-leading-underscore: false
- allow-leading-underscore: false
convention: 'camelcase'
# Use none instead of 0 for no border
border-zero:
Expand All @@ -47,8 +44,7 @@ rules:
indentation: 2
function-name-format:
- 2
-
allow-leading-underscore: false
- allow-leading-underscore: false
convention: 'camelcase'
# This removes the need for ::hover
pseudo-element: 0
Expand All @@ -62,23 +58,20 @@ rules:
force-attribute-nesting: 0
no-qualifying-elements:
- 2
-
# Allows input[type=search]
- # Allows input[type=search]
allow-element-with-attribute: 1
# Files can end without a newline
final-newline: 0
# We use some rare duplicate property values for browser variance
no-duplicate-properties:
- 2
-
exclude:
- exclude:
- 'font-size'
- 'word-break'
# Put a line-break between sections of CSS, but allow quicky one-liners for legibility
empty-line-between-blocks:
- 2
-
allow-single-line-rulesets: 1
- allow-single-line-rulesets: 1
# Warns are nice for deprecations and development
no-warn: 0
# Transition all is useful in certain situations and there's no recent info to suggest slowdown
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
"boom": "^7.2.0",
"brace": "0.11.1",
"cache-loader": "^4.1.0",
"chalk": "^2.4.1",
"chalk": "^2.4.2",
"check-disk-space": "^2.1.0",
"color": "1.0.3",
"commander": "3.0.0",
Expand Down Expand Up @@ -348,7 +348,7 @@
"babel-eslint": "^10.0.3",
"babel-jest": "^24.9.0",
"babel-plugin-dynamic-import-node": "^2.3.0",
"backport": "4.6.4",
"backport": "4.6.5",
"chai": "3.5.0",
"chance": "1.0.18",
"cheerio": "0.22.0",
Expand Down Expand Up @@ -418,6 +418,7 @@
"nock": "10.0.6",
"node-sass": "^4.9.4",
"normalize-path": "^3.0.0",
"null-loader": "^3.0.0",
"nyc": "^14.1.1",
"pixelmatch": "4.0.2",
"pkg-up": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-babel-preset/webpack_preset.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module.exports = () => {
{
useBuiltIns: 'entry',
modules: 'cjs',
corejs: 2,
corejs: 3,
},
],
require('./common_preset'),
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-dev-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"kbn:watch": "yarn build --watch"
},
"dependencies": {
"chalk": "^2.4.1",
"chalk": "^2.4.2",
"dedent": "^0.7.0",
"execa": "^1.0.0",
"exit-hook": "^2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-es/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@elastic/elasticsearch": "^7.3.0",
"@kbn/dev-utils": "1.0.0",
"abort-controller": "^2.0.3",
"chalk": "^2.4.1",
"chalk": "^2.4.2",
"dedent": "^0.7.0",
"del": "^4.0.0",
"execa": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-plugin-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"version": "1.0.0",
"dependencies": {
"chalk": "^2.4.1",
"chalk": "^2.4.2",
"dedent": "^0.7.0",
"execa": "^1.0.0",
"getopts": "^2.2.4",
Expand Down
Loading

0 comments on commit 01fa777

Please sign in to comment.