From 98c8060d1d2f447e2d07eeea92de1e21134e3978 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 18 Dec 2017 11:43:38 +0000 Subject: [PATCH 1/4] chore(package): update eslint-config-travix to version 5.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 958f83c4..dbe3589a 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "enzyme": "^3.0.0", "enzyme-adapter-react-16": "^1.0.1", "eslint": "^4.1.0", - "eslint-config-travix": "^3.0.1", + "eslint-config-travix": "^5.0.0", "eslint-plugin-babel": "^4.0.0", "eslint-plugin-import": "^2.0.1", "eslint-plugin-promise": "^3.5.0", From bce31f24fd928b7547ffd99c8a430352fafa9069 Mon Sep 17 00:00:00 2001 From: jbaudin Date: Fri, 29 Dec 2017 09:04:32 +0100 Subject: [PATCH 2/4] downgrade to 4.0.0. 5.0.0 does not exist --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dbe3589a..8ad879ca 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "enzyme": "^3.0.0", "enzyme-adapter-react-16": "^1.0.1", "eslint": "^4.1.0", - "eslint-config-travix": "^5.0.0", + "eslint-config-travix": "^4.0.0", "eslint-plugin-babel": "^4.0.0", "eslint-plugin-import": "^2.0.1", "eslint-plugin-promise": "^3.5.0", From 647778f724ca177a74bee3742a9c311497ea2eca Mon Sep 17 00:00:00 2001 From: jbaudin Date: Fri, 29 Dec 2017 13:38:00 +0100 Subject: [PATCH 3/4] fix lint --- .eslintrc | 4 +- packages/frint-cli/bin/frint.js | 2 +- packages/frint-cli/commands/help.js | 2 +- packages/frint-cli/commands/init.js | 4 +- packages/frint-cli/commands/new.js | 4 +- packages/frint-cli/commands/version.js | 6 +- packages/frint-cli/commands/version.spec.js | 4 +- packages/frint-cli/root/index.mock.js | 2 +- .../src/ObserveHandler.js | 2 +- .../src/ObserveHandler.spec.js | 2 +- .../src/RegionHandler.js | 14 +-- .../src/DefaultHandler.js | 2 +- .../src/composeHandlers.spec.js | 8 +- .../frint-component-utils/src/streamProps.js | 2 +- .../src/streamProps.spec.js | 14 +-- packages/frint-config/src/externals.js | 24 ++--- packages/frint-config/src/index.js | 2 +- packages/frint-data/src/ChainableTypes.js | 4 +- packages/frint-data/src/Types.spec.js | 26 +++--- packages/frint-data/src/chainType.js | 4 +- packages/frint-data/src/createCollection.js | 4 +- .../frint-data/src/createCollection.spec.js | 60 ++++++------ packages/frint-data/src/createModel.js | 16 ++-- packages/frint-data/src/createModel.spec.js | 92 +++++++++---------- packages/frint-data/src/mixins/events.js | 6 +- .../frint-data/src/utils/bubbleUpEvent.js | 2 +- .../src/utils/makeMethodReactive.js | 2 +- packages/frint-model/src/Model.spec.js | 4 +- packages/frint-model/src/createModel.spec.js | 10 +- .../frint-react/src/components/Provider.js | 6 +- .../src/components/Provider.spec.js | 10 +- packages/frint-react/src/components/Region.js | 2 +- .../frint-react/src/components/Region.spec.js | 16 ++-- .../frint-react/src/components/observe.js | 2 +- .../src/components/observe.spec.js | 16 ++-- .../src/createLinkHandler.js | 2 +- .../src/createLinkHandler.spec.js | 4 +- .../src/createRouteHandler.js | 4 +- .../src/createRouteHandler.spec.js | 16 ++-- .../src/createSwitchHandler.js | 4 +- .../src/createSwitchHandler.spec.js | 6 +- .../src/index.js | 2 +- .../src/testHelpers.js | 6 +- packages/frint-router-react/src/Link.js | 10 +- packages/frint-router-react/src/Link.spec.js | 34 +++---- packages/frint-router-react/src/Route.js | 10 +- packages/frint-router-react/src/Route.spec.js | 32 +++---- packages/frint-router-react/src/Switch.js | 2 +- .../frint-router-react/src/Switch.spec.js | 50 +++++----- .../src/makeRouterService.spec.js | 14 +-- .../frint-router/src/matchFromHistory.spec.js | 16 ++-- packages/frint-store/src/Store.js | 6 +- packages/frint-store/src/combineEpics.spec.js | 4 +- .../frint-store/src/combineReducers.spec.js | 26 +++--- packages/frint-store/src/createStore.js | 2 +- packages/frint-store/src/createStore.spec.js | 58 ++++++------ packages/frint-test-utils/src/index.js | 2 +- packages/frint/src/App.js | 10 +- packages/frint/src/App.spec.js | 24 ++--- 59 files changed, 363 insertions(+), 361 deletions(-) diff --git a/.eslintrc b/.eslintrc index 9eb08e8c..420c6f43 100644 --- a/.eslintrc +++ b/.eslintrc @@ -11,6 +11,8 @@ "rxjs", "rxjs/add/*" ] - }] + }], + "react/require-default-props": 0, + "react/no-unused-prop-types": 0 } } diff --git a/packages/frint-cli/bin/frint.js b/packages/frint-cli/bin/frint.js index 7f758876..2d150112 100755 --- a/packages/frint-cli/bin/frint.js +++ b/packages/frint-cli/bin/frint.js @@ -50,7 +50,7 @@ function run() { )), tap(names => console.log(names)), tap(() => console.log('\n')), - tap(() => console.log('Type `frint help ` to learn more.')) + tap(() => console.log('Type `frint help ` to learn more.')), ) .subscribe(); } diff --git a/packages/frint-cli/commands/help.js b/packages/frint-cli/commands/help.js index d6bc7387..424a8264 100644 --- a/packages/frint-cli/commands/help.js +++ b/packages/frint-cli/commands/help.js @@ -54,6 +54,6 @@ module.exports = createApp({ 'params', 'rootApp', ], - } + }, ], }); diff --git a/packages/frint-cli/commands/init.js b/packages/frint-cli/commands/init.js index 26e93a12..7de59685 100644 --- a/packages/frint-cli/commands/init.js +++ b/packages/frint-cli/commands/init.js @@ -45,7 +45,7 @@ module.exports = createApp({ .pipe(tar.x({ filter: path => path.indexOf(`frint-master/examples/${example}/`) === 0, strip: 3, - C: dir + C: dir, })) .on('error', deps.console.error) .on('finish', () => deps.console.log('Done!')); @@ -67,6 +67,6 @@ module.exports = createApp({ 'params', 'pwd', ], - } + }, ], }); diff --git a/packages/frint-cli/commands/new.js b/packages/frint-cli/commands/new.js index 3a034bbf..9badfc70 100644 --- a/packages/frint-cli/commands/new.js +++ b/packages/frint-cli/commands/new.js @@ -1,5 +1,5 @@ /* eslint-disable no-use-before-define */ - +/* global Promise */ const mkdirp = require('mkdirp'); const request = require('request'); const tar = require('tar'); @@ -70,7 +70,7 @@ module.exports = createApp({ 'params', 'pwd', ], - } + }, ], }); diff --git a/packages/frint-cli/commands/version.js b/packages/frint-cli/commands/version.js index 1e6b6b4f..9ca3129b 100644 --- a/packages/frint-cli/commands/version.js +++ b/packages/frint-cli/commands/version.js @@ -16,8 +16,8 @@ module.exports = createApp({ return function execute() { const pkg = JSON.parse( deps.fs.readFileSync( - path.resolve(`${__dirname}/../package.json`) - ) + path.resolve(`${__dirname}/../package.json`), + ), ); deps.console.log(`v${pkg.version}`); @@ -27,6 +27,6 @@ module.exports = createApp({ 'console', 'fs', ], - } + }, ], }); diff --git a/packages/frint-cli/commands/version.spec.js b/packages/frint-cli/commands/version.spec.js index 20eaf52f..cfed8f1a 100644 --- a/packages/frint-cli/commands/version.spec.js +++ b/packages/frint-cli/commands/version.spec.js @@ -34,11 +34,11 @@ describe('frint-cli › commands › version', function () { const fakeConsole = rootApp.get('console'); rootApp.get('fs').mkdirpSync( - path.resolve(`${__dirname}/../`) + path.resolve(`${__dirname}/../`), ); rootApp.get('fs').writeFileSync( path.resolve(`${__dirname}/../package.json`), - '{"version": "1.2.3"}' + '{"version": "1.2.3"}', ); commandApp.get('execute')(); diff --git a/packages/frint-cli/root/index.mock.js b/packages/frint-cli/root/index.mock.js index 7d35e749..d88e7301 100644 --- a/packages/frint-cli/root/index.mock.js +++ b/packages/frint-cli/root/index.mock.js @@ -17,6 +17,6 @@ module.exports = function createMockedRootApp() { } return acc; - }, providers) + }, providers), }); }; diff --git a/packages/frint-component-handlers/src/ObserveHandler.js b/packages/frint-component-handlers/src/ObserveHandler.js index c2ff78fc..9cf122eb 100644 --- a/packages/frint-component-handlers/src/ObserveHandler.js +++ b/packages/frint-component-handlers/src/ObserveHandler.js @@ -19,5 +19,5 @@ export default { if (this._subscription) { this._subscription.unsubscribe(); } - } + }, }; diff --git a/packages/frint-component-handlers/src/ObserveHandler.spec.js b/packages/frint-component-handlers/src/ObserveHandler.spec.js index 638e6f17..72eeb553 100644 --- a/packages/frint-component-handlers/src/ObserveHandler.spec.js +++ b/packages/frint-component-handlers/src/ObserveHandler.spec.js @@ -63,7 +63,7 @@ describe('frint-component-handlers › ObserveHandler', function () { ObserveHandler, { app: {}, - } + }, ); handler._data = handler.getInitialData(); diff --git a/packages/frint-component-handlers/src/RegionHandler.js b/packages/frint-component-handlers/src/RegionHandler.js index 4fc1941f..9d34f381 100644 --- a/packages/frint-component-handlers/src/RegionHandler.js +++ b/packages/frint-component-handlers/src/RegionHandler.js @@ -7,7 +7,7 @@ export default { getInitialData() { return { list: [], // array of apps ==> { name, instance } - listForRendering: [] // array of {name, Component} objects + listForRendering: [], // array of {name, Component} objects }; }, sendProps(appInstance, props) { @@ -31,7 +31,7 @@ export default { this.rootApp = rootApp; const apps$ = rootApp.getApps$( this.getProp('name'), - this.getProp('uniqueKey') + this.getProp('uniqueKey'), ); this._subscription = apps$.subscribe({ @@ -41,7 +41,7 @@ export default { const { name: appName, weight: appWeight, - multi + multi, } = item; const isPresent = this.getData('listForRendering').some((w) => { return w.name === appName; @@ -85,14 +85,14 @@ export default { }) .sort((a, b) => { return a.weight - b.weight; - }) + }), ); }); }); }, error: (err) => { console.warn(`Subscription error for :`, err); - } + }, }); }, shouldUpdate(nextProps, nextData) { @@ -135,9 +135,9 @@ export default { this.rootApp.destroyApp( item.name, this.getProp('name'), - this.getProp('uniqueKey') + this.getProp('uniqueKey'), ); }); } - } + }, }; diff --git a/packages/frint-component-utils/src/DefaultHandler.js b/packages/frint-component-utils/src/DefaultHandler.js index 2cb8d94a..21e0d6e6 100644 --- a/packages/frint-component-utils/src/DefaultHandler.js +++ b/packages/frint-component-utils/src/DefaultHandler.js @@ -36,5 +36,5 @@ export default { // other getMountableComponent(app) { return app.get('component'); - } + }, }; diff --git a/packages/frint-component-utils/src/composeHandlers.spec.js b/packages/frint-component-utils/src/composeHandlers.spec.js index 55526905..90701990 100644 --- a/packages/frint-component-utils/src/composeHandlers.spec.js +++ b/packages/frint-component-utils/src/composeHandlers.spec.js @@ -32,7 +32,7 @@ describe('frint-component-utils › composeHandlers', function () { }, getCounter() { return this.counter; - } + }, }); expect(handler.beforeMount()).to.equal('beforeMount'); @@ -58,18 +58,18 @@ describe('frint-component-utils › composeHandlers', function () { }, getCounter() { return this.counter; - } + }, }; const secondHandler = { increment() { this.counter = this.counter + 2; - } + }, }; const handlerInstance = composeHandlers( firstHandler, - secondHandler + secondHandler, ); expect(handlerInstance.beforeMount()).to.equal('beforeMount'); diff --git a/packages/frint-component-utils/src/streamProps.js b/packages/frint-component-utils/src/streamProps.js index c9c9d1b1..2ab12949 100644 --- a/packages/frint-component-utils/src/streamProps.js +++ b/packages/frint-component-utils/src/streamProps.js @@ -39,7 +39,7 @@ class Streamer { setKey(key, value) { this._push(of$({ - [key]: value + [key]: value, })); return this; diff --git a/packages/frint-component-utils/src/streamProps.spec.js b/packages/frint-component-utils/src/streamProps.spec.js index 00f08d8d..5fbb7e50 100644 --- a/packages/frint-component-utils/src/streamProps.spec.js +++ b/packages/frint-component-utils/src/streamProps.spec.js @@ -38,7 +38,7 @@ describe('frint-react › streamProps', function () { streamer.set({ key2: 'value2 overridden', - key3: 'value3' + key3: 'value3', }); streamer.get$() @@ -85,24 +85,24 @@ describe('frint-react › streamProps', function () { 'Ricardo', 'Mark', 'Jean', - 'Alex' // last one wins + 'Alex', // last one wins ); const numbers$ = of$( 1, 2, - 3 // last one wins + 3, // last one wins ); streamer.set( names$, - name => ({ name }) // final plain object + name => ({ name }), // final plain object ); streamer.set( numbers$, number => number * 2, // direct mapped values number => of$(number), // even mapped observables - number => ({ number }) // final plain object + number => ({ number }), // final plain object ); streamer.get$() @@ -125,7 +125,7 @@ describe('frint-react › streamProps', function () { const fakeStore = { dispatch(payload) { dispatchedPayload = payload; - } + }, }; function myActionCreator(value) { @@ -137,7 +137,7 @@ describe('frint-react › streamProps', function () { streamer.setDispatch( { myAction: myActionCreator }, - fakeStore + fakeStore, ); streamer.get$() diff --git a/packages/frint-config/src/externals.js b/packages/frint-config/src/externals.js index 655d957d..321fe1e3 100644 --- a/packages/frint-config/src/externals.js +++ b/packages/frint-config/src/externals.js @@ -21,7 +21,7 @@ export const lodash = [ } return callback(); - } + }, ]; // full imports @@ -51,15 +51,15 @@ export const thirdParties = [{ root: 'ReactDOM', commonjs: 'react-dom', commonjs2: 'react-dom', - amd: 'react-dom' - } + amd: 'react-dom', + }, }, { 'prop-types': { root: 'PropTypes', commonjs: 'prop-types', commonjs2: 'prop-types', amd: 'prop-types', - } + }, }]; export const frint = [{ @@ -67,50 +67,50 @@ export const frint = [{ root: 'Frint', commonjs: 'frint', commonjs2: 'frint', - amd: 'frint' + amd: 'frint', }, }, { 'frint-store': { root: 'FrintStore', commonjs: 'frint-store', commonjs2: 'frint-store', - amd: 'frint-store' + amd: 'frint-store', }, }, { 'frint-model': { root: 'FrintModel', commonjs: 'frint-model', commonjs2: 'frint-model', - amd: 'frint-model' + amd: 'frint-model', }, }, { 'frint-data': { root: 'FrintData', commonjs: 'frint-data', commonjs2: 'frint-data', - amd: 'frint-data' + amd: 'frint-data', }, }, { 'frint-react': { root: 'FrintReact', commonjs: 'frint-react', commonjs2: 'frint-react', - amd: 'frint-react' + amd: 'frint-react', }, }, { 'frint-router': { root: 'FrintRouter', commonjs: 'frint-router', commonjs2: 'frint-router', - amd: 'frint-router' + amd: 'frint-router', }, }, { 'frint-router-react': { root: 'FrintRouterReact', commonjs: 'frint-router-react', commonjs2: 'frint-router-react', - amd: 'frint-router-react' - } + amd: 'frint-router-react', + }, }]; export default rxjs diff --git a/packages/frint-config/src/index.js b/packages/frint-config/src/index.js index ab3fa8d9..200e74db 100644 --- a/packages/frint-config/src/index.js +++ b/packages/frint-config/src/index.js @@ -2,7 +2,7 @@ import externals, { frint, lodash, thirdParties, - rxjs + rxjs, } from './externals'; export default { diff --git a/packages/frint-data/src/ChainableTypes.js b/packages/frint-data/src/ChainableTypes.js index b40a9b37..5964b9e4 100644 --- a/packages/frint-data/src/ChainableTypes.js +++ b/packages/frint-data/src/ChainableTypes.js @@ -7,7 +7,7 @@ export const isRequired = { } return value; - } + }, }; export const defaults = { @@ -18,5 +18,5 @@ export const defaults = { } return defaultValue; - } + }, }; diff --git a/packages/frint-data/src/Types.spec.js b/packages/frint-data/src/Types.spec.js index 2e203f43..9c0abf6e 100644 --- a/packages/frint-data/src/Types.spec.js +++ b/packages/frint-data/src/Types.spec.js @@ -244,7 +244,7 @@ describe('frint-data › Types', function () { it('accepts enum of types', function () { const type = Types.enum.of([ Types.string, - Types.number + Types.number, ]).isRequired; expect(type(1)).to.equal(1); @@ -454,24 +454,24 @@ describe('frint-data › Types', function () { street: Types.string, city: Types.string.isRequired, postalCode: Types.number.isRequired, - country: Types.string.defaults('Netherlands') + country: Types.string.defaults('Netherlands'), }); expect(type({ street: 'Amsterdam', city: 'Amsterdam', - postalCode: 123 + postalCode: 123, })).to.deep.equal({ street: 'Amsterdam', city: 'Amsterdam', postalCode: 123, - country: 'Netherlands' + country: 'Netherlands', }); expect(() => type({ street: 'Amsterdam', city: 'Amsterdam', - postalCode: '123' + postalCode: '123', })).to.throw(/schema failed for key 'postalCode', value is not a number/); }); @@ -482,8 +482,8 @@ describe('frint-data › Types', function () { street: Types.string, city: Types.string.isRequired, postalCode: Types.number.isRequired, - country: Types.string.defaults('Netherlands') - }).isRequired + country: Types.string.defaults('Netherlands'), + }).isRequired, }); expect(type({ @@ -491,16 +491,16 @@ describe('frint-data › Types', function () { address: { street: 'Amsterdam', city: 'Amsterdam', - postalCode: 123 - } + postalCode: 123, + }, })).to.deep.equal({ name: 'Frint', address: { street: 'Amsterdam', city: 'Amsterdam', postalCode: 123, - country: 'Netherlands' - } + country: 'Netherlands', + }, }); expect(() => type({ @@ -508,8 +508,8 @@ describe('frint-data › Types', function () { address: { street: 'Amsterdam', city: 'Amsterdam', - postalCode: '123' - } + postalCode: '123', + }, })).to.throw(/schema failed for key 'postalCode', value is not a number/); }); }); diff --git a/packages/frint-data/src/chainType.js b/packages/frint-data/src/chainType.js index 4992af2f..955154c2 100644 --- a/packages/frint-data/src/chainType.js +++ b/packages/frint-data/src/chainType.js @@ -17,7 +17,7 @@ export default function chain(fn, omitChainables = []) { if (chainIsFactory) { return function (...args) { return chain(function (value) { - let nextValue = chainFunc(value, ...args); + const nextValue = chainFunc(value, ...args); return fn(nextValue); }); @@ -32,7 +32,7 @@ export default function chain(fn, omitChainables = []) { return nextValue; }, omitChainables.concat([chainName])); - } + }, }); }); diff --git a/packages/frint-data/src/createCollection.js b/packages/frint-data/src/createCollection.js index 51a5c26c..4bd8042e 100644 --- a/packages/frint-data/src/createCollection.js +++ b/packages/frint-data/src/createCollection.js @@ -33,7 +33,7 @@ export default function createCollection(options = {}) { const models = []; // others listening to this collection - let eventHandlers = {}; + const eventHandlers = {}; // this collection listening to others const listeners = []; @@ -52,7 +52,7 @@ export default function createCollection(options = {}) { Object.defineProperty(this, 'length', { get() { return models.length; - } + }, }); const mutableMethods = {}; diff --git a/packages/frint-data/src/createCollection.spec.js b/packages/frint-data/src/createCollection.spec.js index 2f4733a3..f8812bbb 100644 --- a/packages/frint-data/src/createCollection.spec.js +++ b/packages/frint-data/src/createCollection.spec.js @@ -39,7 +39,7 @@ describe('frint-data › createCollection', function () { { name: 'Harry' }, new Person({ name: 'Hermione' }), // { name: 'Hermione' }, - { name: 'Ron' } + { name: 'Ron' }, ]); expect(people).to.be.instanceof(People); @@ -71,13 +71,13 @@ describe('frint-data › createCollection', function () { const people1 = new People([ { name: 'Harry' }, { name: 'Hermione' }, - { name: 'Ron' } + { name: 'Ron' }, ]); const people2 = new People([ { name: 'A' }, { name: 'B' }, - { name: 'C' } + { name: 'C' }, ]); expect(people1.at(0).name).to.equal('Harry'); @@ -99,13 +99,13 @@ describe('frint-data › createCollection', function () { model: Person, findAt(n) { return this.at(n); - } + }, }); const people = new People([ { name: 'Frint' }, { name: 'Blah' }, - { name: 'Yo' } + { name: 'Yo' }, ]); expect(people.findAt).to.be.a('function'); @@ -122,7 +122,7 @@ describe('frint-data › createCollection', function () { model: Person, at(n) { /* istanbul ignore next */ return this.at(n); - } + }, }); function getPeople() { @@ -148,13 +148,13 @@ describe('frint-data › createCollection', function () { }); const people = new People([ - { name: 'Harry' } + { name: 'Harry' }, ]); people.get$() .pipe( take$(3), - last$() + last$(), ) .subscribe(function (collection) { expect(collection.length).to.equal(3); @@ -187,13 +187,13 @@ describe('frint-data › createCollection', function () { const people = new People([ { name: 'Harry' }, { name: 'Ron' }, - { name: 'Hermione' } + { name: 'Hermione' }, ]); people.listen$('change') .pipe( take$(2), - last$() + last$(), ) .subscribe(function ({ collection }) { expect(collection.at(2).name).to.equal('Hermione Granger-Weasley'); @@ -220,13 +220,13 @@ describe('frint-data › createCollection', function () { const people = new People([ { name: 'Harry' }, { name: 'Ron' }, - { name: 'Hermione' } + { name: 'Hermione' }, ]); people.listen$('change') .pipe( take$(1), - last$() + last$(), ) .subscribe(function ({ collection }) { expect(collection.length).to.equal(2); @@ -251,7 +251,7 @@ describe('frint-data › createCollection', function () { model: Person, initialize() { this.push(new Person({ - name: 'Initialize' + name: 'Initialize', })); }, }); @@ -277,7 +277,7 @@ describe('frint-data › createCollection', function () { }); const people = new People([ - { name: 'Foo' } + { name: 'Foo' }, ]); expect(people.length).to.equal(1); @@ -303,7 +303,7 @@ describe('frint-data › createCollection', function () { const people = new People([ { name: 'Harry' }, { name: 'Hermione' }, - { name: 'Ron' } + { name: 'Ron' }, ]); expect(people.at(0).name).to.equal('Harry'); @@ -374,7 +374,7 @@ describe('frint-data › createCollection', function () { const people = new People([ { name: 'Harry' }, { name: 'Hermione' }, - { name: 'Ron' } + { name: 'Ron' }, ]); expect(people.length).to.equal(3); @@ -409,7 +409,7 @@ describe('frint-data › createCollection', function () { const people = new People([ { name: 'Harry' }, { name: 'Hermione' }, - { name: 'Ron' } + { name: 'Ron' }, ]); expect(people.length).to.equal(3); @@ -458,7 +458,7 @@ describe('frint-data › createCollection', function () { expect(names).to.deep.equal([ 'Harry', 'Hermione', - 'Ron' + 'Ron', ]); }); }); @@ -491,7 +491,7 @@ describe('frint-data › createCollection', function () { expect(names).to.deep.equal([ 'Harry', 'Hermione', - 'Ron' + 'Ron', ]); }); }); @@ -508,13 +508,13 @@ describe('frint-data › createCollection', function () { customPop() { return this.pop(); - } + }, }); const people = new People([ { name: 'Harry' }, { name: 'Hermione' }, - { name: 'Ron' } + { name: 'Ron' }, ]); expect(people.length).to.equal(3); @@ -525,7 +525,7 @@ describe('frint-data › createCollection', function () { expect(people.toJS()).to.deep.equal([ { name: 'Harry' }, - { name: 'Hermione' } + { name: 'Hermione' }, ]); expect(lastModel.name).to.equal('Ron'); }); @@ -605,7 +605,7 @@ describe('frint-data › createCollection', function () { const people = new People([ { name: 'Harry' }, { name: 'Hermione' }, - { name: 'Ron' } + { name: 'Ron' }, ]); expect(people.length).to.equal(3); @@ -617,7 +617,7 @@ describe('frint-data › createCollection', function () { expect(people.toJS()).to.deep.equal([ { name: 'Harry' }, - { name: 'Ron' } + { name: 'Ron' }, ]); }); }); @@ -640,7 +640,7 @@ describe('frint-data › createCollection', function () { const people = new People([ { name: 'Harry' }, { name: 'Hermione' }, - { name: 'Ron' } + { name: 'Ron' }, ]); expect(people.length).to.equal(3); @@ -651,7 +651,7 @@ describe('frint-data › createCollection', function () { expect(people.toJS()).to.deep.equal([ { name: 'Hermione' }, - { name: 'Ron' } + { name: 'Ron' }, ]); }); }); @@ -674,7 +674,7 @@ describe('frint-data › createCollection', function () { const people = new People([ { name: 'Harry' }, { name: 'Hermione' }, - { name: 'Ron' } + { name: 'Ron' }, ]); expect(people.length).to.equal(3); @@ -685,7 +685,7 @@ describe('frint-data › createCollection', function () { expect(people.toJS()).to.deep.equal([ { name: 'Hermione' }, - { name: 'Ron' } + { name: 'Ron' }, ]); expect(firstModel.name).to.equal('Harry'); }); @@ -705,7 +705,7 @@ describe('frint-data › createCollection', function () { const people = new People([ { name: 'Harry' }, { name: 'Hermione' }, - { name: 'Ron' } + { name: 'Ron' }, ]); expect(isModel(people.at(0))).to.equal(true); @@ -715,7 +715,7 @@ describe('frint-data › createCollection', function () { expect(people.toJS()).to.deep.equal([ { name: 'Harry' }, { name: 'Hermione' }, - { name: 'Ron' } + { name: 'Ron' }, ]); }); }); diff --git a/packages/frint-data/src/createModel.js b/packages/frint-data/src/createModel.js index 0cbeaa22..f6e1bdbb 100644 --- a/packages/frint-data/src/createModel.js +++ b/packages/frint-data/src/createModel.js @@ -35,7 +35,7 @@ export default function createModel(options = {}) { let attributes = {}; // others listening to this model - let eventHandlers = {}; + const eventHandlers = {}; // this model listening to others const listeners = []; @@ -67,7 +67,7 @@ export default function createModel(options = {}) { } return convertToJS(attributes); - } + }, }); makeMethodReactive(this, 'toJS'); @@ -88,7 +88,7 @@ export default function createModel(options = {}) { v.destroy(); } }); - } + }, }); // get() @@ -99,7 +99,7 @@ export default function createModel(options = {}) { } return this.getIn(path.split('.')); - } + }, }); makeMethodReactive(this, 'get'); @@ -131,7 +131,7 @@ export default function createModel(options = {}) { return result[path]; }, this); - } + }, }); makeMethodReactive(this, 'getIn'); @@ -155,14 +155,14 @@ export default function createModel(options = {}) { attributes[attributeName] = newValue; self._trigger('change', new Event({ - path: [attributeName] + path: [attributeName], })); } catch (typesError) { throw typesError; } }, - enumerable: true + enumerable: true, }); // watch children @@ -171,7 +171,7 @@ export default function createModel(options = {}) { const cancelDestroyListener = value._on('destroy', function () { self._trigger('change', new Event({ - path: [attributeName] + path: [attributeName], })); cancelChangeWatcher(); diff --git a/packages/frint-data/src/createModel.spec.js b/packages/frint-data/src/createModel.spec.js index ead283fd..186c6906 100644 --- a/packages/frint-data/src/createModel.spec.js +++ b/packages/frint-data/src/createModel.spec.js @@ -28,7 +28,7 @@ describe('frint-data › createModel', function () { }); const model = new Model({ - name: 'Rubeus' + name: 'Rubeus', }); expect(model).to.be.instanceof(Model); @@ -40,12 +40,12 @@ describe('frint-data › createModel', function () { const Model = createModel({ schema: { name: Types.string.isRequired, - language: Types.string.defaults('English') + language: Types.string.defaults('English'), }, }); const model = new Model({ - name: 'Rubeus' + name: 'Rubeus', }); expect(model).to.be.instanceof(Model); @@ -63,7 +63,7 @@ describe('frint-data › createModel', function () { }); const model = new Model({ - name: 'Rubeus' + name: 'Rubeus', }); expect(Object.keys(model)).to.deep.equal(['name', 'language']); @@ -84,8 +84,8 @@ describe('frint-data › createModel', function () { name: 'Rubeus', address: { street: 'Straat', - city: 'Amsterdam' - } + city: 'Amsterdam', + }, }); expect(model).to.be.instanceof(Model); @@ -94,14 +94,14 @@ describe('frint-data › createModel', function () { expect(model.address.city).to.equal('Amsterdam'); expect(model.address).to.deep.equal({ street: 'Straat', - city: 'Amsterdam' + city: 'Amsterdam', }); expect(model.address.street).to.equal('Straat'); expect(model.address).to.deep.equal({ street: 'Straat', - city: 'Amsterdam' + city: 'Amsterdam', }); }); @@ -119,7 +119,7 @@ describe('frint-data › createModel', function () { }); const model = new Model({ - name: 'Rubeus' + name: 'Rubeus', }); expect(model).to.be.instanceof(Model); @@ -166,7 +166,7 @@ describe('frint-data › createModel', function () { const model = new Model({ firstName: 'Rubeus', - lastName: 'Hagrid' + lastName: 'Hagrid', }); expect(model).to.be.instanceof(Model); @@ -203,7 +203,7 @@ describe('frint-data › createModel', function () { function getPerson() { new Person({ // eslint-disable-line name: 'Rubeus', - bio: 'blah...' + bio: 'blah...', }); } @@ -224,7 +224,7 @@ describe('frint-data › createModel', function () { function getPerson() { new Person({ // eslint-disable-line name: 'Rubeus', - bio: 'blah...' + bio: 'blah...', }); } @@ -251,8 +251,8 @@ describe('frint-data › createModel', function () { name: 'Rubeus', address: { street: 'Straat', - country: 'Netherlands' - } + country: 'Netherlands', + }, }); expect(person).to.be.instanceof(Person); @@ -275,7 +275,7 @@ describe('frint-data › createModel', function () { }); const person = new Person({ - name: 'Rubeus' + name: 'Rubeus', }); expect(person.name).to.equal('Rubeus'); @@ -358,8 +358,8 @@ describe('frint-data › createModel', function () { posts: [ { title: 'Hello World' }, { title: 'About' }, - { title: 'Contact' } - ] + { title: 'Contact' }, + ], }); expect(author.name).to.equal('Rubeus'); @@ -394,13 +394,13 @@ describe('frint-data › createModel', function () { }); const person = new Person({ - name: 'Rubeus' + name: 'Rubeus', }); person.get$() // 1 .pipe( take$(3), - last$() + last$(), ) .subscribe(function (p) { expect(p.name).to.equal('Frint changed again'); @@ -434,14 +434,14 @@ describe('frint-data › createModel', function () { name: 'Rubeus', address: { street: 'Straat', - city: 'Amsterdam' - } + city: 'Amsterdam', + }, }); person.get$() .pipe( take$(3), - last$() + last$(), ) .subscribe(function (p) { expect(p.address.street).to.equal('New Street Again'); @@ -464,7 +464,7 @@ describe('frint-data › createModel', function () { model: Book, addBook(title) { this.push(new Book({ - title + title, })); }, customPush(m) { @@ -481,13 +481,13 @@ describe('frint-data › createModel', function () { const author = new Author({ name: 'Rubeus', - books: [] + books: [], }); author.get$() .pipe( take$(3), - last$() + last$(), ) .subscribe(function (a) { expect(a.books.length).to.equal(2); @@ -544,8 +544,8 @@ describe('frint-data › createModel', function () { name: 'Vernon Dursley', address: { street: 'Privet Drive', - city: 'Surrey' - } + city: 'Surrey', + }, }); person.listen$('change') @@ -589,8 +589,8 @@ describe('frint-data › createModel', function () { const author = new Author({ name: 'Rita Skeeter', books: [ - { title: 'The Life and Lies of Dumbledore' } - ] + { title: 'The Life and Lies of Dumbledore' }, + ], }); // first change @@ -619,7 +619,7 @@ describe('frint-data › createModel', function () { }); author.books.customPush(new Book({ - title: `Dumbledore's Army` + title: `Dumbledore's Army`, })); }); @@ -637,7 +637,7 @@ describe('frint-data › createModel', function () { }); const person = new Person({ - name: 'Initial name' + name: 'Initial name', }); expect(person.name).to.equal('Updated by initialize'); @@ -682,8 +682,8 @@ describe('frint-data › createModel', function () { name: 'Vernon Dursley', address: { street: 'Privet Drive', - city: 'Surrey' - } + city: 'Surrey', + }, }); expect(isModel(person.get('address'))).to.equal(true); @@ -713,8 +713,8 @@ describe('frint-data › createModel', function () { name: 'Rita Skeeter', books: [ { title: 'The Life and Lies of Dumbledore' }, - { title: `Dumbledore's Army` } - ] + { title: `Dumbledore's Army` }, + ], }); expect(author.get('books')).to.equal(author.books); @@ -764,8 +764,8 @@ describe('frint-data › createModel', function () { name: 'Vernon Dursley', address: { street: 'Privet Drive', - city: 'Surrey' - } + city: 'Surrey', + }, }); expect(isModel(person.getIn(['address']))).to.equal(true); @@ -795,8 +795,8 @@ describe('frint-data › createModel', function () { name: 'Rita Skeeter', books: [ { title: 'The Life and Lies of Dumbledore' }, - { title: `Dumbledore's Army` } - ] + { title: `Dumbledore's Army` }, + ], }); expect(author.getIn(['books'])).to.equal(author.books); @@ -815,7 +815,7 @@ describe('frint-data › createModel', function () { }, }); const model = new Model({ - name: 'Blah' + name: 'Blah', }); expect(model.toJS()).to.deep.equal({ name: 'Blah' }); @@ -845,8 +845,8 @@ describe('frint-data › createModel', function () { const person = new Person({ name: 'Blah', address: { - street: 'Straat' - } + street: 'Straat', + }, }); expect(isModel(person.address)).to.equal(true); @@ -854,8 +854,8 @@ describe('frint-data › createModel', function () { expect(person.toJS()).to.deep.equal({ name: 'Blah', address: { - street: 'Straat' - } + street: 'Straat', + }, }); }); @@ -870,14 +870,14 @@ describe('frint-data › createModel', function () { const todo = new Todo({ id: 1, title: 'My first todo', - x: 'x' + x: 'x', }); todo.y = 'y'; expect(todo.toJS()).to.deep.equal({ id: 1, - title: 'My first todo' + title: 'My first todo', }); }); }); diff --git a/packages/frint-data/src/mixins/events.js b/packages/frint-data/src/mixins/events.js index 9a69dbcc..cc9ae781 100644 --- a/packages/frint-data/src/mixins/events.js +++ b/packages/frint-data/src/mixins/events.js @@ -11,7 +11,7 @@ export default function events(context, listeners = {}) { return function cancelListener() { return context._off(event, fn); }; - } + }, }); Object.defineProperty(context, '_trigger', { @@ -23,7 +23,7 @@ export default function events(context, listeners = {}) { return listeners[event].forEach(function (listener) { // eslint-disable-line listener(...args); }); - } + }, }); Object.defineProperty(context, '_off', { @@ -49,6 +49,6 @@ export default function events(context, listeners = {}) { listeners[event].splice(index, 1); } }); - } + }, }); } diff --git a/packages/frint-data/src/utils/bubbleUpEvent.js b/packages/frint-data/src/utils/bubbleUpEvent.js index 4fcf0a40..e5c5aa70 100644 --- a/packages/frint-data/src/utils/bubbleUpEvent.js +++ b/packages/frint-data/src/utils/bubbleUpEvent.js @@ -11,7 +11,7 @@ export default function bubbleUpEvent(context, modelOrCollection, eventName, pre context._trigger(eventName, new Event({ path: isEvent(event) ? p.concat(event.path) - : p + : p, })); }); } diff --git a/packages/frint-data/src/utils/makeMethodReactive.js b/packages/frint-data/src/utils/makeMethodReactive.js index 7b2ac75e..69cd93fd 100644 --- a/packages/frint-data/src/utils/makeMethodReactive.js +++ b/packages/frint-data/src/utils/makeMethodReactive.js @@ -15,6 +15,6 @@ export default function makeMethodReactive(context, method) { listener(); }; }); - } + }, }); } diff --git a/packages/frint-model/src/Model.spec.js b/packages/frint-model/src/Model.spec.js index 15a89045..fcfbaca6 100644 --- a/packages/frint-model/src/Model.spec.js +++ b/packages/frint-model/src/Model.spec.js @@ -9,8 +9,8 @@ describe('frint-model › Model', () => { attribute1: 'value1', attribute2: 'value2', attribute3: { - attribute31: 'value31' - } + attribute31: 'value31', + }, }; const myModelInstance = new Model(myAttributes); diff --git a/packages/frint-model/src/createModel.spec.js b/packages/frint-model/src/createModel.spec.js index 0416809a..be9ccea2 100644 --- a/packages/frint-model/src/createModel.spec.js +++ b/packages/frint-model/src/createModel.spec.js @@ -8,12 +8,12 @@ import createModel from './createModel'; describe('frint-model › createModel', () => { const mySpec = { getAttribute1() { return this.attributes.attribute1; }, - getAttribute2() { return this.attributes.attribute2; } + getAttribute2() { return this.attributes.attribute2; }, }; const myAttributes = { attribute1: 'value1', - attribute2: 'value2' + attribute2: 'value2', }; const MyModel = createModel(mySpec); @@ -45,15 +45,15 @@ describe('frint-model › createModel', () => { const TestModel = createModel({ initialize(attributes) { this.storedFromInitialize = attributes; - } + }, }); const testModel = new TestModel({ - foo: 'bar' + foo: 'bar', }); expect(testModel.storedFromInitialize).to.deep.equal({ - foo: 'bar' + foo: 'bar', }); }); diff --git a/packages/frint-react/src/components/Provider.js b/packages/frint-react/src/components/Provider.js index a7163191..f6b6b891 100644 --- a/packages/frint-react/src/components/Provider.js +++ b/packages/frint-react/src/components/Provider.js @@ -5,16 +5,16 @@ import PropTypes from 'prop-types'; export default class Provider extends Component { static propTypes = { app: PropTypes.object.isRequired, - children: PropTypes.element.isRequired + children: PropTypes.element.isRequired, }; static childContextTypes = { - app: PropTypes.object.isRequired + app: PropTypes.object.isRequired, }; getChildContext() { return { - app: this.app + app: this.app, }; } diff --git a/packages/frint-react/src/components/Provider.spec.js b/packages/frint-react/src/components/Provider.spec.js index e5c84f2b..7261cb44 100644 --- a/packages/frint-react/src/components/Provider.spec.js +++ b/packages/frint-react/src/components/Provider.spec.js @@ -13,14 +13,14 @@ chai.use(sinonChai); describe('frint-react › components › Provider', function () { const fakeApp = {}; - const fakeChildren = (
); + const fakeChildren = (
); let myProviderInstance; beforeEach(function () { sandbox.spy(Children, 'only'); myProviderInstance = new Provider({ app: fakeApp, - children: fakeChildren + children: fakeChildren, }); }); @@ -35,13 +35,13 @@ describe('frint-react › components › Provider', function () { it('has static propTypes defined', function () { expect(Provider.propTypes).to.be.deep.equal({ app: PropTypes.object.isRequired, - children: PropTypes.element.isRequired + children: PropTypes.element.isRequired, }); }); it('has static childContextTypes defined', function () { expect(Provider.childContextTypes).to.be.deep.equal({ - app: PropTypes.object.isRequired + app: PropTypes.object.isRequired, }); }); @@ -51,7 +51,7 @@ describe('frint-react › components › Provider', function () { it('has a getChildContext method which returns app object of the instance', function () { expect(myProviderInstance.getChildContext()).to.be.deep.equal({ - app: fakeApp + app: fakeApp, }); }); diff --git a/packages/frint-react/src/components/Region.js b/packages/frint-react/src/components/Region.js index 26b445b7..f36a8f97 100644 --- a/packages/frint-react/src/components/Region.js +++ b/packages/frint-react/src/components/Region.js @@ -10,9 +10,9 @@ import ReactHandler from '../handlers/ReactHandler'; export default class Region extends React.Component { static propTypes = { className: PropTypes.string, + data: PropTypes.any, name: PropTypes.string.isRequired, uniqueKey: PropTypes.string, - data: PropTypes.any, }; static contextTypes = { diff --git a/packages/frint-react/src/components/Region.spec.js b/packages/frint-react/src/components/Region.spec.js index c6e672db..386ee16c 100644 --- a/packages/frint-react/src/components/Region.spec.js +++ b/packages/frint-react/src/components/Region.spec.js @@ -35,7 +35,7 @@ describe('frint-react › components › Region', function () { ReactDOM.render( , - document.getElementById('root') + document.getElementById('root'), ); const element = document.getElementById('my-component'); @@ -83,7 +83,7 @@ describe('frint-react › components › Region', function () { window.app = new RootApp(); render( window.app, - document.getElementById('root') + document.getElementById('root'), ); // register apps @@ -129,7 +129,7 @@ describe('frint-react › components › Region', function () { // render render( window.app, - document.getElementById('root') + document.getElementById('root'), ); // verify @@ -197,7 +197,7 @@ describe('frint-react › components › Region', function () { return streamProps() .set( app.get('region').getData$(), - data => ({ todo: data.todo }) + data => ({ todo: data.todo }), ) .get$(); })(({ todo }) => ( @@ -215,7 +215,7 @@ describe('frint-react › components › Region', function () { window.app = new RootApp(); render( window.app, - document.getElementById('root') + document.getElementById('root'), ); expect(document.getElementById('root-text').innerHTML).to.equal('Hello World from Root'); @@ -299,7 +299,7 @@ describe('frint-react › components › Region', function () { return streamProps() .set( app.get('region').getData$(), - data => ({ todo: data.todo }) + data => ({ todo: data.todo }), ) .get$(); })(({ todo }) => ( @@ -321,7 +321,7 @@ describe('frint-react › components › Region', function () { window.app = new RootApp(); render( window.app, - document.getElementById('root') + document.getElementById('root'), ); expect(document.getElementById('root-text').innerHTML).to.equal('Hello World from Root'); @@ -386,7 +386,7 @@ describe('frint-react › components › Region', function () { window.app = new RootApp(); render( window.app, - document.getElementById('root') + document.getElementById('root'), ); // register apps diff --git a/packages/frint-react/src/components/observe.js b/packages/frint-react/src/components/observe.js index b7c825ba..94658865 100644 --- a/packages/frint-react/src/components/observe.js +++ b/packages/frint-react/src/components/observe.js @@ -17,7 +17,7 @@ export default function observe(fn) { : 'observe'; static contextTypes = { - app: PropTypes.object.isRequired + app: PropTypes.object.isRequired, }; constructor(props, context) { diff --git a/packages/frint-react/src/components/observe.spec.js b/packages/frint-react/src/components/observe.spec.js index 121e8ef5..f1fa87c4 100644 --- a/packages/frint-react/src/components/observe.spec.js +++ b/packages/frint-react/src/components/observe.spec.js @@ -1,4 +1,4 @@ -/* eslint-disable import/no-extraneous-dependencies, func-names, react/prop-types */ +/* eslint-disable import/no-extraneous-dependencies, func-names, react/prop-types, react/jsx-no-bind */ /* global describe, it, document, beforeEach, resetDOM */ import { expect } from 'chai'; import { merge as merge$ } from 'rxjs/observable/merge'; @@ -36,7 +36,7 @@ describe('frint-react › components › observe', function () { ReactDOM.render( , - document.getElementById('root') + document.getElementById('root'), ); expect(document.getElementById('counter').innerHTML).to.equal('1'); @@ -53,7 +53,7 @@ describe('frint-react › components › observe', function () { ReactDOM.render( , - document.getElementById('root') + document.getElementById('root'), ); expect(document.getElementById('text').innerHTML).to.equal('Hello World'); @@ -73,7 +73,7 @@ describe('frint-react › components › observe', function () { const ObservedComponent = observe(function (app, props$) { const generatedProps$ = merge$( of$({ name: app.getName() }), - props$.pipe(map$(parentProps => ({ parentProps }))) + props$.pipe(map$(parentProps => ({ parentProps }))), ) .pipe(scan$((props, emitted) => { return { @@ -134,12 +134,12 @@ describe('frint-react › components › observe', function () { beforeUnmount() {}, getName() { return 'FakeApp'; - } + }, }; render( fakeApp, - document.getElementById('root') + document.getElementById('root'), ); expect(document.getElementById('name').innerHTML).to.equal('FakeApp'); @@ -174,7 +174,7 @@ describe('frint-react › components › observe', function () { const fakeApp = { getName() { return 'ShallowApp'; - } + }, }; function ComponentToRender(props) { @@ -211,7 +211,7 @@ describe('frint-react › components › observe', function () { const fakeApp = { getName() { return 'FakeApp'; - } + }, }; function ComponentToRender(props) { diff --git a/packages/frint-router-component-handlers/src/createLinkHandler.js b/packages/frint-router-component-handlers/src/createLinkHandler.js index ed3d687a..28b0cd67 100644 --- a/packages/frint-router-component-handlers/src/createLinkHandler.js +++ b/packages/frint-router-component-handlers/src/createLinkHandler.js @@ -68,7 +68,7 @@ export default function createLinkHandler(ComponentHandler, app, component) { ComponentHandler, { app, - component + component, }, ); } diff --git a/packages/frint-router-component-handlers/src/createLinkHandler.spec.js b/packages/frint-router-component-handlers/src/createLinkHandler.spec.js index 481e1a38..4a2082de 100644 --- a/packages/frint-router-component-handlers/src/createLinkHandler.spec.js +++ b/packages/frint-router-component-handlers/src/createLinkHandler.spec.js @@ -11,7 +11,7 @@ describe('frint-router-component-handlers › createLinkHandler', function () { const handler = createLinkHandler( ComponentHandler, createTestAppInstance(new MemoryRouterService()), - createComponent() + createComponent(), ); expect(handler).to.include.all.keys('getInitialData', 'beforeMount', 'propsChange', 'handleClick', 'beforeDestroy'); @@ -28,7 +28,7 @@ describe('frint-router-component-handlers › createLinkHandler', function () { const handler = createLinkHandler( ComponentHandler, createTestAppInstance(router), - component + component, ); it('when getInitialData() called, it returns object with active key', function () { diff --git a/packages/frint-router-component-handlers/src/createRouteHandler.js b/packages/frint-router-component-handlers/src/createRouteHandler.js index 62dd810e..5a3b1d11 100644 --- a/packages/frint-router-component-handlers/src/createRouteHandler.js +++ b/packages/frint-router-component-handlers/src/createRouteHandler.js @@ -85,7 +85,7 @@ const RouteHandler = { this._appInstance.beforeDestroy(); this._appInstance = null; } - } + }, }; export default function createRouteHandler(ComponentHandler, app, component) { @@ -98,7 +98,7 @@ export default function createRouteHandler(ComponentHandler, app, component) { ComponentHandler, { app, - component + component, }, ); } diff --git a/packages/frint-router-component-handlers/src/createRouteHandler.spec.js b/packages/frint-router-component-handlers/src/createRouteHandler.spec.js index f1f1b307..2065b623 100644 --- a/packages/frint-router-component-handlers/src/createRouteHandler.spec.js +++ b/packages/frint-router-component-handlers/src/createRouteHandler.spec.js @@ -11,7 +11,7 @@ describe('frint-router-component-handlers › createRouteHandler', function () { const handler = createRouteHandler( ComponentHandler, createTestAppInstance(new MemoryRouterService()), - createComponent() + createComponent(), ); expect(handler).to.include.all.keys('getInitialData', 'beforeMount', 'propsChange', 'beforeDestroy'); @@ -22,7 +22,7 @@ describe('frint-router-component-handlers › createRouteHandler', function () { createRouteHandler( {}, createTestAppInstance(new MemoryRouterService()), - createComponent() + createComponent(), ); }; @@ -37,13 +37,13 @@ describe('frint-router-component-handlers › createRouteHandler', function () { component.props = { path: '/products', exact: true, - component: componentToRender + component: componentToRender, }; const handler = createRouteHandler( ComponentHandler, createTestAppInstance(router), - component + component, ); it('initially component and matched data are set to null', function () { @@ -106,13 +106,13 @@ describe('frint-router-component-handlers › createRouteHandler', function () { render: function () { /* istanbul ignore next */ return null; - } + }, }; const handler = createRouteHandler( ComponentHandler, createTestAppInstance(router), - component + component, ); router.push('/'); @@ -157,13 +157,13 @@ describe('frint-router-component-handlers › createRouteHandler', function () { path: '/products', exact: true, computedMatch, - component: componentToRender + component: componentToRender, }; const handler = createRouteHandler( ComponentHandler, createTestAppInstance(router), - component + component, ); router.push('/'); diff --git a/packages/frint-router-component-handlers/src/createSwitchHandler.js b/packages/frint-router-component-handlers/src/createSwitchHandler.js index 24268415..a6a28873 100644 --- a/packages/frint-router-component-handlers/src/createSwitchHandler.js +++ b/packages/frint-router-component-handlers/src/createSwitchHandler.js @@ -5,7 +5,7 @@ const SwitchHandler = { getInitialData() { return { - history: null + history: null, }; }, @@ -48,7 +48,7 @@ export default function createSwitchHandler(ComponentHandler, app, component) { ComponentHandler, { app, - component + component, }, ); } diff --git a/packages/frint-router-component-handlers/src/createSwitchHandler.spec.js b/packages/frint-router-component-handlers/src/createSwitchHandler.spec.js index e1060150..c8019014 100644 --- a/packages/frint-router-component-handlers/src/createSwitchHandler.spec.js +++ b/packages/frint-router-component-handlers/src/createSwitchHandler.spec.js @@ -11,7 +11,7 @@ describe('frint-router-component-handlers › createSwitchHandler', function () const handler = createSwitchHandler( ComponentHandler, createTestAppInstance(new MemoryRouterService()), - createComponent() + createComponent(), ); expect(handler).to.include.all.keys('getInitialData', 'beforeMount', 'beforeDestroy', 'getMatch'); @@ -21,7 +21,7 @@ describe('frint-router-component-handlers › createSwitchHandler', function () const handler = createSwitchHandler( ComponentHandler, createTestAppInstance(new MemoryRouterService()), - createComponent() + createComponent(), ); const data = handler.getInitialData(); @@ -36,7 +36,7 @@ describe('frint-router-component-handlers › createSwitchHandler', function () const handler = createSwitchHandler( ComponentHandler, createTestAppInstance(router), - component + component, ); component.data = handler.getInitialData(); diff --git a/packages/frint-router-component-handlers/src/index.js b/packages/frint-router-component-handlers/src/index.js index 112d00cb..aa6323d3 100644 --- a/packages/frint-router-component-handlers/src/index.js +++ b/packages/frint-router-component-handlers/src/index.js @@ -5,5 +5,5 @@ import createSwitchHandler from './createSwitchHandler'; export default { createLinkHandler, createRouteHandler, - createSwitchHandler + createSwitchHandler, }; diff --git a/packages/frint-router-component-handlers/src/testHelpers.js b/packages/frint-router-component-handlers/src/testHelpers.js index 9323149c..b6bafcfa 100644 --- a/packages/frint-router-component-handlers/src/testHelpers.js +++ b/packages/frint-router-component-handlers/src/testHelpers.js @@ -15,7 +15,7 @@ export const ComponentHandler = { }, getMountableComponent(app) { return app.get('component'); - } + }, }; export function createTestApp(router, component) { @@ -31,7 +31,7 @@ export function createTestApp(router, component) { return createApp({ name: 'TestApp', - providers + providers, }); } @@ -43,6 +43,6 @@ export function createTestAppInstance(router, component) { export function createComponent() { return { data: {}, - props: {} + props: {}, }; } diff --git a/packages/frint-router-react/src/Link.js b/packages/frint-router-react/src/Link.js index 9a64b5ef..0d37082a 100644 --- a/packages/frint-router-react/src/Link.js +++ b/packages/frint-router-react/src/Link.js @@ -5,16 +5,16 @@ import { ReactHandler } from 'frint-react'; export default class Link extends React.Component { static contextTypes = { - app: PropTypes.object.isRequired + app: PropTypes.object.isRequired, }; static propTypes = { - to: PropTypes.string.isRequired, - exact: PropTypes.bool, - type: PropTypes.string, - className: PropTypes.string, activeClassName: PropTypes.string, children: PropTypes.node, + className: PropTypes.string, + exact: PropTypes.bool, + to: PropTypes.string.isRequired, + type: PropTypes.string, }; constructor(...args) { diff --git a/packages/frint-router-react/src/Link.spec.js b/packages/frint-router-react/src/Link.spec.js index 53609d35..482cd1ba 100644 --- a/packages/frint-router-react/src/Link.spec.js +++ b/packages/frint-router-react/src/Link.spec.js @@ -16,8 +16,8 @@ function createContextWithRouter(router) { } return null; - } - } + }, + }, }; } @@ -31,7 +31,7 @@ describe('frint-route-react › Link', () => { const wrapper = shallow( {linkContent}, - { context: createContextWithRouter() } + { context: createContextWithRouter() }, ); expect(wrapper.name()).to.equal('a'); @@ -46,7 +46,7 @@ describe('frint-route-react › Link', () => { const wrapper = shallow( {linkContent}, - { context: { app: {} } } + { context: { app: {} } }, ); expect(wrapper.name()).to.equal('button'); @@ -69,7 +69,7 @@ describe('frint-route-react › Link', () => { > About , - { context: createContextWithRouter(router) } + { context: createContextWithRouter(router) }, ); router.push('/'); @@ -106,7 +106,7 @@ describe('frint-route-react › Link', () => { > About , - { context: createContextWithRouter(router) } + { context: createContextWithRouter(router) }, ); router.push('/'); @@ -136,7 +136,7 @@ describe('frint-route-react › Link', () => { > About , - { context: createContextWithRouter(router) } + { context: createContextWithRouter(router) }, ); router.push('/about'); @@ -162,7 +162,7 @@ describe('frint-route-react › Link', () => { > About , - { context: createContextWithRouter(router) } + { context: createContextWithRouter(router) }, ); router.push('/about'); @@ -189,7 +189,7 @@ describe('frint-route-react › Link', () => { > About , - { context: createContextWithRouter(router) } + { context: createContextWithRouter(router) }, ); router.push('/about/whatever'); @@ -213,7 +213,7 @@ describe('frint-route-react › Link', () => { const subscription = { unsubscribe() { unsubscribeCount += 1; - } + }, }; const router = { @@ -222,9 +222,9 @@ describe('frint-route-react › Link', () => { subscribe() { subscribeCount += 1; return subscription; - } + }, }; - } + }, }; const wrapper = mount( @@ -235,7 +235,7 @@ describe('frint-route-react › Link', () => { > About , - { context: createContextWithRouter(router) } + { context: createContextWithRouter(router) }, ); expect(subscribeCount).to.equal(1); @@ -267,12 +267,12 @@ describe('frint-route-react › Link', () => { getMatch(...args) { return actualRouter.getMatch.call(actualRouter, ...args); - } + }, }; const wrapper = shallow( About, - { context: createContextWithRouter(router) } + { context: createContextWithRouter(router) }, ); it('and pushes new url to router when it doesn\'t match current url', function () { @@ -280,7 +280,7 @@ describe('frint-route-react › Link', () => { let stopPropagationCalled = 0; wrapper.simulate('click', { preventDefault() { preventDefaultCalled += 1; }, - stopPropagation() { stopPropagationCalled += 1; } + stopPropagation() { stopPropagationCalled += 1; }, }); expect(pushedUrls).to.deep.equal(['/about']); @@ -294,7 +294,7 @@ describe('frint-route-react › Link', () => { let stopPropagationCalled = 0; wrapper.simulate('click', { preventDefault() { preventDefaultCalled += 1; }, - stopPropagation() { stopPropagationCalled += 1; } + stopPropagation() { stopPropagationCalled += 1; }, }); // nothing new was added to the pushedUrls and that's the point diff --git a/packages/frint-router-react/src/Route.js b/packages/frint-router-react/src/Route.js index ec1300ab..9f0fc9c8 100644 --- a/packages/frint-router-react/src/Route.js +++ b/packages/frint-router-react/src/Route.js @@ -7,16 +7,16 @@ import { createRouteHandler } from 'frint-router-component-handlers'; export default class Route extends React.Component { static contextTypes = { - app: PropTypes.object.isRequired + app: PropTypes.object.isRequired, }; static propTypes = { - path: PropTypes.string, - exact: PropTypes.bool, - computedMatch: PropTypes.object, + app: PropTypes.func, component: PropTypes.func, + computedMatch: PropTypes.object, + exact: PropTypes.bool, + path: PropTypes.string, render: PropTypes.func, - app: PropTypes.func, }; constructor(...args) { diff --git a/packages/frint-router-react/src/Route.spec.js b/packages/frint-router-react/src/Route.spec.js index b316e118..4f87bbf4 100644 --- a/packages/frint-router-react/src/Route.spec.js +++ b/packages/frint-router-react/src/Route.spec.js @@ -1,4 +1,4 @@ -/* eslint-disable import/no-extraneous-dependencies, func-names, no-unused-expressions */ +/* eslint-disable import/no-extraneous-dependencies, func-names, no-unused-expressions, react/jsx-no-bind */ /* global describe, it, before, resetDOM */ import { expect } from 'chai'; import React from 'react'; @@ -23,7 +23,7 @@ function createContext() { }); return { - app: new App() + app: new App(), }; } @@ -40,7 +40,7 @@ describe('frint-route-react › Route', function () { // exact and path const wrapperPathExact = shallow( , - { context: createContext() } + { context: createContext() }, ); expect(wrapperPathExact.type()).to.be.null; @@ -48,7 +48,7 @@ describe('frint-route-react › Route', function () { // only path const wrapperPath = shallow( , - { context: createContext() } + { context: createContext() }, ); expect(wrapperPath.type()).to.be.null; @@ -56,7 +56,7 @@ describe('frint-route-react › Route', function () { // only computedMatch const wrapperComputedMatch = shallow( , - { context: createContext() } + { context: createContext() }, ); expect(wrapperComputedMatch.type()).to.be.null; @@ -68,7 +68,7 @@ describe('frint-route-react › Route', function () { const context = createContext(); const wrapper = shallow( , - { context } + { context }, ); context.app.get('router').push('/'); @@ -101,7 +101,7 @@ describe('frint-route-react › Route', function () { ); }} />, - { context } + { context }, ); context.app.get('router').push('/'); @@ -127,7 +127,7 @@ describe('frint-route-react › Route', function () { const context = createContext(); const wrapper = shallow( , - { context } + { context }, ); context.app.get('router').push('/'); @@ -153,7 +153,7 @@ describe('frint-route-react › Route', function () { const context = createContext(); const wrapper = shallow( , - { context } + { context }, ); context.app.get('router').push('/'); @@ -176,7 +176,7 @@ describe('frint-route-react › Route', function () { const context = createContext(); const wrapper = shallow( , - { context } + { context }, ); expect(wrapper.type()).to.equal(Component); @@ -192,7 +192,7 @@ describe('frint-route-react › Route', function () { const context = createContext(); const wrapper = shallow( , - { context } + { context }, ); context.app.get('router').push('/about'); @@ -219,13 +219,13 @@ describe('frint-route-react › Route', function () { ], beforeDestroy: () => { beforeDestroyCallCount += 1; - } + }, }); const context = createContext(); const wrapper = shallow( , - { context } + { context }, ); it('registers app with parent app from context', function () { @@ -266,7 +266,7 @@ describe('frint-route-react › Route', function () { ], beforeDestroy: () => { beforeDestroyAboutCallCount += 1; - } + }, }); let beforeDestroyServicesCallCount = 0; @@ -281,13 +281,13 @@ describe('frint-route-react › Route', function () { ], beforeDestroy: () => { beforeDestroyServicesCallCount += 1; - } + }, }); const context = createContext(); const wrapper = shallow( , - { context } + { context }, ); it('renders nothing then path doesn\'t match', function () { diff --git a/packages/frint-router-react/src/Switch.js b/packages/frint-router-react/src/Switch.js index c3d17c0d..98485a10 100644 --- a/packages/frint-router-react/src/Switch.js +++ b/packages/frint-router-react/src/Switch.js @@ -7,7 +7,7 @@ import { ReactHandler } from 'frint-react'; export default class Switch extends React.Component { static contextTypes = { - app: PropTypes.object.isRequired + app: PropTypes.object.isRequired, }; static propTypes = { diff --git a/packages/frint-router-react/src/Switch.spec.js b/packages/frint-router-react/src/Switch.spec.js index 058510c2..6862d399 100644 --- a/packages/frint-router-react/src/Switch.spec.js +++ b/packages/frint-router-react/src/Switch.spec.js @@ -1,4 +1,4 @@ -/* eslint-disable import/no-extraneous-dependencies, func-names, no-unused-expressions */ +/* eslint-disable import/no-extraneous-dependencies, func-names, no-unused-expressions, react/jsx-no-bind */ /* global describe, it */ import { expect } from 'chai'; import React from 'react'; @@ -25,7 +25,7 @@ function createContext() { }); return { - app: new App() + app: new App(), }; } @@ -40,11 +40,11 @@ describe('frint-router-react › Switch', function () { const wrapper = shallow( - + , - { context } + { context }, ); @@ -57,7 +57,7 @@ describe('frint-router-react › Switch', function () { computedMatch: { url: '/', isExact: true, params: {} }, component: HomeComponent, exact: true, - path: '/' + path: '/', }); }); @@ -67,7 +67,7 @@ describe('frint-router-react › Switch', function () { expect(wrapper.props()).to.deep.equal({ computedMatch: { url: '/about', isExact: false, params: {} }, component: AboutComponent, - path: '/about' + path: '/about', }); }); @@ -76,7 +76,7 @@ describe('frint-router-react › Switch', function () { expect(wrapper.props()).to.deep.equal({ component: NotFound, - computedMatch: { url: '/not-the-page-youre-looking-for', isExact: false, params: {} } + computedMatch: { url: '/not-the-page-youre-looking-for', isExact: false, params: {} }, }); }); }); @@ -93,7 +93,7 @@ describe('frint-router-react › Switch', function () { , - { context } + { context }, ); router.push('/about'); @@ -102,7 +102,7 @@ describe('frint-router-react › Switch', function () { expect(wrapper.props()).to.eql({ computedMatch: { url: '/about', isExact: true, params: {} }, component: FirstComponent, - path: '/about' + path: '/about', }); }); @@ -118,7 +118,7 @@ describe('frint-router-react › Switch', function () { , - { context } + { context }, ); router.push('/services'); @@ -126,7 +126,7 @@ describe('frint-router-react › Switch', function () { expect(wrapper.type()).to.equal(Route); expect(wrapper.props()).to.deep.equal({ component: DefaultComponent, - computedMatch: { url: '/services', isExact: false, params: {} } + computedMatch: { url: '/services', isExact: false, params: {} }, }); }); @@ -140,7 +140,7 @@ describe('frint-router-react › Switch', function () { , - { context } + { context }, ); router.push('/about'); @@ -158,7 +158,7 @@ describe('frint-router-react › Switch', function () { , - { context } + { context }, ); router.push('/about'); @@ -173,7 +173,7 @@ describe('frint-router-react › Switch', function () { const subscription = { unsubscribe() { unsubscribeCount += 1; - } + }, }; const router = { @@ -182,9 +182,9 @@ describe('frint-router-react › Switch', function () { subscribe() { subscribeCount += 1; return subscription; - } + }, }; - } + }, }; const context = { @@ -194,13 +194,13 @@ describe('frint-router-react › Switch', function () { if (key === 'router') { return router; } - } - } + }, + }, }; const wrapper = shallow( , - { context } + { context }, ); expect(subscribeCount).to.equal(1); @@ -224,7 +224,7 @@ describe('frint-router-react › Switch', function () { ], beforeDestroy: () => { beforeDestroyCallCount += 1; - } + }, }); const WrapperComponent = ({ routeSet }) => { @@ -237,7 +237,7 @@ describe('frint-router-react › Switch', function () { ); } else if (routeSet === 2) { changingRoutes.push( - + , ); } @@ -250,7 +250,7 @@ describe('frint-router-react › Switch', function () { }; WrapperComponent.propTypes = { - routeSet: PropTypes.number + routeSet: PropTypes.number, }; const context = createContext(); @@ -258,7 +258,7 @@ describe('frint-router-react › Switch', function () { const wrapper = mount( , - { context, childContextTypes: { app: PropTypes.object } } + { context, childContextTypes: { app: PropTypes.object } }, ); it('renders matching Route and component from the first set', function () { @@ -295,13 +295,13 @@ describe('frint-router-react › Switch', function () { {'string'} , - { context } + { context }, ); expect(wrapper.type()).to.equal(Route); expect(wrapper.props()).to.deep.equal({ component: DefaultComponent, - computedMatch: { url: '/', isExact: false, params: {} } + computedMatch: { url: '/', isExact: false, params: {} }, }); }); }); diff --git a/packages/frint-router/src/makeRouterService.spec.js b/packages/frint-router/src/makeRouterService.spec.js index 05029f09..934324a7 100644 --- a/packages/frint-router/src/makeRouterService.spec.js +++ b/packages/frint-router/src/makeRouterService.spec.js @@ -39,7 +39,7 @@ describe('frint-router › makeRouterService', function () { router.getHistory$() .pipe( take$(2), - last$() + last$(), ) .subscribe(function (history) { expect(history.location.pathname).to.equal('/about'); @@ -56,7 +56,7 @@ describe('frint-router › makeRouterService', function () { router.getLocation$() .pipe( take$(2), - last$() + last$(), ) .subscribe(function (location) { expect(location.pathname).to.equal('/about'); @@ -73,14 +73,14 @@ describe('frint-router › makeRouterService', function () { // initial expect(router.getMatch( '/about', - router.getHistory() + router.getHistory(), )).to.equal(null); // after navigating to /about router.push('/about'); expect(router.getMatch( '/about', - router.getHistory() + router.getHistory(), )).to.deep.equal({ isExact: true, params: {}, @@ -91,7 +91,7 @@ describe('frint-router › makeRouterService', function () { router.push('/'); expect(router.getMatch( '/about', - router.getHistory() + router.getHistory(), )).to.equal(null); expect(router.getLocation().pathname).to.equal('/'); }); @@ -104,9 +104,9 @@ describe('frint-router › makeRouterService', function () { take$(4), scan$( (matches, currentMatch) => matches.concat([currentMatch]), - [] + [], ), - last$() + last$(), ) .subscribe(function (matches) { expect(matches).to.deep.equal([ diff --git a/packages/frint-router/src/matchFromHistory.spec.js b/packages/frint-router/src/matchFromHistory.spec.js index a98babad..ae6f025d 100644 --- a/packages/frint-router/src/matchFromHistory.spec.js +++ b/packages/frint-router/src/matchFromHistory.spec.js @@ -25,7 +25,7 @@ describe('frint-router › matchFromHistory', function () { url: '/', params: {}, isExact: true, - } + }, }, { @@ -43,7 +43,7 @@ describe('frint-router › matchFromHistory', function () { url: '/houses/revenclaw', params: {}, isExact: true, - } + }, }, { @@ -60,7 +60,7 @@ describe('frint-router › matchFromHistory', function () { url: '/houses/hufflepuff', params: {}, isExact: true, - } + }, }, { @@ -77,7 +77,7 @@ describe('frint-router › matchFromHistory', function () { url: '/houses', params: {}, isExact: false, - } + }, }, { @@ -97,7 +97,7 @@ describe('frint-router › matchFromHistory', function () { name: 'slytherin', }, isExact: true, - } + }, }, { @@ -118,7 +118,7 @@ describe('frint-router › matchFromHistory', function () { superhero: 'spiderman', }, isExact: true, - } + }, }, { @@ -138,7 +138,7 @@ describe('frint-router › matchFromHistory', function () { superhero: 'batman', }, isExact: false, - } + }, }, ]; @@ -147,7 +147,7 @@ describe('frint-router › matchFromHistory', function () { const result = matchFromHistory( entry.input.pattern, entry.input.history, - { exact: entry.input.exact } + { exact: entry.input.exact }, ); expect(result.url).to.equal(entry.output.url); diff --git a/packages/frint-store/src/Store.js b/packages/frint-store/src/Store.js index cd7da05c..001c5baa 100644 --- a/packages/frint-store/src/Store.js +++ b/packages/frint-store/src/Store.js @@ -34,7 +34,7 @@ function Store(options = {}) { ':', padStart(d.getSeconds(), 2, 0), '.', - padStart(d.getMilliseconds(), 3, 0) + padStart(d.getMilliseconds(), 3, 0), ].join(''); try { @@ -95,7 +95,7 @@ function Store(options = {}) { this._epicSubscription = this._epic$ .pipe( map$(epic => epic(this._action$, this, this.options.deps)), - switchMap$(output$ => output$) + switchMap$(output$ => output$), ) .subscribe(this.dispatch); @@ -118,7 +118,7 @@ Store.prototype.dispatch = function dispatch(action) { return action( this.dispatch, this.getState, - this.options.deps + this.options.deps, ); } diff --git a/packages/frint-store/src/combineEpics.spec.js b/packages/frint-store/src/combineEpics.spec.js index 81ad05d6..d2608705 100644 --- a/packages/frint-store/src/combineEpics.spec.js +++ b/packages/frint-store/src/combineEpics.spec.js @@ -14,7 +14,7 @@ describe('frint-store › combineEpics', function () { return action$ .pipe( filter$(action => action.type === 'PING'), - map$(() => ({ type: 'PONG' })) + map$(() => ({ type: 'PONG' })), ); }; @@ -31,7 +31,7 @@ describe('frint-store › combineEpics', function () { subject$.next({ type: 'PING' }); expect(emittedActions).to.deep.equal([ - { type: 'PONG' } + { type: 'PONG' }, ]); subscription.unsubscribe(); diff --git a/packages/frint-store/src/combineReducers.spec.js b/packages/frint-store/src/combineReducers.spec.js index 544e2bf5..022e52d8 100644 --- a/packages/frint-store/src/combineReducers.spec.js +++ b/packages/frint-store/src/combineReducers.spec.js @@ -9,11 +9,11 @@ describe('frint-store › combineReducers', function () { switch (action.type) { case 'INCREMENT_COUNTER': return Object.assign({}, { - value: state.value + 1 + value: state.value + 1, }); case 'DECREMENT_COUNTER': return Object.assign({}, { - value: state.value - 1 + value: state.value - 1, }); default: return state; @@ -24,7 +24,7 @@ describe('frint-store › combineReducers', function () { switch (action.type) { case 'SET_COLOR': return Object.assign({}, { - value: action.color + value: action.color, }); default: return state; @@ -45,12 +45,12 @@ describe('frint-store › combineReducers', function () { it('combines multiple reducers', function () { const rootReducer = combineReducers({ counter: counterReducer, - color: colorReducer + color: colorReducer, }); const initialState = { counter: { value: 100 }, - color: { value: 'red' } + color: { value: 'red' }, }; const states = []; @@ -66,14 +66,14 @@ describe('frint-store › combineReducers', function () { { counter: { value: 101 }, color: { value: 'red' } }, { counter: { value: 102 }, color: { value: 'red' } }, { counter: { value: 101 }, color: { value: 'red' } }, - { counter: { value: 101 }, color: { value: 'blue' } } + { counter: { value: 101 }, color: { value: 'blue' } }, ]); }); it('combines multiple reducers with no given initial state', function () { const rootReducer = combineReducers({ counter: counterReducer, - color: colorReducer + color: colorReducer, }); const state = rootReducer(undefined, { type: 'DO_NOTHING' }); @@ -93,9 +93,9 @@ describe('frint-store › combineReducers', function () { error(...args) { consoleCalls.push({ method: 'error', - args + args, }); - } + }, }; const rootReducer = combineReducers({ @@ -103,12 +103,12 @@ describe('frint-store › combineReducers', function () { color: colorReducer, buggy: buggyReducer, }, { - console: fakeConsole + console: fakeConsole, }); const initialState = { counter: { value: 100 }, - color: { value: 'red' } + color: { value: 'red' }, }; const states = []; @@ -120,7 +120,7 @@ describe('frint-store › combineReducers', function () { expect(states).to.deep.equal([ { counter: { value: 100 }, color: { value: 'red' }, buggy: {} }, { counter: { value: 101 }, color: { value: 'red' }, buggy: {} }, - { counter: { value: 101 }, color: { value: 'blue' }, buggy: {} } + { counter: { value: 101 }, color: { value: 'blue' }, buggy: {} }, ]); expect(() => rootReducer(states[states.length - 1], { type: 'DO_ERROR' })) @@ -128,7 +128,7 @@ describe('frint-store › combineReducers', function () { expect(consoleCalls.length).to.equal(1); expect(consoleCalls[0]).to.deep.equal({ method: 'error', - args: ['Reducer for key `buggy` threw an error:'] + args: ['Reducer for key `buggy` threw an error:'], }); expect(() => rootReducer(states[states.length - 1], { type: 'DO_UNDEFINED' })) diff --git a/packages/frint-store/src/createStore.js b/packages/frint-store/src/createStore.js index 090e0209..a39f3e9f 100644 --- a/packages/frint-store/src/createStore.js +++ b/packages/frint-store/src/createStore.js @@ -12,7 +12,7 @@ export default function createStore(options = {}) { constructor(opts = {}) { super(merge( options, - opts + opts, )); } } diff --git a/packages/frint-store/src/createStore.spec.js b/packages/frint-store/src/createStore.spec.js index 8b4c31f7..a8a89ad5 100644 --- a/packages/frint-store/src/createStore.spec.js +++ b/packages/frint-store/src/createStore.spec.js @@ -24,7 +24,7 @@ describe('frint-store › createStore', function () { enableLogger: false, initialState: { ok: true, - } + }, }); const subscription = store.getState$() @@ -47,16 +47,16 @@ describe('frint-store › createStore', function () { switch (action.type) { case 'INCREMENT_COUNTER': return Object.assign({}, { - counter: state.counter + 1 + counter: state.counter + 1, }); case 'DECREMENT_COUNTER': return Object.assign({}, { - counter: state.counter - 1 + counter: state.counter - 1, }); default: return state; } - } + }, }); const store = new Store(); @@ -74,12 +74,12 @@ describe('frint-store › createStore', function () { const lastState = states[states.length - 1]; expect(lastState).to.deep.equal({ - counter: 1 + counter: 1, }); const synchronousState = store.getState(); expect(synchronousState).to.deep.equal({ - counter: 1 + counter: 1, }); subscription.unsubscribe(); @@ -99,7 +99,7 @@ describe('frint-store › createStore', function () { actions.push(action); return state; - } + }, }); const store = new Store(); @@ -134,16 +134,16 @@ describe('frint-store › createStore', function () { switch (action.type) { case 'INCREMENT_COUNTER': return Object.assign({}, { - counter: state.counter + 1 + counter: state.counter + 1, }); case 'DECREMENT_COUNTER': return Object.assign({}, { - counter: state.counter - 1 + counter: state.counter - 1, }); default: return state; } - } + }, }); const store = new Store(); @@ -157,7 +157,7 @@ describe('frint-store › createStore', function () { store.dispatch(function (dispatch, getState, deps) { dispatch({ type: 'INCREMENT_COUNTER', - deps + deps, }); }); store.dispatch({ type: 'DECREMENT_COUNTER' }); @@ -188,8 +188,8 @@ describe('frint-store › createStore', function () { .pipe(filter$(action => action.type === 'PING')); }, initialState: { - counter: 0 - } + counter: 0, + }, }); const store = new Store(); @@ -230,16 +230,16 @@ describe('frint-store › createStore', function () { switch (action.type) { case 'INCREMENT_COUNTER': return Object.assign({}, { - counter: state.counter + 1 + counter: state.counter + 1, }); case 'DECREMENT_COUNTER': return Object.assign({}, { - counter: state.counter - 1 + counter: state.counter - 1, }); default: return state; } - } + }, }); const store = new Store(); @@ -279,7 +279,7 @@ describe('frint-store › createStore', function () { }, error(...args) { consoleCalls.push({ method: 'error', args }); - } + }, }; const Store = createStore({ @@ -295,7 +295,7 @@ describe('frint-store › createStore', function () { default: return state; } - } + }, }); const store = new Store(); @@ -324,11 +324,11 @@ describe('frint-store › createStore', function () { switch (action.type) { case 'INCREMENT_COUNTER': return Object.assign({}, { - value: state.value + 1 + value: state.value + 1, }); case 'DECREMENT_COUNTER': return Object.assign({}, { - value: state.value - 1 + value: state.value - 1, }); default: return state; @@ -339,7 +339,7 @@ describe('frint-store › createStore', function () { switch (action.type) { case 'SET_COLOR': return Object.assign({}, { - value: action.color + value: action.color, }); default: return state; @@ -359,8 +359,8 @@ describe('frint-store › createStore', function () { value: 100, }, color: { - value: 'red' - } + value: 'red', + }, }, reducer: rootReducer, }); @@ -382,7 +382,7 @@ describe('frint-store › createStore', function () { { counter: { value: 101 }, color: { value: 'red' } }, // INCREMENT_COUNTER { counter: { value: 102 }, color: { value: 'red' } }, // INCREMENT_COUNTER { counter: { value: 101 }, color: { value: 'red' } }, // DECREMENT_COUNTER - { counter: { value: 101 }, color: { value: 'green' } } // SET_COLOR + { counter: { value: 101 }, color: { value: 'green' } }, // SET_COLOR ]); subscription.unsubscribe(); @@ -411,7 +411,7 @@ describe('frint-store › createStore', function () { { counter: { value: 1 }, color: { value: 'blue' } }, // INCREMENT_COUNTER { counter: { value: 2 }, color: { value: 'blue' } }, // INCREMENT_COUNTER { counter: { value: 1 }, color: { value: 'blue' } }, // DECREMENT_COUNTER - { counter: { value: 1 }, color: { value: 'green' } } // SET_COLOR + { counter: { value: 1 }, color: { value: 'green' } }, // SET_COLOR ]); subscription.unsubscribe(); @@ -445,7 +445,7 @@ describe('frint-store › createStore', function () { { counter: { value: 101 }, color: { value: 'blue' } }, // INCREMENT_COUNTER { counter: { value: 102 }, color: { value: 'blue' } }, // INCREMENT_COUNTER { counter: { value: 101 }, color: { value: 'blue' } }, // DECREMENT_COUNTER - { counter: { value: 101 }, color: { value: 'green' } } // SET_COLOR + { counter: { value: 101 }, color: { value: 'green' } }, // SET_COLOR ]); subscription.unsubscribe(); @@ -489,7 +489,7 @@ describe('frint-store › createStore', function () { .pipe( filter$(action => action.type === PING), delay$(10), - map$(() => ({ type: PONG })) + map$(() => ({ type: PONG })), ); } @@ -515,9 +515,9 @@ describe('frint-store › createStore', function () { return acc; }, - [] + [], ), - last$() + last$(), ) .subscribe(function (pingStates) { expect(pingStates).to.deep.equal([ diff --git a/packages/frint-test-utils/src/index.js b/packages/frint-test-utils/src/index.js index d7668c65..5567a7f7 100644 --- a/packages/frint-test-utils/src/index.js +++ b/packages/frint-test-utils/src/index.js @@ -19,7 +19,7 @@ export function resetDOM() { } export function takeOverConsole(console) { - let hijackedFns = {}; + const hijackedFns = {}; function intercept(method, fn) { const original = console[method]; diff --git a/packages/frint/src/App.js b/packages/frint/src/App.js index 8f68509c..82d3a647 100644 --- a/packages/frint/src/App.js +++ b/packages/frint/src/App.js @@ -104,8 +104,8 @@ App.prototype._registerRootProviders = function _registerRootProviders() { omit(parentProvider, [ 'useClass', 'useValue', - 'useFactory' - ]) + 'useFactory', + ]), ); // non-scoped @@ -123,7 +123,7 @@ App.prototype._registerRootProviders = function _registerRootProviders() { // `useValue` providers have no impact with scoping this.container.register({ ...definedProvider, - useValue: parentApp.get(parentProvider.name) + useValue: parentApp.get(parentProvider.name), }); return; @@ -141,7 +141,7 @@ App.prototype._registerRootProviders = function _registerRootProviders() { if ('useFactory' in parentProvider) { this.container.register({ ...definedProvider, - useFactory: parentProvider.useFactory + useFactory: parentProvider.useFactory, }); } }); @@ -306,7 +306,7 @@ App.prototype.getAppOnceAvailable$ = function getAppOnceAvailable$(name, region const instanceKey = makeInstanceKey(region, regionKey, x.multi); return x.instances[instanceKey]; }), - first$(y => y) + first$(y => y), ); }; diff --git a/packages/frint/src/App.spec.js b/packages/frint/src/App.spec.js index 7c3bb349..ddbc3eb1 100644 --- a/packages/frint/src/App.spec.js +++ b/packages/frint/src/App.spec.js @@ -44,9 +44,9 @@ describe('frint › App', function () { expect( childApp .getParentApps() - .map(x => x.options.name) + .map(x => x.options.name), ).to.deep.equal([ - 'RootApp' + 'RootApp', ]); expect(grandchildApp.getParentApp()).to.deep.equal(childApp); @@ -54,7 +54,7 @@ describe('frint › App', function () { expect( grandchildApp .getParentApps() - .map(x => x.options.name) + .map(x => x.options.name), ).to.deep.equal([ 'ChildApp', 'RootApp', @@ -118,7 +118,7 @@ describe('frint › App', function () { providers: [ { name: 'foo', - useValue: 'fooValue' + useValue: 'fooValue', }, { name: 'bar', @@ -131,7 +131,7 @@ describe('frint › App', function () { name: 'baz', useClass: Baz, deps: ['foo', 'bar'], - } + }, ], }); @@ -183,7 +183,7 @@ describe('frint › App', function () { useValue: 'serviceE', cascade: true, scoped: false, - } + }, ], }); @@ -219,7 +219,7 @@ describe('frint › App', function () { it('gets container', function () { const app = new App({ - name: 'MyApp' + name: 'MyApp', }); expect(app.getContainer()).to.deep.equal(app.container); @@ -256,7 +256,7 @@ describe('frint › App', function () { name: 'MyApp', initialize() { called = true; - } + }, }); expect(app.getName()).to.equal('MyApp'); @@ -270,7 +270,7 @@ describe('frint › App', function () { name: 'MyApp', beforeDestroy() { called = true; - } + }, }); app.beforeDestroy(); @@ -505,7 +505,7 @@ describe('frint › App', function () { name: 'foo', useValue: `${foo} [updated]`, }); - } + }, }); const app = new Root(); @@ -527,7 +527,7 @@ describe('frint › App', function () { name: 'foo', useValue: `${foo} [updatedFromCreateApp]`, }); - } + }, }); const app = new Root({ @@ -537,7 +537,7 @@ describe('frint › App', function () { name: 'foo', useValue: `${foo} [updatedFromInstantiation]`, }); - } + }, }); expect(app.get('foo')).to.equal('original foo [updatedFromCreateApp] [updatedFromInstantiation]'); From 4fad1791f359ece4d42756bfa52270196ca34520 Mon Sep 17 00:00:00 2001 From: jbaudin Date: Tue, 2 Jan 2018 09:54:45 +0100 Subject: [PATCH 4/4] restrict comma-dangle to multiple lines --- .eslintrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.eslintrc b/.eslintrc index 420c6f43..23e1796b 100644 --- a/.eslintrc +++ b/.eslintrc @@ -13,6 +13,7 @@ ] }], "react/require-default-props": 0, - "react/no-unused-prop-types": 0 + "react/no-unused-prop-types": 0, + "comma-dangle": ["error", "always-multiline"] } }