- {i18n.text(`popup.${error ? 'loadingError' : 'emptyList'}`)}
-
- );
- }
-
+ const errorOrEmpty = error || (!items.length && !loading);
+ if (errorOrEmpty) {
return (
-
-
-
+
-
-
-
-
+
+
+
+
);
UnavailableMessage.propTypes = {
- domain: PropTypes.string.isRequired,
- reloadApp: PropTypes.func.isRequired,
+ domain: PropTypes.string.isRequired,
+ reloadApp: PropTypes.func.isRequired,
};
export default UnavailableMessage;
diff --git a/src/pages/popup/components/__tests__/App.test.js b/src/pages/popup/components/__tests__/App.test.js
index 4e80e74..3497a9e 100644
--- a/src/pages/popup/components/__tests__/App.test.js
+++ b/src/pages/popup/components/__tests__/App.test.js
@@ -8,58 +8,58 @@ jest.mock('../List/List', () => () =>
List
);
jest.mock('../Donation/Donation', () => () =>
Donation
);
const baseProps = {
- user: {
- authorized: true,
- email: 'test@ya.ru',
- },
- messages: {
- unreadCount: 5,
- items: [
- {id: 1},
- {id: 2},
- ],
- loading: false,
- error: false,
- },
- settings: {
- preferredDomain: 'ru',
- },
- loadMessages: jest.fn(),
- updateMessage: jest.fn(),
- openLink: jest.fn(),
- openSettings: jest.fn(),
- reloadApp: jest.fn(),
- openDonationLink: jest.fn(),
+ user: {
+ authorized: true,
+ email: 'test@ya.ru',
+ },
+ messages: {
+ unreadCount: 5,
+ items: [
+ {id: 1},
+ {id: 2},
+ ],
+ loading: false,
+ error: false,
+ },
+ settings: {
+ preferredDomain: 'ru',
+ },
+ loadMessages: jest.fn(),
+ updateMessage: jest.fn(),
+ openLink: jest.fn(),
+ openSettings: jest.fn(),
+ reloadApp: jest.fn(),
+ openDonationLink: jest.fn(),
};
function render(props) {
- const component = renderer.create(
-
,
- );
+ const component = renderer.create(
+
,
+ );
- return component.toJSON();
+ return component.toJSON();
}
describe('popup/App', () => {
- it('authorized', () => {
- const tree = render();
+ it('authorized', () => {
+ const tree = render();
- expect(tree).toMatchSnapshot();
- expect(baseProps.loadMessages).toHaveBeenCalledTimes(1);
- });
-
- it('not authorized', () => {
- const tree = render({
- user: {
- ...baseProps.user,
- authorized: false,
- },
- });
+ expect(tree).toMatchSnapshot();
+ expect(baseProps.loadMessages).toHaveBeenCalledTimes(1);
+ });
- expect(tree).toMatchSnapshot();
- expect(baseProps.loadMessages).not.toBeCalled();
+ it('not authorized', () => {
+ const tree = render({
+ user: {
+ ...baseProps.user,
+ authorized: false,
+ },
});
+
+ expect(tree).toMatchSnapshot();
+ expect(baseProps.loadMessages).not.toBeCalled();
+ });
});
diff --git a/src/pages/popup/index.js b/src/pages/popup/index.js
index 7d87c37..b7b1e0f 100644
--- a/src/pages/popup/index.js
+++ b/src/pages/popup/index.js
@@ -7,17 +7,17 @@ import App from './components/App';
import './styles/layout.less';
async function initApp() {
- const store = await createUIStore();
+ const store = await createUIStore();
- const mountNode = document.createElement('div');
- document.body.appendChild(mountNode);
+ const mountNode = document.createElement('div');
+ document.body.appendChild(mountNode);
- ReactDOM.render(
-
-
- ,
- mountNode,
- );
+ ReactDOM.render(
+
+
+ ,
+ mountNode,
+ );
}
initApp();
diff --git a/src/pages/raven.js b/src/pages/raven.js
index 8c45d5b..e15decb 100644
--- a/src/pages/raven.js
+++ b/src/pages/raven.js
@@ -3,20 +3,20 @@ import appConfig from 'shared/config';
import config from '../manifest/base.json';
Raven.config('https://de838c75714548c1b68ab1f14fa01e98@sentry.io/120928', {
- environment: __DEV__ ? 'development' : 'production',
- release: config.version,
- maxBreadcrumbs: 50,
- ignoreErrors: [
- appConfig.errors.offline,
- appConfig.errors.notAuthorized,
- ],
- shouldSendCallback() {
- return !window.navigator.userAgent.includes('Vivaldi');
- },
+ environment: __DEV__ ? 'development' : 'production',
+ release: config.version,
+ maxBreadcrumbs: 50,
+ ignoreErrors: [
+ appConfig.errors.offline,
+ appConfig.errors.notAuthorized,
+ ],
+ shouldSendCallback() {
+ return !window.navigator.userAgent.includes('Vivaldi');
+ },
}).install();
window.onunhandledrejection = (err) => {
- Raven.captureException(err.reason);
+ Raven.captureException(err.reason);
};
// expose for background.js
diff --git a/src/pages/settings/actions.js b/src/pages/settings/actions.js
index 9f008e2..a2b4b18 100644
--- a/src/pages/settings/actions.js
+++ b/src/pages/settings/actions.js
@@ -2,8 +2,8 @@ import {UPDATE_SETTINGS} from 'shared/redux-consts/settings';
// eslint-disable-next-line import/prefer-default-export
export function updateSettings(name, value) {
- return {
- type: UPDATE_SETTINGS,
- [name]: value,
- };
+ return {
+ type: UPDATE_SETTINGS,
+ [name]: value,
+ };
}
diff --git a/src/pages/settings/components/App.js b/src/pages/settings/components/App.js
index 82b2c6a..9678412 100644
--- a/src/pages/settings/components/App.js
+++ b/src/pages/settings/components/App.js
@@ -6,25 +6,25 @@ import config from './config';
import Field from './Field/Field';
const App = ({settings, updateSettings}) => {
- const fields = config.map((item, index) => (
-
- ));
+ const fields = config.map((item, index) => (
+
+ ));
- return (
-
- );
+ return (
+
+ );
};
App.propTypes = {
- settings: PropTypes.object.isRequired,
- updateSettings: PropTypes.func.isRequired,
+ settings: PropTypes.object.isRequired,
+ updateSettings: PropTypes.func.isRequired,
};
export default connect(state => state, actions)(App);
diff --git a/src/pages/settings/components/Field/Field.js b/src/pages/settings/components/Field/Field.js
index 5837713..ee03527 100644
--- a/src/pages/settings/components/Field/Field.js
+++ b/src/pages/settings/components/Field/Field.js
@@ -8,43 +8,43 @@ import Link from './Items/Link';
import styles from './Field.less';
const Field = (props) => {
- const {
- type,
- name,
- label,
- description,
- } = props;
+ const {
+ type,
+ name,
+ label,
+ description,
+ } = props;
- let Component;
- switch (type) {
- case types.checkbox:
- Component = Checkbox;
- break;
- case types.link:
- Component = Link;
- break;
- default:
- Component = Select;
- }
+ let Component;
+ switch (type) {
+ case types.checkbox:
+ Component = Checkbox;
+ break;
+ case types.link:
+ Component = Link;
+ break;
+ default:
+ Component = Select;
+ }
- return (
-
- |
-
- {description && {description} }
- |
-
-
- |
-
- );
+ return (
+
+ |
+
+ {description && {description} }
+ |
+
+
+ |
+
+ );
};
Field.propTypes = {
- type: PropTypes.oneOf(Object.keys(types)).isRequired,
- name: PropTypes.string.isRequired,
- label: PropTypes.string.isRequired,
- description: PropTypes.string.isRequired,
+ type: PropTypes.oneOf(Object.keys(types)).isRequired,
+ name: PropTypes.string.isRequired,
+ label: PropTypes.string.isRequired,
+ description: PropTypes.string.isRequired,
};
export default Field;
diff --git a/src/pages/settings/components/Field/Items/Checkbox.js b/src/pages/settings/components/Field/Items/Checkbox.js
index 4814b75..df1e28f 100644
--- a/src/pages/settings/components/Field/Items/Checkbox.js
+++ b/src/pages/settings/components/Field/Items/Checkbox.js
@@ -3,22 +3,22 @@ import React from 'react';
import FieldPropTypes from './proptypes';
const Checkbox = ({
- name,
- value,
- onChange,
+ name,
+ value,
+ onChange,
}) => (
-
onChange(name, e.target.checked)}
- />
+
onChange(name, e.target.checked)}
+ />
);
Checkbox.propTypes = {
- ...FieldPropTypes,
- value: PropTypes.bool.isRequired,
+ ...FieldPropTypes,
+ value: PropTypes.bool.isRequired,
};
export default Checkbox;
diff --git a/src/pages/settings/components/Field/Items/Link.js b/src/pages/settings/components/Field/Items/Link.js
index 529c451..c3d6f63 100644
--- a/src/pages/settings/components/Field/Items/Link.js
+++ b/src/pages/settings/components/Field/Items/Link.js
@@ -2,16 +2,16 @@ import PropTypes from 'prop-types';
import React, {Component} from 'react';
export default class Link extends Component {
- static propTypes = {
- url: PropTypes.string.isRequired,
- text: PropTypes.string.isRequired,
- }
+ static propTypes = {
+ url: PropTypes.string.isRequired,
+ text: PropTypes.string.isRequired,
+ }
- render() {
- return
{this.props.text};
- }
+ render() {
+ return
{this.props.text};
+ }
- onClick = () => {
- chrome.tabs.create({url: this.props.url});
- }
+ onClick = () => {
+ chrome.tabs.create({url: this.props.url});
+ }
}
diff --git a/src/pages/settings/components/Field/Items/Select.js b/src/pages/settings/components/Field/Items/Select.js
index 29a3848..6b6f66e 100644
--- a/src/pages/settings/components/Field/Items/Select.js
+++ b/src/pages/settings/components/Field/Items/Select.js
@@ -3,52 +3,52 @@ import React, {Component} from 'react';
import FieldPropTypes from './proptypes';
export default class Select extends Component {
- static propTypes = {
- ...FieldPropTypes,
- value: PropTypes.oneOfType([
- PropTypes.number,
- PropTypes.string,
- ]).isRequired,
- options: PropTypes.arrayOf(PropTypes.shape({
- value: PropTypes.oneOfType([
- PropTypes.number,
- PropTypes.string,
- ]).isRequired,
- label: PropTypes.string.isRequired,
- })).isRequired,
- }
+ static propTypes = {
+ ...FieldPropTypes,
+ value: PropTypes.oneOfType([
+ PropTypes.number,
+ PropTypes.string,
+ ]).isRequired,
+ options: PropTypes.arrayOf(PropTypes.shape({
+ value: PropTypes.oneOfType([
+ PropTypes.number,
+ PropTypes.string,
+ ]).isRequired,
+ label: PropTypes.string.isRequired,
+ })).isRequired,
+ }
- render() {
- const {
- name,
- value,
- options,
- } = this.props;
+ render() {
+ const {
+ name,
+ value,
+ options,
+ } = this.props;
- const optionElements = options.map((item, index) => (
-
- ));
+ const optionElements = options.map((item, index) => (
+
+ ));
- return (
-
- );
- }
+ return (
+
+ );
+ }
- onChange = (e) => {
- const {
- name,
- onChange,
- } = this.props;
- const {value} = e.target;
- const parsedValue = isNaN(value) ? value : parseInt(value, 10);
+ onChange = (e) => {
+ const {
+ name,
+ onChange,
+ } = this.props;
+ const {value} = e.target;
+ const parsedValue = isNaN(value) ? value : parseInt(value, 10);
- onChange(name, parsedValue);
- }
+ onChange(name, parsedValue);
+ }
}
diff --git a/src/pages/settings/components/Field/Items/__tests__/Select.test.js b/src/pages/settings/components/Field/Items/__tests__/Select.test.js
index 025b14c..42aed4b 100644
--- a/src/pages/settings/components/Field/Items/__tests__/Select.test.js
+++ b/src/pages/settings/components/Field/Items/__tests__/Select.test.js
@@ -3,94 +3,94 @@ import renderer from 'react-test-renderer';
import Select from '../Select';
function testCase(props) {
- const component = renderer.create(
-
,
- );
+ const component = renderer.create(
+
,
+ );
- const tree = component.toJSON();
- expect(tree).toMatchSnapshot();
+ const tree = component.toJSON();
+ expect(tree).toMatchSnapshot();
- return tree;
+ return tree;
}
describe('settings/Select', () => {
- it('no options', () => {
- testCase({
- value: 123,
- options: [],
- });
+ it('no options', () => {
+ testCase({
+ value: 123,
+ options: [],
});
+ });
- describe('with options', () => {
- function testCaseWithOptions({
- value,
- newValue,
- actualNewValue,
- options,
- }) {
- const name = 'field';
- const onChange = jest.fn();
-
- const tree = testCase({
- name,
- value,
- options,
- onChange,
- });
+ describe('with options', () => {
+ function testCaseWithOptions({
+ value,
+ newValue,
+ actualNewValue,
+ options,
+ }) {
+ const name = 'field';
+ const onChange = jest.fn();
- tree.props.onChange({target: {value: newValue}});
- expect(onChange).lastCalledWith(name, actualNewValue);
- }
+ const tree = testCase({
+ name,
+ value,
+ options,
+ onChange,
+ });
- describe('number options', () => {
- it('without zero value', () => {
- testCaseWithOptions({
- value: 1,
- newValue: '2', // select onChange always called with string
- actualNewValue: 2,
- options: [{
- label: 'option1',
- value: 1,
- }, {
- label: 'option2',
- value: 2,
- }],
- });
- });
+ tree.props.onChange({target: {value: newValue}});
+ expect(onChange).lastCalledWith(name, actualNewValue);
+ }
- it('with zero value', () => {
- testCaseWithOptions({
- value: 1,
- newValue: '0', // select onChange always called with string
- actualNewValue: 0,
- options: [{
- label: 'option0',
- value: 0,
- }, {
- label: 'option1',
- value: 1,
- }],
- });
- });
+ describe('number options', () => {
+ it('without zero value', () => {
+ testCaseWithOptions({
+ value: 1,
+ newValue: '2', // select onChange always called with string
+ actualNewValue: 2,
+ options: [{
+ label: 'option1',
+ value: 1,
+ }, {
+ label: 'option2',
+ value: 2,
+ }],
});
+ });
- it('string options', () => {
- testCaseWithOptions({
- value: 'opt1',
- newValue: 'opt2',
- actualNewValue: 'opt2',
- options: [{
- label: 'option1',
- value: 'opt1',
- }, {
- label: 'option2',
- value: 'opt2',
- }],
- });
+ it('with zero value', () => {
+ testCaseWithOptions({
+ value: 1,
+ newValue: '0', // select onChange always called with string
+ actualNewValue: 0,
+ options: [{
+ label: 'option0',
+ value: 0,
+ }, {
+ label: 'option1',
+ value: 1,
+ }],
});
+ });
+ });
+
+ it('string options', () => {
+ testCaseWithOptions({
+ value: 'opt1',
+ newValue: 'opt2',
+ actualNewValue: 'opt2',
+ options: [{
+ label: 'option1',
+ value: 'opt1',
+ }, {
+ label: 'option2',
+ value: 'opt2',
+ }],
+ });
});
+ });
});
diff --git a/src/pages/settings/components/Field/Items/proptypes.js b/src/pages/settings/components/Field/Items/proptypes.js
index c85ab08..b04125e 100644
--- a/src/pages/settings/components/Field/Items/proptypes.js
+++ b/src/pages/settings/components/Field/Items/proptypes.js
@@ -1,6 +1,6 @@
import PropTypes from 'prop-types';
export default {
- name: PropTypes.string.isRequired,
- onChange: PropTypes.func.isRequired,
+ name: PropTypes.string.isRequired,
+ onChange: PropTypes.func.isRequired,
};
diff --git a/src/pages/settings/components/Field/__tests__/Field.test.js b/src/pages/settings/components/Field/__tests__/Field.test.js
index 9789f71..6e77c44 100644
--- a/src/pages/settings/components/Field/__tests__/Field.test.js
+++ b/src/pages/settings/components/Field/__tests__/Field.test.js
@@ -7,41 +7,41 @@ jest.mock('../Items/Select', () => (props) =>
Select
);
jest.mock('../Items/Link', () => (props) =>
Link
);
function testCase(props) {
- const component = renderer.create(
-
,
- );
+ const component = renderer.create(
+
,
+ );
- const tree = component.toJSON();
- expect(tree).toMatchSnapshot();
+ const tree = component.toJSON();
+ expect(tree).toMatchSnapshot();
}
describe('settings/Field', () => {
- it('checkbox', () => {
- testCase({
- type: 'checkbox',
- value: false,
- onChange: jest.fn(),
- });
+ it('checkbox', () => {
+ testCase({
+ type: 'checkbox',
+ value: false,
+ onChange: jest.fn(),
});
+ });
- it('select', () => {
- testCase({
- type: 'select',
- value: 1,
- onChange: jest.fn(),
- });
+ it('select', () => {
+ testCase({
+ type: 'select',
+ value: 1,
+ onChange: jest.fn(),
});
+ });
- it('link', () => {
- testCase({
- type: 'link',
- url: 'https://smth.com',
- text: 'site url',
- });
+ it('link', () => {
+ testCase({
+ type: 'link',
+ url: 'https://smth.com',
+ text: 'site url',
});
+ });
});
diff --git a/src/pages/settings/components/Field/types.js b/src/pages/settings/components/Field/types.js
index 212ae02..5015063 100644
--- a/src/pages/settings/components/Field/types.js
+++ b/src/pages/settings/components/Field/types.js
@@ -1,5 +1,5 @@
export default {
- checkbox: 'checkbox',
- select: 'select',
- link: 'link',
+ checkbox: 'checkbox',
+ select: 'select',
+ link: 'link',
};
diff --git a/src/pages/settings/components/__tests__/App.test.js b/src/pages/settings/components/__tests__/App.test.js
index fbc34d3..d80fd14 100644
--- a/src/pages/settings/components/__tests__/App.test.js
+++ b/src/pages/settings/components/__tests__/App.test.js
@@ -6,19 +6,19 @@ jest.mock('shared/utils/i18n');
jest.mock('../Field/Field', () => (props) =>
Field
);
it('settings/App', () => {
- const component = renderer.create(
-
,
- );
+ const component = renderer.create(
+
,
+ );
- const tree = component.toJSON();
- expect(tree).toMatchSnapshot();
+ const tree = component.toJSON();
+ expect(tree).toMatchSnapshot();
});
diff --git a/src/pages/settings/components/config.js b/src/pages/settings/components/config.js
index 7401e38..c201052 100644
--- a/src/pages/settings/components/config.js
+++ b/src/pages/settings/components/config.js
@@ -3,51 +3,51 @@ import i18n from 'shared/utils/i18n';
import types from './Field/types';
const fields = [{
- type: types.select,
- name: 'newMessageNotification',
- optionValues: [0, 1, 2],
+ type: types.select,
+ name: 'newMessageNotification',
+ optionValues: [0, 1, 2],
}, {
- type: types.select,
- name: 'unreadMessagesNotification',
- optionValues: [0, 5, 15, 30], // interval in min
+ type: types.select,
+ name: 'unreadMessagesNotification',
+ optionValues: [0, 5, 15, 30], // interval in min
}, {
- type: types.checkbox,
- name: 'unreadMessagesSound',
+ type: types.checkbox,
+ name: 'unreadMessagesSound',
}, {
- type: types.select,
- name: 'notAuthNotification',
- optionValues: [0, 1, 2],
+ type: types.select,
+ name: 'notAuthNotification',
+ optionValues: [0, 1, 2],
}, {
- type: types.select,
- name: 'preferredDomain',
- optionValues: appConfig.supportedDomains,
+ type: types.select,
+ name: 'preferredDomain',
+ optionValues: appConfig.supportedDomains,
}];
// TODO: enable it for FF as well https://bugzilla.mozilla.org/show_bug.cgi?id=1303384
if (typeof browser === 'undefined') {
- fields.push({
- type: types.link,
- name: 'setShortcuts',
- url: 'chrome://extensions/configureCommands',
- text: i18n.text('settings.setShortcuts.linkText'),
- });
+ fields.push({
+ type: types.link,
+ name: 'setShortcuts',
+ url: 'chrome://extensions/configureCommands',
+ text: i18n.text('settings.setShortcuts.linkText'),
+ });
}
export default fields.map(field => {
- const baseKey = `settings.${field.name}`;
- let options;
+ const baseKey = `settings.${field.name}`;
+ let options;
- if (field.hasOwnProperty('optionValues')) {
- options = field.optionValues.map((value, index) => ({
- value,
- label: i18n.text(`${baseKey}.options.${index}`),
- }));
- }
+ if (field.hasOwnProperty('optionValues')) {
+ options = field.optionValues.map((value, index) => ({
+ value,
+ label: i18n.text(`${baseKey}.options.${index}`),
+ }));
+ }
- return {
- ...field,
- label: i18n.text(`${baseKey}.label`),
- description: i18n.text(`${baseKey}.description`),
- options,
- };
+ return {
+ ...field,
+ label: i18n.text(`${baseKey}.label`),
+ description: i18n.text(`${baseKey}.description`),
+ options,
+ };
});
diff --git a/src/pages/settings/index.js b/src/pages/settings/index.js
index 16e706a..dfc5d96 100644
--- a/src/pages/settings/index.js
+++ b/src/pages/settings/index.js
@@ -7,17 +7,17 @@ import App from './components/App';
import './layout.less';
async function initApp() {
- const store = await createUIStore();
+ const store = await createUIStore();
- const mountNode = document.createElement('div');
- document.body.appendChild(mountNode);
+ const mountNode = document.createElement('div');
+ document.body.appendChild(mountNode);
- ReactDOM.render(
-
-
- ,
- mountNode,
- );
+ ReactDOM.render(
+
+
+ ,
+ mountNode,
+ );
}
initApp();
diff --git a/src/pages/shared/config.js b/src/pages/shared/config.js
index 0953c8d..fd4d65a 100644
--- a/src/pages/shared/config.js
+++ b/src/pages/shared/config.js
@@ -1,14 +1,14 @@
export default {
- errors: {
- offline: 'network is offline',
- notAuthorized: 'AUTH_NO_AUTH',
- },
- supportedDomains: [
- 'ru',
- 'ua',
- 'by',
- 'kz',
- 'com',
- 'com.tr',
- ],
+ errors: {
+ offline: 'network is offline',
+ notAuthorized: 'AUTH_NO_AUTH',
+ },
+ supportedDomains: [
+ 'ru',
+ 'ua',
+ 'by',
+ 'kz',
+ 'com',
+ 'com.tr',
+ ],
};
diff --git a/src/pages/shared/utils/__mocks__/i18n.js b/src/pages/shared/utils/__mocks__/i18n.js
index ae02e00..e3e67c2 100644
--- a/src/pages/shared/utils/__mocks__/i18n.js
+++ b/src/pages/shared/utils/__mocks__/i18n.js
@@ -1,8 +1,8 @@
export default {
- text(key) {
- return key;
- },
- date(str) {
- return str;
- },
+ text(key) {
+ return key;
+ },
+ date(str) {
+ return str;
+ },
};
diff --git a/src/pages/shared/utils/__tests__/i18n.js b/src/pages/shared/utils/__tests__/i18n.js
index f42180a..ef18e4d 100644
--- a/src/pages/shared/utils/__tests__/i18n.js
+++ b/src/pages/shared/utils/__tests__/i18n.js
@@ -2,101 +2,101 @@ import dateFns from 'date-fns';
import i18n from '../i18n';
const months = Array
- .from(Array(12).keys())
- .reduce((obj, item) => {
- obj[`popup_months_${item}`] = `month#${item}`; // eslint-disable-line no-param-reassign
- return obj;
- }, {});
+ .from(Array(12).keys())
+ .reduce((obj, item) => {
+ obj[`popup_months_${item}`] = `month#${item}`; // eslint-disable-line no-param-reassign
+ return obj;
+ }, {});
const keys = {
- key_number_one: 'key number one',
- ...months,
+ key_number_one: 'key number one',
+ ...months,
};
let getMessage;
describe('shared/utils/i18n', () => {
- beforeEach(() => {
- getMessage = jest.fn(key => keys[key]);
-
- window.chrome = {
- i18n: {
- getMessage,
- },
- };
+ beforeEach(() => {
+ getMessage = jest.fn(key => keys[key]);
+
+ window.chrome = {
+ i18n: {
+ getMessage,
+ },
+ };
+ });
+
+ describe('text', () => {
+ it('key with dots', () => {
+ expect(i18n.text('key.number.one')).toBe(keys.key_number_one);
+ expect(getMessage).lastCalledWith('key_number_one', []);
});
- describe('text', () => {
- it('key with dots', () => {
- expect(i18n.text('key.number.one')).toBe(keys.key_number_one);
- expect(getMessage).lastCalledWith('key_number_one', []);
- });
+ it('key with underscores', () => {
+ const input = 'key_number_one';
- it('key with underscores', () => {
- const input = 'key_number_one';
-
- expect(i18n.text(input)).toBe(keys.key_number_one);
- expect(getMessage).lastCalledWith(input, []);
- });
+ expect(i18n.text(input)).toBe(keys.key_number_one);
+ expect(getMessage).lastCalledWith(input, []);
+ });
- it('with arguments', () => {
- const input = 'key_number_one';
- const arg1 = 'arg1';
- const arg2 = 23;
+ it('with arguments', () => {
+ const input = 'key_number_one';
+ const arg1 = 'arg1';
+ const arg2 = 23;
- expect(i18n.text(input, arg1, arg2)).toBe(keys.key_number_one);
- expect(getMessage).lastCalledWith(input, [arg1, arg2]);
- });
+ expect(i18n.text(input, arg1, arg2)).toBe(keys.key_number_one);
+ expect(getMessage).lastCalledWith(input, [arg1, arg2]);
});
+ });
- // Yandex uses ISO format ("2016-11-17T22:33:22") for date
- describe('date', () => {
- describe('this day', () => {
- const timezoneHoursOffset = (new Date()).getTimezoneOffset() / 60;
+ // Yandex uses ISO format ("2016-11-17T22:33:22") for date
+ describe('date', () => {
+ describe('this day', () => {
+ const timezoneHoursOffset = (new Date()).getTimezoneOffset() / 60;
- it('no need to add nils', () => {
- const date = new Date();
- const hours = 12;
- const min = 10;
- const expected = `${hours + timezoneHoursOffset}:${min}`;
+ it('no need to add nils', () => {
+ const date = new Date();
+ const hours = 12;
+ const min = 10;
+ const expected = `${hours + timezoneHoursOffset}:${min}`;
- date.setHours(hours, min);
+ date.setHours(hours, min);
- expect(i18n.date(date.toISOString())).toBe(expected);
- });
+ expect(i18n.date(date.toISOString())).toBe(expected);
+ });
- it('need to add nils', () => {
- const date = new Date();
- const hours = 9;
- const min = 5;
- const expected = `0${hours + timezoneHoursOffset}:0${min}`;
+ it('need to add nils', () => {
+ const date = new Date();
+ const hours = 9;
+ const min = 5;
+ const expected = `0${hours + timezoneHoursOffset}:0${min}`;
- date.setHours(hours, min);
+ date.setHours(hours, min);
- expect(i18n.date(date.toISOString())).toBe(expected);
- });
- });
+ expect(i18n.date(date.toISOString())).toBe(expected);
+ });
+ });
- it('prev month', () => {
- const today = new Date();
- const date = dateFns.subMonths(today, 1);
- const month = date.getMonth();
+ it('prev month', () => {
+ const today = new Date();
+ const date = dateFns.subMonths(today, 1);
+ const month = date.getMonth();
- const expected = dateFns.isSameYear(today, date) ?
- `${date.getDate()} ${months[`popup_months_${month}`]}` :
- `${date.getDate()} ${months[`popup_months_${month}`]} ${date.getFullYear()}`;
+ const expected = dateFns.isSameYear(today, date) ?
+ `${date.getDate()} ${months[`popup_months_${month}`]}` :
+ `${date.getDate()} ${months[`popup_months_${month}`]} ${date.getFullYear()}`;
- expect(i18n.date(date.toISOString())).toBe(expected);
- expect(getMessage).lastCalledWith(`popup_months_${month}`, []);
- });
+ expect(i18n.date(date.toISOString())).toBe(expected);
+ expect(getMessage).lastCalledWith(`popup_months_${month}`, []);
+ });
- it('another year', () => {
- const date = dateFns.subYears(new Date(), 1);
- const month = date.getMonth();
+ it('another year', () => {
+ const date = dateFns.subYears(new Date(), 1);
+ const month = date.getMonth();
- const expected = `${date.getDate()} ${months[`popup_months_${month}`]} ${date.getFullYear()}`;
+ const expected = `${date.getDate()} ${months[`popup_months_${month}`]} ${date.getFullYear()}`;
- expect(i18n.date(date.toISOString())).toBe(expected);
- expect(getMessage).lastCalledWith(`popup_months_${month}`, []);
- });
+ expect(i18n.date(date.toISOString())).toBe(expected);
+ expect(getMessage).lastCalledWith(`popup_months_${month}`, []);
});
+ });
});
diff --git a/src/pages/shared/utils/i18n.js b/src/pages/shared/utils/i18n.js
index ce7fd2b..c9052f9 100644
--- a/src/pages/shared/utils/i18n.js
+++ b/src/pages/shared/utils/i18n.js
@@ -1,39 +1,38 @@
function addNil(value) {
- return value < 10 ? `0${value}` : value;
+ return value < 10 ? `0${value}` : value;
}
function text(key, ...args) {
- return chrome.i18n.getMessage(key.replace(/\./g, '_'), args);
+ return chrome.i18n.getMessage(key.replace(/\./g, '_'), args);
}
function parseDate(value) {
- const localDate = new Date(value);
- const timezone = localDate.getTimezoneOffset() * 60 * 1000; // in milliseconds
+ const localDate = new Date(value);
+ const timezone = localDate.getTimezoneOffset() * 60 * 1000; // in milliseconds
- return new Date(localDate.valueOf() + timezone);
+ return new Date(localDate.valueOf() + timezone);
}
function date(value) {
- const date = parseDate(value); // eslint-disable-line no-shadow
- const currentDate = new Date();
- let yearPostfix = '';
+ const date = parseDate(value); // eslint-disable-line no-shadow
+ const currentDate = new Date();
+ let yearPostfix = '';
- if (currentDate.toDateString() === date.toDateString()) {
- const hour = addNil(date.getHours());
- const min = addNil(date.getMinutes());
+ if (currentDate.toDateString() === date.toDateString()) {
+ const hour = addNil(date.getHours());
+ const min = addNil(date.getMinutes());
- return `${hour}:${min}`;
- }
- else if (currentDate.getYear() !== date.getYear()) {
- yearPostfix = ` ${date.getFullYear()}`;
- }
+ return `${hour}:${min}`;
+ } else if (currentDate.getYear() !== date.getYear()) {
+ yearPostfix = ` ${date.getFullYear()}`;
+ }
- const month = text(`popup.months.${date.getMonth()}`);
+ const month = text(`popup.months.${date.getMonth()}`);
- return `${date.getDate()} ${month}${yearPostfix}`;
+ return `${date.getDate()} ${month}${yearPostfix}`;
}
export default {
- text,
- date,
+ text,
+ date,
};
diff --git a/webpack/base.js b/webpack/base.js
index 263f349..8ffe07b 100644
--- a/webpack/base.js
+++ b/webpack/base.js
@@ -5,64 +5,64 @@ const CircularDependencyPlugin = require('circular-dependency-plugin');
const {pagesPath} = require('./utils');
module.exports = {
- entry: {
- raven: `${pagesPath}/raven`,
- background: `${pagesPath}/background`,
- popup: `${pagesPath}/popup`,
- settings: `${pagesPath}/settings`,
+ entry: {
+ raven: `${pagesPath}/raven`,
+ background: `${pagesPath}/background`,
+ popup: `${pagesPath}/popup`,
+ settings: `${pagesPath}/settings`,
+ },
+ output: {
+ path: path.resolve('dist/pages'),
+ filename: '[name].js',
+ },
+ resolve: {
+ alias: {
+ shared: path.resolve('./src/pages/shared'),
},
- output: {
- path: path.resolve('dist/pages'),
- filename: '[name].js',
+ },
+ moduleRules: {
+ js: {
+ test: /\.js$/,
+ use: ['babel-loader'],
+ exclude: /node_modules/,
},
- resolve: {
- alias: {
- shared: path.resolve('./src/pages/shared'),
+ css: {
+ test: /\.less$/,
+ use: [
+ {
+ loader: 'css-loader',
+ options: {
+ importLoaders: 1,
+ modules: true,
+ localIdentName: '[name]__[local]___[hash:base64:5]',
+ },
},
+ 'less-loader',
+ ],
},
- moduleRules: {
- js: {
- test: /\.js$/,
- use: ['babel-loader'],
- exclude: /node_modules/,
- },
- css: {
- test: /\.less$/,
- use: [
- {
- loader: 'css-loader',
- options: {
- importLoaders: 1,
- modules: true,
- localIdentName: '[name]__[local]___[hash:base64:5]',
- },
- },
- 'less-loader',
- ],
- },
- },
- plugins: {
- copy: new CopyPlugin([{
- from: 'src',
- to: path.resolve('dist'),
- ignore: [
- 'manifest/**/*',
- 'pages/**/*',
- 'locales/**/*',
- ],
- }]),
- shell(target) {
- return new ShellPlugin({
- onBuildEnd: [
- `node ./scripts/generate-manifest ${target}`,
- 'node ./scripts/locales',
- ],
- dev: false,
- });
- },
- circularDependency: new CircularDependencyPlugin({
- exclude: /node_modules/,
- failOnError: true,
- }),
+ },
+ plugins: {
+ copy: new CopyPlugin([{
+ from: 'src',
+ to: path.resolve('dist'),
+ ignore: [
+ 'manifest/**/*',
+ 'pages/**/*',
+ 'locales/**/*',
+ ],
+ }]),
+ shell(target) {
+ return new ShellPlugin({
+ onBuildEnd: [
+ `node ./scripts/generate-manifest ${target}`,
+ 'node ./scripts/locales',
+ ],
+ dev: false,
+ });
},
+ circularDependency: new CircularDependencyPlugin({
+ exclude: /node_modules/,
+ failOnError: true,
+ }),
+ },
};
diff --git a/webpack/dev.js b/webpack/dev.js
index c4c5a38..06159db 100644
--- a/webpack/dev.js
+++ b/webpack/dev.js
@@ -2,67 +2,71 @@ const webpack = require('webpack');
const WriteFilePlugin = require('write-file-webpack-plugin');
const {generateHtmlPlugins} = require('./utils');
const {
- entry,
- output,
- resolve,
- moduleRules,
- plugins,
+ entry,
+ output,
+ resolve,
+ moduleRules,
+ plugins,
} = require('./base');
const baseConfig = {
- entry,
- output,
- resolve,
- module: {
- rules: [
- moduleRules.js,
- Object.assign({}, moduleRules.css, {
- use: [
- 'style-loader',
- ...moduleRules.css.use,
- ],
- }),
+ entry,
+ output,
+ resolve,
+ module: {
+ rules: [
+ moduleRules.js,
+ {
+ ...moduleRules.css,
+ use: [
+ 'style-loader',
+ ...moduleRules.css.use,
],
- },
- plugins: [
- plugins.circularDependency,
- plugins.copy,
- ...generateHtmlPlugins(entry),
- new webpack.DefinePlugin({
- 'process.env.NODE_ENV': JSON.stringify('development'),
- __DEV__: true,
- }),
+ },
],
+ },
+ plugins: [
+ plugins.circularDependency,
+ plugins.copy,
+ ...generateHtmlPlugins(entry),
+ new webpack.DefinePlugin({
+ 'process.env.NODE_ENV': JSON.stringify('development'),
+ __DEV__: true,
+ }),
+ ],
};
module.exports = (target) => {
- if (target === 'chrome') {
- return Object.assign({}, baseConfig, {
- output: Object.assign({}, baseConfig.output, {
- publicPath: 'http://localhost:8080',
- }),
- plugins: [
- ...baseConfig.plugins,
- plugins.shell('chrome'),
- new WriteFilePlugin({
- log: false,
- test: /^((?!hot-update).)*$/,
- }),
- ],
- devtool: 'eval',
- devServer: {
- stats: 'minimal',
- },
- });
- }
+ if (target === 'chrome') {
+ return {
+ ...baseConfig,
+ output: {
+ ...baseConfig.output,
+ publicPath: 'http://localhost:8080',
+ },
+ plugins: [
+ ...baseConfig.plugins,
+ plugins.shell('chrome'),
+ new WriteFilePlugin({
+ log: false,
+ test: /^((?!hot-update).)*$/,
+ }),
+ ],
+ devtool: 'eval',
+ devServer: {
+ stats: 'minimal',
+ },
+ };
+ }
- // firefox
- return Object.assign({}, baseConfig, {
- plugins: [
- ...baseConfig.plugins,
- plugins.shell('firefox'),
- ],
- devtool: 'cheap-module-source-map',
- watch: true,
- });
+ // firefox
+ return {
+ ...baseConfig,
+ plugins: [
+ ...baseConfig.plugins,
+ plugins.shell('firefox'),
+ ],
+ devtool: 'cheap-module-source-map',
+ watch: true,
+ };
};
diff --git a/webpack/prod.js b/webpack/prod.js
index 21c2877..4ca5d80 100644
--- a/webpack/prod.js
+++ b/webpack/prod.js
@@ -3,41 +3,42 @@ const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
const ExtractTextPlugin = require('extract-text-webpack-plugin');
const {generateHtmlPlugins} = require('./utils');
const {
- entry,
- output,
- resolve,
- moduleRules,
- plugins,
+ entry,
+ output,
+ resolve,
+ moduleRules,
+ plugins,
} = require('./base');
const extractTextPlugin = new ExtractTextPlugin('[name].css');
module.exports = (target) => ({
- entry,
- output,
- resolve,
- module: {
- rules: [
- moduleRules.js,
- Object.assign({}, moduleRules.css, {
- use: extractTextPlugin.extract(moduleRules.css.use),
- }),
- ],
- },
- plugins: [
- new webpack.LoaderOptionsPlugin({
- minimize: true,
- debug: false,
- }),
- new webpack.DefinePlugin({
- 'process.env.NODE_ENV': JSON.stringify('production'),
- __DEV__: false,
- }),
- new UglifyJSPlugin(),
- plugins.circularDependency,
- plugins.copy,
- plugins.shell(target),
- ...generateHtmlPlugins(entry),
- extractTextPlugin,
+ entry,
+ output,
+ resolve,
+ module: {
+ rules: [
+ moduleRules.js,
+ {
+ ...moduleRules.css,
+ use: extractTextPlugin.extract(moduleRules.css.use),
+ },
],
+ },
+ plugins: [
+ new webpack.LoaderOptionsPlugin({
+ minimize: true,
+ debug: false,
+ }),
+ new webpack.DefinePlugin({
+ 'process.env.NODE_ENV': JSON.stringify('production'),
+ __DEV__: false,
+ }),
+ new UglifyJSPlugin(),
+ plugins.circularDependency,
+ plugins.copy,
+ plugins.shell(target),
+ ...generateHtmlPlugins(entry),
+ extractTextPlugin,
+ ],
});
diff --git a/webpack/utils.js b/webpack/utils.js
index 5172fcd..891e6db 100644
--- a/webpack/utils.js
+++ b/webpack/utils.js
@@ -3,28 +3,28 @@ const HtmlPlugin = require('html-webpack-plugin');
const pagesPath = './src/pages';
function generateHtmlPlugins(entriesObj) {
- // not supported by nodejs
- // const {
- // raven,
- // ...entries,
- // } = entriesObj;
- const extraScript = 'raven';
- const entries = Object.keys(entriesObj).filter(name => name !== extraScript);
+ // TODO: not supported by nodejs
+ // const {
+ // raven,
+ // ...entries,
+ // } = entriesObj;
+ const extraScript = 'raven';
+ const entries = Object.keys(entriesObj).filter(name => name !== extraScript);
- return entries.map(name => new HtmlPlugin({
- filename: `./${name}.html`,
- chunksSortMode(a, b) {
- // raven has a bigger id
- return b.id - a.id;
- },
- chunks: [
- extraScript,
- name,
- ],
- }));
+ return entries.map(name => new HtmlPlugin({
+ filename: `./${name}.html`,
+ chunksSortMode(a, b) {
+ // raven has a bigger id
+ return b.id - a.id;
+ },
+ chunks: [
+ extraScript,
+ name,
+ ],
+ }));
}
module.exports = {
- pagesPath,
- generateHtmlPlugins,
+ pagesPath,
+ generateHtmlPlugins,
};
diff --git a/yarn.lock b/yarn.lock
index c3f2c01..4ecebb4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -86,7 +86,7 @@ ajv-keywords@^1.0.0:
version "1.5.1"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
-ajv-keywords@^2.0.0:
+ajv-keywords@^2.0.0, ajv-keywords@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
@@ -106,7 +106,7 @@ ajv@^4.7.0, ajv@^4.9.1:
co "^4.6.0"
json-stable-stringify "^1.0.1"
-ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5:
+ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.0, ajv@^5.2.3:
version "5.2.3"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.3.tgz#c06f598778c44c6b161abafe3466b81ad1814ed2"
dependencies:
@@ -406,7 +406,7 @@ babel-code-frame@7.0.0-beta.0:
esutils "^2.0.2"
js-tokens "^3.0.0"
-babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
dependencies:
@@ -1219,6 +1219,12 @@ cli-cursor@^1.0.1:
dependencies:
restore-cursor "^1.0.1"
+cli-cursor@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+ dependencies:
+ restore-cursor "^2.0.0"
+
cli-width@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -1371,7 +1377,7 @@ concat-map@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream@^1.5.2:
+concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
dependencies:
@@ -2274,7 +2280,14 @@ eslint-restricted-globals@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz#35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7"
-eslint@3.19.0, eslint@^3.19.0, eslint@^3.7.1:
+eslint-scope@^3.7.1:
+ version "3.7.1"
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
+ dependencies:
+ esrecurse "^4.1.0"
+ estraverse "^4.1.1"
+
+eslint@3.19.0, eslint@^3.7.1:
version "3.19.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
dependencies:
@@ -2314,7 +2327,49 @@ eslint@3.19.0, eslint@^3.19.0, eslint@^3.7.1:
text-table "~0.2.0"
user-home "^2.0.0"
-espree@^3.4.0:
+eslint@^4.8.0:
+ version "4.8.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.8.0.tgz#229ef0e354e0e61d837c7a80fdfba825e199815e"
+ dependencies:
+ ajv "^5.2.0"
+ babel-code-frame "^6.22.0"
+ chalk "^2.1.0"
+ concat-stream "^1.6.0"
+ cross-spawn "^5.1.0"
+ debug "^3.0.1"
+ doctrine "^2.0.0"
+ eslint-scope "^3.7.1"
+ espree "^3.5.1"
+ esquery "^1.0.0"
+ estraverse "^4.2.0"
+ esutils "^2.0.2"
+ file-entry-cache "^2.0.0"
+ functional-red-black-tree "^1.0.1"
+ glob "^7.1.2"
+ globals "^9.17.0"
+ ignore "^3.3.3"
+ imurmurhash "^0.1.4"
+ inquirer "^3.0.6"
+ is-resolvable "^1.0.0"
+ js-yaml "^3.9.1"
+ json-stable-stringify "^1.0.1"
+ levn "^0.3.0"
+ lodash "^4.17.4"
+ minimatch "^3.0.2"
+ mkdirp "^0.5.1"
+ natural-compare "^1.4.0"
+ optionator "^0.8.2"
+ path-is-inside "^1.0.2"
+ pluralize "^7.0.0"
+ progress "^2.0.0"
+ require-uncached "^1.0.3"
+ semver "^5.3.0"
+ strip-ansi "^4.0.0"
+ strip-json-comments "~2.0.1"
+ table "^4.0.1"
+ text-table "~0.2.0"
+
+espree@^3.4.0, espree@^3.5.1:
version "3.5.1"
resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.1.tgz#0c988b8ab46db53100a1954ae4ba995ddd27d87e"
dependencies:
@@ -2486,6 +2541,14 @@ extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+external-editor@^2.0.4:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.5.tgz#52c249a3981b9ba187c7cacf5beb50bf1d91a6bc"
+ dependencies:
+ iconv-lite "^0.4.17"
+ jschardet "^1.4.2"
+ tmp "^0.0.33"
+
extglob@^0.3.1:
version "0.3.2"
resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
@@ -2572,6 +2635,12 @@ figures@^1.3.5:
escape-string-regexp "^1.0.5"
object-assign "^4.1.0"
+figures@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+ dependencies:
+ escape-string-regexp "^1.0.5"
+
file-entry-cache@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
@@ -2825,6 +2894,10 @@ function-bind@^1.0.2, function-bind@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+functional-red-black-tree@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+
fx-runner@1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/fx-runner/-/fx-runner-1.0.7.tgz#c102cfdf21234c2dbd16723dccb1186f99c0b641"
@@ -2924,7 +2997,7 @@ globals@^10.0.0:
version "10.1.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-10.1.0.tgz#4425a1881be0d336b4a823a82a7be725d5dd987c"
-globals@^9.14.0, globals@^9.18.0:
+globals@^9.14.0, globals@^9.17.0, globals@^9.18.0:
version "9.18.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@@ -3255,7 +3328,7 @@ iconv-lite@0.4.13:
version "0.4.13"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
-iconv-lite@0.4.19, iconv-lite@~0.4.13:
+iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@~0.4.13:
version "0.4.19"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
@@ -3283,7 +3356,7 @@ iferr@^0.1.5:
version "0.1.5"
resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-ignore@^3.2.0:
+ignore@^3.2.0, ignore@^3.3.3:
version "3.3.5"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.5.tgz#c4e715455f6073a8d7e5dae72d2fc9d71663dba6"
@@ -3350,6 +3423,25 @@ inquirer@^0.12.0:
strip-ansi "^3.0.0"
through "^2.3.6"
+inquirer@^3.0.6:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
+ dependencies:
+ ansi-escapes "^3.0.0"
+ chalk "^2.0.0"
+ cli-cursor "^2.1.0"
+ cli-width "^2.0.0"
+ external-editor "^2.0.4"
+ figures "^2.0.0"
+ lodash "^4.3.0"
+ mute-stream "0.0.7"
+ run-async "^2.2.0"
+ rx-lite "^4.0.8"
+ rx-lite-aggregates "^4.0.8"
+ string-width "^2.1.0"
+ strip-ansi "^4.0.0"
+ through "^2.3.6"
+
internal-ip@1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
@@ -3536,6 +3628,10 @@ is-primitive@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+is-promise@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+
is-property@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
@@ -3963,7 +4059,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-js-yaml@^3.5.1, js-yaml@^3.7.0:
+js-yaml@^3.5.1, js-yaml@^3.7.0, js-yaml@^3.9.1:
version "3.10.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
dependencies:
@@ -3981,6 +4077,10 @@ jsbn@~0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+jschardet@^1.4.2:
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.5.1.tgz#c519f629f86b3a5bedba58a88d311309eec097f9"
+
jsdom@^9.12.0:
version "9.12.0"
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
@@ -4596,6 +4696,10 @@ mute-stream@0.0.5:
version "0.0.5"
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
+mute-stream@0.0.7:
+ version "0.0.7"
+ resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+
mv@~2:
version "2.1.1"
resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"
@@ -4899,6 +5003,12 @@ onetime@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+onetime@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+ dependencies:
+ mimic-fn "^1.0.0"
+
open@0.0.5:
version "0.0.5"
resolved "https://registry.yarnpkg.com/open/-/open-0.0.5.tgz#42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"
@@ -4959,7 +5069,7 @@ os-shim@^0.1.2:
version "0.1.3"
resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917"
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -5074,7 +5184,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-path-is-inside@^1.0.1:
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
@@ -5178,6 +5288,10 @@ pluralize@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
+pluralize@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+
portfinder@^1.0.9:
version "1.0.13"
resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
@@ -5482,6 +5596,10 @@ progress@^1.1.8:
version "1.1.8"
resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
+progress@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
+
promise-inflight@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
@@ -5996,7 +6114,7 @@ require-main-filename@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-require-uncached@1.0.3, require-uncached@^1.0.2:
+require-uncached@1.0.3, require-uncached@^1.0.2, require-uncached@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
dependencies:
@@ -6028,6 +6146,13 @@ restore-cursor@^1.0.1:
exit-hook "^1.0.0"
onetime "^1.0.0"
+restore-cursor@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+ dependencies:
+ onetime "^2.0.0"
+ signal-exit "^3.0.2"
+
right-align@^0.1.1:
version "0.1.3"
resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -6059,12 +6184,28 @@ run-async@^0.1.0:
dependencies:
once "^1.3.0"
+run-async@^2.2.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+ dependencies:
+ is-promise "^2.1.0"
+
run-queue@^1.0.0, run-queue@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
dependencies:
aproba "^1.1.1"
+rx-lite-aggregates@^4.0.8:
+ version "4.0.8"
+ resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
+ dependencies:
+ rx-lite "*"
+
+rx-lite@*, rx-lite@^4.0.8:
+ version "4.0.8"
+ resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
+
rx-lite@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
@@ -6257,6 +6398,12 @@ slice-ansi@0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+slice-ansi@1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
+ dependencies:
+ is-fullwidth-code-point "^2.0.0"
+
sntp@1.x.x:
version "1.0.9"
resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
@@ -6476,7 +6623,7 @@ string-width@^1.0.1, string-width@^1.0.2:
is-fullwidth-code-point "^1.0.0"
strip-ansi "^3.0.0"
-string-width@^2.0.0:
+string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
dependencies:
@@ -6627,6 +6774,17 @@ table@^3.7.8:
slice-ansi "0.0.4"
string-width "^2.0.0"
+table@^4.0.1:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
+ dependencies:
+ ajv "^5.2.3"
+ ajv-keywords "^2.1.0"
+ chalk "^2.1.0"
+ lodash "^4.17.4"
+ slice-ansi "1.0.0"
+ string-width "^2.1.1"
+
tapable@^0.1.8:
version "0.1.10"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4"
@@ -6742,6 +6900,12 @@ tmp@0.0.30:
dependencies:
os-tmpdir "~1.0.1"
+tmp@^0.0.33:
+ version "0.0.33"
+ resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+ dependencies:
+ os-tmpdir "~1.0.2"
+
tmpl@1.0.x:
version "1.0.4"
resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"