Merge branch 'master' into use-scale-color

stylelint-scss · Jul 3, 2019 · 37a4ca4 · 37a4ca4
2 parents d4c2647 + 925b5a8
commit 37a4ca4
Show file tree

Hide file tree

Showing 17 changed files with 4,089 additions and 3,745 deletions.
diff --git a/README.md b/README.md
@@ -144,6 +144,7 @@ Please also see the [example configs](./docs/examples/) for special cases.
 
 - [`selector-nest-combinators`](./src/rules/selector-nest-combinators/README.md): Require or disallow nesting of combinators in selectors.
 - [`selector-no-redundant-nesting-selector`](./src/rules/selector-no-redundant-nesting-selector/README.md): Disallow redundant nesting selectors (`&`).
+- [`selector-no-union-class-name`](./src/rules/selector-no-union-class-name/README.md): Disallow union class names with the parent selector (`&`).
 
 ### General / Sheet
 

diff --git a/babel-jest.js b/babel-jest.js
@@ -100,7 +100,7 @@ const createTransformer = options => {
     },
     process(src, filename, config, transformOptions) {
       if (!babel) {
-        babel = require("babel-core");
+        babel = require("@babel/core");
       }
 
       if (babel.util && !babel.util.canCompile(filename)) {