diff --git a/.eslintrc.js b/.eslintrc.js index 47fd3bc9517..7c404473041 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,19 +1,22 @@ module.exports = { root: true, - parser: 'babel-eslint', parserOptions: { - sourceType: "module", - allowImportExportEverywhere: false + ecmaVersion: 2017, + sourceType: 'module' }, + plugins: [ + 'ember' + ], extends: [ 'eslint:recommended', 'plugin:ember-suave/recommended' ], env: { - 'browser': true + browser: true }, rules: { 'arrow-spacing': 'error', + 'no-var': 'error', 'no-useless-escape': 'off', 'space-before-blocks': 'error', 'comma-dangle': ['error', 'never'], @@ -45,7 +48,6 @@ module.exports = { 'brace-style': ['error', '1tbs', { 'allowSingleLine': true }], 'max-statements-per-line': ['error', { 'max': 2 }], 'quotes': ['error', 'single'], - 'no-var': 'off', 'indent': [ 'error', 2, { "FunctionExpression": {"parameters": "first"}, @@ -64,7 +66,9 @@ module.exports = { 'eqeqeq': ['error', 'smart'], 'one-var': 'off', 'ember-suave/no-const-outside-module-scope': 'off', - 'ember-suave/require-access-in-comments': 'off' + 'ember-suave/require-access-in-comments': 'off', + 'ember/no-get': 'error', + 'ember/no-get-properties': 'error', }, globals: { module : true, @@ -74,5 +78,37 @@ module.exports = { Uint8Array : true, require : true, Promise : true - } + }, + overrides: [ + // node files + { + files: [ + '.eslintrc.js', + '.template-lintrc.js', + 'ember-cli-build.js', + 'testem.js', + 'blueprints/*/index.js', + 'config/**/*.js', + 'lib/*/index.js', + 'server/**/*.js' + ], + parserOptions: { + sourceType: 'script', + ecmaVersion: 2015 + }, + env: { + browser: false, + node: true + }, + plugins: ['node'], + rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, { + // add your custom rules and overrides for node files here + + // this can be removed once the following is fixed + // https://github.com/mysticatea/eslint-plugin-node/issues/77 + 'node/no-unpublished-require': 'off', + 'node/no-extraneous-require': 'off' + }) + } + ] }; diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index 2b6f469f0ce..00000000000 --- a/.jshintrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "esversion": 6 -} diff --git a/app/adapters/application.js b/app/adapters/application.js index ade3e626ae0..585fef648f6 100644 --- a/app/adapters/application.js +++ b/app/adapters/application.js @@ -39,7 +39,7 @@ export default JSONAPIAdapter.extend(HasManyQueryAdapterMixin, AdapterFetch, Cac isInvalid(statusCode) { if (statusCode !== 404 && statusCode !== 422 && statusCode !== 403 && statusCode !== 409) { - this.get('notify').error('An unexpected error occurred.', { + this.notify.error('An unexpected error occurred.', { closeAfter: 5000 }); } @@ -83,7 +83,7 @@ export default JSONAPIAdapter.extend(HasManyQueryAdapterMixin, AdapterFetch, Cac */ ensureResponseAuthorized(status) { if (status === 401 && this.get('session.isAuthenticated')) { - this.get('session').invalidate(); + this.session.invalidate(); } } }); diff --git a/app/components/event-card.js b/app/components/event-card.js index b65a8b1fc74..f13b8c76d24 100644 --- a/app/components/event-card.js +++ b/app/components/event-card.js @@ -1,6 +1,6 @@ import Component from '@ember/component'; import { computed } from '@ember/object'; -import { forOwn } from 'lodash'; +import { forOwn } from 'lodash-es'; import { pascalCase } from 'open-event-frontend/utils/string'; export default Component.extend({ diff --git a/app/components/events/event-import-section.js b/app/components/events/event-import-section.js index 2a28f8c8038..4adeca526c4 100644 --- a/app/components/events/event-import-section.js +++ b/app/components/events/event-import-section.js @@ -14,12 +14,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please upload a file') + prompt : this.l10n.t('Please upload a file') }, { type : 'regExp', value : '/^(.*.((zip|xml|ical|ics|xcal)$))?[^.]*$/i', - prompt : this.get('l10n').t('Please upload a file in suggested format') + prompt : this.l10n.t('Please upload a file in suggested format') } ] } diff --git a/app/components/events/view/export/api-response.js b/app/components/events/view/export/api-response.js index 8067c67d457..1c19abb8b53 100644 --- a/app/components/events/view/export/api-response.js +++ b/app/components/events/view/export/api-response.js @@ -14,11 +14,11 @@ export default Component.extend({ isLoading: false, baseUrl: computed('eventId', function() { - return `${`${ENV.APP.apiHost}/${ENV.APP.apiNamespace}/events/`}${this.get('eventId')}`; + return `${`${ENV.APP.apiHost}/${ENV.APP.apiNamespace}/events/`}${this.eventId}`; }), displayUrl: computed('eventId', function() { - return `${`${ENV.APP.apiHost}/${ENV.APP.apiNamespace}/events/`}${this.get('eventId')}`; + return `${`${ENV.APP.apiHost}/${ENV.APP.apiNamespace}/events/`}${this.eventId}`; }), toggleSwitches: { @@ -32,14 +32,14 @@ export default Component.extend({ makeRequest() { this.set('isLoading', true); - this.get('loader') - .load(this.get('displayUrl'), { isExternal: true }) + this.loader + .load(this.displayUrl, { isExternal: true }) .then(json => { json = JSON.stringify(json, null, 2); this.set('json', htmlSafe(syntaxHighlight(json))); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('Could not fetch from the server')); + this.notify.error(this.l10n.t('Could not fetch from the server')); this.set('json', 'Could not fetch from the server'); }) .finally(() => { @@ -48,12 +48,12 @@ export default Component.extend({ }, buildDisplayUrl() { - let newUrl = this.get('baseUrl'); + let newUrl = this.baseUrl; const include = []; - for (const key in this.get('toggleSwitches')) { - if (this.get('toggleSwitches').hasOwnProperty(key)) { - this.get('toggleSwitches')[key] && include.push(key); + for (const key in this.toggleSwitches) { + if (this.toggleSwitches.hasOwnProperty(key)) { + this.toggleSwitches[key] && include.push(key); } } diff --git a/app/components/events/view/export/download-common.js b/app/components/events/view/export/download-common.js index 69be49c4b46..bbc0413e9ae 100644 --- a/app/components/events/view/export/download-common.js +++ b/app/components/events/view/export/download-common.js @@ -7,7 +7,7 @@ export default Component.extend({ eventDownloadUrl : '', isLoading : false, fileFormat : computed(function() { - switch (this.get('downloadType')) { + switch (this.downloadType) { case 'iCalendar': return 'ical'; case 'Pentabarf XML': @@ -19,29 +19,29 @@ export default Component.extend({ } }), displayUrl: computed(function() { - return this.get(`model.${ this.get('fileFormat') }Url`) !== null ? this.get(`model.${ this.get('fileFormat') }Url`) : 'Please publish to generate the link'; + return this.get(`model.${ this.fileFormat }Url`) !== null ? this.get(`model.${ this.fileFormat }Url`) : 'Please publish to generate the link'; }), requestLoop(exportJobInfo) { run.later(() => { - this.get('loader') + this.loader .load(exportJobInfo.task_url, { withoutPrefix: true }) .then(exportJobStatus => { if (exportJobStatus.state === 'SUCCESS') { this.set('isDownloadDisabled', false); this.set('eventDownloadUrl', exportJobStatus.result.download_url); - this.get('notify').success(this.get('l10n').t('Download Ready')); + this.notify.success(this.l10n.t('Download Ready')); } else if (exportJobStatus.state === 'WAITING') { this.requestLoop(exportJobInfo); this.set('eventExportStatus', exportJobStatus.state); - this.get('notify').alert(this.get('l10n').t('Task is going on.')); + this.notify.alert(this.l10n.t('Task is going on.')); } else { this.set('eventExportStatus', exportJobStatus.state); - this.get('notify').error(this.get('l10n').t('Task failed.')); + this.notify.error(this.l10n.t('Task failed.')); } }) .catch(() => { this.set('eventExportStatus', 'FAILURE'); - this.get('notify').error(this.get('l10n').t('Task failed.')); + this.notify.error(this.l10n.t('Task failed.')); }) .finally(() => { this.set('isLoading', false); @@ -51,14 +51,14 @@ export default Component.extend({ actions: { startExportTask() { this.set('isLoading', true); - this.get('loader') - .load(`/events/${this.get('model.id')}/export/${this.get('fileFormat')}`) + this.loader + .load(`/events/${this.get('model.id')}/export/${this.fileFormat}`) .then(exportJobInfo => { this.requestLoop(exportJobInfo); }) .catch(() => { this.set('isLoading', false); - this.get('notify').error(this.get('l10n').t('Unexpected error occurred.')); + this.notify.error(this.l10n.t('Unexpected error occurred.')); }); } } diff --git a/app/components/events/view/overview/manage-roles.js b/app/components/events/view/overview/manage-roles.js index 3822d1f7e95..bdbb0b9d0ff 100644 --- a/app/components/events/view/overview/manage-roles.js +++ b/app/components/events/view/overview/manage-roles.js @@ -5,7 +5,7 @@ export default Component.extend({ classNames : ['ui', 'fluid', 'card'], roleType : 'accepted', roleInvites : computed('data.roleInvites.@each', 'roleType', function() { - return this.get('data.roleInvites').filterBy('status', this.get('roleType')); + return this.get('data.roleInvites').filterBy('status', this.roleType); }), actions: { openAddUserRoleModal(invite) { @@ -13,7 +13,7 @@ export default Component.extend({ this.set('currentInvite', invite); this.set('isNewInvite', false); } else { - const currentInvite = this.get('data').roleInvites.createRecord({}); + const currentInvite = this.data.roleInvites.createRecord({}); this.set('currentInvite', currentInvite); this.set('isNewInvite', true); } @@ -21,18 +21,17 @@ export default Component.extend({ }, updateUserRoles() { this.set('isLoading', true); - const currentInvite = this.get('currentInvite'); - currentInvite.set('roleName', currentInvite.get('role.name')); - this.get('currentInvite').save() + this.currentInvite.set('roleName', this.currentInvite.get('role.name')); + this.currentInvite.save() .then(() => { - if (this.get('isNewInvite')) { - this.get('data.roleInvites').addObject(currentInvite); + if (this.isNewInvite) { + this.get('data.roleInvites').addObject(this.currentInvite); } this.set('isAddUserRoleModalOpen', false); - this.get('notify').success(this.get('isNewInvite') ? this.get('l10n').t('Role Invite sent successfully') : this.get('l10n').t('Role Invite updated successfully')); + this.notify.success(this.isNewInvite ? this.l10n.t('Role Invite sent successfully') : this.l10n.t('Role Invite updated successfully')); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); }) .finally(() => { this.set('isLoading', false); @@ -42,11 +41,11 @@ export default Component.extend({ this.set('isLoading', true); invite.destroyRecord() .then(() => { - this.get('notify').success(this.get('l10n').t('Role Invite deleted successfully')); + this.notify.success(this.l10n.t('Role Invite deleted successfully')); this.get('data.roleInvites').removeObject(invite); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/components/explore/side-bar.js b/app/components/explore/side-bar.js index 4c6010f62d3..9f39614984a 100644 --- a/app/components/explore/side-bar.js +++ b/app/components/explore/side-bar.js @@ -12,7 +12,7 @@ export default Component.extend({ customEndDate: null, hideClearFilters: computed('category', 'sub_category', 'event_type', 'startDate', 'endDate', 'location', function() { - return !(this.get('category') || this.get('sub_category') || this.get('event_type') || this.get('startDate') || this.get('endDate') || this.get('location') !== null); + return !(this.category || this.sub_category || this.event_type || this.startDate || this.endDate || this.location !== null); }), dateRanges: computed(function() { @@ -21,16 +21,16 @@ export default Component.extend({ actions: { selectCategory(category, subCategory) { - this.set('category', (category === this.get('category') && !subCategory) ? null : category); - this.set('sub_category', (!subCategory || subCategory === this.get('sub_category')) ? null : subCategory); + this.set('category', (category === this.category && !subCategory) ? null : category); + this.set('sub_category', (!subCategory || subCategory === this.sub_category) ? null : subCategory); }, selectEventType(eventType) { - this.set('event_type', eventType === this.get('event_type') ? null : eventType); + this.set('event_type', eventType === this.event_type ? null : eventType); }, dateValidate(date) { - if (moment(date).isAfter(this.get('customEndDate'))) { + if (moment(date).isAfter(this.customEndDate)) { this.set('customEndDate', date); } @@ -41,14 +41,14 @@ export default Component.extend({ let newStartDate = null; let newEndDate = null; - if (dateType === this.get('dateType') && dateType !== 'custom_dates') { + if (dateType === this.dateType && dateType !== 'custom_dates') { this.set('dateType', null); } else { this.set('dateType', dateType); switch (dateType) { case 'custom_dates': - newStartDate = this.get('customStartDate'); - newEndDate = this.get('customEndDate'); + newStartDate = this.customStartDate; + newEndDate = this.customEndDate; break; case 'all_dates': diff --git a/app/components/footer-main.js b/app/components/footer-main.js index d6b70555f14..2f9abb7b78e 100644 --- a/app/components/footer-main.js +++ b/app/components/footer-main.js @@ -5,18 +5,18 @@ export default Component.extend({ tagName : 'footer', classNames : ['ui', 'inverted', 'vertical', 'footer', 'segment'], currentLocale : computed(function() { - return this.get('l10n').getLocale(); + return this.l10n.getLocale(); }), actions: { switchLanguage(locale) { - this.get('l10n').switchLanguage(locale); + this.l10n.switchLanguage(locale); } }, didInsertElement() { - this.set('eventLocations', this.get('eventLocations').sortBy('name')); + this.set('eventLocations', this.eventLocations.sortBy('name')); - let eventTypes = this.get('eventTypes').sortBy('name').toArray(); + let eventTypes = this.eventTypes.sortBy('name').toArray(); eventTypes.forEach(eventType => { if (eventType.name === 'Other') { let other = eventType; diff --git a/app/components/forms/admin/content/pages-form.js b/app/components/forms/admin/content/pages-form.js index 9d594b1418b..1242a2bf827 100644 --- a/app/components/forms/admin/content/pages-form.js +++ b/app/components/forms/admin/content/pages-form.js @@ -14,7 +14,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a name') + prompt : this.l10n.t('Please enter a name') } ] }, @@ -23,7 +23,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a title') + prompt : this.l10n.t('Please enter a title') } ] }, @@ -32,16 +32,16 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the path') + prompt : this.l10n.t('Please enter the path') }, { type : 'regExp', value : '/[^/](.*)/', - prompt : this.get('l10n').t('Path should not contain leading slash.') + prompt : this.l10n.t('Path should not contain leading slash.') }, { type : 'doesntContain[ ]', - prompt : this.get('l10n').t('Path should not contain whitespaces.') + prompt : this.l10n.t('Path should not contain whitespaces.') } ] }, @@ -50,7 +50,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please select a place') + prompt : this.l10n.t('Please select a place') } ] }, @@ -59,7 +59,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a position') + prompt : this.l10n.t('Please enter a position') } ] }, @@ -68,7 +68,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a language') + prompt : this.l10n.t('Please enter a language') } ] } @@ -83,13 +83,13 @@ export default Component.extend(FormMixin, { }); }, deletePage(data) { - if (!this.get('isCreate')) { + if (!this.isCreate) { data.destroyRecord(); this.set('isFormOpen', false); } }, close() { - if (this.get('isCreate')) { + if (this.isCreate) { this.set('isFormOpen', false); } } diff --git a/app/components/forms/admin/content/social-links-form.js b/app/components/forms/admin/content/social-links-form.js index 8af1e225843..d7bdf7a8833 100644 --- a/app/components/forms/admin/content/social-links-form.js +++ b/app/components/forms/admin/content/social-links-form.js @@ -17,7 +17,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : protocolLessValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }, @@ -27,12 +27,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'containsExactly[twitter.com]', - prompt : this.get('l10n').t('Please enter a valid twitter url') + prompt : this.l10n.t('Please enter a valid twitter url') }, { type : 'regExp', value : protocolLessValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }, @@ -42,12 +42,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'containsExactly[facebook.com]', - prompt : this.get('l10n').t('Please enter a valid facebook url') + prompt : this.l10n.t('Please enter a valid facebook url') }, { type : 'regExp', value : protocolLessValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }, @@ -57,12 +57,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'containsExactly[plus.google.com]', - prompt : this.get('l10n').t('Please enter a valid google plus url') + prompt : this.l10n.t('Please enter a valid google plus url') }, { type : 'regExp', value : protocolLessValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }, @@ -72,12 +72,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'containsExactly[youtube.com]', - prompt : this.get('l10n').t('Please enter a valid YouTube url') + prompt : this.l10n.t('Please enter a valid YouTube url') }, { type : 'regExp', value : protocolLessValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }, @@ -87,12 +87,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'containsExactly[github.com]', - prompt : this.get('l10n').t('Please enter a valid GitHub url') + prompt : this.l10n.t('Please enter a valid GitHub url') }, { type : 'regExp', value : protocolLessValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] } diff --git a/app/components/forms/admin/content/translation-form.js b/app/components/forms/admin/content/translation-form.js index 14e8dd0d1e6..41061660b74 100644 --- a/app/components/forms/admin/content/translation-form.js +++ b/app/components/forms/admin/content/translation-form.js @@ -14,12 +14,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please upload a file') + prompt : this.l10n.t('Please upload a file') }, { type : 'regExp', value : '/^(.*.((po)$))?[^.]*$/i', - prompt : this.get('l10n').t('Please upload a file in suggested format') + prompt : this.l10n.t('Please upload a file in suggested format') } ] }, @@ -28,7 +28,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please select a language') + prompt : this.l10n.t('Please select a language') } ] } diff --git a/app/components/forms/admin/settings/images-form.js b/app/components/forms/admin/settings/images-form.js index 0894d176acb..8cc8dc150c4 100644 --- a/app/components/forms/admin/settings/images-form.js +++ b/app/components/forms/admin/settings/images-form.js @@ -14,7 +14,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter width') + prompt : this.l10n.t('Please enter width') } ] }, @@ -23,7 +23,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter height') + prompt : this.l10n.t('Please enter height') } ] }, @@ -32,7 +32,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter quality') + prompt : this.l10n.t('Please enter quality') } ] }, @@ -41,7 +41,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter width') + prompt : this.l10n.t('Please enter width') } ] }, @@ -50,7 +50,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter height') + prompt : this.l10n.t('Please enter height') } ] }, @@ -59,7 +59,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter quality') + prompt : this.l10n.t('Please enter quality') } ] }, @@ -68,7 +68,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter width') + prompt : this.l10n.t('Please enter width') } ] }, @@ -77,7 +77,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter height') + prompt : this.l10n.t('Please enter height') } ] }, @@ -86,7 +86,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter quality') + prompt : this.l10n.t('Please enter quality') } ] }, @@ -95,7 +95,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter width') + prompt : this.l10n.t('Please enter width') } ] }, @@ -104,7 +104,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter height') + prompt : this.l10n.t('Please enter height') } ] }, @@ -113,7 +113,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter size') + prompt : this.l10n.t('Please enter size') } ] }, @@ -122,7 +122,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter quality') + prompt : this.l10n.t('Please enter quality') } ] }, @@ -131,7 +131,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter size') + prompt : this.l10n.t('Please enter size') } ] }, @@ -140,7 +140,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter quality') + prompt : this.l10n.t('Please enter quality') } ] }, @@ -149,7 +149,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter size') + prompt : this.l10n.t('Please enter size') } ] }, @@ -158,7 +158,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter quality') + prompt : this.l10n.t('Please enter quality') } ] } diff --git a/app/components/forms/admin/settings/microservices-form.js b/app/components/forms/admin/settings/microservices-form.js index 7186e3595b6..379a4b660d4 100644 --- a/app/components/forms/admin/settings/microservices-form.js +++ b/app/components/forms/admin/settings/microservices-form.js @@ -16,7 +16,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : protocolLessValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid URL for Android app') + prompt : this.l10n.t('Please enter a valid URL for Android app') } ] }, @@ -28,7 +28,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : protocolLessValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid URL for web app') + prompt : this.l10n.t('Please enter a valid URL for web app') } ] } diff --git a/app/components/forms/admin/settings/payment-gateway-form.js b/app/components/forms/admin/settings/payment-gateway-form.js index e1abd9ff52b..0d981a2d27f 100644 --- a/app/components/forms/admin/settings/payment-gateway-form.js +++ b/app/components/forms/admin/settings/payment-gateway-form.js @@ -14,7 +14,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the client ID') + prompt : this.l10n.t('Please enter the client ID') } ] }, @@ -24,7 +24,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the secret key') + prompt : this.l10n.t('Please enter the secret key') } ] }, @@ -34,7 +34,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the publishable key') + prompt : this.l10n.t('Please enter the publishable key') } ] }, @@ -44,7 +44,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the sandbox client id') + prompt : this.l10n.t('Please enter the sandbox client id') } ] }, @@ -54,7 +54,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the sandbox secret token') + prompt : this.l10n.t('Please enter the sandbox secret token') } ] }, @@ -64,7 +64,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the live client token') + prompt : this.l10n.t('Please enter the live client token') } ] }, @@ -74,7 +74,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the live secret token') + prompt : this.l10n.t('Please enter the live secret token') } ] }, @@ -84,7 +84,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the public test key') + prompt : this.l10n.t('Please enter the public test key') } ] }, @@ -94,7 +94,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the secret test key') + prompt : this.l10n.t('Please enter the secret test key') } ] }, @@ -104,7 +104,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the public live key') + prompt : this.l10n.t('Please enter the public live key') } ] }, @@ -114,7 +114,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the secret live key') + prompt : this.l10n.t('Please enter the secret live key') } ] } @@ -137,23 +137,23 @@ export default Component.extend(FormMixin, { actions: { submit() { this.onValid(() => { - if (this.get('isCheckedStripe') === false) { - this.get('settings').setProperties({ + if (this.isCheckedStripe === false) { + this.settings.setProperties({ 'stripeClientId' : null, 'stripeSecretKey' : null, 'stripePublishableKey' : null }); } - if (this.get('isCheckedPaypal') === false) { - this.get('settings').setProperties({ + if (this.isCheckedPaypal === false) { + this.settings.setProperties({ 'paypalSandboxClient' : null, 'paypalSandboxSecret' : null, 'paypalSecret' : null, 'paypalClient' : null }); } - if (this.get('isCheckedOmise') === false) { - this.get('settings').setProperties({ + if (this.isCheckedOmise === false) { + this.settings.setProperties({ 'omiseTestPublic' : null, 'omiseTestSecret' : null, 'omiseLivePublic' : null, diff --git a/app/components/forms/admin/settings/system-form.js b/app/components/forms/admin/settings/system-form.js index b70f81bac88..e61ed3297d8 100644 --- a/app/components/forms/admin/settings/system-form.js +++ b/app/components/forms/admin/settings/system-form.js @@ -14,7 +14,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the App name') + prompt : this.l10n.t('Please enter the App name') } ] }, @@ -24,7 +24,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a tag line') + prompt : this.l10n.t('Please enter a tag line') } ] }, @@ -34,7 +34,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the Bucket name') + prompt : this.l10n.t('Please enter the Bucket name') } ] }, @@ -44,7 +44,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the access key') + prompt : this.l10n.t('Please enter the access key') } ] }, @@ -54,7 +54,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the access secret') + prompt : this.l10n.t('Please enter the access secret') } ] }, @@ -64,7 +64,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please select a region') + prompt : this.l10n.t('Please select a region') } ] }, @@ -74,7 +74,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the Bucket name') + prompt : this.l10n.t('Please enter the Bucket name') } ] }, @@ -84,7 +84,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the key') + prompt : this.l10n.t('Please enter the key') } ] }, @@ -94,7 +94,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the secret') + prompt : this.l10n.t('Please enter the secret') } ] }, @@ -104,11 +104,11 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the from email') + prompt : this.l10n.t('Please enter the from email') }, { type : 'email', - prompt : this.get('l10n').t('Please enter a valid email address') + prompt : this.l10n.t('Please enter a valid email address') } ] }, @@ -118,7 +118,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter name for from email') + prompt : this.l10n.t('Please enter name for from email') } ] }, @@ -128,12 +128,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the Frontend Url') + prompt : this.l10n.t('Please enter the Frontend Url') }, { type : 'regExp', value : protocolLessValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid URL for Frontend') + prompt : this.l10n.t('Please enter a valid URL for Frontend') } ] }, @@ -143,7 +143,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the SMTP host') + prompt : this.l10n.t('Please enter the SMTP host') } ] }, @@ -153,11 +153,11 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the SMTP port number') + prompt : this.l10n.t('Please enter the SMTP port number') }, { type : 'integer', - prompt : this.get('l10n').t('Please enter a valid port number') + prompt : this.l10n.t('Please enter a valid port number') } ] }, @@ -167,7 +167,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the token for Sendgrid') + prompt : this.l10n.t('Please enter the token for Sendgrid') } ] }, @@ -177,11 +177,11 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the application secret key') + prompt : this.l10n.t('Please enter the application secret key') }, { type : 'minLength[16]', - prompt : this.get('l10n').t('Your application secret key must have at least {ruleValue} characters') + prompt : this.l10n.t('Your application secret key must have at least {ruleValue} characters') } ] } diff --git a/app/components/forms/admin/settings/system/storage-option.js b/app/components/forms/admin/settings/system/storage-option.js index 90276f8c0cc..f1f2bd71710 100644 --- a/app/components/forms/admin/settings/system/storage-option.js +++ b/app/components/forms/admin/settings/system/storage-option.js @@ -1,7 +1,7 @@ import Component from '@ember/component'; import { computed } from '@ember/object'; import { amazonS3Regions } from 'open-event-frontend/utils/dictionary/amazon-s3-regions'; -import { orderBy } from 'lodash'; +import { orderBy } from 'lodash-es'; export default Component.extend({ regions: computed(function() { diff --git a/app/components/forms/admin/settings/ticket-fees-form.js b/app/components/forms/admin/settings/ticket-fees-form.js index 01401cf593c..60168ab701f 100644 --- a/app/components/forms/admin/settings/ticket-fees-form.js +++ b/app/components/forms/admin/settings/ticket-fees-form.js @@ -2,7 +2,7 @@ import Component from '@ember/component'; import { computed } from '@ember/object'; import { countries } from 'open-event-frontend/utils/dictionary/demography'; import { paymentCountries, paymentCurrencies } from 'open-event-frontend/utils/dictionary/payment'; -import { orderBy, filter } from 'lodash'; +import { orderBy, filter } from 'lodash-es'; export default Component.extend({ @@ -16,15 +16,15 @@ export default Component.extend({ actions: { addNewTicket() { - let settings = this.get('model'); + let settings = this.model; let incorrect_settings = settings.filter(function(setting) { return (!setting.get('currency') || !setting.get('country')); }); if (incorrect_settings.length > 0) { - this.notify.error(this.get('l10n').t('Existing items need to be completed before new items can be added.')); + this.notify.error(this.l10n.t('Existing items need to be completed before new items can be added.')); this.set('isLoading', false); } else { - this.get('model').toArray().addObject(this.store.createRecord('ticket-fee', { + this.model.toArray().addObject(this.store.createRecord('ticket-fee', { maximumFee : 0.0, serviceFee : 0.0 })); @@ -34,10 +34,10 @@ export default Component.extend({ this.set('isLoading', true); rec.destroyRecord() .then(() => { - this.get('notify').success(this.get('l10n').t('Fee setting deleted successfully')); + this.notify.success(this.l10n.t('Fee setting deleted successfully')); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/components/forms/events/view/create-access-code.js b/app/components/forms/events/view/create-access-code.js index 2fda283bf08..2ddd37f4435 100644 --- a/app/components/forms/events/view/create-access-code.js +++ b/app/components/forms/events/view/create-access-code.js @@ -23,7 +23,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter access code') + prompt : this.l10n.t('Please enter access code') }, { type : 'regExp', @@ -36,11 +36,11 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter number of tickets') + prompt : this.l10n.t('Please enter number of tickets') }, { type : 'number', - prompt : this.get('l10n').t('Please enter proper number of tickets') + prompt : this.l10n.t('Please enter proper number of tickets') } ] }, @@ -50,11 +50,11 @@ export default Component.extend(FormMixin, { rules : [ { type : 'number', - prompt : this.get('l10n').t('Please enter the proper number') + prompt : this.l10n.t('Please enter the proper number') }, { type : 'checkMaxMin', - prompt : this.get('l10n').t('Minimum value should not be greater than maximum') + prompt : this.l10n.t('Minimum value should not be greater than maximum') } ] }, @@ -64,15 +64,15 @@ export default Component.extend(FormMixin, { rules : [ { type : 'number', - prompt : this.get('l10n').t('Please enter the proper number') + prompt : this.l10n.t('Please enter the proper number') }, { type : 'checkMaxMin', - prompt : this.get('l10n').t('Maximum value should not be less than minimum') + prompt : this.l10n.t('Maximum value should not be less than minimum') }, { type : 'checkMaxTotal', - prompt : this.get('l10n').t('Maximum value should not be greater than number of tickets') + prompt : this.l10n.t('Maximum value should not be greater than number of tickets') } ] }, @@ -82,7 +82,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'date', - prompt : this.get('l10n').t('Please enter the proper date') + prompt : this.l10n.t('Please enter the proper date') } ] }, @@ -92,7 +92,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'date', - prompt : this.get('l10n').t('Please enter the proper date') + prompt : this.l10n.t('Please enter the proper date') } ] } @@ -103,7 +103,7 @@ export default Component.extend(FormMixin, { accessLink : computed('data.code', function() { const params = this.get('router._router.currentState.routerJsState.params'); const origin = this.get('fastboot.isFastBoot') ? `${this.get('fastboot.request.protocol')}//${this.get('fastboot.request.host')}` : location.origin; - let link = origin + this.get('router').urlFor('public', params['events.view'].event_id, { queryParams: { access_code: this.get('data.code') } }); + let link = origin + this.router.urlFor('public', params['events.view'].event_id, { queryParams: { access_code: this.get('data.code') } }); this.set('data.accessUrl', link); return link; }), diff --git a/app/components/forms/events/view/create-discount-code.js b/app/components/forms/events/view/create-discount-code.js index f0e385eca28..b3d8c1495bc 100644 --- a/app/components/forms/events/view/create-discount-code.js +++ b/app/components/forms/events/view/create-discount-code.js @@ -33,7 +33,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a discount code') + prompt : this.l10n.t('Please enter a discount code') }, { type : 'regExp', @@ -46,7 +46,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the number of tickets') + prompt : this.l10n.t('Please enter the number of tickets') } ] }, @@ -55,7 +55,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the discount amount') + prompt : this.l10n.t('Please enter the discount amount') } ] }, @@ -64,7 +64,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the discount percentage') + prompt : this.l10n.t('Please enter the discount percentage') } ] }, @@ -74,11 +74,11 @@ export default Component.extend(FormMixin, { rules : [ { type : 'integer', - prompt : this.get('l10n').t('Please enter a valid integer') + prompt : this.l10n.t('Please enter a valid integer') }, { type : 'checkMaxMin', - prompt : this.get('l10n').t('Minimum value should not be greater than maximum') + prompt : this.l10n.t('Minimum value should not be greater than maximum') } ] }, @@ -88,15 +88,15 @@ export default Component.extend(FormMixin, { rules : [ { type : 'integer', - prompt : this.get('l10n').t('Please enter a valid integer') + prompt : this.l10n.t('Please enter a valid integer') }, { type : 'checkMaxMin', - prompt : this.get('l10n').t('Maximum value should not be less than minimum') + prompt : this.l10n.t('Maximum value should not be less than minimum') }, { type : 'checkMaxTotal', - prompt : this.get('l10n').t('Maximum value should not be greater than number of tickets') + prompt : this.l10n.t('Maximum value should not be greater than number of tickets') } ] }, @@ -105,7 +105,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'checkTicketSelected', - prompt : this.get('l10n').t('Please select atleast 1 ticket.') + prompt : this.l10n.t('Please select atleast 1 ticket.') } ] } @@ -115,7 +115,7 @@ export default Component.extend(FormMixin, { discountLink: computed('data.code', function() { const params = this.get('router._router.currentState.routerJsState.params'); const origin = this.get('fastboot.isFastBoot') ? `${this.get('fastboot.request.protocol')}//${this.get('fastboot.request.host')}` : location.origin; - let link = origin + this.get('router').urlFor('public', params['events.view'].event_id, { queryParams: { code: this.get('data.code') } }); + let link = origin + this.router.urlFor('public', params['events.view'].event_id, { queryParams: { code: this.get('data.code') } }); this.set('data.discountUrl', link); return link; }), diff --git a/app/components/forms/events/view/order-form.js b/app/components/forms/events/view/order-form.js index c7ddb0421c5..021640ba701 100644 --- a/app/components/forms/events/view/order-form.js +++ b/app/components/forms/events/view/order-form.js @@ -13,7 +13,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'integer[1..60]', - prompt : this.get('l10n').t('Please enter a valid registration time limit between 1 to 60 minutes.') + prompt : this.l10n.t('Please enter a valid registration time limit between 1 to 60 minutes.') } ] } diff --git a/app/components/forms/login-form.js b/app/components/forms/login-form.js index f2af806d9b1..0c645b2c51f 100644 --- a/app/components/forms/login-form.js +++ b/app/components/forms/login-form.js @@ -19,11 +19,11 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your email ID') + prompt : this.l10n.t('Please enter your email ID') }, { type : 'email', - prompt : this.get('l10n').t('Please enter a valid email ID') + prompt : this.l10n.t('Please enter a valid email ID') } ] }, @@ -32,7 +32,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your password') + prompt : this.l10n.t('Please enter your password') } ] } @@ -49,22 +49,22 @@ export default Component.extend(FormMixin, { this.set('errorMessage', null); this.set('isLoading', true); - this.get('session') + this.session .authenticate(authenticator, credentials) .then(async() => { - const tokenPayload = this.get('authManager').getTokenPayload(); + const tokenPayload = this.authManager.getTokenPayload(); if (tokenPayload) { - this.get('authManager').persistCurrentUser( - await this.get('store').findRecord('user', tokenPayload.identity) + this.authManager.persistCurrentUser( + await this.store.findRecord('user', tokenPayload.identity) ); } }) .catch(reason => { - if (!(this.get('isDestroyed') || this.get('isDestroying'))) { + if (!(this.isDestroyed || this.isDestroying)) { if (reason && reason.hasOwnProperty('status_code') && reason.status_code === 401) { - this.set('errorMessage', this.get('l10n').t('Your credentials were incorrect.')); + this.set('errorMessage', this.l10n.t('Your credentials were incorrect.')); } else { - this.set('errorMessage', this.get('l10n').t('An unexpected error occurred.')); + this.set('errorMessage', this.l10n.t('An unexpected error occurred.')); } this.set('isLoading', false); } else { @@ -72,7 +72,7 @@ export default Component.extend(FormMixin, { } }) .finally(() => { - if (!(this.get('isDestroyed') || this.get('isDestroying'))) { + if (!(this.isDestroyed || this.isDestroying)) { this.set('password', ''); } }); @@ -82,13 +82,13 @@ export default Component.extend(FormMixin, { async auth(provider) { try { if (provider === 'facebook') { - this.get('loader').load('/auth/oauth/facebook') + this.loader.load('/auth/oauth/facebook') .then(async response => { window.location.replace(response.url); }); } } catch (error) { - this.get('notify').error(this.get('l10n').t(error.message)); + this.notify.error(this.l10n.t(error.message)); } }, diff --git a/app/components/forms/orders/attendee-list.js b/app/components/forms/orders/attendee-list.js index efe86ab32c6..91cbb973aab 100644 --- a/app/components/forms/orders/attendee-list.js +++ b/app/components/forms/orders/attendee-list.js @@ -1,6 +1,6 @@ import Component from '@ember/component'; import { computed } from '@ember/object'; -import { groupBy } from 'lodash'; +import { groupBy } from 'lodash-es'; export default Component.extend({ buyer: computed('data.user', function() { @@ -16,6 +16,6 @@ export default Component.extend({ return true; }), allFields: computed('fields', function() { - return groupBy(this.get('fields').toArray(), field => field.get('form')); + return groupBy(this.fields.toArray(), field => field.get('form')); }) }); diff --git a/app/components/forms/orders/guest-order-form.js b/app/components/forms/orders/guest-order-form.js index 21879b20c03..0d7caf0057f 100644 --- a/app/components/forms/orders/guest-order-form.js +++ b/app/components/forms/orders/guest-order-form.js @@ -15,11 +15,11 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your email ID') + prompt : this.l10n.t('Please enter your email ID') }, { type : 'email', - prompt : this.get('l10n').t('Please enter a valid email ID') + prompt : this.l10n.t('Please enter a valid email ID') } ] }, @@ -28,7 +28,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your password') + prompt : this.l10n.t('Please enter your password') } ] } @@ -38,7 +38,7 @@ export default Component.extend(FormMixin, { actions: { submit() { this.onValid(() => { - if (this.get('userExists')) { + if (this.userExists) { this.loginExistingUser(this.email, this.password); } else { this.createNewUserViaEmail(this.email); diff --git a/app/components/forms/orders/order-form.js b/app/components/forms/orders/order-form.js index 951d6b4bb4d..62525284ebf 100644 --- a/app/components/forms/orders/order-form.js +++ b/app/components/forms/orders/order-form.js @@ -5,7 +5,7 @@ import { inject as service } from '@ember/service'; import FormMixin from 'open-event-frontend/mixins/form'; import moment from 'moment'; import { countries } from 'open-event-frontend/utils/dictionary/demography'; -import { groupBy, orderBy } from 'lodash'; +import { groupBy, orderBy } from 'lodash-es'; import { compulsoryProtocolValidUrlPattern, validTwitterProfileUrlPattern, validFacebookProfileUrlPattern, validGithubProfileUrlPattern @@ -35,7 +35,7 @@ export default Component.extend(FormMixin, { }), isPaidOrder: computed('data', function() { if (!this.get('data.amount')) { - this.get('data').set('paymentMode', 'free'); + this.data.set('paymentMode', 'free'); return false; } return true; @@ -56,8 +56,8 @@ export default Component.extend(FormMixin, { if (diff > 0) { this.timer(willExpireAt, orderIdentifier); } else { - this.get('data').reload(); - this.get('router').transitionTo('orders.expired', orderIdentifier); + this.data.reload(); + this.router.transitionTo('orders.expired', orderIdentifier); } }, 1000); }, @@ -67,7 +67,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your first name') + prompt : this.l10n.t('Please enter your first name') } ] }; @@ -75,7 +75,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your last name') + prompt : this.l10n.t('Please enter your last name') } ] }; @@ -83,11 +83,11 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your email') + prompt : this.l10n.t('Please enter your email') }, { type : 'email', - prompt : this.get('l10n').t('Please enter a valid email') + prompt : this.l10n.t('Please enter a valid email') } ] }; @@ -96,7 +96,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please select a gender') + prompt : this.l10n.t('Please select a gender') } ] }; @@ -105,7 +105,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your address') + prompt : this.l10n.t('Please enter your address') } ] }; @@ -114,7 +114,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your city') + prompt : this.l10n.t('Please enter your city') } ] }; @@ -123,7 +123,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your state') + prompt : this.l10n.t('Please enter your state') } ] }; @@ -132,7 +132,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your country') + prompt : this.l10n.t('Please enter your country') } ] }; @@ -141,7 +141,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your job title') + prompt : this.l10n.t('Please enter your job title') } ] }; @@ -150,7 +150,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a mobile number') + prompt : this.l10n.t('Please enter a mobile number') } ] }; @@ -159,7 +159,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your tax business info') + prompt : this.l10n.t('Please enter your tax business info') } ] }; @@ -168,7 +168,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your billing address') + prompt : this.l10n.t('Please enter your billing address') } ] }; @@ -177,7 +177,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your home address') + prompt : this.l10n.t('Please enter your home address') } ] }; @@ -186,7 +186,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your shipping address') + prompt : this.l10n.t('Please enter your shipping address') } ] }; @@ -195,7 +195,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your company') + prompt : this.l10n.t('Please enter your company') } ] }; @@ -204,7 +204,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your work address') + prompt : this.l10n.t('Please enter your work address') } ] }; @@ -213,7 +213,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your work phone') + prompt : this.l10n.t('Please enter your work phone') } ] }; @@ -224,7 +224,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : compulsoryProtocolValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }; @@ -233,12 +233,12 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter url of website') + prompt : this.l10n.t('Please enter url of website') }, { type : 'regExp', value : compulsoryProtocolValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }; @@ -249,7 +249,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : compulsoryProtocolValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }; @@ -258,12 +258,12 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter url of website') + prompt : this.l10n.t('Please enter url of website') }, { type : 'regExp', value : compulsoryProtocolValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }; @@ -274,7 +274,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : validTwitterProfileUrlPattern, - prompt : this.get('l10n').t('Please enter a valid twitter profile url') + prompt : this.l10n.t('Please enter a valid twitter profile url') } ] }; @@ -283,12 +283,12 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter twitter link') + prompt : this.l10n.t('Please enter twitter link') }, { type : 'regExp', value : validTwitterProfileUrlPattern, - prompt : this.get('l10n').t('Please enter a valid twitter profile url') + prompt : this.l10n.t('Please enter a valid twitter profile url') } ] }; @@ -299,7 +299,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : validFacebookProfileUrlPattern, - prompt : this.get('l10n').t('Please enter a valid facebook account url') + prompt : this.l10n.t('Please enter a valid facebook account url') } ] }; @@ -308,12 +308,12 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter facebook link') + prompt : this.l10n.t('Please enter facebook link') }, { type : 'regExp', value : validFacebookProfileUrlPattern, - prompt : this.get('l10n').t('Please enter a valid facebook account url') + prompt : this.l10n.t('Please enter a valid facebook account url') } ] }; @@ -324,7 +324,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : validGithubProfileUrlPattern, - prompt : this.get('l10n').t('Please enter a valid GitHub profile url') + prompt : this.l10n.t('Please enter a valid GitHub profile url') } ] }; @@ -333,12 +333,12 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please enter GitHub link') + prompt : this.l10n.t('Please enter GitHub link') }, { type : 'regExp', value : validGithubProfileUrlPattern, - prompt : this.get('l10n').t('Please enter a valid GitHub profile url') + prompt : this.l10n.t('Please enter a valid GitHub profile url') } ] }; @@ -353,7 +353,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your first name') + prompt : this.l10n.t('Please enter your first name') } ] }, @@ -362,7 +362,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your last name') + prompt : this.l10n.t('Please enter your last name') } ] }, @@ -371,7 +371,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'email', - prompt : this.get('l10n').t('Please enter a valid email address') + prompt : this.l10n.t('Please enter a valid email address') } ] }, @@ -380,7 +380,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your country') + prompt : this.l10n.t('Please enter your country') } ] }, @@ -389,7 +389,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your company') + prompt : this.l10n.t('Please enter your company') } ] }, @@ -398,7 +398,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your address') + prompt : this.l10n.t('Please enter your address') } ] }, @@ -407,7 +407,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your city ') + prompt : this.l10n.t('Please enter your city ') } ] }, @@ -416,7 +416,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your zip code') + prompt : this.l10n.t('Please enter your zip code') } ] }, @@ -425,7 +425,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'checked', - prompt : this.get('l10n').t('Please specify your choice of payment method ') + prompt : this.l10n.t('Please specify your choice of payment method ') } ] } @@ -464,7 +464,7 @@ export default Component.extend(FormMixin, { }, allFields: computed('fields', function() { - return groupBy(this.get('fields').toArray(), field => field.get('form')); + return groupBy(this.fields.toArray(), field => field.get('form')); }), countries: computed(function() { @@ -478,11 +478,10 @@ export default Component.extend(FormMixin, { }); }, modifyHolder(holder) { - let buyer = this.get('buyer'); - if (this.get('sameAsBuyer')) { - holder.set('firstname', buyer.content.firstName); - holder.set('lastname', buyer.content.lastName); - holder.set('email', buyer.content.email); + if (this.sameAsBuyer) { + holder.set('firstname', this.buyer.content.firstName); + holder.set('lastname', this.buyer.content.lastName); + holder.set('email', this.buyer.content.email); } else { holder.set('firstname', ''); holder.set('lastname', ''); diff --git a/app/components/forms/register-form.js b/app/components/forms/register-form.js index 3234d72280d..7bb8a8493c1 100644 --- a/app/components/forms/register-form.js +++ b/app/components/forms/register-form.js @@ -18,7 +18,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'email', - prompt : this.get('l10n').t('Please enter a valid email address') + prompt : this.l10n.t('Please enter a valid email address') } ] }, @@ -27,11 +27,11 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a password') + prompt : this.l10n.t('Please enter a password') }, { type : 'minLength[8]', - prompt : this.get('l10n').t('Your password must have at least {ruleValue} characters') + prompt : this.l10n.t('Your password must have at least {ruleValue} characters') } ] }, @@ -40,7 +40,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'match[password]', - prompt : this.get('l10n').t('Passwords do not match') + prompt : this.l10n.t('Passwords do not match') } ] } @@ -48,8 +48,8 @@ export default Component.extend(FormMixin, { }; }, didInsertElement() { - if (this.get('inviteEmail')) { - this.get('data').set('email', this.get('inviteEmail')); + if (this.inviteEmail) { + this.data.set('email', this.inviteEmail); } }, diff --git a/app/components/forms/reset-password-form.js b/app/components/forms/reset-password-form.js index f7304476373..fdb89edf7bc 100644 --- a/app/components/forms/reset-password-form.js +++ b/app/components/forms/reset-password-form.js @@ -19,11 +19,11 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your email ID') + prompt : this.l10n.t('Please enter your email ID') }, { type : 'email', - prompt : this.get('l10n').t('Please enter a valid email ID') + prompt : this.l10n.t('Please enter a valid email ID') } ] }, @@ -33,7 +33,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your new password') + prompt : this.l10n.t('Please enter your new password') } ] } @@ -45,21 +45,21 @@ export default Component.extend(FormMixin, { submit() { this.onValid(() => { let payload = {}; - if (this.get('token')) { + if (this.token) { payload = { 'data': { - 'token' : this.get('token'), - 'password' : this.get('password') + 'token' : this.token, + 'password' : this.password } }; - this.get('loader') + this.loader .patch('auth/reset-password', payload) .then(() => { - this.notify.success(this.get('l10n').t('Your password has been reset successfully. Please log in to continue')); - this.get('router').transitionTo('login'); + this.notify.success(this.l10n.t('Your password has been reset successfully. Please log in to continue')); + this.router.transitionTo('login'); }) .catch(() => { - this.set('errorMessage', this.get('l10n').t('An unexpected error occurred.')); + this.set('errorMessage', this.l10n.t('An unexpected error occurred.')); }) .finally(() => { this.set('isLoading', false); @@ -69,20 +69,20 @@ export default Component.extend(FormMixin, { } else { payload = { 'data': { - 'email': this.get('identification') + 'email': this.identification } }; - this.get('loader') + this.loader .post('auth/reset-password', payload) .then(() => { - this.notify.success(this.get('l10n').t('Please go to the link sent to your email to reset your password')); - this.get('router').transitionTo('login'); + this.notify.success(this.l10n.t('Please go to the link sent to your email to reset your password')); + this.router.transitionTo('login'); }) .catch(reason => { if (reason && reason.hasOwnProperty('errors') && reason.errors[0].status === 404) { - this.set('errorMessage', this.get('l10n').t('No account is registered with this email address.')); + this.set('errorMessage', this.l10n.t('No account is registered with this email address.')); } else { - this.set('errorMessage', this.get('l10n').t('An unexpected error occurred.')); + this.set('errorMessage', this.l10n.t('An unexpected error occurred.')); } }) .finally(() => { diff --git a/app/components/forms/session-speaker-form.js b/app/components/forms/session-speaker-form.js index c1dc0ed1290..4e15d274a6b 100644 --- a/app/components/forms/session-speaker-form.js +++ b/app/components/forms/session-speaker-form.js @@ -1,6 +1,6 @@ import Component from '@ember/component'; import { computed } from '@ember/object'; -import { groupBy, orderBy } from 'lodash'; +import { groupBy, orderBy } from 'lodash-es'; import FormMixin from 'open-event-frontend/mixins/form'; import { compulsoryProtocolValidUrlPattern, protocolLessValidUrlPattern, validTwitterProfileUrlPattern, validFacebookProfileUrlPattern, validGithubProfileUrlPattern, validLinkedinProfileUrlPattern, validPhoneNumber } from 'open-event-frontend/utils/validators'; @@ -25,7 +25,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a title') + prompt : this.l10n.t('Please enter a title') } ] }, @@ -34,7 +34,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a subtitle') + prompt : this.l10n.t('Please enter a subtitle') } ] }, @@ -43,7 +43,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter short abstract') + prompt : this.l10n.t('Please enter short abstract') } ] }, @@ -52,7 +52,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a long abstract') + prompt : this.l10n.t('Please enter a long abstract') } ] }, @@ -61,7 +61,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter comments') + prompt : this.l10n.t('Please enter comments') } ] }, @@ -70,7 +70,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please select a track') + prompt : this.l10n.t('Please select a track') } ] }, @@ -79,7 +79,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please select a session type') + prompt : this.l10n.t('Please select a session type') } ] }, @@ -88,7 +88,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a level') + prompt : this.l10n.t('Please enter a level') } ] }, @@ -97,7 +97,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a language') + prompt : this.l10n.t('Please enter a language') } ] }, @@ -106,12 +106,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a url') + prompt : this.l10n.t('Please enter a url') }, { type : 'regExp', value : compulsoryProtocolValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }, @@ -122,7 +122,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : compulsoryProtocolValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }, @@ -131,12 +131,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a url') + prompt : this.l10n.t('Please enter a url') }, { type : 'regExp', value : compulsoryProtocolValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }, @@ -147,7 +147,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : compulsoryProtocolValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }, @@ -156,12 +156,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a url') + prompt : this.l10n.t('Please enter a url') }, { type : 'regExp', value : compulsoryProtocolValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }, @@ -172,7 +172,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : compulsoryProtocolValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }, @@ -181,7 +181,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a name') + prompt : this.l10n.t('Please enter a name') } ] }, @@ -190,11 +190,11 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter an email') + prompt : this.l10n.t('Please enter an email') }, { type : 'email', - prompt : this.get('l10n').t('Please enter a valid email') + prompt : this.l10n.t('Please enter a valid email') } ] }, @@ -204,11 +204,11 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter an email') + prompt : this.l10n.t('Please enter an email') }, { type : 'email', - prompt : this.get('l10n').t('Please enter a valid email') + prompt : this.l10n.t('Please enter a valid email') } ] }, @@ -217,12 +217,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please select an image') + prompt : this.l10n.t('Please select an image') }, { type : 'regExp', value : compulsoryProtocolValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }, @@ -233,7 +233,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : compulsoryProtocolValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }, @@ -242,7 +242,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter an organisation') + prompt : this.l10n.t('Please enter an organisation') } ] }, @@ -251,7 +251,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a position') + prompt : this.l10n.t('Please enter a position') } ] }, @@ -260,7 +260,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a country') + prompt : this.l10n.t('Please enter a country') } ] }, @@ -269,7 +269,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a city') + prompt : this.l10n.t('Please enter a city') } ] }, @@ -278,7 +278,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter long biography') + prompt : this.l10n.t('Please enter long biography') } ] }, @@ -287,7 +287,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter short biography') + prompt : this.l10n.t('Please enter short biography') } ] }, @@ -296,7 +296,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter speaking experience') + prompt : this.l10n.t('Please enter speaking experience') } ] }, @@ -305,7 +305,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter select sponsorship') + prompt : this.l10n.t('Please enter select sponsorship') } ] }, @@ -314,7 +314,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please select a gender') + prompt : this.l10n.t('Please select a gender') } ] }, @@ -323,7 +323,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter where you heard about the event') + prompt : this.l10n.t('Please enter where you heard about the event') } ] }, @@ -334,7 +334,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : validPhoneNumber, - prompt : this.get('l10n').t('Please enter a valid mobile number.') + prompt : this.l10n.t('Please enter a valid mobile number.') } ] }, @@ -343,12 +343,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a mobile number') + prompt : this.l10n.t('Please enter a mobile number') }, { type : 'regExp', value : validPhoneNumber, - prompt : this.get('l10n').t('Please enter a valid mobile number.') + prompt : this.l10n.t('Please enter a valid mobile number.') } ] }, @@ -357,12 +357,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter url of website') + prompt : this.l10n.t('Please enter url of website') }, { type : 'regExp', value : protocolLessValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }, @@ -373,7 +373,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : protocolLessValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] }, @@ -382,12 +382,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter facebook link') + prompt : this.l10n.t('Please enter facebook link') }, { type : 'regExp', value : validFacebookProfileUrlPattern, - prompt : this.get('l10n').t('Please enter a valid facebook account url') + prompt : this.l10n.t('Please enter a valid facebook account url') } ] }, @@ -398,7 +398,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : validFacebookProfileUrlPattern, - prompt : this.get('l10n').t('Please enter a valid facebook account url') + prompt : this.l10n.t('Please enter a valid facebook account url') } ] }, @@ -407,12 +407,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter twitter link') + prompt : this.l10n.t('Please enter twitter link') }, { type : 'regExp', value : validTwitterProfileUrlPattern, - prompt : this.get('l10n').t('Please enter a valid twitter profile url') + prompt : this.l10n.t('Please enter a valid twitter profile url') } ] }, @@ -423,7 +423,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : validTwitterProfileUrlPattern, - prompt : this.get('l10n').t('Please enter a valid twitter profile url') + prompt : this.l10n.t('Please enter a valid twitter profile url') } ] }, @@ -432,12 +432,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter GitHub link') + prompt : this.l10n.t('Please enter GitHub link') }, { type : 'regExp', value : validGithubProfileUrlPattern, - prompt : this.get('l10n').t('Please enter a valid GitHub profile url') + prompt : this.l10n.t('Please enter a valid GitHub profile url') } ] }, @@ -448,7 +448,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : validGithubProfileUrlPattern, - prompt : this.get('l10n').t('Please enter a valid GitHub profile url') + prompt : this.l10n.t('Please enter a valid GitHub profile url') } ] }, @@ -457,12 +457,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter linkedin link') + prompt : this.l10n.t('Please enter linkedin link') }, { type : 'regExp', value : validLinkedinProfileUrlPattern, - prompt : this.get('l10n').t('Please enter a valid linkedin profile url') + prompt : this.l10n.t('Please enter a valid linkedin profile url') } ] }, @@ -473,7 +473,7 @@ export default Component.extend(FormMixin, { { type : 'regExp', value : validLinkedinProfileUrlPattern, - prompt : this.get('l10n').t('Please enter a valid linkedin profile url') + prompt : this.l10n.t('Please enter a valid linkedin profile url') } ] } @@ -488,21 +488,21 @@ export default Component.extend(FormMixin, { genders: orderBy(genders, 'name'), allFields: computed('fields', function() { - return groupBy(this.get('fields').toArray(), field => field.get('form')); + return groupBy(this.fields.toArray(), field => field.get('form')); }), // Clicking on the add session button creates a blank record which increases the length of the speaker's list by 1. noSpeakerExists: computed('speakers', function() { - return (this.get('speakers').length === 1); + return this.speakers.length === 1; }), // Clicking on the add speaker button creates a blank record which increases the length of the session's list by 1. noSessionExists: computed('sessions', function() { - return (this.get('sessions').length === 1); + return this.sessions.length === 1; }), shouldShowNewSessionDetails: computed('sessionDetails', 'newSessionSelected', function() { - return this.get('newSessionSelected') && !this.get('sessionDetails'); + return this.newSessionSelected && !this.sessionDetails; }), actions: { @@ -519,11 +519,11 @@ export default Component.extend(FormMixin, { } }, didInsertElement() { - if (this.get('isSpeaker') && this.get('data.speaker') && this.get('data.speaker').length) { + if (this.isSpeaker && this.get('data.speaker') && this.get('data.speaker').length) { this.set('data.speaker', this.get('data.speaker').toArray()[0]); } - if (this.get('isSession') && this.get('data.session') && this.get('data.session').length) { + if (this.isSession && this.get('data.session') && this.get('data.session').length) { this.set('data.session', this.get('data.session').toArray()[0]); } } diff --git a/app/components/forms/user-profile-form.js b/app/components/forms/user-profile-form.js index ffaca3248d9..c8a64fbd07a 100644 --- a/app/components/forms/user-profile-form.js +++ b/app/components/forms/user-profile-form.js @@ -15,7 +15,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your name') + prompt : this.l10n.t('Please enter your name') } ] }, @@ -24,7 +24,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your family name') + prompt : this.l10n.t('Please enter your family name') } ] } @@ -36,13 +36,13 @@ export default Component.extend(FormMixin, { submit() { this.onValid(() => { this.set('isLoading', true); - this.get('user').save() + this.user.save() .then(() => { - this.get('notify').success(this.get('l10n').t('Your profile has been updated')); + this.notify.success(this.l10n.t('Your profile has been updated')); }) .catch(() => { this.get('authManager.currentUser').rollbackAttributes(); - this.get('notify').error(this.get('l10n').t('An unexpected error occurred')); + this.notify.error(this.l10n.t('An unexpected error occurred')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/components/forms/wizard/basic-details-step.js b/app/components/forms/wizard/basic-details-step.js index d6daea03f61..8b5735d2ea9 100644 --- a/app/components/forms/wizard/basic-details-step.js +++ b/app/components/forms/wizard/basic-details-step.js @@ -2,13 +2,13 @@ import Component from '@ember/component'; import { later } from '@ember/runloop'; import { observer, computed } from '@ember/object'; import moment from 'moment'; -import { merge } from '@ember/polyfills'; +import { merge } from 'lodash-es'; import { licenses } from 'open-event-frontend/utils/dictionary/licenses'; import { timezones } from 'open-event-frontend/utils/dictionary/date-time'; import { paymentCountries, paymentCurrencies } from 'open-event-frontend/utils/dictionary/payment'; import { countries } from 'open-event-frontend/utils/dictionary/demography'; import FormMixin from 'open-event-frontend/mixins/form'; -import { orderBy, filter, find } from 'lodash'; +import { orderBy, filter, find } from 'lodash-es'; import { inject as service } from '@ember/service'; import EventWizardMixin from 'open-event-frontend/mixins/event-wizard'; import { protocolLessValidUrlPattern } from 'open-event-frontend/utils/validators'; @@ -63,18 +63,17 @@ export default Component.extend(FormMixin, EventWizardMixin, { * returns the validation rules for the social links. */ socialLinksValidationRules: computed('socialLinks', function() { - const socialLinks = this.get('socialLinks'); let validationRules = {}; - for (let i = 0; i < socialLinks.length; i++) { + for (let i = 0; i < this.socialLinks.length; i++) { validationRules = merge(validationRules, { - [socialLinks.get(i).identifier]: { - identifier : socialLinks.get(i).identifier, + [this.socialLinks.get(i).identifier]: { + identifier : this.socialLinks.get(i).identifier, optional : true, rules : [ { type : 'regExp', value : protocolLessValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] } @@ -112,10 +111,10 @@ export default Component.extend(FormMixin, EventWizardMixin, { }), didInsertElement() { - if (!this.get('isCreate') && this.get('data.event.copyright') && !this.get('data.event.copyright.content')) { + if (!this.isCreate && this.get('data.event.copyright') && !this.get('data.event.copyright.content')) { this.set('data.event.copyright', this.store.createRecord('event-copyright')); } - if (!this.get('isCreate') && this.get('data.event.stripeAuthorization') && !this.get('data.event.stripeAuthorization.content')) { + if (!this.isCreate && this.get('data.event.stripeAuthorization') && !this.get('data.event.stripeAuthorization.content')) { this.set('data.event.stripeAuthorization', this.store.createRecord('stripe-authorization')); } }, @@ -131,7 +130,7 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please give your event a name') + prompt : this.l10n.t('Please give your event a name') } ] }, @@ -140,7 +139,7 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Choose a timezone for your event') + prompt : this.l10n.t('Choose a timezone for your event') } ] }, @@ -149,11 +148,11 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please tell us when your event starts') + prompt : this.l10n.t('Please tell us when your event starts') }, { type : 'date', - prompt : this.get('l10n').t('Please give a valid start date') + prompt : this.l10n.t('Please give a valid start date') } ] }, @@ -162,11 +161,11 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please tell us when your event ends') + prompt : this.l10n.t('Please tell us when your event ends') }, { type : 'date', - prompt : this.get('l10n').t('Please give a valid end date') + prompt : this.l10n.t('Please give a valid end date') } ] }, @@ -176,7 +175,7 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please give a start time') + prompt : this.l10n.t('Please give a start time') } ] }, @@ -186,7 +185,7 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please give an end time') + prompt : this.l10n.t('Please give an end time') } ] }, @@ -195,7 +194,7 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please give your ticket a name') + prompt : this.l10n.t('Please give your ticket a name') } ] }, @@ -205,7 +204,7 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'maxLength[160]', - prompt : this.get('l10n').t('Ticket description shouldn\'t contain more than {ruleValue} characters') + prompt : this.l10n.t('Ticket description shouldn\'t contain more than {ruleValue} characters') } ] }, @@ -214,15 +213,15 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please give your ticket a price') + prompt : this.l10n.t('Please give your ticket a price') }, { type : 'number', - prompt : this.get('l10n').t('Please give a proper price for you ticket') + prompt : this.l10n.t('Please give a proper price for you ticket') }, { type : 'integer[1..]', - prompt : this.get('l10n').t('Ticket price should be greater than 0') + prompt : this.l10n.t('Ticket price should be greater than 0') } ] }, @@ -231,11 +230,11 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please specify how many tickets of this type are available') + prompt : this.l10n.t('Please specify how many tickets of this type are available') }, { type : 'number', - prompt : this.get('l10n').t('Please give a proper quantity for you ticket') + prompt : this.l10n.t('Please give a proper quantity for you ticket') } ] }, @@ -244,11 +243,11 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Minimum tickets per order required') + prompt : this.l10n.t('Minimum tickets per order required') }, { type : 'number', - prompt : this.get('l10n').t('Invalid number') + prompt : this.l10n.t('Invalid number') } ] }, @@ -257,15 +256,15 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Maximum tickets per order required') + prompt : this.l10n.t('Maximum tickets per order required') }, { type : 'number', - prompt : this.get('l10n').t('Invalid number') + prompt : this.l10n.t('Invalid number') }, { type : 'integer[1..]', - prompt : this.get('l10n').t('Maximum tickets per order should be greater than 0') + prompt : this.l10n.t('Maximum tickets per order should be greater than 0') } ] }, @@ -274,11 +273,11 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'email', - prompt : this.get('l10n').t('Please enter a valid email') + prompt : this.l10n.t('Please enter a valid email') }, { type : 'empty', - prompt : this.get('l10n').t('Please fill your paypal email for payment of tickets.') + prompt : this.l10n.t('Please fill your paypal email for payment of tickets.') } ] }, @@ -287,7 +286,7 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please fill the details for payment of tickets.') + prompt : this.l10n.t('Please fill the details for payment of tickets.') } ] }, @@ -296,7 +295,7 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please fill the bank details for payment of tickets.') + prompt : this.l10n.t('Please fill the bank details for payment of tickets.') } ] }, @@ -305,7 +304,7 @@ export default Component.extend(FormMixin, EventWizardMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please fill the cheque details for payment of tickets.') + prompt : this.l10n.t('Please fill the cheque details for payment of tickets.') } ] }, @@ -316,26 +315,26 @@ export default Component.extend(FormMixin, EventWizardMixin, { { type : 'regExp', value : protocolLessValidUrlPattern, - prompt : this.get('l10n').t('Please enter a valid url') + prompt : this.l10n.t('Please enter a valid url') } ] } } }; // Merging the predetermined rules with the rules for social links. - validationRules.fields = merge(validationRules.fields, this.get('socialLinksValidationRules')); + validationRules.fields = merge(validationRules.fields, this.socialLinksValidationRules); return validationRules; }, actions: { connectStripe() { this.get('data.event.stripeAuthorization.content') || this.set('data.event.stripeAuthorization', this.store.createRecord('stripe-authorization')); - this.get('torii').open('stripe') + this.torii.open('stripe') .then(authorization => { this.set('data.event.stripeAuthorization.stripeAuthCode', authorization.authorizationCode); }) .catch(error => { - this.get('notify').error(this.get('l10n').t(`${error.message}. Please try again`)); + this.notify.error(this.l10n.t(`${error.message}. Please try again`)); }); }, disconnectStripe() { @@ -396,7 +395,7 @@ export default Component.extend(FormMixin, EventWizardMixin, { // TODO do proper checks. Simulating now. later(this, () => { if (this.get('data.event.discountCode.code') !== 'AIYPWZQP') { - this.getForm().form('add prompt', 'discount_code', this.get('l10n').t('This discount code is invalid. Please try again.')); + this.getForm().form('add prompt', 'discount_code', this.l10n.t('This discount code is invalid. Please try again.')); } else { this.set('data.event.discountCode.code', 42); this.set('discountCodeDescription', 'Tester special discount'); @@ -418,9 +417,9 @@ export default Component.extend(FormMixin, EventWizardMixin, { }, updateDates() { - const { startsAtDate, endsAtDate, startsAtTime, endsAtTime, timezone } = this.get('data.event').getProperties('startsAtDate', 'endsAtDate', 'startsAtTime', 'endsAtTime', 'timezone'); - var startsAtConcatenated = moment(startsAtDate.concat(' ', startsAtTime)); - var endsAtConcatenated = moment(endsAtDate.concat(' ', endsAtTime)); + const { startsAtDate, endsAtDate, startsAtTime, endsAtTime, timezone } = this.get('data.event'); + let startsAtConcatenated = moment(startsAtDate.concat(' ', startsAtTime)); + let endsAtConcatenated = moment(endsAtDate.concat(' ', endsAtTime)); this.get('data.event').setProperties({ startsAt : moment.tz(startsAtConcatenated, timezone), endsAt : moment.tz(endsAtConcatenated, timezone) diff --git a/app/components/forms/wizard/sessions-speakers-step.js b/app/components/forms/wizard/sessions-speakers-step.js index 06f51f1c03c..073f2b08b8a 100644 --- a/app/components/forms/wizard/sessions-speakers-step.js +++ b/app/components/forms/wizard/sessions-speakers-step.js @@ -2,7 +2,7 @@ import Component from '@ember/component'; import { computed } from '@ember/object'; import FormMixin from 'open-event-frontend/mixins/form'; import EventWizardMixin from 'open-event-frontend/mixins/event-wizard'; -import { groupBy } from 'lodash'; +import { groupBy } from 'lodash-es'; export default Component.extend(EventWizardMixin, FormMixin, { @@ -17,7 +17,7 @@ export default Component.extend(EventWizardMixin, FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter name for session-type') + prompt : this.l10n.t('Please enter name for session-type') } ] }, @@ -26,7 +26,7 @@ export default Component.extend(EventWizardMixin, FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter name for track') + prompt : this.l10n.t('Please enter name for track') } ] }, @@ -35,7 +35,7 @@ export default Component.extend(EventWizardMixin, FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a Private link') + prompt : this.l10n.t('Please enter a Private link') } ] }, @@ -44,7 +44,7 @@ export default Component.extend(EventWizardMixin, FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please select the Privacy') + prompt : this.l10n.t('Please select the Privacy') } ] } diff --git a/app/components/forms/wizard/sponsors-step.js b/app/components/forms/wizard/sponsors-step.js index e84f4850636..07e02f09650 100644 --- a/app/components/forms/wizard/sponsors-step.js +++ b/app/components/forms/wizard/sponsors-step.js @@ -14,7 +14,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please give your sponsor a name') + prompt : this.l10n.t('Please give your sponsor a name') } ] }, @@ -22,7 +22,7 @@ export default Component.extend(FormMixin, { rules: [ { type : 'empty', - prompt : this.get('l10n').t('Please upload sponsor\'s logo.') + prompt : this.l10n.t('Please upload sponsor\'s logo.') } ] } @@ -41,7 +41,7 @@ export default Component.extend(FormMixin, { return (!sponsor.get('name')); }); if (incorrect_sponsors.length > 0) { - this.notify.error(this.get('l10n').t('Please fill the required fields for existing sponsor items')); + this.notify.error(this.l10n.t('Please fill the required fields for existing sponsor items')); this.set('isLoading', false); } else { this.get('data.sponsors').addObject(this.store.createRecord('sponsor')); @@ -57,7 +57,7 @@ export default Component.extend(FormMixin, { return (!sponsor.get('name')); }); if (incorrect_sponsors.length > 0) { - this.notify.error(this.get('l10n').t('Please fill the required fields.')); + this.notify.error(this.l10n.t('Please fill the required fields.')); this.set('isLoading', false); } else { this.set('data.event.state', 'draft'); diff --git a/app/components/modals/add-system-role-modal.js b/app/components/modals/add-system-role-modal.js index daa42264b2a..63d420ffc3b 100644 --- a/app/components/modals/add-system-role-modal.js +++ b/app/components/modals/add-system-role-modal.js @@ -16,7 +16,7 @@ export default ModalBase.extend(FormMixin, { }, close() { if (!this.get('role.id')) { - this.get('role').unloadRecord(); + this.role.unloadRecord(); } this.set('isOpen', false); } @@ -32,7 +32,7 @@ export default ModalBase.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a role name') + prompt : this.l10n.t('Please enter a role name') } ] } diff --git a/app/components/modals/add-user-role-modal.js b/app/components/modals/add-user-role-modal.js index 22546e83592..9fe9ed22cd7 100644 --- a/app/components/modals/add-user-role-modal.js +++ b/app/components/modals/add-user-role-modal.js @@ -12,8 +12,8 @@ export default ModalBase.extend(FormMixin, { }); }, close() { - if (!this.get('currentInvite').get('id')) { - this.get('currentInvite').unloadRecord(); + if (!this.currentInvite.get('id')) { + this.currentInvite.unloadRecord(); } this.set('isOpen', false); } @@ -31,11 +31,11 @@ export default ModalBase.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter an email for user') + prompt : this.l10n.t('Please enter an email for user') }, { type : 'email', - prompt : this.get('l10n').t('Please enter a valid email address for user') + prompt : this.l10n.t('Please enter a valid email address for user') } ] }, @@ -44,7 +44,7 @@ export default ModalBase.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please select a role') + prompt : this.l10n.t('Please select a role') } ] } diff --git a/app/components/modals/admin/content/new-event-sub-topic-modal.js b/app/components/modals/admin/content/new-event-sub-topic-modal.js index f5b0041bffd..23f8e4581ec 100644 --- a/app/components/modals/admin/content/new-event-sub-topic-modal.js +++ b/app/components/modals/admin/content/new-event-sub-topic-modal.js @@ -24,7 +24,7 @@ export default ModalBase.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a sub topic name') + prompt : this.l10n.t('Please enter a sub topic name') } ] } diff --git a/app/components/modals/admin/content/new-event-topic-modal.js b/app/components/modals/admin/content/new-event-topic-modal.js index 15629335c4a..e4c6e9d0a01 100644 --- a/app/components/modals/admin/content/new-event-topic-modal.js +++ b/app/components/modals/admin/content/new-event-topic-modal.js @@ -23,7 +23,7 @@ export default ModalBase.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a topic name') + prompt : this.l10n.t('Please enter a topic name') } ] } diff --git a/app/components/modals/admin/content/new-event-type-modal.js b/app/components/modals/admin/content/new-event-type-modal.js index a405f4cff57..8bb6cf76aea 100644 --- a/app/components/modals/admin/content/new-event-type-modal.js +++ b/app/components/modals/admin/content/new-event-type-modal.js @@ -23,7 +23,7 @@ export default ModalBase.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a event type') + prompt : this.l10n.t('Please enter a event type') } ] } diff --git a/app/components/modals/change-image-modal.js b/app/components/modals/change-image-modal.js index 68ea185025c..4bb306ec924 100644 --- a/app/components/modals/change-image-modal.js +++ b/app/components/modals/change-image-modal.js @@ -4,14 +4,14 @@ export default ModalBase.extend({ isSmall : true, actions : { updatePlaceholder() { - this.get('placeholder').then(placeholder => { + this.placeholder.then(placeholder => { placeholder.save() .then(() => { this.set('isOpen', false); - this.notify.success(this.get('l10n').t('Placeholder has been saved successfully.')); + this.notify.success(this.l10n.t('Placeholder has been saved successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. Placeholder not saved.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. Placeholder not saved.')); }); }); } diff --git a/app/components/modals/cropper-modal.js b/app/components/modals/cropper-modal.js index bb32d448bc4..9ef7604bb4b 100644 --- a/app/components/modals/cropper-modal.js +++ b/app/components/modals/cropper-modal.js @@ -33,7 +33,7 @@ export default ModalBase.extend({ }, cropImage() { this.$('img').croppie('result', 'base64', 'original', 'jpeg').then(result => { - if (this.get('onImageCrop')) { + if (this.onImageCrop) { this.onImageCrop(result); } }); diff --git a/app/components/modals/edit-user-modal.js b/app/components/modals/edit-user-modal.js index 7ae904ffd86..a0c070bca85 100644 --- a/app/components/modals/edit-user-modal.js +++ b/app/components/modals/edit-user-modal.js @@ -3,7 +3,7 @@ import ModalBase from 'open-event-frontend/components/modals/modal-base'; export default ModalBase.extend({ actions: { saveRole(id) { - this.get('store').findRecord('user', id).then(function(user) { + this.store.findRecord('user', id).then(function(user) { user.save(); }); this.set('isOpen', false); diff --git a/app/components/modals/event-delete-modal.js b/app/components/modals/event-delete-modal.js index 135e728f5d2..ee241b3c257 100644 --- a/app/components/modals/event-delete-modal.js +++ b/app/components/modals/event-delete-modal.js @@ -5,6 +5,6 @@ export default ModalBase.extend({ isSmall : true, confirmName : '', isNameDifferent : computed('confirmName', function() { - return this.get('eventName') ? this.get('confirmName').toLowerCase() !== this.get('eventName').toLowerCase() : true; + return this.eventName ? this.confirmName.toLowerCase() !== this.eventName.toLowerCase() : true; }) }); diff --git a/app/components/modals/modal-base.js b/app/components/modals/modal-base.js index d70109147d4..e4b3882b8ad 100644 --- a/app/components/modals/modal-base.js +++ b/app/components/modals/modal-base.js @@ -1,5 +1,6 @@ import { observer } from '@ember/object'; -import { assign, merge } from '@ember/polyfills'; +import { assign } from '@ember/polyfills'; +import { merge } from 'lodash-es'; import UiModal from 'semantic-ui-ember/components/ui-modal'; import { isTesting } from 'open-event-frontend/utils/testing'; @@ -8,7 +9,7 @@ export default UiModal.extend({ classNameBindings : ['isFullScreen:fullscreen', 'isSmall:small', 'isLarge:large'], openObserver: observer('isOpen', function() { - if (this.get('isOpen')) { + if (this.isOpen) { this.$().modal('show'); } else { this.$().modal('hide'); @@ -44,23 +45,23 @@ export default UiModal.extend({ detachable : false, duration : isTesting ? 0 : 200, dimmerSettings : { - dimmerName : `${this.get('elementId')}-modal-dimmer`, + dimmerName : `${this.elementId}-modal-dimmer`, variation : 'inverted' }, onHide: () => { this.set('isOpen', false); - if (this.get('onHide')) { + if (this.onHide) { this.onHide(); } }, onDeny: () => { - if (this.get('onDeny')) { + if (this.onDeny) { this.onDeny(); } return true; }, onApprove: () => { - if (this.get('onApprove')) { + if (this.onApprove) { this.onApprove(); } return true; @@ -72,18 +73,18 @@ export default UiModal.extend({ this.$('[data-content]').popup({ inline: true }); - if (this.get('onVisible')) { + if (this.onVisible) { this.onVisible(); } } }; - const options = this.get('options') ? merge(defaultOptions, this.get('options')) : defaultOptions; + const options = this.options ? merge(defaultOptions, this.options) : defaultOptions; assign(settings, options); }, didInitSemantic() { - if (this.get('isOpen')) { + if (this.isOpen) { this.$().modal('show'); } } diff --git a/app/components/modals/tax-info-modal.js b/app/components/modals/tax-info-modal.js index 5244f0dfe18..51836404ba8 100644 --- a/app/components/modals/tax-info-modal.js +++ b/app/components/modals/tax-info-modal.js @@ -2,7 +2,7 @@ import { computed } from '@ember/object'; import ModalBase from 'open-event-frontend/components/modals/modal-base'; import FormMixin from 'open-event-frontend/mixins/form'; import { countries } from 'open-event-frontend/utils/dictionary/demography'; -import { orderBy } from 'lodash'; +import { orderBy } from 'lodash-es'; export default ModalBase.extend(FormMixin, { isSmall : false, @@ -24,7 +24,7 @@ export default ModalBase.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please give a name') + prompt : this.l10n.t('Please give a name') } ] }, @@ -33,11 +33,11 @@ export default ModalBase.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please tell us your tax rate (in %)') + prompt : this.l10n.t('Please tell us your tax rate (in %)') }, { type : 'number', - prompt : this.get('l10n').t('Please give a valid tax rate') + prompt : this.l10n.t('Please give a valid tax rate') } ] }, @@ -46,7 +46,7 @@ export default ModalBase.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please give us your tax ID') + prompt : this.l10n.t('Please give us your tax ID') } ] }, @@ -56,7 +56,7 @@ export default ModalBase.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please give us your company name') + prompt : this.l10n.t('Please give us your company name') } ] }, @@ -66,7 +66,7 @@ export default ModalBase.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please give us your address') + prompt : this.l10n.t('Please give us your address') } ] }, @@ -76,7 +76,7 @@ export default ModalBase.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please give a city') + prompt : this.l10n.t('Please give a city') } ] }, @@ -86,7 +86,7 @@ export default ModalBase.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please give a state') + prompt : this.l10n.t('Please give a state') } ] }, @@ -96,7 +96,7 @@ export default ModalBase.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please provide a zip code') + prompt : this.l10n.t('Please provide a zip code') } ] } @@ -116,7 +116,7 @@ export default ModalBase.extend(FormMixin, { updateTaxInfo() { this.$('.ui.form').form('validate form'); if (this.$('.ui.form').form('is valid')) { - this.set('tax.isTaxIncludedInPrice', this.get('isTaxIncludedInPrice') === 'include'); + this.set('tax.isTaxIncludedInPrice', this.isTaxIncludedInPrice === 'include'); this.close(); this.set('hasTaxInfo', true); } diff --git a/app/components/modals/user-delete-modal.js b/app/components/modals/user-delete-modal.js index 2b44aacb3dd..847b7e7b422 100644 --- a/app/components/modals/user-delete-modal.js +++ b/app/components/modals/user-delete-modal.js @@ -5,6 +5,6 @@ export default ModalBase.extend({ isSmall : true, confirmEmail : '', isEmailDifferent : computed('confirmEmail', function() { - return this.get('userEmail') ? this.get('confirmEmail') !== this.get('userEmail') : true; + return this.userEmail ? this.confirmEmail !== this.userEmail : true; }) }); diff --git a/app/components/nav-bar.js b/app/components/nav-bar.js index 11e86ba650b..a524307309d 100644 --- a/app/components/nav-bar.js +++ b/app/components/nav-bar.js @@ -3,8 +3,8 @@ import Component from '@ember/component'; export default Component.extend({ actions: { logout() { - this.get('authManager').logout(); - this.get('routing').transitionTo('index'); + this.authManager.logout(); + this.routing.transitionTo('index'); } } }); diff --git a/app/components/notification-dropdown.js b/app/components/notification-dropdown.js index a6af86c0726..b19d0704199 100644 --- a/app/components/notification-dropdown.js +++ b/app/components/notification-dropdown.js @@ -19,10 +19,10 @@ export default Component.extend({ notification.set('isRead', true); notification.save() .then(() => { - this.get('notify').success(this.get('l10n').t('Marked as Read successfully')); + this.notify.success(this.l10n.t('Marked as Read successfully')); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('An unexpected error occurred.')); + this.notify.error(this.l10n.t('An unexpected error occurred.')); }); }, markAllRead() { diff --git a/app/components/orders/order-summary.js b/app/components/orders/order-summary.js index 09bf4f7478f..8e49de6ca82 100644 --- a/app/components/orders/order-summary.js +++ b/app/components/orders/order-summary.js @@ -1,7 +1,7 @@ import Component from '@ember/component'; import { computed } from '@ember/object'; import FormMixin from 'open-event-frontend/mixins/form'; -import { sumBy } from 'lodash'; +import { sumBy } from 'lodash-es'; export default Component.extend(FormMixin, { tickets: computed('data.tickets', function() { diff --git a/app/components/paypal-button.js b/app/components/paypal-button.js index 126d5da8e6a..93704ec1764 100644 --- a/app/components/paypal-button.js +++ b/app/components/paypal-button.js @@ -1,4 +1,4 @@ -import paypal from 'npm:paypal-checkout'; +import paypal from 'paypal-checkout'; import Component from '@ember/component'; import { inject as service } from '@ember/service'; @@ -8,10 +8,7 @@ export default Component.extend({ async didInsertElement() { this._super(...arguments); - let order = this.get('data'); - let loader = this.get('loader'); - let notify = this.get('notify'); - let router = this.get('router'); + let order = this.data; let createPayload = { 'data': { 'attributes': { @@ -33,7 +30,7 @@ export default Component.extend({ }, payment() { - return loader.post(`orders/${order.identifier}/create-paypal-payment`, createPayload) + return this.loader.post(`orders/${order.identifier}/create-paypal-payment`, createPayload) .then(res => { return res.payment_id; }); @@ -55,13 +52,13 @@ export default Component.extend({ skipDataTransform: true }; chargePayload = JSON.stringify(chargePayload); - return loader.post(`orders/${order.identifier}/charge`, chargePayload, config) + return this.loader.post(`orders/${order.identifier}/charge`, chargePayload, config) .then(charge => { if (charge.data.attributes.status) { - notify.success(charge.data.attributes.message); - router.transitionTo('orders.view', order.identifier); + this.notify.success(charge.data.attributes.message); + this.router.transitionTo('orders.view', order.identifier); } else { - notify.error(charge.data.attributes.message); + this.notify.error(charge.data.attributes.message); } }); } diff --git a/app/components/public/social-links.js b/app/components/public/social-links.js index 6c9332ad088..84cae78f0d7 100644 --- a/app/components/public/social-links.js +++ b/app/components/public/social-links.js @@ -8,6 +8,6 @@ export default Component.extend({ socialLinks: A(), twitterLink: computed('socialLinks.[]', function() { - return this.get('socialLinks').findBy('isTwitter', true); + return this.socialLinks.findBy('isTwitter', true); }) }); diff --git a/app/components/public/speaker-item.js b/app/components/public/speaker-item.js index 781a2e98d7f..08adc8fd5b1 100644 --- a/app/components/public/speaker-item.js +++ b/app/components/public/speaker-item.js @@ -4,10 +4,10 @@ import { computed } from '@ember/object'; export default Component.extend({ classNames : ['four wide speaker column'], socialLinks : computed(function() { - return this.get('speaker').getProperties('twitter', 'facebook', 'github', 'linkedin'); + return this.speaker.getProperties('twitter', 'facebook', 'github', 'linkedin'); }), hasSocialLinks: computed(function() { - var currentSpeaker = this.speaker; + let currentSpeaker = this.speaker; return (currentSpeaker.twitter || currentSpeaker.facebook || currentSpeaker.github || currentSpeaker.linkedin || currentSpeaker.shortBiography || currentSpeaker.longBiography || currentSpeaker.speakingExperience); }) }); diff --git a/app/components/public/sponsor-list.js b/app/components/public/sponsor-list.js index be4e6e3f8db..66aa0e2605c 100644 --- a/app/components/public/sponsor-list.js +++ b/app/components/public/sponsor-list.js @@ -1,12 +1,12 @@ import Component from '@ember/component'; import { computed } from '@ember/object'; -import { orderBy, groupBy } from 'lodash'; +import { orderBy, groupBy } from 'lodash-es'; export default Component.extend({ sponsorsGrouped: computed('sponsors.[]', function() { return groupBy( orderBy( - this.get('sponsors').toArray(), + this.sponsors.toArray(), sponsor => sponsor.get('level') ), sponsor => sponsor.get('type') diff --git a/app/components/public/ticket-list.js b/app/components/public/ticket-list.js index 999dae9198b..df596982198 100644 --- a/app/components/public/ticket-list.js +++ b/app/components/public/ticket-list.js @@ -2,7 +2,7 @@ import Component from '@ember/component'; import { computed } from '@ember/object'; import FormMixin from 'open-event-frontend/mixins/form'; import { inject as service } from '@ember/service'; -import { sumBy } from 'lodash'; +import { sumBy } from 'lodash-es'; import { A } from '@ember/array'; export default Component.extend(FormMixin, { @@ -16,7 +16,7 @@ export default Component.extend(FormMixin, { }), shouldDisableOrderButton: computed('isUnverified', 'hasTicketsInOrder', function() { - return !this.get('hasTicketsInOrder'); + return !this.hasTicketsInOrder; }), accessCodeTickets : A(), @@ -25,23 +25,23 @@ export default Component.extend(FormMixin, { invalidPromotionalCode: false, tickets: computed(function() { - return this.get('data').sortBy('position'); + return this.data.sortBy('position'); }), hasTicketsInOrder: computed('tickets.@each.orderQuantity', function() { - return sumBy(this.get('tickets').toArray(), + return sumBy(this.tickets.toArray(), ticket => ticket.getWithDefault('orderQuantity', 0) ) > 0; }), total: computed('tickets.@each.orderQuantity', 'tickets.@each.discount', function() { - return sumBy(this.get('tickets').toArray(), + return sumBy(this.tickets.toArray(), ticket => (ticket.getWithDefault('price', 0) - ticket.getWithDefault('discount', 0)) * ticket.getWithDefault('orderQuantity', 0) ); }), actions: { async togglePromotionalCode(queryParam) { this.toggleProperty('enterPromotionalCode'); - if (this.get('enterPromotionalCode') && !queryParam) { + if (this.enterPromotionalCode && !queryParam) { this.set('promotionalCode', ''); } else { if (queryParam) { @@ -50,59 +50,56 @@ export default Component.extend(FormMixin, { } else { this.set('promotionalCodeApplied', false); this.set('code', null); - let order = this.get('order'); - order.set('accessCode', undefined); - order.set('discountCode', undefined); - this.get('accessCodeTickets').forEach(ticket => { + this.order.set('accessCode', undefined); + this.order.set('discountCode', undefined); + this.accessCodeTickets.forEach(ticket => { ticket.set('isHidden', true); - this.get('tickets').removeObject(ticket); + this.tickets.removeObject(ticket); }); - this.get('discountedTickets').forEach(ticket => { + this.discountedTickets.forEach(ticket => { ticket.set('discount', 0); }); - this.get('accessCodeTickets').clear(); - this.get('discountedTickets').clear(); + this.accessCodeTickets.clear(); + this.discountedTickets.clear(); } } }, async applyPromotionalCode() { - let promotionalCode = this.get('promotionalCode'); - let order = this.get('order'); - if (!this.get('code')) { - this.set('code', promotionalCode); + if (!this.code) { + this.set('code', this.promotionalCode); } try { - let accessCode = await this.get('store').findRecord('access-code', promotionalCode, {}); - order.set('accessCode', accessCode); + let accessCode = await this.store.findRecord('access-code', this.promotionalCode, {}); + this.order.set('accessCode', accessCode); let tickets = await accessCode.get('tickets'); tickets.forEach(ticket => { ticket.set('isHidden', false); - this.get('tickets').addObject(ticket); - this.get('accessCodeTickets').addObject(ticket); + this.tickets.addObject(ticket); + this.accessCodeTickets.addObject(ticket); this.set('invalidPromotionalCode', false); }); } catch (e) { this.set('invalidPromotionalCode', true); } try { - let discountCode = await this.get('store').findRecord('discount-code', promotionalCode, { + let discountCode = await this.store.findRecord('discount-code', this.promotionalCode, { include: 'tickets' }); let discountCodeEvent = await discountCode.get('event'); if (this.currentEventIdentifier === discountCodeEvent.identifier) { let discountType = discountCode.get('type'); let discountValue = discountCode.get('value'); - order.set('discountCode', discountCode); + this.order.set('discountCode', discountCode); let tickets = await discountCode.get('tickets'); tickets.forEach(ticket => { let ticketPrice = ticket.get('price'); if (discountType === 'amount') { ticket.set('discount', Math.min(ticketPrice, discountValue)); - this.get('discountedTickets').addObject(ticket); + this.discountedTickets.addObject(ticket); } else { ticket.set('discount', ticketPrice * (discountValue / 100)); - this.get('discountedTickets').addObject(ticket); + this.discountedTickets.addObject(ticket); } this.set('invalidPromotionalCode', false); }); @@ -110,32 +107,31 @@ export default Component.extend(FormMixin, { this.set('invalidPromotionalCode', true); } } catch (e) { - if (this.get('invalidPromotionalCode')) { + if (this.invalidPromotionalCode) { this.set('invalidPromotionalCode', true); } } - if (this.get('invalidPromotionalCode')) { + if (this.invalidPromotionalCode) { this.set('promotionalCodeApplied', false); this.notify.error('This Promotional Code is not valid'); } else { this.set('promotionalCodeApplied', true); this.set('promotionalCode', 'Promotional code applied successfully'); } - order.set('amount', this.get('total')); + this.order.set('amount', this.total); }, updateOrder(ticket, count) { - let order = this.get('order'); ticket.set('orderQuantity', count); - order.set('amount', this.get('total')); - if (!this.get('total')) { - order.set('amount', 0); + this.order.set('amount', this.total); + if (!this.total) { + this.order.set('amount', 0); } if (count > 0) { - order.tickets.addObject(ticket); + this.order.tickets.addObject(ticket); } else { - if (order.tickets.includes(ticket)) { - order.tickets.removeObject(ticket); + if (this.order.tickets.includes(ticket)) { + this.order.tickets.removeObject(ticket); } } }, @@ -143,16 +139,16 @@ export default Component.extend(FormMixin, { handleKeyPress() { if (event.code === 'Enter') { this.send('applyPromotionalCode'); - this.set('code', this.get('promotionalCode')); + this.set('code', this.promotionalCode); } } }, didInsertElement() { - this.get('data').forEach(ticket => { + this.data.forEach(ticket => { ticket.set('discount', 0); }); - if (this.get('code')) { - this.send('togglePromotionalCode', this.get('code')); + if (this.code) { + this.send('togglePromotionalCode', this.code); } }, getValidationRules() { @@ -166,7 +162,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the promotional Code') + prompt : this.l10n.t('Please enter the promotional Code') } ] } diff --git a/app/components/quick-filter.js b/app/components/quick-filter.js index 7e4d976534e..cf1b0d8c3d3 100644 --- a/app/components/quick-filter.js +++ b/app/components/quick-filter.js @@ -11,7 +11,7 @@ export default Component.extend({ let newStartDate = null; let newEndDate = null; - switch (this.get('filterDate')) { + switch (this.filterDate) { case 'all_dates': break; @@ -55,9 +55,9 @@ export default Component.extend({ init() { this._super(...arguments); - this.set('dummyLocation', this.get('location')); - this.set('dummyName', this.get('eventName')); - if (this.get('dummyName') || this.get('dummyLocation')) {this.set('disableClear', false)} + this.set('dummyLocation', this.location); + this.set('dummyName', this.eventName); + if (this.dummyName || this.dummyLocation) {this.set('disableClear', false)} }, actions: { handleKeyPress() { @@ -67,8 +67,8 @@ export default Component.extend({ }, search() { this.setDateFilter(); - this.set('location', this.get('dummyLocation')); - this.set('eventName', this.get('dummyName')); + this.set('location', this.dummyLocation); + this.set('eventName', this.dummyName); this.set('disableClear', false); }, @@ -77,8 +77,8 @@ export default Component.extend({ this.set('dummyName', null); this.set('filterDate', null); this.setDateFilter(); - this.set('location', this.get('dummyLocation')); - this.set('eventName', this.get('dummyName')); + this.set('location', this.dummyLocation); + this.set('eventName', this.dummyName); this.set('disableClear', true); } } diff --git a/app/components/settings/application-section.js b/app/components/settings/application-section.js index 70ddd0fe620..03501919128 100644 --- a/app/components/settings/application-section.js +++ b/app/components/settings/application-section.js @@ -10,9 +10,9 @@ export default Component.extend({ auth(provider) { try { if (provider === 'facebook') { - this.get('torii').open('facebook').then(authData => { + this.torii.open('facebook').then(authData => { this.set('isLoading', true); - this.get('loader').load(`/auth/oauth/login/${ provider }/${ authData.authorizationCode }/?redirect_uri=${ authData.redirectUri}`) + this.loader.load(`/auth/oauth/login/${ provider }/${ authData.authorizationCode }/?redirect_uri=${ authData.redirectUri}`) .then(async response => { let credentials = { 'identification' : response.email, @@ -20,13 +20,13 @@ export default Component.extend({ }; let authenticator = 'authenticator:jwt'; - this.get('session') + this.session .authenticate(authenticator, credentials) .then(async() => { - const tokenPayload = this.get('authManager').getTokenPayload(); + const tokenPayload = this.authManager.getTokenPayload(); if (tokenPayload) { - this.get('authManager').persistCurrentUser( - await this.get('store').findRecord('user', tokenPayload.identity) + this.authManager.persistCurrentUser( + await this.store.findRecord('user', tokenPayload.identity) ); this.set('data', this.get('authManager.currentUser')); } @@ -36,7 +36,7 @@ export default Component.extend({ }); } } catch (error) { - this.get('notify').error(this.get('l10n').t(error.message)); + this.notify.error(this.l10n.t(error.message)); this.set('isLoading', false); } } diff --git a/app/components/settings/contact-info-section.js b/app/components/settings/contact-info-section.js index e72ef630dc0..74a20a8ed8d 100644 --- a/app/components/settings/contact-info-section.js +++ b/app/components/settings/contact-info-section.js @@ -19,11 +19,11 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter your email ID') + prompt : this.l10n.t('Please enter your email ID') }, { type : 'email', - prompt : this.get('l10n').t('Please enter a valid email ID') + prompt : this.l10n.t('Please enter a valid email ID') } ] }, @@ -32,12 +32,12 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a phone number.') + prompt : this.l10n.t('Please enter a phone number.') }, { type : 'regExp', value : validPhoneNumber, - prompt : this.get('l10n').t('Please enter a valid phone number.') + prompt : this.l10n.t('Please enter a valid phone number.') } ] } diff --git a/app/components/settings/danger-zone.js b/app/components/settings/danger-zone.js index 68a7b67fc70..1dbd0e64ff9 100644 --- a/app/components/settings/danger-zone.js +++ b/app/components/settings/danger-zone.js @@ -31,12 +31,12 @@ export default Component.extend({ this.set('isLoading', true); user.destroyRecord() .then(() => { - this.get('authManager').logout(); - this.get('routing').transitionTo('index'); - this.notify.success(this.get('l10n').t('Your account has been deleted successfully.')); + this.authManager.logout(); + this.routing.transitionTo('index'); + this.notify.success(this.l10n.t('Your account has been deleted successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.setProperties({ diff --git a/app/components/settings/email-preferences-section.js b/app/components/settings/email-preferences-section.js index 049b0a8b98e..2af8e230e4a 100644 --- a/app/components/settings/email-preferences-section.js +++ b/app/components/settings/email-preferences-section.js @@ -5,11 +5,11 @@ export default Component.extend({ savePreference(emailPreference) { emailPreference.save() .then(() => { - this.get('notify').success(this.get('l10n').t('Email notifications updated successfully')); + this.notify.success(this.l10n.t('Email notifications updated successfully')); }) .catch(() => { emailPreference.rollbackAttributes(); - this.get('notify').error(this.get('l10n').t('An unexpected error occurred.')); + this.notify.error(this.l10n.t('An unexpected error occurred.')); }); } } diff --git a/app/components/settings/password-section.js b/app/components/settings/password-section.js index 156977e4dfa..a7b842b891c 100644 --- a/app/components/settings/password-section.js +++ b/app/components/settings/password-section.js @@ -13,7 +13,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter the current password') + prompt : this.l10n.t('Please enter the current password') } ] }, @@ -22,11 +22,11 @@ export default Component.extend(FormMixin, { rules : [ { type : 'empty', - prompt : this.get('l10n').t('Please enter a new password') + prompt : this.l10n.t('Please enter a new password') }, { type : 'minLength[8]', - prompt : this.get('l10n').t('Your password must have at least {ruleValue} characters') + prompt : this.l10n.t('Your password must have at least {ruleValue} characters') } ] }, @@ -35,7 +35,7 @@ export default Component.extend(FormMixin, { rules : [ { type : 'match[password_new]', - prompt : this.get('l10n').t('Passwords do not match') + prompt : this.l10n.t('Passwords do not match') } ] } diff --git a/app/components/side-bar.js b/app/components/side-bar.js index 4a4a42c257a..4d8936e5dd4 100644 --- a/app/components/side-bar.js +++ b/app/components/side-bar.js @@ -25,24 +25,24 @@ export default Component.extend({ this.set('$sidebarOpener', this.$('.open.sidebar')); this.set('$sidebarClosers', this.$('.ui.sidebar').find('.item,a,.link,button')); - this.get('$sidebarClosers').push(this.$('.main-container')[0]); + this.$sidebarClosers.push(this.$('.main-container')[0]); - if (this.get('$sidebarOpener')) { - this.get('$sidebarOpener').on('click', this.toggleSidebar.bind(this)); + if (this.$sidebarOpener) { + this.$sidebarOpener.on('click', this.toggleSidebar.bind(this)); } - if (this.get('$sidebarClosers') && this.get('$sidebarClosers').length > 0) { - this.get('$sidebarClosers').on('click', this.hideSidebar.bind(this)); + if (this.$sidebarClosers && this.$sidebarClosers.length > 0) { + this.$sidebarClosers.on('click', this.hideSidebar.bind(this)); } }, willDestroyElement() { this._super(...arguments); - if (this.get('$sidebarOpener')) { - this.get('$sidebarOpener').off('click', this.toggleSidebar.bind(this)); + if (this.$sidebarOpener) { + this.$sidebarOpener.off('click', this.toggleSidebar.bind(this)); } - if (this.get('$sidebarClosers') && this.get('$sidebarClosers').length > 0) { - this.get('$sidebarClosers').off('click', this.hideSidebar.bind(this)); + if (this.$sidebarClosers && this.$sidebarClosers.length > 0) { + this.$sidebarClosers.off('click', this.hideSidebar.bind(this)); } } }); diff --git a/app/components/smart-overflow.js b/app/components/smart-overflow.js index d40605e5568..cdef1b8d258 100644 --- a/app/components/smart-overflow.js +++ b/app/components/smart-overflow.js @@ -4,8 +4,8 @@ export default Component.extend({ classNames: ['smart-overflow'], didInsertElement() { this._super(...arguments); - var $headerSpan = this.$('span'); - var $header = this.$(); + let $headerSpan = this.$('span'); + let $header = this.$(); $header.attr('data-content', $headerSpan.text()); $header.attr('data-variation', 'tiny'); while ($headerSpan.outerHeight() > $header.height()) { @@ -20,8 +20,8 @@ export default Component.extend({ }, willDestroyElement() { this._super(...arguments); - if (this.get('$header')) { - this.get('$header').popup('destroy'); + if (this.$header) { + this.$header.popup('destroy'); } } }); diff --git a/app/components/tabbed-navigation.js b/app/components/tabbed-navigation.js index d7adbbda5ed..83843ed5c1f 100644 --- a/app/components/tabbed-navigation.js +++ b/app/components/tabbed-navigation.js @@ -8,7 +8,7 @@ export default Component.extend({ currentRoute: computed('session.currentRouteName', 'item', function() { const path = this.get('session.currentRouteName'); if (path) { - return this.get('item'); + return this.item; } }), didInsertElement() { diff --git a/app/components/ui-table-server.js b/app/components/ui-table-server.js index da68a92a8a7..d2a5197e3a3 100644 --- a/app/components/ui-table-server.js +++ b/app/components/ui-table-server.js @@ -5,7 +5,7 @@ import { run } from '@ember/runloop'; import { A } from '@ember/array'; import ModelsTable from 'open-event-frontend/components/ui-table'; import layout from 'open-event-frontend/templates/components/ui-table'; -import { merge, kebabCase } from 'lodash'; +import { merge, kebabCase } from 'lodash-es'; import moment from 'moment'; export default ModelsTable.extend({ @@ -39,25 +39,24 @@ export default ModelsTable.extend({ arrangedContent : alias('filteredContent'), arrangedContentLength: computed('router.currentURL', 'filteredContent.meta', function() { - let itemsCountProperty = get(this, 'metaItemsCountProperty'); + let itemsCountProperty = this.metaItemsCountProperty; let meta = get(this, 'filteredContent.meta') || {}; return get(meta, itemsCountProperty) || 0; }), pagesCount: computed('router.currentURL', 'currentPageNumber', 'pageSize', function() { - let itemsCountProperty = get(this, 'metaItemsCountProperty'); - let meta = get(this, 'filteredContent.meta') || {}; + let itemsCountProperty = this.metaItemsCountProperty; + let meta = this.get('filteredContent.meta') || {}; let items = (get(meta, itemsCountProperty)); - let pageSize = get(this, 'pageSize'); let pages = 0; - if (pageSize > items) { + if (this.pageSize > items) { this.$('.pagination').css({ display: 'none' }); } else { this.$('.pagination').removeAttr('style'); - pages = parseInt((items / pageSize)); - if (items % pageSize) { + pages = parseInt((items / this.pageSize)); + if (items % this.pageSize) { pages = pages + 1; } } @@ -65,47 +64,34 @@ export default ModelsTable.extend({ }), gotoForwardEnabled: computed('currentPageNumber', 'pagesCount', function() { - let currentPageNumber = get(this, 'currentPageNumber'); - let pagesCount = get(this, 'pagesCount'); - return currentPageNumber < pagesCount; + return this.currentPageNumber < this.pagesCount; }), gotoBackwardEnabled: computed('currentPageNumber', function() { - let currentPageNumber = get(this, 'currentPageNumber'); - return currentPageNumber > 1; + return this.currentPageNumber > 1; }), lastIndex: computed('router.currentURL', 'pageSize', 'currentPageNumber', 'arrangedContentLength', function() { - let pageMax = get(this, 'pageSize') * get(this, 'currentPageNumber'); - let itemsCount = get(this, 'arrangedContentLength'); + let pageMax = this.pageSize * this.currentPageNumber; + let itemsCount = this.arrangedContentLength; return Math.min(pageMax, itemsCount); }), _loadData() { - let data = get(this, 'data'); - let currentPageNumber = get(this, 'currentPageNumber'); - let pageSize = get(this, 'pageSize'); - let columns = get(this, 'processedColumns'); - let sortProperties = get(this, 'sortProperties'); - let filterString = get(this, 'filterString'); - var query, store, modelName; - - if (!get(data, 'query')) { + let query, store, modelName; + if (!get(this.data, 'query')) { console.warn('You must use https://emberjs.com/api/data/classes/DS.Store.html#method_query for loading data'); - store = get(this, 'store'); - query = merge({}, get(this, 'query')); - modelName = get(this, 'modelName'); - + query = merge({}, this.query); } else { - query = merge({}, get(data, 'query')); - store = get(data, 'store'); - modelName = get(data, 'type.modelName'); + query = merge({}, get(this.data, 'query')); + store = get(this.data, 'store'); + modelName = get(this.data, 'type.modelName'); } query.filter = JSON.parse(query.filter || '[]'); - query[get(this, 'filterQueryParameters.page')] = currentPageNumber; - query[get(this, 'filterQueryParameters.pageSize')] = pageSize; + query[get(this, 'filterQueryParameters.page')] = this.currentPageNumber; + query[get(this, 'filterQueryParameters.pageSize')] = this.pageSize; - let sort = sortProperties && get(sortProperties, 'firstObject'); + let sort = this.sortProperties && get(this.sortProperties, 'firstObject'); if (sort) { let [sortBy, sortDirection] = sort.split(':'); query = this.sortingWrapper(query, sortBy, sortDirection.toUpperCase()); @@ -121,31 +107,32 @@ export default ModelsTable.extend({ // delete query[globalFilter]; // } - let globalFilter = get(this, 'customGlobalFilter'); + let globalFilter = this.customGlobalFilter; if (globalFilter) { - if (filterString) { + if (this.filterString) { query.filter.pushObject({ name : globalFilter, op : 'ilike', - val : `%${filterString}%` + val : `%${this.filterString}%` }); } } else { query.filter.removeObject({ name : globalFilter, op : 'ilike', - val : `%${filterString}%` + val : `%${this.filterString}%` }); } - columns.forEach(column => { + this.processedColumns.forEach(column => { let filter = get(column, 'filterString'); let filterTitle = this.getCustomFilterTitle(column); let filterHeading = this.getFilterHeading(column); let isMomentQuery = false; + let queryParam; if (filterHeading && filterHeading === 'Date') { isMomentQuery = true; - var queryParam = moment(filter); + queryParam = moment(filter); } if (filter && !isMomentQuery) { query.filter.pushObject({ @@ -205,39 +192,35 @@ export default ModelsTable.extend({ actions: { gotoNext() { - if (!get(this, 'gotoForwardEnabled')) { + if (!this.gotoForwardEnabled) { return; } - let pagesCount = get(this, 'pagesCount'); - let currentPageNumber = get(this, 'currentPageNumber'); - if (pagesCount > currentPageNumber) { + if (this.pagesCount > this.currentPageNumber) { this.incrementProperty('currentPageNumber'); } }, gotoPrev() { - if (!get(this, 'gotoBackwardEnabled')) { + if (!this.gotoBackwardEnabled) { return; } - let pagesCount = get(this, 'pagesCount'); - if (pagesCount > 1) { + if (this.pagesCount > 1) { this.decrementProperty('currentPageNumber'); } }, gotoFirst() { - if (!get(this, 'gotoBackwardEnabled')) { + if (!this.gotoBackwardEnabled) { return; } set(this, 'currentPageNumber', 1); }, gotoLast() { - if (!get(this, 'gotoForwardEnabled')) { + if (!this.gotoForwardEnabled) { return; } - let pagesCount = get(this, 'pagesCount'); - set(this, 'currentPageNumber', pagesCount); + this.set('currentPageNumber', this.pagesCount); }, sort(column) { @@ -272,33 +255,30 @@ export default ModelsTable.extend({ didReceiveAttrs() { set(this, 'pageSize', 10); set(this, 'currentPageNumber', 1); - set(this, 'filteredContent', get(this, 'data')); + set(this, 'filteredContent', this.data); }, didInsertElement() { this._super(...arguments); - if (!get(this, 'pageSize')) { - set(this, 'pageSize', 10); + if (!this.pageSize) { + this.set('pageSize', 10); } }, _addPropertyObserver() { - run.debounce(this, this._loadData, get(this, 'debounceDataLoadTime')); + run.debounce(this, this._loadData, this.debounceDataLoadTime); }, willInsertElement() { this._super(...arguments); - - let observedProperties = get(this, 'observedProperties'); - observedProperties.forEach(propertyName => this.addObserver(propertyName, this._addPropertyObserver)); + this.observedProperties.forEach(propertyName => this.addObserver(propertyName, this._addPropertyObserver)); }, willDestroyElement() { this._super(...arguments); this.set('isLoading', false); this.set('isInitialLoad', true); - let observedProperties = get(this, 'observedProperties'); - observedProperties.forEach(propertyName => this.removeObserver(propertyName)); + this.observedProperties.forEach(propertyName => this.removeObserver(propertyName)); } }); diff --git a/app/components/unverified-user-message.js b/app/components/unverified-user-message.js index d6655444d09..e0ac4b751fe 100644 --- a/app/components/unverified-user-message.js +++ b/app/components/unverified-user-message.js @@ -8,7 +8,7 @@ export default Component.extend({ shouldShowMessage: computed('session.isAuthenticated', 'authManager.currentUser.isVerified', 'isMessageVisible', function() { return this.get('session.isAuthenticated') - && this.get('isMessageVisible') + && this.isMessageVisible && !this.get('authManager.currentUser.isVerified'); }), @@ -19,17 +19,17 @@ export default Component.extend({ 'email': this.get('authManager.currentUser.email') } }; - this.get('loader') + this.loader .post('/auth/resend-verification-email', payload) .then(() => { - this.get('notify').success(this.get('l10n').t('Verification mail sent successfully')); + this.notify.success(this.l10n.t('Verification mail sent successfully')); this.set('isMailSent', true); }) .catch(error => { if (error.error) { - this.get('notify').error(this.get('l10n').t(error.error)); + this.notify.error(this.l10n.t(error.error)); } else { - this.get('notify').error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); } }); } diff --git a/app/components/widgets/forms/date-picker.js b/app/components/widgets/forms/date-picker.js index 39ebcc8723a..7d162e37c01 100644 --- a/app/components/widgets/forms/date-picker.js +++ b/app/components/widgets/forms/date-picker.js @@ -1,5 +1,5 @@ import Component from '@ember/component'; -import { merge } from '@ember/polyfills'; +import { merge } from 'lodash-es'; import moment from 'moment'; import { FORM_DATE_FORMAT } from 'open-event-frontend/utils/dictionary/date-time'; @@ -19,16 +19,16 @@ export default Component.extend({ this._super(...arguments); const defaultOptions = { type : 'date', - today : this.get('today'), + today : this.today, formatter : { date: date => { if (!date) {return ''} - return moment(date).format(this.get('format')); + return moment(date).format(this.format); } } }; - switch (this.get('rangePosition')) { + switch (this.rangePosition) { case 'start': defaultOptions.endCalendar = this.$().closest('.fields').find('.ui.calendar.date.picker'); break; @@ -37,13 +37,13 @@ export default Component.extend({ break; } - this.$().calendar(merge(defaultOptions, this.get('options'))); + this.$().calendar(merge(defaultOptions, this.options)); }, actions: { onChange() { - if (this.get('onChange')) { - this.sendAction('onChange', this.get('value')); + if (this.onChange) { + this.sendAction('onChange', this.value); } } } diff --git a/app/components/widgets/forms/file-upload.js b/app/components/widgets/forms/file-upload.js index 1d0126fc057..11e5ab6b440 100644 --- a/app/components/widgets/forms/file-upload.js +++ b/app/components/widgets/forms/file-upload.js @@ -9,24 +9,24 @@ export default Component.extend({ allowDragDrop : true, inputIdGenerated: computed('inputId', function() { - return this.get('inputId') ? this.get('inputId') : v4(); + return this.inputId ? this.inputId : v4(); }), maxSize: computed('maxSizeInKb', function() { - return humanReadableBytes(this.get('maxSizeInKb')); + return humanReadableBytes(this.maxSizeInKb); }), uploadFile() { this.set('needsConfirmation', false); this.set('uploadingFile', true); - this.get('loader') - .uploadFile('/upload/files', this.$(`#${this.get('inputIdGenerated')}`)) + this.loader + .uploadFile('/upload/files', this.$(`#${this.inputIdGenerated}`)) .then(file => { this.set('fileUrl', JSON.parse(file).url); - this.get('notify').success(this.get('l10n').t('File uploaded successfully')); + this.notify.success(this.l10n.t('File uploaded successfully')); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); }) .finally(() => { this.set('uploadingFile', false); @@ -35,7 +35,7 @@ export default Component.extend({ processFiles(files) { if (files && files[0]) { - isFileValid(files[0], this.get('maxSizeInKb'), ['application/pdf', 'application/vnd.ms-powerpoint', 'video/mp4', 'application/vnd.oasis.opendocument.presentation']).then(() => { + isFileValid(files[0], this.maxSizeInKb, ['application/pdf', 'application/vnd.ms-powerpoint', 'video/mp4', 'application/vnd.oasis.opendocument.presentation']).then(() => { const reader = new FileReader(); reader.onload = () => { this.uploadFile(); @@ -45,7 +45,7 @@ export default Component.extend({ this.notify.error(error); }); } else { - this.notify.error(this.get('l10n').t('No FileReader support. Please use a more latest browser')); + this.notify.error(this.l10n.t('No FileReader support. Please use a more latest browser')); } }, @@ -58,7 +58,7 @@ export default Component.extend({ } }, removeSelection() { - if (!this.get('needsConfirmation') || this.get('edit') === true) { + if (!this.needsConfirmation || this.edit === true) { this.set('selectedFile', null); this.set('fileUrl', null); } else { @@ -69,8 +69,8 @@ export default Component.extend({ init() { this._super(...arguments); - this.set('selectedFile', this.get('fileUrl')); - if (this.get('selectedFile')) { + this.set('selectedFile', this.fileUrl); + if (this.selectedFile) { this.set('needsConfirmation', true); } }, diff --git a/app/components/widgets/forms/image-upload.js b/app/components/widgets/forms/image-upload.js index 62045ec9fa5..90b38d37275 100644 --- a/app/components/widgets/forms/image-upload.js +++ b/app/components/widgets/forms/image-upload.js @@ -10,22 +10,22 @@ export default Component.extend({ requiresDivider : false, inputIdGenerated: computed('inputId', function() { - return this.get('inputId') ? this.get('inputId') : v4(); + return this.inputId ? this.inputId : v4(); }), maxSize: computed('maxSizeInKb', function() { - return humanReadableBytes(this.get('maxSizeInKb')); + return humanReadableBytes(this.maxSizeInKb); }), allowReCrop: computed('selectedImage', 'needsCropper', function() { - return this.get('needsCropper') && !this.get('selectedImage').includes('http'); + return this.needsCropper && !this.selectedImage.includes('http'); }), uploadImage(imageData) { this.set('selectedImage', imageData); this.set('needsConfirmation', false); this.set('uploadingImage', true); - this.get('loader') + this.loader .post('/upload/image', { data: imageData }) @@ -45,7 +45,7 @@ export default Component.extend({ const reader = new FileReader(); reader.onload = e => { const untouchedImageData = e.target.result; - if (this.get('needsCropper')) { + if (this.needsCropper) { this.set('imgData', untouchedImageData); this.set('cropperModalIsShown', true); } else { @@ -58,7 +58,7 @@ export default Component.extend({ this.notify.error(error); }); } else { - this.notify.error(this.get('l10n').t('No FileReader support. Please use a more latest browser')); + this.notify.error(this.l10n.t('No FileReader support. Please use a more latest browser')); } }, @@ -75,7 +75,7 @@ export default Component.extend({ }, removeSelection() { - if (!this.get('needsConfirmation')) { + if (!this.needsConfirmation) { this.set('selectedImage', null); this.set('imageUrl', null); } else { @@ -90,8 +90,8 @@ export default Component.extend({ init() { this._super(...arguments); - this.set('selectedImage', this.get('imageUrl')); - if (this.get('selectedImage')) { + this.set('selectedImage', this.imageUrl); + if (this.selectedImage) { this.set('needsConfirmation', true); } }, diff --git a/app/components/widgets/forms/link-input.js b/app/components/widgets/forms/link-input.js index 03e984067ce..50966d07305 100644 --- a/app/components/widgets/forms/link-input.js +++ b/app/components/widgets/forms/link-input.js @@ -18,8 +18,8 @@ export default Component.extend({ }), protocolAddressObserver: observer('protocol', 'address', function() { - let add = this.get('address'); - let proto = this.get('protocol'); + let add = this.address; + let proto = this.protocol; if (add.includes('http://') || add.includes('https://')) { let temp = add.split('://'); proto = temp[0]; @@ -36,7 +36,7 @@ export default Component.extend({ didInsertElement() { this._super(...arguments); - if (this.get('segmentedLink')) { + if (this.segmentedLink) { this.setProperties({ protocol : this.get('segmentedLink.protocol'), address : this.get('segmentedLink.address') diff --git a/app/components/widgets/forms/location-input.js b/app/components/widgets/forms/location-input.js index 0ba19a5a87c..df4ba960be5 100644 --- a/app/components/widgets/forms/location-input.js +++ b/app/components/widgets/forms/location-input.js @@ -1,6 +1,6 @@ import Component from '@ember/component'; import { observer, computed } from '@ember/object'; -import { keys, values } from 'lodash'; +import { keys, values } from 'lodash-es'; export default Component.extend({ @@ -14,18 +14,18 @@ export default Component.extend({ }, combinedAddress: computed('address.{venue,line,city,state,zipCode,country}', function() { - return values(this.get('address')).join(' ').trim(); + return values(this.address).join(' ').trim(); }), placeNameChanger: observer('combinedAddress', function() { - this.set('placeName', this.get('combinedAddress')); + this.set('placeName', this.combinedAddress); }), actions: { showAddressView(show = true) { this.set('addressViewIsShown', show); if (!show) { - keys(this.get('address')).forEach(key => { + keys(this.address).forEach(key => { this.set(`address.${key}`, ''); }); this.setProperties({ diff --git a/app/components/widgets/forms/places-autocomplete.js b/app/components/widgets/forms/places-autocomplete.js index da3eda62c6e..8f40571a4eb 100644 --- a/app/components/widgets/forms/places-autocomplete.js +++ b/app/components/widgets/forms/places-autocomplete.js @@ -24,10 +24,10 @@ export default TextField.extend({ if (this.get('fastboot.isFastboot')) { return; } - let navigator = this.get('navigator') || ((window) ? window.navigator : null); + let navigator = this.navigator || ((window) ? window.navigator : null); if (navigator && navigator.geolocation) { navigator.geolocation.getCurrentPosition(position => { - let google = this.get('google') || window.google; + let google = this.google || window.google; let geolocation = { lat : position.coords.latitude, lng : position.coords.longitude @@ -36,7 +36,7 @@ export default TextField.extend({ center : geolocation, radius : position.coords.accuracy }); - this.get('autocomplete').setBounds(circle.getBounds()); + this.autocomplete.setBounds(circle.getBounds()); }); } }, @@ -48,32 +48,32 @@ export default TextField.extend({ setupComponent() { this.getAutocomplete(); - this.get('autocomplete').addListener('place_changed', () => { + this.autocomplete.addListener('place_changed', () => { run(() => { this.placeChanged() }); }); - if (this.get('withGeoLocate')) { + if (this.withGeoLocate) { this.geolocate(); } }, willDestroy() { - if (isPresent(this.get('autocomplete'))) { - let google = this.get('google') || ((window) ? window.google : null); + if (isPresent(this.autocomplete)) { + let google = this.google || ((window) ? window.google : null); if (google) { - google.maps.event.clearInstanceListeners(this.get('autocomplete')); + google.maps.event.clearInstanceListeners(this.autocomplete); } } }, getAutocomplete() { - if (isEmpty(this.get('autocomplete'))) { + if (isEmpty(this.autocomplete)) { if (document && window) { let [inputElement] = this.$(), - google = this.get('google') || window.google, + google = this.google || window.google, options = { types: this._typesToArray() }; - if (Object.keys(this.get('restrictions')).length > 0) { - options.componentRestrictions = this.get('restrictions'); + if (Object.keys(this.restrictions).length > 0) { + options.componentRestrictions = this.restrictions; } let autocomplete = new google.maps.places.Autocomplete(inputElement, options); this.set('autocomplete', autocomplete); @@ -82,16 +82,16 @@ export default TextField.extend({ }, placeChanged() { - if (this.get('placeChangedCallback')) { - let place = this.get('autocomplete').getPlace(); - this.get('placeChangedCallback')(place); - this.set('value', place[this.get('setValueWithProperty')]); + if (this.placeChangedCallback) { + let place = this.autocomplete.getPlace(); + this.placeChangedCallback(place); + this.set('value', place[this.setValueWithProperty]); } }, _typesToArray() { - if (this.get('types') !== '') { - return this.get('types').split(','); + if (this.types !== '') { + return this.types.split(','); } else { return []; } @@ -99,8 +99,8 @@ export default TextField.extend({ actions: { focusOut() { - if (this.get('focusOutCallback')) { - this.get('focusOutCallback')(); + if (this.focusOutCallback) { + this.focusOutCallback(); } } } diff --git a/app/components/widgets/forms/radio-button.js b/app/components/widgets/forms/radio-button.js index 2616186959d..707aacd6088 100644 --- a/app/components/widgets/forms/radio-button.js +++ b/app/components/widgets/forms/radio-button.js @@ -12,16 +12,16 @@ export default Component.extend({ checked : null, htmlChecked: computed('value', 'checked', function() { - return this.get('value') === this.get('checked'); + return this.value === this.checked; }), change() { - this.set('checked', this.get('value')); + this.set('checked', this.value); }, _setCheckedProp() { if (!this.$()) { return } - this.$().prop('checked', this.get('htmlChecked')); + this.$().prop('checked', this.htmlChecked); }, _updateElementValue: observer('htmlChecked', function() { diff --git a/app/components/widgets/forms/rich-text-editor.js b/app/components/widgets/forms/rich-text-editor.js index e3978806284..672070c05bb 100644 --- a/app/components/widgets/forms/rich-text-editor.js +++ b/app/components/widgets/forms/rich-text-editor.js @@ -33,18 +33,18 @@ export default Component.extend({ }, valueObserver: observer('value', function() { - if (this.get('editor') && this.get('value') !== this.get('_value')) { - this.get('editor').setValue(this.get('value')); + if (this.editor && this.value !== this._value) { + this.editor.setValue(this.value); } }), textareaIdGenerated: computed('textareaId', function() { - return this.get('textareaId') ? this.get('textareaId') : v4(); + return this.textareaId ? this.textareaId : v4(); }), didInsertElement() { this._super(...arguments); - this.set('_value', this.get('value')); + this.set('_value', this.value); this.$('.button') .popup({ inline : true, @@ -53,9 +53,9 @@ export default Component.extend({ // Don't initialize wysihtml5 when app is in testing mode if (!isTesting) { - this.editor = new wysihtml5.Editor(this.$(`#${this.get('textareaIdGenerated')}`)[0], { - toolbar : this.$(`#${this.get('textareaIdGenerated')}-toolbar`)[0], - parserRules : this.get('standardParserRules') + this.editor = new wysihtml5.Editor(this.$(`#${this.textareaIdGenerated}`)[0], { + toolbar : this.$(`#${this.textareaIdGenerated}-toolbar`)[0], + parserRules : this.standardParserRules }); const updateValue = () => { diff --git a/app/components/widgets/forms/time-picker.js b/app/components/widgets/forms/time-picker.js index b6646f22921..59436574888 100644 --- a/app/components/widgets/forms/time-picker.js +++ b/app/components/widgets/forms/time-picker.js @@ -1,5 +1,5 @@ import Component from '@ember/component'; -import { merge } from '@ember/polyfills'; +import { merge } from 'lodash-es'; import moment from 'moment'; import { FORM_TIME_FORMAT } from 'open-event-frontend/utils/dictionary/date-time'; @@ -23,12 +23,12 @@ export default Component.extend({ formatter : { time: date => { if (!date) {return ''} - return moment(date).format(this.get('format')); + return moment(date).format(this.format); } } }; - switch (this.get('rangePosition')) { + switch (this.rangePosition) { case 'start': defaultOptions.endCalendar = this.$().closest('.fields').find('.ui.calendar.time.picker'); break; @@ -37,7 +37,7 @@ export default Component.extend({ break; } - this.$().calendar(merge(defaultOptions, this.get('options'))); + this.$().calendar(merge(defaultOptions, this.options)); } }); diff --git a/app/components/widgets/safe-image.js b/app/components/widgets/safe-image.js index 455e9c14c4f..a2c1694c000 100644 --- a/app/components/widgets/safe-image.js +++ b/app/components/widgets/safe-image.js @@ -9,12 +9,12 @@ export default Component.extend({ fallbackAvatar : '/images/placeholders/avatar.png', didInsertElement() { - if (!this.get('src')) { - this.set('src', this.get('isAvatar') ? this.get('fallbackAvatar') : this.get('fallback')); + if (!this.src) { + this.set('src', this.isAvatar ? this.fallbackAvatar : this.fallback); } this.$().on('error', () => { run(this, () => { - this.set('src', this.get('isAvatar') ? this.get('fallbackAvatar') : this.get('fallback')); + this.set('src', this.isAvatar ? this.fallbackAvatar : this.fallback); }); }); }, diff --git a/app/components/widgets/steps-indicator.js b/app/components/widgets/steps-indicator.js index 9ac78f8e54e..8265b02fcb6 100644 --- a/app/components/widgets/steps-indicator.js +++ b/app/components/widgets/steps-indicator.js @@ -1,6 +1,6 @@ import Component from '@ember/component'; import Object, { observer, computed } from '@ember/object'; -import { map, findIndex } from 'lodash'; +import { map, findIndex } from 'lodash-es'; export default Component.extend({ @@ -9,25 +9,25 @@ export default Component.extend({ currentStep : 1, currentIndex: computed('currentStep', function() { - return this.get('currentStep') - 1; + return this.currentStep - 1; }), currentStepComputed: observer('session.currentRouteName', 'autoSteps', function() { - if (this.get('autoSteps')) { - this.set('currentStep', findIndex(this.get('steps'), ['route', this.get('session.currentRouteName')]) + 1); + if (this.autoSteps) { + this.set('currentStep', findIndex(this.steps, ['route', this.get('session.currentRouteName')]) + 1); } }), processedSteps: computed('steps', 'currentIndex', 'enableAll', function() { - return map(this.get('steps'), (step, index) => { + return map(this.steps, (step, index) => { step = Object.create(step); - if (!this.get('enableAll') && index > this.get('currentIndex')) { + if (!this.enableAll && index > this.currentIndex) { step.set('isDisabled', true); } - if (this.get('disableAll') && index !== this.get('currentIndex')) { + if (this.disableAll && index !== this.currentIndex) { step.set('isDisabled', true); } - if (index < this.get('currentIndex')) { + if (index < this.currentIndex) { step.set('isCompleted', true); } return step; diff --git a/app/components/widgets/twitter-timeline.js b/app/components/widgets/twitter-timeline.js index 71114a2368a..4dc1e96898b 100644 --- a/app/components/widgets/twitter-timeline.js +++ b/app/components/widgets/twitter-timeline.js @@ -3,19 +3,19 @@ import { computed } from '@ember/object'; export default Component.extend({ handle: computed('handleOrProfile', function() { - if (this.get('handleOrProfile') && this.get('handleOrProfile').includes('/')) { - const splitted = this.get('handleOrProfile').trim().split('/'); + if (this.handleOrProfile && this.handleOrProfile.includes('/')) { + const splitted = this.handleOrProfile.trim().split('/'); if (splitted.includes('hashtag')) { return null; } return splitted[splitted.length - 1]; } - return this.get('handleOrProfile'); + return this.handleOrProfile; }), normalizedUrl: computed('handle', function() { - if (this.get('handle')) { - return `https://twitter.com/${this.get('handle')}`; + if (this.handle) { + return `https://twitter.com/${this.handle}`; } return null; }) diff --git a/app/controllers/admin/content/events.js b/app/controllers/admin/content/events.js index eeaa05de844..7536a8c05e3 100644 --- a/app/controllers/admin/content/events.js +++ b/app/controllers/admin/content/events.js @@ -1,5 +1,5 @@ import Controller from '@ember/controller'; -import { camelCase, startCase } from 'lodash'; +import { camelCase, startCase } from 'lodash-es'; export default Controller.extend({ @@ -14,7 +14,7 @@ export default Controller.extend({ this.set('disableEventSubtopic', false); this.set('currentTopicSelected', topic); } catch (e) { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. SubTopics not loaded.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. SubTopics not loaded.')); } finally { this.set('isLoading', false); } @@ -32,10 +32,10 @@ export default Controller.extend({ eventProp.destroyRecord() .then(() => { this.get(`model.${modelName}s`).removeObject(eventProp); - this.notify.success(this.get('l10n').t('This Event Property has been deleted successfully.')); + this.notify.success(this.l10n.t('This Event Property has been deleted successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. Event Type was not deleted.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. Event Type was not deleted.')); }) .finally(() => { this.set('isLoading', false); @@ -47,10 +47,10 @@ export default Controller.extend({ modelInstance.save() .then(() => { this.get(`model.${camelCasedValue}s`).addObject(modelInstance); - this.notify.success(this.get('l10n').t(`${startCase(camelCasedValue)} has been added successfully.`)); + this.notify.success(this.l10n.t(`${startCase(camelCasedValue)} has been added successfully.`)); }) .catch(() => { - this.notify.error(this.get('l10n').t(`An unexpected error has occurred. ${startCase(camelCasedValue)} not saved.`)); + this.notify.error(this.l10n.t(`An unexpected error has occurred. ${startCase(camelCasedValue)} not saved.`)); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/admin/content/index.js b/app/controllers/admin/content/index.js index 91bf63eb519..9eab3c2fc75 100644 --- a/app/controllers/admin/content/index.js +++ b/app/controllers/admin/content/index.js @@ -4,13 +4,13 @@ export default Controller.extend({ actions: { saveSocials() { this.set('isLoading', true); - let settings = this.get('model'); + let settings = this.model; settings.save() .then(() => { - this.notify.success(this.get('l10n').t('Social links have been saved successfully.')); + this.notify.success(this.l10n.t('Social links have been saved successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. Social links not saved.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. Social links not saved.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/admin/content/pages.js b/app/controllers/admin/content/pages.js index 19ef8f4bde1..5837541c278 100644 --- a/app/controllers/admin/content/pages.js +++ b/app/controllers/admin/content/pages.js @@ -10,7 +10,7 @@ export default Controller.extend({ updateCurrentPage(page, type) { if (type === 'create') { this.set('isCreate', true); - this.set('currentForm', this.get('store').createRecord('page')); + this.set('currentForm', this.store.createRecord('page')); } else { this.set('isCreate', false); this.set('currentForm', page); @@ -20,13 +20,13 @@ export default Controller.extend({ savePage(page) { page.save() .then(() => { - if (this.get('isCreate')) { + if (this.isCreate) { this.set('isFormOpen', false); } - this.notify.success(this.get('l10n').t('Page details have been saved successfully.')); + this.notify.success(this.l10n.t('Page details have been saved successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. Page Details not saved.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. Page Details not saved.')); }); } } diff --git a/app/controllers/admin/content/translations.js b/app/controllers/admin/content/translations.js index 686a537a495..615f4057ad4 100644 --- a/app/controllers/admin/content/translations.js +++ b/app/controllers/admin/content/translations.js @@ -6,7 +6,7 @@ export default Controller.extend({ actions: { translationsDownload() { this.set('isLoading', true); - this.get('loader') + this.loader .downloadFile('/admin/content/translations/all') .then(res => { const anchor = document.createElement('a'); @@ -14,11 +14,11 @@ export default Controller.extend({ anchor.href = URL.createObjectURL(new Blob([res], { type: 'octet/stream' })); anchor.download = 'Translations.zip'; anchor.click(); - this.get('notify').success(this.get('l10n').t('Translations Zip generated successfully.')); + this.notify.success(this.l10n.t('Translations Zip generated successfully.')); }) .catch(e => { console.warn(e); - this.get('notify').error(this.get('l10n').t('Unexpected error occurred.')); + this.notify.error(this.l10n.t('Unexpected error occurred.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/admin/events/list.js b/app/controllers/admin/events/list.js index 887721318d4..9e4c3432852 100644 --- a/app/controllers/admin/events/list.js +++ b/app/controllers/admin/events/list.js @@ -85,17 +85,17 @@ export default Controller.extend({ }, deleteEvent() { this.set('isLoading', true); - this.store.findRecord('event', this.get('eventId'), { backgroundReload: false }).then(function(event) { + this.store.findRecord('event', this.eventId, { backgroundReload: false }).then(function(event) { event.destroyRecord(); }) .then(() => { this.set('isLoading', false); - this.notify.success(this.get('l10n').t('Event has been deleted successfully.')); + this.notify.success(this.l10n.t('Event has been deleted successfully.')); this.send('refreshRoute'); }) .catch(() => { this.set('isLoading', false); - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }); this.set('isEventDeleteModalOpen', false); }, @@ -104,11 +104,11 @@ export default Controller.extend({ event.set('deletedAt', null); event.save({ adapterOptions: { getTrashed: true } }) .then(() => { - this.notify.success(this.get('l10n').t('Event has been restored successfully.')); + this.notify.success(this.l10n.t('Event has been restored successfully.')); this.send('refreshRoute'); }) .catch(e => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); console.warn(e); }) .finally(() => { @@ -119,10 +119,10 @@ export default Controller.extend({ event.toggleProperty('isFeatured'); event.save() .then(() => { - this.notify.success(this.get('l10n').t('Event details modified successfully')); + this.notify.success(this.l10n.t('Event details modified successfully')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }); } } diff --git a/app/controllers/admin/messages.js b/app/controllers/admin/messages.js index ee6288e5318..5632970dd54 100644 --- a/app/controllers/admin/messages.js +++ b/app/controllers/admin/messages.js @@ -5,13 +5,13 @@ export default Controller.extend({ actions: { save() { try { - let systemMessages = this.get('model'); + let systemMessages = this.model; systemMessages.forEach(systemMessage => { systemMessage.save(); }); - this.get('notify').success(this.get('l10n').t('Changes have been saved successfully')); + this.notify.success(this.l10n.t('Changes have been saved successfully')); } catch (e) { - this.get('notify').error(this.get('l10n').t(e.errors[0].detail)); + this.notify.error(this.l10n.t(e.errors[0].detail)); } } } diff --git a/app/controllers/admin/modules.js b/app/controllers/admin/modules.js index d757edadc67..c6904d7a3a4 100644 --- a/app/controllers/admin/modules.js +++ b/app/controllers/admin/modules.js @@ -4,13 +4,13 @@ export default Controller.extend({ actions: { submit() { this.set('isLoading', true); - let modules = this.get('model'); + let modules = this.model; modules.save() .then(() => { - this.notify.success(this.get('l10n').t('Settings have been saved successfully.')); + this.notify.success(this.l10n.t('Settings have been saved successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. Settings not saved.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. Settings not saved.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/admin/permissions/event-roles.js b/app/controllers/admin/permissions/event-roles.js index 13be2bb038f..ae55868d545 100644 --- a/app/controllers/admin/permissions/event-roles.js +++ b/app/controllers/admin/permissions/event-roles.js @@ -12,10 +12,10 @@ export default Controller.extend({ this.set('isLoading', true); this.get('model.permissions').save() .then(() => { - this.notify.success(this.get('l10n').t('Admin Event role permissions have been saved successfully.')); + this.notify.success(this.l10n.t('Admin Event role permissions have been saved successfully.')); }) .catch(err => { - this.notify.error(this.get('l10n').t(err)); + this.notify.error(this.l10n.t(err)); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/admin/permissions/system-roles.js b/app/controllers/admin/permissions/system-roles.js index 2e64ac02a63..efd8663212d 100644 --- a/app/controllers/admin/permissions/system-roles.js +++ b/app/controllers/admin/permissions/system-roles.js @@ -30,10 +30,10 @@ export default Controller.extend({ this.set('isLoading', true); role.destroyRecord() .then(() => { - this.notify.success(this.get('l10n').t('System role has been deleted successfully.')); + this.notify.success(this.l10n.t('System role has been deleted successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. System role was not deleted.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. System role was not deleted.')); }) .finally(() => { this.set('isLoading', false); @@ -41,7 +41,7 @@ export default Controller.extend({ }, addSystemRole() { this.set('isLoading', true); - let panels = this.get('panelPermissions'); + let panels = this.panelPermissions; panels.forEach(panel => { if (panel.isChecked) { @@ -51,16 +51,16 @@ export default Controller.extend({ } }); if (!this.get('role.panelPermissions').length) { - this.notify.error(this.get('l10n').t('Please select atleast one panel.')); + this.notify.error(this.l10n.t('Please select atleast one panel.')); this.set('isLoading', false); } else { - this.get('role').save() + this.role.save() .then(() => { this.set('isAddSystemRoleModalOpen', false); - this.notify.success(this.get('l10n').t('System role have been saved successfully.')); + this.notify.success(this.l10n.t('System role have been saved successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. System role not saved.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. System role not saved.')); }) .finally(() => { this.set('isLoading', false); @@ -71,10 +71,10 @@ export default Controller.extend({ this.set('isLoading', true); this.get('model.userPermissions').save() .then(() => { - this.notify.success(this.get('l10n').t('User permissions have been saved successfully.')); + this.notify.success(this.l10n.t('User permissions have been saved successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. User permissions not saved.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. User permissions not saved.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/admin/sales/fees.js b/app/controllers/admin/sales/fees.js index 29f4b7c1d09..645d9e0f088 100644 --- a/app/controllers/admin/sales/fees.js +++ b/app/controllers/admin/sales/fees.js @@ -4,7 +4,7 @@ import { computed } from '@ember/object'; export default Controller.extend({ ticketsTotal: computed(function() { let sum = 0; - this.get('model').forEach(data => { + this.model.forEach(data => { sum += data.ticketCount; }); return sum; @@ -12,7 +12,7 @@ export default Controller.extend({ revenueTotal: computed(function() { let sum = 0; - this.get('model').forEach(data => { + this.model.forEach(data => { sum += data.revenue; }); return sum; diff --git a/app/controllers/admin/sales/marketer.js b/app/controllers/admin/sales/marketer.js index 0eea572f814..ed523c23575 100644 --- a/app/controllers/admin/sales/marketer.js +++ b/app/controllers/admin/sales/marketer.js @@ -4,14 +4,14 @@ import { computed } from '@ember/object'; export default Controller.extend({ salesTotal: computed(function() { let sum = 0; - this.get('model').forEach(data => { + this.model.forEach(data => { sum += data.sales.completed.ticket_count; }); return sum; }), discountsTotal: computed(function() { let sum = 0; - this.get('model').forEach(data => { + this.model.forEach(data => { sum += data.sales.completed.sales_total; }); return sum; diff --git a/app/controllers/admin/sessions/list.js b/app/controllers/admin/sessions/list.js index 9d13042ae1c..67f4ef312c1 100644 --- a/app/controllers/admin/sessions/list.js +++ b/app/controllers/admin/sessions/list.js @@ -52,10 +52,10 @@ export default Controller.extend({ this.set('isLoading', true); session.destroyRecord() .then(() => { - this.notify.success(this.get('l10n').t('Session has been deleted successfully.')); + this.notify.success(this.l10n.t('Session has been deleted successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/admin/settings/analytics.js b/app/controllers/admin/settings/analytics.js index 029fbe77228..71f90573c46 100644 --- a/app/controllers/admin/settings/analytics.js +++ b/app/controllers/admin/settings/analytics.js @@ -4,13 +4,13 @@ export default Controller.extend({ actions: { updateSettings() { this.set('isLoading', true); - let settings = this.get('model'); + let settings = this.model; settings.save() .then(() => { - this.notify.success(this.get('l10n').t('Settings have been saved successfully.')); + this.notify.success(this.l10n.t('Settings have been saved successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. Settings not saved.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. Settings not saved.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/admin/settings/images.js b/app/controllers/admin/settings/images.js index 7abdbd144ae..2aa4a2c26b1 100644 --- a/app/controllers/admin/settings/images.js +++ b/app/controllers/admin/settings/images.js @@ -8,14 +8,14 @@ export default Controller.extend({ .then(() => { this.get('model.speakerImageSize').save() .then(() => { - this.notify.success(this.get('l10n').t('Image sizes have been saved successfully.')); + this.notify.success(this.l10n.t('Image sizes have been saved successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. Image sizes not saved.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. Image sizes not saved.')); }); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. Image sizes not saved.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. Image sizes not saved.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/admin/settings/index.js b/app/controllers/admin/settings/index.js index 029fbe77228..71f90573c46 100644 --- a/app/controllers/admin/settings/index.js +++ b/app/controllers/admin/settings/index.js @@ -4,13 +4,13 @@ export default Controller.extend({ actions: { updateSettings() { this.set('isLoading', true); - let settings = this.get('model'); + let settings = this.model; settings.save() .then(() => { - this.notify.success(this.get('l10n').t('Settings have been saved successfully.')); + this.notify.success(this.l10n.t('Settings have been saved successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. Settings not saved.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. Settings not saved.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/admin/settings/microservices.js b/app/controllers/admin/settings/microservices.js index 029fbe77228..71f90573c46 100644 --- a/app/controllers/admin/settings/microservices.js +++ b/app/controllers/admin/settings/microservices.js @@ -4,13 +4,13 @@ export default Controller.extend({ actions: { updateSettings() { this.set('isLoading', true); - let settings = this.get('model'); + let settings = this.model; settings.save() .then(() => { - this.notify.success(this.get('l10n').t('Settings have been saved successfully.')); + this.notify.success(this.l10n.t('Settings have been saved successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. Settings not saved.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. Settings not saved.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/admin/settings/payment-gateway.js b/app/controllers/admin/settings/payment-gateway.js index 029fbe77228..71f90573c46 100644 --- a/app/controllers/admin/settings/payment-gateway.js +++ b/app/controllers/admin/settings/payment-gateway.js @@ -4,13 +4,13 @@ export default Controller.extend({ actions: { updateSettings() { this.set('isLoading', true); - let settings = this.get('model'); + let settings = this.model; settings.save() .then(() => { - this.notify.success(this.get('l10n').t('Settings have been saved successfully.')); + this.notify.success(this.l10n.t('Settings have been saved successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. Settings not saved.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. Settings not saved.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/admin/settings/ticket-fees.js b/app/controllers/admin/settings/ticket-fees.js index 86b4c2f21cb..a2954cc5c49 100644 --- a/app/controllers/admin/settings/ticket-fees.js +++ b/app/controllers/admin/settings/ticket-fees.js @@ -4,20 +4,20 @@ export default Controller.extend({ actions: { updateSettings() { this.set('isLoading', true); - let settings = this.get('model'); + let settings = this.model; let incorrect_settings = settings.filter(function(setting) { return (!setting.get('currency') || !setting.get('country')); }); if (incorrect_settings.length > 0) { - this.notify.error(this.get('l10n').t('Please fill the required fields.')); + this.notify.error(this.l10n.t('Please fill the required fields.')); this.set('isLoading', false); } else { settings.save() .then(() => { - this.notify.success(this.get('l10n').t('Ticket Fee settings have been saved successfully.')); + this.notify.success(this.l10n.t('Ticket Fee settings have been saved successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred. Settings not saved.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. Settings not saved.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/admin/users/list.js b/app/controllers/admin/users/list.js index 8b9e1366c37..9607cc86a46 100644 --- a/app/controllers/admin/users/list.js +++ b/app/controllers/admin/users/list.js @@ -75,10 +75,10 @@ export default Controller.extend({ this.set('isLoading', true); user.destroyRecord() .then(() => { - this.notify.success(this.get('l10n').t('User has been deleted successfully.')); + this.notify.success(this.l10n.t('User has been deleted successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); @@ -93,11 +93,11 @@ export default Controller.extend({ user.set('deletedAt', null); user.save({ adapterOptions: { getTrashed: true } }) .then(() => { - this.notify.success(this.get('l10n').t('User has been restored successfully.')); + this.notify.success(this.l10n.t('User has been restored successfully.')); this.send('refreshRoute'); }) .catch(e => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); console.warn(e); }) .finally(() => { diff --git a/app/controllers/admin/users/view/events/list.js b/app/controllers/admin/users/view/events/list.js index 17c5b68f7ce..13b44efb2ba 100644 --- a/app/controllers/admin/users/view/events/list.js +++ b/app/controllers/admin/users/view/events/list.js @@ -63,14 +63,14 @@ export default Controller.extend({ }, deleteEvent() { this.set('isLoading', true); - this.store.findRecord('event', this.get('eventId'), { backgroundReload: false }).then(function(event) { + this.store.findRecord('event', this.eventId, { backgroundReload: false }).then(function(event) { event.destroyRecord(); }) .then(() => { - this.notify.success(this.get('l10n').t('Event has been deleted successfully.')); + this.notify.success(this.l10n.t('Event has been deleted successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/admin/users/view/settings/contact-info.js b/app/controllers/admin/users/view/settings/contact-info.js index 7eed1fcf5db..220df030732 100644 --- a/app/controllers/admin/users/view/settings/contact-info.js +++ b/app/controllers/admin/users/view/settings/contact-info.js @@ -7,10 +7,10 @@ export default Controller.extend({ let currentUser = this.get('model.user'); currentUser.save() .then(() => { - this.get('notify').success(this.get('l10n').t('Your Contact Info has been updated')); + this.notify.success(this.l10n.t('Your Contact Info has been updated')); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('An unexpected error occurred')); + this.notify.error(this.l10n.t('An unexpected error occurred')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/events/import.js b/app/controllers/events/import.js index efe4668164f..42c5e8014da 100644 --- a/app/controllers/events/import.js +++ b/app/controllers/events/import.js @@ -9,7 +9,7 @@ export default Controller.extend({ fileName : '', importTask(taskUrl) { run.later(() => { - this.get('loader') + this.loader .load(taskUrl) .then(data => { if (data.state !== 'SUCCESS') { @@ -32,9 +32,9 @@ export default Controller.extend({ actions: { uploadFile(files) { let [file] = files; - var data = new FormData(); - var endpoint = 'import/json'; - var ext = file.name.split('.'); + let data = new FormData(); + let endpoint = 'import/json'; + let ext = file.name.split('.'); ext = ext[ext.length - 1].toLowerCase(); if (ext === 'xml') { endpoint = 'import/pentabarf'; @@ -52,7 +52,7 @@ export default Controller.extend({ 'file' : true }); - this.get('loader').post( + this.loader.post( `/events/${endpoint}`, data, { isFile: true } diff --git a/app/controllers/events/list.js b/app/controllers/events/list.js index b4212587195..3d2c11b4281 100644 --- a/app/controllers/events/list.js +++ b/app/controllers/events/list.js @@ -67,15 +67,15 @@ export default Controller.extend({ }, deleteEvent() { this.set('isLoading', true); - this.store.findRecord('event', this.get('eventId'), { backgroundReload: false }).then(function(event) { + this.store.findRecord('event', this.eventId, { backgroundReload: false }).then(function(event) { event.destroyRecord(); }) .then(() => { - this.notify.success(this.get('l10n').t('Event has been deleted successfully.')); + this.notify.success(this.l10n.t('Event has been deleted successfully.')); this.send('refreshRoute'); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/events/view.js b/app/controllers/events/view.js index 35707aebec5..dca42afdc76 100644 --- a/app/controllers/events/view.js +++ b/app/controllers/events/view.js @@ -8,23 +8,23 @@ export default Controller.extend({ }, togglePublishState() { if (isEmpty(this.get('model.locationName'))) { - this.notify.error(this.get('l10n').t('Your event must have a location before it can be published.')); + this.notify.error(this.l10n.t('Your event must have a location before it can be published.')); return; } this.set('isLoading', true); const state = this.get('model.state'); this.set('model.state', state === 'draft' ? 'published' : 'draft'); - this.get('model').save() + this.model.save() .then(() => { if (state === 'draft') { - this.notify.success(this.get('l10n').t('Your event has been published successfully.')); + this.notify.success(this.l10n.t('Your event has been published successfully.')); } else { - this.notify.success(this.get('l10n').t('Your event has been unpublished.')); + this.notify.success(this.l10n.t('Your event has been unpublished.')); } }) .catch(() => { this.set('model.state', state); - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); @@ -32,13 +32,13 @@ export default Controller.extend({ }, deleteEvent() { this.set('isLoading', true); - this.get('model').destroyRecord() + this.model.destroyRecord() .then(() => { this.transitionToRoute('events'); - this.notify.success(this.get('l10n').t('Event has been deleted successfully.')); + this.notify.success(this.l10n.t('Event has been deleted successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); @@ -47,14 +47,14 @@ export default Controller.extend({ }, copyEvent() { this.set('isCopying', true); - this.get('loader') + this.loader .post(`events/${this.get('model.id')}/copy`, {}) .then(copiedEvent => { this.transitionToRoute('events.view.edit', copiedEvent.identifier); - this.get('notify').success(this.get('l10n').t('Event copied successfully')); + this.notify.success(this.l10n.t('Event copied successfully')); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('Copying of event failed')); + this.notify.error(this.l10n.t('Copying of event failed')); }) .finally(() => { this.set('isCopying', false); diff --git a/app/controllers/events/view/export.js b/app/controllers/events/view/export.js index ea7044550a1..d131897563d 100644 --- a/app/controllers/events/view/export.js +++ b/app/controllers/events/view/export.js @@ -12,26 +12,26 @@ export default Controller.extend({ }, requestLoop(exportJobInfo) { run.later(() => { - this.get('loader') + this.loader .load(exportJobInfo.task_url, { withoutPrefix: true }) .then(exportJobStatus => { if (exportJobStatus.state === 'SUCCESS') { this.set('isDownloadDisabled', false); this.set('eventDownloadUrl', exportJobStatus.result.download_url); this.set('eventExportStatus', exportJobStatus.state); - this.get('notify').success(this.get('l10n').t('Event exported.')); + this.notify.success(this.l10n.t('Event exported.')); } else if (exportJobStatus.state === 'WAITING') { this.requestLoop(exportJobInfo); this.set('eventExportStatus', exportJobStatus.state); - this.get('notify').alert(this.get('l10n').t('Event export is going on.')); + this.notify.alert(this.l10n.t('Event export is going on.')); } else { this.set('eventExportStatus', exportJobStatus.state); - this.get('notify').error(this.get('l10n').t('Event export failed.')); + this.notify.error(this.l10n.t('Event export failed.')); } }) .catch(() => { this.set('eventExportStatus', 'FAILURE'); - this.get('notify').error(this.get('l10n').t('Event export failed.')); + this.notify.error(this.l10n.t('Event export failed.')); }) .finally(() => { this.set('isLoading', false); @@ -41,15 +41,15 @@ export default Controller.extend({ actions: { startGeneration() { this.set('isLoading', true); - let payload = this.get('data'); - this.get('loader') + let payload = this.data; + this.loader .post(`/events/${this.get('model.id')}/export/json`, payload) .then(exportJobInfo => { this.requestLoop(exportJobInfo); }) .catch(() => { this.set('isLoading', false); - this.get('notify').error(this.get('l10n').t('Unexpected error occurred.')); + this.notify.error(this.l10n.t('Unexpected error occurred.')); }); } } diff --git a/app/controllers/events/view/index.js b/app/controllers/events/view/index.js index 715248254e9..849d382b4a9 100644 --- a/app/controllers/events/view/index.js +++ b/app/controllers/events/view/index.js @@ -34,11 +34,11 @@ export default Controller.extend({ this.set('isLoading', true); sponsor.destroyRecord() .then(() => { - this.notify.success(this.get('l10n').t('Sponsor has been deleted successfully.')); + this.notify.success(this.l10n.t('Sponsor has been deleted successfully.')); this.get('model.sponsors').removeObject(sponsor); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/events/view/scheduler.js b/app/controllers/events/view/scheduler.js index ceccf45e68b..2d6a2f435a5 100644 --- a/app/controllers/events/view/scheduler.js +++ b/app/controllers/events/view/scheduler.js @@ -46,20 +46,20 @@ export default Controller.extend({ let config = { skipDataTransform: true }; - return this.get('loader') + return this.loader .patch(`sessions/${sessionId}`, JSON.stringify(payload), config) .then(() => { - this.get('notify').success('Changes have been made successfully'); + this.notify.success('Changes have been made successfully'); }) .catch(reason => { this.set('error', reason); - this.get('notify').error(`Error: ${reason}`); + this.notify.error(`Error: ${reason}`); }); }, unscheduleSession(session) { $('.full-calendar').fullCalendar('removeEvents', session._id); this.updateSession(null, null, session.resourceId, session.serverId); - this.get('target').send('refresh'); + this.target.send('refresh'); }, actions: { @@ -85,18 +85,17 @@ export default Controller.extend({ }, togglePublishState() { this.set('isLoading', true); - let isSchedulePublished = this.get('isSchedulePublished'); - let action = isSchedulePublished ? 'unpublished' : 'published'; - let publishedAt = isSchedulePublished ? moment(0) : moment(); + let action = this.isSchedulePublished ? 'unpublished' : 'published'; + let publishedAt = this.isSchedulePublished ? moment(0) : moment(); let event = this.get('model.eventDetails'); event.set('schedulePublishedOn', publishedAt); event.save() .then(() => { - this.get('notify').success(`The schedule has been ${action} successfully`); + this.notify.success(`The schedule has been ${action} successfully`); }) .catch(reason => { this.set('error', reason); - this.get('notify').error(`Error: ${reason}`); + this.notify.error(`Error: ${reason}`); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/events/view/sessions.js b/app/controllers/events/view/sessions.js index 06c2509deda..f9b4b67a5ad 100644 --- a/app/controllers/events/view/sessions.js +++ b/app/controllers/events/view/sessions.js @@ -14,35 +14,35 @@ export default Controller.extend({ actions: { export() { this.set('isLoading', true); - this.get('loader') + this.loader .load(`/events/${this.get('model.id')}/export/sessions/csv`) .then(exportJobInfo => { this.requestLoop(exportJobInfo); }) .catch(() => { this.set('isLoading', false); - this.get('notify').error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }); } }, requestLoop(exportJobInfo) { run.later(() => { - this.get('loader') + this.loader .load(exportJobInfo.task_url, { withoutPrefix: true }) .then(exportJobStatus => { if (exportJobStatus.state === 'SUCCESS') { window.location = exportJobStatus.result.download_url; - this.get('notify').success(this.get('l10n').t('Download Ready')); + this.notify.success(this.l10n.t('Download Ready')); } else if (exportJobStatus.state === 'WAITING') { this.requestLoop(exportJobInfo); - this.get('notify').alert(this.get('l10n').t('Task is going on.')); + this.notify.alert(this.l10n.t('Task is going on.')); } else { - this.get('notify').error(this.get('l10n').t('CSV Export has failed.')); + this.notify.error(this.l10n.t('CSV Export has failed.')); } }) .catch(() => { - this.get('notify').error(this.get('l10n').t('CSV Export has failed.')); + this.notify.error(this.l10n.t('CSV Export has failed.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/events/view/sessions/create.js b/app/controllers/events/view/sessions/create.js index 1aa12cf1fd1..36d003cf2e5 100644 --- a/app/controllers/events/view/sessions/create.js +++ b/app/controllers/events/view/sessions/create.js @@ -2,9 +2,9 @@ import Controller from '@ember/controller'; export default Controller.extend({ actions: { async save() { - var _this = this; + let _this = this; await this.get('model.session').save(); - if (this.get('addNewSpeaker')) { + if (this.addNewSpeaker) { let newSpeaker = this.get('model.speaker'); newSpeaker.save() .then(() => { @@ -15,14 +15,14 @@ export default Controller.extend({ _this.transitionToRoute('events.view.sessions', _this.get('model.event.id')); }) .catch(() => { - _this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + _this.get('notify').error(this.l10n.t('Oops something went wrong. Please try again')); }) .finally(() => { _this.set('isLoading', false); }); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); }) .finally(() => { this.set('isLoading', false); @@ -30,11 +30,11 @@ export default Controller.extend({ } else { this.get('model.session').save() .then(() => { - this.get('notify').success(this.get('l10n').t('Your session has been saved')); + this.notify.success(this.l10n.t('Your session has been saved')); this.transitionToRoute('events.view.sessions', this.get('model.event.id')); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/events/view/sessions/edit.js b/app/controllers/events/view/sessions/edit.js index 26518448289..0e784ae5a02 100644 --- a/app/controllers/events/view/sessions/edit.js +++ b/app/controllers/events/view/sessions/edit.js @@ -4,8 +4,8 @@ export default Controller.extend({ actions: { save() { this.set('isLoading', true); - var _this = this; - if (this.get('addNewSpeaker')) { + let _this = this; + if (this.addNewSpeaker) { let newSpeaker = this.get('model.speaker'); newSpeaker.save() .then(() => { @@ -16,14 +16,14 @@ export default Controller.extend({ _this.transitionToRoute('events.view.sessions', _this.get('model.event.id')); }) .catch(() => { - _this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + _this.get('notify').error(this.l10n.t('Oops something went wrong. Please try again')); }) .finally(() => { _this.set('isLoading', false); }); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); }) .finally(() => { this.set('isLoading', false); @@ -32,11 +32,11 @@ export default Controller.extend({ this.get('model.speaker').deleteRecord(); this.get('model.session').save() .then(() => { - this.get('notify').success(this.get('l10n').t('Your session has been saved')); + this.notify.success(this.l10n.t('Your session has been saved')); this.transitionToRoute('events.view.sessions', this.get('model.event.id')); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/events/view/sessions/list.js b/app/controllers/events/view/sessions/list.js index 5069670f296..7fc09b442ef 100644 --- a/app/controllers/events/view/sessions/list.js +++ b/app/controllers/events/view/sessions/list.js @@ -63,10 +63,10 @@ export default Controller.extend({ this.set('isLoading', true); session.destroyRecord() .then(() => { - this.notify.success(this.get('l10n').t('Session has been deleted successfully.')); + this.notify.success(this.l10n.t('Session has been deleted successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); @@ -115,12 +115,12 @@ export default Controller.extend({ this.set('isLoading', true); session.save() .then(() => { - sendEmail ? this.notify.success(this.get('l10n').t('Session has been accepted and speaker has been notified via email.')) - : this.notify.success(this.get('l10n').t('Session has been accepted')); + sendEmail ? this.notify.success(this.l10n.t('Session has been accepted and speaker has been notified via email.')) + : this.notify.success(this.l10n.t('Session has been accepted')); this.send('refreshRoute'); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); @@ -133,12 +133,12 @@ export default Controller.extend({ this.set('isLoading', true); session.save() .then(() => { - sendEmail ? this.notify.success(this.get('l10n').t('Session has been confirmed and speaker has been notified via email.')) - : this.notify.success(this.get('l10n').t('Session has been confirmed')); + sendEmail ? this.notify.success(this.l10n.t('Session has been confirmed and speaker has been notified via email.')) + : this.notify.success(this.l10n.t('Session has been confirmed')); this.send('refreshRoute'); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); @@ -151,12 +151,12 @@ export default Controller.extend({ this.set('isLoading', true); session.save() .then(() => { - sendEmail ? this.notify.success(this.get('l10n').t('Session has been rejected and speaker has been notified via email.')) - : this.notify.success(this.get('l10n').t('Session has been rejected')); + sendEmail ? this.notify.success(this.l10n.t('Session has been rejected and speaker has been notified via email.')) + : this.notify.success(this.l10n.t('Session has been rejected')); this.send('refreshRoute'); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/events/view/speakers.js b/app/controllers/events/view/speakers.js index 4fb463941bc..9f5a61d691c 100644 --- a/app/controllers/events/view/speakers.js +++ b/app/controllers/events/view/speakers.js @@ -8,35 +8,35 @@ export default Controller.extend({ actions: { export() { this.set('isLoading', true); - this.get('loader') + this.loader .load(`/events/${this.get('model.id')}/export/speakers/csv`) .then(exportJobInfo => { this.requestLoop(exportJobInfo); }) .catch(() => { this.set('isLoading', false); - this.get('notify').error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }); } }, requestLoop(exportJobInfo) { run.later(() => { - this.get('loader') + this.loader .load(exportJobInfo.task_url, { withoutPrefix: true }) .then(exportJobStatus => { if (exportJobStatus.state === 'SUCCESS') { window.location = exportJobStatus.result.download_url; - this.get('notify').success(this.get('l10n').t('Download Ready')); + this.notify.success(this.l10n.t('Download Ready')); } else if (exportJobStatus.state === 'WAITING') { this.requestLoop(exportJobInfo); - this.get('notify').alert(this.get('l10n').t('Task is going on.')); + this.notify.alert(this.l10n.t('Task is going on.')); } else { - this.get('notify').error(this.get('l10n').t('CSV Export has failed.')); + this.notify.error(this.l10n.t('CSV Export has failed.')); } }) .catch(() => { - this.get('notify').error(this.get('l10n').t('CSV Export has failed.')); + this.notify.error(this.l10n.t('CSV Export has failed.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/events/view/speakers/create.js b/app/controllers/events/view/speakers/create.js index 3d8539034a8..a21cbe96e8d 100644 --- a/app/controllers/events/view/speakers/create.js +++ b/app/controllers/events/view/speakers/create.js @@ -15,10 +15,10 @@ export default Controller.extend({ this.get('model.speaker.sessions').pushObject(sessionDetails); } await this.get('model.speaker').save(); - this.get('notify').success(this.get('l10n').t('Your session has been saved')); + this.notify.success(this.l10n.t('Your session has been saved')); this.transitionToRoute('events.view.speakers', this.get('model.event.id')); } catch (e) { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); } } } diff --git a/app/controllers/events/view/speakers/edit.js b/app/controllers/events/view/speakers/edit.js index 4ea1d6c3958..96d6a5f6ebe 100644 --- a/app/controllers/events/view/speakers/edit.js +++ b/app/controllers/events/view/speakers/edit.js @@ -6,11 +6,11 @@ export default Controller.extend({ this.set('isLoading', true); this.get('model.speaker').save() .then(() => { - this.get('notify').success(this.get('l10n').t('Speaker details have been saved')); + this.notify.success(this.l10n.t('Speaker details have been saved')); this.transitionToRoute('events.view.speakers'); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/events/view/speakers/list.js b/app/controllers/events/view/speakers/list.js index 6cf4f35e166..10d651addfe 100644 --- a/app/controllers/events/view/speakers/list.js +++ b/app/controllers/events/view/speakers/list.js @@ -44,10 +44,10 @@ export default Controller.extend({ this.set('isLoading', true); speaker.destroyRecord() .then(() => { - this.notify.success(this.get('l10n').t('Speaker has been deleted successfully.')); + this.notify.success(this.l10n.t('Speaker has been deleted successfully.')); }) .catch(e => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); console.warn(e); }) .finally(() => { @@ -64,10 +64,10 @@ export default Controller.extend({ speaker.toggleProperty('isFeatured'); speaker.save() .then(() => { - this.notify.success(this.get('l10n').t('Speaker details modified successfully')); + this.notify.success(this.l10n.t('Speaker details modified successfully')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }); } } diff --git a/app/controllers/events/view/tickets/access-codes/create.js b/app/controllers/events/view/tickets/access-codes/create.js index 62996d6d1dd..2d2720933e4 100644 --- a/app/controllers/events/view/tickets/access-codes/create.js +++ b/app/controllers/events/view/tickets/access-codes/create.js @@ -5,11 +5,11 @@ export default Controller.extend({ save(accessCode) { accessCode.save() .then(() => { - this.get('notify').success(this.get('l10n').t('Access code has been successfully created.')); + this.notify.success(this.l10n.t('Access code has been successfully created.')); this.transitionToRoute('events.view.tickets.access-codes'); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('An unexpected error has occured. Access code cannot be created.')); + this.notify.error(this.l10n.t('An unexpected error has occured. Access code cannot be created.')); }); } } diff --git a/app/controllers/events/view/tickets/access-codes/edit.js b/app/controllers/events/view/tickets/access-codes/edit.js index d0efd7d5848..6ed026bdf7b 100644 --- a/app/controllers/events/view/tickets/access-codes/edit.js +++ b/app/controllers/events/view/tickets/access-codes/edit.js @@ -5,11 +5,11 @@ export default Controller.extend({ save(accessCode) { accessCode.save() .then(() => { - this.get('notify').success(this.get('l10n').t('Access code has been successfully updated.')); + this.notify.success(this.l10n.t('Access code has been successfully updated.')); this.transitionToRoute('events.view.tickets.access-codes'); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('An unexpected error has occured. Access code cannot be created.')); + this.notify.error(this.l10n.t('An unexpected error has occured. Access code cannot be created.')); }); } } diff --git a/app/controllers/events/view/tickets/access-codes/list.js b/app/controllers/events/view/tickets/access-codes/list.js index 3bf479b4141..74a4465b43e 100644 --- a/app/controllers/events/view/tickets/access-codes/list.js +++ b/app/controllers/events/view/tickets/access-codes/list.js @@ -35,11 +35,11 @@ export default Controller.extend({ this.set('isLoading', true); accessCode.destroyRecord() .then(() => { - this.get('model').reload(); - this.notify.success(this.get('l10n').t('Access Code has been deleted successfully.')); + this.model.reload(); + this.notify.success(this.l10n.t('Access Code has been deleted successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); @@ -50,11 +50,11 @@ export default Controller.extend({ accessCode.toggleProperty('isActive'); accessCode.save() .then(() => { - this.notify.success(this.get('l10n').t('Access Code has been updated successfully.')); + this.notify.success(this.l10n.t('Access Code has been updated successfully.')); this.send('refreshRoute'); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/events/view/tickets/add-order.js b/app/controllers/events/view/tickets/add-order.js index 727401805ef..0d839cbbc12 100644 --- a/app/controllers/events/view/tickets/add-order.js +++ b/app/controllers/events/view/tickets/add-order.js @@ -1,6 +1,6 @@ import Controller from '@ember/controller'; import { computed } from '@ember/object'; -import { sumBy } from 'lodash'; +import { sumBy } from 'lodash-es'; export default Controller.extend({ hasTicketsInOrder: computed('model.tickets.@each.orderQuantity', function() { @@ -41,8 +41,8 @@ export default Controller.extend({ updateOrder(ticket, count) { let order = this.get('model.order'); ticket.set('orderQuantity', count); - order.set('amount', this.get('total')); - if (!this.get('total')) { + order.set('amount', this.total); + if (!this.total) { order.set('amount', 0); } if (count > 0) { @@ -78,20 +78,20 @@ export default Controller.extend({ order.set('attendees', attendees.slice()); await order.save() .then(order => { - this.get('notify').success(this.get('l10n').t('Order details saved. Please fill further details within 10 minutes.')); + this.notify.success(this.l10n.t('Order details saved. Please fill further details within 10 minutes.')); this.transitionToRoute('orders.new', order.identifier); }) .catch(async() => { for (const attendee of attendees ? attendees.toArray() : []) { await attendee.destroyRecord(); } - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); }) .finally(() => { this.set('isLoading', false); }); } catch (e) { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); } } } diff --git a/app/controllers/events/view/tickets/attendees.js b/app/controllers/events/view/tickets/attendees.js index 94d39f3c65a..bb9df14c266 100644 --- a/app/controllers/events/view/tickets/attendees.js +++ b/app/controllers/events/view/tickets/attendees.js @@ -9,34 +9,34 @@ export default Controller.extend({ actions: { export(mode) { this.set(`isLoading${mode}`, true); - this.get('loader') + this.loader .load(`/events/${this.get('model.id')}/export/attendees/${mode}`) .then(exportJobInfo => { this.requestLoop(exportJobInfo, mode); }) .catch(() => { this.set(`isLoading${mode}`, false); - this.get('notify').error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }); } }, requestLoop(exportJobInfo, mode) { run.later(() => { - this.get('loader') + this.loader .load(exportJobInfo.task_url, { withoutPrefix: true }) .then(exportJobStatus => { if (exportJobStatus.state === 'SUCCESS') { window.location = exportJobStatus.result.download_url; - this.get('notify').success(this.get('l10n').t('Download Ready')); + this.notify.success(this.l10n.t('Download Ready')); } else if (exportJobStatus.state === 'WAITING') { this.requestLoop(exportJobInfo); - this.get('notify').alert(this.get('l10n').t('Task is going on.')); + this.notify.alert(this.l10n.t('Task is going on.')); } else { - this.get('notify').error(this.get('l10n').t(`${mode.toUpperCase()} Export has failed.`)); + this.notify.error(this.l10n.t(`${mode.toUpperCase()} Export has failed.`)); } }) .catch(() => { - this.get('notify').error(this.get('l10n').t(`${mode.toUpperCase()} Export has failed.`)); + this.notify.error(this.l10n.t(`${mode.toUpperCase()} Export has failed.`)); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/events/view/tickets/attendees/list.js b/app/controllers/events/view/tickets/attendees/list.js index 3056881d6f1..55071259b9c 100644 --- a/app/controllers/events/view/tickets/attendees/list.js +++ b/app/controllers/events/view/tickets/attendees/list.js @@ -44,11 +44,11 @@ export default Controller.extend({ } attendee.save() .then(savedAttendee => { - this.notify.success(this.get('l10n').t(`Attendee ${savedAttendee.isCheckedIn ? 'Checked-In' : 'Checked-Out'} Successfully`)); + this.notify.success(this.l10n.t(`Attendee ${savedAttendee.isCheckedIn ? 'Checked-In' : 'Checked-Out'} Successfully`)); this.send('refreshRoute'); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred')); + this.notify.error(this.l10n.t('An unexpected error has occurred')); }); } } diff --git a/app/controllers/events/view/tickets/discount-codes/create.js b/app/controllers/events/view/tickets/discount-codes/create.js index 08659daf472..40ef9ed8cc5 100644 --- a/app/controllers/events/view/tickets/discount-codes/create.js +++ b/app/controllers/events/view/tickets/discount-codes/create.js @@ -5,11 +5,11 @@ export default Controller.extend({ saveCode(discountCode) { discountCode.save() .then(() => { - this.get('notify').success(this.get('l10n').t('Discount code has been successfully created.')); + this.notify.success(this.l10n.t('Discount code has been successfully created.')); this.transitionToRoute('events.view.tickets.discount-codes'); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('An unexpected error has occured. Discount code cannot be created.')); + this.notify.error(this.l10n.t('An unexpected error has occured. Discount code cannot be created.')); }); } } diff --git a/app/controllers/events/view/tickets/discount-codes/edit.js b/app/controllers/events/view/tickets/discount-codes/edit.js index b7d446e18b0..dd1db98e00b 100644 --- a/app/controllers/events/view/tickets/discount-codes/edit.js +++ b/app/controllers/events/view/tickets/discount-codes/edit.js @@ -5,11 +5,11 @@ export default Controller.extend({ saveCode(discountCode) { discountCode.save() .then(() => { - this.get('notify').success(this.get('l10n').t('Discount code has been successfully updated.')); + this.notify.success(this.l10n.t('Discount code has been successfully updated.')); this.transitionToRoute('events.view.tickets.discount-codes'); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('An unexpected error has occurred. Discount code cannot be updated.')); + this.notify.error(this.l10n.t('An unexpected error has occurred. Discount code cannot be updated.')); }); } } diff --git a/app/controllers/events/view/tickets/discount-codes/list.js b/app/controllers/events/view/tickets/discount-codes/list.js index 22d37c1b7f1..cc398aca241 100644 --- a/app/controllers/events/view/tickets/discount-codes/list.js +++ b/app/controllers/events/view/tickets/discount-codes/list.js @@ -39,11 +39,11 @@ export default Controller.extend({ this.set('isLoading', true); discountCode.destroyRecord() .then(() => { - this.get('model').reload(); - this.notify.success(this.get('l10n').t('Discount Code has been deleted successfully.')); + this.model.reload(); + this.notify.success(this.l10n.t('Discount Code has been deleted successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); @@ -54,12 +54,12 @@ export default Controller.extend({ discountCode.toggleProperty('isActive'); discountCode.save() .then(() => { - this.notify.success(this.get('l10n').t('Discount Code has been updated successfully.')); + this.notify.success(this.l10n.t('Discount Code has been updated successfully.')); this.send('refreshRoute'); }) .catch(() => { discountCode.toggleProperty('isActive'); - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/events/view/tickets/order-form.js b/app/controllers/events/view/tickets/order-form.js index 2016c011ea2..a0450ad684e 100644 --- a/app/controllers/events/view/tickets/order-form.js +++ b/app/controllers/events/view/tickets/order-form.js @@ -17,11 +17,11 @@ export default Controller.extend({ this.set('isLoading', true); this.saveForms(data) .then(() => { - this.get('notify').success(this.get('l10n').t('Your Attendee form has been saved')); + this.notify.success(this.l10n.t('Your Attendee form has been saved')); }) .catch(e => { console.error(e); - this.get('notify').error(this.get('l10n').t(e.errors[0].detail)); + this.notify.error(this.l10n.t(e.errors[0].detail)); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/events/view/tickets/orders.js b/app/controllers/events/view/tickets/orders.js index c582700019c..6493f8bc954 100644 --- a/app/controllers/events/view/tickets/orders.js +++ b/app/controllers/events/view/tickets/orders.js @@ -9,34 +9,34 @@ export default Controller.extend({ actions: { export(mode) { this.set(`isLoading${mode}`, true); - this.get('loader') + this.loader .load(`/events/${this.get('model.id')}/export/orders/${mode}`) .then(exportJobInfo => { this.requestLoop(exportJobInfo, mode); }) .catch(() => { this.set(`isLoading${mode}`, false); - this.get('notify').error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }); } }, requestLoop(exportJobInfo, mode) { run.later(() => { - this.get('loader') + this.loader .load(exportJobInfo.task_url, { withoutPrefix: true }) .then(exportJobStatus => { if (exportJobStatus.state === 'SUCCESS') { window.location = exportJobStatus.result.download_url; - this.get('notify').success(this.get('l10n').t('Download Ready')); + this.notify.success(this.l10n.t('Download Ready')); } else if (exportJobStatus.state === 'WAITING') { this.requestLoop(exportJobInfo); - this.get('notify').alert(this.get('l10n').t('Task is going on.')); + this.notify.alert(this.l10n.t('Task is going on.')); } else { - this.get('notify').error(this.get('l10n').t(`${mode.toUpperCase()} Export has failed.`)); + this.notify.error(this.l10n.t(`${mode.toUpperCase()} Export has failed.`)); } }) .catch(() => { - this.get('notify').error(this.get('l10n').t(`${mode.toUpperCase()} Export has failed.`)); + this.notify.error(this.l10n.t(`${mode.toUpperCase()} Export has failed.`)); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/events/view/tickets/orders/list.js b/app/controllers/events/view/tickets/orders/list.js index f758a90fe4a..bcdfe3c1901 100644 --- a/app/controllers/events/view/tickets/orders/list.js +++ b/app/controllers/events/view/tickets/orders/list.js @@ -37,10 +37,10 @@ export default Controller.extend({ order.save() .then(() => { this.send('refreshRoute'); - this.notify.success(this.get('l10n').t('Order has been marked completed successfully.')); + this.notify.success(this.l10n.t('Order has been marked completed successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); @@ -51,10 +51,10 @@ export default Controller.extend({ order.destroyRecord() .then(() => { this.send('refreshRoute'); - this.notify.success(this.get('l10n').t('Order has been deleted successfully.')); + this.notify.success(this.l10n.t('Order has been deleted successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); @@ -66,10 +66,10 @@ export default Controller.extend({ order.save() .then(() => { this.send('refreshRoute'); - this.notify.success(this.get('l10n').t('Order has been cancelled successfully.')); + this.notify.success(this.l10n.t('Order has been cancelled successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/index.js b/app/controllers/index.js index 1971a04f859..ad8d2a6446c 100644 --- a/app/controllers/index.js +++ b/app/controllers/index.js @@ -11,7 +11,7 @@ export default Controller.extend({ filterDate : null, callForSpeakersEvents: computed('filteredEvents.[]', function() { - return this.get('filteredEvents').filter(event => { + return this.filteredEvents.filter(event => { const callForPapers = event.get('speakersCall'); const sessionEnabled = event.isSessionsSpeakersEnabled; if (!callForPapers || !callForPapers.get('startsAt') || !callForPapers.get('endsAt')) { diff --git a/app/controllers/my-sessions/view.js b/app/controllers/my-sessions/view.js index 37db1203dd7..2d6b24793d7 100644 --- a/app/controllers/my-sessions/view.js +++ b/app/controllers/my-sessions/view.js @@ -17,13 +17,13 @@ export default Controller.extend({ }, deleteProposal() { this.set('isLoading', true); - this.get('model').destroyRecord() + this.model.destroyRecord() .then(() => { this.transitionToRoute('my-sessions.index'); - this.notify.success(this.get('l10n').t('Proposal has been deleted successfully.')); + this.notify.success(this.l10n.t('Proposal has been deleted successfully.')); }) .catch(() => { - this.notify.error(this.get('l10n').t('An unexpected error has occurred.')); + this.notify.error(this.l10n.t('An unexpected error has occurred.')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/notifications.js b/app/controllers/notifications.js index 2bd83999a53..d22f8b7e397 100644 --- a/app/controllers/notifications.js +++ b/app/controllers/notifications.js @@ -11,10 +11,10 @@ export default Controller.extend({ item.save(); } }); - this.get('notify').success(this.get('l10n').t('All notifications marked read successfully')); + this.notify.success(this.l10n.t('All notifications marked read successfully')); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('An unexpected error occurred.')); + this.notify.error(this.l10n.t('An unexpected error occurred.')); }); } } diff --git a/app/controllers/oauth/callback.js b/app/controllers/oauth/callback.js index fd5dcb47413..0657410013d 100644 --- a/app/controllers/oauth/callback.js +++ b/app/controllers/oauth/callback.js @@ -2,7 +2,7 @@ import Controller from '@ember/controller'; export default Controller.extend({ oauth(queryParams) { - this.get('loader').post(`/auth/oauth/login/${ queryParams.provider }?code=${ queryParams.code }`) + this.loader.post(`/auth/oauth/login/${ queryParams.provider }?code=${ queryParams.code }`) .then(response => { let credentials = { identification : response.email, @@ -10,23 +10,23 @@ export default Controller.extend({ }, authenticator = 'authenticator:jwt'; - this.get('session') + this.session .authenticate(authenticator, credentials) .then(async() => { - const tokenPayload = this.get('authManager').getTokenPayload(); + const tokenPayload = this.authManager.getTokenPayload(); if (tokenPayload) { - this.get('authManager').persistCurrentUser( - await this.get('store').findRecord('user', tokenPayload.identity) + this.authManager.persistCurrentUser( + await this.store.findRecord('user', tokenPayload.identity) ); } this.transitionToRoute('/'); }) .catch(reason => { - if (!(this.get('isDestroyed') || this.get('isDestroying'))) { + if (!(this.isDestroyed || this.isDestroying)) { if (reason && reason.hasOwnProperty('status_code') && reason.status_code === 401) { - this.set('errorMessage', this.get('l10n').t('Your credentials were incorrect.')); + this.set('errorMessage', this.l10n.t('Your credentials were incorrect.')); } else { - this.set('errorMessage', this.get('l10n').t('An unexpected error occurred.')); + this.set('errorMessage', this.l10n.t('An unexpected error occurred.')); } this.set('isLoading', false); } else { @@ -34,7 +34,7 @@ export default Controller.extend({ } }) .finally(() => { - if (!(this.get('isDestroyed') || this.get('isDestroying'))) { + if (!(this.isDestroyed || this.isDestroying)) { this.set('password', ''); } }); diff --git a/app/controllers/orders/new.js b/app/controllers/orders/new.js index 5e35140b3f6..282a02d5734 100644 --- a/app/controllers/orders/new.js +++ b/app/controllers/orders/new.js @@ -25,22 +25,22 @@ export default Controller.extend({ await order.save() .then(order => { if (order.status === 'pending') { - this.get('notify').success(this.get('l10n').t('Order details saved. Please fill the payment details')); + this.notify.success(this.l10n.t('Order details saved. Please fill the payment details')); this.transitionToRoute('orders.pending', order.identifier); } else if (order.status === 'completed' || order.status === 'placed') { - this.get('notify').success(this.get('l10n').t('Order details saved. Your order is successful')); + this.notify.success(this.l10n.t('Order details saved. Your order is successful')); this.transitionToRoute('orders.view', order.identifier); } }) .catch(e => { order.set('status', 'initializing'); - this.get('notify').error(this.get('l10n').t(` ${e} Oops something went wrong. Please try again`)); + this.notify.error(this.l10n.t(` ${e} Oops something went wrong. Please try again`)); }) .finally(() => { this.set('isLoading', false); }); } catch (e) { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); } } } diff --git a/app/controllers/orders/pending.js b/app/controllers/orders/pending.js index 6f95ed7111a..1d09f2a2768 100644 --- a/app/controllers/orders/pending.js +++ b/app/controllers/orders/pending.js @@ -35,13 +35,13 @@ export default Controller.extend({ skipDataTransform: true }; chargePayload = JSON.stringify(chargePayload); - return this.get('loader').post(`orders/${order.identifier}/charge`, chargePayload, config) + return this.loader.post(`orders/${order.identifier}/charge`, chargePayload, config) .then(charge => { if (charge.data.attributes.status) { - this.get('notify').success(charge.data.attributes.message); + this.notify.success(charge.data.attributes.message); this.transitionToRoute('orders.view', order.identifier); } else { - this.get('notify').error(charge.data.attributes.message); + this.notify.error(charge.data.attributes.message); } }); }, diff --git a/app/controllers/public/cfs/edit-session.js b/app/controllers/public/cfs/edit-session.js index cfb7a90767f..1cab8edf640 100644 --- a/app/controllers/public/cfs/edit-session.js +++ b/app/controllers/public/cfs/edit-session.js @@ -6,11 +6,11 @@ export default Controller.extend({ this.set('isLoading', true); this.get('model.session').save() .then(() => { - this.get('notify').success(this.get('l10n').t('Session details have been saved')); + this.notify.success(this.l10n.t('Session details have been saved')); this.transitionToRoute('public.cfs'); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/public/cfs/edit-speaker.js b/app/controllers/public/cfs/edit-speaker.js index 58db7799967..bd24ff29f24 100644 --- a/app/controllers/public/cfs/edit-speaker.js +++ b/app/controllers/public/cfs/edit-speaker.js @@ -6,11 +6,11 @@ export default Controller.extend({ this.set('isLoading', true); this.get('model.speaker').save() .then(() => { - this.get('notify').success(this.get('l10n').t('Speaker details have been saved')); + this.notify.success(this.l10n.t('Speaker details have been saved')); this.transitionToRoute('public.cfs.index'); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/public/cfs/new-session.js b/app/controllers/public/cfs/new-session.js index 4f5b925cbaf..d2953ffdd4a 100644 --- a/app/controllers/public/cfs/new-session.js +++ b/app/controllers/public/cfs/new-session.js @@ -7,10 +7,10 @@ export default Controller.extend({ await this.get('model.session').save(); speakerDetails.sessions.pushObject(this.get('model.session')); await this.get('model.session').save(); - this.get('notify').success(this.get('l10n').t('Your session has been saved')); + this.notify.success(this.l10n.t('Your session has been saved')); this.transitionToRoute('public.cfs.index'); } catch (e) { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); } } } diff --git a/app/controllers/public/cfs/new-speaker.js b/app/controllers/public/cfs/new-speaker.js index 58db7799967..bd24ff29f24 100644 --- a/app/controllers/public/cfs/new-speaker.js +++ b/app/controllers/public/cfs/new-speaker.js @@ -6,11 +6,11 @@ export default Controller.extend({ this.set('isLoading', true); this.get('model.speaker').save() .then(() => { - this.get('notify').success(this.get('l10n').t('Speaker details have been saved')); + this.notify.success(this.l10n.t('Speaker details have been saved')); this.transitionToRoute('public.cfs.index'); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('Oops something went wrong. Please try again')); + this.notify.error(this.l10n.t('Oops something went wrong. Please try again')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/public/index.js b/app/controllers/public/index.js index 29430cb5e1d..5d69c5db55a 100644 --- a/app/controllers/public/index.js +++ b/app/controllers/public/index.js @@ -34,14 +34,14 @@ export default Controller.extend({ let credentials = newUser.getProperties('email', 'password'), authenticator = 'authenticator:jwt'; credentials.identification = newUser.email; - this.get('session') + this.session .authenticate(authenticator, credentials) .then(async() => { - const tokenPayload = this.get('authManager').getTokenPayload(); + const tokenPayload = this.authManager.getTokenPayload(); if (tokenPayload) { this.set('session.skipRedirectOnInvalidation', true); - this.get('authManager').persistCurrentUser( - await this.get('store').findRecord('user', tokenPayload.identity) + this.authManager.persistCurrentUser( + await this.store.findRecord('user', tokenPayload.identity) ); this.set('isLoginModalOpen', false); this.send('placeOrder'); @@ -59,7 +59,7 @@ export default Controller.extend({ if (error.errors[0].status === 409) { this.set('userExists', true); } else { - this.get('notify').error(this.get('l10n').t(error.errors[0].detail)); + this.notify.error(this.l10n.t(error.errors[0].detail)); } } }) @@ -76,25 +76,25 @@ export default Controller.extend({ password }; let authenticator = 'authenticator:jwt'; - this.get('session') + this.session .authenticate(authenticator, credentials) .then(async() => { - const tokenPayload = this.get('authManager').getTokenPayload(); + const tokenPayload = this.authManager.getTokenPayload(); if (tokenPayload) { this.set('session.skipRedirectOnInvalidation', true); - this.get('authManager').persistCurrentUser( - await this.get('store').findRecord('user', tokenPayload.identity) + this.authManager.persistCurrentUser( + await this.store.findRecord('user', tokenPayload.identity) ); this.set('isLoginModalOpen', false); this.send('placeOrder'); } }) .catch(reason => { - if (!(this.get('isDestroyed') || this.get('isDestroying'))) { + if (!(this.isDestroyed || this.isDestroying)) { if (reason && reason.hasOwnProperty('status_code') && reason.status_code === 401) { - this.set('errorMessage', this.get('l10n').t('Your credentials were incorrect.')); + this.set('errorMessage', this.l10n.t('Your credentials were incorrect.')); } else { - this.set('errorMessage', this.get('l10n').t('An unexpected error occurred.')); + this.set('errorMessage', this.l10n.t('An unexpected error occurred.')); } } else { console.warn(reason); @@ -146,20 +146,20 @@ export default Controller.extend({ order.set('attendees', attendees); await order.save() .then(order => { - this.get('notify').success(this.get('l10n').t('Order details saved. Please fill further details within 10 minutes.')); + this.notify.success(this.l10n.t('Order details saved. Please fill further details within 10 minutes.')); this.transitionToRoute('orders.new', order.identifier); }) .catch(async e => { for (const attendee of attendees ? attendees.toArray() : []) { await attendee.destroyRecord(); } - this.get('notify').error(this.get('l10n').t(e.errors[0].detail)); + this.notify.error(this.l10n.t(e.errors[0].detail)); }) .finally(() => { this.set('isLoading', false); }); } catch (e) { - this.get('notify').error(this.get('l10n').t(e)); + this.notify.error(this.l10n.t(e)); } } } diff --git a/app/controllers/register.js b/app/controllers/register.js index 8c48b165a15..c318306c331 100644 --- a/app/controllers/register.js +++ b/app/controllers/register.js @@ -6,7 +6,7 @@ export default Controller.extend({ inviteEmail : null, inviteToken : null, willDestroy() { - const user = this.get('model'); + const user = this.model; if (user) { this.store.unloadRecord(user); } @@ -15,20 +15,20 @@ export default Controller.extend({ actions: { createUser() { const password = this.get('model.password'); - this.get('model').save() + this.model.save() .then(user => { this.set('session.newUser', user.get('email')); - if (this.get('inviteToken')) { - this.send('loginExistingUser', user.get('email'), password, this.get('inviteToken'), this.get('event')); + if (this.inviteToken) { + this.send('loginExistingUser', user.get('email'), password, this.inviteToken, this.event); } else { this.transitionToRoute('login'); } }) .catch(reason => { if (reason && reason.hasOwnProperty('errors') && reason.errors[0].status === 409) { - this.set('errorMessage', this.get('l10n').t('User already exists.')); + this.set('errorMessage', this.l10n.t('User already exists.')); } else { - this.set('errorMessage', this.get('l10n').t('An unexpected error occurred.')); + this.set('errorMessage', this.l10n.t('An unexpected error occurred.')); } }) .finally(() => { @@ -43,24 +43,24 @@ export default Controller.extend({ password }; let authenticator = 'authenticator:jwt'; - this.get('session') + this.session .authenticate(authenticator, credentials) .then(async() => { - const tokenPayload = this.get('authManager').getTokenPayload(); + const tokenPayload = this.authManager.getTokenPayload(); if (tokenPayload) { this.set('session.skipRedirectOnInvalidation', true); - this.get('authManager').persistCurrentUser( - await this.get('store').findRecord('user', tokenPayload.identity) + this.authManager.persistCurrentUser( + await this.store.findRecord('user', tokenPayload.identity) ); } this.transitionToRoute('public.role-invites', eventId, { queryParams: { token } }); }) .catch(reason => { - if (!(this.get('isDestroyed') || this.get('isDestroying'))) { + if (!(this.isDestroyed || this.isDestroying)) { if (reason && reason.hasOwnProperty('status_code') && reason.status_code === 401) { - this.set('errorMessage', this.get('l10n').t('Your credentials were incorrect.')); + this.set('errorMessage', this.l10n.t('Your credentials were incorrect.')); } else { - this.set('errorMessage', this.get('l10n').t('An unexpected error occurred.')); + this.set('errorMessage', this.l10n.t('An unexpected error occurred.')); } } else { console.warn(reason); diff --git a/app/controllers/settings/contact-info.js b/app/controllers/settings/contact-info.js index 66e0119c89d..91454a4b992 100644 --- a/app/controllers/settings/contact-info.js +++ b/app/controllers/settings/contact-info.js @@ -4,13 +4,13 @@ export default Controller.extend({ actions: { updateContactInfo() { this.set('isLoading', true); - let currentUser = this.get('model'); + let currentUser = this.model; currentUser.save() .then(() => { - this.get('notify').success(this.get('l10n').t('Your Contact Info has been updated')); + this.notify.success(this.l10n.t('Your Contact Info has been updated')); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('An unexpected error occurred')); + this.notify.error(this.l10n.t('An unexpected error occurred')); }) .finally(() => { this.set('isLoading', false); diff --git a/app/controllers/settings/password.js b/app/controllers/settings/password.js index 6abb88a49ae..6abab1d81b6 100644 --- a/app/controllers/settings/password.js +++ b/app/controllers/settings/password.js @@ -10,16 +10,16 @@ export default Controller.extend({ 'new-password' : passwordData.passwordNew } }; - this.get('loader') + this.loader .post('/auth/change-password', payload) .then(() => { - this.get('notify').success(this.get('l10n').t('Password updated successfully')); + this.notify.success(this.l10n.t('Password updated successfully')); }) .catch(error => { if (error.errors) { - this.get('notify').error(this.get('l10n').t(`${error.errors[0].detail}`)); + this.notify.error(this.l10n.t(`${error.errors[0].detail}`)); } else { - this.get('notify').error(this.get('l10n').t('Unexpected error. Password did not change.')); + this.notify.error(this.l10n.t('Unexpected error. Password did not change.')); } }) .finally(() => { diff --git a/app/controllers/verify.js b/app/controllers/verify.js index c47463091c5..8cde2478477 100644 --- a/app/controllers/verify.js +++ b/app/controllers/verify.js @@ -14,7 +14,7 @@ export default Controller.extend({ token: tokenVal } }; - return this.get('loader') + return this.loader .post('auth/verify-email', payload) .then(() => { this.set('success', true); diff --git a/app/helpers/confirm.js b/app/helpers/confirm.js index d05b434301a..c397caf16f9 100644 --- a/app/helpers/confirm.js +++ b/app/helpers/confirm.js @@ -10,12 +10,12 @@ export default Helper.extend({ compute(params) { return () => { if (params.length >= 2) { - this.get('confirm').prompt(params[0]) + this.confirm.prompt(params[0]) .then(() => { params[1](); }); } else { - this.get('confirm').prompt() + this.confirm.prompt() .then(() => { params[0](); }); diff --git a/app/helpers/css.js b/app/helpers/css.js index 761c12af6ee..6cbf98b1b45 100644 --- a/app/helpers/css.js +++ b/app/helpers/css.js @@ -1,6 +1,6 @@ import Helper from '@ember/component/helper'; import { inject as service } from '@ember/service'; -import { forOwn } from 'lodash'; +import { forOwn } from 'lodash-es'; import { htmlSafe } from '@ember/string'; export default Helper.extend({ @@ -11,6 +11,6 @@ export default Helper.extend({ forOwn(hash, (value, key) => { style += `${key}: ${value};`; }); - return htmlSafe(this.get('sanitizer').strip(style)); + return htmlSafe(this.sanitizer.strip(style)); } }); diff --git a/app/helpers/currency-name.js b/app/helpers/currency-name.js index 6306d4f8661..1f439a7ddb8 100644 --- a/app/helpers/currency-name.js +++ b/app/helpers/currency-name.js @@ -1,5 +1,5 @@ import Helper from '@ember/component/helper'; -import { find } from 'lodash'; +import { find } from 'lodash-es'; import { paymentCurrencies } from 'open-event-frontend/utils/dictionary/payment'; export function currencyName(params) { diff --git a/app/helpers/currency-symbol.js b/app/helpers/currency-symbol.js index 62dbcc6fda1..a5d549bb78c 100644 --- a/app/helpers/currency-symbol.js +++ b/app/helpers/currency-symbol.js @@ -1,5 +1,5 @@ import Helper from '@ember/component/helper'; -import { find } from 'lodash'; +import { find } from 'lodash-es'; import { paymentCurrencies } from 'open-event-frontend/utils/dictionary/payment'; export function currencySymbol(params) { diff --git a/app/helpers/sanitize.js b/app/helpers/sanitize.js index 61a5cfb6217..cc877c1bf58 100644 --- a/app/helpers/sanitize.js +++ b/app/helpers/sanitize.js @@ -9,6 +9,6 @@ export default Helper.extend({ sanitizer: service(), compute(params) { - return htmlSafe(this.get('sanitizer').purify(params[0])); + return htmlSafe(this.sanitizer.purify(params[0])); } }); diff --git a/app/helpers/ticket-attendees.js b/app/helpers/ticket-attendees.js index e266161e01e..63e96ba4be2 100644 --- a/app/helpers/ticket-attendees.js +++ b/app/helpers/ticket-attendees.js @@ -1,5 +1,5 @@ import { helper } from '@ember/component/helper'; -import { intersection } from 'lodash'; +import { intersection } from 'lodash-es'; export function ticketAttendees(params/* , hash*/) { diff --git a/app/mixins/admin-sales.js b/app/mixins/admin-sales.js index ccafa1a74d8..f1577fc33bf 100644 --- a/app/mixins/admin-sales.js +++ b/app/mixins/admin-sales.js @@ -4,42 +4,42 @@ import { computed } from '@ember/object'; export default Mixin.create({ totalCompletedTickets: computed(function() { let sum = 0; - this.get('model').forEach(data => { + this.model.forEach(data => { sum += data.sales.completed.ticket_count; }); return sum; }), totalCompletedSales: computed(function() { let sum = 0; - this.get('model').forEach(data => { + this.model.forEach(data => { sum += data.sales.completed.sales_total; }); return sum; }), totalPlacedTickets: computed(function() { let sum = 0; - this.get('model').forEach(data => { + this.model.forEach(data => { sum += data.sales.placed.ticket_count; }); return sum; }), totalPlacedSales: computed(function() { let sum = 0; - this.get('model').forEach(data => { + this.model.forEach(data => { sum += data.sales.placed.sales_total; }); return sum; }), totalPendingTickets: computed(function() { let sum = 0; - this.get('model').forEach(data => { + this.model.forEach(data => { sum += data.sales.pending.ticket_count; }); return sum; }), totalPendingSales: computed(function() { let sum = 0; - this.get('model').forEach(data => { + this.model.forEach(data => { sum += data.sales.pending.sales_total; }); return sum; diff --git a/app/mixins/custom-primary-key.js b/app/mixins/custom-primary-key.js index a2035488e39..52e610be8f4 100644 --- a/app/mixins/custom-primary-key.js +++ b/app/mixins/custom-primary-key.js @@ -1,5 +1,5 @@ import Mixin from '@ember/object/mixin'; -import { get, unset } from 'lodash'; +import { get, unset } from 'lodash-es'; import { coerceId } from 'open-event-frontend/utils/internal'; import attr from 'ember-data/attr'; @@ -8,16 +8,14 @@ export default Mixin.create({ originalId: attr(), extractId(modelClass, resourceHash) { - let primaryKey = this.get('primaryKey'); - let id = get(resourceHash, primaryKey); + let id = get(resourceHash, this.primaryKey); return coerceId(id); }, serialize() { - let primaryKey = this.get('primaryKey'); const json = this._super(...arguments); - if (primaryKey !== 'id') { - unset(json, ['data', primaryKey]); // Remove the custom primary key + if (this.primaryKey !== 'id') { + unset(json, ['data', this.primaryKey]); // Remove the custom primary key json.data.id = json.data.attributes['original-id']; // Restore the original from copy unset(json, 'data.attributes.original-id'); // Remove the original's copy } @@ -25,9 +23,8 @@ export default Mixin.create({ }, extractAttributes(modelClass, resourceHash) { - let primaryKey = this.get('primaryKey'); let attributes = this._super(...arguments); - if (primaryKey !== 'id') { + if (this.primaryKey !== 'id') { attributes.originalId = resourceHash.id; } return attributes; diff --git a/app/mixins/event-wizard.js b/app/mixins/event-wizard.js index d8825e10a44..74468c224ee 100644 --- a/app/mixins/event-wizard.js +++ b/app/mixins/event-wizard.js @@ -14,20 +14,20 @@ export default Mixin.create(MutableArray, CustomFormMixin, { getSteps() { return [ { - title : this.get('l10n').t('Basic Details'), - description : this.get('l10n').t('Tell about your event'), + title : this.l10n.t('Basic Details'), + description : this.l10n.t('Tell about your event'), icon : 'info icon', route : 'events.view.edit.basic-details' }, { - title : this.get('l10n').t('Sponsors'), - description : this.get('l10n').t('Advertise your sponsors'), + title : this.l10n.t('Sponsors'), + description : this.l10n.t('Advertise your sponsors'), icon : 'dollar icon', route : 'events.view.edit.sponsors' }, { - title : this.get('l10n').t('Sessions & Speakers'), - description : this.get('l10n').t('Expand your event'), + title : this.l10n.t('Sessions & Speakers'), + description : this.l10n.t('Expand your event'), icon : 'list icon', route : 'events.view.edit.sessions-speakers' } @@ -118,12 +118,12 @@ export default Mixin.create(MutableArray, CustomFormMixin, { this.set('isLoading', true); this.saveEventData(propsToSave) .then(data => { - this.get('notify').success(this.get('l10n').t('Your event has been saved')); + this.notify.success(this.l10n.t('Your event has been saved')); this.transitionToRoute(route, data.id); }) .catch(e => { console.error(e); - this.get('notify').error(this.get('l10n').t(e.errors[0].detail)); + this.notify.error(this.l10n.t(e.errors[0].detail)); }) .finally(() => { this.set('isLoading', false); diff --git a/app/mixins/form.js b/app/mixins/form.js index f527e75a821..8e185022f3a 100644 --- a/app/mixins/form.js +++ b/app/mixins/form.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import Mixin from '@ember/object/mixin'; -import { merge } from '@ember/polyfills'; +import { merge } from 'lodash-es'; import { debounce } from '@ember/runloop'; import moment from 'moment'; import { FORM_DATE_FORMAT } from 'open-event-frontend/utils/dictionary/date-time'; @@ -16,7 +16,7 @@ export default Mixin.create({ autoScrollSpeed : 200, getForm() { - return this.get('$form'); + return this.$form; }, onValid(callback) { @@ -55,7 +55,7 @@ export default Mixin.create({ } let $form; - if ((this.get('tagName') && this.get('tagName').toLowerCase() === 'form') || (this.$() && this.$().prop('tagName').toLowerCase() === 'form')) { + if ((this.tagName && this.tagName.toLowerCase() === 'form') || (this.$() && this.$().prop('tagName').toLowerCase() === 'form')) { $form = this.$(); $form.addClass('ui form'); } else { @@ -63,7 +63,7 @@ export default Mixin.create({ } if ($form) { $form = $form.first(); - if (this.get('getValidationRules') && $form) { + if (this.getValidationRules && $form) { $form.form(merge(defaultFormRules, this.getValidationRules())); } if ($form && this) { @@ -75,7 +75,7 @@ export default Mixin.create({ didInsertElement() { this._super(...arguments); - $.fn.form.settings.rules.date = (value, format = FORM_DATE_FORMAT) => { + window.$.fn.form.settings.rules.date = (value, format = FORM_DATE_FORMAT) => { if (value && value.length > 0 && format) { return moment(value, format).isValid(); } diff --git a/app/mixins/notifications.js b/app/mixins/notifications.js index 371b36a29e9..7da6609dadb 100644 --- a/app/mixins/notifications.js +++ b/app/mixins/notifications.js @@ -6,10 +6,10 @@ export default Mixin.create({ notification.set('isRead', true); notification.save() .then(() => { - this.get('notify').success(this.get('l10n').t('Marked as Read successfully')); + this.notify.success(this.l10n.t('Marked as Read successfully')); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('An unexpected error occurred.')); + this.notify.error(this.l10n.t('An unexpected error occurred.')); }); }, markAllAsRead(notifications) { @@ -23,10 +23,10 @@ export default Mixin.create({ Promise .all(bulkPromises) .then(() => { - this.get('notify').success(this.get('l10n').t('Marked all as Read successfully')); + this.notify.success(this.l10n.t('Marked all as Read successfully')); }) .catch(() => { - this.get('notify').error(this.get('l10n').t('An unexpected error occurred.')); + this.notify.error(this.l10n.t('An unexpected error occurred.')); }); } } diff --git a/app/models/access-code.js b/app/models/access-code.js index e1d2ff0f796..7715c1b45a6 100644 --- a/app/models/access-code.js +++ b/app/models/access-code.js @@ -17,7 +17,7 @@ export default ModelBase.extend({ tickets : hasMany('ticket'), marketer : belongsTo('user', { inverse: 'accessCodes' }), isExpired : computed('validTill', function() { - return (new Date() > new Date(this.get('validTill'))); + return new Date() > new Date(this.validTill); }), event: belongsTo('event', { inverse: 'accessCodes' diff --git a/app/models/admin-statistics-user.js b/app/models/admin-statistics-user.js index 3ba29947335..4c0b8545b6d 100644 --- a/app/models/admin-statistics-user.js +++ b/app/models/admin-statistics-user.js @@ -13,6 +13,6 @@ export default ModelBase.extend({ trackOrganizer : attr('number'), total: computed('superAdmin', 'admin', 'verified', 'unverified', function() { - return this.get('superAdmin') + this.get('admin') + this.get('verified') + this.get('unverified'); + return this.superAdmin + this.admin + this.verified + this.unverified; }) }); diff --git a/app/models/custom-form.js b/app/models/custom-form.js index bbedc10ab71..d1c13e8db45 100644 --- a/app/models/custom-form.js +++ b/app/models/custom-form.js @@ -78,10 +78,10 @@ export default ModelBase.extend({ }, name: computed('fieldIdentifier', 'form', function() { - let name = this.get('fieldIdentifier'); - if (this.get('form') === 'session') { + let name = this.fieldIdentifier; + if (this.form === 'session') { name = this.get(`session.${name}`); - } else if (this.get('form') === 'speaker') { + } else if (this.form === 'speaker') { name = this.get(`speaker.${name}`); } else { name = this.get(`attendee.${name}`); @@ -90,18 +90,18 @@ export default ModelBase.extend({ }), isLongText: computed('type', function() { - return this.get('type') === 'text' - && (['shortBiography', 'longBiography', 'longAbstract', 'shortAbstract', 'comments', 'speakingExperience'].includes(this.get('fieldIdentifier'))); + return this.type === 'text' + && (['shortBiography', 'longBiography', 'longAbstract', 'shortAbstract', 'comments', 'speakingExperience'].includes(this.fieldIdentifier)); }), isIncludedObserver: observer('isIncluded', function() { - if (!this.get('isIncluded') && this.get('isRequired')) { + if (!this.isIncluded && this.isRequired) { this.set('isRequired', false); } }), isRequiredObserver: observer('isRequired', function() { - if (!this.get('isIncluded') && this.get('isRequired')) { + if (!this.isIncluded && this.isRequired) { this.set('isIncluded', true); } }) diff --git a/app/models/discount-code.js b/app/models/discount-code.js index 6f794445cdf..f3024847fa2 100644 --- a/app/models/discount-code.js +++ b/app/models/discount-code.js @@ -32,7 +32,7 @@ export default ModelBase.extend({ tickets : hasMany('ticket'), orders : hasMany('order'), isExpired : computed('validTill', function() { - return (new Date() > new Date(this.get('validTill'))); + return new Date() > new Date(this.validTill); }), event: belongsTo('event', { inverse: 'discountCodes' diff --git a/app/models/event.js b/app/models/event.js index 51c23281c57..3632418606a 100644 --- a/app/models/event.js +++ b/app/models/event.js @@ -10,7 +10,7 @@ import { computedSegmentedLink } from 'open-event-frontend/utils/computed-helpers'; import CustomPrimaryKeyMixin from 'open-event-frontend/mixins/custom-primary-key'; -import { groupBy } from 'lodash'; +import { groupBy } from 'lodash-es'; const detectedTimezone = moment.tz.guess(); @@ -153,13 +153,12 @@ export default ModelBase.extend(CustomPrimaryKeyMixin, { segmentedTicketUrl : computedSegmentedLink.bind(this)('ticketUrl'), shortLocationName: computed('locationName', function() { - let eventLocation = this.get('locationName'); - if (!eventLocation) { + if (!this.locationName) { return ''; } - let splitLocations = eventLocation.split(','); + let splitLocations = this.locationName.split(','); if (splitLocations.length <= 3) { - return eventLocation; + return this.locationName; } else { return splitLocations.splice(1, splitLocations.length).join(); } @@ -167,11 +166,11 @@ export default ModelBase.extend(CustomPrimaryKeyMixin, { url: computed('identifier', function() { const origin = this.get('fastboot.isFastBoot') ? `${this.get('fastboot.request.protocol')}//${this.get('fastboot.request.host')}` : location.origin; - return origin + this.get('router').urlFor('public', this.get('id')); + return origin + this.router.urlFor('public', this.id); }), sessionsByState: computed('sessions', function() { - return groupBy(this.get('sessions').toArray(), 'data.state'); + return groupBy(this.sessions.toArray(), 'data.state'); }), _ready: on('ready', function() { diff --git a/app/models/notification-action.js b/app/models/notification-action.js index 71ec2bd2d76..4ac00890175 100644 --- a/app/models/notification-action.js +++ b/app/models/notification-action.js @@ -17,8 +17,7 @@ export default ModelBase.extend({ */ buttonTitle: computed('subject', 'actionType', function() { let action; - const actionType = this.get('actionType'); - switch (actionType) { + switch (this.actionType) { case 'download': action = 'Download'; break; @@ -32,8 +31,7 @@ export default ModelBase.extend({ } let buttonSubject; - const subject = this.get('subject'); - switch (subject) { + switch (this.subject) { case 'event-export': buttonSubject = ' Event'; break; @@ -63,7 +61,7 @@ export default ModelBase.extend({ break; case 'call-for-speakers': - if (this.get('actionType') === 'submit') { + if (this.actionType === 'submit') { buttonSubject = ' Proposal'; } else { buttonSubject = ' Call for Speakers'; @@ -80,9 +78,8 @@ export default ModelBase.extend({ * The route name to which the action button will direct the user to. */ buttonRoute: computed('subject', function() { - const subject = this.get('subject'); let routeName; - switch (subject) { + switch (this.subject) { case 'event-export': routeName = 'events.view'; break; diff --git a/app/models/session.js b/app/models/session.js index 82415d33a6a..5fe1cf2f5e9 100644 --- a/app/models/session.js +++ b/app/models/session.js @@ -38,10 +38,10 @@ export default ModelBase.extend({ creator : belongsTo('user'), status: computed('state', 'deletedAt', function() { - if (this.get('deletedAt') !== null) { + if (this.deletedAt !== null) { return 'deleted'; } else { - return this.get('state'); + return this.state; } }), diff --git a/app/models/social-link.js b/app/models/social-link.js index 4c1521b616d..c2345da1cb5 100644 --- a/app/models/social-link.js +++ b/app/models/social-link.js @@ -13,7 +13,7 @@ export default ModelBase.extend({ event: belongsTo('event'), normalizedName: computed('name', function() { - return this.get('name').trim().toLowerCase(); + return this.name.trim().toLowerCase(); }), isTwitter: equal('normalizedName', 'twitter'), diff --git a/app/models/speakers-call.js b/app/models/speakers-call.js index b1a4480da08..365e373baec 100644 --- a/app/models/speakers-call.js +++ b/app/models/speakers-call.js @@ -23,10 +23,10 @@ export default ModelBase.extend({ endsAtTime : computedDateTimeSplit.bind(this)('endsAt', 'time'), isOpen: computed('startsAt', 'endsAt', function() { - return moment().isAfter(this.get('startsAt')) && moment().isBefore(this.get('endsAt')); + return moment().isAfter(this.startsAt) && moment().isBefore(this.endsAt); }), isInFuture: computed('startsAt', function() { - return moment(this.get('startsAt')).isAfter(); + return moment(this.startsAt).isAfter(); }) }); diff --git a/app/models/ticket.js b/app/models/ticket.js index 5c72b545196..b892ba23271 100644 --- a/app/models/ticket.js +++ b/app/models/ticket.js @@ -43,6 +43,6 @@ export default ModelBase.extend({ salesEndsAtTime : computedDateTimeSplit.bind(this)('salesEndsAt', 'time'), itemTotal: computed('price', 'quantity', function() { - return this.get('price') * this.get('quantity'); + return this.price * this.quantity; }) }); diff --git a/app/models/user.js b/app/models/user.js index f5c7a701a98..57763e3efe6 100644 --- a/app/models/user.js +++ b/app/models/user.js @@ -5,7 +5,7 @@ import { inject as service } from '@ember/service'; import attr from 'ember-data/attr'; import ModelBase from 'open-event-frontend/models/base'; import { hasMany } from 'ember-data/relationships'; -import { toString } from 'lodash'; +import { toString } from 'lodash-es'; export default ModelBase.extend({ @@ -48,11 +48,11 @@ export default ModelBase.extend({ lastAccessedAt : attr('moment', { readOnly: true }), status: computed('lastAccessedAt', 'deletedAt', function() { - if (this.get('deletedAt') == null) { - if (this.get('lastAccessedAt') == null) { + if (this.deletedAt == null) { + if (this.lastAccessedAt == null) { return 'inactive'; } - return ((new Date().getMonth() - new Date(this.get('lastAccessedAt')).getMonth() <= 12) ? 'active' : 'inactive'); + return (new Date().getMonth() - new Date(this.lastAccessedAt).getMonth() <= 12) ? 'active' : 'inactive'; } else { return 'deleted'; } @@ -83,8 +83,8 @@ export default ModelBase.extend({ _didUpdate: on('didUpdate', function(user) { if (toString(user.id) === toString(this.get('authManager.currentUser.id'))) { - user = this.get('store').peekRecord('user', user.id); - this.get('authManager').persistCurrentUser(user); + user = this.store.peekRecord('user', user.id); + this.authManager.persistCurrentUser(user); } }) }); diff --git a/app/router.js b/app/router.js index 8b0d3985c66..2cdf009c540 100644 --- a/app/router.js +++ b/app/router.js @@ -11,20 +11,22 @@ const router = Router.extend(RouterScroll, { session : service(), headData : service(), - didTransition() { - this._super(...arguments); - this._trackPage(); + setTitle(title) { + this.headData.set('title', title); }, - setTitle(title) { - this.get('headData').set('title', title); + init() { + this._super(...arguments); + this.on('routeDidChange', () => { + this._trackPage(); + }); }, _trackPage() { scheduleOnce('afterRender', this, () => { - const page = this.get('url'); + const page = this.url; const title = this.getWithDefault('currentRouteName', 'unknown'); - this.get('metrics').trackPage({ page, title }); + this.metrics.trackPage({ page, title }); this.set('session.currentRouteName', title); }); } diff --git a/app/routes/admin.js b/app/routes/admin.js index 2c895932032..fc884c68296 100644 --- a/app/routes/admin.js +++ b/app/routes/admin.js @@ -3,6 +3,6 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Administration'); + return this.l10n.t('Administration'); } }); diff --git a/app/routes/admin/content.js b/app/routes/admin/content.js index 990adf55278..afc61926371 100644 --- a/app/routes/admin/content.js +++ b/app/routes/admin/content.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Content'); + return this.l10n.t('Content'); } }); diff --git a/app/routes/admin/content/events.js b/app/routes/admin/content/events.js index b0302c3a1ab..34e95446152 100644 --- a/app/routes/admin/content/events.js +++ b/app/routes/admin/content/events.js @@ -2,16 +2,16 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Social Links'); + return this.l10n.t('Social Links'); }, async model() { return { - 'eventTopics': await this.get('store').query('event-topic', { + 'eventTopics': await this.store.query('event-topic', { sort : 'name', include : 'event-sub-topics' }), - 'eventTypes': await this.get('store').query('event-type', {}) + 'eventTypes': await this.store.query('event-type', {}) }; }, setupController(controller, model) { diff --git a/app/routes/admin/content/index.js b/app/routes/admin/content/index.js index ed9af364fb5..881ce46914b 100644 --- a/app/routes/admin/content/index.js +++ b/app/routes/admin/content/index.js @@ -2,10 +2,10 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Social Links'); + return this.l10n.t('Social Links'); }, model() { - return this.get('store').queryRecord('setting', {}); + return this.store.queryRecord('setting', {}); }, actions: { willTransition() { diff --git a/app/routes/admin/content/pages.js b/app/routes/admin/content/pages.js index 0230a8bc400..62b2069b3d2 100644 --- a/app/routes/admin/content/pages.js +++ b/app/routes/admin/content/pages.js @@ -2,10 +2,10 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Pages'); + return this.l10n.t('Pages'); }, model() { - return this.get('store').findAll('page'); + return this.store.findAll('page'); } }); diff --git a/app/routes/admin/content/system-images.js b/app/routes/admin/content/system-images.js index 81ef32410c1..aa3ca598abe 100644 --- a/app/routes/admin/content/system-images.js +++ b/app/routes/admin/content/system-images.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('System Images'); + return this.l10n.t('System Images'); }, model() { return this.store.query('event-topic', { diff --git a/app/routes/admin/content/system-images/list.js b/app/routes/admin/content/system-images/list.js index 2ef85ba9c6a..c3f226725f0 100644 --- a/app/routes/admin/content/system-images/list.js +++ b/app/routes/admin/content/system-images/list.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Sub topics'); + return this.l10n.t('Sub topics'); }, model(params) { this.set('params', params); diff --git a/app/routes/admin/content/translations.js b/app/routes/admin/content/translations.js index be6fd0a06c2..cf07a0cba0b 100644 --- a/app/routes/admin/content/translations.js +++ b/app/routes/admin/content/translations.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Translations'); + return this.l10n.t('Translations'); }, model() { diff --git a/app/routes/admin/events.js b/app/routes/admin/events.js index 24ad026eaf2..47f5eae9bad 100644 --- a/app/routes/admin/events.js +++ b/app/routes/admin/events.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Events'); + return this.l10n.t('Events'); } }); diff --git a/app/routes/admin/events/import.js b/app/routes/admin/events/import.js index 2a2ad1c3a90..e5078787194 100644 --- a/app/routes/admin/events/import.js +++ b/app/routes/admin/events/import.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Import'); + return this.l10n.t('Import'); } }); diff --git a/app/routes/admin/events/list.js b/app/routes/admin/events/list.js index d1213b99086..5e1208e98b0 100644 --- a/app/routes/admin/events/list.js +++ b/app/routes/admin/events/list.js @@ -5,13 +5,13 @@ export default Route.extend({ titleToken() { switch (this.get('params.events_status')) { case 'live': - return this.get('l10n').t('Live'); + return this.l10n.t('Live'); case 'draft': - return this.get('l10n').t('Draft'); + return this.l10n.t('Draft'); case 'past': - return this.get('l10n').t('Past'); + return this.l10n.t('Past'); case 'deleted': - return this.get('l10n').t('Deleted'); + return this.l10n.t('Deleted'); } }, model(params) { diff --git a/app/routes/admin/index.js b/app/routes/admin/index.js index 8f9b9dbfe71..16df88f790d 100644 --- a/app/routes/admin/index.js +++ b/app/routes/admin/index.js @@ -3,28 +3,28 @@ import Route from '@ember/routing/route'; export default Route.extend({ async model() { return { - events: await this.get('store').queryRecord('admin-statistics-event', { + events: await this.store.queryRecord('admin-statistics-event', { filter: { name : 'id', op : 'eq', val : 1 } }), - users: await this.get('store').queryRecord('admin-statistics-user', { + users: await this.store.queryRecord('admin-statistics-user', { filter: { name : 'id', op : 'eq', val : 1 } }), - mails: await this.get('store').queryRecord('admin-statistics-mail', { + mails: await this.store.queryRecord('admin-statistics-mail', { filter: { name : 'id', op : 'eq', val : 1 } }), - sessions: await this.get('store').queryRecord('admin-statistics-session', { + sessions: await this.store.queryRecord('admin-statistics-session', { filter: { name : 'id', op : 'eq', diff --git a/app/routes/admin/messages.js b/app/routes/admin/messages.js index 971c58676c3..db4b555656e 100644 --- a/app/routes/admin/messages.js +++ b/app/routes/admin/messages.js @@ -2,9 +2,9 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Messages'); + return this.l10n.t('Messages'); }, model() { - return this.get('store').query('message-setting', {}); + return this.store.query('message-setting', {}); } }); diff --git a/app/routes/admin/modules.js b/app/routes/admin/modules.js index c3a78774753..5c8d6aaf50b 100644 --- a/app/routes/admin/modules.js +++ b/app/routes/admin/modules.js @@ -2,9 +2,9 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Modules'); + return this.l10n.t('Modules'); }, model() { - return this.get('store').queryRecord('module', {}); + return this.store.queryRecord('module', {}); } }); diff --git a/app/routes/admin/permissions.js b/app/routes/admin/permissions.js index a4e37dc3c57..6708d50c7c6 100644 --- a/app/routes/admin/permissions.js +++ b/app/routes/admin/permissions.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Permissions'); + return this.l10n.t('Permissions'); } }); diff --git a/app/routes/admin/permissions/event-roles.js b/app/routes/admin/permissions/event-roles.js index 82d4e06444c..7a4dc069dc3 100644 --- a/app/routes/admin/permissions/event-roles.js +++ b/app/routes/admin/permissions/event-roles.js @@ -2,13 +2,13 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Event Roles'); + return this.l10n.t('Event Roles'); }, async model() { return { roles : ['Attendee', 'Co-organizer', 'Moderator', 'Organizer', 'Track Organizer', 'Registrar'], - services : await this.get('store').query('service', {}), - permissions : await this.get('store').query('event-role-permission', { 'page[size]': 30 }) + services : await this.store.query('service', {}), + permissions : await this.store.query('event-role-permission', { 'page[size]': 30 }) }; } }); diff --git a/app/routes/admin/permissions/system-roles.js b/app/routes/admin/permissions/system-roles.js index a20e884f1e4..f48855be1cd 100644 --- a/app/routes/admin/permissions/system-roles.js +++ b/app/routes/admin/permissions/system-roles.js @@ -2,13 +2,13 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('System Roles'); + return this.l10n.t('System Roles'); }, async model() { return { - userPermissions : await this.get('store').findAll('user-permission'), - systemRoles : await this.get('store').findAll('custom-system-role'), - panelPermissions : await this.get('store').findAll('panel-permission') + userPermissions : await this.store.findAll('user-permission'), + systemRoles : await this.store.findAll('custom-system-role'), + panelPermissions : await this.store.findAll('panel-permission') }; }, actions: { diff --git a/app/routes/admin/reports.js b/app/routes/admin/reports.js index 6a5b9731a4d..c7edec58ca3 100644 --- a/app/routes/admin/reports.js +++ b/app/routes/admin/reports.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Reports'); + return this.l10n.t('Reports'); } }); diff --git a/app/routes/admin/reports/kubernetes-server-logs.js b/app/routes/admin/reports/kubernetes-server-logs.js index b08c584c4e2..647a0c93307 100644 --- a/app/routes/admin/reports/kubernetes-server-logs.js +++ b/app/routes/admin/reports/kubernetes-server-logs.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Kubernetes Server Logs'); + return this.l10n.t('Kubernetes Server Logs'); } }); diff --git a/app/routes/admin/reports/system-logs.js b/app/routes/admin/reports/system-logs.js index 83881ce259f..a6d3f00f009 100644 --- a/app/routes/admin/reports/system-logs.js +++ b/app/routes/admin/reports/system-logs.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('System Logs'); + return this.l10n.t('System Logs'); } }); diff --git a/app/routes/admin/reports/system-logs/activity-logs.js b/app/routes/admin/reports/system-logs/activity-logs.js index d5c3e167c42..c9f41cf61dc 100644 --- a/app/routes/admin/reports/system-logs/activity-logs.js +++ b/app/routes/admin/reports/system-logs/activity-logs.js @@ -2,11 +2,11 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Activity Logs'); + return this.l10n.t('Activity Logs'); }, model() { - return this.get('store').query('activity', { + return this.store.query('activity', { 'page[size]' : 100, sort : '-time' }); diff --git a/app/routes/admin/reports/system-logs/mail-logs.js b/app/routes/admin/reports/system-logs/mail-logs.js index af1b5f64f8f..778014e725f 100644 --- a/app/routes/admin/reports/system-logs/mail-logs.js +++ b/app/routes/admin/reports/system-logs/mail-logs.js @@ -2,11 +2,11 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Mail Logs'); + return this.l10n.t('Mail Logs'); }, model() { - return this.get('store').query('mail', { + return this.store.query('mail', { 'page[size]' : 100, sort : '-time' }); diff --git a/app/routes/admin/reports/system-logs/notification-logs.js b/app/routes/admin/reports/system-logs/notification-logs.js index c7a2be8bc16..3c43b86c33c 100644 --- a/app/routes/admin/reports/system-logs/notification-logs.js +++ b/app/routes/admin/reports/system-logs/notification-logs.js @@ -2,11 +2,11 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Notification Logs'); + return this.l10n.t('Notification Logs'); }, model() { - return this.get('store').query('notification', { + return this.store.query('notification', { include : 'user', 'page[size]' : 100, sort : '-received-at' diff --git a/app/routes/admin/sales.js b/app/routes/admin/sales.js index def406948cf..0b3253e915e 100644 --- a/app/routes/admin/sales.js +++ b/app/routes/admin/sales.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Sales'); + return this.l10n.t('Sales'); } }); diff --git a/app/routes/admin/sales/discounted-events.js b/app/routes/admin/sales/discounted-events.js index c586b4b83f7..6e2bd2ee1aa 100644 --- a/app/routes/admin/sales/discounted-events.js +++ b/app/routes/admin/sales/discounted-events.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Discounted Events'); + return this.l10n.t('Discounted Events'); }, model() { diff --git a/app/routes/admin/sales/fees.js b/app/routes/admin/sales/fees.js index cb8a01d1540..d7f9d25c387 100644 --- a/app/routes/admin/sales/fees.js +++ b/app/routes/admin/sales/fees.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Fees'); + return this.l10n.t('Fees'); }, model() { diff --git a/app/routes/admin/sales/index.js b/app/routes/admin/sales/index.js index a4116e00c5d..acacddfbcc5 100644 --- a/app/routes/admin/sales/index.js +++ b/app/routes/admin/sales/index.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Overview'); + return this.l10n.t('Overview'); }, model() { diff --git a/app/routes/admin/sales/locations.js b/app/routes/admin/sales/locations.js index b3eb8ab8320..cc31cb5fe4a 100644 --- a/app/routes/admin/sales/locations.js +++ b/app/routes/admin/sales/locations.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Location'); + return this.l10n.t('Location'); }, model() { diff --git a/app/routes/admin/sales/marketer.js b/app/routes/admin/sales/marketer.js index e42546308d4..df4694a7400 100644 --- a/app/routes/admin/sales/marketer.js +++ b/app/routes/admin/sales/marketer.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Marketer'); + return this.l10n.t('Marketer'); }, model() { diff --git a/app/routes/admin/sales/organizers.js b/app/routes/admin/sales/organizers.js index 1eb6c29c9fd..8db04cafeac 100644 --- a/app/routes/admin/sales/organizers.js +++ b/app/routes/admin/sales/organizers.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Organizer'); + return this.l10n.t('Organizer'); }, model() { diff --git a/app/routes/admin/sales/status.js b/app/routes/admin/sales/status.js index 478d92c4177..82841b966c3 100644 --- a/app/routes/admin/sales/status.js +++ b/app/routes/admin/sales/status.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Status'); + return this.l10n.t('Status'); }, model() { return this.store.query('event-invoice', { include: 'event,user' }); diff --git a/app/routes/admin/sessions.js b/app/routes/admin/sessions.js index 9b7a3fc908e..7fdce30055a 100644 --- a/app/routes/admin/sessions.js +++ b/app/routes/admin/sessions.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Sessions'); + return this.l10n.t('Sessions'); } }); diff --git a/app/routes/admin/sessions/list.js b/app/routes/admin/sessions/list.js index 9fd14a442e2..be62eab8b86 100644 --- a/app/routes/admin/sessions/list.js +++ b/app/routes/admin/sessions/list.js @@ -4,17 +4,17 @@ export default Route.extend({ titleToken() { switch (this.get('params.sessions_state')) { case 'confirmed': - return this.get('l10n').t('Confirmed'); + return this.l10n.t('Confirmed'); case 'pending': - return this.get('l10n').t('Pending'); + return this.l10n.t('Pending'); case 'accepted': - return this.get('l10n').t('Accepted'); + return this.l10n.t('Accepted'); case 'rejected': - return this.get('l10n').t('Rejected'); + return this.l10n.t('Rejected'); case 'deleted': - return this.get('l10n').t('Deleted'); + return this.l10n.t('Deleted'); default: - return this.get('l10n').t('Session'); + return this.l10n.t('Session'); } }, model(params) { @@ -163,7 +163,7 @@ export default Route.extend({ } ]; } - return this.get('store').query('session', { + return this.store.query('session', { get_trashed : true, include : 'event,speakers', filter : filterOptions, diff --git a/app/routes/admin/settings.js b/app/routes/admin/settings.js index a2cdfeb9e42..1a66242959e 100644 --- a/app/routes/admin/settings.js +++ b/app/routes/admin/settings.js @@ -2,9 +2,9 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Settings'); + return this.l10n.t('Settings'); }, model() { - return this.get('store').queryRecord('setting', {}); + return this.store.queryRecord('setting', {}); } }); diff --git a/app/routes/admin/settings/analytics.js b/app/routes/admin/settings/analytics.js index 8c61bc9c80a..7ecdc0cbc05 100644 --- a/app/routes/admin/settings/analytics.js +++ b/app/routes/admin/settings/analytics.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Analytics'); + return this.l10n.t('Analytics'); }, actions: { willTransition() { diff --git a/app/routes/admin/settings/images.js b/app/routes/admin/settings/images.js index a79612c0fc3..dbc07ae1c6c 100644 --- a/app/routes/admin/settings/images.js +++ b/app/routes/admin/settings/images.js @@ -2,13 +2,13 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Images'); + return this.l10n.t('Images'); }, async model() { return { - speakerImageSize : await this.get('store').queryRecord('speaker-image-size', 1), - eventImageSize : await this.get('store').queryRecord('event-image-size', 1) + speakerImageSize : await this.store.queryRecord('speaker-image-size', 1), + eventImageSize : await this.store.queryRecord('event-image-size', 1) }; }, actions: { diff --git a/app/routes/admin/settings/index.js b/app/routes/admin/settings/index.js index 566345967a7..7f559df5cfd 100644 --- a/app/routes/admin/settings/index.js +++ b/app/routes/admin/settings/index.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('System'); + return this.l10n.t('System'); }, actions: { willTransition() { diff --git a/app/routes/admin/settings/microservices.js b/app/routes/admin/settings/microservices.js index 35c7f1f377b..8dce2fadc5a 100644 --- a/app/routes/admin/settings/microservices.js +++ b/app/routes/admin/settings/microservices.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Microservices'); + return this.l10n.t('Microservices'); }, actions: { willTransition() { diff --git a/app/routes/admin/settings/payment-gateway.js b/app/routes/admin/settings/payment-gateway.js index f5eb07a8c77..9899f51b979 100644 --- a/app/routes/admin/settings/payment-gateway.js +++ b/app/routes/admin/settings/payment-gateway.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Payment Gateway'); + return this.l10n.t('Payment Gateway'); }, actions: { willTransition() { diff --git a/app/routes/admin/settings/ticket-fees.js b/app/routes/admin/settings/ticket-fees.js index 58c97476850..28ed4fcbdd1 100644 --- a/app/routes/admin/settings/ticket-fees.js +++ b/app/routes/admin/settings/ticket-fees.js @@ -2,10 +2,10 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Ticket Fees'); + return this.l10n.t('Ticket Fees'); }, model() { - return this.get('store').findAll('ticket-fee'); + return this.store.findAll('ticket-fee'); }, actions: { willTransition() { diff --git a/app/routes/admin/users.js b/app/routes/admin/users.js index 04a6d778cdd..c9bf10fac5c 100644 --- a/app/routes/admin/users.js +++ b/app/routes/admin/users.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Users'); + return this.l10n.t('Users'); } }); diff --git a/app/routes/admin/users/list.js b/app/routes/admin/users/list.js index 8c6e0451f3c..52fd0bdc3dc 100644 --- a/app/routes/admin/users/list.js +++ b/app/routes/admin/users/list.js @@ -5,16 +5,16 @@ export default Route.extend({ titleToken() { switch (this.get('params.users_status')) { case 'active': - return this.get('l10n').t('Active'); + return this.l10n.t('Active'); case 'deleted': - return this.get('l10n').t('Deleted'); + return this.l10n.t('Deleted'); case 'inactive': - return this.get('l10n').t('Inactive'); + return this.l10n.t('Inactive'); } }, beforeModel(transition) { this._super(...arguments); - const userState = transition.params[transition.targetName].users_status; + const userState = transition.to.params.users_status; if (!['all', 'deleted', 'active', 'inactive'].includes(userState)) { this.replaceWith('admin.users.view', userState); } @@ -74,7 +74,7 @@ export default Route.extend({ } ]; } - return this.get('store').query('user', { + return this.store.query('user', { include : 'events', get_trashed : true, filter : filterOptions, diff --git a/app/routes/admin/users/view/events.js b/app/routes/admin/users/view/events.js index 96706d47ffc..4837989373d 100644 --- a/app/routes/admin/users/view/events.js +++ b/app/routes/admin/users/view/events.js @@ -3,6 +3,6 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Events'); + return this.l10n.t('Events'); } }); diff --git a/app/routes/admin/users/view/events/list.js b/app/routes/admin/users/view/events/list.js index 49e3099b610..dca4b4c300a 100644 --- a/app/routes/admin/users/view/events/list.js +++ b/app/routes/admin/users/view/events/list.js @@ -6,11 +6,11 @@ export default Route.extend(AuthenticatedRouteMixin, { titleToken() { switch (this.get('params.event_status')) { case 'live': - return this.get('l10n').t('Live'); + return this.l10n.t('Live'); case 'draft': - return this.get('l10n').t('Draft'); + return this.l10n.t('Draft'); case 'past': - return this.get('l10n').t('Past'); + return this.l10n.t('Past'); } }, async model(params) { diff --git a/app/routes/admin/users/view/sessions.js b/app/routes/admin/users/view/sessions.js index 2d69bf613ba..2a2a1ec56b9 100644 --- a/app/routes/admin/users/view/sessions.js +++ b/app/routes/admin/users/view/sessions.js @@ -3,6 +3,6 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('My sessions'); + return this.l10n.t('My sessions'); } }); diff --git a/app/routes/admin/users/view/sessions/list.js b/app/routes/admin/users/view/sessions/list.js index bb46101d5b1..206cdabe114 100644 --- a/app/routes/admin/users/view/sessions/list.js +++ b/app/routes/admin/users/view/sessions/list.js @@ -6,9 +6,9 @@ export default Route.extend(AuthenticatedRouteMixin, { titleToken() { switch (this.get('params.session_status')) { case 'upcoming': - return this.get('l10n').t('Upcoming'); + return this.l10n.t('Upcoming'); case 'past': - return this.get('l10n').t('Past'); + return this.l10n.t('Past'); } }, model(params) { diff --git a/app/routes/admin/users/view/settings.js b/app/routes/admin/users/view/settings.js index 18b322c95f1..1affd3ed9f0 100644 --- a/app/routes/admin/users/view/settings.js +++ b/app/routes/admin/users/view/settings.js @@ -3,7 +3,7 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Settings'); + return this.l10n.t('Settings'); }, model() { const currentUser = this.modelFor('admin.users.view'); diff --git a/app/routes/admin/users/view/settings/applications.js b/app/routes/admin/users/view/settings/applications.js index c6b34d05a49..c7fabb7845e 100644 --- a/app/routes/admin/users/view/settings/applications.js +++ b/app/routes/admin/users/view/settings/applications.js @@ -3,6 +3,6 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Applications'); + return this.l10n.t('Applications'); } }); diff --git a/app/routes/admin/users/view/settings/email-preferences.js b/app/routes/admin/users/view/settings/email-preferences.js index 32c0ec95195..eb9f0460043 100644 --- a/app/routes/admin/users/view/settings/email-preferences.js +++ b/app/routes/admin/users/view/settings/email-preferences.js @@ -3,7 +3,7 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Email Preferences'); + return this.l10n.t('Email Preferences'); }, model() { const currentUser = this.modelFor('admin.users.view'); diff --git a/app/routes/admin/users/view/tickets.js b/app/routes/admin/users/view/tickets.js index eb6cd9c5fd7..21029fcd7e8 100644 --- a/app/routes/admin/users/view/tickets.js +++ b/app/routes/admin/users/view/tickets.js @@ -3,6 +3,6 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('My Tickets'); + return this.l10n.t('My Tickets'); } }); diff --git a/app/routes/admin/users/view/tickets/index.js b/app/routes/admin/users/view/tickets/index.js index 66db93e1f80..8769227e6ae 100644 --- a/app/routes/admin/users/view/tickets/index.js +++ b/app/routes/admin/users/view/tickets/index.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Upcoming'); + return this.l10n.t('Upcoming'); }, beforeModel() { this._super(...arguments); diff --git a/app/routes/admin/users/view/tickets/list.js b/app/routes/admin/users/view/tickets/list.js index dcabccffa8a..558a836be23 100644 --- a/app/routes/admin/users/view/tickets/list.js +++ b/app/routes/admin/users/view/tickets/list.js @@ -6,9 +6,9 @@ export default Route.extend(AuthenticatedRouteMixin, { titleToken() { switch (this.get('params.tickets_status')) { case 'upcoming': - return this.get('l10n').t('Upcoming'); + return this.l10n.t('Upcoming'); case 'past': - return this.get('l10n').t('Past'); + return this.l10n.t('Past'); } }, async model(params) { diff --git a/app/routes/application.js b/app/routes/application.js index f4f1e491435..e35ea21df1d 100644 --- a/app/routes/application.js +++ b/app/routes/application.js @@ -1,7 +1,7 @@ import Route from '@ember/routing/route'; import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin'; import { inject as service } from '@ember/service'; -import { merge, values, isEmpty } from 'lodash'; +import { merge, values, isEmpty } from 'lodash-es'; export default Route.extend(ApplicationRouteMixin, { session: service(), @@ -16,8 +16,8 @@ export default Route.extend(ApplicationRouteMixin, { async beforeModel(transition) { this._super(...arguments); - await this.get('authManager').initialize(); - await this.get('settings').initialize(); + await this.authManager.initialize(); + await this.settings.initialize(); if (!transition.intent.url.includes('login') && !transition.intent.url.includes('reset-password')) { this.set('session.previousRouteName', transition.intent.url); } else { @@ -28,7 +28,7 @@ export default Route.extend(ApplicationRouteMixin, { async model() { let notifications = []; if (this.get('session.isAuthenticated')) { - notifications = await this.get('authManager.currentUser').query('notifications', { + notifications = await this.authManager.currentUser.query('notifications', { filter: [ { name : 'is-read', @@ -42,14 +42,14 @@ export default Route.extend(ApplicationRouteMixin, { return { notifications, - pages: await this.get('store').query('page', { + pages: await this.store.query('page', { sort: 'index' }), cookiePolicy : this.get('settings.cookiePolicy'), cookiePolicyLink : this.get('settings.cookiePolicyLink'), - socialLinks : await this.get('store').queryRecord('setting', {}), - eventTypes : await this.get('store').findAll('event-type'), - eventLocations : await this.get('store').findAll('event-location') + socialLinks : await this.store.queryRecord('setting', {}), + eventTypes : await this.store.findAll('event-type'), + eventLocations : await this.store.findAll('event-location') }; }, diff --git a/app/routes/create.js b/app/routes/create.js index b5de84790d2..e76b1ce0ca7 100644 --- a/app/routes/create.js +++ b/app/routes/create.js @@ -4,7 +4,7 @@ import EventWizardMixin from 'open-event-frontend/mixins/event-wizard'; export default Route.extend(AuthenticatedRouteMixin, EventWizardMixin, { titleToken() { - return this.get('l10n').t('Create an Event'); + return this.l10n.t('Create an Event'); }, async model() { return { @@ -14,7 +14,7 @@ export default Route.extend(AuthenticatedRouteMixin, EventWizardMixin, { copyright : this.store.createRecord('event-copyright'), stripeAuthorization : this.store.createRecord('stripe-authorization') }), - module : await this.get('store').queryRecord('module', {}), + module : await this.store.queryRecord('module', {}), types : await this.store.query('event-type', { sort: 'name' }), diff --git a/app/routes/events.js b/app/routes/events.js index 96706d47ffc..4837989373d 100644 --- a/app/routes/events.js +++ b/app/routes/events.js @@ -3,6 +3,6 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Events'); + return this.l10n.t('Events'); } }); diff --git a/app/routes/events/import.js b/app/routes/events/import.js index 102ba55029d..32796399877 100644 --- a/app/routes/events/import.js +++ b/app/routes/events/import.js @@ -2,11 +2,11 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Import'); + return this.l10n.t('Import'); }, async model() { - const data = await this.get('store').findAll('importJob'); + const data = await this.store.findAll('importJob'); return { data, diff --git a/app/routes/events/list.js b/app/routes/events/list.js index 56bc4bcd39a..ae9b1d6286c 100644 --- a/app/routes/events/list.js +++ b/app/routes/events/list.js @@ -5,16 +5,16 @@ export default Route.extend({ titleToken() { switch (this.get('params.event_state')) { case 'live': - return this.get('l10n').t('Live'); + return this.l10n.t('Live'); case 'draft': - return this.get('l10n').t('Draft'); + return this.l10n.t('Draft'); case 'past': - return this.get('l10n').t('Past'); + return this.l10n.t('Past'); } }, beforeModel(transition) { this._super(...arguments); - const eventState = transition.params[transition.targetName].event_state; + const eventState = transition.to.params.event_state; if (!['live', 'draft', 'past'].includes(eventState)) { this.replaceWith('events.view', eventState); } diff --git a/app/routes/events/view.js b/app/routes/events/view.js index d688d9b3c39..b807a247b11 100644 --- a/app/routes/events/view.js +++ b/app/routes/events/view.js @@ -1,8 +1,7 @@ import Route from '@ember/routing/route'; -import Ember from 'ember'; +import { set } from '@ember/object'; import { inject as service } from '@ember/service'; -const { set } = Ember; export default Route.extend({ headData: service(), titleToken(model) { diff --git a/app/routes/events/view/edit.js b/app/routes/events/view/edit.js index 9f28baa0253..d79494367c7 100644 --- a/app/routes/events/view/edit.js +++ b/app/routes/events/view/edit.js @@ -4,7 +4,7 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, EventWizardMixin, { titleToken() { - return this.get('l10n').t('Edit Event'); + return this.l10n.t('Edit Event'); }, beforeModel(transition) { diff --git a/app/routes/events/view/edit/basic-details.js b/app/routes/events/view/edit/basic-details.js index 00c98f044a2..b4f0c677c69 100644 --- a/app/routes/events/view/edit/basic-details.js +++ b/app/routes/events/view/edit/basic-details.js @@ -4,7 +4,7 @@ import EventWizardMixin from 'open-event-frontend/mixins/event-wizard'; export default Route.extend(EventWizardMixin, { titleToken() { - return this.get('l10n').t('Basic Details'); + return this.l10n.t('Basic Details'); }, model() { diff --git a/app/routes/events/view/edit/sessions-speakers.js b/app/routes/events/view/edit/sessions-speakers.js index d3930c810ff..eb82f583fc5 100644 --- a/app/routes/events/view/edit/sessions-speakers.js +++ b/app/routes/events/view/edit/sessions-speakers.js @@ -4,7 +4,7 @@ import EventWizardMixin from 'open-event-frontend/mixins/event-wizard'; export default Route.extend(EventWizardMixin, { titleToken() { - return this.get('l10n').t('Sessions & Speakers'); + return this.l10n.t('Sessions & Speakers'); }, async model() { diff --git a/app/routes/events/view/edit/sponsors.js b/app/routes/events/view/edit/sponsors.js index e4f1b41d268..fab8213eaae 100644 --- a/app/routes/events/view/edit/sponsors.js +++ b/app/routes/events/view/edit/sponsors.js @@ -4,7 +4,7 @@ import EventWizardMixin from 'open-event-frontend/mixins/event-wizard'; export default Route.extend(EventWizardMixin, { titleToken() { - return this.get('l10n').t('Sponsors'); + return this.l10n.t('Sponsors'); }, async model() { diff --git a/app/routes/events/view/export.js b/app/routes/events/view/export.js index ac536e6a903..94f08faab28 100644 --- a/app/routes/events/view/export.js +++ b/app/routes/events/view/export.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Export'); + return this.l10n.t('Export'); } }); diff --git a/app/routes/events/view/scheduler.js b/app/routes/events/view/scheduler.js index c2a3b3b8e76..7e70701c874 100644 --- a/app/routes/events/view/scheduler.js +++ b/app/routes/events/view/scheduler.js @@ -1,7 +1,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Scheduler'); + return this.l10n.t('Scheduler'); }, actions: { refresh() { diff --git a/app/routes/events/view/sessions.js b/app/routes/events/view/sessions.js index 1647fe83509..b47e6802985 100644 --- a/app/routes/events/view/sessions.js +++ b/app/routes/events/view/sessions.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Sessions'); + return this.l10n.t('Sessions'); }, model() { return this.modelFor('events.view'); diff --git a/app/routes/events/view/sessions/create.js b/app/routes/events/view/sessions/create.js index 02b38e30606..b5004d32b4c 100644 --- a/app/routes/events/view/sessions/create.js +++ b/app/routes/events/view/sessions/create.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Create session'); + return this.l10n.t('Create session'); }, async model() { const eventDetails = this.modelFor('events.view'); @@ -16,14 +16,14 @@ export default Route.extend({ include : 'sessions', 'page[size]' : 0 }), - session: await this.get('store').createRecord('session', { + session: await this.store.createRecord('session', { event : eventDetails, creator : this.get('authManager.currentUser'), startsAt : null, endsAt : null, speakers : [] }), - speaker: await this.get('store').createRecord('speaker', { + speaker: await this.store.createRecord('speaker', { event : eventDetails, user : this.get('authManager.currentUser') }), @@ -33,7 +33,7 @@ export default Route.extend({ }, resetController(controller) { this._super(...arguments); - const model = controller.get('model'); + const { model } = controller; if (!model.speaker.id) { model.speaker.unloadRecord(); } diff --git a/app/routes/events/view/sessions/edit.js b/app/routes/events/view/sessions/edit.js index 17a04a6fe14..ec2130642e2 100644 --- a/app/routes/events/view/sessions/edit.js +++ b/app/routes/events/view/sessions/edit.js @@ -3,8 +3,8 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken(model) { - var sessionTitle = model.session.title; - return this.get('l10n').t(sessionTitle.concat('-Edit')); + let sessionTitle = model.session.title; + return this.l10n.t(sessionTitle.concat('-Edit')); }, async model(params) { const eventDetails = this.modelFor('events.view'); @@ -14,7 +14,7 @@ export default Route.extend(AuthenticatedRouteMixin, { 'page[size]' : 50, sort : 'id' }), - session: await this.get('store').findRecord('session', params.session_id, { + session: await this.store.findRecord('session', params.session_id, { include: 'track,session-type,speakers' }), tracks : await eventDetails.query('tracks', {}), @@ -22,7 +22,7 @@ export default Route.extend(AuthenticatedRouteMixin, { speakers : await eventDetails.query('speakers', { 'page[size]': 0 }), - speaker: await this.get('store').createRecord('speaker', { + speaker: await this.store.createRecord('speaker', { event : eventDetails, user : this.get('authManager.currentUser') }) diff --git a/app/routes/events/view/sessions/list.js b/app/routes/events/view/sessions/list.js index 00f537cb44c..cc51aaac164 100644 --- a/app/routes/events/view/sessions/list.js +++ b/app/routes/events/view/sessions/list.js @@ -4,15 +4,15 @@ export default Route.extend({ titleToken() { switch (this.get('params.session_status')) { case 'pending': - return this.get('l10n').t('Pending'); + return this.l10n.t('Pending'); case 'confirmed': - return this.get('l10n').t('Confirmed'); + return this.l10n.t('Confirmed'); case 'accepted': - return this.get('l10n').t('Accepted'); + return this.l10n.t('Accepted'); case 'rejected': - return this.get('l10n').t('Rejected'); + return this.l10n.t('Rejected'); default: - return this.get('l10n').t('Session'); + return this.l10n.t('Session'); } }, async model(params) { diff --git a/app/routes/events/view/speakers.js b/app/routes/events/view/speakers.js index f376e224cd5..c4d570d8f46 100644 --- a/app/routes/events/view/speakers.js +++ b/app/routes/events/view/speakers.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Speakers'); + return this.l10n.t('Speakers'); }, model() { return this.modelFor('events.view'); diff --git a/app/routes/events/view/speakers/create.js b/app/routes/events/view/speakers/create.js index baa43e4068f..63f84bfae6f 100644 --- a/app/routes/events/view/speakers/create.js +++ b/app/routes/events/view/speakers/create.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Create session'); + return this.l10n.t('Create session'); }, async model() { const eventDetails = this.modelFor('events.view'); @@ -12,13 +12,13 @@ export default Route.extend({ 'page[size]' : 50, sort : 'id' }), - session: await this.get('store').createRecord('session', { + session: await this.store.createRecord('session', { event : eventDetails, creator : this.get('authManager.currentUser') }), sessions: await eventDetails.query('sessions', { }), - speaker: await this.get('store').createRecord('speaker', { + speaker: await this.store.createRecord('speaker', { event : eventDetails, user : this.get('authManager.currentUser') }), @@ -28,7 +28,7 @@ export default Route.extend({ }, resetController(controller) { this._super(...arguments); - const model = controller.get('model'); + const { model } = controller; if (!controller.get('model.speaker.id')) { model.speaker.unloadRecord(); } diff --git a/app/routes/events/view/speakers/edit.js b/app/routes/events/view/speakers/edit.js index 2c0701878e5..bd4eefedf9c 100644 --- a/app/routes/events/view/speakers/edit.js +++ b/app/routes/events/view/speakers/edit.js @@ -3,8 +3,8 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken(model) { - var speakerName = model.speaker.get('name'); - return this.get('l10n').t(speakerName.concat('-Edit')); + let speakerName = model.speaker.get('name'); + return this.l10n.t(speakerName.concat('-Edit')); }, async model(params) { const eventDetails = this.modelFor('events.view'); @@ -14,7 +14,7 @@ export default Route.extend(AuthenticatedRouteMixin, { 'page[size]' : 50, sort : 'id' }), - speaker: await this.get('store').findRecord('speaker', params.speaker_id) + speaker: await this.store.findRecord('speaker', params.speaker_id) }; } }); diff --git a/app/routes/events/view/speakers/list.js b/app/routes/events/view/speakers/list.js index d322d910a6c..75f8418feb3 100644 --- a/app/routes/events/view/speakers/list.js +++ b/app/routes/events/view/speakers/list.js @@ -4,11 +4,11 @@ export default Route.extend({ titleToken() { switch (this.get('params.speakers_status')) { case 'pending': - return this.get('l10n').t('Pending'); + return this.l10n.t('Pending'); case 'accepted': - return this.get('l10n').t('Accepted'); + return this.l10n.t('Accepted'); case 'rejected': - return this.get('l10n').t('Rejected'); + return this.l10n.t('Rejected'); } }, async model(params) { diff --git a/app/routes/events/view/tickets.js b/app/routes/events/view/tickets.js index 3ab0746e693..f7b1cd073df 100644 --- a/app/routes/events/view/tickets.js +++ b/app/routes/events/view/tickets.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Tickets'); + return this.l10n.t('Tickets'); } }); diff --git a/app/routes/events/view/tickets/access-codes.js b/app/routes/events/view/tickets/access-codes.js index 30da3b0154f..8fbc6581c56 100644 --- a/app/routes/events/view/tickets/access-codes.js +++ b/app/routes/events/view/tickets/access-codes.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Access codes'); + return this.l10n.t('Access codes'); } }); diff --git a/app/routes/events/view/tickets/access-codes/create.js b/app/routes/events/view/tickets/access-codes/create.js index a1679be4a28..dacd2e34002 100644 --- a/app/routes/events/view/tickets/access-codes/create.js +++ b/app/routes/events/view/tickets/access-codes/create.js @@ -4,11 +4,11 @@ import RSVP from 'rsvp'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Create'); + return this.l10n.t('Create'); }, async model() { return RSVP.hash({ - accessCode: this.get('store').createRecord('access-code', { + accessCode: this.store.createRecord('access-code', { event : this.modelFor('events.view'), tickets : [], marketer : this.get('authManager.currentUser'), diff --git a/app/routes/events/view/tickets/access-codes/edit.js b/app/routes/events/view/tickets/access-codes/edit.js index f953bbc7f10..b932ecd8a68 100644 --- a/app/routes/events/view/tickets/access-codes/edit.js +++ b/app/routes/events/view/tickets/access-codes/edit.js @@ -4,8 +4,8 @@ import RSVP from 'rsvp'; export default Route.extend(AuthenticatedRouteMixin, { titleToken(model) { - var access_code = model.accessCode.get('code'); - return this.get('l10n').t(access_code.concat('-Edit')); + let access_code = model.accessCode.get('code'); + return this.l10n.t(access_code.concat('-Edit')); }, model(params) { return RSVP.hash({ diff --git a/app/routes/events/view/tickets/access-codes/list.js b/app/routes/events/view/tickets/access-codes/list.js index a948f05645d..42730d9c346 100644 --- a/app/routes/events/view/tickets/access-codes/list.js +++ b/app/routes/events/view/tickets/access-codes/list.js @@ -5,11 +5,11 @@ export default Route.extend({ titleToken() { switch (this.get('params.access_status')) { case 'active': - return this.get('l10n').t('Active'); + return this.l10n.t('Active'); case 'inactive': - return this.get('l10n').t('Inactive'); + return this.l10n.t('Inactive'); case 'expired': - return this.get('l10n').t('Expired'); + return this.l10n.t('Expired'); } }, async model(params) { diff --git a/app/routes/events/view/tickets/add-order.js b/app/routes/events/view/tickets/add-order.js index 8d2f618452c..121b87cf3b3 100644 --- a/app/routes/events/view/tickets/add-order.js +++ b/app/routes/events/view/tickets/add-order.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Add Order'); + return this.l10n.t('Add Order'); }, async model() { const eventDetails = this.modelFor('events.view'); diff --git a/app/routes/events/view/tickets/attendees.js b/app/routes/events/view/tickets/attendees.js index c9c34bf662f..691cf8add70 100644 --- a/app/routes/events/view/tickets/attendees.js +++ b/app/routes/events/view/tickets/attendees.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Attendees'); + return this.l10n.t('Attendees'); } }); diff --git a/app/routes/events/view/tickets/attendees/list.js b/app/routes/events/view/tickets/attendees/list.js index a09aae0be7a..8afabd01189 100644 --- a/app/routes/events/view/tickets/attendees/list.js +++ b/app/routes/events/view/tickets/attendees/list.js @@ -4,19 +4,19 @@ export default Route.extend({ titleToken() { switch (this.get('params.attendees_status')) { case 'placed': - return this.get('l10n').t('Placed'); + return this.l10n.t('Placed'); case 'pending': - return this.get('l10n').t('Pending'); + return this.l10n.t('Pending'); case 'expired': - return this.get('l10n').t('Expired'); + return this.l10n.t('Expired'); case 'cancelled': - return this.get('l10n').t('Cancelled'); + return this.l10n.t('Cancelled'); case 'checkedIn': - return this.get('l10n').t('Checked In'); + return this.l10n.t('Checked In'); case 'notCheckedIn': - return this.get('l10n').t('Not Checked In'); + return this.l10n.t('Not Checked In'); case 'all': - return this.get('l10n').t('All'); + return this.l10n.t('All'); } }, async model(params) { diff --git a/app/routes/events/view/tickets/discount-codes.js b/app/routes/events/view/tickets/discount-codes.js index b4197253401..b40884a773f 100644 --- a/app/routes/events/view/tickets/discount-codes.js +++ b/app/routes/events/view/tickets/discount-codes.js @@ -3,6 +3,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Discount codes'); + return this.l10n.t('Discount codes'); } }); diff --git a/app/routes/events/view/tickets/discount-codes/create.js b/app/routes/events/view/tickets/discount-codes/create.js index adf299abee3..76b54288e67 100644 --- a/app/routes/events/view/tickets/discount-codes/create.js +++ b/app/routes/events/view/tickets/discount-codes/create.js @@ -3,17 +3,17 @@ import moment from 'moment'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Create'); + return this.l10n.t('Create'); }, async model() { let tickets = await this.modelFor('events.view').query('tickets', {}); let event = this.modelFor('events.view'); return { - discountCode: this.get('store').createRecord('discount-code', { + discountCode: this.store.createRecord('discount-code', { event, tickets : [], usedFor : 'ticket', - marketer : this.get('authManager.currentUser') + marketer : this.authManager.currentUser }), tickets, event diff --git a/app/routes/events/view/tickets/discount-codes/edit.js b/app/routes/events/view/tickets/discount-codes/edit.js index 4f9a1663f4a..5aaff04cc2d 100644 --- a/app/routes/events/view/tickets/discount-codes/edit.js +++ b/app/routes/events/view/tickets/discount-codes/edit.js @@ -4,8 +4,8 @@ import RSVP from 'rsvp'; export default Route.extend(AuthenticatedRouteMixin, { titleToken(model) { - var discount_code = model.discountCode.get('code'); - return this.get('l10n').t(discount_code.concat('-Edit')); + let discount_code = model.discountCode.get('code'); + return this.l10n.t(discount_code.concat('-Edit')); }, model(params) { return RSVP.hash({ diff --git a/app/routes/events/view/tickets/discount-codes/list.js b/app/routes/events/view/tickets/discount-codes/list.js index 533b49386c6..331b92cb839 100644 --- a/app/routes/events/view/tickets/discount-codes/list.js +++ b/app/routes/events/view/tickets/discount-codes/list.js @@ -5,11 +5,11 @@ export default Route.extend({ titleToken() { switch (this.get('params.discount_status')) { case 'active': - return this.get('l10n').t('Active'); + return this.l10n.t('Active'); case 'inactive': - return this.get('l10n').t('Inactive'); + return this.l10n.t('Inactive'); case 'expired': - return this.get('l10n').t('Expired'); + return this.l10n.t('Expired'); } }, async model(params) { diff --git a/app/routes/events/view/tickets/index.js b/app/routes/events/view/tickets/index.js index 80748d1d958..2ccdd9ee3de 100644 --- a/app/routes/events/view/tickets/index.js +++ b/app/routes/events/view/tickets/index.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Overview'); + return this.l10n.t('Overview'); }, async model() { return { diff --git a/app/routes/events/view/tickets/order-form.js b/app/routes/events/view/tickets/order-form.js index 633d4c5d67a..1a7703541fa 100644 --- a/app/routes/events/view/tickets/order-form.js +++ b/app/routes/events/view/tickets/order-form.js @@ -4,7 +4,7 @@ import { A } from '@ember/array'; export default Route.extend(CustomFormMixin, { titleToken() { - return this.get('l10n').t('Order Form'); + return this.l10n.t('Order Form'); }, async model() { let filterOptions = [{ diff --git a/app/routes/events/view/tickets/orders.js b/app/routes/events/view/tickets/orders.js index bab4ca38969..79df5d0a41b 100644 --- a/app/routes/events/view/tickets/orders.js +++ b/app/routes/events/view/tickets/orders.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Orders'); + return this.l10n.t('Orders'); }, model() { return this.modelFor('events.view'); diff --git a/app/routes/events/view/tickets/orders/list.js b/app/routes/events/view/tickets/orders/list.js index 385c2f79b19..f68d6a28904 100644 --- a/app/routes/events/view/tickets/orders/list.js +++ b/app/routes/events/view/tickets/orders/list.js @@ -4,15 +4,15 @@ export default Route.extend({ titleToken() { switch (this.get('params.orders_status')) { case 'placed': - return this.get('l10n').t('Placed'); + return this.l10n.t('Placed'); case 'pending': - return this.get('l10n').t('Pending'); + return this.l10n.t('Pending'); case 'expired': - return this.get('l10n').t('Expired'); + return this.l10n.t('Expired'); case 'cancelled': - return this.get('l10n').t('Cancelled'); + return this.l10n.t('Cancelled'); case 'all': - return this.get('l10n').t('All'); + return this.l10n.t('All'); } }, diff --git a/app/routes/explore.js b/app/routes/explore.js index bbf56b34e57..f92ecd19c12 100644 --- a/app/routes/explore.js +++ b/app/routes/explore.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Explore'); + return this.l10n.t('Explore'); }, /** @@ -168,9 +168,9 @@ export default Route.extend({ actions: { async queryParamsDidChange(change, params) { - if (this.get('controller')) { - this.get('controller').set('filteredEvents', await this._loadEvents(params)); - this.get('controller').set('filters', params); + if (this.controller) { + this.controller.set('filteredEvents', await this._loadEvents(params)); + this.controller.set('filters', params); } } } diff --git a/app/routes/index.js b/app/routes/index.js index 807a2d9c04e..7b03897d5cf 100644 --- a/app/routes/index.js +++ b/app/routes/index.js @@ -141,8 +141,8 @@ export default Route.extend({ actions: { async queryParamsDidChange(change, params) { - if (this.get('controller')) { - this.get('controller').set('filteredEvents', await this._loadEvents(params)); + if (this.controller) { + this.controller.set('filteredEvents', await this._loadEvents(params)); } }, loading(transition) { diff --git a/app/routes/login.js b/app/routes/login.js index 038703a995c..bea0213ccdf 100644 --- a/app/routes/login.js +++ b/app/routes/login.js @@ -3,6 +3,6 @@ import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated- export default Route.extend(UnauthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Login'); + return this.l10n.t('Login'); } }); diff --git a/app/routes/logout.js b/app/routes/logout.js index 8e05bdb7fc3..564e7ad13d6 100644 --- a/app/routes/logout.js +++ b/app/routes/logout.js @@ -3,7 +3,7 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { beforeModel() { - this.get('authManager').logout(); + this.authManager.logout(); this.transitionTo('index'); } }); diff --git a/app/routes/my-sessions.js b/app/routes/my-sessions.js index 2d69bf613ba..2a2a1ec56b9 100644 --- a/app/routes/my-sessions.js +++ b/app/routes/my-sessions.js @@ -3,6 +3,6 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('My sessions'); + return this.l10n.t('My sessions'); } }); diff --git a/app/routes/my-sessions/index.js b/app/routes/my-sessions/index.js index 214f77a5572..2fdef498acc 100644 --- a/app/routes/my-sessions/index.js +++ b/app/routes/my-sessions/index.js @@ -3,7 +3,7 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Upcoming'); + return this.l10n.t('Upcoming'); }, beforeModel() { this._super(...arguments); diff --git a/app/routes/my-sessions/list.js b/app/routes/my-sessions/list.js index ccd7fe3d72c..902925258c1 100644 --- a/app/routes/my-sessions/list.js +++ b/app/routes/my-sessions/list.js @@ -6,9 +6,9 @@ export default Route.extend(AuthenticatedRouteMixin, { titleToken() { switch (this.get('params.session_status')) { case 'upcoming': - return this.get('l10n').t('Upcoming'); + return this.l10n.t('Upcoming'); case 'past': - return this.get('l10n').t('Past'); + return this.l10n.t('Past'); } }, model(params) { @@ -49,7 +49,7 @@ export default Route.extend(AuthenticatedRouteMixin, { } ]; } - return this.get('authManager.currentUser').query('sessions', { + return this.authManager.currentUser.query('sessions', { include : 'event', filter : filterOptions, sort : 'starts-at' diff --git a/app/routes/my-sessions/view.js b/app/routes/my-sessions/view.js index e3f5677b0c3..92224308f89 100644 --- a/app/routes/my-sessions/view.js +++ b/app/routes/my-sessions/view.js @@ -3,7 +3,7 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Sessions'); + return this.l10n.t('Sessions'); }, model(params) { return this.store.findRecord('session', params.session_id, { diff --git a/app/routes/my-tickets.js b/app/routes/my-tickets.js index eb6cd9c5fd7..21029fcd7e8 100644 --- a/app/routes/my-tickets.js +++ b/app/routes/my-tickets.js @@ -3,6 +3,6 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('My Tickets'); + return this.l10n.t('My Tickets'); } }); diff --git a/app/routes/my-tickets/past.js b/app/routes/my-tickets/past.js index 1936a439e4b..73fbcaf7c25 100644 --- a/app/routes/my-tickets/past.js +++ b/app/routes/my-tickets/past.js @@ -3,7 +3,7 @@ import moment from 'moment'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Past'); + return this.l10n.t('Past'); }, model() { let filterOptions = []; @@ -45,7 +45,7 @@ export default Route.extend({ ] } ); - return this.get('authManager.currentUser').query('orders', { + return this.authManager.currentUser.query('orders', { include : 'event', filter : filterOptions }); diff --git a/app/routes/my-tickets/upcoming.js b/app/routes/my-tickets/upcoming.js index 198dbd92a4e..5af5c0f72c3 100644 --- a/app/routes/my-tickets/upcoming.js +++ b/app/routes/my-tickets/upcoming.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Upcoming'); + return this.l10n.t('Upcoming'); } }); diff --git a/app/routes/my-tickets/upcoming/index.js b/app/routes/my-tickets/upcoming/index.js index 92052194f59..97430e1a77e 100644 --- a/app/routes/my-tickets/upcoming/index.js +++ b/app/routes/my-tickets/upcoming/index.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Completed'); + return this.l10n.t('Completed'); }, beforeModel() { this._super(...arguments); diff --git a/app/routes/my-tickets/upcoming/list.js b/app/routes/my-tickets/upcoming/list.js index 629c12c771b..a362c53885b 100644 --- a/app/routes/my-tickets/upcoming/list.js +++ b/app/routes/my-tickets/upcoming/list.js @@ -5,9 +5,9 @@ export default Route.extend({ titleToken() { switch (this.get('params.ticket_status')) { case 'completed': - return this.get('l10n').t('Completed'); + return this.l10n.t('Completed'); case 'open': - return this.get('l10n').t('Open'); + return this.l10n.t('Open'); } }, model(params) { @@ -74,7 +74,7 @@ export default Route.extend({ } ); } - return this.get('authManager.currentUser').query('orders', { + return this.authManager.currentUser.query('orders', { include : 'event', filter : filterOptions }); diff --git a/app/routes/not-found.js b/app/routes/not-found.js index ea183ad0974..8a97ab38be2 100644 --- a/app/routes/not-found.js +++ b/app/routes/not-found.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Page Not Found'); + return this.l10n.t('Page Not Found'); } }); diff --git a/app/routes/notifications.js b/app/routes/notifications.js index 878d2ada4e8..e3a64bcb6dc 100644 --- a/app/routes/notifications.js +++ b/app/routes/notifications.js @@ -3,6 +3,6 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Notifications'); + return this.l10n.t('Notifications'); } }); diff --git a/app/routes/notifications/all.js b/app/routes/notifications/all.js index 86a23560b2f..3ad84d562fb 100644 --- a/app/routes/notifications/all.js +++ b/app/routes/notifications/all.js @@ -4,9 +4,9 @@ export default Route.extend({ titleToken() { switch (this.get('params.notification_state')) { case 'unread': - return this.get('l10n').t('Unread'); + return this.l10n.t('Unread'); case 'all': - return this.get('l10n').t('All'); + return this.l10n.t('All'); } }, async model(params) { @@ -28,7 +28,7 @@ export default Route.extend({ data.unread = true; } - data.notifications = await this.get('authManager.currentUser').query('notifications', { + data.notifications = await this.authManager.currentUser.query('notifications', { include : 'notification-actions', sort : '-received-at', filter : filterOptions diff --git a/app/routes/orders.js b/app/routes/orders.js index 798329e3dee..b45a118a92f 100644 --- a/app/routes/orders.js +++ b/app/routes/orders.js @@ -3,6 +3,6 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Orders'); + return this.l10n.t('Orders'); } }); diff --git a/app/routes/orders/expired.js b/app/routes/orders/expired.js index 3df072ae0c5..b5a14063def 100644 --- a/app/routes/orders/expired.js +++ b/app/routes/orders/expired.js @@ -2,8 +2,8 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken(model) { - var order = model.get('identifier'); - return this.get('l10n').t(`Expired Order -${order}`); + let order = model.get('identifier'); + return this.l10n.t(`Expired Order -${order}`); }, model(params) { diff --git a/app/routes/orders/new.js b/app/routes/orders/new.js index f131d559ce1..cf8b8235e00 100644 --- a/app/routes/orders/new.js +++ b/app/routes/orders/new.js @@ -3,8 +3,8 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken(model) { - var order = model.order.get('identifier'); - return this.get('l10n').t(`New Order -${order}`); + let order = model.order.get('identifier'); + return this.l10n.t(`New Order -${order}`); }, async model(params) { diff --git a/app/routes/orders/pending.js b/app/routes/orders/pending.js deleted file mode 100644 index 74a276f82c2..00000000000 --- a/app/routes/orders/pending.js +++ /dev/null @@ -1,33 +0,0 @@ -import Route from '@ember/routing/route'; - -export default Route.extend({ - titleToken(model) { - var order = model.order.get('identifier'); - return this.get('l10n').t(`Pending Order -${order}`); - }, - - async model(params) { - const order = await this.store.findRecord('order', params.order_id, { - include : 'attendees,tickets,event', - reload : true - }); - const eventDetails = await order.query('event', { include: 'tax' }); - return { - order, - form: await eventDetails.query('customForms', { - 'page[size]' : 50, - sort : 'id' - }) - }; - }, - - afterModel(model) { - if (model.order.get('status') === 'expired') { - this.transitionTo('orders.expired', model.order.get('identifier')); - } else if (model.order.get('status') === 'completed' || model.order.get('status') === 'placed') { - this.transitionTo('orders.view', model.order.get('identifier')); - } else if (model.order.get('status') === 'pending') { - this.transitionTo('orders.pending', model.order.get('identifier')); - } - } -}); diff --git a/app/routes/orders/view.js b/app/routes/orders/view.js index bfc029d755a..566878e92d5 100644 --- a/app/routes/orders/view.js +++ b/app/routes/orders/view.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken(model) { - var order = model.order.get('identifier'); + let order = model.order.get('identifier'); if (model.order.status === 'completed') { return this.l10n.t(`Completed Order -${order}`); } else if (model.order.status === 'placed') { diff --git a/app/routes/pages.js b/app/routes/pages.js index 5e0f004aa9a..f7f1e4fd03d 100644 --- a/app/routes/pages.js +++ b/app/routes/pages.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Pages'); + return this.l10n.t('Pages'); }, model(params) { return this.modelFor('application').pages.findBy('url', params.path); diff --git a/app/routes/profile.js b/app/routes/profile.js index 644542de5ac..983cb12835c 100644 --- a/app/routes/profile.js +++ b/app/routes/profile.js @@ -3,7 +3,7 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Profile'); + return this.l10n.t('Profile'); }, model() { diff --git a/app/routes/public/cfs.js b/app/routes/public/cfs.js index 7ad70c95fba..ed741e163a3 100644 --- a/app/routes/public/cfs.js +++ b/app/routes/public/cfs.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Call for Speakers'); + return this.l10n.t('Call for Speakers'); } }); diff --git a/app/routes/public/cfs/edit-session.js b/app/routes/public/cfs/edit-session.js index 8d7f95d3747..ac64569ebd0 100644 --- a/app/routes/public/cfs/edit-session.js +++ b/app/routes/public/cfs/edit-session.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Edit Session'); + return this.l10n.t('Edit Session'); }, async model(params) { @@ -13,7 +13,7 @@ export default Route.extend({ sort : 'id', 'page[size]' : 50 }), - session: await this.get('store').findRecord('session', params.session_id, { + session: await this.store.findRecord('session', params.session_id, { include: 'session-type,track' }) }; diff --git a/app/routes/public/cfs/edit-speaker.js b/app/routes/public/cfs/edit-speaker.js index a4186c28d57..c0e91330fde 100644 --- a/app/routes/public/cfs/edit-speaker.js +++ b/app/routes/public/cfs/edit-speaker.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Edit Speaker'); + return this.l10n.t('Edit Speaker'); }, async model(params) { @@ -13,7 +13,7 @@ export default Route.extend({ sort : 'id', 'page[size]' : 50 }), - speaker: await this.get('store').findRecord('speaker', params.speaker_id) + speaker: await this.store.findRecord('speaker', params.speaker_id) }; } }); diff --git a/app/routes/public/cfs/index.js b/app/routes/public/cfs/index.js index 205c06d00cd..62d22435dd1 100644 --- a/app/routes/public/cfs/index.js +++ b/app/routes/public/cfs/index.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Call for Speakers'); + return this.l10n.t('Call for Speakers'); }, async beforeModel(transition) { @@ -17,7 +17,7 @@ export default Route.extend({ - CFS is private and a valid hash is entered */ if (!speakersCall.announcement) { - this.get('notify').error(this.get('l10n').t('Call For Speakers has not been issued yet.')); + this.notify.error(this.l10n.t('Call For Speakers has not been issued yet.')); this.transitionTo('public', eventDetails.identifier); } if (!((speakersCall.privacy === 'public' && (!hash || speakersCall.hash === hash)) || (speakersCall.privacy === 'private' && hash === speakersCall.hash))) { diff --git a/app/routes/public/cfs/new-session.js b/app/routes/public/cfs/new-session.js index 7acd1e7fc54..ef243229b7b 100644 --- a/app/routes/public/cfs/new-session.js +++ b/app/routes/public/cfs/new-session.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('New Session'); + return this.l10n.t('New Session'); }, async model() { @@ -13,7 +13,7 @@ export default Route.extend({ sort : 'id', 'page[size]' : 50 }), - session: await this.get('store').createRecord('session', { + session: await this.store.createRecord('session', { event : eventDetails, creator : this.get('authManager.currentUser') }), diff --git a/app/routes/public/cfs/new-speaker.js b/app/routes/public/cfs/new-speaker.js index 2801b9e372b..cade50e6f84 100644 --- a/app/routes/public/cfs/new-speaker.js +++ b/app/routes/public/cfs/new-speaker.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('New Speaker'); + return this.l10n.t('New Speaker'); }, async model() { @@ -18,7 +18,7 @@ export default Route.extend({ sort : 'id', 'page[size]' : 50 }), - speaker: await this.get('store').createRecord('speaker', { + speaker: await this.store.createRecord('speaker', { email : currentUser.email, name : userName, photoUrl : currentUser.avatarUrl, diff --git a/app/routes/public/coc.js b/app/routes/public/coc.js index 8c54466fe2a..23161e94d56 100644 --- a/app/routes/public/coc.js +++ b/app/routes/public/coc.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Code of Conduct'); + return this.l10n.t('Code of Conduct'); } }); diff --git a/app/routes/public/index.js b/app/routes/public/index.js index 29d3917642e..0bdcfbbf20a 100644 --- a/app/routes/public/index.js +++ b/app/routes/public/index.js @@ -1,10 +1,8 @@ import Route from '@ember/routing/route'; import moment from 'moment'; -import Ember from 'ember'; +import { set } from '@ember/object'; import { inject as service } from '@ember/service'; -const { set } = Ember; - export default Route.extend({ headData: service(), async model() { diff --git a/app/routes/public/role-invites.js b/app/routes/public/role-invites.js index d587767f2fa..5355c1f1145 100644 --- a/app/routes/public/role-invites.js +++ b/app/routes/public/role-invites.js @@ -7,23 +7,23 @@ export default Route.extend({ token: transition.queryParams.token } }; - this.get('loader') + this.loader .post('/role_invites/user', payload) .then(user => { if (this.get('session.isAuthenticated')) { if (this.get('authManager.currentUser.email') === user.email) { - this.get('loader') + this.loader .post('/role_invites/accept-invite', payload) .then(invite => { this.transitionTo('events.view', invite.event); }) .catch(e => { - this.get('notify').error(this.get('l10n').t('An unexpected error has occurred')); + this.notify.error(this.l10n.t('An unexpected error has occurred')); console.warn(e); }); } else { this.set('session.skipRedirectOnInvalidation', true); - this.get('session').invalidate(); + this.session.invalidate(); this.transitionTo('register', { queryParams: { event : `${transition.params.public.event_id}`, @@ -44,7 +44,7 @@ export default Route.extend({ } }) .catch(e => { - this.get('notify').error(this.get('l10n').t('An unexpected error has occurred')); + this.notify.error(this.l10n.t('An unexpected error has occurred')); console.warn(e); }); } diff --git a/app/routes/public/schedule.js b/app/routes/public/schedule.js index 57a3aeb07ca..b2e886bd63f 100644 --- a/app/routes/public/schedule.js +++ b/app/routes/public/schedule.js @@ -2,7 +2,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Schedule'); + return this.l10n.t('Schedule'); }, async model() { diff --git a/app/routes/public/sessions.js b/app/routes/public/sessions.js index 9b7a3fc908e..7fdce30055a 100644 --- a/app/routes/public/sessions.js +++ b/app/routes/public/sessions.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Sessions'); + return this.l10n.t('Sessions'); } }); diff --git a/app/routes/public/sessions/list.js b/app/routes/public/sessions/list.js index b90deb7ec0f..78e5612d6e3 100644 --- a/app/routes/public/sessions/list.js +++ b/app/routes/public/sessions/list.js @@ -5,20 +5,20 @@ export default Route.extend({ titleToken() { switch (this.get('params.session_status')) { case 'all': - return this.get('l10n').t('All sessions'); + return this.l10n.t('All sessions'); case 'today': - return this.get('l10n').t('Today\'s Sessions'); + return this.l10n.t('Today\'s Sessions'); case 'week': - return this.get('l10n').t('Week\'s Sessions'); + return this.l10n.t('Week\'s Sessions'); case 'month': - return this.get('l10n').t('Month\'s Sessions'); + return this.l10n.t('Month\'s Sessions'); } }, async model(params) { const eventDetails = this.modelFor('public'); let sessions = null; if (params.session_status === 'today') { - sessions = await this.get('store').query('session', { + sessions = await this.store.query('session', { filter: [ { and: [ @@ -60,7 +60,7 @@ export default Route.extend({ ] }); } else if (params.session_status === 'week') { - sessions = await this.get('store').query('session', { + sessions = await this.store.query('session', { filter: [ { and: [ @@ -102,7 +102,7 @@ export default Route.extend({ ] }); } else if (params.session_status === 'month') { - sessions = await this.get('store').query('session', { + sessions = await this.store.query('session', { filter: [ { and: [ @@ -144,7 +144,7 @@ export default Route.extend({ ] }); } else { - sessions = await this.get('store').query('session', { + sessions = await this.store.query('session', { filter: [ { and: [ diff --git a/app/routes/register.js b/app/routes/register.js index ef56a7095f1..a7196ef9de4 100644 --- a/app/routes/register.js +++ b/app/routes/register.js @@ -3,7 +3,7 @@ import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated- export default Route.extend(UnauthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Register'); + return this.l10n.t('Register'); }, model() { return this.store.createRecord('user'); diff --git a/app/routes/reset-password.js b/app/routes/reset-password.js index 185a6460a64..7cef5a57f56 100644 --- a/app/routes/reset-password.js +++ b/app/routes/reset-password.js @@ -2,12 +2,12 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Reset Password'); + return this.l10n.t('Reset Password'); }, beforeModel() { if (this.get('session.isAuthenticated')) { this.set('session.skipRedirectOnInvalidation', true); - this.get('authManager').logout(); + this.authManager.logout(); } }, afterModel() { diff --git a/app/routes/settings.js b/app/routes/settings.js index 4e6711f93b6..3846e4efb38 100644 --- a/app/routes/settings.js +++ b/app/routes/settings.js @@ -2,6 +2,6 @@ import Route from '@ember/routing/route'; export default Route.extend({ titleToken() { - return this.get('l10n').t('Settings'); + return this.l10n.t('Settings'); } }); diff --git a/app/routes/settings/applications.js b/app/routes/settings/applications.js index 3cbb6f40f82..f2813b14c0e 100644 --- a/app/routes/settings/applications.js +++ b/app/routes/settings/applications.js @@ -3,7 +3,7 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Applications'); + return this.l10n.t('Applications'); }, model() { return this.get('authManager.currentUser'); diff --git a/app/routes/settings/contact-info.js b/app/routes/settings/contact-info.js index b47f270f6f6..9364f0b9284 100644 --- a/app/routes/settings/contact-info.js +++ b/app/routes/settings/contact-info.js @@ -3,7 +3,7 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Contact Info'); + return this.l10n.t('Contact Info'); }, model() { return this.get('authManager.currentUser'); diff --git a/app/routes/settings/danger-zone.js b/app/routes/settings/danger-zone.js index 7c9600cd6e9..a5985704516 100644 --- a/app/routes/settings/danger-zone.js +++ b/app/routes/settings/danger-zone.js @@ -3,7 +3,7 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Danger Zone'); + return this.l10n.t('Danger Zone'); }, async model() { diff --git a/app/routes/settings/email-preferences.js b/app/routes/settings/email-preferences.js index 2f81afa9f8c..336385d3ab7 100644 --- a/app/routes/settings/email-preferences.js +++ b/app/routes/settings/email-preferences.js @@ -3,9 +3,9 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Email Preferences'); + return this.l10n.t('Email Preferences'); }, model() { - return this.get('authManager.currentUser').query('emailNotifications', { include: 'event' }); + return this.authManager.currentUser.query('emailNotifications', { include: 'event' }); } }); diff --git a/app/routes/settings/password.js b/app/routes/settings/password.js index d60930c081d..8290582b3af 100644 --- a/app/routes/settings/password.js +++ b/app/routes/settings/password.js @@ -3,6 +3,6 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout export default Route.extend(AuthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Password'); + return this.l10n.t('Password'); } }); diff --git a/app/routes/verify.js b/app/routes/verify.js index b5980e1c606..f4d2cdf4260 100644 --- a/app/routes/verify.js +++ b/app/routes/verify.js @@ -3,7 +3,7 @@ import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated- export default Route.extend(UnauthenticatedRouteMixin, { titleToken() { - return this.get('l10n').t('Verify'); + return this.l10n.t('Verify'); }, beforeModel(transition) { diff --git a/app/serializers/user.js b/app/serializers/user.js index fbce00388de..6f2bb1adbb1 100644 --- a/app/serializers/user.js +++ b/app/serializers/user.js @@ -1,5 +1,5 @@ import ApplicationSerializer from 'open-event-frontend/serializers/application'; -import { pick, omit } from 'lodash'; +import { pick, omit } from 'lodash-es'; export default ApplicationSerializer.extend({ serialize(snapshot, options) { diff --git a/app/services/auth-manager.js b/app/services/auth-manager.js index 62bd28682e1..ad359f5fcbc 100644 --- a/app/services/auth-manager.js +++ b/app/services/auth-manager.js @@ -1,7 +1,7 @@ import { observer, computed } from '@ember/object'; import Service, { inject as service } from '@ember/service'; import { camelize } from '@ember/string'; -import { mapKeys } from 'lodash'; +import { mapKeys } from 'lodash-es'; export default Service.extend({ @@ -10,11 +10,11 @@ export default Service.extend({ store : service(), currentUser: computed('session.data.currentUserFallback.id', 'currentUserModel', function() { - if (this.get('currentUserModel')) { - return this.get('currentUserModel'); + if (this.currentUserModel) { + return this.currentUserModel; } if (this.get('session.data.currentUserFallback')) { - let userModel = this.get('store').peekRecord('user', this.get('session.data.currentUserFallback.id')); + let userModel = this.store.peekRecord('user', this.get('session.data.currentUserFallback.id')); if (!userModel) { return this.restoreCurrentUser(); } @@ -30,7 +30,7 @@ export default Service.extend({ }), currentUserChangeListener: observer('currentUser', function() { - if (this.get('currentUser') && this.get('session.isAuthenticated')) { + if (this.currentUser && this.get('session.isAuthenticated')) { this.identify(); } }), @@ -44,34 +44,33 @@ export default Service.extend({ }, logout() { - this.get('session').invalidate(); + this.session.invalidate(); this.set('currentUserModel', null); - this.get('session').set('data.currentUserFallback', null); + this.session.set('data.currentUserFallback', null); }, identify() { - let currentUser = this.get('currentUser'); - if (currentUser) { - this.get('metrics').identify({ - distinctId : currentUser.id, - email : currentUser.email + if (this.currentUser) { + this.metrics.identify({ + distinctId : this.currentUser.id, + email : this.currentUser.email }); } }, identifyStranger() { - this.get('metrics').identify(null); + this.metrics.identify(null); }, persistCurrentUser(user = null) { if (!user) { - user = this.get('currentUserModel'); + user = this.currentUserModel; } else { this.set('currentUserModel', user); } let userData = user.serialize(false).data.attributes; userData.id = user.get('id'); - this.get('session').set('data.currentUserFallback', userData); + this.session.set('data.currentUserFallback', userData); }, restoreCurrentUser(data = null) { @@ -84,14 +83,14 @@ export default Service.extend({ if (!data.email) { data.email = null; } - this.get('store').push({ + this.store.push({ data: { id : userId, type : 'user', attributes : data } }); - let userModel = this.get('store').peekRecord('user', userId); + let userModel = this.store.peekRecord('user', userId); this.set('currentUserModel', userModel); return userModel; }, @@ -99,7 +98,7 @@ export default Service.extend({ async initialize() { if (this.get('session.isAuthenticated')) { if (this.get('session.data.currentUserFallback.id')) { - const user = await this.get('store').findRecord('user', this.get('session.data.currentUserFallback.id')); + const user = await this.store.findRecord('user', this.get('session.data.currentUserFallback.id')); this.set('currentUserModel', user); this.identify(); } else { diff --git a/app/services/device.js b/app/services/device.js index 854272ba6b0..5000d087e9e 100644 --- a/app/services/device.js +++ b/app/services/device.js @@ -3,7 +3,7 @@ import Service from '@ember/service'; import { computed } from '@ember/object'; import { equal, or } from '@ember/object/computed'; import { debounce } from '@ember/runloop'; -import { forOwn } from 'lodash'; +import { forOwn } from 'lodash-es'; import { inject as service } from '@ember/service'; /** @@ -38,9 +38,8 @@ export default Service.extend({ deviceType: computed('currentWidth', function() { let deviceType = 'computer'; - const currentWidth = this.get('currentWidth'); forOwn(breakpoints, (value, key) => { - if (currentWidth >= value.min && (!value.hasOwnProperty('max') || currentWidth <= value.max)) { + if (this.currentWidth >= value.min && (!value.hasOwnProperty('max') || this.currentWidth <= value.max)) { deviceType = key; } }); @@ -90,7 +89,7 @@ export default Service.extend({ $(window).resize(() => { debounce(() => { - if (!(this.get('isDestroyed') || this.get('isDestroying'))) { + if (!(this.isDestroyed || this.isDestroying)) { this.set('currentWidth', document.body.clientWidth); } }, 200); diff --git a/app/services/l10n.js b/app/services/l10n.js index 449db44310d..5ff3a232152 100644 --- a/app/services/l10n.js +++ b/app/services/l10n.js @@ -35,7 +35,7 @@ export default L10n.extend({ switchLanguage(locale) { this.setLocale(locale); - this.get('cookies').write(this.localStorageKey, locale); + this.cookies.write(this.localStorageKey, locale); if (!this.get('fastboot.isFastBoot')) { location.reload(); } @@ -43,7 +43,7 @@ export default L10n.extend({ init() { this._super(...arguments); - const currentLocale = this.get('cookies').read(this.localStorageKey); + const currentLocale = this.cookies.read(this.localStorageKey); const detectedLocale = this.detectLocale(); if (currentLocale) { this.setLocale(currentLocale); diff --git a/app/services/loader.js b/app/services/loader.js index f0715a53992..56a62076bdc 100644 --- a/app/services/loader.js +++ b/app/services/loader.js @@ -3,10 +3,10 @@ import { getOwner } from '@ember/application'; import $ from 'jquery'; import { getErrorMessage } from 'open-event-frontend/utils/errors'; import { buildUrl } from 'open-event-frontend/utils/url'; -import httpStatus from 'npm:http-status'; -import objectToFormData from 'npm:object-to-formdata'; +import httpStatus from 'http-status'; +import objectToFormData from 'object-to-formdata'; import fetch from 'fetch'; -import { clone, assign, merge } from 'lodash'; +import { clone, assign, merge } from 'lodash-es'; const bodyAllowedIn = ['PATCH', 'POST', 'PUT']; export default Service.extend({ diff --git a/app/services/sanitizer.js b/app/services/sanitizer.js index 5f5c654fedb..a7585849581 100644 --- a/app/services/sanitizer.js +++ b/app/services/sanitizer.js @@ -1,5 +1,5 @@ import Service from '@ember/service'; -import sanitizeHtml from 'npm:sanitize-html'; +import sanitizeHtml from 'sanitize-html'; export default Service.extend({ diff --git a/app/services/settings.js b/app/services/settings.js index f30f9bf9b0d..9e143618378 100644 --- a/app/services/settings.js +++ b/app/services/settings.js @@ -13,7 +13,7 @@ export default Service.extend({ * Reload settings when the authentication state changes. */ _authenticationObserver: observer('session.isAuthenticated', function() { - this.get('_lastPromise') + this._lastPromise .then(() => this.set('_lastPromise', this._loadSettings())) .catch(() => this.set('_lastPromise', this._loadSettings())); }), @@ -25,8 +25,8 @@ export default Service.extend({ * @private */ async _loadSettings() { - const settingsModel = await this.get('store').queryRecord('setting', {}); - this.get('store').modelFor('setting').eachAttribute(attributeName => { + const settingsModel = await this.store.queryRecord('setting', {}); + this.store.modelFor('setting').eachAttribute(attributeName => { this.set(attributeName, settingsModel.get(attributeName)); }); }, diff --git a/app/templates/admin/sales/discounted-events.hbs b/app/templates/admin/sales/discounted-events.hbs index 110044c329f..0d34c81e0df 100644 --- a/app/templates/admin/sales/discounted-events.hbs +++ b/app/templates/admin/sales/discounted-events.hbs @@ -63,19 +63,19 @@ {{entry.sales.completed.ticket_count}} - {{currency-symbol order.paymentCurrency}} {{number-format entry.sales.completed.sales_total}} + {{currency-symbol order.paymentCurrency}} {{format-number entry.sales.completed.sales_total}} {{entry.sales.placed.ticket_count}} - {{currency-symbol order.paymentCurrency}} {{number-format entry.sales.places.sales_total}} + {{currency-symbol order.paymentCurrency}} {{format-number entry.sales.places.sales_total}} {{entry.sales.pending.ticket_count}} - {{currency-symbol order.paymentCurrency}} {{number-format entry.sales.pending.sales_total}} + {{currency-symbol order.paymentCurrency}} {{format-number entry.sales.pending.sales_total}} {{/each}} @@ -91,19 +91,19 @@ {{totalCompletedTickets}} - US$ {{number-format totalCompletedSales}} + US$ {{format-number totalCompletedSales}} {{totalPlacedTickets}} - US$ {{number-format totalPlacedSales}} + US$ {{format-number totalPlacedSales}} {{totalPendingTickets}} - US$ {{number-format totalPendingSales}} + US$ {{format-number totalPendingSales}} --}} diff --git a/app/templates/admin/sales/fees.hbs b/app/templates/admin/sales/fees.hbs index 3986f906219..e0462a95dfe 100644 --- a/app/templates/admin/sales/fees.hbs +++ b/app/templates/admin/sales/fees.hbs @@ -38,13 +38,13 @@ {{order.ticketCount}} - {{number-format order.feePercentage}}% + {{format-number order.feePercentage}}% {{#if order.maximumFee}} [{{t 'Max.'}} {{currency-symbol order.paymentCurrency}} {{order.maximumFee}}] {{/if}} - {{currency-symbol order.paymentCurrency}} {{number-format order.revenue}} + {{currency-symbol order.paymentCurrency}} {{format-number order.revenue}} {{/each}} @@ -60,7 +60,7 @@ {{ticketsTotal}} - US$ {{number-format revenueTotal}} + US$ {{format-number revenueTotal}} --}} diff --git a/app/templates/admin/sales/index.hbs b/app/templates/admin/sales/index.hbs index f1f92a590ab..41524a718cd 100644 --- a/app/templates/admin/sales/index.hbs +++ b/app/templates/admin/sales/index.hbs @@ -28,11 +28,11 @@ {{entry.name}} {{moment-format entry.startsAt 'ddd, MMM DD \at h:mm A'}} {{entry.sales.completed.ticket_count}} - {{currency-symbol entry.paymentCurrency}} {{number-format entry.sales.completed.sales_total}} + {{currency-symbol entry.paymentCurrency}} {{format-number entry.sales.completed.sales_total}} {{entry.sales.placed.ticket_count}} - {{currency-symbol entry.paymentCurrency}} {{number-format entry.sales.placed.sales_total}} + {{currency-symbol entry.paymentCurrency}} {{format-number entry.sales.placed.sales_total}} {{entry.sales.pending.ticket_count}} - {{currency-symbol entry.paymentCurrency}} {{number-format entry.sales.pending.sales_total}} + {{currency-symbol entry.paymentCurrency}} {{format-number entry.sales.pending.sales_total}} {{/each}} @@ -45,19 +45,19 @@ {{totalCompletedTickets}} - US$ {{number-format totalCompletedSales}} + US$ {{format-number totalCompletedSales}} {{totalPlacedTickets}} - US$ {{number-format totalPlacedSales}} + US$ {{format-number totalPlacedSales}} {{totalPendingTickets}} - US$ {{number-format totalPendingSales}} + US$ {{format-number totalPendingSales}} --}} diff --git a/app/templates/admin/sales/locations.hbs b/app/templates/admin/sales/locations.hbs index 158ea557d09..8dceed484d3 100644 --- a/app/templates/admin/sales/locations.hbs +++ b/app/templates/admin/sales/locations.hbs @@ -26,11 +26,11 @@ {{entry.locationName}} {{entry.sales.completed.ticket_count}} - US$ {{number-format entry.sales.completed.sales_total}} + US$ {{format-number entry.sales.completed.sales_total}} {{entry.sales.placed.ticket_count}} - US$ {{number-format entry.sales.placed.sales_total}} + US$ {{format-number entry.sales.placed.sales_total}} {{entry.sales.pending.ticket_count}} - US$ {{number-format entry.sales.pending.sales_total}} + US$ {{format-number entry.sales.pending.sales_total}} {{/each}} @@ -38,11 +38,11 @@ {{t 'Total'}} {{totalCompletedTickets}} - US$ {{number-format totalCompletedSales}} + US$ {{format-number totalCompletedSales}} {{totalPlacedTickets}} - US$ {{number-format totalPlacedSales}} + US$ {{format-number totalPlacedSales}} {{totalPendingTickets}} - US$ {{number-format totalPendingSales}} + US$ {{format-number totalPendingSales}} --}} diff --git a/app/templates/admin/sales/marketer.hbs b/app/templates/admin/sales/marketer.hbs index 52e75787d17..a31e19083f0 100644 --- a/app/templates/admin/sales/marketer.hbs +++ b/app/templates/admin/sales/marketer.hbs @@ -25,7 +25,7 @@ {{entry.sales.completed.ticket_count}} - US$ {{number-format entry.sales.completed.sales_total}} + US$ {{format-number entry.sales.completed.sales_total}} {{/each}} @@ -38,8 +38,8 @@ {{ticketsTotal}} - US$ {{number-format salesTotal}} - US$ {{number-format discountsTotal}} + US$ {{format-number salesTotal}} + US$ {{format-number discountsTotal}} --}} diff --git a/app/templates/admin/sales/organizers.hbs b/app/templates/admin/sales/organizers.hbs index bec091b8a05..922f4168930 100644 --- a/app/templates/admin/sales/organizers.hbs +++ b/app/templates/admin/sales/organizers.hbs @@ -56,19 +56,19 @@ {{entry.sales.completed.ticket_count}} - US$ {{number-format entry.sales.completed.sales_total}} + US$ {{format-number entry.sales.completed.sales_total}} {{entry.sales.placed.ticket_count}} - US$ {{number-format entry.sales.places.sales_total}} + US$ {{format-number entry.sales.places.sales_total}} {{entry.sales.pending.ticket_count}} - US$ {{number-format entry.sales.pending.sales_total}} + US$ {{format-number entry.sales.pending.sales_total}} {{/each}} @@ -84,19 +84,19 @@ {{totalCompletedTickets}} - US$ {{number-format totalCompletedSales}} + US$ {{format-number totalCompletedSales}} {{totalPlacedTickets}} - US$ {{number-format totalPlacedSales}} + US$ {{format-number totalPlacedSales}} {{totalPendingTickets}} - US$ {{number-format totalPendingSales}} + US$ {{format-number totalPendingSales}} --}} diff --git a/app/templates/components/events/view/overview/event-tickets.hbs b/app/templates/components/events/view/overview/event-tickets.hbs index 912a245bb4e..ef2334fea65 100644 --- a/app/templates/components/events/view/overview/event-tickets.hbs +++ b/app/templates/components/events/view/overview/event-tickets.hbs @@ -15,7 +15,7 @@ {{t 'Sales (amount)'}} - {{currency-symbol data.event.paymentCurrency}} {{number-format data.orderStat.sales.completed}} + {{currency-symbol data.event.paymentCurrency}} {{format-number data.orderStat.sales.completed}} diff --git a/app/templates/components/orders/order-summary.hbs b/app/templates/components/orders/order-summary.hbs index 5aa44ca096b..eb91e9f2325 100644 --- a/app/templates/components/orders/order-summary.hbs +++ b/app/templates/components/orders/order-summary.hbs @@ -60,11 +60,11 @@ {{ticket.name}} - {{currency-symbol eventCurrency}} {{number-format ticket.price}} - {{currency-symbol eventCurrency}} {{number-format ticket.discount}} + {{currency-symbol eventCurrency}} {{format-number ticket.price}} + {{currency-symbol eventCurrency}} {{format-number ticket.discount}} {{ticket-attendees data.attendees ticket.attendees}} - {{currency-symbol eventCurrency}} {{number-format (mult (sub ticket.price ticket.discount) (ticket-attendees data.attendees ticket.attendees))}} + {{currency-symbol eventCurrency}} {{format-number (mult (sub ticket.price ticket.discount) (ticket-attendees data.attendees ticket.attendees))}} {{#if event.tax}} @@ -90,7 +90,7 @@
- {{currency-symbol eventCurrency}} {{number-format data.amount}} + {{currency-symbol eventCurrency}} {{format-number data.amount}}
diff --git a/app/templates/components/public/ticket-list.hbs b/app/templates/components/public/ticket-list.hbs index 5e05d4b4bca..2054e73dc56 100644 --- a/app/templates/components/public/ticket-list.hbs +++ b/app/templates/components/public/ticket-list.hbs @@ -25,14 +25,14 @@ {{#if ticket.discount}}
- {{currency-symbol eventCurrency}} {{number-format ticket.price}} + {{currency-symbol eventCurrency}} {{format-number ticket.price}}
- {{currency-symbol eventCurrency}} {{number-format (sub ticket.price ticket.discount)}} + {{currency-symbol eventCurrency}} {{format-number (sub ticket.price ticket.discount)}}
{{else}} - {{currency-symbol eventCurrency}} {{number-format ticket.price}} + {{currency-symbol eventCurrency}} {{format-number ticket.price}} {{/if}}
@@ -50,7 +50,7 @@
- {{currency-symbol eventCurrency}} {{number-format (mult (sub ticket.price ticket.discount) ticket.orderQuantity)}} + {{currency-symbol eventCurrency}} {{format-number (mult (sub ticket.price ticket.discount) ticket.orderQuantity)}} {{/unless}} @@ -64,7 +64,7 @@
- {{t 'Total'}}: {{currency-symbol eventCurrency}} {{number-format total}} + {{t 'Total'}}: {{currency-symbol eventCurrency}} {{format-number total}}
diff --git a/app/templates/components/ui-table/cell/admin/sales/status/cell-amount.hbs b/app/templates/components/ui-table/cell/admin/sales/status/cell-amount.hbs index be314611fad..13912e8d872 100644 --- a/app/templates/components/ui-table/cell/admin/sales/status/cell-amount.hbs +++ b/app/templates/components/ui-table/cell/admin/sales/status/cell-amount.hbs @@ -1,3 +1,3 @@ - US$ {{number-format record.amount}} + US$ {{format-number record.amount}} diff --git a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-price.hbs b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-price.hbs index c84c544b2ea..258564c93cc 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-price.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-price.hbs @@ -1,5 +1,5 @@
- {{currency-symbol paymentCurrency}} {{number-format record.order.amount}} + {{currency-symbol paymentCurrency}} {{format-number record.order.amount}}
{{#if record.order.discountCode.code}}
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/cell-add-order-price.hbs b/app/templates/components/ui-table/cell/events/view/tickets/cell-add-order-price.hbs index a3f22a5c5bc..59baf4139fa 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/cell-add-order-price.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/cell-add-order-price.hbs @@ -1 +1 @@ -{{currency-symbol paymentCurrency}} {{number-format record.price}} \ No newline at end of file +{{currency-symbol paymentCurrency}} {{format-number record.price}} \ No newline at end of file diff --git a/app/templates/components/ui-table/cell/events/view/tickets/cell-add-order-total.hbs b/app/templates/components/ui-table/cell/events/view/tickets/cell-add-order-total.hbs index e66dc294d8b..1a974e72348 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/cell-add-order-total.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/cell-add-order-total.hbs @@ -1 +1 @@ -{{currency-symbol paymentCurrency}} {{number-format (mult record.orderQuantity record.price)}} \ No newline at end of file +{{currency-symbol paymentCurrency}} {{format-number (mult record.orderQuantity record.price)}} \ No newline at end of file diff --git a/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-value.hbs b/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-value.hbs index 41ce3a349a7..f741314b6ed 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-value.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/discount-codes/cell-value.hbs @@ -1,7 +1,7 @@ {{#if (eq record.type 'percent')}} - {{number-format record.value}}{{t '%'}} + {{format-number record.value}}{{t '%'}} {{else if (eq record.type 'amount')}} - {{t currency-symbol record.event.paymentCurrency }}{{number-format record.value}} + {{t currency-symbol record.event.paymentCurrency }}{{format-number record.value}} {{/if}} diff --git a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-amount.hbs b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-amount.hbs index ef9267a6b8b..29ddcf2bc09 100644 --- a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-amount.hbs +++ b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-amount.hbs @@ -1,5 +1,5 @@
- {{currency-symbol paymentCurrency}} {{number-format record.amount}} + {{currency-symbol paymentCurrency}} {{format-number record.amount}}
{{#if record.discountCode.code}}
diff --git a/app/templates/components/widgets/forms/date-picker.hbs b/app/templates/components/widgets/forms/date-picker.hbs index 925022b7306..90e71ace865 100644 --- a/app/templates/components/widgets/forms/date-picker.hbs +++ b/app/templates/components/widgets/forms/date-picker.hbs @@ -1,4 +1,4 @@ {{#if icon}} {{/if}} -{{input type='text' value=value placeholder=placeholder name=name focus-out='onChange'}} +{{input type='text' value=value placeholder=placeholder name=name focus-out=(action 'onChange')}} diff --git a/app/templates/events/view/tickets/index.hbs b/app/templates/events/view/tickets/index.hbs index 8f869b70f25..8eb8f0263f1 100644 --- a/app/templates/events/view/tickets/index.hbs +++ b/app/templates/events/view/tickets/index.hbs @@ -4,7 +4,7 @@
{{model.orderStats.orders.completed}}
{{t 'Orders'}}
-
{{number-format model.orderStats.sales.completed}}
{{t 'Sales '}}({{currency-symbol model.eventDetail.paymentCurrency}})
+
{{format-number model.orderStats.sales.completed}}
{{t 'Sales '}}({{currency-symbol model.eventDetail.paymentCurrency}})
{{model.orderStats.tickets.completed}}
{{t 'Tickets sold'}}
@@ -32,7 +32,7 @@ {{/link-to}} {{model.orderStats.tickets.cancelled}} {{model.orderStats.orders.cancelled}} - {{number-format model.orderStats.sales.cancelled}} + {{format-number model.orderStats.sales.cancelled}} {{#link-to 'events.view.tickets.orders.list' 'cancelled'}} {{t 'View orders'}} @@ -50,7 +50,7 @@ {{/link-to}} {{model.orderStats.tickets.pending}} {{model.orderStats.orders.pending}} - {{number-format model.orderStats.sales.pending}} + {{format-number model.orderStats.sales.pending}} {{#link-to 'events.view.tickets.orders.list' 'pending'}} {{t 'View orders'}} @@ -68,7 +68,7 @@ {{/link-to}} {{model.orderStats.tickets.expired}} {{model.orderStats.orders.expired}} - {{number-format model.orderStats.sales.expired}} + {{format-number model.orderStats.sales.expired}} {{#link-to 'events.view.tickets.orders.list' 'expired'}} {{t 'View orders'}} @@ -86,7 +86,7 @@ {{/link-to}} {{model.orderStats.tickets.placed}} {{model.orderStats.orders.placed}} - {{number-format model.orderStats.sales.placed}} + {{format-number model.orderStats.sales.placed}} {{#link-to 'events.view.tickets.orders.list' 'placed'}} {{t 'View orders'}} @@ -104,7 +104,7 @@ {{/link-to}} {{model.orderStats.tickets.completed}} {{model.orderStats.orders.completed}} - {{number-format model.orderStats.sales.completed}} + {{format-number model.orderStats.sales.completed}} {{#link-to 'events.view.tickets.orders.index'}} {{t 'View orders'}} @@ -144,11 +144,11 @@ {{ticket.name}} {{ticket.quantity}} {{ticket.orderStatistics.tickets.completed}} - {{currency-symbol model.eventDetail.paymentCurrency}} {{number-format ticket.orderStatistics.sales.completed}} + {{currency-symbol model.eventDetail.paymentCurrency}} {{format-number ticket.orderStatistics.sales.completed}} {{ticket.orderStatistics.tickets.placed}} - {{currency-symbol model.eventDetail.paymentCurrency}} {{number-format ticket.orderStatistics.sales.placed}} + {{currency-symbol model.eventDetail.paymentCurrency}} {{format-number ticket.orderStatistics.sales.placed}} {{ticket.orderStatistics.tickets.pending}} - {{currency-symbol model.eventDetail.paymentCurrency}} {{number-format ticket.orderStatistics.sales.pending}} + {{currency-symbol model.eventDetail.paymentCurrency}} {{format-number ticket.orderStatistics.sales.pending}} {{/each}} diff --git a/app/utils/colors.js b/app/utils/colors.js index f46b1eb0b42..337609fcd1a 100644 --- a/app/utils/colors.js +++ b/app/utils/colors.js @@ -1,5 +1,5 @@ -import palette from 'npm:google-material-color'; -import { random } from 'lodash'; +import palette from 'google-material-color'; +import { random } from 'lodash-es'; export const getColor = (shades = ['600', '700', '800', '900']) => { let color = null; diff --git a/app/utils/computed-helpers.js b/app/utils/computed-helpers.js index dc8cda760da..ddd8ab0d6f4 100644 --- a/app/utils/computed-helpers.js +++ b/app/utils/computed-helpers.js @@ -1,6 +1,6 @@ import { computed } from '@ember/object'; import moment from 'moment'; -import { values } from 'lodash'; +import { values } from 'lodash-es'; import { isValidUrl } from 'open-event-frontend/utils/validators'; import { FORM_DATE_FORMAT, FORM_TIME_FORMAT } from 'open-event-frontend/utils/dictionary/date-time'; diff --git a/app/utils/dictionary/filters.js b/app/utils/dictionary/filters.js index 88887d6988c..3e7278705dc 100644 --- a/app/utils/dictionary/filters.js +++ b/app/utils/dictionary/filters.js @@ -1,35 +1,35 @@ export const getDateRanges = function() { return [ { - name : this.get('l10n').t('All Dates'), + name : this.l10n.t('All Dates'), key : 'all_dates' }, { - name : this.get('l10n').t('Today'), + name : this.l10n.t('Today'), key : 'today' }, { - name : this.get('l10n').t('Tomorrow'), + name : this.l10n.t('Tomorrow'), key : 'tomorrow' }, { - name : this.get('l10n').t('This week'), + name : this.l10n.t('This week'), key : 'this_week' }, { - name : this.get('l10n').t('This Weekend'), + name : this.l10n.t('This Weekend'), key : 'this_weekend' }, { - name : this.get('l10n').t('Next week'), + name : this.l10n.t('Next week'), key : 'next_week' }, { - name : this.get('l10n').t('This Month'), + name : this.l10n.t('This Month'), key : 'this_month' }, { - name : this.get('l10n').t('Custom dates'), + name : this.l10n.t('Custom dates'), key : 'custom_dates' } ]; diff --git a/app/utils/errors.js b/app/utils/errors.js index c1e1c0c73c2..dff2eb8a3f8 100644 --- a/app/utils/errors.js +++ b/app/utils/errors.js @@ -1,4 +1,4 @@ -import { isString, isArray, isObjectLike, isNumber } from 'lodash'; +import { isString, isArray, isObjectLike, isNumber } from 'lodash-es'; /** * A recursive method to parse and retrieve an error string from a BE response diff --git a/app/utils/string.js b/app/utils/string.js index 021e7444dcc..84eeb340b60 100644 --- a/app/utils/string.js +++ b/app/utils/string.js @@ -1,4 +1,4 @@ -import { camelCase } from 'lodash'; +import { camelCase } from 'lodash-es'; export const pascalCase = string => { string = camelCase(string); diff --git a/app/utils/url.js b/app/utils/url.js index a8f6720236e..e531628a038 100644 --- a/app/utils/url.js +++ b/app/utils/url.js @@ -1,6 +1,6 @@ -import UrlParser from 'npm:url-parse'; -import queryString from 'npm:query-string'; -import { merge, mapValues, isArray } from 'lodash'; +import UrlParser from 'url-parse'; +import queryString from 'query-string'; +import { merge, mapValues, isArray } from 'lodash-es'; /** * Build a URL with query string diff --git a/config/optional-features.json b/config/optional-features.json new file mode 100644 index 00000000000..850a43179a0 --- /dev/null +++ b/config/optional-features.json @@ -0,0 +1,4 @@ +{ + "application-template-wrapper": true, + "jquery-integration": true +} diff --git a/ember-cli-build.js b/ember-cli-build.js index b03c14e6aa7..2d61c70d516 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -2,7 +2,7 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app'); const MergeTrees = require('broccoli-merge-trees'); const Funnel = require('broccoli-funnel'); -const { browsers } = require('./config/targets'); +const targets = require('./config/targets'); let env = process.env.EMBER_ENV || 'development'; @@ -13,13 +13,20 @@ module.exports = function(defaults) { }, storeConfigInMeta : false, autoprefixer : { - browsers, - cascade: false + browsers : targets.browsers, + cascade : false }, minifyHTML: { enabled : false, htmlFiles : ['index.html', '404.html'] }, + babel: { + plugins: [ + '@babel/plugin-proposal-object-rest-spread' + ], + targets, + sourceMaps: 'inline' + }, fingerprint: { enabled : env === 'production', generateAssetMap : true, diff --git a/package.json b/package.json index 5f8eee226ee..d27e9d642a6 100644 --- a/package.json +++ b/package.json @@ -19,103 +19,117 @@ "postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'bower_components', 'junction') } catch (e) { }\"" }, "devDependencies": { + "@babel/core": "^7.4.4", + "@babel/plugin-proposal-object-rest-spread": "^7.4.4", + "@babel/plugin-transform-block-scoping": "^7.4.4", "@ember/jquery": "^0.6.0", - "async": "^2.6.1", + "@ember/optional-features": "^0.7.0", + "@types/ember": "^3.1.0", + "@types/ember-data": "^3.1.7", + "@types/rsvp": "^4.0.2", + "async": "^2.6.2", "babel-eslint": "^8.2.3", "broccoli-asset-rev": "^3.0.0", "broccoli-persistent-filter": "^2.0.0", "ember-ajax": "5.0.0", - "ember-browserify": "^1.1.13", - "ember-cached-shoe": "^0.2.0", - "ember-cli": "~3.10.0", - "ember-cli-app-version": "^3.0.0", + "ember-auto-import": "^1.3.0", + "ember-cached-shoe": "^0.2.1", + "ember-cli": "~3.10.1", + "ember-cli-accounting": "^2.0.2", + "ember-cli-app-version": "^3.2.0", "ember-cli-autoprefixer": "0.8.1", - "ember-cli-babel": "^7.1.3", - "ember-cli-clipboard": "^0.11.0", + "ember-cli-babel": "^7.7.3", + "ember-cli-cjs-transform": "^1.3.1", + "ember-cli-clipboard": "^0.11.1", "ember-cli-code-coverage": "^1.0.0-beta.0", - "ember-cli-content-security-policy": "^1.0.0", - "ember-cli-dependency-checker": "^3.0.0", + "ember-cli-content-security-policy": "^1.1.1", + "ember-cli-dependency-checker": "^3.1.0", "ember-cli-deploy": "^1.0.0", "ember-cli-deploy-build": "^1.0.0", "ember-cli-deploy-git": "^1.2.0", "ember-cli-deploy-html-manifest": "0.0.6", "ember-cli-deploy-revision-data": "^1.0.0", - "ember-cli-deprecation-workflow": "^1.0.0", - "ember-cli-document-title": "^0.4.0", - "ember-cli-dotenv": "^2.0.0", + "ember-cli-deprecation-workflow": "^1.0.1", + "ember-cli-document-title-northm": "^1.0.3", + "ember-cli-dotenv": "^2.2.2", "ember-cli-eslint": "^5.1.0", - "ember-cli-fastboot": "^2.0.0", + "ember-cli-fastboot": "^2.0.4", "ember-cli-geo": "^4.0.0", "ember-cli-head": "^0.4.1", "ember-cli-html-minifier": "^1.0.0", - "ember-cli-htmlbars": "^3.0.0", - "ember-cli-htmlbars-inline-precompile": "^2.0.0", + "ember-cli-htmlbars": "^3.0.1", + "ember-cli-htmlbars-inline-precompile": "^2.1.0", "ember-cli-ifa": "^0.7.0", "ember-cli-inject-live-reload": "^1.7.0", - "ember-cli-mirage": "^0.4.7", + "ember-cli-mirage": "^0.4.15", "ember-cli-moment-shim": "^3.7.1", "ember-cli-nouislider": "^1.1.0", - "ember-cli-pace": "^0.1.0", + "ember-cli-pace": "devotox/ember-cli-pace#master", "ember-cli-qunit": "^4.1.1", - "ember-cli-sass": "^7.1.0", - "ember-cli-scss-lint": "^2.2.0", - "ember-cli-sentry": "^4.0.0", + "ember-cli-sass": "^10.0.0", + "ember-cli-scss-lint": "^2.4.1", + "ember-cli-sentry": "^4.1.0", "ember-cli-shims": "^1.2.0", "ember-cli-string-helpers": "^2.0.0", "ember-cli-stripe": "^1.0.4", "ember-cli-template-lint": "^0.7.6", "ember-cli-uglify": "^3.0.0", - "ember-composable-helpers": "^2.0.0", + "ember-composable-helpers": "^2.3.1", "ember-config-service": "^1.0.0", "ember-cookies": "^0.4.0", - "ember-data": "~3.3.1", + "ember-data": "~3.10.0", "ember-data-has-many-query": "^0.3.0", - "ember-drag-drop": "^0.6.0", + "ember-drag-drop": "^0.6.3", "ember-exam": "^2.0.2", "ember-export-application-global": "^2.0.0", - "ember-fetch": "^6.4.0", + "ember-fetch": "6.5.1", "ember-fullcalendar": "^1.7.0", "ember-g-map": "0.0.25", "ember-href-to": "3.1.0", - "ember-infinity": "^1.3.3", + "ember-infinity": "^1.4.5", "ember-l10n": "^2.0.4", "ember-link-action": "0.1.3", "ember-load-initializers": "^2.0.0", - "ember-lodash": "^4.17.5", - "ember-math-helpers": "^2.8.1", + "ember-math-helpers": "^2.11.1", "ember-maybe-import-regenerator": "^0.1.6", "ember-metrics": "^0.13.0", - "ember-models-table": "^2.5.0", - "ember-moment": "^7.7.0", - "ember-notify": "^5.2.1", + "ember-models-table": "^2.10.1", + "ember-moment": "^7.8.1", + "ember-notify": "^5.3.0", "ember-print-this": "^1.0.0", + "ember-qunit": "^4.4.1", "ember-resolver": "^5.0.0", - "ember-route-action-helper": "^2.0.5", - "ember-router-scroll": "1.0.1", - "ember-scroll-to": "^0.6.4", - "ember-simple-auth": "^1.5.1", + "ember-route-action-helper": "^2.0.7", + "ember-router-scroll": "1.1.0", + "ember-scroll-to": "^0.6.5", + "ember-simple-auth": "^1.8.2", "ember-simple-auth-token": "^3.0.0", - "ember-source": "https://s3.amazonaws.com/builds.emberjs.com/release/shas/50db6dc8001c127e5aeb2d6ddbacf9f9205d1d7b.tgz", - "ember-string-helpers": "^1.0.2", - "ember-truth-helpers": "^2.0.0", + "ember-source": "~3.10.0", + "ember-truth-helpers": "^2.1.0", "ember-uuid": "^1.0.1", + "eslint-plugin-ember": "^6.2.0", "eslint-plugin-ember-suave": "^1.0.0", + "eslint-plugin-node": "^9.0.1", "gettext.js": "git://github.com/Cropster/gettext.js.git#master", "google-material-color": "^1.3.1", - "http-status": "^1.2.0", - "jquery": "^3.3.1", + "http-status": "^1.3.2", + "jquery": "^3.4.1", "loader.js": "^4.7.0", - "object-to-formdata": "^1.4.3", - "query-string": "^6.3.0", - "qunit-dom": "^0.8.0", - "sanitize-html": "^1.19.1", + "lodash-es": "^4.17.11", + "object-to-formdata": "^1.6.4", + "paypal-checkout": "^4.0.268", + "query-string": "^6.5.0", + "qunit-dom": "^0.8.5", + "sanitize-html": "^1.20.1", + "sass": "^1.20.1", "semantic-ui-ember": "^3.0.3", + "string_decoder": "^1.2.0", "torii": "^0.10.1", - "url-parse": "^1.4.1", - "xgettext-template": "^3.4.0" + "url-parse": "^1.4.7", + "xgettext-template": "^3.4.2" }, "engines": { - "node": "^4.5 || 6.* || >= 7.*", + "node": "8.* || >= 10.*", "yarn": ">= 1.0.0" }, "private": true, @@ -129,12 +143,12 @@ "@bower_components/raven-js": "getsentry/raven-js#~3.3", "@bower_components/semantic-ui-calendar": "mdehoog/semantic-ui-calendar#^0.0.8", "@bower_components/tinyColorPicker": "PitPik/tinyColorPicker#^1.1.1", - "@bower_components/wysihtml": "Voog/wysihtml#^0.5.5", - "paypal-checkout": "^4.0.223", - "string_decoder": "^1.1.1" + "@bower_components/wysihtml": "Voog/wysihtml#^0.5.5" }, "resolutions": { - "ember-cli-babel": "^6.14.1" + "@babel/core": "^7.4.4", + "caniuse-lite": "^1.0.30000967", + "browserslist": "^4.5.6" }, "ember-addon": { "paths": [ diff --git a/tests/integration/components/settings/contact-info-test.js b/tests/integration/components/settings/contact-info-test.js index 9d86cb7a9b2..cf845304b7d 100644 --- a/tests/integration/components/settings/contact-info-test.js +++ b/tests/integration/components/settings/contact-info-test.js @@ -7,7 +7,7 @@ import { render } from '@ember/test-helpers'; module('Integration | Component | settings/contact info section', function(hooks) { setupIntegrationTest(hooks); - var user = EmberObject.create({ + let user = EmberObject.create({ email : 'xyz@xyz.com', contact : '34893485843' }); diff --git a/yarn.lock b/yarn.lock index b26eebffb38..b2e9aca5fdc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14,83 +14,7 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/core@^7.0.0": - version "7.1.2" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.2.tgz#f8d2a9ceb6832887329a7b60f9d035791400ba4e" - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.1.2" - "@babel/helpers" "^7.1.2" - "@babel/parser" "^7.1.2" - "@babel/template" "^7.1.2" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.1.2" - convert-source-map "^1.1.0" - debug "^3.1.0" - json5 "^0.5.0" - lodash "^4.17.10" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/core@^7.1.6": - version "7.2.2" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.2.2.tgz#07adba6dde27bb5ad8d8672f15fde3e08184a687" - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.2.2" - "@babel/helpers" "^7.2.0" - "@babel/parser" "^7.2.2" - "@babel/template" "^7.2.2" - "@babel/traverse" "^7.2.2" - "@babel/types" "^7.2.2" - convert-source-map "^1.1.0" - debug "^4.1.0" - json5 "^2.1.0" - lodash "^4.17.10" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/core@^7.3.3": - version "7.3.4" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.3.4.tgz#921a5a13746c21e32445bf0798680e9d11a6530b" - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.3.4" - "@babel/helpers" "^7.2.0" - "@babel/parser" "^7.3.4" - "@babel/template" "^7.2.2" - "@babel/traverse" "^7.3.4" - "@babel/types" "^7.3.4" - convert-source-map "^1.1.0" - debug "^4.1.0" - json5 "^2.1.0" - lodash "^4.17.11" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/core@^7.3.4": - version "7.4.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.3.tgz#198d6d3af4567be3989550d97e068de94503074f" - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.4.0" - "@babel/helpers" "^7.4.3" - "@babel/parser" "^7.4.3" - "@babel/template" "^7.4.0" - "@babel/traverse" "^7.4.3" - "@babel/types" "^7.4.0" - convert-source-map "^1.1.0" - debug "^4.1.0" - json5 "^2.1.0" - lodash "^4.17.11" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/core@^7.4.3": +"@babel/core@^7.0.0", "@babel/core@^7.1.6", "@babel/core@^7.3.3", "@babel/core@^7.3.4", "@babel/core@^7.4.3", "@babel/core@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.4.tgz#84055750b05fcd50f9915a826b44fa347a825250" dependencies: @@ -119,7 +43,7 @@ source-map "^0.5.0" trim-right "^1.0.1" -"@babel/generator@^7.1.2", "@babel/generator@^7.1.3": +"@babel/generator@^7.1.3": version "7.1.3" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.3.tgz#2103ec9c42d9bdad9190a6ad5ff2d456fd7b8673" dependencies: @@ -139,26 +63,6 @@ source-map "^0.5.0" trim-right "^1.0.1" -"@babel/generator@^7.3.4": - version "7.3.4" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.4.tgz#9aa48c1989257877a9d971296e5b73bfe72e446e" - dependencies: - "@babel/types" "^7.3.4" - jsesc "^2.5.1" - lodash "^4.17.11" - source-map "^0.5.0" - trim-right "^1.0.1" - -"@babel/generator@^7.4.0": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.0.tgz#c230e79589ae7a729fd4631b9ded4dc220418196" - dependencies: - "@babel/types" "^7.4.0" - jsesc "^2.5.1" - lodash "^4.17.11" - source-map "^0.5.0" - trim-right "^1.0.1" - "@babel/generator@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.4.tgz#174a215eb843fc392c7edcaabeaa873de6e8f041" @@ -190,6 +94,17 @@ "@babel/traverse" "^7.1.0" "@babel/types" "^7.0.0" +"@babel/helper-create-class-features-plugin@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz#fc3d690af6554cc9efc607364a82d48f58736dba" + dependencies: + "@babel/helper-function-name" "^7.1.0" + "@babel/helper-member-expression-to-functions" "^7.0.0" + "@babel/helper-optimise-call-expression" "^7.0.0" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-replace-supers" "^7.4.4" + "@babel/helper-split-export-declaration" "^7.4.4" + "@babel/helper-define-map@^7.1.0": version "7.1.0" resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c" @@ -297,6 +212,15 @@ "@babel/traverse" "^7.1.0" "@babel/types" "^7.0.0" +"@babel/helper-replace-supers@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz#aee41783ebe4f2d3ab3ae775e1cc6f1a90cefa27" + dependencies: + "@babel/helper-member-expression-to-functions" "^7.0.0" + "@babel/helper-optimise-call-expression" "^7.0.0" + "@babel/traverse" "^7.4.4" + "@babel/types" "^7.4.4" + "@babel/helper-simple-access@^7.1.0": version "7.1.0" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c" @@ -316,12 +240,6 @@ dependencies: "@babel/types" "^7.0.0" -"@babel/helper-split-export-declaration@^7.4.0": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz#571bfd52701f492920d63b7f735030e9a3e10b55" - dependencies: - "@babel/types" "^7.4.0" - "@babel/helper-split-export-declaration@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677" @@ -337,30 +255,6 @@ "@babel/traverse" "^7.1.0" "@babel/types" "^7.0.0" -"@babel/helpers@^7.1.2": - version "7.1.2" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.1.2.tgz#ab752e8c35ef7d39987df4e8586c63b8846234b5" - dependencies: - "@babel/template" "^7.1.2" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.1.2" - -"@babel/helpers@^7.2.0": - version "7.3.1" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.3.1.tgz#949eec9ea4b45d3210feb7dc1c22db664c9e44b9" - dependencies: - "@babel/template" "^7.1.2" - "@babel/traverse" "^7.1.5" - "@babel/types" "^7.3.0" - -"@babel/helpers@^7.4.3": - version "7.4.3" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.3.tgz#7b1d354363494b31cb9a2417ae86af32b7853a3b" - dependencies: - "@babel/template" "^7.4.0" - "@babel/traverse" "^7.4.3" - "@babel/types" "^7.4.0" - "@babel/helpers@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.4.tgz#868b0ef59c1dd4e78744562d5ce1b59c89f2f2a5" @@ -389,18 +283,10 @@ version "7.1.3" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz#2c92469bac2b7fbff810b67fca07bd138b48af77" -"@babel/parser@^7.2.2", "@babel/parser@^7.2.3": +"@babel/parser@^7.2.3": version "7.3.1" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.1.tgz#8f4ffd45f779e6132780835ffa7a215fa0b2d181" -"@babel/parser@^7.3.4": - version "7.3.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.4.tgz#a43357e4bbf4b92a437fb9e465c192848287f27c" - -"@babel/parser@^7.4.0", "@babel/parser@^7.4.3": - version "7.4.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.3.tgz#eb3ac80f64aa101c907d4ce5406360fe75b7895b" - "@babel/parser@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.4.tgz#5977129431b8fe33471730d255ce8654ae1250b6" @@ -413,6 +299,21 @@ "@babel/helper-remap-async-to-generator" "^7.1.0" "@babel/plugin-syntax-async-generators" "^7.0.0" +"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.3.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz#93a6486eed86d53452ab9bab35e368e9461198ce" + dependencies: + "@babel/helper-create-class-features-plugin" "^7.4.4" + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-proposal-decorators@^7.3.0": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz#de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0" + dependencies: + "@babel/helper-create-class-features-plugin" "^7.4.4" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-decorators" "^7.2.0" + "@babel/plugin-proposal-json-strings@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0.tgz#3b4d7b5cf51e1f2e70f52351d28d44fc2970d01e" @@ -427,6 +328,13 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-object-rest-spread" "^7.0.0" +"@babel/plugin-proposal-object-rest-spread@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz#1ef173fcf24b3e2df92a678f027673b55e7e3005" + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-object-rest-spread" "^7.2.0" + "@babel/plugin-proposal-optional-catch-binding@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0.tgz#b610d928fe551ff7117d42c8bb410eec312a6425" @@ -448,6 +356,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-syntax-decorators@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz#c50b1b957dcc69e4b1127b65e1c33eef61570c1b" + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-json-strings@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0.tgz#0d259a68090e15b383ce3710e01d5b23f3770cbd" @@ -460,12 +374,24 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-syntax-object-rest-spread@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e" + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-optional-catch-binding@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0.tgz#886f72008b3a8b185977f7cb70713b45e51ee475" dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-syntax-typescript@^7.2.0": + version "7.3.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz#a7cc3f66119a9f7ebe2de5383cce193473d65991" + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-transform-arrow-functions@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0.tgz#a6c14875848c68a3b4b3163a486535ef25c7e749" @@ -493,6 +419,13 @@ "@babel/helper-plugin-utils" "^7.0.0" lodash "^4.17.10" +"@babel/plugin-transform-block-scoping@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz#c13279fabf6b916661531841a23c4b7dae29646d" + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + lodash "^4.17.11" + "@babel/plugin-transform-classes@^7.1.0": version "7.1.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.1.0.tgz#ab3f8a564361800cbc8ab1ca6f21108038432249" @@ -621,6 +554,15 @@ dependencies: regenerator-transform "^0.13.3" +"@babel/plugin-transform-runtime@^7.2.0": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.4.tgz#a50f5d16e9c3a4ac18a1a9f9803c107c380bce08" + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-plugin-utils" "^7.0.0" + resolve "^1.8.1" + semver "^5.5.1" + "@babel/plugin-transform-shorthand-properties@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz#85f8af592dcc07647541a0350e8c95c7bf419d15" @@ -653,6 +595,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-transform-typescript@^7.1.0": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.4.tgz#93e9c3f2a546e6d3da1e9cc990e30791b807aa9f" + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-typescript" "^7.2.0" + "@babel/plugin-transform-unicode-regex@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0.tgz#c6780e5b1863a76fe792d90eded9fcd5b51d68fc" @@ -714,6 +663,12 @@ js-levenshtein "^1.1.3" semver "^5.3.0" +"@babel/runtime@^7.2.0": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.4.tgz#dc2e34982eb236803aa27a07fea6857af1b9171d" + dependencies: + regenerator-runtime "^0.13.2" + "@babel/template@7.0.0-beta.44": version "7.0.0-beta.44" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f" @@ -723,7 +678,7 @@ babylon "7.0.0-beta.44" lodash "^4.2.0" -"@babel/template@^7.1.0", "@babel/template@^7.1.2": +"@babel/template@^7.1.0": version "7.1.2" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644" dependencies: @@ -731,22 +686,6 @@ "@babel/parser" "^7.1.2" "@babel/types" "^7.1.2" -"@babel/template@^7.2.2": - version "7.2.2" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907" - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.2.2" - "@babel/types" "^7.2.2" - -"@babel/template@^7.4.0": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.0.tgz#12474e9c077bae585c5d835a95c0b0b790c25c8b" - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.4.0" - "@babel/types" "^7.4.0" - "@babel/template@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237" @@ -784,7 +723,7 @@ globals "^11.1.0" lodash "^4.17.10" -"@babel/traverse@^7.1.5", "@babel/traverse@^7.1.6", "@babel/traverse@^7.2.2": +"@babel/traverse@^7.1.6": version "7.2.3" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8" dependencies: @@ -798,34 +737,6 @@ globals "^11.1.0" lodash "^4.17.10" -"@babel/traverse@^7.3.4": - version "7.3.4" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.3.4.tgz#1330aab72234f8dea091b08c4f8b9d05c7119e06" - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.3.4" - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.0.0" - "@babel/parser" "^7.3.4" - "@babel/types" "^7.3.4" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.11" - -"@babel/traverse@^7.4.3": - version "7.4.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.3.tgz#1a01f078fc575d589ff30c0f71bf3c3d9ccbad84" - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.4.0" - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.4.0" - "@babel/parser" "^7.4.3" - "@babel/types" "^7.4.0" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.11" - "@babel/traverse@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.4.tgz#0776f038f6d78361860b6823887d4f3937133fe8" @@ -856,36 +767,20 @@ lodash "^4.17.10" to-fast-properties "^2.0.0" -"@babel/types@^7.1.6", "@babel/types@^7.2.2", "@babel/types@^7.3.0": - version "7.3.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.0.tgz#61dc0b336a93badc02bf5f69c4cd8e1353f2ffc0" - dependencies: - esutils "^2.0.2" - lodash "^4.17.10" - to-fast-properties "^2.0.0" - -"@babel/types@^7.3.4": - version "7.3.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.4.tgz#bf482eaeaffb367a28abbf9357a94963235d90ed" - dependencies: - esutils "^2.0.2" - lodash "^4.17.11" - to-fast-properties "^2.0.0" - -"@babel/types@^7.4.0": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.0.tgz#670724f77d24cce6cc7d8cf64599d511d164894c" +"@babel/types@^7.1.5", "@babel/types@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.4.tgz#8db9e9a629bb7c29370009b4b779ed93fe57d5f0" dependencies: esutils "^2.0.2" lodash "^4.17.11" to-fast-properties "^2.0.0" -"@babel/types@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.4.tgz#8db9e9a629bb7c29370009b4b779ed93fe57d5f0" +"@babel/types@^7.1.6", "@babel/types@^7.2.2", "@babel/types@^7.3.0": + version "7.3.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.0.tgz#61dc0b336a93badc02bf5f69c4cd8e1353f2ffc0" dependencies: esutils "^2.0.2" - lodash "^4.17.11" + lodash "^4.17.10" to-fast-properties "^2.0.0" "@bower_components/Croppie@Foliotek/Croppie#^2.4.1": @@ -952,12 +847,25 @@ jquery "^3.3.1" resolve "^1.10.0" -"@ember/ordered-set@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@ember/ordered-set/-/ordered-set-1.0.0.tgz#cf9ab5fd7510bcad370370ebcded705f6d1c542b" +"@ember/optional-features@^0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-0.7.0.tgz#f65a858007020ddfb8342f586112750c32abd2d9" + dependencies: + chalk "^2.3.0" + co "^4.6.0" + ember-cli-version-checker "^2.1.0" + glob "^7.1.2" + inquirer "^3.3.0" + mkdirp "^0.5.1" + silent-error "^1.1.0" + util.promisify "^1.0.0" + +"@ember/ordered-set@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@ember/ordered-set/-/ordered-set-2.0.3.tgz#2ac1ca73b3bd116063cae814898832ef434a57f9" dependencies: - ember-cli-babel "6.12.0" - ember-compatibility-helpers "^1.0.0-beta.2" + ember-cli-babel "^6.16.0" + ember-compatibility-helpers "^1.1.1" "@ember/test-helpers@^0.7.18": version "0.7.20" @@ -967,6 +875,17 @@ ember-cli-babel "^6.10.0" ember-cli-htmlbars-inline-precompile "^1.0.0" +"@ember/test-helpers@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-1.5.0.tgz#a480181c412778294e317c256d04ca52e63c813a" + integrity sha512-RrS0O3VlDASMsI6v9nxUgO0k8EJGy1nzz/1HgiScbu8LbCpPj4Mp8S82yT/olXA3TShu7c/RfLZHjlN/iRW2OA== + dependencies: + broccoli-debug "^0.6.5" + broccoli-funnel "^2.0.2" + ember-assign-polyfill "^2.6.0" + ember-cli-babel "^7.4.3" + ember-cli-htmlbars-inline-precompile "^2.1.0" + "@glimmer/compiler@^0.32.3": version "0.32.3" resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.32.3.tgz#fc15780ec38aa62b60da600618ca1f43da6b979c" @@ -981,6 +900,10 @@ version "0.2.0" resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.2.0.tgz#73bfd4a6ee4148a80bf092e8a5d29bcac9d4ce7e" +"@glimmer/env@^0.1.7": + version "0.1.7" + resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07" + "@glimmer/interfaces@^0.32.3": version "0.32.3" resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.32.3.tgz#a328344d88490c1ae765ebe18ee357ed9a66f0fb" @@ -1022,7 +945,134 @@ dependencies: "@types/estree" "*" -"@types/estree@*": +"@types/ember-data@^3.1.7": + version "3.1.7" + resolved "https://registry.yarnpkg.com/@types/ember-data/-/ember-data-3.1.7.tgz#7e5cc5236b97c1ff2457d0776dd020f96542e343" + dependencies: + "@types/ember" "*" + "@types/ember__object" "*" + "@types/rsvp" "*" + +"@types/ember@*", "@types/ember@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@types/ember/-/ember-3.1.0.tgz#3c44b846c41a1340bc823910f9222746585b3314" + dependencies: + "@types/ember__application" "*" + "@types/ember__array" "*" + "@types/ember__component" "*" + "@types/ember__controller" "*" + "@types/ember__debug" "*" + "@types/ember__engine" "*" + "@types/ember__error" "*" + "@types/ember__object" "*" + "@types/ember__polyfills" "*" + "@types/ember__routing" "*" + "@types/ember__runloop" "*" + "@types/ember__service" "*" + "@types/ember__string" "*" + "@types/ember__test" "*" + "@types/ember__utils" "*" + "@types/htmlbars-inline-precompile" "*" + "@types/jquery" "*" + "@types/rsvp" "*" + +"@types/ember__application@*": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@types/ember__application/-/ember__application-3.0.7.tgz#8a34f6d75661256d6d6859dcdde848bdd3bea47e" + dependencies: + "@types/ember__application" "*" + "@types/ember__engine" "*" + "@types/ember__object" "*" + "@types/ember__routing" "*" + +"@types/ember__array@*": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/ember__array/-/ember__array-3.0.4.tgz#6b04b9188da1c315d808304c989a6e7ed24d7ad3" + dependencies: + "@types/ember__array" "*" + "@types/ember__object" "*" + +"@types/ember__component@*": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/ember__component/-/ember__component-3.0.5.tgz#ae0a64d53ec3bff7a100347fac52320cba068c22" + dependencies: + "@types/ember__component" "*" + "@types/ember__object" "*" + "@types/jquery" "*" + +"@types/ember__controller@*": + version "3.0.6" + resolved "https://registry.yarnpkg.com/@types/ember__controller/-/ember__controller-3.0.6.tgz#dbfbc1480a4584efb719746b3562636398bf6261" + dependencies: + "@types/ember__object" "*" + +"@types/ember__debug@*": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/ember__debug/-/ember__debug-3.0.4.tgz#cdf87a580688a0e3053820eff6f390fbb7ba0e80" + dependencies: + "@types/ember__debug" "*" + "@types/ember__engine" "*" + "@types/ember__object" "*" + +"@types/ember__engine@*": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/ember__engine/-/ember__engine-3.0.4.tgz#7e79d72653f5c7fd9f6d828d32540be372128aca" + dependencies: + "@types/ember__engine" "*" + "@types/ember__object" "*" + +"@types/ember__error@*": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/ember__error/-/ember__error-3.0.3.tgz#73e5d9f05212d7965e7c2f4df39abdbf5ea41ab1" + +"@types/ember__object@*": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@types/ember__object/-/ember__object-3.1.1.tgz#ea0a8313fc80ac5af4826190da3e688d72f02d58" + dependencies: + "@types/ember__object" "*" + "@types/rsvp" "*" + +"@types/ember__polyfills@*": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/ember__polyfills/-/ember__polyfills-3.0.5.tgz#8f2c97b42f089afed53b4c137a6d7bbf4f7aa12e" + +"@types/ember__routing@*": + version "3.0.9" + resolved "https://registry.yarnpkg.com/@types/ember__routing/-/ember__routing-3.0.9.tgz#3387d4f60b1ea3211d96e8bb9700129125c95538" + dependencies: + "@types/ember__component" "*" + "@types/ember__controller" "*" + "@types/ember__object" "*" + "@types/ember__routing" "*" + "@types/ember__service" "*" + +"@types/ember__runloop@*": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/ember__runloop/-/ember__runloop-3.0.5.tgz#7101cc0d5b06d2b578a34ce4b9e8355d9061ac71" + dependencies: + "@types/ember__runloop" "*" + +"@types/ember__service@*": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/ember__service/-/ember__service-3.0.5.tgz#6e566ae03eb26ec16ea6cc84e9cc190d926b791b" + dependencies: + "@types/ember__object" "*" + +"@types/ember__string@*": + version "3.0.6" + resolved "https://registry.yarnpkg.com/@types/ember__string/-/ember__string-3.0.6.tgz#79b10b0fc0136a9c86536bc55cbd18cae9a9bd3b" + +"@types/ember__test@*": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/ember__test/-/ember__test-3.0.5.tgz#8435b9b3caa5b97a9057d8f4e922c20f2279f93f" + dependencies: + "@types/ember__application" "*" + +"@types/ember__utils@*": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/ember__utils/-/ember__utils-3.0.2.tgz#d4c32007d0c84c95faa9221a1582b87ac3b1b4f3" + +"@types/estree@*", "@types/estree@0.0.39": version "0.0.39" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" @@ -1030,17 +1080,40 @@ version "0.0.38" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2" +"@types/htmlbars-inline-precompile@*": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/htmlbars-inline-precompile/-/htmlbars-inline-precompile-1.0.1.tgz#de564513fabb165746aecd76369c87bd85e5bbb4" + +"@types/jquery@*": + version "3.3.29" + resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.29.tgz#680a2219ce3c9250483722fccf5570d1e2d08abd" + dependencies: + "@types/sizzle" "*" + "@types/minimatch@^3.0.3": version "3.0.3" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" +"@types/node@*": + version "12.0.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40" + "@types/node@^9.6.0": version "9.6.39" resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.39.tgz#111cb4f5591cb6945aad34733b4e40bfd59b58fc" +"@types/rsvp@*", "@types/rsvp@^4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.2.tgz#bf9f72eaa6771292638a85bb8ce1db97e754b371" + +"@types/sizzle@*": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47" + "@types/symlink-or-copy@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@types/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#4151a81b4052c80bc2becbae09f3a9ec010a9c7a" + integrity sha512-Lja2xYuuf2B3knEsga8ShbOdsfNOtzT73GyJmZyY7eGl2+ajOqrs8yM5ze0fsSoYwvA6bw7/Qr7OZ7PEEmYwWg== "@webassemblyjs/ast@1.7.11": version "1.7.11" @@ -1167,6 +1240,10 @@ "@webassemblyjs/wast-parser" "1.7.11" "@xtuc/long" "4.2.1" +"@xg-wang/whatwg-fetch@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@xg-wang/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#f7b222c012a238e7d6e89ed3d72a1e0edb58453d" + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -1179,13 +1256,6 @@ Base64@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/Base64/-/Base64-1.0.1.tgz#def45cc50c961bcc9bf2321d0f52bcbfec1f1bb1" -JSONStream@^1.0.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.3.tgz#27b4b8fbbfeab4e71bcf551e7f27be8d952239bf" - dependencies: - jsonparse "^1.2.0" - through ">=2.2.7 <3" - JSONStream@~1.3.1: version "1.3.5" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" @@ -1201,9 +1271,9 @@ abbrev@1, abbrev@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" -abortcontroller-polyfill@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.2.1.tgz#4e88847513a4ed691d5e4899d8b3a3af6f7d90ee" +abortcontroller-polyfill@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.3.0.tgz#de69af32ae926c210b7efbcc29bf644ee4838b00" accepts@~1.3.4, accepts@~1.3.5: version "1.3.5" @@ -1232,29 +1302,14 @@ acorn-jsx@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e" -acorn-node@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.3.0.tgz#5f86d73346743810ef1269b901dbcbded020861b" - dependencies: - acorn "^5.4.1" - xtend "^4.0.1" - acorn@^3.0.0, acorn@^3.0.4: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" -acorn@^4.0.3: - version "4.0.13" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" - -acorn@^5.0.0, acorn@^5.5.3, acorn@^5.6.2: +acorn@^5.0.0, acorn@^5.2.1, acorn@^5.5.3, acorn@^5.6.2: version "5.7.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" -acorn@^5.0.3, acorn@^5.2.1, acorn@^5.4.1: - version "5.6.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.6.2.tgz#b1da1d7be2ac1b4a327fb9eab851702c5045b4e7" - acorn@^5.5.0: version "5.5.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9" @@ -1333,11 +1388,11 @@ align-text@^0.1.1, align-text@^0.1.3: longest "^1.0.1" repeat-string "^1.5.2" -amd-name-resolver@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.7.tgz#814301adfe8a2f109f6e84d5e935196efb669615" +alter@~0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/alter/-/alter-0.2.0.tgz#c7588808617572034aae62480af26b1d4d1cb3cd" dependencies: - ensure-posix-path "^1.0.1" + stable "~0.1.3" amd-name-resolver@1.2.0, amd-name-resolver@^1.2.0: version "1.2.0" @@ -1345,7 +1400,7 @@ amd-name-resolver@1.2.0, amd-name-resolver@^1.2.0: dependencies: ensure-posix-path "^1.0.1" -amd-name-resolver@^1.3.1: +amd-name-resolver@^1.2.1, amd-name-resolver@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.3.1.tgz#ffe71c683c6e7191fc4ae1bb3aaed15abea135d9" dependencies: @@ -1412,6 +1467,12 @@ ansi-styles@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178" +ansi-to-html@^0.6.6: + version "0.6.10" + resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.10.tgz#412114353bac2589a034db7ec5b371b8ba771131" + dependencies: + entities "^1.1.1" + ansicolors@~0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef" @@ -1450,14 +1511,6 @@ append-transform@^0.4.0: dependencies: default-require-extensions "^1.0.0" -applause@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/applause/-/applause-1.2.2.tgz#a8468579e81f67397bb5634c29953bedcd0f56c0" - dependencies: - cson-parser "^1.1.0" - js-yaml "^3.3.0" - lodash "^3.10.0" - aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -1505,26 +1558,10 @@ array-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" -array-filter@~0.0.0: - version "0.0.1" - resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec" - -array-find-index@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" - array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" -array-map@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662" - -array-reduce@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b" - array-to-error@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/array-to-error/-/array-to-error-1.1.1.tgz#d68812926d14097a205579a667eeaf1856a44c07" @@ -1585,7 +1622,7 @@ assert-plus@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" -assert@^1.1.1, assert@^1.4.0: +assert@^1.1.1: version "1.4.1" resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" dependencies: @@ -1595,6 +1632,18 @@ assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" +ast-traverse@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ast-traverse/-/ast-traverse-0.1.1.tgz#69cf2b8386f19dcda1bb1e05d68fe359d8897de6" + +ast-types@0.8.12: + version "0.8.12" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.12.tgz#a0d90e4351bb887716c83fd637ebf818af4adfcc" + +ast-types@0.8.15: + version "0.8.15" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.15.tgz#8eef0827f04dff0ec8857ba925abe3fea6194e52" + ast-types@0.9.6: version "0.9.6" resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9" @@ -1603,12 +1652,6 @@ astral-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" -astw@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/astw/-/astw-2.2.0.tgz#7bd41784d32493987aeb239b6b4e1c57a873b917" - dependencies: - acorn "^4.0.3" - async-disk-cache@^1.0.0, async-disk-cache@^1.2.1: version "1.3.3" resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-1.3.3.tgz#6040486660b370e4051cd9fa9fee275e1fae3728" @@ -1625,9 +1668,9 @@ async-each@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" -async-foreach@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" +async-each@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" async-limiter@~1.0.0: version "1.0.0" @@ -1648,7 +1691,7 @@ async@^1.3.0, async@^1.4.0, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" -async@^2.1.4, async@^2.4.1, async@^2.6.0: +async@^2.1.4, async@^2.4.1: version "2.6.0" resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" dependencies: @@ -1660,6 +1703,12 @@ async@^2.5.0, async@^2.6.1: dependencies: lodash "^4.17.10" +async@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381" + dependencies: + lodash "^4.17.11" + async@~0.2.6, async@~0.2.9: version "0.2.10" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" @@ -1699,9 +1748,9 @@ aws4@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" -b2a@^1.0.9: - version "1.0.10" - resolved "https://registry.yarnpkg.com/b2a/-/b2a-1.0.10.tgz#979271967ae2dd6d0bafea827ab5d02bb0362c01" +b2a@^1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/b2a/-/b2a-1.0.11.tgz#3e1e27bab975606348ff24e8ea84a4fd6d3bec62" babel-code-frame@^6.26.0: version "6.26.0" @@ -1711,7 +1760,58 @@ babel-code-frame@^6.26.0: esutils "^2.0.2" js-tokens "^3.0.2" -babel-core@^6.14.0, babel-core@^6.24.1, babel-core@^6.26.0: +babel-core@^5.0.0: + version "5.8.38" + resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-5.8.38.tgz#1fcaee79d7e61b750b00b8e54f6dfc9d0af86558" + dependencies: + babel-plugin-constant-folding "^1.0.1" + babel-plugin-dead-code-elimination "^1.0.2" + babel-plugin-eval "^1.0.1" + babel-plugin-inline-environment-variables "^1.0.1" + babel-plugin-jscript "^1.0.4" + babel-plugin-member-expression-literals "^1.0.1" + babel-plugin-property-literals "^1.0.1" + babel-plugin-proto-to-assign "^1.0.3" + babel-plugin-react-constant-elements "^1.0.3" + babel-plugin-react-display-name "^1.0.3" + babel-plugin-remove-console "^1.0.1" + babel-plugin-remove-debugger "^1.0.1" + babel-plugin-runtime "^1.0.7" + babel-plugin-undeclared-variables-check "^1.0.2" + babel-plugin-undefined-to-void "^1.1.6" + babylon "^5.8.38" + bluebird "^2.9.33" + chalk "^1.0.0" + convert-source-map "^1.1.0" + core-js "^1.0.0" + debug "^2.1.1" + detect-indent "^3.0.0" + esutils "^2.0.0" + fs-readdir-recursive "^0.1.0" + globals "^6.4.0" + home-or-tmp "^1.0.0" + is-integer "^1.0.4" + js-tokens "1.0.1" + json5 "^0.4.0" + lodash "^3.10.0" + minimatch "^2.0.3" + output-file-sync "^1.1.0" + path-exists "^1.0.0" + path-is-absolute "^1.0.0" + private "^0.1.6" + regenerator "0.8.40" + regexpu "^1.3.0" + repeating "^1.1.2" + resolve "^1.1.6" + shebang-regex "^1.0.0" + slash "^1.0.0" + source-map "^0.5.0" + source-map-support "^0.2.10" + to-fast-properties "^1.0.0" + trim-right "^1.0.0" + try-resolve "^1.0.0" + +babel-core@^6.24.1, babel-core@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8" dependencies: @@ -1896,23 +1996,31 @@ babel-plugin-check-es2015-constants@^6.22.0: dependencies: babel-runtime "^6.22.0" +babel-plugin-constant-folding@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/babel-plugin-constant-folding/-/babel-plugin-constant-folding-1.0.1.tgz#8361d364c98e449c3692bdba51eff0844290aa8e" + +babel-plugin-dead-code-elimination@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/babel-plugin-dead-code-elimination/-/babel-plugin-dead-code-elimination-1.0.2.tgz#5f7c451274dcd7cccdbfbb3e0b85dd28121f0f65" + babel-plugin-debug-macros@^0.1.10, babel-plugin-debug-macros@^0.1.11: version "0.1.11" resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.1.11.tgz#6c562bf561fccd406ce14ab04f42c218cf956605" dependencies: semver "^5.3.0" -babel-plugin-debug-macros@^0.2.0-beta.6: +babel-plugin-debug-macros@^0.2.0, babel-plugin-debug-macros@^0.2.0-beta.6: version "0.2.0" resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz#0120ac20ce06ccc57bf493b667cf24b85c28da7a" dependencies: semver "^5.3.0" -babel-plugin-ember-modules-api-polyfill@^1.4.2: - version "1.6.0" - resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-1.6.0.tgz#abd1afa4237b3121cb51222f9bf3283cad8990aa" +babel-plugin-debug-macros@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.1.tgz#cf45b497ab02cdd0c98e11f6da79b1e0773ceae1" dependencies: - ember-rfc176-data "^0.2.0" + semver "^5.3.0" babel-plugin-ember-modules-api-polyfill@^2.3.0: version "2.3.0" @@ -1920,19 +2028,26 @@ babel-plugin-ember-modules-api-polyfill@^2.3.0: dependencies: ember-rfc176-data "^0.3.0" -babel-plugin-ember-modules-api-polyfill@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.5.0.tgz#860aab9fecbf38c10d1fe0779c6979a854fff154" +babel-plugin-ember-modules-api-polyfill@^2.5.0, babel-plugin-ember-modules-api-polyfill@^2.6.0, babel-plugin-ember-modules-api-polyfill@^2.8.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.9.0.tgz#8503e7b4192aeb336b00265e6235258ff6b754aa" dependencies: - ember-rfc176-data "^0.3.5" + ember-rfc176-data "^0.3.9" + +babel-plugin-eval@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/babel-plugin-eval/-/babel-plugin-eval-1.0.1.tgz#a2faed25ce6be69ade4bfec263f70169195950da" babel-plugin-feature-flags@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/babel-plugin-feature-flags/-/babel-plugin-feature-flags-0.3.1.tgz#9c827cf9a4eb9a19f725ccb239e85cab02036fc1" -babel-plugin-filter-imports@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-0.3.1.tgz#e7859b56886b175dd2616425d277b219e209ea8b" +babel-plugin-filter-imports@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-2.0.4.tgz#9209b708ed3b228349c4e6f660358bf02685e803" + dependencies: + "@babel/types" "^7.1.5" + lodash "^4.17.11" babel-plugin-htmlbars-inline-precompile@^0.2.3: version "0.2.4" @@ -1942,6 +2057,10 @@ babel-plugin-htmlbars-inline-precompile@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-1.0.0.tgz#a9d2f6eaad8a3f3d361602de593a8cbef8179c22" +babel-plugin-inline-environment-variables@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/babel-plugin-inline-environment-variables/-/babel-plugin-inline-environment-variables-1.0.1.tgz#1f58ce91207ad6a826a8bf645fafe68ff5fe3ffe" + babel-plugin-istanbul@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.5.tgz#6760cdd977f411d3e175bb064f2bc327d99b2b6e" @@ -1950,6 +2069,14 @@ babel-plugin-istanbul@^4.1.5: istanbul-lib-instrument "^1.7.5" test-exclude "^4.1.1" +babel-plugin-jscript@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/babel-plugin-jscript/-/babel-plugin-jscript-1.0.4.tgz#8f342c38276e87a47d5fa0a8bd3d5eb6ccad8fcc" + +babel-plugin-member-expression-literals@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/babel-plugin-member-expression-literals/-/babel-plugin-member-expression-literals-1.0.1.tgz#cc5edb0faa8dc927170e74d6d1c02440021624d3" + babel-plugin-module-resolver@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.1.1.tgz#881cf67e3d4b8400d5eaaefc1be44d2dc1fe404f" @@ -1970,6 +2097,36 @@ babel-plugin-module-resolver@^3.2.0: reselect "^3.0.1" resolve "^1.4.0" +babel-plugin-property-literals@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/babel-plugin-property-literals/-/babel-plugin-property-literals-1.0.1.tgz#0252301900192980b1c118efea48ce93aab83336" + +babel-plugin-proto-to-assign@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/babel-plugin-proto-to-assign/-/babel-plugin-proto-to-assign-1.0.4.tgz#c49e7afd02f577bc4da05ea2df002250cf7cd123" + dependencies: + lodash "^3.9.3" + +babel-plugin-react-constant-elements@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/babel-plugin-react-constant-elements/-/babel-plugin-react-constant-elements-1.0.3.tgz#946736e8378429cbc349dcff62f51c143b34e35a" + +babel-plugin-react-display-name@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/babel-plugin-react-display-name/-/babel-plugin-react-display-name-1.0.3.tgz#754fe38926e8424a4e7b15ab6ea6139dee0514fc" + +babel-plugin-remove-console@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/babel-plugin-remove-console/-/babel-plugin-remove-console-1.0.1.tgz#d8f24556c3a05005d42aaaafd27787f53ff013a7" + +babel-plugin-remove-debugger@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/babel-plugin-remove-debugger/-/babel-plugin-remove-debugger-1.0.1.tgz#fd2ea3cd61a428ad1f3b9c89882ff4293e8c14c7" + +babel-plugin-runtime@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/babel-plugin-runtime/-/babel-plugin-runtime-1.0.7.tgz#bf7c7d966dd56ecd5c17fa1cb253c9acb7e54aaf" + babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" @@ -2006,7 +2163,7 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es2015-block-scoping@^6.24.1: +babel-plugin-transform-es2015-block-scoping@^6.23.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" dependencies: @@ -2183,6 +2340,16 @@ babel-plugin-transform-strict-mode@^6.24.1: babel-runtime "^6.22.0" babel-types "^6.24.1" +babel-plugin-undeclared-variables-check@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/babel-plugin-undeclared-variables-check/-/babel-plugin-undeclared-variables-check-1.0.2.tgz#5cf1aa539d813ff64e99641290af620965f65dee" + dependencies: + leven "^1.0.2" + +babel-plugin-undefined-to-void@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz#7f578ef8b78dfae6003385d8417a61eda06e2f81" + babel-polyfill@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" @@ -2290,6 +2457,10 @@ babylon@7.0.0-beta.44: version "7.0.0-beta.44" resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d" +babylon@^5.8.38: + version "5.8.38" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-5.8.38.tgz#ec9b120b11bf6ccd4173a18bf217e60b79859ffd" + babylon@^6.18.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" @@ -2348,12 +2519,26 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -beaver-logger@^3.0.11, beaver-logger@^3.0.6: +beaver-logger@^3.0.17: + version "3.0.17" + resolved "https://registry.yarnpkg.com/beaver-logger/-/beaver-logger-3.0.17.tgz#59d201ab9c7359e6250d10f3a72bf06dcc4c2866" + dependencies: + zalgo-promise "^1.0.26" + +beaver-logger@^3.0.6: version "3.0.14" resolved "https://registry.yarnpkg.com/beaver-logger/-/beaver-logger-3.0.14.tgz#ef7e9bf2d72f80b48097842cd79e665df1d862e1" dependencies: zalgo-promise "^1.0.26" +belter@^1.0.77, belter@^1.0.93: + version "1.0.96" + resolved "https://registry.yarnpkg.com/belter/-/belter-1.0.96.tgz#4c9419bda8d037b94a9c81a5ecfc34ff6f0d0827" + dependencies: + cross-domain-safe-weakmap "^1.0.20" + cross-domain-utils "^2.0.10" + zalgo-promise "^1.0.28" + better-assert@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522" @@ -2397,6 +2582,10 @@ block-stream@*: dependencies: inherits "~2.0.0" +bluebird@^2.9.33: + version "2.11.0" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" + bluebird@^3.1.1, bluebird@^3.4.6: version "3.5.1" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" @@ -2477,18 +2666,6 @@ boom@2.x.x: dependencies: hoek "2.x.x" -boom@4.x.x: - version "4.3.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31" - dependencies: - hoek "4.x.x" - -boom@5.x.x: - version "5.2.0" - resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02" - dependencies: - hoek "4.x.x" - bower-config@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.1.tgz#85fd9df367c2b8dbbd0caa4c5f2bad40cd84c2cc" @@ -2534,7 +2711,7 @@ braces@^1.8.2: preserve "^0.2.0" repeat-element "^1.1.2" -braces@^2.3.0: +braces@^2.3.0, braces@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" dependencies: @@ -2566,6 +2743,10 @@ braces@^2.3.1: split-string "^3.0.2" to-regex "^3.0.1" +breakable@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/breakable/-/breakable-1.0.0.tgz#784a797915a38ead27bad456b5572cb4bbaa78c1" + broccoli-amd-funnel@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/broccoli-amd-funnel/-/broccoli-amd-funnel-2.0.1.tgz#dbdbfd28841731342d538126567c25bea3f15310" @@ -2598,15 +2779,15 @@ broccoli-autoprefixer@^5.0.0: broccoli-persistent-filter "^1.1.6" postcss "^6.0.1" -broccoli-babel-transpiler@^6.0.0: - version "6.1.4" - resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.1.4.tgz#8be8074c42abf2e17ff79b2d2a21df5c51143c82" +broccoli-babel-transpiler@^5.6.2: + version "5.7.4" + resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-5.7.4.tgz#2b0611ce9e5d98b8d8d2b49ae1219af2f52767e3" dependencies: - babel-core "^6.14.0" + babel-core "^5.0.0" broccoli-funnel "^1.0.0" broccoli-merge-trees "^1.0.0" - broccoli-persistent-filter "^1.4.0" - clone "^2.0.0" + broccoli-persistent-filter "^1.4.2" + clone "^0.2.0" hash-for-dep "^1.0.2" heimdalljs-logger "^0.1.7" json-stable-stringify "^1.0.0" @@ -2628,22 +2809,22 @@ broccoli-babel-transpiler@^6.4.2: rsvp "^4.8.2" workerpool "^2.3.0" -broccoli-babel-transpiler@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.1.0.tgz#82881100f402419deacf24fc977083993f89a109" +broccoli-babel-transpiler@^6.5.0: + version "6.5.1" + resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.5.1.tgz#a4afc8d3b59b441518eb9a07bd44149476e30738" dependencies: - "@babel/core" "^7.0.0" + babel-core "^6.26.0" broccoli-funnel "^2.0.1" - broccoli-merge-trees "^3.0.0" + broccoli-merge-trees "^2.0.0" broccoli-persistent-filter "^1.4.3" - clone "^2.1.2" + clone "^2.0.0" hash-for-dep "^1.2.3" - heimdalljs-logger "^0.1.9" - json-stable-stringify "^1.0.1" - rsvp "^4.8.3" - workerpool "^2.3.1" + heimdalljs-logger "^0.1.7" + json-stable-stringify "^1.0.0" + rsvp "^4.8.2" + workerpool "^2.3.0" -broccoli-babel-transpiler@^7.2.0: +broccoli-babel-transpiler@^7.1.0, broccoli-babel-transpiler@^7.1.2, broccoli-babel-transpiler@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.2.0.tgz#5c0d694c4055106abb385e2d3d88936d35b7cb18" dependencies: @@ -2768,7 +2949,7 @@ broccoli-config-replace@^1.1.2: debug "^2.2.0" fs-extra "^0.24.0" -broccoli-debug@^0.6.1, broccoli-debug@^0.6.2, broccoli-debug@^0.6.4: +broccoli-debug@^0.6.1, broccoli-debug@^0.6.4: version "0.6.4" resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.4.tgz#986eb3d2005e00e3bb91f9d0a10ab137210cd150" dependencies: @@ -2790,7 +2971,7 @@ broccoli-debug@^0.6.5: symlink-or-copy "^1.1.8" tree-sync "^1.2.2" -broccoli-file-creator@^1.0.0, broccoli-file-creator@^1.1.1: +broccoli-file-creator@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-1.1.1.tgz#1b35b67d215abdfadd8d49eeb69493c39e6c3450" dependencies: @@ -2801,18 +2982,12 @@ broccoli-file-creator@^1.0.0, broccoli-file-creator@^1.1.1: rsvp "~3.0.6" symlink-or-copy "^1.0.1" -broccoli-filter@^0.1.11: - version "0.1.14" - resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-0.1.14.tgz#23cae3891ff9ebb7b4d7db00c6dcf03535daf7ad" +broccoli-file-creator@^2.0.0, broccoli-file-creator@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-2.1.1.tgz#7351dd2496c762cfce7736ce9b49e3fce0c7b7db" dependencies: - broccoli-kitchen-sink-helpers "^0.2.6" - broccoli-writer "^0.1.1" - mkdirp "^0.3.5" - promise-map-series "^0.2.1" - quick-temp "^0.1.2" - rsvp "^3.0.16" - symlink-or-copy "^1.0.1" - walk-sync "^0.1.3" + broccoli-plugin "^1.1.0" + mkdirp "^0.5.1" broccoli-filter@^1.2.2, broccoli-filter@^1.2.3, broccoli-filter@^1.3.0: version "1.3.0" @@ -2832,15 +3007,14 @@ broccoli-funnel-reducer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea" -broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli-funnel@^1.1.0, broccoli-funnel@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296" +broccoli-funnel@2.0.1, "broccoli-funnel@^1.2.0 || ^2.0.0", broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.1.tgz#6823c73b675ef78fffa7ab800f083e768b51d449" dependencies: array-equal "^1.0.0" blank-object "^1.0.1" broccoli-plugin "^1.3.0" debug "^2.2.0" - exists-sync "0.0.4" fast-ordered-set "^1.0.0" fs-tree-diff "^0.5.3" heimdalljs "^0.2.0" @@ -2851,14 +3025,15 @@ broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli symlink-or-copy "^1.0.0" walk-sync "^0.3.1" -"broccoli-funnel@^1.2.0 || ^2.0.0", broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.1.tgz#6823c73b675ef78fffa7ab800f083e768b51d449" +broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296" dependencies: array-equal "^1.0.0" blank-object "^1.0.1" broccoli-plugin "^1.3.0" debug "^2.2.0" + exists-sync "0.0.4" fast-ordered-set "^1.0.0" fs-tree-diff "^0.5.3" heimdalljs "^0.2.0" @@ -2887,7 +3062,7 @@ broccoli-funnel@^2.0.2: symlink-or-copy "^1.0.0" walk-sync "^0.3.1" -broccoli-kitchen-sink-helpers@^0.2.5, broccoli-kitchen-sink-helpers@^0.2.6, broccoli-kitchen-sink-helpers@~0.2.0: +broccoli-kitchen-sink-helpers@^0.2.5, broccoli-kitchen-sink-helpers@~0.2.0: version "0.2.9" resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc" dependencies: @@ -2913,7 +3088,7 @@ broccoli-lint-eslint@^5.0.0: lodash.defaultsdeep "^4.6.0" md5-hex "^2.0.0" -broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.2: +broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.1: version "1.2.4" resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5" dependencies: @@ -3000,7 +3175,7 @@ broccoli-persistent-filter@1.2.11: symlink-or-copy "^1.0.1" walk-sync "^0.3.1" -broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0, broccoli-persistent-filter@^1.4.0, broccoli-persistent-filter@^1.4.3: +broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0, broccoli-persistent-filter@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.3.tgz#3511bc52fc53740cda51621f58a28152d9911bc1" dependencies: @@ -3018,6 +3193,24 @@ broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.5, broccoli-p symlink-or-copy "^1.0.1" walk-sync "^0.3.1" +broccoli-persistent-filter@^1.4.2: + version "1.4.6" + resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.6.tgz#80762d19000880a77da33c34373299c0f6a3e615" + dependencies: + async-disk-cache "^1.2.1" + async-promise-queue "^1.0.3" + broccoli-plugin "^1.0.0" + fs-tree-diff "^0.5.2" + hash-for-dep "^1.0.2" + heimdalljs "^0.2.1" + heimdalljs-logger "^0.1.7" + mkdirp "^0.5.1" + promise-map-series "^0.2.1" + rimraf "^2.6.1" + rsvp "^3.0.18" + symlink-or-copy "^1.0.1" + walk-sync "^0.3.1" + broccoli-persistent-filter@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-2.0.0.tgz#6b0de3c5f6d282a9f23bf57dc5b1b7f2eb9a560e" @@ -3099,30 +3292,6 @@ broccoli-plugin@^1.3.1: rimraf "^2.3.4" symlink-or-copy "^1.1.8" -broccoli-replace@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/broccoli-replace/-/broccoli-replace-0.12.0.tgz#36460a984c45c61731638c53068b0ab12ea8fdb7" - dependencies: - applause "1.2.2" - broccoli-persistent-filter "^1.2.0" - minimatch "^3.0.0" - -broccoli-rollup@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-1.3.0.tgz#43a0a7798555bab54217009eb470a4ff5a056df0" - dependencies: - broccoli-plugin "^1.2.1" - es6-map "^0.1.4" - fs-extra "^0.30.0" - fs-tree-diff "^0.5.2" - heimdalljs "^0.2.1" - heimdalljs-logger "^0.1.7" - md5-hex "^1.3.0" - node-modules-path "^1.0.1" - rollup "^0.41.4" - symlink-or-copy "^1.1.8" - walk-sync "^0.3.1" - broccoli-rollup@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-2.1.1.tgz#0b77dc4b7560a53e998ea85f3b56772612d4988d" @@ -3139,14 +3308,13 @@ broccoli-rollup@^2.1.1: symlink-or-copy "^1.1.8" walk-sync "^0.3.1" -broccoli-sass-source-maps@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.2.0.tgz#1f1a0794136152b096188638b59b42b17a4bdc68" +broccoli-sass-source-maps@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-4.0.0.tgz#1ee4c10a810b10955b0502e28f85ab672f5961a2" dependencies: broccoli-caching-writer "^3.0.3" include-path-searcher "^0.1.0" mkdirp "^0.3.5" - node-sass "^4.7.2" object-assign "^2.0.0" rsvp "^3.0.6" @@ -3171,45 +3339,26 @@ broccoli-source@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-1.1.0.tgz#54f0e82c8b73f46580cbbc4f578f0b32fca8f809" -broccoli-stew@^1.2.0, broccoli-stew@^1.3.3, broccoli-stew@^1.4.2, broccoli-stew@^1.5.0: +broccoli-stew@^1.3.3, broccoli-stew@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-1.5.0.tgz#d7af8c18511dce510e49d308a62e5977f461883c" dependencies: broccoli-debug "^0.6.1" broccoli-funnel "^1.0.1" broccoli-merge-trees "^1.0.0" - broccoli-persistent-filter "^1.1.6" - broccoli-plugin "^1.3.0" - chalk "^1.1.3" - debug "^2.4.0" - ensure-posix-path "^1.0.1" - fs-extra "^2.0.0" - minimatch "^3.0.2" - resolve "^1.1.6" - rsvp "^3.0.16" - symlink-or-copy "^1.1.8" - walk-sync "^0.3.0" - -broccoli-stew@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-2.0.1.tgz#d0a507b79bf5fea9ff84032ae837dc48670ab1dc" - dependencies: - broccoli-debug "^0.6.5" - broccoli-funnel "^2.0.0" - broccoli-merge-trees "^3.0.1" - broccoli-persistent-filter "^2.1.1" - broccoli-plugin "^1.3.1" - chalk "^2.4.1" - debug "^3.1.0" + broccoli-persistent-filter "^1.1.6" + broccoli-plugin "^1.3.0" + chalk "^1.1.3" + debug "^2.4.0" ensure-posix-path "^1.0.1" - fs-extra "^6.0.1" - minimatch "^3.0.4" - resolve "^1.8.1" - rsvp "^4.8.4" - symlink-or-copy "^1.2.0" - walk-sync "^0.3.3" + fs-extra "^2.0.0" + minimatch "^3.0.2" + resolve "^1.1.6" + rsvp "^3.0.16" + symlink-or-copy "^1.1.8" + walk-sync "^0.3.0" -broccoli-stew@^2.1.0: +broccoli-stew@^2.0.1, broccoli-stew@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-2.1.0.tgz#ba73add17fda3b9b01d8cfb343a8b613b7136a0a" dependencies: @@ -3228,21 +3377,13 @@ broccoli-stew@^2.1.0: symlink-or-copy "^1.2.0" walk-sync "^0.3.3" -broccoli-string-replace@^0.1.1: +broccoli-string-replace@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/broccoli-string-replace/-/broccoli-string-replace-0.1.2.tgz#1ed92f85680af8d503023925e754e4e33676b91f" dependencies: broccoli-persistent-filter "^1.1.5" minimatch "^3.0.3" -broccoli-templater@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/broccoli-templater/-/broccoli-templater-1.0.0.tgz#7c054aacf596d1868d1a44291f9ec7b907d30ecf" - dependencies: - broccoli-filter "^0.1.11" - broccoli-stew "^1.2.0" - lodash.template "^3.3.2" - broccoli-templater@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/broccoli-templater/-/broccoli-templater-2.0.1.tgz#2e001e45aeba7fa2eb9b19a54c9c61b741935799" @@ -3270,12 +3411,6 @@ broccoli-uglify-sourcemap@^3.1.0: walk-sync "^1.1.3" workerpool "^3.1.2" -broccoli-unwatched-tree@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/broccoli-unwatched-tree/-/broccoli-unwatched-tree-0.1.3.tgz#ab0fb820f613845bf67a803baad820f68b1e3aae" - dependencies: - broccoli-source "^1.1.0" - broccoli-webpack@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/broccoli-webpack/-/broccoli-webpack-1.0.0.tgz#87c7468d8bbde30c4116e6e3bf0169d81e874b34" @@ -3284,7 +3419,7 @@ broccoli-webpack@^1.0.0: rsvp "^3.2.1" webpack "^1.12.14" -broccoli-writer@^0.1.1, broccoli-writer@~0.1.1: +broccoli-writer@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/broccoli-writer/-/broccoli-writer-0.1.1.tgz#d4d71aa8f2afbc67a3866b91a2da79084b96ab2d" dependencies: @@ -3319,23 +3454,6 @@ brorand@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" -browser-pack@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.1.0.tgz#c34ba10d0b9ce162b5af227c7131c92c2ecd5774" - dependencies: - JSONStream "^1.0.3" - combine-source-map "~0.8.0" - defined "^1.0.0" - safe-buffer "^5.1.1" - through2 "^2.0.0" - umd "^3.0.0" - -browser-resolve@^1.11.0, browser-resolve@^1.7.0: - version "1.11.2" - resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce" - dependencies: - resolve "1.1.7" - browserify-aes@0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-0.4.0.tgz#067149b668df31c4b58533e02d01e806d8608e2c" @@ -3388,7 +3506,7 @@ browserify-sign@^4.0.0: inherits "^2.0.1" parse-asn1 "^5.0.0" -browserify-zlib@^0.1.4, browserify-zlib@~0.1.2: +browserify-zlib@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d" dependencies: @@ -3400,87 +3518,13 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserify@^13.0.0: - version "13.3.0" - resolved "https://registry.yarnpkg.com/browserify/-/browserify-13.3.0.tgz#b5a9c9020243f0c70e4675bec8223bc627e415ce" - dependencies: - JSONStream "^1.0.3" - assert "^1.4.0" - browser-pack "^6.0.1" - browser-resolve "^1.11.0" - browserify-zlib "~0.1.2" - buffer "^4.1.0" - cached-path-relative "^1.0.0" - concat-stream "~1.5.1" - console-browserify "^1.1.0" - constants-browserify "~1.0.0" - crypto-browserify "^3.0.0" - defined "^1.0.0" - deps-sort "^2.0.0" - domain-browser "~1.1.0" - duplexer2 "~0.1.2" - events "~1.1.0" - glob "^7.1.0" - has "^1.0.0" - htmlescape "^1.1.0" - https-browserify "~0.0.0" - inherits "~2.0.1" - insert-module-globals "^7.0.0" - labeled-stream-splicer "^2.0.0" - module-deps "^4.0.8" - os-browserify "~0.1.1" - parents "^1.0.1" - path-browserify "~0.0.0" - process "~0.11.0" - punycode "^1.3.2" - querystring-es3 "~0.2.0" - read-only-stream "^2.0.0" - readable-stream "^2.0.2" - resolve "^1.1.4" - shasum "^1.0.0" - shell-quote "^1.6.1" - stream-browserify "^2.0.0" - stream-http "^2.0.0" - string_decoder "~0.10.0" - subarg "^1.0.0" - syntax-error "^1.1.1" - through2 "^2.0.0" - timers-browserify "^1.0.1" - tty-browserify "~0.0.0" - url "~0.11.0" - util "~0.10.1" - vm-browserify "~0.0.1" - xtend "^4.0.0" - -browserslist@^2.11.3, browserslist@^2.2.2: - version "2.11.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2" - dependencies: - caniuse-lite "^1.0.30000792" - electron-to-chromium "^1.3.30" - -browserslist@^3.2.6: - version "3.2.8" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6" - dependencies: - caniuse-lite "^1.0.30000844" - electron-to-chromium "^1.3.47" - -browserslist@^4.0.0: - version "4.3.6" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.6.tgz#0f9d9081afc66b36f477c6bdf3813f784f42396a" - dependencies: - caniuse-lite "^1.0.30000921" - electron-to-chromium "^1.3.92" - node-releases "^1.1.1" - -browserslist@^4.1.0: - version "4.3.4" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.4.tgz#4477b737db6a1b07077275b24791e680d4300425" +browserslist@^2.11.3, browserslist@^2.2.2, browserslist@^3.2.6, browserslist@^4.0.0, browserslist@^4.1.0, browserslist@^4.5.6: + version "4.6.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.0.tgz#5274028c26f4d933d5b1323307c1d1da5084c9ff" dependencies: - caniuse-lite "^1.0.30000899" - electron-to-chromium "^1.3.82" - node-releases "^1.0.1" + caniuse-lite "^1.0.30000967" + electron-to-chromium "^1.3.133" + node-releases "^1.1.19" bser@^2.0.0: version "2.0.0" @@ -3511,7 +3555,7 @@ buffer-xor@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" -buffer@^4.1.0, buffer@^4.3.0, buffer@^4.9.0: +buffer@^4.3.0, buffer@^4.9.0: version "4.9.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" dependencies: @@ -3523,6 +3567,10 @@ builtin-modules@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" +builtin-modules@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e" + builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" @@ -3638,13 +3686,9 @@ cacheable-request@^2.1.1: normalize-url "2.0.1" responselike "1.0.2" -cached-path-relative@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7" - -calculate-cache-key-for-tree@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/calculate-cache-key-for-tree/-/calculate-cache-key-for-tree-1.1.0.tgz#0c3e42c9c134f3c9de5358c0f16793627ea976d6" +calculate-cache-key-for-tree@^1.2.0: + version "1.2.3" + resolved "https://registry.yarnpkg.com/calculate-cache-key-for-tree/-/calculate-cache-key-for-tree-1.2.3.tgz#5a5e4fcfa2d374a63e47fe967593f179e8282825" dependencies: json-stable-stringify "^1.0.1" @@ -3683,18 +3727,11 @@ camel-case@3.0.x: no-case "^2.2.0" upper-case "^1.1.1" -camelcase-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" - dependencies: - camelcase "^2.0.0" - map-obj "^1.0.0" - -camelcase@^1.0.2: +camelcase@^1.0.2, camelcase@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" -camelcase@^2.0.0, camelcase@^2.0.1: +camelcase@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" @@ -3725,21 +3762,9 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000921: - version "1.0.30000921" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000921.tgz#7a607c1623444b22351d834e093aedda3c42fbe8" - -caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805: - version "1.0.30000823" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000823.tgz#b79842a5b5a48eaa416b73f5a5d7a23f52d26014" - -caniuse-lite@^1.0.30000844: - version "1.0.30000852" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000852.tgz#8b7510cec030cac7842e52beca2bf292af65f935" - -caniuse-lite@^1.0.30000899: - version "1.0.30000903" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858" +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000967: + version "1.0.30000969" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000969.tgz#7664f571f2072657bde70b00a1fc1ba41f1942a9" capture-exit@^1.2.0: version "1.2.0" @@ -3764,10 +3789,6 @@ cardinal@^1.0.0: ansicolors "~0.2.1" redeyed "~1.0.0" -caseless@~0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7" - caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -3831,6 +3852,10 @@ chalk@~0.4.0: has-color "~0.1.0" strip-ansi "~0.1.0" +chardet@^0.4.0: + version "0.4.2" + resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -3866,6 +3891,24 @@ chokidar@1.7.0, chokidar@^1.0.0, chokidar@^1.6.0: optionalDependencies: fsevents "^1.0.0" +chokidar@^2.0.0: + version "2.1.6" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5" + dependencies: + anymatch "^2.0.0" + async-each "^1.0.1" + braces "^2.3.2" + glob-parent "^3.1.0" + inherits "^2.0.3" + is-binary-path "^1.0.0" + is-glob "^4.0.0" + normalize-path "^3.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.2.1" + upath "^1.1.1" + optionalDependencies: + fsevents "^1.2.7" + chokidar@^2.0.2: version "2.0.4" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26" @@ -4033,6 +4076,10 @@ clone-response@1.0.2: dependencies: mimic-response "^1.0.0" +clone@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f" + clone@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" @@ -4056,10 +4103,6 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" -coffee-script@^1.10.0: - version "1.12.7" - resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53" - collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -4092,15 +4135,6 @@ columnify@~1.5.4: strip-ansi "^3.0.0" wcwidth "^1.0.0" -combine-source-map@^0.8.0, combine-source-map@~0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz#a58d0df042c186fcf822a8e8015f5450d2d79a8b" - dependencies: - convert-source-map "~1.1.0" - inline-source-map "~0.6.0" - lodash.memoize "~3.0.3" - source-map "~0.5.3" - combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" @@ -4131,11 +4165,11 @@ commander@^2.15.1: version "2.19.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" -commander@^2.19.0: +commander@^2.19.0, commander@^2.5.0, commander@~2.20.0: version "2.20.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" -commander@^2.6.0, commander@^2.8.1, commander@^2.9.0: +commander@^2.6.0, commander@^2.8.1: version "2.15.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" @@ -4149,6 +4183,20 @@ commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" +commoner@~0.10.3: + version "0.10.8" + resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5" + dependencies: + commander "^2.5.0" + detective "^4.3.1" + glob "^5.0.15" + graceful-fs "^4.1.2" + iconv-lite "^0.4.5" + mkdirp "^0.5.0" + private "^0.1.6" + q "^1.1.2" + recast "^0.11.17" + compare-versions@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.1.0.tgz#43310256a5c555aaed4193c04d8f154cf9c6efd5" @@ -4187,7 +4235,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.6, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@^1.6.1: +concat-stream@^1.4.6, concat-stream@^1.5.0, concat-stream@^1.5.2: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" dependencies: @@ -4196,14 +4244,6 @@ concat-stream@^1.4.6, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@ readable-stream "^2.2.2" typedarray "^0.0.6" -concat-stream@~1.5.0, concat-stream@~1.5.1: - version "1.5.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266" - dependencies: - inherits "~2.0.1" - readable-stream "~2.0.0" - typedarray "~0.0.5" - config-chain@~1.1.11: version "1.1.12" resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" @@ -4268,7 +4308,7 @@ consolidate@^0.15.1: dependencies: bluebird "^3.1.1" -constants-browserify@^1.0.0, constants-browserify@~1.0.0: +constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -4294,10 +4334,6 @@ convert-source-map@^1.5.0, convert-source-map@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" -convert-source-map@~1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860" - cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" @@ -4325,6 +4361,10 @@ copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" +core-js@^1.0.0: + version "1.2.7" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" + core-js@^2.4.0, core-js@^2.5.0: version "2.5.4" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.4.tgz#f2c8bf181f2a80b92f360121429ce63a2f0aeae0" @@ -4345,10 +4385,6 @@ core-object@2.0.6: dependencies: chalk "^1.1.3" -core-object@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/core-object/-/core-object-1.1.0.tgz#86d63918733cf9da1a5aae729e62c0a88e66ad0a" - core-object@^2.0.0, core-object@^2.0.6: version "2.1.1" resolved "https://registry.yarnpkg.com/core-object/-/core-object-2.1.1.tgz#4b7a5f1edefcb1e6d0dcb58eab1b9f90bfc666a8" @@ -4408,24 +4444,29 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -cross-domain-safe-weakmap@^1.0.1, cross-domain-safe-weakmap@^1.0.19: +cross-domain-safe-weakmap@^1.0.1: version "1.0.20" resolved "https://registry.yarnpkg.com/cross-domain-safe-weakmap/-/cross-domain-safe-weakmap-1.0.20.tgz#d047546260b4535bb373af31babde64a209681d6" dependencies: cross-domain-utils "^2.0.0" -cross-domain-utils@^2.0.0, cross-domain-utils@^2.0.1, cross-domain-utils@^2.0.3: +cross-domain-safe-weakmap@^1.0.20, cross-domain-safe-weakmap@^1.0.22: + version "1.0.25" + resolved "https://registry.yarnpkg.com/cross-domain-safe-weakmap/-/cross-domain-safe-weakmap-1.0.25.tgz#240f44b478cd0e1dc7023599f2d89d727fe260cf" + dependencies: + cross-domain-utils "^2.0.0" + +cross-domain-utils@^2.0.0, cross-domain-utils@^2.0.1: version "2.0.10" resolved "https://registry.yarnpkg.com/cross-domain-utils/-/cross-domain-utils-2.0.10.tgz#4ee5962d61523e92fbe07a6d4d461c6e6f5f1878" dependencies: zalgo-promise "^1.0.11" -cross-spawn@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" +cross-domain-utils@^2.0.10, cross-domain-utils@^2.0.16: + version "2.0.27" + resolved "https://registry.yarnpkg.com/cross-domain-utils/-/cross-domain-utils-2.0.27.tgz#acd3d8cfe2441dfc132965b55f7864bbb0958571" dependencies: - lru-cache "^4.0.1" - which "^1.2.9" + zalgo-promise "^1.0.11" cross-spawn@^5.0.1: version "5.1.0" @@ -4451,12 +4492,6 @@ cryptiles@2.x.x: dependencies: boom "2.x.x" -cryptiles@3.x.x: - version "3.1.2" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe" - dependencies: - boom "5.x.x" - crypto-browserify@3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.3.0.tgz#b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c" @@ -4466,7 +4501,7 @@ crypto-browserify@3.3.0: ripemd160 "0.2.0" sha.js "2.2.6" -crypto-browserify@^3.0.0, crypto-browserify@^3.11.0: +crypto-browserify@^3.11.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" dependencies: @@ -4486,12 +4521,6 @@ crypto-random-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" -cson-parser@^1.1.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/cson-parser/-/cson-parser-1.3.5.tgz#7ec675e039145533bf2a6a856073f1599d9c2d24" - dependencies: - coffee-script "^1.10.0" - css-select@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.0.0.tgz#b1121ca51848dd264e2244d058cee254deeb44b0" @@ -4505,12 +4534,6 @@ css-what@1.0: version "1.0.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-1.0.0.tgz#d7cc2df45180666f99d2b14462639469e00f736c" -currently-unhandled@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" - dependencies: - array-find-index "^1.0.1" - cyclist@~0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640" @@ -4569,7 +4592,7 @@ debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" -decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: +decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -4636,6 +4659,21 @@ defined@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" +defs@~1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/defs/-/defs-1.1.1.tgz#b22609f2c7a11ba7a3db116805c139b1caffa9d2" + dependencies: + alter "~0.2.0" + ast-traverse "~0.1.1" + breakable "~1.0.0" + esprima-fb "~15001.1001.0-dev-harmony-fb" + simple-fmt "~0.1.0" + simple-is "~0.2.0" + stringmap "~0.2.2" + stringset "~0.2.1" + tryor "~0.1.2" + yargs "~3.27.0" + del@^2.0.2: version "2.2.2" resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" @@ -4672,25 +4710,6 @@ depd@~1.1.1, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" -deps-sort@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.0.tgz#091724902e84658260eb910748cccd1af6e21fb5" - dependencies: - JSONStream "^1.0.3" - shasum "^1.0.0" - subarg "^1.0.0" - through2 "^2.0.0" - -derequire@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/derequire/-/derequire-2.0.6.tgz#31a414bb7ca176239fa78b116636ef77d517e768" - dependencies: - acorn "^4.0.3" - concat-stream "^1.4.6" - escope "^3.6.0" - through2 "^2.0.0" - yargs "^6.5.0" - des.js@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" @@ -4706,6 +4725,14 @@ detect-file@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" +detect-indent@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-3.0.1.tgz#9dc5e5ddbceef8325764b9451b02bc6d54084f75" + dependencies: + get-stdin "^4.0.1" + minimist "^1.1.0" + repeating "^1.1.0" + detect-indent@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" @@ -4720,7 +4747,7 @@ detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" -detective@^4.0.0: +detective@^4.3.1: version "4.7.1" resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e" dependencies: @@ -4774,14 +4801,14 @@ domain-browser@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" -domain-browser@~1.1.0: - version "1.1.7" - resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" - -domelementtype@1, domelementtype@^1.3.0: +domelementtype@1: version "1.3.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2" +domelementtype@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" + domelementtype@~1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b" @@ -4828,19 +4855,13 @@ dotenv@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-1.2.0.tgz#7cd73e16e07f057c8072147a5bc3a8677f0ab5c6" -dotenv@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d" - dotenv@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef" -duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" - dependencies: - readable-stream "^2.0.2" +dotenv@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c" duplexer3@^0.1.4: version "0.1.4" @@ -4873,21 +4894,9 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -electron-to-chromium@^1.3.30: - version "1.3.41" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.41.tgz#7e33643e00cd85edfd17e04194f6d00e73737235" - -electron-to-chromium@^1.3.47: - version "1.3.48" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz#d3b0d8593814044e092ece2108fc3ac9aea4b900" - -electron-to-chromium@^1.3.82: - version "1.3.83" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.83.tgz#74584eb0972bb6777811c5d68d988c722f5e6666" - -electron-to-chromium@^1.3.92: - version "1.3.95" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.95.tgz#79fac438813ca7f3db182a525c2ab432934f6484" +electron-to-chromium@^1.3.133: + version "1.3.135" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.135.tgz#f5799b95f2bcd8de17cde47d63392d83a4477041" elliptic@^6.0.0: version "6.4.0" @@ -4908,11 +4917,23 @@ ember-ajax@5.0.0: ember-cli-babel "^7.5.0" najax "^1.0.3" -ember-app-scheduler@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ember-app-scheduler/-/ember-app-scheduler-1.0.1.tgz#cc25e79d139525e440f2b26bcf8fdd60a3899878" +ember-app-scheduler@^1.0.5: + version "1.0.8" + resolved "https://registry.yarnpkg.com/ember-app-scheduler/-/ember-app-scheduler-1.0.8.tgz#37adacce2fa5ab59324e2c0b08f3c4a3568025b4" dependencies: - ember-cli-babel "^6.3.0" + "@types/ember" "^3.1.0" + "@types/rsvp" "^4.0.2" + ember-cli-babel "^7.1.3" + ember-cli-typescript "^2.0.0" + ember-compatibility-helpers "^1.1.2" + +ember-assign-polyfill@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/ember-assign-polyfill/-/ember-assign-polyfill-2.6.0.tgz#07847e3357ee35b33f886a0b5fbec6873f6860eb" + integrity sha512-Y8NzOmHI/g4PuJ+xC14eTYiQbigNYddyHB8FY2kuQMxThTEIDE7SJtgttJrYYcPciOu0Tnb5ff36iO46LeiXkw== + dependencies: + ember-cli-babel "^6.16.0" + ember-cli-version-checker "^2.0.0" ember-auto-import@^1.2.15: version "1.2.19" @@ -4943,6 +4964,35 @@ ember-auto-import@^1.2.15: walk-sync "^0.3.3" webpack "^4.12.0" +ember-auto-import@^1.2.19, ember-auto-import@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.3.0.tgz#0d0988790e60847315f9bba758299226a3ba75c6" + dependencies: + "@babel/core" "^7.1.6" + "@babel/traverse" "^7.1.6" + "@babel/types" "^7.1.6" + babel-core "^6.26.3" + babel-plugin-syntax-dynamic-import "^6.18.0" + babel-template "^6.26.0" + babylon "^6.18.0" + broccoli-debug "^0.6.4" + broccoli-plugin "^1.3.0" + debug "^3.1.0" + ember-cli-babel "^6.6.0" + enhanced-resolve "^4.0.0" + fs-extra "^6.0.1" + fs-tree-diff "^1.0.0" + handlebars "~4.0.13" + js-string-escape "^1.0.1" + lodash "^4.17.10" + mkdirp "^0.5.1" + pkg-up "^2.0.0" + resolve "^1.7.1" + rimraf "^2.6.2" + symlink-or-copy "^1.2.0" + walk-sync "^0.3.3" + webpack "~4.28" + ember-auto-import@^1.2.21: version "1.2.21" resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.2.21.tgz#e02ded183844faba66c3f2af97028ef35175b837" @@ -4972,50 +5022,30 @@ ember-auto-import@^1.2.21: walk-sync "^0.3.3" webpack "~4.28" -ember-browserify@^1.1.13: - version "1.2.2" - resolved "https://registry.yarnpkg.com/ember-browserify/-/ember-browserify-1.2.2.tgz#598e76640bfa7fa124e9564c9c5be91ccfb533c1" - dependencies: - acorn "^5.0.3" - broccoli-caching-writer "^3.0.3" - broccoli-kitchen-sink-helpers "^0.3.1" - broccoli-merge-trees "^1.1.2" - broccoli-plugin "^1.2.1" - browserify "^13.0.0" - core-object "^1.1.0" - debug "^2.2.0" - derequire "^2.0.3" - ember-cli-version-checker "^2.1.0" - fs-tree "^1.0.0" - fs-tree-diff "^0.5.0" - lodash "^4.5.1" - md5-hex "^1.3.0" - mkdirp "^0.5.0" - promise-map-series "^0.2.0" - quick-temp "^0.1.2" - rimraf "^2.2.8" - rsvp "^3.0.14" - symlink-or-copy "^1.0.0" - through2 "^2.0.0" - walk-sync "^0.2.7" - -ember-cached-shoe@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/ember-cached-shoe/-/ember-cached-shoe-0.2.0.tgz#bda54d8fa1c7e6757ebc79bcd4511ff684587e7b" +ember-cached-shoe@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/ember-cached-shoe/-/ember-cached-shoe-0.2.1.tgz#94eb55fd14e59423715ca7866480e2ce18ef0eb7" dependencies: - b2a "^1.0.9" + b2a "^1.0.11" broccoli-webpack "^1.0.0" ember-auto-import "^1.2.21" ember-cli-babel "^6.3.0" ember-cli-node-assets "^0.2.2" fastboot-transform "^0.1.3" -ember-cli-app-version@^3.0.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-3.1.3.tgz#26d25f5e653ff0106f0b39da6d75518ba8ed282d" +ember-cli-accounting@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/ember-cli-accounting/-/ember-cli-accounting-2.0.2.tgz#40fb4d00c038b26c090a4023a05a9d31efe4652f" + integrity sha512-J2tL4LD11e13Ah5gI9nVoeFJ2dlEIEbQc9J+4zS4UP1Ej0bENU5Z0xWGBq3fU+zQixHl4pn/bhmuZtjS2cpCfg== + dependencies: + ember-cli-babel "^6.10.0" + +ember-cli-app-version@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-3.2.0.tgz#7b9ad0e1b63ae0518648356ee24c703e922bc26e" dependencies: - ember-cli-babel "^6.8.0" - git-repo-version "^1.0.0" + ember-cli-babel "^6.12.0" + git-repo-version "^1.0.2" ember-cli-autoprefixer@0.8.1: version "0.8.1" @@ -5024,7 +5054,42 @@ ember-cli-autoprefixer@0.8.1: broccoli-autoprefixer "^5.0.0" lodash "^4.0.0" -ember-cli-babel@6.12.0, ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7, ember-cli-babel@^5.2.4, ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.14.1, ember-cli-babel@^6.16.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.0, ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.2.0, ember-cli-babel@^7.4.0, ember-cli-babel@^7.5.0, ember-cli-babel@~7.1.2: +ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.0.tgz#de3baedd093163b6c2461f95964888c1676325ac" + +ember-cli-babel@7.1.3: + version "7.1.3" + resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.1.3.tgz#a2a7374adb525369a3a205cedd54d8e0c3de3309" + dependencies: + "@babel/core" "^7.0.0" + "@babel/plugin-transform-modules-amd" "^7.0.0" + "@babel/polyfill" "^7.0.0" + "@babel/preset-env" "^7.0.0" + amd-name-resolver "1.2.0" + babel-plugin-debug-macros "^0.2.0-beta.6" + babel-plugin-ember-modules-api-polyfill "^2.5.0" + babel-plugin-module-resolver "^3.1.1" + broccoli-babel-transpiler "^7.1.0" + broccoli-debug "^0.6.4" + broccoli-funnel "^2.0.1" + broccoli-source "^1.1.0" + clone "^2.1.2" + ember-cli-version-checker "^2.1.2" + ensure-posix-path "^1.0.2" + semver "^5.5.0" + +ember-cli-babel@^5.1.5, ember-cli-babel@^5.2.4: + version "5.2.8" + resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.8.tgz#0356b03cc3fdff5d0f2ecaa46a0e1cfaebffd876" + dependencies: + broccoli-babel-transpiler "^5.6.2" + broccoli-funnel "^1.0.0" + clone "^2.0.0" + ember-cli-version-checker "^1.0.2" + resolve "^1.1.2" + +ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.0: version "6.14.1" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.14.1.tgz#796339229035910b625593caffbc2683792ada68" dependencies: @@ -5042,15 +5107,59 @@ ember-cli-babel@6.12.0, ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.5, ember-cl ember-cli-version-checker "^2.1.2" semver "^5.5.0" -ember-cli-babel@^7.1.3: - version "7.1.3" - resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.1.3.tgz#a2a7374adb525369a3a205cedd54d8e0c3de3309" +ember-cli-babel@^6.12.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957" + dependencies: + amd-name-resolver "1.2.0" + babel-plugin-debug-macros "^0.2.0-beta.6" + babel-plugin-ember-modules-api-polyfill "^2.6.0" + babel-plugin-transform-es2015-modules-amd "^6.24.0" + babel-polyfill "^6.26.0" + babel-preset-env "^1.7.0" + broccoli-babel-transpiler "^6.5.0" + broccoli-debug "^0.6.4" + broccoli-funnel "^2.0.0" + broccoli-source "^1.1.0" + clone "^2.0.0" + ember-cli-version-checker "^2.1.2" + semver "^5.5.0" + +ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.2.0, ember-cli-babel@^7.4.0, ember-cli-babel@^7.4.3, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.0, ember-cli-babel@^7.7.3: + version "7.7.3" + resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.7.3.tgz#f94709f6727583d18685ca6773a995877b87b8a0" dependencies: "@babel/core" "^7.0.0" + "@babel/plugin-proposal-class-properties" "^7.3.4" + "@babel/plugin-proposal-decorators" "^7.3.0" "@babel/plugin-transform-modules-amd" "^7.0.0" + "@babel/plugin-transform-runtime" "^7.2.0" "@babel/polyfill" "^7.0.0" "@babel/preset-env" "^7.0.0" - amd-name-resolver "1.2.0" + "@babel/runtime" "^7.2.0" + amd-name-resolver "^1.2.1" + babel-plugin-debug-macros "^0.3.0" + babel-plugin-ember-modules-api-polyfill "^2.8.0" + babel-plugin-module-resolver "^3.1.1" + broccoli-babel-transpiler "^7.1.2" + broccoli-debug "^0.6.4" + broccoli-funnel "^2.0.1" + broccoli-source "^1.1.0" + clone "^2.1.2" + ember-cli-babel-plugin-helpers "^1.1.0" + ember-cli-version-checker "^2.1.2" + ensure-posix-path "^1.0.2" + semver "^5.5.0" + +ember-cli-babel@~7.1.2: + version "7.1.4" + resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.1.4.tgz#5f2b6ba2156d8dce2681aea92689b57ffbc71ccb" + dependencies: + "@babel/core" "^7.0.0" + "@babel/plugin-transform-modules-amd" "^7.0.0" + "@babel/polyfill" "^7.0.0" + "@babel/preset-env" "^7.0.0" + amd-name-resolver "^1.2.1" babel-plugin-debug-macros "^0.2.0-beta.6" babel-plugin-ember-modules-api-polyfill "^2.5.0" babel-plugin-module-resolver "^3.1.1" @@ -5073,9 +5182,26 @@ ember-cli-broccoli-sane-watcher@^3.0.0: rsvp "^3.0.18" sane "^4.0.0" -ember-cli-clipboard@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/ember-cli-clipboard/-/ember-cli-clipboard-0.11.0.tgz#d0517156c10fc9d8c57e2261b9f6d096b3a0fa01" +ember-cli-cjs-transform@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/ember-cli-cjs-transform/-/ember-cli-cjs-transform-1.3.1.tgz#ae8c0da709ec3c02311b0afbb3a5974abbac3707" + dependencies: + broccoli-debug "^0.6.4" + broccoli-plugin "^1.3.0" + ember-cli-babel "^6.6.0" + fs-extra "^5.0.0" + hash-for-dep "^1.2.3" + pkg-dir "^2.0.0" + resolve "^1.7.1" + rollup "^0.59.0" + rollup-plugin-commonjs "^9.1.0" + rollup-plugin-node-resolve "^3.3.0" + sync-disk-cache "^1.3.3" + username "^3.0.0" + +ember-cli-clipboard@^0.11.1: + version "0.11.1" + resolved "https://registry.yarnpkg.com/ember-cli-clipboard/-/ember-cli-clipboard-0.11.1.tgz#caa6aaae498f12922102555d6825ad81ad843d2a" dependencies: broccoli-funnel "^1.1.0" clipboard "^2.0.0" @@ -5104,16 +5230,16 @@ ember-cli-code-coverage@^1.0.0-beta.0: rsvp "^4.8.1" walk-sync "^0.3.2" -ember-cli-content-security-policy@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-content-security-policy/-/ember-cli-content-security-policy-1.0.0.tgz#4f7d72997d4209cd59f10d3b0070fdb39593ed2d" +ember-cli-content-security-policy@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ember-cli-content-security-policy/-/ember-cli-content-security-policy-1.1.1.tgz#7d91a695319d8f99c317f3a594fba77bbfedf6c7" dependencies: body-parser "^1.17.0" chalk "^2.0.0" -ember-cli-dependency-checker@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.0.0.tgz#61245f5f79f881dece043303111d5f41efb8621f" +ember-cli-dependency-checker@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.1.0.tgz#b39c6b537a1457d77892edf5ddcfa025cd1401e2" dependencies: chalk "^2.3.0" find-yarn-workspace-root "^1.1.0" @@ -5194,27 +5320,27 @@ ember-cli-deploy@^1.0.0: rsvp "^3.3.3" silent-error "^1.0.0" -ember-cli-deprecation-workflow@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-deprecation-workflow/-/ember-cli-deprecation-workflow-1.0.0.tgz#9afae3a5769d85b32325b9da5f045ace5b3719a8" +ember-cli-deprecation-workflow@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ember-cli-deprecation-workflow/-/ember-cli-deprecation-workflow-1.0.1.tgz#3305a6879af7f074216a54963d92491c411ce7e0" dependencies: broccoli-funnel "^2.0.1" broccoli-merge-trees "^3.0.1" broccoli-plugin "^1.3.1" ember-debug-handlers-polyfill "^1.1.1" -ember-cli-document-title@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/ember-cli-document-title/-/ember-cli-document-title-0.4.0.tgz#1d0321c443d16b104eca16a8eb42839ecd6737f2" +ember-cli-document-title-northm@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/ember-cli-document-title-northm/-/ember-cli-document-title-northm-1.0.3.tgz#c7aa902e12dea3922acf3a21e9a47d1ec7dee314" dependencies: - ember-cli-babel "^6.6.0" + ember-cli-babel "^7.0.0" -ember-cli-dotenv@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ember-cli-dotenv/-/ember-cli-dotenv-2.1.0.tgz#ac9d14884cbcefb7588e06e77e40ee06445975ee" +ember-cli-dotenv@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/ember-cli-dotenv/-/ember-cli-dotenv-2.2.2.tgz#212f2397939afe14ea9951b0cbc76a5b8a9f5788" dependencies: - dotenv "^4.0.0" - ember-cli-babel "^6.6.0" + dotenv "^7.0.0" + ember-cli-babel "^7.1.2" minimist "^1.2.0" ember-cli-eslint@^5.1.0: @@ -5226,9 +5352,9 @@ ember-cli-eslint@^5.1.0: rsvp "^4.6.1" walk-sync "^1.0.0" -ember-cli-fastboot@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-fastboot/-/ember-cli-fastboot-2.0.0.tgz#1fab2dd838aadc1165effc82777a6c2751f81fd0" +ember-cli-fastboot@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/ember-cli-fastboot/-/ember-cli-fastboot-2.0.4.tgz#2aa4ecc87671f04078e3e1cb48684677bb2f26c5" dependencies: broccoli-concat "^3.7.1" broccoli-funnel "^2.0.1" @@ -5238,7 +5364,7 @@ ember-cli-fastboot@^2.0.0: ember-cli-babel "^7.1.0" ember-cli-lodash-subset "2.0.1" ember-cli-preprocess-registry "^3.1.2" - ember-cli-version-checker "^2.1.2" + ember-cli-version-checker "^3.0.0" fastboot "^1.2.0" fastboot-express-middleware "^1.2.0" fastboot-transform "^0.1.3" @@ -5284,9 +5410,9 @@ ember-cli-htmlbars-inline-precompile@^1.0.0: heimdalljs-logger "^0.1.7" silent-error "^1.1.0" -ember-cli-htmlbars-inline-precompile@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-2.0.0.tgz#8cbc941370ac6e728ae3d49c4164b3c7131d6118" +ember-cli-htmlbars-inline-precompile@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-2.1.0.tgz#61b91ff1879d44ae504cadb46fb1f2604995ae08" dependencies: babel-plugin-htmlbars-inline-precompile "^1.0.0" ember-cli-version-checker "^2.1.2" @@ -5294,7 +5420,7 @@ ember-cli-htmlbars-inline-precompile@^2.0.0: heimdalljs-logger "^0.1.9" silent-error "^1.1.0" -ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.1.1: +ember-cli-htmlbars@^1.1.1: version "1.3.4" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.3.4.tgz#461289724b34af372a6a0c4b6635819156963353" dependencies: @@ -5322,6 +5448,15 @@ ember-cli-htmlbars@^3.0.0: json-stable-stringify "^1.0.0" strip-bom "^3.0.0" +ember-cli-htmlbars@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-3.0.1.tgz#01e21f0fd05e0a6489154f26614b1041769e3e58" + dependencies: + broccoli-persistent-filter "^1.4.3" + hash-for-dep "^1.2.3" + json-stable-stringify "^1.0.0" + strip-bom "^3.0.0" + ember-cli-ifa@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/ember-cli-ifa/-/ember-cli-ifa-0.7.0.tgz#dbcfef17744d9ee10648dca5025ac55383d528f8" @@ -5348,25 +5483,27 @@ ember-cli-lodash-subset@^1.0.7: version "1.0.12" resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-1.0.12.tgz#af2e77eba5dcb0d77f3308d3a6fd7d3450f6e537" -ember-cli-mirage@^0.4.7: - version "0.4.7" - resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.4.7.tgz#aa7cf2d7247703b03d216b2fe6ca5b9d514eaf84" +ember-cli-mirage@^0.4.15: + version "0.4.15" + resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.4.15.tgz#dcf878e785853232d8ac725bb425aa545da63e79" dependencies: - broccoli-funnel "^1.0.2" - broccoli-merge-trees "^1.1.0" - broccoli-replace "^0.12.0" - broccoli-stew "^1.5.0" + "@xg-wang/whatwg-fetch" "^3.0.0" + broccoli-file-creator "^2.1.1" + broccoli-funnel "^2.0.1" + broccoli-merge-trees "^3.0.2" + broccoli-stew "^2.0.1" + broccoli-string-replace "^0.1.2" chalk "^1.1.1" - ember-cli-babel "^6.8.2" - ember-cli-node-assets "^0.1.4" + ember-auto-import "^1.2.19" + ember-cli-babel "^6.16.0" + ember-cli-node-assets "^0.2.2" ember-get-config "^0.2.2" - ember-inflector "^2.0.0" - ember-lodash "^4.17.3" - exists-sync "0.0.3" - fake-xml-http-request "^1.4.0" + ember-inflector "^2.0.0 || ^3.0.0" + fake-xml-http-request "^2.0.0" faker "^3.0.0" - pretender "^1.6.1" - route-recognizer "^0.2.3" + lodash "^4.17.11" + pretender "2.1.1" + route-recognizer "^0.3.4" ember-cli-moment-shim@3.5.0: version "3.5.0" @@ -5410,17 +5547,6 @@ ember-cli-node-assets@0.2.2, ember-cli-node-assets@^0.2.2: lodash "^4.5.1" resolve "^1.1.7" -ember-cli-node-assets@^0.1.4: - version "0.1.6" - resolved "https://registry.yarnpkg.com/ember-cli-node-assets/-/ember-cli-node-assets-0.1.6.tgz#6488a2949048c801ad6d9e33753c7bce32fc1146" - dependencies: - broccoli-funnel "^1.0.1" - broccoli-merge-trees "^1.1.1" - broccoli-unwatched-tree "^0.1.1" - debug "^2.2.0" - lodash "^4.5.1" - resolve "^1.1.7" - ember-cli-normalize-entity-name@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz#0b14f7bcbc599aa117b5fddc81e4fd03c4bad5b7" @@ -5437,12 +5563,15 @@ ember-cli-nouislider@^1.1.0: ember-cli-htmlbars "^2.0.1" nouislider "^11.0.3" -ember-cli-pace@^0.1.0: +ember-cli-pace@devotox/ember-cli-pace#master: version "0.1.0" - resolved "https://registry.yarnpkg.com/ember-cli-pace/-/ember-cli-pace-0.1.0.tgz#c70a16a513415f1b026a7de919353bea14cda7e4" + resolved "https://codeload.github.com/devotox/ember-cli-pace/tar.gz/45febdcb62a70968bb7fb9b7d1cb91c0284fe695" dependencies: - ember-cli-babel "^5.1.6" - uglify-js "^2.6.1" + ember-cli-babel "^6.3.0" + ember-cli-node-assets "^0.2.2" + fastboot-transform "^0.1.2" + pace-progress "^1.0.2" + uglify-js "^3.0.24" ember-cli-path-utils@^1.0.0: version "1.0.0" @@ -5463,6 +5592,7 @@ ember-cli-preprocess-registry@^3.1.2: ember-cli-preprocess-registry@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/ember-cli-preprocess-registry/-/ember-cli-preprocess-registry-3.3.0.tgz#685837a314fbe57224bd54b189f4b9c23907a2de" + integrity sha512-60GYpw7VPeB7TvzTLZTuLTlHdOXvayxjAQ+IxM2T04Xkfyu75O2ItbWlftQW7NZVGkaCsXSRAmn22PG03VpLMA== dependencies: broccoli-clean-css "^1.1.0" broccoli-funnel "^2.0.1" @@ -5476,28 +5606,28 @@ ember-cli-qunit@^4.1.1: ember-cli-babel "^6.11.0" ember-qunit "^3.3.2" -ember-cli-sass@^7.1.0: - version "7.1.7" - resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-7.1.7.tgz#66899134788ec8d2406a45f5346d4db47a2aa012" +ember-cli-sass@^10.0.0: + version "10.0.1" + resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-10.0.1.tgz#afa91eb7dfe3890be0390639d66976512e7d8edc" dependencies: - broccoli-funnel "^1.0.0" - broccoli-merge-trees "^1.1.0" - broccoli-sass-source-maps "^2.1.0" + broccoli-funnel "^2.0.1" + broccoli-merge-trees "^3.0.1" + broccoli-sass-source-maps "^4.0.0" ember-cli-version-checker "^2.1.0" -ember-cli-scss-lint@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/ember-cli-scss-lint/-/ember-cli-scss-lint-2.3.0.tgz#2c41b36a7fcbb9f715eca4ce639cea7dc0526cd7" +ember-cli-scss-lint@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/ember-cli-scss-lint/-/ember-cli-scss-lint-2.4.1.tgz#a858f2c9a154fc408f76cdf93e037bff8e69d927" dependencies: broccoli-funnel "^2.0.1" broccoli-merge-trees "^2.0.0" broccoli-scss-linter "^3.0.0" - ember-cli-babel "^6.6.0" + ember-cli-babel "^7.1.2" lodash.defaults "^4.2.0" -ember-cli-sentry@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-sentry/-/ember-cli-sentry-4.0.0.tgz#b86e160b2ef38045eedcc98d5deab8d6944c4bf2" +ember-cli-sentry@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ember-cli-sentry/-/ember-cli-sentry-4.1.0.tgz#491577c2df62cbb3c5397998d7425d899397beae" dependencies: broccoli-funnel "^2.0.1" broccoli-merge-trees "^3.0.1" @@ -5562,6 +5692,23 @@ ember-cli-test-loader@^2.2.0: dependencies: ember-cli-babel "^6.8.1" +ember-cli-typescript@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-2.0.1.tgz#9c46729213b9e1d13f5c3ff8421d772134aa889e" + dependencies: + "@babel/plugin-proposal-class-properties" "^7.1.0" + "@babel/plugin-transform-typescript" "^7.1.0" + ansi-to-html "^0.6.6" + debug "^4.0.0" + ember-cli-babel-plugin-helpers "^1.0.0" + execa "^1.0.0" + fs-extra "^7.0.0" + resolve "^1.5.0" + rsvp "^4.8.1" + semver "^6.0.0" + stagehand "^1.0.0" + walk-sync "^1.0.0" + ember-cli-uglify@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-3.0.0.tgz#8819665b2cc5fe70e3ba9fe7a94645209bc42fd6" @@ -5582,13 +5729,7 @@ ember-cli-update@^0.29.2: which "^1.3.1" yargs "^12.0.0" -ember-cli-valid-component-name@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-valid-component-name/-/ember-cli-valid-component-name-1.0.0.tgz#71550ce387e0233065f30b30b1510aa2dfbe87ef" - dependencies: - silent-error "^1.0.0" - -ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.6, ember-cli-version-checker@^1.2.0: +ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.6: version "1.3.1" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz#0bc2d134c830142da64bf9627a0eded10b61ae72" dependencies: @@ -5601,6 +5742,13 @@ ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0: resolve "^1.3.3" semver "^5.3.0" +ember-cli-version-checker@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3" + dependencies: + resolve "^1.3.3" + semver "^5.3.0" + ember-cli-version-checker@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.1.2.tgz#305ce102390c66e4e0f1432dea9dc5c7c19fed98" @@ -5615,9 +5763,17 @@ ember-cli-version-checker@^3.0.0: resolve "^1.9.0" semver "^5.6.0" -ember-cli@~3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.10.0.tgz#69f0da598467091acf76d625dc382bab4b18395a" +ember-cli-version-checker@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-3.1.3.tgz#7c9b4f5ff30fdebcd480b1c06c4de43bb51c522c" + dependencies: + resolve-package-path "^1.2.6" + semver "^5.6.0" + +ember-cli@~3.10.1: + version "3.10.1" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.10.1.tgz#068b63bab00ec8a229097d45b809ccc5e1a9dd53" + integrity sha512-MQdZAxkwSR2wGJhVMP0Wm7cSYXfMW0Hku/kWtqDm1Ig1dIcWWRpTNxQ12uxBSiE8uQNrXpF3cl5ZDpMVnhbdqw== dependencies: "@babel/core" "^7.4.3" "@babel/plugin-transform-modules-amd" "^7.2.0" @@ -5711,21 +5867,30 @@ ember-cli@~3.10.0: watch-detector "^0.1.0" yam "^1.0.0" -ember-compatibility-helpers@^1.0.0-beta.2: - version "1.0.0-beta.2" - resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.0.0-beta.2.tgz#00cb134af45f9562fa47a23f4da81a63aad41943" +ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.0.tgz#feee16c5e9ef1b1f1e53903b241740ad4b01097e" dependencies: - babel-plugin-debug-macros "^0.1.11" - ember-cli-version-checker "^2.0.0" + babel-plugin-debug-macros "^0.2.0" + ember-cli-version-checker "^2.1.1" semver "^5.4.1" -ember-composable-helpers@^2.0.0, ember-composable-helpers@^2.0.3: +ember-composable-helpers@^2.0.3: version "2.1.0" resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-2.1.0.tgz#71f75ab2de1c696d21939b5f9dcc62eaf2c947e5" dependencies: broccoli-funnel "^1.0.1" ember-cli-babel "^6.6.0" +ember-composable-helpers@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-2.3.1.tgz#db98ad8b55d053e2ac216b9da091c9e7a3b9f453" + dependencies: + "@babel/core" "^7.0.0" + broccoli-funnel "2.0.1" + ember-cli-babel "^7.1.0" + resolve "^1.10.0" + ember-config-service@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-config-service/-/ember-config-service-1.0.0.tgz#5309ef34d8e14061842b691bb62697e02d3dfe70" @@ -5733,14 +5898,7 @@ ember-config-service@^1.0.0: ember-cli-babel "^6.16.0" ember-getowner-polyfill "2.2.0" -ember-cookies@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/ember-cookies/-/ember-cookies-0.3.0.tgz#f9a23c957bd0e561e6a056e044d95ce2416b64d8" - dependencies: - ember-cli-babel "^6.8.2" - ember-getowner-polyfill "^1.1.0 || ^2.0.0" - -ember-cookies@^0.4.0: +"ember-cookies@^0.3.0 || ^0.4.0", ember-cookies@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/ember-cookies/-/ember-cookies-0.4.0.tgz#472f405bedd47c7c6f6a4e76ac927b8e7a3605ef" dependencies: @@ -5762,50 +5920,48 @@ ember-data-has-many-query@^0.3.0: ember-copy "^1.0.0" global "^4.3.2" -ember-data@~3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.3.1.tgz#8ff1f7759d35fcb750c8d33435e7ef2f69242dce" +ember-data@~3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.10.0.tgz#b5f53a445ba1ee37890ec672b3dc3f869d8b3992" + integrity sha512-QqKJ5/Co2wGBnD5FSUiO1tbhsjjiRS5uJUwD2vRa0suwNv5E9f+5S6Yww6O0B2z5nDRzRheBFZ7iRjbshQhWDg== dependencies: - "@ember/ordered-set" "^1.0.0" - amd-name-resolver "0.0.7" - babel-plugin-ember-modules-api-polyfill "^1.4.2" + "@ember/ordered-set" "^2.0.3" + "@glimmer/env" "^0.1.7" babel-plugin-feature-flags "^0.3.1" - babel-plugin-filter-imports "^0.3.1" - babel-plugin-transform-es2015-block-scoping "^6.24.1" + babel-plugin-filter-imports "^2.0.4" babel6-plugin-strip-class-callcheck "^6.0.0" babel6-plugin-strip-heimdall "^6.0.1" - broccoli-babel-transpiler "^6.0.0" - broccoli-debug "^0.6.2" - broccoli-file-creator "^1.0.0" + broccoli-debug "^0.6.5" + broccoli-file-creator "^2.1.1" broccoli-funnel "^2.0.1" - broccoli-merge-trees "^2.0.0" - broccoli-rollup "^1.2.0" - calculate-cache-key-for-tree "^1.1.0" - chalk "^1.1.1" - ember-cli-babel "^6.8.2" + broccoli-merge-trees "^3.0.2" + broccoli-rollup "^2.1.1" + calculate-cache-key-for-tree "^1.2.0" + chalk "^2.4.1" + ember-cli-babel "^7.7.3" ember-cli-path-utils "^1.0.0" - ember-cli-string-utils "^1.0.0" + ember-cli-string-utils "^1.1.0" ember-cli-test-info "^1.0.0" - ember-cli-version-checker "^2.1.0" - ember-inflector "^2.0.0" - ember-runtime-enumerable-includes-polyfill "^2.0.0" - git-repo-info "^1.1.2" + ember-cli-typescript "^2.0.0" + ember-cli-version-checker "^3.1.3" + ember-inflector "^3.0.0" + git-repo-info "^2.0.0" heimdalljs "^0.3.0" - inflection "^1.8.0" - npm-git-info "^1.0.0" - resolve "^1.5.0" - semver "^5.1.0" - silent-error "^1.0.0" + inflection "^1.12.0" + npm-git-info "^1.0.3" + resolve "^1.8.1" + silent-error "^1.1.1" ember-debug-handlers-polyfill@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ember-debug-handlers-polyfill/-/ember-debug-handlers-polyfill-1.1.1.tgz#e9ae0a720271a834221179202367421b580002ef" -ember-drag-drop@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/ember-drag-drop/-/ember-drag-drop-0.6.0.tgz#21466f2335eb8c5d43b2599e0d4cb6510094a3f7" +ember-drag-drop@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/ember-drag-drop/-/ember-drag-drop-0.6.3.tgz#65e2adfffd427875a0fb2e9f15f470dcad2e5d3d" dependencies: - ember-cli-babel "^6.6.0" + ember-cli-babel "7.1.3" + ember-jquery-legacy "^1.0.0" ember-exam@^2.0.2: version "2.0.2" @@ -5831,29 +5987,18 @@ ember-factory-for-polyfill@^1.3.1: dependencies: ember-cli-version-checker "^2.1.0" -"ember-fetch@^2.1.0 || ^3.0.0": - version "3.4.4" - resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-3.4.4.tgz#926ffa1c4120324b298c44e9558b458e586eb504" - dependencies: - broccoli-funnel "^1.2.0" - broccoli-stew "^1.4.2" - broccoli-templater "^1.0.0" - ember-cli-babel "^6.8.2" - node-fetch "^2.0.0-alpha.9" - whatwg-fetch "^2.0.3" - -ember-fetch@^6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-6.4.0.tgz#806b2acfbda07f3b0dd48a9fcdbc575c5519611d" +ember-fetch@6.5.1, "ember-fetch@^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0": + version "6.5.1" + resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-6.5.1.tgz#6512153b9b85042744ed5a7934c8edb4a5b02dd0" dependencies: - abortcontroller-polyfill "^1.2.1" + abortcontroller-polyfill "^1.3.0" broccoli-concat "^3.2.2" broccoli-debug "^0.6.5" broccoli-merge-trees "^3.0.0" broccoli-rollup "^2.1.1" - broccoli-stew "^2.0.0" + broccoli-stew "^2.1.0" broccoli-templater "^2.0.1" - calculate-cache-key-for-tree "^1.1.0" + calculate-cache-key-for-tree "^2.0.0" caniuse-api "^3.0.0" ember-cli-babel "^6.8.2" node-fetch "^2.3.0" @@ -5886,7 +6031,7 @@ ember-get-config@^0.2.2, ember-get-config@^0.2.4: broccoli-file-creator "^1.1.1" ember-cli-babel "^6.3.0" -ember-getowner-polyfill@2.2.0, "ember-getowner-polyfill@^1.1.0 || ^2.0.0", ember-getowner-polyfill@^2.0.0, ember-getowner-polyfill@^2.0.1: +ember-getowner-polyfill@2.2.0, "ember-getowner-polyfill@^1.1.0 || ^2.0.0", ember-getowner-polyfill@^2.0.0, ember-getowner-polyfill@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-2.2.0.tgz#38e7dccbcac69d5ec694000329ec0b2be651d2b2" dependencies: @@ -5899,27 +6044,27 @@ ember-href-to@3.1.0: dependencies: ember-cli-babel "^7.1.2" -ember-in-viewport@~3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/ember-in-viewport/-/ember-in-viewport-3.2.2.tgz#81110e04076cf693f29d19e58daf5a3a5b8da60e" +ember-in-viewport@~3.5.3: + version "3.5.5" + resolved "https://registry.yarnpkg.com/ember-in-viewport/-/ember-in-viewport-3.5.5.tgz#33ff5f22f10eda95b18254d7d1a472c3d9ebf50b" dependencies: ember-auto-import "^1.2.15" - ember-cli-babel "^6.16.0" - intersection-observer-admin "0.0.5" - raf-pool "0.0.4" + ember-cli-babel "^7.7.3" + intersection-observer-admin "0.2.1" + raf-pool "0.1.0" -ember-infinity@^1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/ember-infinity/-/ember-infinity-1.3.3.tgz#0e4ed47ac37f51e344b25f26cfc21cad6fa1103f" +ember-infinity@^1.4.5: + version "1.4.5" + resolved "https://registry.yarnpkg.com/ember-infinity/-/ember-infinity-1.4.5.tgz#cea612f5cac1012046fc8687cd5e448677307aac" dependencies: ember-cli-babel "~7.1.2" - ember-in-viewport "~3.2.2" + ember-in-viewport "~3.5.3" -ember-inflector@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-2.2.0.tgz#edd273dfd1a29be27f14b195e2f0ed70e812d9e0" +"ember-inflector@^2.0.0 || ^3.0.0", ember-inflector@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-3.0.0.tgz#7e1ee8aaa0fa773ba0905d8b7c0786354d890ee1" dependencies: - ember-cli-babel "^6.0.0" + ember-cli-babel "^6.6.0" ember-invoke-action@^1.4.0: version "1.5.0" @@ -5933,6 +6078,12 @@ ember-invoke-action@^1.5.1: dependencies: ember-cli-babel "^6.6.0" +ember-jquery-legacy@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/ember-jquery-legacy/-/ember-jquery-legacy-1.0.0.tgz#2a2a29109385dfabe4c626a3ac8d1dd3c6a4b9a3" + dependencies: + ember-cli-babel "^6.6.0" + ember-l10n@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/ember-l10n/-/ember-l10n-2.0.4.tgz#179c4fb69fd54fabe827cfc1b0ef0ba0c7147aab" @@ -5955,32 +6106,21 @@ ember-load-initializers@^2.0.0: dependencies: ember-cli-babel "^7.0.0" -ember-lodash@^4.17.3, ember-lodash@^4.17.5: - version "4.18.0" - resolved "https://registry.yarnpkg.com/ember-lodash/-/ember-lodash-4.18.0.tgz#45de700d6a4f68f1cd62888d90b50aa6477b9a83" - dependencies: - broccoli-debug "^0.6.1" - broccoli-funnel "^2.0.1" - broccoli-merge-trees "^2.0.0" - broccoli-string-replace "^0.1.1" - ember-cli-babel "^6.10.0" - lodash-es "^4.17.4" - -ember-macro-helpers@^0.17.0: - version "0.17.0" - resolved "https://registry.yarnpkg.com/ember-macro-helpers/-/ember-macro-helpers-0.17.0.tgz#5e64a49f476e38c1916aff75f949455533cd1abe" +ember-macro-helpers@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ember-macro-helpers/-/ember-macro-helpers-2.2.0.tgz#682bb887fda0679fd82cf981190f6dbba20b6e03" dependencies: - ember-cli-babel "^6.6.0" + ember-cli-babel "^6.18.0" ember-cli-string-utils "^1.1.0" ember-cli-test-info "^1.0.0" ember-weakmap "^3.0.0" -ember-math-helpers@^2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/ember-math-helpers/-/ember-math-helpers-2.8.1.tgz#6c01de988ad2623e8f5890f22c2d7427ea72a7a2" +ember-math-helpers@^2.11.1: + version "2.11.1" + resolved "https://registry.yarnpkg.com/ember-math-helpers/-/ember-math-helpers-2.11.1.tgz#a598ed813fc0ffcae7147f1392331eda66bff044" dependencies: - broccoli-funnel "^2.0.0" - ember-cli-babel "^6.16.0" + broccoli-funnel "^2.0.2" + ember-cli-babel "^7.1.2" ember-cli-htmlbars "^3.0.0" ember-maybe-import-regenerator@^0.1.6: @@ -6001,29 +6141,28 @@ ember-metrics@^0.13.0: ember-getowner-polyfill "^2.0.0" ember-runtime-enumerable-includes-polyfill "^2.0.0" -ember-models-table@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/ember-models-table/-/ember-models-table-2.5.0.tgz#4f50bdf0834b58493a78c89dbe5e95c6f16ab33e" +ember-models-table@^2.10.1: + version "2.10.1" + resolved "https://registry.yarnpkg.com/ember-models-table/-/ember-models-table-2.10.1.tgz#1b9455a26480cd7db5f09c3053b70c0d44e5842f" dependencies: - ember-cli-babel "^6.8.1" - ember-cli-htmlbars "^2.0.1" + ember-cli-babel "^7.1.2" + ember-cli-htmlbars "^3.0.0" ember-composable-helpers "^2.0.3" -ember-moment@^7.7.0: - version "7.7.0" - resolved "https://registry.yarnpkg.com/ember-moment/-/ember-moment-7.7.0.tgz#febf7cc5bfc665c8f1d45fa24e5c7a5f5f91afa5" +ember-moment@^7.8.1: + version "7.8.1" + resolved "https://registry.yarnpkg.com/ember-moment/-/ember-moment-7.8.1.tgz#6f77cf941d1a92e231b2f4b810e113b2fae50c5f" dependencies: ember-cli-babel "^6.7.2" - ember-getowner-polyfill "^2.0.1" - ember-macro-helpers "^0.17.0" + ember-getowner-polyfill "^2.2.0" + ember-macro-helpers "^2.1.0" -ember-notify@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/ember-notify/-/ember-notify-5.2.1.tgz#c603e928bc6e92885a8f98181e7bdbf8d90eb2d3" +ember-notify@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/ember-notify/-/ember-notify-5.3.0.tgz#8f798b7e8bbb9cca2511a15c34838c1afdc53cf3" dependencies: - ember-cli-babel "^5.1.6" - ember-cli-htmlbars "^1.0.3" - ember-string-ishtmlsafe-polyfill "^1.1.0" + ember-cli-babel "^6.6.0" + ember-cli-htmlbars "^2.0.1" object-assign "^4.1.0" ember-print-this@^1.0.0: @@ -6055,6 +6194,19 @@ ember-qunit@^3.3.2: ember-cli-test-loader "^2.2.0" qunit "^2.5.0" +ember-qunit@^4.4.1: + version "4.4.1" + resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-4.4.1.tgz#3654cadf9fa7e2287fe7b61fc7f19c3eb06222b5" + integrity sha512-RYyEqn3UpwLri4+lL9sFdDp1uPa0AfN587661iKm7r3kTAzYHxZE7jRsBDIejhgSH2kVSky0+Q9Y7oLULYiM/Q== + dependencies: + "@ember/test-helpers" "^1.5.0" + broccoli-funnel "^2.0.2" + broccoli-merge-trees "^3.0.2" + common-tags "^1.4.0" + ember-cli-babel "^7.5.0" + ember-cli-test-loader "^2.2.0" + qunit "^2.9.2" + ember-resolver@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-5.0.0.tgz#733a7d99bca0ca724ffa377636b42a32b014e5c7" @@ -6067,21 +6219,17 @@ ember-resolver@^5.0.0: ember-cli-version-checker "^2.0.0" resolve "^1.3.3" -ember-rfc176-data@^0.2.0: - version "0.2.7" - resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.2.7.tgz#bd355bc9b473e08096b518784170a23388bc973b" - ember-rfc176-data@^0.3.0, ember-rfc176-data@^0.3.1: version "0.3.2" resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.2.tgz#bde5538939529b263c142b53a47402f8127f8dce" -ember-rfc176-data@^0.3.5: - version "0.3.5" - resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.5.tgz#f630e550572c81a5e5c7220f864c0f06eee9e977" +ember-rfc176-data@^0.3.9: + version "0.3.9" + resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.9.tgz#44b6e051ead6c044ea87bd551f402e2cf89a7e3d" -ember-route-action-helper@^2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/ember-route-action-helper/-/ember-route-action-helper-2.0.6.tgz#1d50454350d7112be326ab44058f06cf291d5fd9" +ember-route-action-helper@^2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/ember-route-action-helper/-/ember-route-action-helper-2.0.7.tgz#3b946a613c88bb82a039c974f64f5b6f56d5e0bf" dependencies: ember-cli-babel "^6.8.1" ember-getowner-polyfill "^2.0.0" @@ -6092,13 +6240,14 @@ ember-router-generator@^1.2.3: dependencies: recast "^0.11.3" -ember-router-scroll@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ember-router-scroll/-/ember-router-scroll-1.0.1.tgz#07f57aae10a009d170928b9e62b85edd92c81e4e" +ember-router-scroll@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ember-router-scroll/-/ember-router-scroll-1.1.0.tgz#17f7ead22a4e9f43a8956d942ca37b5e507bada5" dependencies: - ember-app-scheduler "^1.0.1" - ember-cli-babel "^7.1.0" - ember-getowner-polyfill "^2.0.1" + ember-app-scheduler "^1.0.5" + ember-cli-babel "^7.1.2" + ember-compatibility-helpers "^1.1.2" + ember-getowner-polyfill "^2.2.0" ember-runtime-enumerable-includes-polyfill@2.0.0: version "2.0.0" @@ -6114,12 +6263,12 @@ ember-runtime-enumerable-includes-polyfill@^2.0.0: ember-cli-babel "^6.9.0" ember-cli-version-checker "^2.1.0" -ember-scroll-to@^0.6.4: - version "0.6.4" - resolved "https://registry.yarnpkg.com/ember-scroll-to/-/ember-scroll-to-0.6.4.tgz#aabf0e683db1d9eaf2d1b09e33a2e6691fcf77f4" +ember-scroll-to@^0.6.5: + version "0.6.5" + resolved "https://registry.yarnpkg.com/ember-scroll-to/-/ember-scroll-to-0.6.5.tgz#d9a7658eed6b8ae0e3c71b93b03f59a8550b8a10" dependencies: - ember-cli-babel "^5.1.6" - ember-cli-htmlbars "^1.0.3" + ember-cli-babel "^6.3.0" + ember-cli-htmlbars "^2.0.1" ember-simple-auth-token@^3.0.0: version "3.0.0" @@ -6127,18 +6276,18 @@ ember-simple-auth-token@^3.0.0: dependencies: ember-cli-babel "^6.6.0" -ember-simple-auth@^1.5.1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/ember-simple-auth/-/ember-simple-auth-1.6.0.tgz#68a80cdc4f2928a87af0f68aefae5abfd70f2e36" +ember-simple-auth@^1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/ember-simple-auth/-/ember-simple-auth-1.8.2.tgz#caf823117097c7baafcaa3eac92c8217092c5299" dependencies: base-64 "^0.1.0" - broccoli-file-creator "^1.1.1" + broccoli-file-creator "^2.0.0" broccoli-funnel "^1.2.0 || ^2.0.0" broccoli-merge-trees "^2.0.0 || ^3.0.0" ember-cli-babel "^6.8.2" ember-cli-is-package-missing "^1.0.0" - ember-cookies "^0.3.0" - ember-fetch "^2.1.0 || ^3.0.0" + ember-cookies "^0.3.0 || ^0.4.0" + ember-fetch "^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0" ember-getowner-polyfill "^1.1.0 || ^2.0.0" silent-error "^1.0.0" @@ -6148,36 +6297,25 @@ ember-source-channel-url@^1.1.0: dependencies: got "^8.0.1" -"ember-source@https://s3.amazonaws.com/builds.emberjs.com/release/shas/50db6dc8001c127e5aeb2d6ddbacf9f9205d1d7b.tgz": - version "3.1.0-release" - resolved "https://s3.amazonaws.com/builds.emberjs.com/release/shas/50db6dc8001c127e5aeb2d6ddbacf9f9205d1d7b.tgz#17206b2cfc5010616d48e8b08d836e59ed50a7ec" +ember-source@~3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.10.0.tgz#c423f494d573d418bf843d605ea79c21a14ca863" + integrity sha512-qHI+1y1gcfHO44+Ld3ty9565UsqlmimfOLe/Ra3jA4Z9h6vJNOdIzr4Bws7by/8kiBqjO1RM+TVe19zglivwoQ== dependencies: - broccoli-funnel "^2.0.1" - broccoli-merge-trees "^2.0.0" + broccoli-funnel "^2.0.2" + broccoli-merge-trees "^3.0.2" + chalk "^2.4.2" + ember-cli-babel "^7.7.0" ember-cli-get-component-path-option "^1.0.0" ember-cli-is-package-missing "^1.0.0" ember-cli-normalize-entity-name "^1.0.0" ember-cli-path-utils "^1.0.0" ember-cli-string-utils "^1.1.0" - ember-cli-valid-component-name "^1.0.0" - ember-cli-version-checker "^2.1.0" + ember-cli-version-checker "^3.1.3" ember-router-generator "^1.2.3" inflection "^1.12.0" jquery "^3.3.1" - resolve "^1.5.0" - -ember-string-helpers@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/ember-string-helpers/-/ember-string-helpers-1.0.2.tgz#2fcb958bcf0cdf0649e04dda5b65cae06a0f3d56" - dependencies: - ember-cli-babel "^5.0.0" - -ember-string-ishtmlsafe-polyfill@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ember-string-ishtmlsafe-polyfill/-/ember-string-ishtmlsafe-polyfill-1.1.0.tgz#ecde33419ff912b91dd8acf0640eb74b9758408e" - dependencies: - ember-cli-babel "^5.1.7" - ember-cli-version-checker "^1.2.0" + resolve "^1.10.0" ember-template-lint@^0.8.16: version "0.8.18" @@ -6190,11 +6328,11 @@ ember-template-lint@^0.8.16: resolve "^1.1.3" strip-bom "^3.0.0" -ember-truth-helpers@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ember-truth-helpers/-/ember-truth-helpers-2.0.0.tgz#f3e2eef667859197f1328bb4f83b0b35b661c1ac" +ember-truth-helpers@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ember-truth-helpers/-/ember-truth-helpers-2.1.0.tgz#d4dab4eee7945aa2388126485977baeb33ca0798" dependencies: - ember-cli-babel "^6.8.2" + ember-cli-babel "^6.6.0" ember-uuid@^1.0.1: version "1.0.1" @@ -6322,7 +6460,7 @@ error@^7.0.0: string-template "~0.2.1" xtend "~4.0.0" -es-abstract@^1.9.0: +es-abstract@^1.5.1, es-abstract@^1.9.0: version "1.13.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" dependencies: @@ -6357,7 +6495,7 @@ es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3: es5-ext "^0.10.35" es6-symbol "^3.1.1" -es6-map@^0.1.3, es6-map@^0.1.4: +es6-map@^0.1.3: version "0.1.5" resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0" dependencies: @@ -6427,6 +6565,32 @@ eslint-plugin-ember-suave@^1.0.0: dependencies: requireindex "~1.1.0" +eslint-plugin-ember@^6.2.0: + version "6.4.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-6.4.1.tgz#9b6fc99bbd86b4f43e9098a5c07c446eb2e64a08" + dependencies: + ember-rfc176-data "^0.3.9" + snake-case "^2.1.0" + +eslint-plugin-es@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.0.tgz#475f65bb20c993fc10e8c8fe77d1d60068072da6" + dependencies: + eslint-utils "^1.3.0" + regexpp "^2.0.1" + +eslint-plugin-node@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-9.0.1.tgz#93e44626fa62bcb6efea528cee9687663dc03b62" + integrity sha512-fljT5Uyy3lkJzuqhxrYanLSsvaILs9I7CmQ31atTtZ0DoIzRbbvInBh4cQ1CrthFHInHYBQxfPmPt6KLHXNXdw== + dependencies: + eslint-plugin-es "^1.4.0" + eslint-utils "^1.3.1" + ignore "^5.1.1" + minimatch "^3.0.4" + resolve "^1.10.1" + semver "^6.0.0" + eslint-scope@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172" @@ -6441,7 +6605,7 @@ eslint-scope@~3.7.1: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.3.1: +eslint-utils@^1.3.0, eslint-utils@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512" @@ -6548,6 +6712,14 @@ espree@^5.0.0: acorn-jsx "^5.0.0" eslint-visitor-keys "^1.0.0" +esprima-fb@~15001.1001.0-dev-harmony-fb: + version "15001.1001.0-dev-harmony-fb" + resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz#43beb57ec26e8cf237d3dd8b33e42533577f2659" + +esprima@^2.6.0: + version "2.7.3" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" + esprima@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804" @@ -6580,7 +6752,11 @@ estree-walker@^0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39" -esutils@^2.0.2: +estree-walker@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.0.tgz#5d865327c44a618dde5699f763891ae31f257dae" + +esutils@^2.0.0, esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" @@ -6607,7 +6783,7 @@ events-to-array@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.1.2.tgz#2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6" -events@^1.0.0, events@~1.1.0: +events@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" @@ -6660,10 +6836,6 @@ exists-stat@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/exists-stat/-/exists-stat-1.0.0.tgz#0660e3525a2e89d9e446129440c272edfa24b529" -exists-sync@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.3.tgz#b910000bedbb113b378b82f5f5a7638107622dcf" - exists-sync@0.0.4, exists-sync@^0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.4.tgz#9744c2c428cc03b01060db454d4b12f0ef3c8879" @@ -6797,6 +6969,14 @@ extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" +external-editor@^2.0.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5" + dependencies: + chardet "^0.4.0" + iconv-lite "^0.4.17" + tmp "^0.0.33" + external-editor@^3.0.0, external-editor@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27" @@ -6832,9 +7012,9 @@ extsprintf@^1.2.0: version "1.4.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" -fake-xml-http-request@^1.4.0, fake-xml-http-request@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-1.6.0.tgz#bd0ac79ae3e2660098282048a12c730a6f64d550" +fake-xml-http-request@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-2.0.0.tgz#41a92f0ca539477700cb1dafd2df251d55dac8ff" faker@^3.0.0: version "3.1.0" @@ -7287,7 +7467,11 @@ fs-minipass@^1.2.5: dependencies: minipass "^2.2.1" -fs-tree-diff@^0.5.0, fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6, fs-tree-diff@^0.5.7: +fs-readdir-recursive@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz#315b4fb8c1ca5b8c47defef319d073dad3568059" + +fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6, fs-tree-diff@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.7.tgz#315e2b098d5fe7f622880ac965b1b051868ac871" dependencies: @@ -7308,6 +7492,7 @@ fs-tree-diff@^1.0.0, fs-tree-diff@^1.0.2: fs-tree-diff@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz#343e4745ab435ec39ebac5f9059ad919cd034afa" + integrity sha512-x+CfAZ/lJHQqwlD64pYM5QxWjzWhSjroaVsr8PW831zOApL55qPibed0c+xebaLWVr2BnHFoHdrwOv8pzt8R5A== dependencies: "@types/symlink-or-copy" "^1.2.0" heimdalljs-logger "^0.1.7" @@ -7315,13 +7500,6 @@ fs-tree-diff@^2.0.0: path-posix "^1.0.0" symlink-or-copy "^1.1.8" -fs-tree@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-tree/-/fs-tree-1.0.0.tgz#ef64da3e6dd32cc0df27c3b3e0c299ffa575c026" - dependencies: - mkdirp "~0.5.0" - rimraf "~2.2.8" - fs-updater@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/fs-updater/-/fs-updater-1.0.4.tgz#2329980f99ae9176e9a0e84f7637538a182ce63b" @@ -7367,6 +7545,13 @@ fsevents@^1.2.2: nan "^2.9.2" node-pre-gyp "^0.10.0" +fsevents@^1.2.7: + version "1.2.9" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f" + dependencies: + nan "^2.12.1" + node-pre-gyp "^0.12.0" + fstream-ignore@^1.0.0, fstream-ignore@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" @@ -7427,12 +7612,6 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" -gaze@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105" - dependencies: - globule "^1.0.0" - generate-function@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74" @@ -7497,12 +7676,13 @@ gettext-nunjucks@^0.0.2: nunjucks "^3.0.0" nunjucks-markdown "^2.0.1" -gettext-parser@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/gettext-parser/-/gettext-parser-1.4.0.tgz#f8baf34a292f03d5e42f02df099d301f167a7ace" +gettext-parser@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/gettext-parser/-/gettext-parser-2.1.0.tgz#44dad33a15a74776f4383bb33efa8e0eda2346e4" dependencies: encoding "^0.1.12" - safe-buffer "^5.1.1" + readable-stream "^2.0.0" + safe-buffer "^5.1.2" gettext-parser@~0.2.0: version "0.2.0" @@ -7531,15 +7711,15 @@ git-diff-apply@^0.13.0: uuid "^3.1.0" yargs "^12.0.0" -git-repo-info@^1.1.2, git-repo-info@^1.3.0, git-repo-info@^1.4.1: +git-repo-info@^1.3.0, git-repo-info@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.4.1.tgz#2a072823254aaf62fcf0766007d7b6651bd41943" -git-repo-info@^2.1.0: +git-repo-info@^2.0.0, git-repo-info@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-2.1.0.tgz#13d1f753c75bc2994432e65a71e35377ff563813" -git-repo-version@^1.0.0: +git-repo-version@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/git-repo-version/-/git-repo-version-1.0.2.tgz#2c8e9bee5d970cafc0dd58480f9dc56d9afe8e4f" dependencies: @@ -7565,7 +7745,7 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" -glob@^5.0.10: +glob@^5.0.10, glob@^5.0.15: version "5.0.15" resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" dependencies: @@ -7575,17 +7755,7 @@ glob@^5.0.10: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.0.0, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: +glob@^7.0.0, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: version "7.1.2" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" dependencies: @@ -7646,6 +7816,10 @@ globals@^11.7.0: version "11.10.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.10.0.tgz#1e09776dffda5e01816b3bb4077c8b59c24eaa50" +globals@^6.4.0: + version "6.4.1" + resolved "https://registry.yarnpkg.com/globals/-/globals-6.4.1.tgz#8498032b3b6d1cc81eebc5f79690d8fe29fabf4f" + globals@^9.18.0, globals@^9.2.0: version "9.18.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" @@ -7729,7 +7903,7 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" -graceful-fs@^4.1.15, graceful-fs@^4.1.5, graceful-fs@~4.1.11: +graceful-fs@^4.1.15, graceful-fs@^4.1.4, graceful-fs@^4.1.5, graceful-fs@~4.1.11: version "4.1.15" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" @@ -7789,15 +7963,6 @@ har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" -har-validator@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d" - dependencies: - chalk "^1.1.1" - commander "^2.9.0" - is-my-json-valid "^2.12.4" - pinkie-promise "^2.0.0" - har-validator@~4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" @@ -7898,7 +8063,7 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has@^1.0.0, has@^1.0.1, has@^1.0.3: +has@^1.0.1, has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" dependencies: @@ -7946,15 +8111,6 @@ hawk@3.1.3, hawk@~3.1.3: hoek "2.x.x" sntp "1.x.x" -hawk@~6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038" - dependencies: - boom "4.x.x" - cryptiles "3.x.x" - hoek "4.x.x" - sntp "2.x.x" - he@1.1.x: version "1.1.1" resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" @@ -8018,9 +8174,12 @@ hoek@2.x.x: version "2.16.3" resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" -hoek@4.x.x: - version "4.2.1" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" +home-or-tmp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-1.0.0.tgz#4b9f1e40800c3e50c6c27f781676afcce71f3985" + dependencies: + os-tmpdir "^1.0.1" + user-home "^1.1.1" home-or-tmp@^2.0.0: version "2.0.0" @@ -8059,20 +8218,16 @@ html-minifier@^3.5.20: relateurl "0.2.x" uglify-js "3.4.x" -htmlescape@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351" - -htmlparser2@^3.9.0: - version "3.9.2" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338" +htmlparser2@^3.10.0: + version "3.10.1" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" dependencies: - domelementtype "^1.3.0" + domelementtype "^1.3.1" domhandler "^2.3.0" domutils "^1.5.1" entities "^1.1.1" inherits "^2.0.1" - readable-stream "^2.0.2" + readable-stream "^3.1.1" htmlparser2@~3.8.1: version "3.8.3" @@ -8148,11 +8303,11 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" -http-status@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-status/-/http-status-1.2.0.tgz#05f2a54c94f94d32d877b3a31ae08479772ba9f1" +http-status@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/http-status/-/http-status-1.3.2.tgz#a4fb27db5e32948fecd2fb110b9b3afef4a07bf7" -https-browserify@0.0.1, https-browserify@~0.0.0: +https-browserify@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82" @@ -8183,7 +8338,7 @@ iconv-lite@0.4.23: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@^0.4.24, iconv-lite@^0.4.4: +iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@^0.4.5: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" dependencies: @@ -8211,6 +8366,10 @@ ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" +ignore@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.1.tgz#2fc6b8f518aff48fef65a7f348ed85632448e4a5" + import-fresh@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390" @@ -8226,25 +8385,15 @@ imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" -in-publish@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" - include-path-searcher@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/include-path-searcher/-/include-path-searcher-0.1.0.tgz#c0cf2ddfa164fb2eae07bc7ca43a7f191cb4d7bd" -indent-string@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" - dependencies: - repeating "^2.0.0" - indexof@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" -inflection@^1.12.0, inflection@^1.8.0: +inflection@^1.12.0: version "1.12.0" resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416" @@ -8290,12 +8439,6 @@ inline-source-map-comment@^1.0.5: sum-up "^1.0.1" xtend "^4.0.0" -inline-source-map@~0.6.0: - version "0.6.2" - resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5" - dependencies: - source-map "~0.5.3" - inquirer@^0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e" @@ -8314,6 +8457,25 @@ inquirer@^0.12.0: strip-ansi "^3.0.0" through "^2.3.6" +inquirer@^3.3.0: + 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" + inquirer@^6, inquirer@^6.2.1: version "6.2.2" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406" @@ -8350,20 +8512,6 @@ inquirer@^6.1.0: strip-ansi "^5.0.0" through "^2.3.6" -insert-module-globals@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.1.0.tgz#dbb3cea71d3a43d5a07ef0310fe5f078aa4dbf35" - dependencies: - JSONStream "^1.0.3" - combine-source-map "^0.8.0" - concat-stream "^1.6.1" - is-buffer "^1.1.0" - lexical-scope "^1.2.0" - path-is-absolute "^1.0.1" - process "~0.11.0" - through2 "^2.0.0" - xtend "^4.0.0" - interpret@^0.6.4: version "0.6.6" resolved "https://registry.yarnpkg.com/interpret/-/interpret-0.6.6.tgz#fecd7a18e7ce5ca6abfb953e1f86213a49f1625b" @@ -8372,9 +8520,9 @@ interpret@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" -intersection-observer-admin@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/intersection-observer-admin/-/intersection-observer-admin-0.0.5.tgz#4a97796aab49c2bca2341fcd84cae2fea79c829b" +intersection-observer-admin@0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/intersection-observer-admin/-/intersection-observer-admin-0.2.1.tgz#a5b93a7094b05b6c793c982c51df91e0d26bafbd" into-stream@^3.1.0: version "3.1.0" @@ -8431,7 +8579,7 @@ is-binary-path@^1.0.0: dependencies: binary-extensions "^1.0.0" -is-buffer@^1.1.0, is-buffer@^1.1.5: +is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -8556,11 +8704,21 @@ is-installed-globally@^0.1.0: global-dirs "^0.1.0" is-path-inside "^1.0.0" +is-integer@^1.0.4: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-integer/-/is-integer-1.0.7.tgz#6bde81aacddf78b659b6629d629cadc51a886d5c" + dependencies: + is-finite "^1.0.0" + +is-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" + is-my-ip-valid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824" -is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4: +is-my-json-valid@^2.10.0: version "2.17.2" resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c" dependencies: @@ -8714,10 +8872,6 @@ isarray@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" -isarray@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.4.tgz#38e7bcbb0f3ba1b7933c86ba1894ddfc3781bbb7" - isbinaryfile@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" @@ -8833,9 +8987,9 @@ jquery@>=1.11: version "3.4.0" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.0.tgz#8de513fa0fa4b2c7d2e48a530e26f0596936efdf" -js-base64@^2.1.8: - version "2.4.3" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582" +jquery@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" js-levenshtein@^1.1.3: version "1.1.4" @@ -8849,6 +9003,10 @@ js-string-escape@1.0.1, js-string-escape@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef" +js-tokens@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-1.0.1.tgz#cc435a5c8b94ad15acb7983140fc80182c89aeae" + 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" @@ -8871,7 +9029,7 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.3.0, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4, js-yaml@^3.7.0: +js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4, js-yaml@^3.7.0: version "3.11.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef" dependencies: @@ -8928,16 +9086,14 @@ json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1: dependencies: jsonify "~0.0.0" -json-stable-stringify@~0.0.0: - version "0.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz#611c23e814db375527df851193db59dd2af27f45" - dependencies: - jsonify "~0.0.0" - json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" +json5@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-0.4.0.tgz#054352e4c4c80c86c0923877d449de176a732c8d" + json5@^0.5.0, json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" @@ -9029,14 +9185,6 @@ known-css-properties@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.3.0.tgz#a3d135bbfc60ee8c6eacf2f7e7e6f2d4755e49a4" -labeled-stream-splicer@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz#9cffa32fd99e1612fd1d86a8db962416d5292926" - dependencies: - inherits "^2.0.1" - isarray "^2.0.4" - stream-splicer "^2.0.0" - latest-version@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" @@ -9071,6 +9219,10 @@ leek@0.0.24: lodash.assign "^3.2.0" rsvp "^3.0.21" +leven@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/leven/-/leven-1.0.2.tgz#9144b6eebca5f1d0680169f1a6770dcea60b75c3" + levn@^0.3.0, levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" @@ -9078,12 +9230,6 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -lexical-scope@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/lexical-scope/-/lexical-scope-1.2.0.tgz#fcea5edc704a4b3a8796cdca419c3a0afaf22df4" - dependencies: - astw "^2.0.0" - libnpx@10.2.0: version "10.2.0" resolved "https://registry.yarnpkg.com/libnpx/-/libnpx-10.2.0.tgz#1bf4a1c9f36081f64935eb014041da10855e3102" @@ -9166,9 +9312,10 @@ lockfile@~1.0.3: dependencies: signal-exit "^3.0.2" -lodash-es@^4.17.4: - version "4.17.8" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.8.tgz#6fa8c8c5d337481df0bdf1c0d899d42473121e45" +lodash-es@^4.17.11: + version "4.17.11" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0" + integrity sha512-DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q== lodash-node@^2.4.1: version "2.4.1" @@ -9226,10 +9373,6 @@ lodash._baseflatten@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" -lodash._basetostring@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5" - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -9237,10 +9380,6 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._basevalues@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7" - lodash._bindcallback@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" @@ -9291,14 +9430,14 @@ lodash._objecttypes@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/lodash._objecttypes/-/lodash._objecttypes-2.3.0.tgz#6a3ea3987dd6eeb8021b2d5c9c303549cc2bae1e" -lodash._reinterpolate@^3.0.0, lodash._reinterpolate@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - lodash._reinterpolate@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-2.3.0.tgz#03ee9d85c0e55cbd590d71608a295bdda51128ec" +lodash._reinterpolate@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" + lodash._renative@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/lodash._renative/-/lodash._renative-2.3.0.tgz#77d8edd4ced26dd5971f9e15a5f772e4e317fbd3" @@ -9310,7 +9449,7 @@ lodash._reunescapedhtml@~2.3.0: lodash._htmlescapes "~2.3.0" lodash.keys "~2.3.0" -lodash._root@^3.0.0, lodash._root@~3.0.0: +lodash._root@~3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" @@ -9339,10 +9478,6 @@ lodash.assign@^3.2.0: lodash._createassigner "^3.0.0" lodash.keys "^3.0.0" -lodash.assign@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - lodash.assignin@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" @@ -9363,7 +9498,7 @@ lodash.castarray@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" -lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.4.1, lodash.clonedeep@^4.5.0, lodash.clonedeep@~4.5.0: +lodash.clonedeep@^4.4.1, lodash.clonedeep@^4.5.0, lodash.clonedeep@~4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" @@ -9396,12 +9531,6 @@ lodash.defaultsdeep@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz#bec1024f85b1bd96cbea405b23c14ad6443a6f81" -lodash.escape@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698" - dependencies: - lodash._root "^3.0.0" - lodash.escape@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-2.3.0.tgz#844c38c58f844e1362ebe96726159b62cf5f2a58" @@ -9494,15 +9623,11 @@ lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" -lodash.memoize@~3.0.3: - version "3.0.4" - resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f" - lodash.merge@^4.3.0, lodash.merge@^4.3.1, lodash.merge@^4.6.0: version "4.6.1" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54" -lodash.mergewith@^4.6.0: +lodash.mergewith@^4.6.1: version "4.6.1" resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" @@ -9524,20 +9649,6 @@ lodash.support@~2.3.0: dependencies: lodash._renative "~2.3.0" -lodash.template@^3.3.2: - version "3.6.2" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f" - dependencies: - lodash._basecopy "^3.0.0" - lodash._basetostring "^3.0.0" - lodash._basevalues "^3.0.0" - lodash._isiterateecall "^3.0.0" - lodash._reinterpolate "^3.0.0" - lodash.escape "^3.0.0" - lodash.keys "^3.0.0" - lodash.restparam "^3.0.0" - lodash.templatesettings "^3.0.0" - lodash.template@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0" @@ -9557,13 +9668,6 @@ lodash.template@~2.3.x: lodash.templatesettings "~2.3.0" lodash.values "~2.3.0" -lodash.templatesettings@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5" - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.escape "^3.0.0" - lodash.templatesettings@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316" @@ -9603,7 +9707,7 @@ lodash@^2.4.1, lodash@~2.4.1: version "2.4.2" resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e" -lodash@^3.10.0, lodash@^3.2.0: +lodash@^3.10.0, lodash@^3.2.0, lodash@^3.9.3: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" @@ -9635,13 +9739,6 @@ loose-envify@^1.0.0: dependencies: js-tokens "^3.0.0" -loud-rejection@^1.0.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" - dependencies: - currently-unhandled "^0.4.1" - signal-exit "^3.0.0" - lower-case@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" @@ -9680,6 +9777,12 @@ magic-string@^0.24.0: dependencies: sourcemap-codec "^1.4.1" +magic-string@^0.25.2: + version "0.25.2" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9" + dependencies: + sourcemap-codec "^1.4.4" + make-dir@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b" @@ -9718,10 +9821,6 @@ map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" -map-obj@^1.0.0, map-obj@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" - map-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" @@ -9781,7 +9880,7 @@ matcher-collection@^2.0.0: "@types/minimatch" "^3.0.3" minimatch "^3.0.2" -md5-hex@1.3.0, md5-hex@^1.0.2, md5-hex@^1.3.0: +md5-hex@1.3.0, md5-hex@^1.0.2: version "1.3.0" resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4" dependencies: @@ -9850,21 +9949,6 @@ memory-streams@^0.1.0, memory-streams@^0.1.3: dependencies: readable-stream "~1.0.2" -meow@^3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" - dependencies: - camelcase-keys "^2.0.0" - decamelize "^1.1.2" - loud-rejection "^1.0.0" - map-obj "^1.0.1" - minimist "^1.1.3" - normalize-package-data "^2.3.4" - object-assign "^4.0.1" - read-pkg-up "^1.0.1" - redent "^1.0.0" - trim-newlines "^1.0.0" - merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" @@ -9920,7 +10004,7 @@ micromatch@^2.1.5, micromatch@^2.3.11: parse-glob "^3.0.4" regex-cache "^0.4.2" -micromatch@^3.0.4, micromatch@^3.1.4, micromatch@^3.1.8: +micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" dependencies: @@ -9995,7 +10079,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" -"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: +"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: @@ -10007,6 +10091,12 @@ minimatch@3.0.3: dependencies: brace-expansion "^1.0.0" +minimatch@^2.0.3: + version "2.0.10" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" + dependencies: + brace-expansion "^1.0.0" + minimatch@v3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.0.tgz#5236157a51e4f004c177fb3c527ff7dd78f0ef83" @@ -10021,7 +10111,7 @@ minimist@1.1.x: version "1.1.3" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8" -minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: +minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" @@ -10115,26 +10205,6 @@ mktemp@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b" -module-deps@^4.0.8: - version "4.1.1" - resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-4.1.1.tgz#23215833f1da13fd606ccb8087b44852dcb821fd" - dependencies: - JSONStream "^1.0.3" - browser-resolve "^1.7.0" - cached-path-relative "^1.0.0" - concat-stream "~1.5.0" - defined "^1.0.0" - detective "^4.0.0" - duplexer2 "^0.1.2" - inherits "^2.0.1" - parents "^1.0.0" - readable-stream "^2.0.2" - resolve "^1.1.3" - stream-combiner2 "^1.1.1" - subarg "^1.0.0" - through2 "^2.0.0" - xtend "^4.0.0" - moment-timezone@^0.5.13: version "0.5.14" resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.14.tgz#4eb38ff9538b80108ba467a458f3ed4268ccfcb1" @@ -10210,7 +10280,11 @@ najax@^1.0.3: lodash.defaultsdeep "^4.6.0" qs "^6.2.0" -nan@^2.10.0, nan@^2.3.0: +nan@^2.12.1: + version "2.14.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" + +nan@^2.3.0: version "2.10.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" @@ -10283,32 +10357,10 @@ node-fetch-npm@^2.0.2: json-parse-better-errors "^1.0.0" safe-buffer "^5.1.1" -node-fetch@^2.0.0-alpha.9: - version "2.1.2" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5" - node-fetch@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5" -node-gyp@^3.3.1: - version "3.6.2" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60" - dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - minimatch "^3.0.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request "2" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" - node-gyp@~3.6.2: version "3.6.3" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.3.tgz#369fcb09146ae2167f25d8d23d8b49cc1a110d8d" @@ -10415,6 +10467,21 @@ node-pre-gyp@^0.10.0: semver "^5.3.0" tar "^4" +node-pre-gyp@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149" + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4" + node-pre-gyp@^0.6.39: version "0.6.39" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" @@ -10431,41 +10498,16 @@ node-pre-gyp@^0.6.39: tar "^2.2.1" tar-pack "^3.4.0" -node-releases@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.2.tgz#27c296d9fca3b659c64f7d43ea47a31ad2a90e4b" - dependencies: - semver "^5.3.0" - -node-releases@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.2.tgz#93c17fba5eec8650ad908de5433fa8763baebe4d" +node-releases@^1.1.19: + version "1.1.19" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.19.tgz#c492d1e381fea0350b338b646c27867e88e91b3d" dependencies: semver "^5.3.0" -node-sass@^4.7.2: - version "4.8.3" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.8.3.tgz#d077cc20a08ac06f661ca44fb6f19cd2ed41debb" - dependencies: - async-foreach "^0.1.3" - chalk "^1.1.1" - cross-spawn "^3.0.0" - gaze "^1.0.0" - get-stdin "^4.0.1" - glob "^7.0.3" - in-publish "^2.0.0" - lodash.assign "^4.2.0" - lodash.clonedeep "^4.3.2" - lodash.mergewith "^4.6.0" - meow "^3.7.0" - mkdirp "^0.5.1" - nan "^2.10.0" - node-gyp "^3.3.1" - npmlog "^4.0.0" - request "~2.79.0" - sass-graph "^2.2.4" - stdout-stream "^1.4.0" - "true-case-path" "^1.0.2" +node-watch@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.6.0.tgz#ab0703b60cd270783698e57a428faa0010ed8fd0" + integrity sha512-XAgTL05z75ptd7JSVejH1a2Dm1zmXYhuDr9l230Qk6Z7/7GPcnAs/UyJJ4ggsXSvWil8iOzwQLW0zuGUvHpG8g== nomnom@1.8.0: version "1.8.0" @@ -10496,7 +10538,7 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.4.0, "normalize-package semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: +normalize-package-data@^2.3.2: version "2.4.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" dependencies: @@ -10520,6 +10562,10 @@ normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: dependencies: remove-trailing-separator "^1.0.1" +normalize-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + normalize-range@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" @@ -10544,7 +10590,7 @@ npm-cache-filename@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz#ded306c5b0bfc870a9e9faf823bc5f283e05ae11" -npm-git-info@^1.0.0: +npm-git-info@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/npm-git-info/-/npm-git-info-1.0.3.tgz#a933c42ec321e80d3646e0d6e844afe94630e1d5" @@ -10785,9 +10831,9 @@ object-keys@^1.0.12: version "1.1.0" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032" -object-to-formdata@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/object-to-formdata/-/object-to-formdata-1.4.3.tgz#ad1988e5049c8e6b0660a28ed0a5c99dc9ff89f9" +object-to-formdata@^1.6.4: + version "1.6.4" + resolved "https://registry.yarnpkg.com/object-to-formdata/-/object-to-formdata-1.6.4.tgz#ee2c3693ae6829ce8847f77eff7a3d8289c843e1" object-visit@^1.0.0: version "1.0.1" @@ -10795,6 +10841,13 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" +object.getownpropertydescriptors@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16" + dependencies: + define-properties "^1.1.2" + es-abstract "^1.5.1" + object.omit@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" @@ -10885,10 +10938,6 @@ os-browserify@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" -os-browserify@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.1.2.tgz#49ca0293e0b19590a5f5de10c7f265a617d8fe54" - os-homedir@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" @@ -10926,6 +10975,14 @@ osenv@0, osenv@^0.1.3, osenv@^0.1.4, osenv@^0.1.5, osenv@~0.1.4: os-homedir "^1.0.0" os-tmpdir "^1.0.0" +output-file-sync@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76" + dependencies: + graceful-fs "^4.1.4" + mkdirp "^0.5.1" + object-assign "^4.1.0" + p-cancelable@^0.4.0: version "0.4.1" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0" @@ -10937,6 +10994,7 @@ p-defer@^1.0.0: p-defer@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-2.1.0.tgz#d9c97b40f8fb5c256a70b4aabec3c1c8c42f1fae" + integrity sha512-xMwL9id1bHn/UfNGFEMFwlULOprQUEOg6vhqSfr6oKxPFB0oSh0zhGq/9/tPSE+cyij2+RW6H8+0Ke4xsPdZ7Q== p-finally@^1.0.0: version "1.0.0" @@ -10988,6 +11046,10 @@ p-try@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1" +pace-progress@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pace-progress/-/pace-progress-1.0.2.tgz#fdc565c57dd91725a3167b360bf2578d3c3b548d" + package-json@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" @@ -11051,12 +11113,6 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parents@^1.0.0, parents@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751" - dependencies: - path-platform "~0.11.15" - parse-asn1@^5.0.0: version "5.1.1" resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8" @@ -11110,7 +11166,7 @@ pascalcase@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" -path-browserify@0.0.0, path-browserify@~0.0.0: +path-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" @@ -11118,6 +11174,10 @@ path-dirname@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" +path-exists@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-1.0.0.tgz#d5a8998eb71ef37a74c34eb0d9eba6e878eea081" + path-exists@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" @@ -11148,10 +11208,6 @@ path-parse@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" -path-platform@~0.11.15: - version "0.11.15" - resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2" - path-posix@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/path-posix/-/path-posix-1.0.0.tgz#06b26113f56beab042545a23bfa88003ccac260f" @@ -11178,18 +11234,19 @@ path-type@^1.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" -paypal-checkout@^4.0.223: - version "4.0.223" - resolved "https://registry.yarnpkg.com/paypal-checkout/-/paypal-checkout-4.0.223.tgz#bf9d2bd7c521043a3df69aefe5222f0139702bde" +paypal-checkout@^4.0.268: + version "4.0.268" + resolved "https://registry.yarnpkg.com/paypal-checkout/-/paypal-checkout-4.0.268.tgz#cf61d39f7b8b26c0440cce6e81a3aec1241d5c85" dependencies: Base64 "^1.0.0" beaver-logger "^3.0.6" + belter "^1.0.93" bowser "^1.7.1" cross-domain-utils "^2.0.1" hi-base32 "^0.5.0" post-robot "^8.0.0" - xcomponent "^6.0.0" zalgo-promise "^1.0.10" + zoid "^6.0.67" pbkdf2-compat@2.0.1: version "2.0.1" @@ -11231,6 +11288,12 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" +pkg-dir@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" + dependencies: + find-up "^2.1.0" + pkg-dir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" @@ -11271,7 +11334,7 @@ posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" -post-robot@^8.0.0, post-robot@^8.0.14: +post-robot@^8.0.0: version "8.0.28" resolved "https://registry.yarnpkg.com/post-robot/-/post-robot-8.0.28.tgz#2d1e37988317e94c1311ed4caa8162366d4fd1cd" dependencies: @@ -11279,11 +11342,19 @@ post-robot@^8.0.0, post-robot@^8.0.14: cross-domain-utils "^2.0.0" zalgo-promise "^1.0.3" +post-robot@^8.0.29: + version "8.0.30" + resolved "https://registry.yarnpkg.com/post-robot/-/post-robot-8.0.30.tgz#5aac91bb996751549a3c273507b6448a293f6c1f" + dependencies: + cross-domain-safe-weakmap "^1.0.1" + cross-domain-utils "^2.0.0" + zalgo-promise "^1.0.3" + postcss-value-parser@^3.2.3: version "3.3.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15" -postcss@^6.0.1, postcss@^6.0.14, postcss@^6.0.17: +postcss@^6.0.1, postcss@^6.0.17: version "6.0.21" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.21.tgz#8265662694eddf9e9a5960db6da33c39e4cd069d" dependencies: @@ -11291,6 +11362,14 @@ postcss@^6.0.1, postcss@^6.0.14, postcss@^6.0.17: source-map "^0.6.1" supports-color "^5.3.0" +postcss@^7.0.5: + version "7.0.16" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz#48f64f1b4b558cb8b52c88987724359acb010da2" + dependencies: + chalk "^2.4.2" + source-map "^0.6.1" + supports-color "^6.1.0" + postinstall-build@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/postinstall-build/-/postinstall-build-5.0.1.tgz#b917a9079b26178d9a24af5a5cd8cb4a991d11b9" @@ -11311,11 +11390,12 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -pretender@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/pretender/-/pretender-1.6.1.tgz#77d1e42ac8c6b298f5cd43534a87645df035db8c" +pretender@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/pretender/-/pretender-2.1.1.tgz#5085f0a1272c31d5b57c488386f69e6ca207cb35" dependencies: - fake-xml-http-request "^1.6.0" + "@xg-wang/whatwg-fetch" "^3.0.0" + fake-xml-http-request "^2.0.0" route-recognizer "^0.3.3" pretty-ms@^3.1.0: @@ -11338,10 +11418,6 @@ private@^0.1.6, private@^0.1.7, private@^0.1.8, private@~0.1.5: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" -process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - process-nextick-args@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" @@ -11352,7 +11428,7 @@ process-relative-require@^1.0.0: dependencies: node-modules-path "^1.0.0" -process@^0.11.0, process@^0.11.10, process@~0.11.0: +process@^0.11.0, process@^0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" @@ -11372,7 +11448,7 @@ promise-inflight@^1.0.1, promise-inflight@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" -promise-map-series@^0.2.0, promise-map-series@^0.2.1, promise-map-series@^0.2.3: +promise-map-series@^0.2.1, promise-map-series@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.2.3.tgz#c2d377afc93253f6bd03dbb77755eb88ab20a847" dependencies: @@ -11478,7 +11554,7 @@ punycode@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" -punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1: +punycode@^1.2.4, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" @@ -11486,6 +11562,10 @@ punycode@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" +q@^1.1.2: + version "1.5.1" + resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + qs@6.5.1, qs@^6.4.0, qs@~6.5.1: version "6.5.1" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" @@ -11494,10 +11574,6 @@ qs@6.5.2, qs@^6.2.0, qs@~6.5.2: version "6.5.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" -qs@~6.3.0: - version "6.3.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c" - qs@~6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" @@ -11510,14 +11586,15 @@ query-string@^5.0.1: object-assign "^4.1.0" strict-uri-encode "^1.0.0" -query-string@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.3.0.tgz#41ae8a61e1213c80b182d5db6cf129e05af89fc5" +query-string@^6.5.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.5.0.tgz#2e1a70125af01f6f04573692d02c09302a1d8bfc" dependencies: decode-uri-component "^0.2.0" + split-on-first "^1.0.0" strict-uri-encode "^2.0.0" -querystring-es3@^0.2.0, querystring-es3@~0.2.0: +querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" @@ -11525,9 +11602,9 @@ querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" -querystringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.0.0.tgz#fa3ed6e68eb15159457c89b37bc6472833195755" +querystringify@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e" quick-temp@^0.1.0, quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8: version "0.1.8" @@ -11537,11 +11614,11 @@ quick-temp@^0.1.0, quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quic rimraf "^2.5.4" underscore.string "~3.3.4" -qunit-dom@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/qunit-dom/-/qunit-dom-0.8.0.tgz#a735e7f6ec2e9d08ec5bb695b3d52c97011e69b8" +qunit-dom@^0.8.5: + version "0.8.5" + resolved "https://registry.yarnpkg.com/qunit-dom/-/qunit-dom-0.8.5.tgz#34b7cffb338e631c39955b21bdbe4d774090124e" dependencies: - broccoli-funnel "^2.0.0" + broccoli-funnel "^2.0.2" broccoli-merge-trees "^3.0.1" qunit@^2.5.0: @@ -11556,9 +11633,20 @@ qunit@^2.5.0: resolve "1.5.0" walk-sync "0.3.2" -raf-pool@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/raf-pool/-/raf-pool-0.0.4.tgz#126ccaeeaa378e33c912f808a3c8f14acd0a714e" +qunit@^2.9.2: + version "2.9.2" + resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.9.2.tgz#97919440c9c0ae838bcd3c33a2ee42f35c5ef4a0" + integrity sha512-wTOYHnioWHcx5wa85Wl15IE7D6zTZe2CQlsodS14yj7s2FZ3MviRnQluspBZsueIDEO7doiuzKlv05yfky1R7w== + dependencies: + commander "2.12.2" + js-reporters "1.2.1" + minimatch "3.0.4" + node-watch "0.6.0" + resolve "1.9.0" + +raf-pool@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/raf-pool/-/raf-pool-0.1.0.tgz#856242f3d66b45ee0d4a9159d05d8560614891b3" randomatic@^1.1.3: version "1.1.7" @@ -11654,12 +11742,6 @@ read-installed@~4.0.3: optionalDependencies: graceful-fs "^4.1.2" -read-only-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0" - dependencies: - readable-stream "^2.0.2" - "read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@~2.0.9: version "2.0.13" resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a" @@ -11723,7 +11805,7 @@ readable-stream@1.1: isarray "0.0.1" string_decoder "~0.10.x" -"readable-stream@2 || 3": +"readable-stream@2 || 3", readable-stream@^3.1.1: version "3.3.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9" dependencies: @@ -11761,17 +11843,6 @@ readable-stream@~1.1.10: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@~2.0.0: - version "2.0.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - readdir-scoped-modules@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747" @@ -11790,6 +11861,14 @@ readdirp@^2.0.0: readable-stream "^2.0.2" set-immediate-shim "^1.0.1" +readdirp@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" + dependencies: + graceful-fs "^4.1.11" + micromatch "^3.1.10" + readable-stream "^2.0.2" + readline2@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35" @@ -11798,7 +11877,25 @@ readline2@^1.0.1: is-fullwidth-code-point "^1.0.0" mute-stream "0.0.5" -recast@^0.11.3: +recast@0.10.33: + version "0.10.33" + resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.33.tgz#942808f7aa016f1fa7142c461d7e5704aaa8d697" + dependencies: + ast-types "0.8.12" + esprima-fb "~15001.1001.0-dev-harmony-fb" + private "~0.1.5" + source-map "~0.5.0" + +recast@^0.10.10: + version "0.10.43" + resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.43.tgz#b95d50f6d60761a5f6252e15d80678168491ce7f" + dependencies: + ast-types "0.8.15" + esprima-fb "~15001.1001.0-dev-harmony-fb" + private "~0.1.5" + source-map "~0.5.0" + +recast@^0.11.17, recast@^0.11.3: version "0.11.23" resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3" dependencies: @@ -11811,14 +11908,7 @@ rechoir@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" dependencies: - resolve "^1.1.6" - -redent@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" - dependencies: - indent-string "^2.1.0" - strip-indent "^1.0.1" + resolve "^1.1.6" redeyed@~1.0.0: version "1.0.1" @@ -11848,6 +11938,10 @@ regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1: version "0.11.1" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" +regenerator-runtime@^0.13.2: + version "0.13.2" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447" + regenerator-runtime@^0.9.5: version "0.9.6" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz#d33eb95d0d2001a4be39659707c51b0cb71ce029" @@ -11866,6 +11960,17 @@ regenerator-transform@^0.13.3: dependencies: private "^0.1.6" +regenerator@0.8.40: + version "0.8.40" + resolved "https://registry.yarnpkg.com/regenerator/-/regenerator-0.8.40.tgz#a0e457c58ebdbae575c9f8cd75127e93756435d8" + dependencies: + commoner "~0.10.3" + defs "~1.1.0" + esprima-fb "~15001.1001.0-dev-harmony-fb" + private "~0.1.5" + recast "0.10.33" + through "~2.3.8" + regex-cache@^0.4.2: version "0.4.4" resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" @@ -11902,6 +12007,16 @@ regexpu-core@^4.1.3, regexpu-core@^4.2.0: unicode-match-property-ecmascript "^1.0.4" unicode-match-property-value-ecmascript "^1.0.2" +regexpu@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexpu/-/regexpu-1.3.0.tgz#e534dc991a9e5846050c98de6d7dd4a55c9ea16d" + dependencies: + esprima "^2.6.0" + recast "^0.10.10" + regenerate "^1.2.1" + regjsgen "^0.2.0" + regjsparser "^0.1.4" + registry-auth-token@^3.0.1: version "3.3.2" resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" @@ -11951,39 +12066,18 @@ repeat-string@^1.5.2, repeat-string@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" +repeating@^1.1.0, repeating@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/repeating/-/repeating-1.1.3.tgz#3d4114218877537494f97f77f9785fab810fa4ac" + dependencies: + is-finite "^1.0.0" + repeating@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" dependencies: is-finite "^1.0.0" -request@2: - version "2.85.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa" - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.6.0" - caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.1" - forever-agent "~0.6.1" - form-data "~2.3.1" - har-validator "~5.0.3" - hawk "~6.0.2" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.17" - oauth-sign "~0.8.2" - performance-now "^2.1.0" - qs "~6.5.1" - safe-buffer "^5.1.1" - stringstream "~0.0.5" - tough-cookie "~2.3.3" - tunnel-agent "^0.6.0" - uuid "^3.1.0" - request@2.81.0, "request@>=2.9.0 <2.82.0", request@~2.81.0: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" @@ -12061,31 +12155,6 @@ request@^2.81.0: tunnel-agent "^0.6.0" uuid "^3.1.0" -request@~2.79.0: - version "2.79.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.11.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~2.0.6" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - qs "~6.3.0" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "~0.4.1" - uuid "^3.0.0" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -12150,28 +12219,30 @@ resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" -resolve@1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" - resolve@1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36" dependencies: path-parse "^1.0.5" +resolve@1.9.0, resolve@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06" + dependencies: + path-parse "^1.0.6" + +resolve@^1.1.2, resolve@^1.10.1: + version "1.11.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232" + dependencies: + path-parse "^1.0.6" + resolve@^1.1.3, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0: version "1.6.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c" dependencies: path-parse "^1.0.5" -resolve@^1.1.4: - version "1.7.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3" - dependencies: - path-parse "^1.0.5" - resolve@^1.10.0, resolve@^1.7.1: version "1.10.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba" @@ -12184,12 +12255,6 @@ resolve@^1.3.2, resolve@^1.8.1: dependencies: path-parse "^1.0.5" -resolve@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06" - dependencies: - path-parse "^1.0.6" - responselike@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -12247,10 +12312,6 @@ rimraf@^2.5.2, rimraf@~2.6.1, rimraf@~2.6.2: dependencies: glob "^7.1.3" -rimraf@~2.2.8: - version "2.2.8" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" - ripemd160@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-0.2.0.tgz#2bf198bde167cacfa51c0a928e84b68bbe171fce" @@ -12262,6 +12323,23 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" +rollup-plugin-commonjs@^9.1.0: + version "9.3.4" + resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.3.4.tgz#2b3dddbbbded83d45c36ff101cdd29e924fd23bc" + dependencies: + estree-walker "^0.6.0" + magic-string "^0.25.2" + resolve "^1.10.0" + rollup-pluginutils "^2.6.0" + +rollup-plugin-node-resolve@^3.3.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz#908585eda12e393caac7498715a01e08606abc89" + dependencies: + builtin-modules "^2.0.0" + is-module "^1.0.0" + resolve "^1.1.6" + rollup-pluginutils@^2.0.1: version "2.3.3" resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz#3aad9b1eb3e7fe8262820818840bf091e5ae6794" @@ -12269,11 +12347,12 @@ rollup-pluginutils@^2.0.1: estree-walker "^0.5.2" micromatch "^2.3.11" -rollup@^0.41.4: - version "0.41.6" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.41.6.tgz#e0d05497877a398c104d816d2733a718a7a94e2a" +rollup-pluginutils@^2.6.0: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.7.1.tgz#a7915ce8b12c177364784bf38a1590cc6c2c8250" dependencies: - source-map-support "^0.4.0" + estree-walker "^0.6.0" + micromatch "^3.1.10" rollup@^0.57.1: version "0.57.1" @@ -12291,14 +12370,21 @@ rollup@^0.57.1: signal-exit "^3.0.2" sourcemap-codec "^1.4.1" -route-recognizer@^0.2.3: - version "0.2.10" - resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.2.10.tgz#024b2283c2e68d13a7c7f5173a5924645e8902df" +rollup@^0.59.0: + version "0.59.4" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.59.4.tgz#6f80f7017c22667ff1bf3e62adf8624a44cc44aa" + dependencies: + "@types/estree" "0.0.39" + "@types/node" "*" route-recognizer@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.3.tgz#1d365e27fa6995e091675f7dc940a8c00353bd29" +route-recognizer@^0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3" + rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.2.1, rsvp@^3.3.3, rsvp@^3.5.0: version "3.6.2" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" @@ -12307,7 +12393,7 @@ rsvp@^4.6.1, rsvp@^4.7.0, rsvp@^4.8.1, rsvp@^4.8.2: version "4.8.2" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.2.tgz#9d5647108735784eb13418cdddb56f75b919d722" -rsvp@^4.8.3, rsvp@^4.8.4: +rsvp@^4.8.4: version "4.8.4" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.4.tgz#b50e6b34583f3dd89329a2f23a8a2be072845911" @@ -12337,6 +12423,16 @@ run-queue@^1.0.0, run-queue@^1.0.3: 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" @@ -12403,29 +12499,20 @@ sane@^4.1.0: minimist "^1.1.1" walker "~1.0.5" -sanitize-html@^1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.19.1.tgz#e8b33c69578054d6ee4f57ea152d6497f3f6fb7d" +sanitize-html@^1.20.1: + version "1.20.1" + resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.20.1.tgz#f6effdf55dd398807171215a62bfc21811bacf85" dependencies: - chalk "^2.3.0" - htmlparser2 "^3.9.0" + chalk "^2.4.1" + htmlparser2 "^3.10.0" lodash.clonedeep "^4.5.0" lodash.escaperegexp "^4.1.2" lodash.isplainobject "^4.0.6" lodash.isstring "^4.0.1" - lodash.mergewith "^4.6.0" - postcss "^6.0.14" + lodash.mergewith "^4.6.1" + postcss "^7.0.5" srcset "^1.0.0" - xtend "^4.0.0" - -sass-graph@^2.2.4: - version "2.2.4" - resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" - dependencies: - glob "^7.0.0" - lodash "^4.0.0" - scss-tokenizer "^0.2.3" - yargs "^7.0.0" + xtend "^4.0.1" sass-lint@^1.12.1: version "1.12.1" @@ -12446,6 +12533,12 @@ sass-lint@^1.12.1: path-is-absolute "^1.0.0" util "^0.10.3" +sass@^1.20.1: + version "1.20.1" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.20.1.tgz#737b901fe072336da540b6d00ec155e2267420da" + dependencies: + chokidar "^2.0.0" + sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -12465,13 +12558,6 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -scss-tokenizer@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" - dependencies: - js-base64 "^2.1.8" - source-map "^0.4.2" - select@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" @@ -12587,7 +12673,7 @@ sha.js@2.2.6: version "2.2.6" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.2.6.tgz#17ddeddc5f722fb66501658895461977867315ba" -sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4: +sha.js@^2.4.0, sha.js@^2.4.8: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" dependencies: @@ -12601,13 +12687,6 @@ sha@~2.0.1: graceful-fs "^4.1.2" readable-stream "^2.0.2" -shasum@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/shasum/-/shasum-1.0.2.tgz#e7012310d8f417f4deb5712150e5678b87ae565f" - dependencies: - json-stable-stringify "~0.0.0" - sha.js "~2.4.4" - shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -12618,15 +12697,6 @@ shebang-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" -shell-quote@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767" - dependencies: - array-filter "~0.0.0" - array-map "~0.0.0" - array-reduce "~0.0.0" - jsonify "~0.0.0" - shelljs@^0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.1.tgz#ec6211bed1920442088fe0f70b2837232ed2c8a8" @@ -12663,6 +12733,10 @@ simple-dom@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-1.3.0.tgz#8473e0d34e340544b061410dba3faf4f1b7aa282" +simple-fmt@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/simple-fmt/-/simple-fmt-0.1.0.tgz#191bf566a59e6530482cb25ab53b4a8dc85c3a6b" + simple-git@^1.57.0: version "1.92.0" resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.92.0.tgz#6061468eb7d19f0141078fc742e62457e910f547" @@ -12673,6 +12747,10 @@ simple-html-tokenizer@^0.4.1: version "0.4.3" resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.4.3.tgz#9b00b766e30058b4bb377c0d4f97566a13ab1be1" +simple-is@~0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/simple-is/-/simple-is-0.2.0.tgz#2abb75aade39deb5cc815ce10e6191164850baf0" + slash@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" @@ -12697,6 +12775,12 @@ smart-buffer@^1.0.13: version "1.1.15" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16" +snake-case@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f" + dependencies: + no-case "^2.2.0" + snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" @@ -12730,12 +12814,6 @@ sntp@1.x.x: dependencies: hoek "2.x.x" -sntp@2.x.x: - version "2.1.0" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8" - dependencies: - hoek "4.x.x" - socket.io-adapter@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b" @@ -12838,7 +12916,13 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.4.0, source-map-support@^0.4.15: +source-map-support@^0.2.10: + version "0.2.10" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.2.10.tgz#ea5a3900a1c1cb25096a0ae8cc5c2b4b10ded3dc" + dependencies: + source-map "0.1.32" + +source-map-support@^0.4.15: version "0.4.18" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" dependencies: @@ -12873,13 +12957,19 @@ source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" +source-map@0.1.32: + version "0.1.32" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266" + dependencies: + amdefine ">=0.0.4" + source-map@0.4.x, source-map@^0.4.2, source-map@^0.4.4, source-map@~0.4.1: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" dependencies: amdefine ">=0.0.4" -source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3: +source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -12897,6 +12987,10 @@ sourcemap-codec@^1.4.1: version "1.4.3" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.3.tgz#0ba615b73ec35112f63c2f2d9e7c3f87282b0e33" +sourcemap-codec@^1.4.4: + version "1.4.4" + resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f" + sourcemap-validator@^1.0.5, sourcemap-validator@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/sourcemap-validator/-/sourcemap-validator-1.1.0.tgz#00454547d1682186e1498a7208e022e8dfa8738f" @@ -12932,6 +13026,10 @@ spdx-license-ids@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87" +split-on-first@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f" + split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" @@ -12985,6 +13083,16 @@ ssri@^6.0.1: dependencies: figgy-pudding "^3.5.1" +stable@~0.1.3: + version "0.1.8" + resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" + +stagehand@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stagehand/-/stagehand-1.0.0.tgz#79515e2ad3a02c63f8720c7df9b6077ae14276d9" + dependencies: + debug "^4.1.0" + static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" @@ -13004,26 +13112,13 @@ statuses@~1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" -stdout-stream@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b" - dependencies: - readable-stream "^2.0.1" - -stream-browserify@^2.0.0, stream-browserify@^2.0.1: +stream-browserify@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" dependencies: inherits "~2.0.1" readable-stream "^2.0.2" -stream-combiner2@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe" - dependencies: - duplexer2 "~0.1.0" - readable-stream "^2.0.2" - stream-each@^1.1.0: version "1.2.3" resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" @@ -13031,7 +13126,7 @@ stream-each@^1.1.0: end-of-stream "^1.1.0" stream-shift "^1.0.0" -stream-http@^2.0.0, stream-http@^2.3.1, stream-http@^2.7.2: +stream-http@^2.3.1, stream-http@^2.7.2: version "2.8.3" resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" dependencies: @@ -13052,13 +13147,6 @@ stream-shift@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" -stream-splicer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.0.tgz#1b63be438a133e4b671cc1935197600175910d83" - dependencies: - inherits "^2.0.1" - readable-stream "^2.0.2" - strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" @@ -13086,11 +13174,11 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string_decoder@0.10, string_decoder@^0.10.25, string_decoder@~0.10.0, string_decoder@~0.10.x: +string_decoder@0.10, string_decoder@^0.10.25, string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" -string_decoder@^1.0.0: +string_decoder@^1.0.0, string_decoder@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d" dependencies: @@ -13108,7 +13196,15 @@ string_decoder@~1.0.3: dependencies: safe-buffer "~5.1.0" -stringstream@~0.0.4, stringstream@~0.0.5: +stringmap@~0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/stringmap/-/stringmap-0.2.2.tgz#556c137b258f942b8776f5b2ef582aa069d7d1b1" + +stringset@~0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/stringset/-/stringset-0.2.1.tgz#ef259c4e349344377fcd1c913dd2e848c9c042b5" + +stringstream@~0.0.4: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" @@ -13160,12 +13256,6 @@ strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" -strip-indent@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" - dependencies: - get-stdin "^4.0.1" - strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" @@ -13178,12 +13268,6 @@ styled_string@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/styled_string/-/styled_string-0.0.1.tgz#d22782bd81295459bc4f1df18c4bad8e94dd124a" -subarg@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2" - dependencies: - minimist "^1.1.0" - sum-up@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e" @@ -13210,15 +13294,25 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" +supports-color@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + dependencies: + has-flag "^3.0.0" + symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#5d49108e2ab824a34069b68974486c290020b393" -syntax-error@^1.1.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz#2d9d4ff5c064acb711594a3e3b95054ad51d907c" +sync-disk-cache@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/sync-disk-cache/-/sync-disk-cache-1.3.3.tgz#481933461623fdc2bdf46cfc87872ba215a7e246" dependencies: - acorn-node "^1.2.0" + debug "^2.1.3" + heimdalljs "^0.2.3" + mkdirp "^0.5.0" + rimraf "^2.2.8" + username-sync "^1.0.2" table@^3.7.8: version "3.8.3" @@ -13421,7 +13515,7 @@ through2@^3.0.1: dependencies: readable-stream "2 || 3" -"through@>=2.2.7 <3", through@^2.3.6: +"through@>=2.2.7 <3", through@^2.3.6, through@~2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -13433,12 +13527,6 @@ timed-out@^4.0.0, timed-out@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" -timers-browserify@^1.0.1: - version "1.4.2" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d" - dependencies: - process "~0.11.0" - timers-browserify@^2.0.2, timers-browserify@^2.0.4: version "2.0.10" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae" @@ -13488,7 +13576,7 @@ to-buffer@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" -to-fast-properties@^1.0.3: +to-fast-properties@^1.0.0, to-fast-properties@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" @@ -13557,19 +13645,17 @@ tree-sync@^1.4.0: quick-temp "^0.1.5" walk-sync "^0.3.3" -trim-newlines@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" - -trim-right@^1.0.1: +trim-right@^1.0.0, trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" -"true-case-path@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62" - dependencies: - glob "^6.0.4" +try-resolve@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/try-resolve/-/try-resolve-1.0.1.tgz#cfde6fabd72d63e5797cfaab873abbe8e700e912" + +tryor@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz#8145e4ca7caff40acde3ccf946e8b8bb75b4172b" tslib@^1.9.0: version "1.9.3" @@ -13579,20 +13665,12 @@ tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" -tty-browserify@~0.0.0: - version "0.0.1" - resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" - tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" dependencies: safe-buffer "^5.0.1" -tunnel-agent@~0.4.1: - version "0.4.3" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" - tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" @@ -13610,7 +13688,7 @@ type-is@~1.6.15, type-is@~1.6.16: media-typer "0.3.0" mime-types "~2.1.18" -typedarray@^0.0.6, typedarray@~0.0.5: +typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -13625,7 +13703,7 @@ uglify-js@3.4.x, uglify-js@^3.1.4: commander "~2.17.1" source-map "~0.6.1" -uglify-js@^2.6, uglify-js@^2.6.1: +uglify-js@^2.6: version "2.8.29" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" dependencies: @@ -13634,6 +13712,13 @@ uglify-js@^2.6, uglify-js@^2.6.1: optionalDependencies: uglify-to-browserify "~1.0.0" +uglify-js@^3.0.24: + version "3.5.13" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.13.tgz#d2d8857b598d77f8764ae3bfcf90bb1df134d2bd" + dependencies: + commander "~2.20.0" + source-map "~0.6.1" + uglify-js@~2.7.3: version "2.7.5" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8" @@ -13659,10 +13744,6 @@ umask@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d" -umd@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf" - underscore.string@^3.2.2: version "3.3.5" resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023" @@ -13760,6 +13841,10 @@ upath@^1.0.5: version "1.1.0" resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" +upath@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068" + update-notifier@^2.3.0, update-notifier@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6" @@ -13814,18 +13899,18 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-parse@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.1.tgz#4dec9dad3dc8585f862fed461d2e19bbf623df30" +url-parse@^1.4.7: + version "1.4.7" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" dependencies: - querystringify "^2.0.0" + querystringify "^2.1.1" requires-port "^1.0.0" url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" -url@^0.11.0, url@~0.11.0: +url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" dependencies: @@ -13838,6 +13923,10 @@ use@^3.1.0: dependencies: kind-of "^6.0.2" +user-home@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" + user-home@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f" @@ -13848,6 +13937,17 @@ username-sync@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.1.tgz#1cde87eefcf94b8822984d938ba2b797426dae1f" +username-sync@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.2.tgz#0a3697909fb7b5768d29e2921f573acfdd427592" + +username@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/username/-/username-3.0.0.tgz#b3dba982a72b4ce59d52f159fa1aeba266af5fc8" + dependencies: + execa "^0.7.0" + mem "^1.1.0" + util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -13856,6 +13956,13 @@ util-extend@^1.0.1, util-extend@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" +util.promisify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030" + dependencies: + define-properties "^1.1.2" + object.getownpropertydescriptors "^2.0.3" + util@0.10.3, util@^0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" @@ -13868,12 +13975,6 @@ util@^0.11.0: dependencies: inherits "2.0.3" -util@~0.10.1: - version "0.10.4" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901" - dependencies: - inherits "2.0.3" - utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" @@ -13915,7 +14016,7 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vm-browserify@0.0.4, vm-browserify@~0.0.1: +vm-browserify@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" dependencies: @@ -13928,10 +14029,6 @@ walk-sync@0.3.2, walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.2: ensure-posix-path "^1.0.0" matcher-collection "^1.0.0" -walk-sync@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.1.3.tgz#8a07261a00bda6cfb1be25e9f100fad57546f583" - walk-sync@^0.2.5, walk-sync@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969" @@ -14109,10 +14206,6 @@ websocket-extensions@>=0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" -whatwg-fetch@^2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" - whatwg-fetch@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" @@ -14159,7 +14252,7 @@ window-size@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" -window-size@^0.1.4: +window-size@^0.1.2, window-size@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" @@ -14194,12 +14287,6 @@ workerpool@^2.3.0: dependencies: object-assign "4.1.1" -workerpool@^2.3.1: - version "2.3.3" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-2.3.3.tgz#49a70089bd55e890d68cc836a19419451d7c81d7" - dependencies: - object-assign "4.1.1" - workerpool@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-3.1.1.tgz#9decea76b73c2f91de1b5bec1019f8a474b3a620" @@ -14255,30 +14342,19 @@ ws@~3.3.1: safe-buffer "~5.1.0" ultron "~1.1.0" -xcomponent@^6.0.0: - version "6.0.62" - resolved "https://registry.yarnpkg.com/xcomponent/-/xcomponent-6.0.62.tgz#7665a4c466d96bd75a405b57adef4bccb1a93d00" - dependencies: - beaver-logger "^3.0.11" - cross-domain-safe-weakmap "^1.0.19" - cross-domain-utils "^2.0.3" - hi-base32 "^0.5.0" - post-robot "^8.0.14" - zalgo-promise "^1.0.22" - xdg-basedir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" -xgettext-template@^3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/xgettext-template/-/xgettext-template-3.4.1.tgz#24b7b450024fa7880acf0406ac759c1e0e90b0b0" +xgettext-template@^3.4.2: + version "3.4.2" + resolved "https://registry.yarnpkg.com/xgettext-template/-/xgettext-template-3.4.2.tgz#f29b9eab1aeb86860e1e31c50df9e4069c003e80" dependencies: - async "^2.6.0" + async "^2.6.1" gettext-ejs "^0.1.1" gettext-handlebars "^0.7.0" gettext-nunjucks "^0.0.2" - gettext-parser "^1.4.0" + gettext-parser "^2.0.0" gettext-swig "^0.3.0" gettext-volt "^0.2.2" object-assign "^4.1.1" @@ -14336,12 +14412,6 @@ yargs-parser@^4.2.0: dependencies: camelcase "^3.0.0" -yargs-parser@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" - dependencies: - camelcase "^3.0.0" - yargs-parser@^9.0.2: version "9.0.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" @@ -14394,7 +14464,7 @@ yargs@^3.32.0: window-size "^0.1.4" y18n "^3.2.0" -yargs@^6.5.0, yargs@^6.6.0: +yargs@^6.6.0: version "6.6.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" dependencies: @@ -14412,24 +14482,6 @@ yargs@^6.5.0, yargs@^6.6.0: y18n "^3.2.1" yargs-parser "^4.2.0" -yargs@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" - dependencies: - camelcase "^3.0.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^1.4.0" - read-pkg-up "^1.0.1" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^1.0.2" - which-module "^1.0.0" - y18n "^3.2.1" - yargs-parser "^5.0.0" - yargs@~3.10.0: version "3.10.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" @@ -14439,10 +14491,37 @@ yargs@~3.10.0: decamelize "^1.0.0" window-size "0.1.0" +yargs@~3.27.0: + version "3.27.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.27.0.tgz#21205469316e939131d59f2da0c6d7f98221ea40" + dependencies: + camelcase "^1.2.1" + cliui "^2.1.0" + decamelize "^1.0.0" + os-locale "^1.4.0" + window-size "^0.1.2" + y18n "^3.2.0" + yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" -zalgo-promise@^1.0.10, zalgo-promise@^1.0.11, zalgo-promise@^1.0.22, zalgo-promise@^1.0.26, zalgo-promise@^1.0.3: +zalgo-promise@^1.0.10, zalgo-promise@^1.0.11, zalgo-promise@^1.0.26, zalgo-promise@^1.0.3: version "1.0.28" resolved "https://registry.yarnpkg.com/zalgo-promise/-/zalgo-promise-1.0.28.tgz#d21b31c060fbb159af9d48f0e67dd31ce4091b33" + +zalgo-promise@^1.0.28, zalgo-promise@^1.0.34: + version "1.0.38" + resolved "https://registry.yarnpkg.com/zalgo-promise/-/zalgo-promise-1.0.38.tgz#6acdb8990954eabab505c0c3bde47523fd927d33" + +zoid@^6.0.67: + version "6.0.74" + resolved "https://registry.yarnpkg.com/zoid/-/zoid-6.0.74.tgz#34b58c77e1e127501d1ceb7643abde8b3c49260f" + dependencies: + beaver-logger "^3.0.17" + belter "^1.0.77" + cross-domain-safe-weakmap "^1.0.22" + cross-domain-utils "^2.0.16" + hi-base32 "^0.5.0" + post-robot "^8.0.29" + zalgo-promise "^1.0.34"