chore(spire): Fix spire config

danez · danez · commit c8e86a86ed93 · 2019-11-23T21:31:09.000+01:00
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.prettierrc.json b/.prettierrc.json
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "10"
+  - "12"
 cache: yarn
 deploy:
   local_dir: .docs
diff --git a/docs/docs/components/AsyncList/index.js b/docs/docs/components/AsyncList/index.js
@@ -41,7 +41,7 @@ export default class AsyncList extends Component {
         let hasError = false;
 
         fetch(url + qs, { headers })
-            .then(response => {
+            .then((response) => {
                 if (!(response.status !== 200)) {
                     const etag = response.headers.get('etag');
                     if (etag) {
@@ -52,13 +52,15 @@ export default class AsyncList extends Component {
                 }
                 return response.json();
             })
-            .then(repos => {
+            .then((repos) => {
                 if (hasError) {
                     throw new Error(repos.message);
                 }
-                this.feedList(repos.filter(repo => repo.fork === false && repo.language));
+                this.feedList(
+                    repos.filter((repo) => repo.fork === false && repo.language)
+                );
             })
-            .catch(err => {
+            .catch((err) => {
                 console.error(err); // eslint-disable-line
                 this.feedList([]);
             });
diff --git a/docs/docs/components/Axis/index.js b/docs/docs/components/Axis/index.js
@@ -8,6 +8,13 @@ const itemsRenderer = (items, ref) => (
 );
 
 // eslint-disable-next-line react/no-multi-comp
-const Axis = () => <List axis="x" itemCount={Infinity} itemsRenderer={itemsRenderer} pageSize={40} />;
+const Axis = () => (
+    <List
+        axis="x"
+        itemCount={Infinity}
+        itemsRenderer={itemsRenderer}
+        pageSize={40}
+    />
+);
 
 export default Axis;
diff --git a/docs/docs/components/InfiniteList/index.js b/docs/docs/components/InfiniteList/index.js
@@ -8,6 +8,8 @@ const itemsRenderer = (items, ref) => (
 );
 
 // eslint-disable-next-line react/no-multi-comp
-const InfiniteList = () => <List itemCount={Infinity} itemsRenderer={itemsRenderer} pageSize={40} />;
+const InfiniteList = () => (
+    <List itemCount={Infinity} itemsRenderer={itemsRenderer} pageSize={40} />
+);
 
 export default InfiniteList;
diff --git a/package.json b/package.json
@@ -15,21 +15,21 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.4.4",
+    "@babel/cli": "^7.7.4",
+    "@babel/core": "^7.7.4",
     "@researchgate/babel-preset": "^1.2.1",
-    "@researchgate/spire-config": "^1.3.0",
+    "@researchgate/spire-config": "^1.5.4",
     "@storybook/addon-options": "^5.0.11",
     "@storybook/react": "^5.0.11",
     "@types/react": "^16.8.18",
     "babel-loader": "^8.0.6",
     "cross-env": "^5.2.0",
-    "eslint": "^5.16.0",
     "intersection-observer": "^0.7.0",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
     "react-test-renderer": "^16.8.6",
-    "spire": "^1.7.2",
-    "spire-plugin-semantic-release": "^1.7.2",
+    "spire": "^1.8.3",
+    "spire-plugin-semantic-release": "^1.8.2",
     "typescript": "^3.4.5",
     "whatwg-fetch": "^3.0.0"
   },
@@ -71,7 +71,7 @@
     "extends": "@researchgate/spire-config",
     "plugins": [
       "spire-plugin-semantic-release",
-      "./.spire/spire-plugin-tslint"
+      "<rootDir>/.spire/spire-plugin-tslint"
     ]
   },
   "scripts": {
@@ -85,5 +85,6 @@
     "storybook": "start-storybook -p 9001 -c .storybook",
     "test": "spire test",
     "ts:check": "tsc --project types"
-  }
+  },
+  "prettier": "@researchgate/prettier-config"
 }
diff --git a/src/List.js b/src/List.js
@@ -14,9 +14,15 @@ class List extends PureComponent {
         initialIndex: PropTypes.number,
         items(props, propName) {
             const object = props[propName];
-            if (object != null && !(Array.isArray(object) || typeof object[Symbol.iterator] === 'function')) {
+            if (
+                object != null &&
+                !(
+                    Array.isArray(object) ||
+                    typeof object[Symbol.iterator] === 'function'
+                )
+            ) {
                 return new Error(
-                    `\`${propName}\` must be of type Array or a native type implementing the iterable interface`,
+                    `\`${propName}\` must be of type Array or a native type implementing the iterable interface`
                 );
             }
             return undefined;
@@ -66,13 +72,19 @@ class List extends PureComponent {
         this.prematureIntersectionChecked = this.state.size === 0;
     }
 
-    setRef = callback => {
+    setRef = (callback) => {
         let prevRootNode;
-        this.setRootNode = node => {
+        this.setRootNode = (node) => {
             if (node !== prevRootNode) {
                 prevRootNode = node;
-                const overflow = window.getComputedStyle(node)[AXIS_CSS_MAP[this.props.axis]];
-                callback(['auto', 'scroll', 'overlay'].indexOf(overflow) !== -1 ? node : null);
+                const overflow = window.getComputedStyle(node)[
+                    AXIS_CSS_MAP[this.props.axis]
+                ];
+                callback(
+                    ['auto', 'scroll', 'overlay'].indexOf(overflow) !== -1
+                        ? node
+                        : null
+                );
             }
         };
     };
@@ -87,7 +99,7 @@ class List extends PureComponent {
                 !isIntersecting,
                 'ReactIntersectionList: the sentinel detected a viewport with a bigger size than the size of its items. ' +
                     'This could lead to detrimental behavior, e.g.: triggering more than one onIntersection callback at the start.\n' +
-                    'To prevent this, use either a bigger `pageSize` value or avoid using the prop awaitMore initially.',
+                    'To prevent this, use either a bigger `pageSize` value or avoid using the prop awaitMore initially.'
             );
         }
 
@@ -112,18 +124,26 @@ class List extends PureComponent {
 
         warning(
             !(hasChildren && hasRender),
-            'ReactIntersectionList: cannot use children and renderItem props as render function at the same time.',
+            'ReactIntersectionList: cannot use children and renderItem props as render function at the same time.'
         );
 
         if (hasChildren) {
             return children;
         }
 
-        return hasRender ? renderItem : (index, key) => <div key={key}>{index}</div>;
+        return hasRender
+            ? renderItem
+            : (index, key) => <div key={key}>{index}</div>;
     }
 
     renderItems() {
-        const { awaitMore, axis, initialIndex, itemsRenderer, threshold } = this.props;
+        const {
+            awaitMore,
+            axis,
+            initialIndex,
+            itemsRenderer,
+            threshold,
+        } = this.props;
         const { size, itemCount } = this.state;
         const itemRenderer = this.getItemRenderer();
         const items = [];
@@ -150,7 +170,7 @@ class List extends PureComponent {
             }
         }
 
-        return itemsRenderer(items, node => {
+        return itemsRenderer(items, (node) => {
             if (node && sentinel) {
                 this.setRootNode(node);
             }
diff --git a/src/Sentinel.js b/src/Sentinel.js
@@ -19,7 +19,9 @@ class Sentinel extends Component {
             rootMargin: computeRootMargin(props),
         };
 
-        this.target = <template style={{ height: 1, minWidth: 1, display: 'block' }} />;
+        this.target = (
+            <template style={{ height: 1, minWidth: 1, display: 'block' }} />
+        );
 
         props.setRef(this.setRootElement);
     }
@@ -37,19 +39,25 @@ class Sentinel extends Component {
     }
 
     shouldComponentUpdate(nextProps, { rootMargin, rootElement }) {
-        const { rootMargin: currentRootMargin, rootElement: currentRootElement } = this.state;
+        const {
+            rootMargin: currentRootMargin,
+            rootElement: currentRootElement,
+        } = this.state;
         // When the rootMargin stays the same but the sentinel is repositioned, it can fall within
         // its threshold prematurely. In this case we don't get any update from the Observer instance.
         // We need to guarantee an update, and re-observing is a cheap way to accomplish this.
-        if (currentRootMargin === rootMargin && currentRootElement === rootElement) {
+        if (
+            currentRootMargin === rootMargin &&
+            currentRootElement === rootElement
+        ) {
             this.observer.externalUnobserve();
             this.observer.observe();
             return false;
         }
         return true;
     }
 
-    setRootElement = rootElement => {
+    setRootElement = (rootElement) => {
         this.setState({ rootElement });
     };
 
@@ -59,7 +67,7 @@ class Sentinel extends Component {
 
         return (
             <Observer
-                ref={instance => {
+                ref={(instance) => {
                     this.observer = instance;
                 }}
                 disabled={typeof rootElement === 'undefined'}
diff --git a/src/__mocks__/Sentinel.js b/src/__mocks__/Sentinel.js
@@ -1,2 +1,4 @@
 /* eslint-env jest */
-export default jest.genMockFromModule('@researchgate/react-intersection-observer').default;
+export default jest.genMockFromModule(
+    '@researchgate/react-intersection-observer'
+).default;
diff --git a/src/__tests__/List.spec.js b/src/__tests__/List.spec.js
@@ -6,15 +6,16 @@ import List from '../';
 import { getItemCount } from '../utils';
 import mockSentinel, { mockCallback } from './mockSentinel';
 
-jest.mock('../Sentinel', () => props => {
+jest.mock('../Sentinel', () => (props) => {
     if (props.setRef) {
         props.setRef(mockCallback);
     }
     return mockSentinel;
 });
 
 const target = { nodeType: 1 };
-const createTree = (props = {}) => renderer.create(<List {...props} />, { createNodeMock: () => target });
+const createTree = (props = {}) =>
+    renderer.create(<List {...props} />, { createNodeMock: () => target });
 
 beforeEach(() => {
     jest.clearAllMocks();
diff --git a/src/__tests__/Sentinel.spec.js b/src/__tests__/Sentinel.spec.js
@@ -12,7 +12,8 @@ const defaultProps = {
     setRef: jest.fn(),
     onChange() {},
 };
-const createTree = (props = defaultProps) => renderer.create(<Sentinel {...props} />);
+const createTree = (props = defaultProps) =>
+    renderer.create(<Sentinel {...props} />);
 
 describe('constructor', () => {
     const propTypes = Sentinel.propTypes;
@@ -31,7 +32,9 @@ describe('constructor', () => {
         const computeRootMarginSpy = jest.fn();
         utils.computeRootMargin = computeRootMarginSpy;
         const TestSentinel = require('../Sentinel').default;
-        const renderMock = jest.spyOn(TestSentinel.prototype, 'render').mockImplementation(() => {});
+        const renderMock = jest
+            .spyOn(TestSentinel.prototype, 'render')
+            .mockImplementation(() => {});
         const setRefMock = jest.fn();
         const props = { setRef: setRefMock };
         const tree = renderer.create(<TestSentinel {...props} />);
@@ -88,8 +91,12 @@ describe('render', () => {
 
 describe('compute', () => {
     test('returns computed rootMargin', () => {
-        expect(computeRootMargin({ threshold: '50%', axis: 'x' })).toBe('0% 50%');
-        expect(computeRootMargin({ threshold: '50px', axis: 'y' })).toBe('50px 0px');
+        expect(computeRootMargin({ threshold: '50%', axis: 'x' })).toBe(
+            '0% 50%'
+        );
+        expect(computeRootMargin({ threshold: '50px', axis: 'y' })).toBe(
+            '50px 0px'
+        );
         expect(computeRootMargin({ threshold: '50', axis: 'y' })).toBe('50 0');
     });
 
diff --git a/src/utils.js b/src/utils.js
@@ -20,7 +20,7 @@ export function getItemCount({ itemCount, items }, warnIfConflict) {
     if (warnIfConflict) {
         warning(
             !(hasItemCount && hasItems),
-            'ReactIntersectionList: cannot use itemCount and items props at the same time, choose one to determine the number of items to render.',
+            'ReactIntersectionList: cannot use itemCount and items props at the same time, choose one to determine the number of items to render.'
         );
     }
 
diff --git a/yarn.lock b/yarn.lock
