diff --git a/.travis.yml b/.travis.yml index 258b59a16..a2c460253 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,9 @@ language: go go: - 1.9.x +addons: + chrome: stable + git: depth: 300 @@ -28,13 +31,11 @@ matrix: - os: osx fast_finish: true -cache: - directories: - - ui/node_modules - before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ -z "$SKIP_NOMAD_TESTS" ]]; then sudo -E bash ./scripts/travis-mac-priv.sh ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ -z "$SKIP_NOMAD_TESTS" ]]; then sudo -E bash ./scripts/travis-linux.sh ; fi + - if [[ "$RUN_UI_TESTS" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.1 ; fi + - if [[ "$RUN_UI_TESTS" ]]; then export PATH="$HOME/.yarn/bin:$PATH" ; fi install: - if [[ -z "$SKIP_NOMAD_TESTS" ]]; then make deps ; fi diff --git a/GNUmakefile b/GNUmakefile index 3c9741a71..951e7a81b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -283,8 +283,8 @@ static-assets: ## Compile the static routes to serve alongside the API .PHONY: test-ui test-ui: ## Run Nomad UI test suite @echo "--> Installing JavaScript assets" + @cd ui && npm rebuild node-sass @cd ui && yarn install - @cd ui && npm install phantomjs-prebuilt @echo "--> Running ember tests" @cd ui && phantomjs --version @cd ui && npm test diff --git a/ui/.nvmrc b/ui/.nvmrc index 1e8b31496..45a4fb75d 100644 --- a/ui/.nvmrc +++ b/ui/.nvmrc @@ -1 +1 @@ -6 +8 diff --git a/ui/.prettierrc b/ui/.prettierrc new file mode 100644 index 000000000..7f9eaa64f --- /dev/null +++ b/ui/.prettierrc @@ -0,0 +1,3 @@ +printWidth: 100 +singleQuote: true +trailingComma: es5 diff --git a/ui/.travis.yml b/ui/.travis.yml deleted file mode 100644 index 385f003d4..000000000 --- a/ui/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -language: node_js -node_js: - - "6" - -sudo: false - -cache: - directories: - - $HOME/.npm - -before_install: - - npm config set spin false - - npm install -g phantomjs-prebuilt - - phantomjs --version - -install: - - npm install - -script: - - npm test diff --git a/ui/app/adapters/application.js b/ui/app/adapters/application.js index 1e5c97333..bcf223383 100644 --- a/ui/app/adapters/application.js +++ b/ui/app/adapters/application.js @@ -1,15 +1,14 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import { computed, get } from '@ember/object'; import RESTAdapter from 'ember-data/adapters/rest'; import codesForError from '../utils/codes-for-error'; -const { get, computed, inject } = Ember; - export const namespace = 'v1'; export default RESTAdapter.extend({ namespace, - token: inject.service(), + token: service(), headers: computed('token.secret', function() { const token = this.get('token.secret'); diff --git a/ui/app/adapters/job.js b/ui/app/adapters/job.js index 4d18d1625..80398adac 100644 --- a/ui/app/adapters/job.js +++ b/ui/app/adapters/job.js @@ -1,10 +1,10 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import RSVP from 'rsvp'; +import { assign } from '@ember/polyfills'; import ApplicationAdapter from './application'; -const { RSVP, inject, assign } = Ember; - export default ApplicationAdapter.extend({ - system: inject.service(), + system: service(), shouldReloadAll: () => true, diff --git a/ui/app/adapters/token.js b/ui/app/adapters/token.js index 0bd103334..32315037a 100644 --- a/ui/app/adapters/token.js +++ b/ui/app/adapters/token.js @@ -1,10 +1,8 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; import { default as ApplicationAdapter, namespace } from './application'; -const { inject } = Ember; - export default ApplicationAdapter.extend({ - store: inject.service(), + store: service(), namespace: namespace + '/acl', diff --git a/ui/app/app.js b/ui/app/app.js index 831ad6106..7d6bae3ce 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -1,16 +1,14 @@ -import Ember from 'ember'; +import Application from '@ember/application'; import Resolver from './resolver'; import loadInitializers from 'ember-load-initializers'; import config from './config/environment'; let App; -Ember.MODEL_FACTORY_INJECTIONS = true; - -App = Ember.Application.extend({ +App = Application.extend({ modulePrefix: config.modulePrefix, podModulePrefix: config.podModulePrefix, - Resolver + Resolver, }); loadInitializers(App, config.modulePrefix); diff --git a/ui/app/components/allocation-row.js b/ui/app/components/allocation-row.js index a258f5b24..5625c092f 100644 --- a/ui/app/components/allocation-row.js +++ b/ui/app/components/allocation-row.js @@ -1,10 +1,10 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import Component from '@ember/component'; +import { run } from '@ember/runloop'; import { lazyClick } from '../helpers/lazy-click'; -const { Component, inject, run } = Ember; - export default Component.extend({ - store: inject.service(), + store: service(), tagName: 'tr', diff --git a/ui/app/components/allocation-status-bar.js b/ui/app/components/allocation-status-bar.js index 0a3734626..7f2d1e2fc 100644 --- a/ui/app/components/allocation-status-bar.js +++ b/ui/app/components/allocation-status-bar.js @@ -1,8 +1,6 @@ -import Ember from 'ember'; +import { computed } from '@ember/object'; import DistributionBar from './distribution-bar'; -const { computed } = Ember; - export default DistributionBar.extend({ layoutName: 'components/distribution-bar', diff --git a/ui/app/components/attributes-section.js b/ui/app/components/attributes-section.js index f2503c9fc..479865264 100644 --- a/ui/app/components/attributes-section.js +++ b/ui/app/components/attributes-section.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ tagName: '', diff --git a/ui/app/components/client-node-row.js b/ui/app/components/client-node-row.js index e2f9dd19c..2775ed58f 100644 --- a/ui/app/components/client-node-row.js +++ b/ui/app/components/client-node-row.js @@ -1,8 +1,6 @@ -import Ember from 'ember'; +import Component from '@ember/component'; import { lazyClick } from '../helpers/lazy-click'; -const { Component } = Ember; - export default Component.extend({ tagName: 'tr', classNames: ['client-node-row', 'is-interactive'], diff --git a/ui/app/components/distribution-bar.js b/ui/app/components/distribution-bar.js index 105273df6..46d47d8f4 100644 --- a/ui/app/components/distribution-bar.js +++ b/ui/app/components/distribution-bar.js @@ -1,10 +1,13 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { computed } from '@ember/object'; +import { run } from '@ember/runloop'; +import { assign } from '@ember/polyfills'; +import { guidFor } from '@ember/object/internals'; import d3 from 'npm:d3-selection'; import 'npm:d3-transition'; import WindowResizable from '../mixins/window-resizable'; import styleStringProperty from '../utils/properties/style-string'; -const { Component, computed, run, assign, guidFor } = Ember; const sumAggregate = (total, val) => total + val; export default Component.extend(WindowResizable, { @@ -96,7 +99,7 @@ export default Component.extend(WindowResizable, { }); slices = slices.merge(slicesEnter); - slices.attr('class', d => d.className || `slice-${filteredData.indexOf(d)}`); + slices.attr('class', d => d.className || `slice-${_data.indexOf(d)}`); const setWidth = d => `${width * d.percent - (d.index === sliceCount - 1 || d.index === 0 ? 1 : 2)}px` const setOffset = d => `${width * d.offset + (d.index === 0 ? 0 : 1)}px` diff --git a/ui/app/components/freestyle/sg-boxed-section.js b/ui/app/components/freestyle/sg-boxed-section.js new file mode 100644 index 000000000..4e4f4fa7d --- /dev/null +++ b/ui/app/components/freestyle/sg-boxed-section.js @@ -0,0 +1,27 @@ +import Component from '@ember/component'; +import { computed } from '@ember/object'; + +export default Component.extend({ + variants: computed(() => [ + { + key: 'Normal', + title: 'Normal', + slug: '', + }, + { + key: 'Info', + title: 'Info', + slug: 'is-info', + }, + { + key: 'Warning', + title: 'Warning', + slug: 'is-warning', + }, + { + key: 'Danger', + title: 'Danger', + slug: 'is-danger', + }, + ]), +}); diff --git a/ui/app/components/freestyle/sg-colors.js b/ui/app/components/freestyle/sg-colors.js new file mode 100644 index 000000000..40d77fcd2 --- /dev/null +++ b/ui/app/components/freestyle/sg-colors.js @@ -0,0 +1,97 @@ +import Component from '@ember/component'; +import { computed } from '@ember/object'; + +export default Component.extend({ + nomadTheme: computed(() => [ + { + name: 'Primary', + base: '#25ba81', + }, + { + name: 'Primary Dark', + base: '#1d9467', + }, + { + name: 'Text', + base: '#0a0a0a', + }, + { + name: 'Link', + base: '#1563ff', + }, + { + name: 'Gray', + base: '#bbc4d1', + }, + { + name: 'Off-white', + base: '#f5f5f5', + }, + ]), + + productColors: computed(() => [ + { + name: 'Consul Pink', + base: '#ff0087', + }, + { + name: 'Consul Pink Dark', + base: '#c62a71', + }, + { + name: 'Packer Blue', + base: '#1daeff', + }, + { + name: 'Packer Blue Dark', + base: '#1d94dd', + }, + { + name: 'Terraform Purple', + base: '#5c4ee5', + }, + { + name: 'Terraform Purple Dark', + base: '#4040b2', + }, + { + name: 'Vagrant Blue', + base: '#1563ff', + }, + { + name: 'Vagrant Blue Dark', + base: '#104eb2', + }, + { + name: 'Nomad Green', + base: '#25ba81', + }, + { + name: 'Nomad Green Dark', + base: '#1d9467', + }, + { + name: 'Nomad Green Darker', + base: '#16704d', + }, + ]), + + emotiveColors: computed(() => [ + { + name: 'Success', + base: '#23d160', + }, + { + name: 'Warning', + base: '#fa8e23', + }, + { + name: 'Danger', + base: '#c84034', + }, + { + name: 'Info', + base: '#1563ff', + }, + ]), +}); diff --git a/ui/app/components/freestyle/sg-distribution-bar-jumbo.js b/ui/app/components/freestyle/sg-distribution-bar-jumbo.js new file mode 100644 index 000000000..9176d6b7c --- /dev/null +++ b/ui/app/components/freestyle/sg-distribution-bar-jumbo.js @@ -0,0 +1,13 @@ +import Component from '@ember/component'; +import { computed } from '@ember/object'; + +export default Component.extend({ + distributionBarData: computed(() => { + return [ + { label: 'one', value: 10 }, + { label: 'two', value: 20 }, + { label: 'three', value: 0 }, + { label: 'four', value: 35 }, + ]; + }), +}); diff --git a/ui/app/components/freestyle/sg-distribution-bar.js b/ui/app/components/freestyle/sg-distribution-bar.js new file mode 100644 index 000000000..ab43ceb03 --- /dev/null +++ b/ui/app/components/freestyle/sg-distribution-bar.js @@ -0,0 +1,43 @@ +import Component from '@ember/component'; +import { computed } from '@ember/object'; + +export default Component.extend({ + timerTicks: 0, + + startTimer: function() { + this.set( + 'timer', + setInterval(() => { + this.incrementProperty('timerTicks'); + }, 500) + ); + }.on('init'), + + willDestroy() { + clearInterval(this.get('timer')); + }, + + distributionBarData: computed(() => { + return [ + { label: 'one', value: 10 }, + { label: 'two', value: 20 }, + { label: 'three', value: 30 }, + ]; + }), + + distributionBarDataWithClasses: computed(() => { + return [ + { label: 'Queued', value: 10, className: 'queued' }, + { label: 'Complete', value: 20, className: 'complete' }, + { label: 'Failed', value: 30, className: 'failed' }, + ]; + }), + + distributionBarDataRotating: computed('timerTicks', () => { + return [ + { label: 'one', value: Math.round(Math.random() * 50) }, + { label: 'two', value: Math.round(Math.random() * 50) }, + { label: 'three', value: Math.round(Math.random() * 50) }, + ]; + }), +}); diff --git a/ui/app/components/gutter-menu.js b/ui/app/components/gutter-menu.js index 9ab098cbb..7a5086b76 100644 --- a/ui/app/components/gutter-menu.js +++ b/ui/app/components/gutter-menu.js @@ -1,9 +1,9 @@ -import Ember from 'ember'; - -const { Component, inject, computed } = Ember; +import { inject as service } from '@ember/service'; +import Component from '@ember/component'; +import { computed } from '@ember/object'; export default Component.extend({ - system: inject.service(), + system: service(), sortedNamespaces: computed('system.namespaces.@each.name', function() { const namespaces = this.get('system.namespaces').toArray() || []; diff --git a/ui/app/components/job-deployment.js b/ui/app/components/job-deployment.js index 1a2476be8..feb13f17d 100644 --- a/ui/app/components/job-deployment.js +++ b/ui/app/components/job-deployment.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ classNames: ['job-deployment', 'boxed-section'], diff --git a/ui/app/components/job-deployment/deployment-metrics.js b/ui/app/components/job-deployment/deployment-metrics.js index f2503c9fc..479865264 100644 --- a/ui/app/components/job-deployment/deployment-metrics.js +++ b/ui/app/components/job-deployment/deployment-metrics.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ tagName: '', diff --git a/ui/app/components/job-deployments-stream.js b/ui/app/components/job-deployments-stream.js index 95bd4f198..0ddb5fedb 100644 --- a/ui/app/components/job-deployments-stream.js +++ b/ui/app/components/job-deployments-stream.js @@ -1,17 +1,16 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { computed } from '@ember/object'; import moment from 'moment'; -const { Component, computed } = Ember; - export default Component.extend({ tagName: 'ol', classNames: ['timeline'], deployments: computed(() => []), - sortedDeployments: computed('deployments.@each.version.submitTime', function() { + sortedDeployments: computed('deployments.@each.versionSubmitTime', function() { return this.get('deployments') - .sortBy('version.submitTime') + .sortBy('versionSubmitTime') .reverse(); }), diff --git a/ui/app/components/job-diff-fields-and-objects.js b/ui/app/components/job-diff-fields-and-objects.js index f2503c9fc..479865264 100644 --- a/ui/app/components/job-diff-fields-and-objects.js +++ b/ui/app/components/job-diff-fields-and-objects.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ tagName: '', diff --git a/ui/app/components/job-diff.js b/ui/app/components/job-diff.js index 2bba7310e..79371f333 100644 --- a/ui/app/components/job-diff.js +++ b/ui/app/components/job-diff.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { Component, computed } = Ember; +import { equal } from '@ember/object/computed'; +import Component from '@ember/component'; export default Component.extend({ classNames: ['job-diff'], @@ -10,7 +9,7 @@ export default Component.extend({ verbose: true, - isEdited: computed.equal('diff.Type', 'Edited'), - isAdded: computed.equal('diff.Type', 'Added'), - isDeleted: computed.equal('diff.Type', 'Deleted'), + isEdited: equal('diff.Type', 'Edited'), + isAdded: equal('diff.Type', 'Added'), + isDeleted: equal('diff.Type', 'Deleted'), }); diff --git a/ui/app/components/job-row.js b/ui/app/components/job-row.js index e370cfba9..db9e6e369 100644 --- a/ui/app/components/job-row.js +++ b/ui/app/components/job-row.js @@ -1,8 +1,6 @@ -import Ember from 'ember'; +import Component from '@ember/component'; import { lazyClick } from '../helpers/lazy-click'; -const { Component } = Ember; - export default Component.extend({ tagName: 'tr', classNames: ['job-row', 'is-interactive'], diff --git a/ui/app/components/job-version.js b/ui/app/components/job-version.js index 0ffe77803..978111a93 100644 --- a/ui/app/components/job-version.js +++ b/ui/app/components/job-version.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { Component, computed } = Ember; +import Component from '@ember/component'; +import { computed } from '@ember/object'; const changeTypes = ['Added', 'Deleted', 'Edited']; diff --git a/ui/app/components/job-versions-stream.js b/ui/app/components/job-versions-stream.js index 8ac011376..b2a92d71a 100644 --- a/ui/app/components/job-versions-stream.js +++ b/ui/app/components/job-versions-stream.js @@ -1,8 +1,7 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { computed } from '@ember/object'; import moment from 'moment'; -const { Component, computed } = Ember; - export default Component.extend({ tagName: 'ol', classNames: ['timeline'], diff --git a/ui/app/components/json-viewer.js b/ui/app/components/json-viewer.js index 2d8442e33..cf966757d 100644 --- a/ui/app/components/json-viewer.js +++ b/ui/app/components/json-viewer.js @@ -1,8 +1,8 @@ -import Ember from 'ember'; +import Component from '@ember/component'; +import { computed } from '@ember/object'; +import { run } from '@ember/runloop'; import JSONFormatterPkg from 'npm:json-formatter-js'; -const { Component, computed, run } = Ember; - // json-formatter-js is packaged in a funny way that ember-cli-browserify // doesn't unwrap properly. const { default: JSONFormatter } = JSONFormatterPkg; diff --git a/ui/app/components/list-pagination.js b/ui/app/components/list-pagination.js index c18301d4a..c04aaa9f4 100644 --- a/ui/app/components/list-pagination.js +++ b/ui/app/components/list-pagination.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { Component, computed } = Ember; +import Component from '@ember/component'; +import { computed } from '@ember/object'; export default Component.extend({ source: computed(() => []), @@ -31,9 +30,11 @@ export default Component.extend({ const lowerBound = Math.max(1, page - spread); const upperBound = Math.min(lastPage, page + spread) + 1; - return Array(upperBound - lowerBound).fill(null).map((_, index) => ({ - pageNumber: lowerBound + index, - })); + return Array(upperBound - lowerBound) + .fill(null) + .map((_, index) => ({ + pageNumber: lowerBound + index, + })); }), list: computed('source.[]', 'page', 'size', function() { diff --git a/ui/app/components/list-pagination/list-pager.js b/ui/app/components/list-pagination/list-pager.js index f2503c9fc..479865264 100644 --- a/ui/app/components/list-pagination/list-pager.js +++ b/ui/app/components/list-pagination/list-pager.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ tagName: '', diff --git a/ui/app/components/list-table.js b/ui/app/components/list-table.js index 39cf15fe6..0b6d63416 100644 --- a/ui/app/components/list-table.js +++ b/ui/app/components/list-table.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { Component, computed } = Ember; +import Component from '@ember/component'; +import { computed } from '@ember/object'; export default Component.extend({ tagName: 'table', diff --git a/ui/app/components/list-table/sort-by.js b/ui/app/components/list-table/sort-by.js index 9edcb61e7..cd6e3fc2c 100644 --- a/ui/app/components/list-table/sort-by.js +++ b/ui/app/components/list-table/sort-by.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { Component, computed } = Ember; +import Component from '@ember/component'; +import { computed } from '@ember/object'; export default Component.extend({ tagName: 'th', diff --git a/ui/app/components/list-table/table-body.js b/ui/app/components/list-table/table-body.js index 4c756a699..782917851 100644 --- a/ui/app/components/list-table/table-body.js +++ b/ui/app/components/list-table/table-body.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ tagName: 'tbody', diff --git a/ui/app/components/list-table/table-head.js b/ui/app/components/list-table/table-head.js index c1f0c7825..92a17d670 100644 --- a/ui/app/components/list-table/table-head.js +++ b/ui/app/components/list-table/table-head.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Component } = Ember; +import Component from '@ember/component'; export default Component.extend({ tagName: 'thead', diff --git a/ui/app/components/search-box.js b/ui/app/components/search-box.js index 19aa76bef..8066f3e0b 100644 --- a/ui/app/components/search-box.js +++ b/ui/app/components/search-box.js @@ -1,13 +1,13 @@ -import Ember from 'ember'; - -const { Component, computed, run } = Ember; +import { reads } from '@ember/object/computed'; +import Component from '@ember/component'; +import { run } from '@ember/runloop'; export default Component.extend({ // Passed to the component (mutable) searchTerm: null, // Used as a debounce buffer - _searchTerm: computed.reads('searchTerm'), + _searchTerm: reads('searchTerm'), // Used to throttle sets to searchTerm debounce: 150, diff --git a/ui/app/components/server-agent-row.js b/ui/app/components/server-agent-row.js index f853ada96..98d401fe0 100644 --- a/ui/app/components/server-agent-row.js +++ b/ui/app/components/server-agent-row.js @@ -1,13 +1,15 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import { alias } from '@ember/object/computed'; +import Component from '@ember/component'; +import { computed } from '@ember/object'; import { lazyClick } from '../helpers/lazy-click'; -const { Component, inject, computed } = Ember; - export default Component.extend({ - // TODO Switch back to the router service style when it is no longer feature-flagged + // TODO Switch back to the router service once the service behaves more like Route + // https://github.com/emberjs/ember.js/issues/15801 // router: inject.service('router'), - _router: inject.service('-routing'), - router: computed.alias('_router.router'), + _router: service('-routing'), + router: alias('_router.router'), tagName: 'tr', classNames: ['server-agent-row', 'is-interactive'], @@ -15,7 +17,8 @@ export default Component.extend({ agent: null, isActive: computed('agent', 'router.currentURL', function() { - // TODO Switch back to the router service style when it is no longer feature-flagged + // TODO Switch back to the router service once the service behaves more like Route + // https://github.com/emberjs/ember.js/issues/15801 // const targetURL = this.get('router').urlFor('servers.server', this.get('agent')); // const currentURL = `${this.get('router.rootURL').slice(0, -1)}${this.get('router.currentURL')}`; diff --git a/ui/app/components/task-group-row.js b/ui/app/components/task-group-row.js index 4fb239637..98753d615 100644 --- a/ui/app/components/task-group-row.js +++ b/ui/app/components/task-group-row.js @@ -1,8 +1,6 @@ -import Ember from 'ember'; +import Component from '@ember/component'; import { lazyClick } from '../helpers/lazy-click'; -const { Component } = Ember; - export default Component.extend({ tagName: 'tr', diff --git a/ui/app/components/task-log.js b/ui/app/components/task-log.js index 1b066db73..277023859 100644 --- a/ui/app/components/task-log.js +++ b/ui/app/components/task-log.js @@ -1,12 +1,13 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import Component from '@ember/component'; +import { computed } from '@ember/object'; +import { run } from '@ember/runloop'; import { task } from 'ember-concurrency'; import { logger } from 'nomad-ui/utils/classes/log'; import WindowResizable from 'nomad-ui/mixins/window-resizable'; -const { Component, computed, inject, run } = Ember; - export default Component.extend(WindowResizable, { - token: inject.service(), + token: service(), classNames: ['boxed-section', 'task-log'], diff --git a/ui/app/controllers/allocations/allocation.js b/ui/app/controllers/allocations/allocation.js index 1ee88420b..75ceaaec3 100644 --- a/ui/app/controllers/allocations/allocation.js +++ b/ui/app/controllers/allocations/allocation.js @@ -1,5 +1,3 @@ -import Ember from 'ember'; - -const { Controller } = Ember; +import Controller from '@ember/controller'; export default Controller.extend({}); diff --git a/ui/app/controllers/allocations/allocation/index.js b/ui/app/controllers/allocations/allocation/index.js index 5a764f2a6..810d0f728 100644 --- a/ui/app/controllers/allocations/allocation/index.js +++ b/ui/app/controllers/allocations/allocation/index.js @@ -1,8 +1,7 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import Controller from '@ember/controller'; import Sortable from 'nomad-ui/mixins/sortable'; -const { Controller, computed } = Ember; - export default Controller.extend(Sortable, { queryParams: { sortProperty: 'sort', @@ -12,6 +11,6 @@ export default Controller.extend(Sortable, { sortProperty: 'name', sortDescending: false, - listToSort: computed.alias('model.states'), - sortedStates: computed.alias('listSorted'), + listToSort: alias('model.states'), + sortedStates: alias('listSorted'), }); diff --git a/ui/app/controllers/allocations/allocation/task/index.js b/ui/app/controllers/allocations/allocation/task/index.js index 7374af8fd..790e190ec 100644 --- a/ui/app/controllers/allocations/allocation/task/index.js +++ b/ui/app/controllers/allocations/allocation/task/index.js @@ -1,9 +1,9 @@ -import Ember from 'ember'; - -const { Controller, computed } = Ember; +import { alias } from '@ember/object/computed'; +import Controller from '@ember/controller'; +import { computed } from '@ember/object'; export default Controller.extend({ - network: computed.alias('model.resources.networks.firstObject'), + network: alias('model.resources.networks.firstObject'), ports: computed('network.reservedPorts.[]', 'network.dynamicPorts.[]', function() { return (this.get('network.reservedPorts') || []) .map(port => ({ diff --git a/ui/app/controllers/application.js b/ui/app/controllers/application.js index ee8bee9ee..fc3c5e58e 100644 --- a/ui/app/controllers/application.js +++ b/ui/app/controllers/application.js @@ -1,10 +1,12 @@ +import { inject as service } from '@ember/service'; +import Controller from '@ember/controller'; +import { run } from '@ember/runloop'; +import { observer, computed } from '@ember/object'; import Ember from 'ember'; import codesForError from '../utils/codes-for-error'; -const { Controller, computed, inject, run, observer } = Ember; - export default Controller.extend({ - config: inject.service(), + config: service(), error: null, @@ -33,7 +35,7 @@ export default Controller.extend({ run.next(() => { throw this.get('error'); }); - } else { + } else if (!Ember.testing) { run.next(() => { // eslint-disable-next-line console.warn('UNRECOVERABLE ERROR:', this.get('error')); diff --git a/ui/app/controllers/clients.js b/ui/app/controllers/clients.js index 41e5c9e2f..f4d0631dc 100644 --- a/ui/app/controllers/clients.js +++ b/ui/app/controllers/clients.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Controller } = Ember; +import Controller from '@ember/controller'; export default Controller.extend({ isForbidden: false, diff --git a/ui/app/controllers/clients/client.js b/ui/app/controllers/clients/client.js index ed463e813..008169f5e 100644 --- a/ui/app/controllers/clients/client.js +++ b/ui/app/controllers/clients/client.js @@ -1,9 +1,9 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import Controller from '@ember/controller'; +import { computed } from '@ember/object'; import Sortable from 'nomad-ui/mixins/sortable'; import Searchable from 'nomad-ui/mixins/searchable'; -const { Controller, computed } = Ember; - export default Controller.extend(Sortable, Searchable, { queryParams: { currentPage: 'page', @@ -20,9 +20,9 @@ export default Controller.extend(Sortable, Searchable, { searchProps: computed(() => ['shortId', 'name']), - listToSort: computed.alias('model.allocations'), - listToSearch: computed.alias('listSorted'), - sortedAllocations: computed.alias('listSearched'), + listToSort: alias('model.allocations'), + listToSearch: alias('listSorted'), + sortedAllocations: alias('listSearched'), actions: { gotoAllocation(allocation) { diff --git a/ui/app/controllers/clients/index.js b/ui/app/controllers/clients/index.js index eedb9ebe8..ac19f9d9d 100644 --- a/ui/app/controllers/clients/index.js +++ b/ui/app/controllers/clients/index.js @@ -1,14 +1,14 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import Controller, { inject as controller } from '@ember/controller'; +import { computed } from '@ember/object'; import Sortable from 'nomad-ui/mixins/sortable'; import Searchable from 'nomad-ui/mixins/searchable'; -const { Controller, computed, inject } = Ember; - export default Controller.extend(Sortable, Searchable, { - clientsController: inject.controller('clients'), + clientsController: controller('clients'), - nodes: computed.alias('model.nodes'), - agents: computed.alias('model.agents'), + nodes: alias('model.nodes'), + agents: alias('model.agents'), queryParams: { currentPage: 'page', @@ -25,11 +25,11 @@ export default Controller.extend(Sortable, Searchable, { searchProps: computed(() => ['id', 'name', 'datacenter']), - listToSort: computed.alias('nodes'), - listToSearch: computed.alias('listSorted'), - sortedNodes: computed.alias('listSearched'), + listToSort: alias('nodes'), + listToSearch: alias('listSorted'), + sortedNodes: alias('listSearched'), - isForbidden: computed.alias('clientsController.isForbidden'), + isForbidden: alias('clientsController.isForbidden'), actions: { gotoNode(node) { diff --git a/ui/app/controllers/freestyle.js b/ui/app/controllers/freestyle.js index 71e5bde38..a5809f613 100644 --- a/ui/app/controllers/freestyle.js +++ b/ui/app/controllers/freestyle.js @@ -1,47 +1,6 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; import FreestyleController from 'ember-freestyle/controllers/freestyle'; -const { inject, computed } = Ember; - export default FreestyleController.extend({ - emberFreestyle: inject.service(), - - timerTicks: 0, - - startTimer: function() { - this.set( - 'timer', - setInterval(() => { - this.incrementProperty('timerTicks'); - }, 500) - ); - }.on('init'), - - stopTimer: function() { - clearInterval(this.get('timer')); - }.on('willDestroy'), - - distributionBarData: computed(() => { - return [ - { label: 'one', value: 10 }, - { label: 'two', value: 20 }, - { label: 'three', value: 30 }, - ]; - }), - - distributionBarDataWithClasses: computed(() => { - return [ - { label: 'Queued', value: 10, className: 'queued' }, - { label: 'Complete', value: 20, className: 'complete' }, - { label: 'Failed', value: 30, className: 'failed' }, - ]; - }), - - distributionBarDataRotating: computed('timerTicks', () => { - return [ - { label: 'one', value: Math.round(Math.random() * 50) }, - { label: 'two', value: Math.round(Math.random() * 50) }, - { label: 'three', value: Math.round(Math.random() * 50) }, - ]; - }), + emberFreestyle: service(), }); diff --git a/ui/app/controllers/jobs.js b/ui/app/controllers/jobs.js index 88f3d60e1..e7a69a7d8 100644 --- a/ui/app/controllers/jobs.js +++ b/ui/app/controllers/jobs.js @@ -1,9 +1,10 @@ -import Ember from 'ember'; - -const { Controller, inject, observer, run } = Ember; +import { inject as service } from '@ember/service'; +import Controller from '@ember/controller'; +import { observer } from '@ember/object'; +import { run } from '@ember/runloop'; export default Controller.extend({ - system: inject.service(), + system: service(), queryParams: { jobNamespace: 'namespace', diff --git a/ui/app/controllers/jobs/index.js b/ui/app/controllers/jobs/index.js index 079d30dc3..d0d06e9ee 100644 --- a/ui/app/controllers/jobs/index.js +++ b/ui/app/controllers/jobs/index.js @@ -1,18 +1,19 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import { alias, filterBy } from '@ember/object/computed'; +import Controller, { inject as controller } from '@ember/controller'; +import { computed } from '@ember/object'; import Sortable from 'nomad-ui/mixins/sortable'; import Searchable from 'nomad-ui/mixins/searchable'; -const { Controller, computed, inject } = Ember; - export default Controller.extend(Sortable, Searchable, { - system: inject.service(), - jobsController: inject.controller('jobs'), + system: service(), + jobsController: controller('jobs'), - isForbidden: computed.alias('jobsController.isForbidden'), + isForbidden: alias('jobsController.isForbidden'), - pendingJobs: computed.filterBy('model', 'status', 'pending'), - runningJobs: computed.filterBy('model', 'status', 'running'), - deadJobs: computed.filterBy('model', 'status', 'dead'), + pendingJobs: filterBy('model', 'status', 'pending'), + runningJobs: filterBy('model', 'status', 'running'), + deadJobs: filterBy('model', 'status', 'dead'), queryParams: { currentPage: 'page', @@ -42,9 +43,9 @@ export default Controller.extend(Sortable, Searchable, { } ), - listToSort: computed.alias('filteredJobs'), - listToSearch: computed.alias('listSorted'), - sortedJobs: computed.alias('listSearched'), + listToSort: alias('filteredJobs'), + listToSearch: alias('listSorted'), + sortedJobs: alias('listSearched'), isShowingDeploymentDetails: false, diff --git a/ui/app/controllers/jobs/job.js b/ui/app/controllers/jobs/job.js index fab3c3204..5b8865a11 100644 --- a/ui/app/controllers/jobs/job.js +++ b/ui/app/controllers/jobs/job.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { Controller, computed } = Ember; +import Controller from '@ember/controller'; +import { computed } from '@ember/object'; export default Controller.extend({ breadcrumbs: computed('model.{name,id}', function() { diff --git a/ui/app/controllers/jobs/job/definition.js b/ui/app/controllers/jobs/job/definition.js index 95144a831..b105b72b0 100644 --- a/ui/app/controllers/jobs/job/definition.js +++ b/ui/app/controllers/jobs/job/definition.js @@ -1,12 +1,11 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import Controller, { inject as controller } from '@ember/controller'; import WithNamespaceResetting from 'nomad-ui/mixins/with-namespace-resetting'; -const { Controller, computed, inject } = Ember; - export default Controller.extend(WithNamespaceResetting, { - jobController: inject.controller('jobs.job'), + jobController: controller('jobs.job'), - job: computed.alias('model.job'), + job: alias('model.job'), - breadcrumbs: computed.alias('jobController.breadcrumbs'), + breadcrumbs: alias('jobController.breadcrumbs'), }); diff --git a/ui/app/controllers/jobs/job/deployments.js b/ui/app/controllers/jobs/job/deployments.js index a8c6b1761..0540c98b1 100644 --- a/ui/app/controllers/jobs/job/deployments.js +++ b/ui/app/controllers/jobs/job/deployments.js @@ -1,13 +1,12 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import Controller, { inject as controller } from '@ember/controller'; import WithNamespaceResetting from 'nomad-ui/mixins/with-namespace-resetting'; -const { Controller, computed, inject } = Ember; - export default Controller.extend(WithNamespaceResetting, { - jobController: inject.controller('jobs.job'), + jobController: controller('jobs.job'), - job: computed.alias('model'), - deployments: computed.alias('model.deployments'), + job: alias('model'), + deployments: alias('model.deployments'), - breadcrumbs: computed.alias('jobController.breadcrumbs'), + breadcrumbs: alias('jobController.breadcrumbs'), }); diff --git a/ui/app/controllers/jobs/job/index.js b/ui/app/controllers/jobs/job/index.js index 2738cccf1..97b97efb5 100644 --- a/ui/app/controllers/jobs/job/index.js +++ b/ui/app/controllers/jobs/job/index.js @@ -1,12 +1,13 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import { alias } from '@ember/object/computed'; +import Controller, { inject as controller } from '@ember/controller'; +import { computed } from '@ember/object'; import Sortable from 'nomad-ui/mixins/sortable'; import WithNamespaceResetting from 'nomad-ui/mixins/with-namespace-resetting'; -const { Controller, computed, inject } = Ember; - export default Controller.extend(Sortable, WithNamespaceResetting, { - system: inject.service(), - jobController: inject.controller('jobs.job'), + system: service(), + jobController: controller('jobs.job'), queryParams: { currentPage: 'page', @@ -20,15 +21,15 @@ export default Controller.extend(Sortable, WithNamespaceResetting, { sortProperty: 'name', sortDescending: false, - breadcrumbs: computed.alias('jobController.breadcrumbs'), - job: computed.alias('model'), + breadcrumbs: alias('jobController.breadcrumbs'), + job: alias('model'), taskGroups: computed('model.taskGroups.[]', function() { return this.get('model.taskGroups') || []; }), - listToSort: computed.alias('taskGroups'), - sortedTaskGroups: computed.alias('listSorted'), + listToSort: alias('taskGroups'), + sortedTaskGroups: alias('listSorted'), sortedEvaluations: computed('model.evaluations.@each.modifyIndex', function() { return (this.get('model.evaluations') || []).sortBy('modifyIndex').reverse(); diff --git a/ui/app/controllers/jobs/job/loading.js b/ui/app/controllers/jobs/job/loading.js index bb159e836..2251e2d75 100644 --- a/ui/app/controllers/jobs/job/loading.js +++ b/ui/app/controllers/jobs/job/loading.js @@ -1,8 +1,7 @@ -import Ember from 'ember'; - -const { Controller, computed, inject } = Ember; +import { alias } from '@ember/object/computed'; +import Controller, { inject as controller } from '@ember/controller'; export default Controller.extend({ - jobController: inject.controller('jobs.job'), - breadcrumbs: computed.alias('jobController.breadcrumbs'), + jobController: controller('jobs.job'), + breadcrumbs: alias('jobController.breadcrumbs'), }); diff --git a/ui/app/controllers/jobs/job/task-group.js b/ui/app/controllers/jobs/job/task-group.js index 4fc628201..2e2ab25e7 100644 --- a/ui/app/controllers/jobs/job/task-group.js +++ b/ui/app/controllers/jobs/job/task-group.js @@ -1,12 +1,12 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import Controller, { inject as controller } from '@ember/controller'; +import { computed } from '@ember/object'; import Sortable from 'nomad-ui/mixins/sortable'; import Searchable from 'nomad-ui/mixins/searchable'; import WithNamespaceResetting from 'nomad-ui/mixins/with-namespace-resetting'; -const { Controller, computed, inject } = Ember; - export default Controller.extend(Sortable, Searchable, WithNamespaceResetting, { - jobController: inject.controller('jobs.job'), + jobController: controller('jobs.job'), queryParams: { currentPage: 'page', @@ -27,9 +27,9 @@ export default Controller.extend(Sortable, Searchable, WithNamespaceResetting, { return this.get('model.allocations') || []; }), - listToSort: computed.alias('allocations'), - listToSearch: computed.alias('listSorted'), - sortedAllocations: computed.alias('listSearched'), + listToSort: alias('allocations'), + listToSearch: alias('listSorted'), + sortedAllocations: alias('listSearched'), breadcrumbs: computed('jobController.breadcrumbs.[]', 'model.{name}', function() { return this.get('jobController.breadcrumbs').concat([ diff --git a/ui/app/controllers/jobs/job/versions.js b/ui/app/controllers/jobs/job/versions.js index 3b2420213..eb669a22b 100644 --- a/ui/app/controllers/jobs/job/versions.js +++ b/ui/app/controllers/jobs/job/versions.js @@ -1,13 +1,12 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import Controller, { inject as controller } from '@ember/controller'; import WithNamespaceResetting from 'nomad-ui/mixins/with-namespace-resetting'; -const { Controller, computed, inject } = Ember; - export default Controller.extend(WithNamespaceResetting, { - jobController: inject.controller('jobs.job'), + jobController: controller('jobs.job'), - job: computed.alias('model'), - versions: computed.alias('model.versions'), + job: alias('model'), + versions: alias('model.versions'), - breadcrumbs: computed.alias('jobController.breadcrumbs'), + breadcrumbs: alias('jobController.breadcrumbs'), }); diff --git a/ui/app/controllers/servers.js b/ui/app/controllers/servers.js index a8d0e1f8a..5e6f1bea4 100644 --- a/ui/app/controllers/servers.js +++ b/ui/app/controllers/servers.js @@ -1,11 +1,10 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import Controller from '@ember/controller'; import Sortable from 'nomad-ui/mixins/sortable'; -const { Controller, computed } = Ember; - export default Controller.extend(Sortable, { - nodes: computed.alias('model.nodes'), - agents: computed.alias('model.agents'), + nodes: alias('model.nodes'), + agents: alias('model.agents'), queryParams: { currentPage: 'page', @@ -21,6 +20,6 @@ export default Controller.extend(Sortable, { isForbidden: false, - listToSort: computed.alias('agents'), - sortedAgents: computed.alias('listSorted'), + listToSort: alias('agents'), + sortedAgents: alias('listSorted'), }); diff --git a/ui/app/controllers/servers/index.js b/ui/app/controllers/servers/index.js index adf0eee4d..ee49e8f72 100644 --- a/ui/app/controllers/servers/index.js +++ b/ui/app/controllers/servers/index.js @@ -1,8 +1,7 @@ -import Ember from 'ember'; - -const { Controller, computed, inject } = Ember; +import { alias } from '@ember/object/computed'; +import Controller, { inject as controller } from '@ember/controller'; export default Controller.extend({ - serversController: inject.controller('servers'), - isForbidden: computed.alias('serversController.isForbidden'), + serversController: controller('servers'), + isForbidden: alias('serversController.isForbidden'), }); diff --git a/ui/app/controllers/servers/server.js b/ui/app/controllers/servers/server.js index 94f5f0bdd..dd455b3ad 100644 --- a/ui/app/controllers/servers/server.js +++ b/ui/app/controllers/servers/server.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { Controller, computed } = Ember; +import Controller from '@ember/controller'; +import { computed } from '@ember/object'; export default Controller.extend({ activeTab: 'tags', diff --git a/ui/app/controllers/settings/tokens.js b/ui/app/controllers/settings/tokens.js index 2aad23469..be1db757d 100644 --- a/ui/app/controllers/settings/tokens.js +++ b/ui/app/controllers/settings/tokens.js @@ -1,12 +1,13 @@ -import Ember from 'ember'; - -const { Controller, inject, computed, getOwner } = Ember; +import { inject as service } from '@ember/service'; +import { reads } from '@ember/object/computed'; +import Controller from '@ember/controller'; +import { getOwner } from '@ember/application'; export default Controller.extend({ - token: inject.service(), - store: inject.service(), + token: service(), + store: service(), - secret: computed.reads('token.secret'), + secret: reads('token.secret'), tokenIsValid: false, tokenIsInvalid: false, diff --git a/ui/app/helpers/css-class.js b/ui/app/helpers/css-class.js index a23d3b90d..d7f30127c 100644 --- a/ui/app/helpers/css-class.js +++ b/ui/app/helpers/css-class.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { helper } from '@ember/component/helper'; /** * CSS Class @@ -12,4 +12,4 @@ export function cssClass([updateType]) { return updateType.replace(/\//g, '-').dasherize(); } -export default Ember.Helper.helper(cssClass); +export default helper(cssClass); diff --git a/ui/app/helpers/format-bytes.js b/ui/app/helpers/format-bytes.js index dc3ab3e15..b2c69ed06 100644 --- a/ui/app/helpers/format-bytes.js +++ b/ui/app/helpers/format-bytes.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Helper } = Ember; +import Helper from '@ember/component/helper'; const UNITS = ['Bytes', 'KiB', 'MiB']; diff --git a/ui/app/helpers/format-percentage.js b/ui/app/helpers/format-percentage.js index ff4358bc7..cfd409c13 100644 --- a/ui/app/helpers/format-percentage.js +++ b/ui/app/helpers/format-percentage.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { helper } from '@ember/component/helper'; /** * Percentage Calculator @@ -35,4 +35,4 @@ function safeNumber(value) { return isNaN(value) ? 0 : +value; } -export default Ember.Helper.helper(formatPercentage); +export default helper(formatPercentage); diff --git a/ui/app/helpers/is-object.js b/ui/app/helpers/is-object.js index 0b7dae86d..97dd42e65 100644 --- a/ui/app/helpers/is-object.js +++ b/ui/app/helpers/is-object.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Helper } = Ember; +import Helper from '@ember/component/helper'; export function isObject([value]) { const isObject = !Array.isArray(value) && value !== null && typeof value === 'object'; diff --git a/ui/app/helpers/lazy-click.js b/ui/app/helpers/lazy-click.js index f9d12dcd2..de96d1c0e 100644 --- a/ui/app/helpers/lazy-click.js +++ b/ui/app/helpers/lazy-click.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { Helper, $ } = Ember; +import Helper from '@ember/component/helper'; +import $ from 'jquery'; /** * Lazy Click Event diff --git a/ui/app/helpers/pluralize.js b/ui/app/helpers/pluralize.js index 161b366a4..fcab84cbe 100644 --- a/ui/app/helpers/pluralize.js +++ b/ui/app/helpers/pluralize.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Helper } = Ember; +import Helper from '@ember/component/helper'; export function pluralize([term, count]) { return count === 1 ? term : term.pluralize(); diff --git a/ui/app/helpers/x-icon.js b/ui/app/helpers/x-icon.js index d3c670e54..f53a50543 100644 --- a/ui/app/helpers/x-icon.js +++ b/ui/app/helpers/x-icon.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { helper } from '@ember/component/helper'; import { inlineSvg } from 'ember-inline-svg/helpers/inline-svg'; // Generated at compile-time by ember-inline-svg @@ -18,4 +18,4 @@ export function xIcon(params, options) { return inlineSvg(SVGs, name, { class: classes }); } -export default Ember.Helper.helper(xIcon); +export default helper(xIcon); diff --git a/ui/app/mixins/searchable.js b/ui/app/mixins/searchable.js index 99a929eed..26557f75a 100644 --- a/ui/app/mixins/searchable.js +++ b/ui/app/mixins/searchable.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { Mixin, computed, get } = Ember; +import Mixin from '@ember/object/mixin'; +import { get, computed } from '@ember/object'; /** Searchable mixin diff --git a/ui/app/mixins/sortable.js b/ui/app/mixins/sortable.js index 269075cd8..e6a78aaf9 100644 --- a/ui/app/mixins/sortable.js +++ b/ui/app/mixins/sortable.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { Mixin, computed } = Ember; +import Mixin from '@ember/object/mixin'; +import { computed } from '@ember/object'; /** Sortable mixin diff --git a/ui/app/mixins/window-resizable.js b/ui/app/mixins/window-resizable.js index 3f3c5b7aa..6a7055bdf 100644 --- a/ui/app/mixins/window-resizable.js +++ b/ui/app/mixins/window-resizable.js @@ -1,8 +1,8 @@ -import Ember from 'ember'; +import Mixin from '@ember/object/mixin'; +import { run } from '@ember/runloop'; +import $ from 'jquery'; -const { run, $ } = Ember; - -export default Ember.Mixin.create({ +export default Mixin.create({ setupWindowResize: function() { run.scheduleOnce('afterRender', this, () => { this.set('_windowResizeHandler', this.get('windowResizeHandler').bind(this)); diff --git a/ui/app/mixins/with-forbidden-state.js b/ui/app/mixins/with-forbidden-state.js index 4b1397e09..85f27676a 100644 --- a/ui/app/mixins/with-forbidden-state.js +++ b/ui/app/mixins/with-forbidden-state.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Mixin } = Ember; +import Mixin from '@ember/object/mixin'; export default Mixin.create({ setupController(controller) { diff --git a/ui/app/mixins/with-model-error-handling.js b/ui/app/mixins/with-model-error-handling.js index 585c61595..484a80148 100644 --- a/ui/app/mixins/with-model-error-handling.js +++ b/ui/app/mixins/with-model-error-handling.js @@ -1,8 +1,6 @@ -import Ember from 'ember'; +import Mixin from '@ember/object/mixin'; import notifyError from 'nomad-ui/utils/notify-error'; -const { Mixin } = Ember; - export default Mixin.create({ model() { return this._super(...arguments).catch(notifyError(this)); diff --git a/ui/app/mixins/with-namespace-resetting.js b/ui/app/mixins/with-namespace-resetting.js index c40407568..ab57f3e3e 100644 --- a/ui/app/mixins/with-namespace-resetting.js +++ b/ui/app/mixins/with-namespace-resetting.js @@ -1,10 +1,10 @@ -import Ember from 'ember'; - -const { Mixin, inject } = Ember; +import { inject as controller } from '@ember/controller'; +import { inject as service } from '@ember/service'; +import Mixin from '@ember/object/mixin'; export default Mixin.create({ - system: inject.service(), - jobsController: inject.controller('jobs'), + system: service(), + jobsController: controller('jobs'), actions: { gotoJobs(namespace) { diff --git a/ui/app/models/agent.js b/ui/app/models/agent.js index aea6c7ee5..63bd7d2b0 100644 --- a/ui/app/models/agent.js +++ b/ui/app/models/agent.js @@ -1,11 +1,10 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import { computed } from '@ember/object'; import Model from 'ember-data/model'; import attr from 'ember-data/attr'; -const { computed, inject } = Ember; - export default Model.extend({ - system: inject.service(), + system: service(), name: attr('string'), address: attr('string'), diff --git a/ui/app/models/allocation.js b/ui/app/models/allocation.js index 6cf164a41..617c1d3f7 100644 --- a/ui/app/models/allocation.js +++ b/ui/app/models/allocation.js @@ -1,4 +1,7 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import { readOnly } from '@ember/object/computed'; +import { computed } from '@ember/object'; +import RSVP from 'rsvp'; import Model from 'ember-data/model'; import attr from 'ember-data/attr'; import { belongsTo } from 'ember-data/relationships'; @@ -7,8 +10,6 @@ import PromiseObject from '../utils/classes/promise-object'; import timeout from '../utils/timeout'; import shortUUIDProperty from '../utils/properties/short-uuid'; -const { computed, RSVP, inject } = Ember; - const STATUS_ORDER = { pending: 1, running: 2, @@ -18,7 +19,7 @@ const STATUS_ORDER = { }; export default Model.extend({ - token: inject.service(), + token: service(), shortId: shortUUIDProperty('id'), job: belongsTo('job'), @@ -56,7 +57,7 @@ export default Model.extend({ return taskGroups && taskGroups.findBy('name', this.get('taskGroupName')); }), - memoryUsed: computed.readOnly('stats.ResourceUsage.MemoryStats.RSS'), + memoryUsed: readOnly('stats.ResourceUsage.MemoryStats.RSS'), cpuUsed: computed('stats.ResourceUsage.CpuStats.TotalTicks', function() { return Math.floor(this.get('stats.ResourceUsage.CpuStats.TotalTicks') || 0); }), diff --git a/ui/app/models/deployment.js b/ui/app/models/deployment.js index 2a952afb7..02dfb4c81 100644 --- a/ui/app/models/deployment.js +++ b/ui/app/models/deployment.js @@ -1,4 +1,5 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import { computed } from '@ember/object'; import Model from 'ember-data/model'; import attr from 'ember-data/attr'; import { belongsTo, hasMany } from 'ember-data/relationships'; @@ -6,8 +7,6 @@ import { fragmentArray } from 'ember-data-model-fragments/attributes'; import shortUUIDProperty from '../utils/properties/short-uuid'; import sumAggregation from '../utils/properties/sum-aggregation'; -const { computed } = Ember; - export default Model.extend({ shortId: shortUUIDProperty('id'), @@ -34,6 +33,9 @@ export default Model.extend({ return (this.get('job.versions') || []).findBy('number', this.get('versionNumber')); }), + // Dependent keys can only go one level past an @each so an alias is needed + versionSubmitTime: alias('version.submitTime'), + placedCanaries: sumAggregation('taskGroupSummaries', 'placedCanaries'), desiredCanaries: sumAggregation('taskGroupSummaries', 'desiredCanaries'), desiredTotal: sumAggregation('taskGroupSummaries', 'desiredTotal'), diff --git a/ui/app/models/evaluation.js b/ui/app/models/evaluation.js index 8afdf15ae..5fcb3550a 100644 --- a/ui/app/models/evaluation.js +++ b/ui/app/models/evaluation.js @@ -1,12 +1,10 @@ -import Ember from 'ember'; +import { bool } from '@ember/object/computed'; import Model from 'ember-data/model'; import attr from 'ember-data/attr'; import { belongsTo } from 'ember-data/relationships'; import { fragmentArray } from 'ember-data-model-fragments/attributes'; import shortUUIDProperty from '../utils/properties/short-uuid'; -const { computed } = Ember; - export default Model.extend({ shortId: shortUUIDProperty('id'), priority: attr('number'), @@ -16,7 +14,7 @@ export default Model.extend({ statusDescription: attr('string'), failedTGAllocs: fragmentArray('placement-failure', { defaultValue: () => [] }), - hasPlacementFailures: computed.bool('failedTGAllocs.length'), + hasPlacementFailures: bool('failedTGAllocs.length'), // TEMPORARY: https://github.com/emberjs/data/issues/5209 originalJobId: attr('string'), diff --git a/ui/app/models/job.js b/ui/app/models/job.js index 4f33983ac..511f89856 100644 --- a/ui/app/models/job.js +++ b/ui/app/models/job.js @@ -1,12 +1,11 @@ -import Ember from 'ember'; +import { collect, sum, bool, equal } from '@ember/object/computed'; +import { computed } from '@ember/object'; import Model from 'ember-data/model'; import attr from 'ember-data/attr'; import { belongsTo, hasMany } from 'ember-data/relationships'; import { fragmentArray } from 'ember-data-model-fragments/attributes'; import sumAggregation from '../utils/properties/sum-aggregation'; -const { computed } = Ember; - export default Model.extend({ region: attr('string'), name: attr('string'), @@ -35,7 +34,7 @@ export default Model.extend({ failedAllocs: sumAggregation('taskGroupSummaries', 'failedAllocs'), lostAllocs: sumAggregation('taskGroupSummaries', 'lostAllocs'), - allocsList: computed.collect( + allocsList: collect( 'queuedAllocs', 'startingAllocs', 'runningAllocs', @@ -44,7 +43,7 @@ export default Model.extend({ 'lostAllocs' ), - totalAllocs: computed.sum('allocsList'), + totalAllocs: sum('allocsList'), pendingChildren: attr('number'), runningChildren: attr('number'), @@ -56,7 +55,7 @@ export default Model.extend({ evaluations: hasMany('evaluations'), namespace: belongsTo('namespace'), - hasPlacementFailures: computed.bool('latestFailureEvaluation'), + hasPlacementFailures: bool('latestFailureEvaluation'), latestEvaluation: computed('evaluations.@each.modifyIndex', 'evaluations.isPending', function() { const evaluations = this.get('evaluations'); @@ -82,7 +81,7 @@ export default Model.extend({ } ), - supportsDeployments: computed.equal('type', 'service'), + supportsDeployments: equal('type', 'service'), runningDeployment: computed('deployments.@each.status', function() { return this.get('deployments').findBy('status', 'running'); diff --git a/ui/app/models/namespace.js b/ui/app/models/namespace.js index 7b05135e8..b5b5f5750 100644 --- a/ui/app/models/namespace.js +++ b/ui/app/models/namespace.js @@ -1,11 +1,9 @@ -import Ember from 'ember'; +import { readOnly } from '@ember/object/computed'; import Model from 'ember-data/model'; import attr from 'ember-data/attr'; -const { computed } = Ember; - export default Model.extend({ - name: computed.readOnly('id'), + name: readOnly('id'), hash: attr('string'), description: attr('string'), }); diff --git a/ui/app/models/node-attributes.js b/ui/app/models/node-attributes.js index 6bfaba7ca..c893d8500 100644 --- a/ui/app/models/node-attributes.js +++ b/ui/app/models/node-attributes.js @@ -1,9 +1,8 @@ -import Ember from 'ember'; +import { get, computed } from '@ember/object'; import attr from 'ember-data/attr'; import Fragment from 'ember-data-model-fragments/fragment'; import flat from 'npm:flat'; -const { computed, get } = Ember; const { unflatten } = flat; export default Fragment.extend({ @@ -12,10 +11,12 @@ export default Fragment.extend({ attributesStructured: computed('attributes', function() { // `unflatten` doesn't sort keys before unflattening, so manual preprocessing is necessary. const original = this.get('attributes'); - const attrs = Object.keys(original).sort().reduce((obj, key) => { - obj[key] = original[key]; - return obj; - }, {}); + const attrs = Object.keys(original) + .sort() + .reduce((obj, key) => { + obj[key] = original[key]; + return obj; + }, {}); return unflatten(attrs, { overwrite: true }); }), diff --git a/ui/app/models/node.js b/ui/app/models/node.js index 6966acfb9..56e489e1d 100644 --- a/ui/app/models/node.js +++ b/ui/app/models/node.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { computed } from '@ember/object'; import Model from 'ember-data/model'; import attr from 'ember-data/attr'; import { hasMany } from 'ember-data/relationships'; @@ -6,8 +6,6 @@ import { fragment } from 'ember-data-model-fragments/attributes'; import shortUUIDProperty from '../utils/properties/short-uuid'; import ipParts from '../utils/ip-parts'; -const { computed } = Ember; - export default Model.extend({ // Available from list response name: attr('string'), diff --git a/ui/app/models/task-event.js b/ui/app/models/task-event.js index 1a26daadc..3d6f464f3 100644 --- a/ui/app/models/task-event.js +++ b/ui/app/models/task-event.js @@ -1,10 +1,9 @@ -import Ember from 'ember'; +import { computed } from '@ember/object'; import Fragment from 'ember-data-model-fragments/fragment'; import attr from 'ember-data/attr'; import { fragmentOwner } from 'ember-data-model-fragments/attributes'; import moment from 'moment'; -const { computed } = Ember; const displayProps = [ 'message', 'validationError', diff --git a/ui/app/models/task-group-deployment-summary.js b/ui/app/models/task-group-deployment-summary.js index 9a6b0eab3..9d5c04035 100644 --- a/ui/app/models/task-group-deployment-summary.js +++ b/ui/app/models/task-group-deployment-summary.js @@ -1,10 +1,8 @@ -import Ember from 'ember'; +import { gt } from '@ember/object/computed'; import Fragment from 'ember-data-model-fragments/fragment'; import attr from 'ember-data/attr'; import { fragmentOwner } from 'ember-data-model-fragments/attributes'; -const { computed } = Ember; - export default Fragment.extend({ deployment: fragmentOwner(), @@ -12,7 +10,7 @@ export default Fragment.extend({ autoRevert: attr('boolean'), promoted: attr('boolean'), - requiresPromotion: computed.gt('desiredCanaries', 0), + requiresPromotion: gt('desiredCanaries', 0), placedCanaries: attr('number'), desiredCanaries: attr('number'), diff --git a/ui/app/models/task-group-summary.js b/ui/app/models/task-group-summary.js index 5d937f73b..9e713b8ab 100644 --- a/ui/app/models/task-group-summary.js +++ b/ui/app/models/task-group-summary.js @@ -1,10 +1,8 @@ -import Ember from 'ember'; +import { collect, sum } from '@ember/object/computed'; import Fragment from 'ember-data-model-fragments/fragment'; import attr from 'ember-data/attr'; import { fragmentOwner } from 'ember-data-model-fragments/attributes'; -const { computed } = Ember; - export default Fragment.extend({ job: fragmentOwner(), name: attr('string'), @@ -16,7 +14,7 @@ export default Fragment.extend({ failedAllocs: attr('number'), lostAllocs: attr('number'), - allocsList: computed.collect( + allocsList: collect( 'queuedAllocs', 'startingAllocs', 'runningAllocs', @@ -25,5 +23,5 @@ export default Fragment.extend({ 'lostAllocs' ), - totalAllocs: computed.sum('allocsList'), + totalAllocs: sum('allocsList'), }); diff --git a/ui/app/models/task-group.js b/ui/app/models/task-group.js index b3998a4cd..e5ea67d0e 100644 --- a/ui/app/models/task-group.js +++ b/ui/app/models/task-group.js @@ -1,11 +1,9 @@ -import Ember from 'ember'; +import { computed } from '@ember/object'; import Fragment from 'ember-data-model-fragments/fragment'; import attr from 'ember-data/attr'; import { fragmentOwner, fragmentArray } from 'ember-data-model-fragments/attributes'; import sumAggregation from '../utils/properties/sum-aggregation'; -const { computed } = Ember; - export default Fragment.extend({ job: fragmentOwner(), diff --git a/ui/app/models/task-state.js b/ui/app/models/task-state.js index a5b3bff22..217e87459 100644 --- a/ui/app/models/task-state.js +++ b/ui/app/models/task-state.js @@ -1,10 +1,9 @@ -import Ember from 'ember'; +import { none } from '@ember/object/computed'; +import { computed } from '@ember/object'; import Fragment from 'ember-data-model-fragments/fragment'; import attr from 'ember-data/attr'; import { fragment, fragmentOwner, fragmentArray } from 'ember-data-model-fragments/attributes'; -const { computed } = Ember; - export default Fragment.extend({ name: attr('string'), state: attr('string'), @@ -12,7 +11,7 @@ export default Fragment.extend({ finishedAt: attr('date'), failed: attr('boolean'), - isActive: computed.none('finishedAt'), + isActive: none('finishedAt'), allocation: fragmentOwner(), task: computed('allocation.taskGroup.tasks.[]', function() { diff --git a/ui/app/models/token.js b/ui/app/models/token.js index 07243dd8a..37db199ae 100644 --- a/ui/app/models/token.js +++ b/ui/app/models/token.js @@ -1,10 +1,8 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; import Model from 'ember-data/model'; import attr from 'ember-data/attr'; import { hasMany } from 'ember-data/relationships'; -const { computed } = Ember; - export default Model.extend({ secret: attr('string'), name: attr('string'), @@ -14,5 +12,5 @@ export default Model.extend({ policies: hasMany('policy'), policyNames: attr(), - accessor: computed.alias('id'), + accessor: alias('id'), }); diff --git a/ui/app/router.js b/ui/app/router.js index bddf8813d..494a2173d 100644 --- a/ui/app/router.js +++ b/ui/app/router.js @@ -1,7 +1,7 @@ -import Ember from 'ember'; +import EmberRouter from '@ember/routing/router'; import config from './config/environment'; -const Router = Ember.Router.extend({ +const Router = EmberRouter.extend({ location: config.locationType, rootURL: config.rootURL, }); diff --git a/ui/app/routes/allocations/allocation.js b/ui/app/routes/allocations/allocation.js index 60eff663b..17aa8b10c 100644 --- a/ui/app/routes/allocations/allocation.js +++ b/ui/app/routes/allocations/allocation.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; +import Route from '@ember/routing/route'; import WithModelErrorHandling from 'nomad-ui/mixins/with-model-error-handling'; -const { Route } = Ember; - export default Route.extend(WithModelErrorHandling); diff --git a/ui/app/routes/allocations/allocation/task.js b/ui/app/routes/allocations/allocation/task.js index 4a57f1ad2..dcf2bda10 100644 --- a/ui/app/routes/allocations/allocation/task.js +++ b/ui/app/routes/allocations/allocation/task.js @@ -1,9 +1,9 @@ -import Ember from 'ember'; - -const { Route, inject, Error: EmberError } = Ember; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; +import EmberError from '@ember/error'; export default Route.extend({ - store: inject.service(), + store: service(), model({ name }) { const allocation = this.modelFor('allocations.allocation'); diff --git a/ui/app/routes/allocations/allocation/task/logs.js b/ui/app/routes/allocations/allocation/task/logs.js index 5e4767eb5..399258f21 100644 --- a/ui/app/routes/allocations/allocation/task/logs.js +++ b/ui/app/routes/allocations/allocation/task/logs.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Route } = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ model() { diff --git a/ui/app/routes/application.js b/ui/app/routes/application.js index 0a2e57c39..f7437a18c 100644 --- a/ui/app/routes/application.js +++ b/ui/app/routes/application.js @@ -1,9 +1,8 @@ -import Ember from 'ember'; - -const { Route, inject } = Ember; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; export default Route.extend({ - config: inject.service(), + config: service(), resetController(controller, isExiting) { if (isExiting) { diff --git a/ui/app/routes/clients.js b/ui/app/routes/clients.js index f2915a3a9..49559c8c9 100644 --- a/ui/app/routes/clients.js +++ b/ui/app/routes/clients.js @@ -1,12 +1,12 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; +import RSVP from 'rsvp'; import WithForbiddenState from 'nomad-ui/mixins/with-forbidden-state'; import notifyForbidden from 'nomad-ui/utils/notify-forbidden'; -const { Route, inject, RSVP } = Ember; - export default Route.extend(WithForbiddenState, { - store: inject.service(), - system: inject.service(), + store: service(), + system: service(), beforeModel() { return this.get('system.leader'); diff --git a/ui/app/routes/clients/client.js b/ui/app/routes/clients/client.js index 9571d975a..1be621e47 100644 --- a/ui/app/routes/clients/client.js +++ b/ui/app/routes/clients/client.js @@ -1,10 +1,9 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; import notifyError from 'nomad-ui/utils/notify-error'; -const { Route, inject } = Ember; - export default Route.extend({ - store: inject.service(), + store: service(), model() { return this._super(...arguments).catch(notifyError(this)); diff --git a/ui/app/routes/freestyle.js b/ui/app/routes/freestyle.js new file mode 100644 index 000000000..21534ffe7 --- /dev/null +++ b/ui/app/routes/freestyle.js @@ -0,0 +1,18 @@ +import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; +import RSVP from 'rsvp'; + +export default Route.extend({ + emberFreestyle: service(), + + beforeModel() { + let emberFreestyle = this.get('emberFreestyle'); + + return emberFreestyle.ensureHljs().then(() => { + return RSVP.all([ + emberFreestyle.ensureHljsLanguage('handlebars'), + emberFreestyle.ensureHljsLanguage('htmlbars'), + ]); + }); + }, +}); diff --git a/ui/app/routes/index.js b/ui/app/routes/index.js index f07c338c8..7de6fff38 100644 --- a/ui/app/routes/index.js +++ b/ui/app/routes/index.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Route } = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ redirect() { diff --git a/ui/app/routes/jobs.js b/ui/app/routes/jobs.js index 9d51a55b6..745e326e2 100644 --- a/ui/app/routes/jobs.js +++ b/ui/app/routes/jobs.js @@ -1,12 +1,12 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; +import { run } from '@ember/runloop'; import WithForbiddenState from 'nomad-ui/mixins/with-forbidden-state'; import notifyForbidden from 'nomad-ui/utils/notify-forbidden'; -const { Route, inject, run } = Ember; - export default Route.extend(WithForbiddenState, { - system: inject.service(), - store: inject.service(), + system: service(), + store: service(), beforeModel() { return this.get('system.namespaces'); diff --git a/ui/app/routes/jobs/index.js b/ui/app/routes/jobs/index.js index 8962abd90..0a8317fea 100644 --- a/ui/app/routes/jobs/index.js +++ b/ui/app/routes/jobs/index.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Route } = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ actions: { diff --git a/ui/app/routes/jobs/job.js b/ui/app/routes/jobs/job.js index 4317a1e35..558ea55e4 100644 --- a/ui/app/routes/jobs/job.js +++ b/ui/app/routes/jobs/job.js @@ -1,10 +1,10 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; +import RSVP from 'rsvp'; import notifyError from 'nomad-ui/utils/notify-error'; -const { Route, RSVP, inject } = Ember; - export default Route.extend({ - store: inject.service(), + store: service(), serialize(model) { return { job_name: model.get('plainId') }; @@ -13,7 +13,7 @@ export default Route.extend({ model(params, transition) { const namespace = transition.queryParams.namespace || this.get('system.activeNamespace.id'); const name = params.job_name; - const fullId = JSON.stringify([name, namespace]); + const fullId = JSON.stringify([name, namespace || 'default']); return this.get('store') .findRecord('job', fullId, { reload: true }) .then(job => { diff --git a/ui/app/routes/jobs/job/definition.js b/ui/app/routes/jobs/job/definition.js index 4f24dbc60..8730f83b8 100644 --- a/ui/app/routes/jobs/job/definition.js +++ b/ui/app/routes/jobs/job/definition.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Route } = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ model() { diff --git a/ui/app/routes/jobs/job/deployments.js b/ui/app/routes/jobs/job/deployments.js index a048c898a..41363eff6 100644 --- a/ui/app/routes/jobs/job/deployments.js +++ b/ui/app/routes/jobs/job/deployments.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { Route, RSVP } = Ember; +import Route from '@ember/routing/route'; +import RSVP from 'rsvp'; export default Route.extend({ model() { diff --git a/ui/app/routes/jobs/job/task-group.js b/ui/app/routes/jobs/job/task-group.js index 2be6107ab..def6e57ea 100644 --- a/ui/app/routes/jobs/job/task-group.js +++ b/ui/app/routes/jobs/job/task-group.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Route } = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ model({ name }) { diff --git a/ui/app/routes/jobs/job/versions.js b/ui/app/routes/jobs/job/versions.js index 637d663c3..6debc85db 100644 --- a/ui/app/routes/jobs/job/versions.js +++ b/ui/app/routes/jobs/job/versions.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { Route } = Ember; +import Route from '@ember/routing/route'; export default Route.extend({ model() { diff --git a/ui/app/routes/not-found.js b/ui/app/routes/not-found.js index 1974ee9ba..a7df89c01 100644 --- a/ui/app/routes/not-found.js +++ b/ui/app/routes/not-found.js @@ -1,6 +1,5 @@ -import Ember from 'ember'; - -const { Route, Error: EmberError } = Ember; +import Route from '@ember/routing/route'; +import EmberError from '@ember/error'; export default Route.extend({ model() { diff --git a/ui/app/routes/servers.js b/ui/app/routes/servers.js index f2915a3a9..49559c8c9 100644 --- a/ui/app/routes/servers.js +++ b/ui/app/routes/servers.js @@ -1,12 +1,12 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import Route from '@ember/routing/route'; +import RSVP from 'rsvp'; import WithForbiddenState from 'nomad-ui/mixins/with-forbidden-state'; import notifyForbidden from 'nomad-ui/utils/notify-forbidden'; -const { Route, inject, RSVP } = Ember; - export default Route.extend(WithForbiddenState, { - store: inject.service(), - system: inject.service(), + store: service(), + system: service(), beforeModel() { return this.get('system.leader'); diff --git a/ui/app/routes/servers/server.js b/ui/app/routes/servers/server.js index 60eff663b..17aa8b10c 100644 --- a/ui/app/routes/servers/server.js +++ b/ui/app/routes/servers/server.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; +import Route from '@ember/routing/route'; import WithModelErrorHandling from 'nomad-ui/mixins/with-model-error-handling'; -const { Route } = Ember; - export default Route.extend(WithModelErrorHandling); diff --git a/ui/app/serializers/allocation.js b/ui/app/serializers/allocation.js index 33cb3ebf5..8a7a5d43b 100644 --- a/ui/app/serializers/allocation.js +++ b/ui/app/serializers/allocation.js @@ -1,10 +1,9 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import { get } from '@ember/object'; import ApplicationSerializer from './application'; -const { get, inject } = Ember; - export default ApplicationSerializer.extend({ - system: inject.service(), + system: service(), attrs: { taskGroupName: 'TaskGroup', diff --git a/ui/app/serializers/application.js b/ui/app/serializers/application.js index bdec30fc1..3d63f5b63 100644 --- a/ui/app/serializers/application.js +++ b/ui/app/serializers/application.js @@ -1,8 +1,6 @@ -import Ember from 'ember'; +import { makeArray } from '@ember/array'; import JSONSerializer from 'ember-data/serializers/json'; -const { makeArray } = Ember; - export default JSONSerializer.extend({ primaryKey: 'ID', diff --git a/ui/app/serializers/deployment.js b/ui/app/serializers/deployment.js index 04e5475a0..2a21f484e 100644 --- a/ui/app/serializers/deployment.js +++ b/ui/app/serializers/deployment.js @@ -1,8 +1,7 @@ -import Ember from 'ember'; +import { get } from '@ember/object'; +import { assign } from '@ember/polyfills'; import ApplicationSerializer from './application'; -const { get, assign } = Ember; - export default ApplicationSerializer.extend({ attrs: { versionNumber: 'JobVersion', diff --git a/ui/app/serializers/evaluation.js b/ui/app/serializers/evaluation.js index 76a2b9b3c..e5faad410 100644 --- a/ui/app/serializers/evaluation.js +++ b/ui/app/serializers/evaluation.js @@ -1,10 +1,10 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; +import { get } from '@ember/object'; +import { assign } from '@ember/polyfills'; import ApplicationSerializer from './application'; -const { inject, get, assign } = Ember; - export default ApplicationSerializer.extend({ - system: inject.service(), + system: service(), normalize(typeHash, hash) { hash.FailedTGAllocs = Object.keys(hash.FailedTGAllocs || {}).map(key => { diff --git a/ui/app/serializers/job-version.js b/ui/app/serializers/job-version.js index 490b6d740..f05809b3f 100644 --- a/ui/app/serializers/job-version.js +++ b/ui/app/serializers/job-version.js @@ -1,8 +1,6 @@ -import Ember from 'ember'; +import { assign } from '@ember/polyfills'; import ApplicationSerializer from './application'; -const { assign } = Ember; - export default ApplicationSerializer.extend({ attrs: { number: 'Version', diff --git a/ui/app/serializers/job.js b/ui/app/serializers/job.js index 74eeb78b0..e09c95cd8 100644 --- a/ui/app/serializers/job.js +++ b/ui/app/serializers/job.js @@ -1,9 +1,8 @@ -import Ember from 'ember'; +import { get } from '@ember/object'; +import { assign } from '@ember/polyfills'; import ApplicationSerializer from './application'; import queryString from 'npm:query-string'; -const { get, assign } = Ember; - export default ApplicationSerializer.extend({ attrs: { parameterized: 'ParameterizedJob', diff --git a/ui/app/serializers/node.js b/ui/app/serializers/node.js index 376f15d12..e0ecfc9a7 100644 --- a/ui/app/serializers/node.js +++ b/ui/app/serializers/node.js @@ -1,10 +1,8 @@ -import Ember from 'ember'; +import { inject as service } from '@ember/service'; import ApplicationSerializer from './application'; -const { inject } = Ember; - export default ApplicationSerializer.extend({ - config: inject.service(), + config: service(), attrs: { httpAddr: 'HTTPAddr', diff --git a/ui/app/serializers/task-group.js b/ui/app/serializers/task-group.js index 107ddf11e..a834250c9 100644 --- a/ui/app/serializers/task-group.js +++ b/ui/app/serializers/task-group.js @@ -1,8 +1,6 @@ -import Ember from 'ember'; +import { copy } from '@ember/object/internals'; import ApplicationSerializer from './application'; -const { copy } = Ember; - export default ApplicationSerializer.extend({ normalize(typeHash, hash) { // Provide EphemeralDisk to each task diff --git a/ui/app/serializers/token.js b/ui/app/serializers/token.js index ede185aed..7ac46e611 100644 --- a/ui/app/serializers/token.js +++ b/ui/app/serializers/token.js @@ -1,8 +1,6 @@ -import Ember from 'ember'; +import { copy } from '@ember/object/internals'; import ApplicationSerializer from './application'; -const { copy } = Ember; - export default ApplicationSerializer.extend({ primaryKey: 'AccessorID', diff --git a/ui/app/services/config.js b/ui/app/services/config.js index 2c586d97c..80e38e1ea 100644 --- a/ui/app/services/config.js +++ b/ui/app/services/config.js @@ -1,14 +1,14 @@ -import Ember from 'ember'; +import { equal } from '@ember/object/computed'; +import Service from '@ember/service'; +import { get } from '@ember/object'; import config from '../config/environment'; -const { Service, get, computed } = Ember; - export default Service.extend({ unknownProperty(path) { return get(config, path); }, - isDev: computed.equal('environment', 'development'), - isProd: computed.equal('environment', 'production'), - isTest: computed.equal('environment', 'test'), + isDev: equal('environment', 'development'), + isProd: equal('environment', 'production'), + isTest: equal('environment', 'test'), }); diff --git a/ui/app/services/ember-freestyle.js b/ui/app/services/ember-freestyle.js index fa276c8d9..a30217765 100644 --- a/ui/app/services/ember-freestyle.js +++ b/ui/app/services/ember-freestyle.js @@ -1,5 +1,5 @@ import EmberFreestyle from 'ember-freestyle/services/ember-freestyle'; export default EmberFreestyle.extend({ - defaultTheme: 'monokai-sublime', + defaultTheme: 'solarized-light', }); diff --git a/ui/app/services/system.js b/ui/app/services/system.js index 111e3bfc2..558b411a9 100644 --- a/ui/app/services/system.js +++ b/ui/app/services/system.js @@ -1,12 +1,11 @@ -import Ember from 'ember'; +import Service, { inject as service } from '@ember/service'; +import { computed } from '@ember/object'; import PromiseObject from '../utils/classes/promise-object'; import { namespace } from '../adapters/application'; -const { Service, computed, inject } = Ember; - export default Service.extend({ - token: inject.service(), - store: inject.service(), + token: service(), + store: service(), leader: computed(function() { const token = this.get('token'); diff --git a/ui/app/services/token.js b/ui/app/services/token.js index d51d7510b..4ce27d9c3 100644 --- a/ui/app/services/token.js +++ b/ui/app/services/token.js @@ -1,8 +1,8 @@ -import Ember from 'ember'; +import Service from '@ember/service'; +import { computed } from '@ember/object'; +import { assign } from '@ember/polyfills'; import fetch from 'nomad-ui/utils/fetch'; -const { Service, computed, assign } = Ember; - export default Service.extend({ secret: computed({ get() { diff --git a/ui/app/styles/app.scss b/ui/app/styles/app.scss index 444a30182..952709aee 100644 --- a/ui/app/styles/app.scss +++ b/ui/app/styles/app.scss @@ -1,5 +1,8 @@ -@import "./core"; -@import "./components"; -@import "./charts"; +@import './core'; +@import './components'; +@import './charts'; -@import "ember-power-select"; +@import 'ember-power-select'; + +// Only necessary in dev +@import './styleguide.scss'; diff --git a/ui/app/styles/charts/colors.scss b/ui/app/styles/charts/colors.scss index 4f3c6335f..e204c723f 100644 --- a/ui/app/styles/charts/colors.scss +++ b/ui/app/styles/charts/colors.scss @@ -10,7 +10,8 @@ $lost: $dark; fill: $queued; } - .starting, .pending { + .starting, + .pending { .layer-0 { fill: $starting; } @@ -58,7 +59,8 @@ $lost: $dark; background: $queued; } - &.starting, &.pending { + &.starting, + &.pending { background: repeating-linear-gradient( -45deg, $starting, diff --git a/ui/app/styles/charts/distribution-bar.scss b/ui/app/styles/charts/distribution-bar.scss index a59c041fb..fcd4a7824 100644 --- a/ui/app/styles/charts/distribution-bar.scss +++ b/ui/app/styles/charts/distribution-bar.scss @@ -21,8 +21,7 @@ opacity: 0; } - $color-sequence: $orange, $yellow, $green, $turquoise, $blue, $purple, - $red; + $color-sequence: $orange, $yellow, $green, $turquoise, $blue, $purple, $red; @for $i from 1 through length($color-sequence) { .slice-#{$i - 1} { diff --git a/ui/app/styles/charts/tooltip.scss b/ui/app/styles/charts/tooltip.scss index c8e17f908..580e0ab3b 100644 --- a/ui/app/styles/charts/tooltip.scss +++ b/ui/app/styles/charts/tooltip.scss @@ -18,7 +18,7 @@ &::before { pointer-events: none; display: inline-block; - content: ""; + content: ''; width: 0; height: 0; border-top: 7px solid $grey; @@ -34,7 +34,7 @@ &::after { pointer-events: none; display: inline-block; - content: ""; + content: ''; width: 0; height: 0; border-top: 6px solid $white; diff --git a/ui/app/styles/components.scss b/ui/app/styles/components.scss index cb2162c2f..afd92f4e0 100644 --- a/ui/app/styles/components.scss +++ b/ui/app/styles/components.scss @@ -1,6 +1,5 @@ @import "./components/badge"; @import "./components/boxed-section"; -@import "./components/breadcrumbs"; @import "./components/cli-window"; @import "./components/ember-power-select"; @import "./components/empty-message"; @@ -12,6 +11,7 @@ @import "./components/loading-spinner"; @import "./components/metrics"; @import "./components/node-status-light"; +@import "./components/page-layout"; @import "./components/simple-list"; @import "./components/status-text"; @import "./components/timeline"; diff --git a/ui/app/styles/components/breadcrumbs.scss b/ui/app/styles/components/breadcrumbs.scss deleted file mode 100644 index c3ec634a6..000000000 --- a/ui/app/styles/components/breadcrumbs.scss +++ /dev/null @@ -1,26 +0,0 @@ -.breadcrumbs { - .breadcrumb { - color: $white; - opacity: 0.7; - text-decoration: none; - - + .breadcrumb { - margin-left: 15px; - &::before { - content: "/"; - color: $primary; - position: relative; - left: -7px; - } - } - - &:last-child { - opacity: 1; - } - } - - a.breadcrumb:hover { - color: $primary-invert; - opacity: 1; - } -} diff --git a/ui/app/styles/components/json-viewer.scss b/ui/app/styles/components/json-viewer.scss index dd215bc97..4c6b1431f 100644 --- a/ui/app/styles/components/json-viewer.scss +++ b/ui/app/styles/components/json-viewer.scss @@ -13,7 +13,9 @@ $url-color: blue ) { font-family: monospace; - &, a, a:hover { + &, + a, + a:hover { color: $default-color; text-decoration: none; } @@ -31,10 +33,10 @@ display: none; } &.json-formatter-object:after { - content: "No properties"; + content: 'No properties'; } &.json-formatter-array:after { - content: "[]"; + content: '[]'; } } } @@ -100,7 +102,7 @@ // Inline preview on hover (optional) > a > .json-formatter-preview-text { opacity: 0; - transition: opacity .15s ease-in; + transition: opacity 0.15s ease-in; font-style: italic; } diff --git a/ui/app/styles/core/page-layout.scss b/ui/app/styles/components/page-layout.scss similarity index 92% rename from ui/app/styles/core/page-layout.scss rename to ui/app/styles/components/page-layout.scss index 26c8de78e..d463be113 100644 --- a/ui/app/styles/core/page-layout.scss +++ b/ui/app/styles/components/page-layout.scss @@ -1,8 +1,3 @@ -html, body, body > .ember-view { - height: 100%; - width: 100%; -} - .page-layout { height: 100%; display: flex; diff --git a/ui/app/styles/components/timeline.scss b/ui/app/styles/components/timeline.scss index bc3ab077a..553257c6c 100644 --- a/ui/app/styles/components/timeline.scss +++ b/ui/app/styles/components/timeline.scss @@ -4,7 +4,7 @@ z-index: $z-base; &::before { - content: " "; + content: ' '; position: absolute; display: block; top: 0; @@ -32,7 +32,7 @@ } &::before { - content: " "; + content: ' '; position: absolute; display: block; width: 10px; diff --git a/ui/app/styles/components/tooltip.scss b/ui/app/styles/components/tooltip.scss index bcb851033..68842c133 100644 --- a/ui/app/styles/components/tooltip.scss +++ b/ui/app/styles/components/tooltip.scss @@ -31,7 +31,7 @@ pointer-events: none; display: block; opacity: 0; - content: ""; + content: ''; width: 0; height: 0; border-top: 6px solid $black; diff --git a/ui/app/styles/core.scss b/ui/app/styles/core.scss index 3021d6be0..e4391415b 100644 --- a/ui/app/styles/core.scss +++ b/ui/app/styles/core.scss @@ -1,60 +1,28 @@ // Utils +@import "./utils/reset.scss"; @import "./utils/z-indices"; +@import "./utils/product-colors"; +@import "./utils/bumper"; // Start with Bulma variables as a foundation @import "bulma/sass/utilities/initial-variables"; // Override variables where appropriate -@import "./utils/product-colors"; - -$orange: #fa8e23; -$green: #2eb039; -$blue: $vagrant-blue; -$purple: $terraform-purple; -$red: #c84034; -$grey-blue: #bbc4d1; - -$primary: $nomad-green; -$warning: $orange; -$warning-invert: $white; -$danger: $red; -$dark: #234; - -$radius: 2px; - -$body-size: 14px; -$title-size: 1.75rem; -$size-5: 1.15rem; -$size-4: 1.3rem; -$size-7: 0.85rem; - -$title-weight: $weight-semibold; - -$family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, - Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; - -$text: $black; - -$header-height: 112px; -$gutter-width: 250px; - -$icon-dimensions: 1.25rem; -$icon-dimensions-small: 1rem; -$icon-dimensions-medium: 1.5rem; -$icon-dimensions-large: 2.5rem; +@import "./core/variables.scss"; // Bring in the rest of Bulma @import "bulma/bulma"; // Override Bulma details where appropriate @import "./core/buttons"; +@import "./core/breadcrumb"; @import "./core/columns"; @import "./core/forms"; @import "./core/icon"; @import "./core/level"; @import "./core/menu"; @import "./core/message"; -@import "./core/nav"; +@import "./core/navbar"; @import "./core/notification"; @import "./core/pagination"; @import "./core/progress"; @@ -64,7 +32,3 @@ $icon-dimensions-large: 2.5rem; @import "./core/tag"; @import "./core/title"; @import "./core/typography"; - -// Add unique core extensions -@import "./core/page-layout"; -@import "./core/bumper"; diff --git a/ui/app/styles/core/breadcrumb.scss b/ui/app/styles/core/breadcrumb.scss new file mode 100644 index 000000000..182decee3 --- /dev/null +++ b/ui/app/styles/core/breadcrumb.scss @@ -0,0 +1,15 @@ +.breadcrumb { + a { + text-decoration: none; + opacity: 0.7; + + &:hover { + text-decoration: none; + opacity: 1; + } + } + + li.is-active a { + opacity: 1; + } +} diff --git a/ui/app/styles/core/forms.scss b/ui/app/styles/core/forms.scss index 741dd892e..19ad29950 100644 --- a/ui/app/styles/core/forms.scss +++ b/ui/app/styles/core/forms.scss @@ -4,7 +4,12 @@ border-color: $grey-blue; color: $text; - &:hover, &.is-hovered, &:active, &.is-active, &:focus, &.is-focused { + &:hover, + &.is-hovered, + &:active, + &.is-active, + &:focus, + &.is-focused { border-color: darken($grey-blue, 5%); } @@ -14,7 +19,8 @@ } } -.input, .textarea { +.input, +.textarea { @include input; box-shadow: none; padding: 0.75em 1.5em; diff --git a/ui/app/styles/core/message.scss b/ui/app/styles/core/message.scss index b5e71e6b7..dba6ffa4b 100644 --- a/ui/app/styles/core/message.scss +++ b/ui/app/styles/core/message.scss @@ -1,8 +1,8 @@ .message { - background: $body-background; + background: $body-background-color; .message-header { - background: $body-background; + background: $body-background-color; color: $text; font-size: $size-5; font-weight: $weight-semibold; diff --git a/ui/app/styles/core/nav.scss b/ui/app/styles/core/navbar.scss similarity index 71% rename from ui/app/styles/core/nav.scss rename to ui/app/styles/core/navbar.scss index b1c6d6079..39232665d 100644 --- a/ui/app/styles/core/nav.scss +++ b/ui/app/styles/core/navbar.scss @@ -1,21 +1,18 @@ -.nav { +.navbar { &.is-primary { - background: linear-gradient( - to right, - $nomad-green-darker, - $nomad-green-dark - ); + background: linear-gradient(to right, $nomad-green-darker, $nomad-green-dark); height: 3.5rem; color: $primary-invert; padding-left: 20px; padding-right: 20px; - .nav-item { + .navbar-item { color: rgba($primary-invert, 0.8); text-decoration: none; &:hover { color: $primary-invert; + background: transparent; } &.is-active, @@ -24,14 +21,14 @@ border-bottom-color: $primary-invert; } - + .nav-item { + + .navbar-item { position: relative; &::before { width: 1px; height: 1em; background: rgba($primary-invert, 0.5); - content: " "; + content: ' '; display: block; position: absolute; left: 0px; @@ -44,6 +41,15 @@ max-height: 26px; } } + + .navbar-end > a.navbar-item { + color: rgba($primary-invert, 0.8); + + &:hover { + color: $primary-invert; + background: transparent; + } + } } &.is-secondary { @@ -53,12 +59,12 @@ font-weight: $weight-semibold; color: $primary-invert; - .nav-item { + .navbar-item { font-size: $size-4; } } - .nav-item { + .navbar-item { &.is-gutter { width: $gutter-width; } diff --git a/ui/app/styles/core/table.scss b/ui/app/styles/core/table.scss index 171379635..ecfacdd86 100644 --- a/ui/app/styles/core/table.scss +++ b/ui/app/styles/core/table.scss @@ -3,6 +3,7 @@ border-radius: $radius; border: 1px solid $grey-blue; border-collapse: separate; + width: 100%; &.is-fixed { table-layout: fixed; @@ -146,7 +147,7 @@ position: relative; &::after { - content: ""; + content: ''; width: 10px; right: 1.5em; top: 0.75em; @@ -156,11 +157,11 @@ } &.asc::after { - content: "⬇"; + content: '⬇'; } &.desc::after { - content: "⬆"; + content: '⬆'; } } @@ -185,7 +186,7 @@ &::after { position: absolute; - content: ""; + content: ''; width: 3px; top: 0; bottom: 0; diff --git a/ui/app/styles/core/tag.scss b/ui/app/styles/core/tag.scss index de4f25c74..cbf2bbe3b 100644 --- a/ui/app/styles/core/tag.scss +++ b/ui/app/styles/core/tag.scss @@ -1,4 +1,6 @@ -.tag { +// Strange selector mirrors selector used in Bulma +// https://github.com/jgthms/bulma/issues/912 +.tag:not(body) { text-transform: uppercase; border-radius: 200px; font-weight: $weight-normal; diff --git a/ui/app/styles/core/variables.scss b/ui/app/styles/core/variables.scss new file mode 100644 index 000000000..bef639661 --- /dev/null +++ b/ui/app/styles/core/variables.scss @@ -0,0 +1,41 @@ +$orange: #fa8e23; +$green: #2eb039; +$blue: $vagrant-blue; +$purple: $terraform-purple; +$red: #c84034; +$grey-blue: #bbc4d1; + +$primary: $nomad-green; +$warning: $orange; +$warning-invert: $white; +$danger: $red; +$info: $blue; +$dark: #234; + +$radius: 2px; + +$body-size: 14px; +$title-size: 1.75rem; +$size-5: 1.15rem; +$size-4: 1.3rem; +$size-7: 0.85rem; + +$title-weight: $weight-semibold; + +$family-sans-serif: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, + Cantarell, 'Helvetica Neue', sans-serif; + +$text: $black; + +$header-height: 112px; +$gutter-width: 250px; + +$icon-dimensions: 1.25rem; +$icon-dimensions-small: 1rem; +$icon-dimensions-medium: 1.5rem; +$icon-dimensions-large: 2.5rem; + +$breadcrumb-item-color: $white; +$breadcrumb-item-hover-color: $white; +$breadcrumb-item-active-color: $white; +$breadcrumb-item-separator-color: $primary; diff --git a/ui/app/styles/styleguide.scss b/ui/app/styles/styleguide.scss new file mode 100644 index 000000000..f77df0655 --- /dev/null +++ b/ui/app/styles/styleguide.scss @@ -0,0 +1,44 @@ +#styleguide { + .mock-content { + display: flex; + height: 250px; + + .mock-image, + .mock-copy { + height: 100%; + width: 100%; + margin: 1em; + } + + .mock-image { + background: linear-gradient( + to top right, + transparent 0%, + transparent 49%, + $grey-blue 49%, + $grey-blue 51%, + transparent 51%, + transparent 100% + ), + linear-gradient( + to bottom right, + transparent 0%, + transparent 49%, + $grey-blue 49%, + $grey-blue 51%, + transparent 51%, + transparent 100% + ); + } + + .mock-copy { + background: repeating-linear-gradient( + to bottom, + $grey-blue, + $grey-blue 5px, + transparent 5px, + transparent 14px + ); + } + } +} diff --git a/ui/app/styles/core/bumper.scss b/ui/app/styles/utils/bumper.scss similarity index 100% rename from ui/app/styles/core/bumper.scss rename to ui/app/styles/utils/bumper.scss diff --git a/ui/app/styles/utils/product-colors.scss b/ui/app/styles/utils/product-colors.scss index 689b9e84e..bbf4b63aa 100644 --- a/ui/app/styles/utils/product-colors.scss +++ b/ui/app/styles/utils/product-colors.scss @@ -1,15 +1,15 @@ -$consul-pink: #FF0087; -$consul-pink-dark: #C62A71; +$consul-pink: #ff0087; +$consul-pink-dark: #c62a71; -$packer-blue: #1DAEFF; -$packer-blue-dark: #1D94DD; +$packer-blue: #1daeff; +$packer-blue-dark: #1d94dd; -$terraform-purple: #5C4EE5; -$terraform-purple-dark: #4040B2; +$terraform-purple: #5c4ee5; +$terraform-purple-dark: #4040b2; -$vagrant-blue: #1563FF; -$vagrant-blue-dark: #104EB2; +$vagrant-blue: #1563ff; +$vagrant-blue-dark: #104eb2; -$nomad-green: #25BA81; +$nomad-green: #25ba81; $nomad-green-dark: #1d9467; -$nomad-green-darker: #16704D; +$nomad-green-darker: #16704d; diff --git a/ui/app/styles/utils/reset.scss b/ui/app/styles/utils/reset.scss new file mode 100644 index 000000000..42d609252 --- /dev/null +++ b/ui/app/styles/utils/reset.scss @@ -0,0 +1,6 @@ +html, +body, +body > .ember-view { + height: 100%; + width: 100%; +} diff --git a/ui/app/templates/allocations/allocation/index.hbs b/ui/app/templates/allocations/allocation/index.hbs index 96cb194b5..9778b2637 100644 --- a/ui/app/templates/allocations/allocation/index.hbs +++ b/ui/app/templates/allocations/allocation/index.hbs @@ -1,25 +1,25 @@ {{#global-header class="page-header"}} - Allocations - {{#link-to "allocations.allocation" model class="breadcrumb"}} - {{model.shortId}} - {{/link-to}} +
  • Allocations
    • +
  • + {{#link-to "allocations.allocation" model}}{{model.shortId}}{{/link-to}} +
    • {{/global-header}} {{#gutter-menu class="page-body"}}
    -

    +

    Allocation {{model.name}} {{model.clientStatus}} {{model.id}}

    -
    +
    Allocation Details Job - {{#link-to "jobs.job" model.job (query-params jobNamespace=model.job.namespace.id)}}{{model.job.name}}{{/link-to}} + {{#link-to "jobs.job" model.job (query-params jobNamespace=model.job.namespace.id) data-test-job-link}}{{model.job.name}}{{/link-to}} Client - {{#link-to "clients.client" model.node}}{{model.node.shortId}}{{/link-to}} + {{#link-to "clients.client" model.node data-test-client-link}}{{model.node.shortId}}{{/link-to}}
    @@ -33,7 +33,7 @@ source=sortedStates sortProperty=sortProperty sortDescending=sortDescending - class="is-striped tasks" as |t|}} + class="is-striped" as |t|}} {{#t.head}} {{#t.sort-by prop="name"}}Name{{/t.sort-by}} {{#t.sort-by prop="state"}}State{{/t.sort-by}} @@ -42,22 +42,22 @@ Addresses {{/t.head}} {{#t.body as |row|}} - - + + {{#link-to "allocations.allocation.task" row.model.allocation row.model}} {{row.model.task.name}} {{/link-to}} - {{row.model.state}} - + {{row.model.state}} + {{#if row.model.events.lastObject.displayMessage}} {{row.model.events.lastObject.displayMessage}} {{else}} No message {{/if}} - {{moment-format row.model.events.lastObject.time "MM/DD/YY HH:mm:ss"}} - + {{moment-format row.model.events.lastObject.time "MM/DD/YY HH:mm:ss"}} + + +
    diff --git a/ui/app/templates/components/gutter-menu.hbs b/ui/app/templates/components/gutter-menu.hbs index 765b53ab9..055e8e323 100644 --- a/ui/app/templates/components/gutter-menu.hbs +++ b/ui/app/templates/components/gutter-menu.hbs @@ -9,6 +9,7 @@
  • {{#power-select + data-test-namespace-switcher options=sortedNamespaces selected=system.activeNamespace searchField="name" diff --git a/ui/app/templates/components/job-deployment.hbs b/ui/app/templates/components/job-deployment.hbs index 2d7a4cfd2..ad24f628f 100644 --- a/ui/app/templates/components/job-deployment.hbs +++ b/ui/app/templates/components/job-deployment.hbs @@ -1,20 +1,20 @@
    {{deployment.shortId}} - {{deployment.status}} + {{deployment.status}} {{#if deployment.requiresPromotion}} - Requires Promotion + Requires Promotion {{/if}} Version - #{{deployment.version.number}} - | {{moment-from-now deployment.version.submitTime}} + #{{deployment.version.number}} + | {{moment-from-now deployment.version.submitTime}} - +
    {{#if isOpen}} -
    +
    {{#job-deployment-details deployment=deployment as |d|}} {{d.metrics}} {{d.taskGroups}} diff --git a/ui/app/templates/components/job-deployment/deployment-allocations.hbs b/ui/app/templates/components/job-deployment/deployment-allocations.hbs index 938f0e79e..f42afdb83 100644 --- a/ui/app/templates/components/job-deployment/deployment-allocations.hbs +++ b/ui/app/templates/components/job-deployment/deployment-allocations.hbs @@ -1,4 +1,4 @@ -
    +
    Allocations
    @@ -17,7 +17,7 @@ Memory {{/t.head}} {{#t.body as |row|}} - {{allocation-row allocation=row.model context="job"}} + {{allocation-row data-test-deployment-allocation allocation=row.model context="job"}} {{/t.body}} {{/list-table}}
    diff --git a/ui/app/templates/components/job-deployment/deployment-metrics.hbs b/ui/app/templates/components/job-deployment/deployment-metrics.hbs index dae3390ab..a3c3ff585 100644 --- a/ui/app/templates/components/job-deployment/deployment-metrics.hbs +++ b/ui/app/templates/components/job-deployment/deployment-metrics.hbs @@ -3,37 +3,37 @@

    Canaries

    -

    {{deployment.placedCanaries}} / {{deployment.desiredCanaries}}

    +

    {{deployment.placedCanaries}} / {{deployment.desiredCanaries}}

    Placed

    -

    {{deployment.placedAllocs}}

    +

    {{deployment.placedAllocs}}

    Desired

    -

    {{deployment.desiredTotal}}

    +

    {{deployment.desiredTotal}}

    Healthy

    -

    {{deployment.healthyAllocs}}

    +

    {{deployment.healthyAllocs}}

    Unhealthy

    -

    {{deployment.unhealthyAllocs}}

    +

    {{deployment.unhealthyAllocs}}

    -
    +
    {{deployment.statusDescription}}
    diff --git a/ui/app/templates/components/job-deployment/task-groups.hbs b/ui/app/templates/components/job-deployment/task-groups.hbs index 1b0ebcc76..cee10994c 100644 --- a/ui/app/templates/components/job-deployment/task-groups.hbs +++ b/ui/app/templates/components/job-deployment/task-groups.hbs @@ -1,9 +1,10 @@ -
    +
    Task Groups
    {{#list-table + data-test-deployment-task-groups source=deployment.taskGroupSummaries class="task-groups" as |t|}} {{#t.head}} @@ -16,20 +17,20 @@ Unhealthy Allocs {{/t.head}} {{#t.body as |row|}} - - {{row.model.name}} - + + {{row.model.name}} + {{#if row.model.requiresPromotion}} {{if row.model.promoted "No" "Yes"}} {{else}} N/A {{/if}} - {{if row.model.autoRevert "Yes" "No"}} - {{or row.model.placedCanaries 0}} / {{row.model.desiredCanaries}} - {{row.model.placedAllocs}} / {{row.model.desiredTotal}} - {{row.model.healthyAllocs}} - {{row.model.unhealthyAllocs}} + {{if row.model.autoRevert "Yes" "No"}} + {{or row.model.placedCanaries 0}} / {{row.model.desiredCanaries}} + {{row.model.placedAllocs}} / {{row.model.desiredTotal}} + {{row.model.healthyAllocs}} + {{row.model.unhealthyAllocs}} {{/t.body}} {{/list-table}} diff --git a/ui/app/templates/components/job-deployments-stream.hbs b/ui/app/templates/components/job-deployments-stream.hbs index b92050b13..cf89df615 100644 --- a/ui/app/templates/components/job-deployments-stream.hbs +++ b/ui/app/templates/components/job-deployments-stream.hbs @@ -1,6 +1,6 @@ {{#each annotatedDeployments as |record|}} {{#if record.meta.showDate}} -
  • +
  • {{#if record.deployment.version.submitTime}} {{moment-format record.deployment.version.submitTime "MMMM D, YYYY"}} {{else}} @@ -8,7 +8,7 @@ {{/if}}
    • {{/if}} -
  • +
  • {{job-deployment deployment=record.deployment}}
    • {{/each}} diff --git a/ui/app/templates/components/job-diff-fields-and-objects.hbs b/ui/app/templates/components/job-diff-fields-and-objects.hbs index 7da3703c8..dfb51e6e4 100644 --- a/ui/app/templates/components/job-diff-fields-and-objects.hbs +++ b/ui/app/templates/components/job-diff-fields-and-objects.hbs @@ -1,9 +1,12 @@
    {{#each fields as |field|}} -
    +
    {{#if (eq (lowercase field.Type) "added")}} @@ -30,10 +33,13 @@
    {{#each objects as |object|}} -
    +
    {{#if (eq (lowercase object.Type) "added")}} + @@ -44,7 +50,7 @@ {{/if}} {{object.Name}} { -
    +
    {{job-diff-fields-and-objects fields=object.Fields objects=object.Objects}}
    } diff --git a/ui/app/templates/components/job-diff.hbs b/ui/app/templates/components/job-diff.hbs index 7a3311a50..543311238 100644 --- a/ui/app/templates/components/job-diff.hbs +++ b/ui/app/templates/components/job-diff.hbs @@ -1,10 +1,13 @@ {{!-- Job heading --}} -
    +
    {{#if (eq (lowercase diff.Type) "added")}} + @@ -19,14 +22,14 @@ {{!-- Show job field and object diffs if the job is edited --}} {{#if (or verbose (eq (lowercase diff.Type) "edited"))}} -
    +
    {{job-diff-fields-and-objects fields=diff.Fields objects=diff.Objects}}
    {{/if}} {{!-- Each task group --}} {{#each diff.TaskGroups as |group|}} -
    +
    {{job-diff-fields-and-objects fields=group.Fields objects=group.Objects}}
    {{/if}} {{!-- Each task --}} {{#each group.Tasks as |task|}} -
    +
    {{#if (eq (lowercase task.Type) "added")}} + diff --git a/ui/app/templates/components/job-row.hbs b/ui/app/templates/components/job-row.hbs index f18fcd3be..54032c664 100644 --- a/ui/app/templates/components/job-row.hbs +++ b/ui/app/templates/components/job-row.hbs @@ -1,16 +1,16 @@ -{{#link-to "jobs.job" job class="is-primary"}}{{job.name}}{{/link-to}} - +{{#link-to "jobs.job" job class="is-primary"}}{{job.name}}{{/link-to}} + {{job.status}} -{{job.type}} -{{job.priority}} - +{{job.type}} +{{job.priority}} + {{#if job.isReloading}} ... {{else}} {{job.taskGroups.length}} {{/if}} - +
    {{allocation-status-bar allocationContainer=job isNarrow=true}}
    diff --git a/ui/app/templates/components/job-version.hbs b/ui/app/templates/components/job-version.hbs index 6fc55a308..a60b40b70 100644 --- a/ui/app/templates/components/job-version.hbs +++ b/ui/app/templates/components/job-version.hbs @@ -1,12 +1,12 @@
    Version #{{version.number}} - + Stable - {{version.stable}} + {{version.stable}} - + Submitted - {{moment-format version.submitTime "MM/DD/YY HH:mm:ss"}} + {{moment-format version.submitTime "MM/DD/YY HH:mm:ss"}} {{#if version.diff}} diff --git a/ui/app/templates/components/job-versions-stream.hbs b/ui/app/templates/components/job-versions-stream.hbs index a9fc61720..30f3dabdc 100644 --- a/ui/app/templates/components/job-versions-stream.hbs +++ b/ui/app/templates/components/job-versions-stream.hbs @@ -1,10 +1,10 @@ {{#each annotatedVersions as |record|}} {{#if record.meta.showDate}} -
  • +
  • {{moment-format record.version.submitTime "MMMM D, YYYY"}}
    • {{/if}} -
  • +
  • {{job-version version=record.version verbose=verbose}}
    • {{/each}} diff --git a/ui/app/templates/components/server-agent-row.hbs b/ui/app/templates/components/server-agent-row.hbs index 6a5779b3d..e7e926dd6 100644 --- a/ui/app/templates/components/server-agent-row.hbs +++ b/ui/app/templates/components/server-agent-row.hbs @@ -1,6 +1,6 @@ -{{#link-to "servers.server" agent.id class="is-primary"}}{{agent.name}}{{/link-to}} -{{agent.status}} -{{if agent.isLeader "True" "False"}} -{{agent.address}} -{{agent.serfPort}} -{{agent.datacenter}} +{{#link-to "servers.server" agent.id class="is-primary"}}{{agent.name}}{{/link-to}} +{{agent.status}} +{{if agent.isLeader "True" "False"}} +{{agent.address}} +{{agent.serfPort}} +{{agent.datacenter}} diff --git a/ui/app/templates/components/task-group-row.hbs b/ui/app/templates/components/task-group-row.hbs index f37f720b2..4abd42d99 100644 --- a/ui/app/templates/components/task-group-row.hbs +++ b/ui/app/templates/components/task-group-row.hbs @@ -1,12 +1,12 @@ - + {{#link-to "jobs.job.task-group" taskGroup.job taskGroup class="is-primary"}} {{taskGroup.name}} {{/link-to}} -{{taskGroup.count}} - +{{taskGroup.count}} +
    {{allocation-status-bar allocationContainer=taskGroup.summary isNarrow=true}}
    -{{taskGroup.reservedCPU}} MHz -{{taskGroup.reservedMemory}} MiB -{{taskGroup.reservedEphemeralDisk}} MiB +{{taskGroup.reservedCPU}} MHz +{{taskGroup.reservedMemory}} MiB +{{taskGroup.reservedEphemeralDisk}} MiB diff --git a/ui/app/templates/components/task-log.hbs b/ui/app/templates/components/task-log.hbs index de1fef860..ce0d0ae9c 100644 --- a/ui/app/templates/components/task-log.hbs +++ b/ui/app/templates/components/task-log.hbs @@ -1,16 +1,16 @@
    - - + + - - - + +
    -
    - 
    {{logger.output}}
    +
    + 
    {{logger.output}}
    diff --git a/ui/app/templates/freestyle.hbs b/ui/app/templates/freestyle.hbs index 18f8a0ae1..a1398fcf0 100644 --- a/ui/app/templates/freestyle.hbs +++ b/ui/app/templates/freestyle.hbs @@ -1,120 +1,74 @@
    - {{#freestyle-guide title='Nomad UI'subtitle='Styles and Patterns'}} - {{#freestyle-section name='Buttons' as |section|}} - {{#freestyle-subsection name='Standard' section=section}} - {{#freestyle-usage 'buttons-standard' title='Standard Buttons'}} -
    - Button - White - Light - Dark - Black - Link -
    -
    - Primary - Info - Success - Warning - Danger -
    - {{/freestyle-usage}} - {{/freestyle-subsection}} + {{#freestyle-guide title='Nomad UI' subtitle='Styles and Patterns'}} + {{#freestyle-section name="Theme" as |section|}} + {{#section.subsection name="Font Stacks"}} + {{freestyle/sg-font-stacks}} + {{/section.subsection}} - {{#freestyle-subsection name='Outlines' section=section}} - {{#freestyle-usage 'buttons-outlines' title='Outline Buttons'}} -
    - Outlined - Primary - Info - Success - Warning - Danger -
    - {{/freestyle-usage}} - {{/freestyle-subsection}} + {{#section.subsection name="Text Sizing"}} + {{freestyle/sg-font-sizing}} + {{/section.subsection}} - {{#freestyle-subsection name='Hollow' section=section}} - {{#freestyle-usage 'buttons-hollow' title='Hollow Buttons'}} -
    - Primary - Info - Success - Warning - Danger -
    - {{/freestyle-usage}} - {{/freestyle-subsection}} - - {{#freestyle-subsection name='Sizing' section=section}} - {{#freestyle-usage 'buttons-sizing' title='Button Sizes'}} -
    - Small - Normal - Medium - Large -
    - {{/freestyle-usage}} - {{/freestyle-subsection}} + {{#section.subsection name="Colors"}} + {{freestyle/sg-colors}} + {{/section.subsection}} {{/freestyle-section}} - {{#freestyle-section name='Distribution Bar' as |section|}} - {{#freestyle-subsection name='Standard' section=section}} - {{#freestyle-usage 'distribution-bar-standard'}} -
    - {{distribution-bar data=distributionBarData}} -
    - {{/freestyle-usage}} - {{#freestyle-annotation}} -
    - The distribution bar chart proportionally show data in a single bar. It includes a tooltip out of the box, assumes the size of the container element, and is designed to be styled with CSS. -
    - {{/freestyle-annotation}} - {{/freestyle-subsection}} + {{#freestyle-section name="Components" as |section|}} + {{#section.subsection name="Boxed section"}} + {{freestyle/sg-boxed-section}} + {{/section.subsection}} - {{#freestyle-subsection name='With Classes' section=section}} - {{#freestyle-usage 'distribution-bar-with-classes'}} -
    - {{distribution-bar data=distributionBarDataWithClasses}} -
    - {{/freestyle-usage}} - {{#freestyle-annotation}} -
    - If a datum provides a className property, it will be assigned to the corresponding rect element, allowing for custom colorization. -
    - {{/freestyle-annotation}} - {{/freestyle-subsection}} + {{#section.subsection name="Breadcrumbs"}} + {{freestyle/sg-breadcrumbs}} + {{/section.subsection}} - {{#freestyle-subsection name='Flexible Sizing' section=section}} - {{#freestyle-usage 'distribution-bar-sizing-1'}} -
    - {{distribution-bar data=distributionBarData}} -
    - {{/freestyle-usage}} - {{#freestyle-usage 'distribution-bar-sizing-2'}} -
    - {{distribution-bar data=distributionBarData}} -
    - {{/freestyle-usage}} - {{#freestyle-annotation}} -
    - Distribution bar assumes the dimensions of the container. -
    - {{/freestyle-annotation}} - {{/freestyle-subsection}} + {{#section.subsection name="Buttons"}} + {{freestyle/sg-buttons}} + {{/section.subsection}} - {{#freestyle-subsection name='Updating Data' section=section}} - {{#freestyle-usage 'distribution-bar-updating'}} -
    - {{distribution-bar data=distributionBarDataRotating}} -
    - {{/freestyle-usage}} - {{#freestyle-annotation}} -
    - Distribution bar animates with data changes. -
    - {{/freestyle-annotation}} - {{/freestyle-subsection}} + {{#section.subsection name="Diff Viewer"}} + {{/section.subsection}} + {{#section.subsection name="Dropdown"}} + {{/section.subsection}} + {{#section.subsection name="Event stream"}} + {{/section.subsection}} + {{#section.subsection name="Gutter navigation"}} + {{/section.subsection}} + {{#section.subsection name="Header"}} + {{/section.subsection}} + {{#section.subsection name="Inline definitions"}} + {{/section.subsection}} + {{#section.subsection name="JSON Viewer"}} + {{/section.subsection}} + {{#section.subsection name="Log Stream"}} + {{/section.subsection}} + {{#section.subsection name="Metric"}} + {{/section.subsection}} + {{#section.subsection name="Page tabs"}} + {{/section.subsection}} + {{#section.subsection name="Page title"}} + {{/section.subsection}} + {{#section.subsection name="Search box"}} + {{/section.subsection}} + {{#section.subsection name="Table"}} + {{/section.subsection}} + {{#section.subsection name="Table, Configuration"}} + {{/section.subsection}} {{/freestyle-section}} -{{/freestyle-guide}} + + {{#freestyle-section name="Charts" as |section|}} + {{#section.subsection name="Distribution Bar"}} + {{freestyle/sg-distribution-bar}} + {{/section.subsection}} + + {{#section.subsection name="Jumbo Distribution Bar"}} + {{freestyle/sg-distribution-bar-jumbo}} + {{/section.subsection}} + + {{#section.subsection name="Progress Bar"}} + {{/section.subsection}} + {{/freestyle-section}} + {{/freestyle-guide}}
    + diff --git a/ui/app/templates/jobs/index.hbs b/ui/app/templates/jobs/index.hbs index 71f976903..9c8c93888 100644 --- a/ui/app/templates/jobs/index.hbs +++ b/ui/app/templates/jobs/index.hbs @@ -1,5 +1,7 @@ {{#global-header class="page-header"}} - Jobs +
  • + {{#link-to "jobs.index"}}Jobs{{/link-to}} +
    • {{/global-header}} {{#gutter-menu class="page-body" onNamespaceChange=(action "refresh")}}
    @@ -8,7 +10,7 @@ {{else}} {{#if filteredJobs.length}}
    -
    {{search-box searchTerm=(mut searchTerm) placeholder="Search jobs..."}}
    +
    {{search-box data-test-jobs-search searchTerm=(mut searchTerm) placeholder="Search jobs..."}}
    {{/if}} {{#list-pagination @@ -29,7 +31,7 @@ Allocation Status {{/t.head}} {{#t.body key="model.id" as |row|}} - {{job-row job=row.model onClick=(action "gotoJob" row.model)}} + {{job-row data-test-job-row job=row.model onClick=(action "gotoJob" row.model)}} {{/t.body}} {{/list-table}}
    @@ -43,14 +45,14 @@
    {{else}} -
    +
    {{#if (eq filteredJobs.length 0)}} -

    No Jobs

    +

    No Jobs

    The cluster is currently empty.

    {{else if searchTerm}} -

    No Matches

    +

    No Matches

    No jobs match the term {{searchTerm}}

    {{/if}}
    diff --git a/ui/app/templates/jobs/job/definition.hbs b/ui/app/templates/jobs/job/definition.hbs index f984fcbe7..d2722fa6a 100644 --- a/ui/app/templates/jobs/job/definition.hbs +++ b/ui/app/templates/jobs/job/definition.hbs @@ -1,6 +1,8 @@ {{#global-header class="page-header"}} - {{#each breadcrumbs as |breadcrumb|}} - {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}} + {{#each breadcrumbs as |breadcrumb index|}} +
  • + {{#link-to params=breadcrumb.args}}{{breadcrumb.label}}{{/link-to}} +
    • {{/each}} {{/global-header}} {{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}} @@ -8,7 +10,7 @@
    - {{json-viewer json=model.definition}} + {{json-viewer data-test-definition-view json=model.definition}}
    diff --git a/ui/app/templates/jobs/job/deployments.hbs b/ui/app/templates/jobs/job/deployments.hbs index 35afe908c..c293bfaef 100644 --- a/ui/app/templates/jobs/job/deployments.hbs +++ b/ui/app/templates/jobs/job/deployments.hbs @@ -1,6 +1,8 @@ {{#global-header class="page-header"}} - {{#each breadcrumbs as |breadcrumb|}} - {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}} + {{#each breadcrumbs as |breadcrumb index|}} +
  • + {{#link-to params=breadcrumb.args}}{{breadcrumb.label}}{{/link-to}} +
    • {{/each}} {{/global-header}} {{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}} diff --git a/ui/app/templates/jobs/job/index.hbs b/ui/app/templates/jobs/job/index.hbs index 07a83d98f..8a0ac1c0d 100644 --- a/ui/app/templates/jobs/job/index.hbs +++ b/ui/app/templates/jobs/job/index.hbs @@ -1,6 +1,8 @@ {{#global-header class="page-header"}} - {{#each breadcrumbs as |breadcrumb|}} - {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}} + {{#each breadcrumbs as |breadcrumb index|}} +
  • + {{#link-to data-test-breadcrumb=breadcrumb.label params=breadcrumb.args}}{{breadcrumb.label}}{{/link-to}} +
    • {{/each}} {{/global-header}} {{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}} @@ -8,7 +10,7 @@

    {{model.name}} - {{model.status}} + {{model.status}} {{#if model.periodic}} periodic {{else if model.parameterized}} @@ -18,10 +20,10 @@
    - Type: {{model.type}} | - Priority: {{model.priority}} + Type: {{model.type}} | + Priority: {{model.priority}} {{#if (and model.namespace system.shouldShowNamespaces)}} - | Namespace: {{model.namespace.name}} + | Namespace: {{model.namespace.name}} {{/if}}
    @@ -32,11 +34,11 @@

    {{#allocation-status-bar allocationContainer=model class="split-view" as |chart|}} -
      +
        {{#each chart.data as |datum index|}}
      1. - {{datum.value}} + {{datum.value}} {{datum.label}} @@ -48,7 +50,7 @@
    {{#if model.hasPlacementFailures}} -
    +
    Placement Failures
    @@ -56,7 +58,7 @@ {{#each model.taskGroups as |taskGroup|}} {{#if taskGroup.placementFailures}} {{#with taskGroup.placementFailures as |failures|}} -

    +

    {{taskGroup.name}} {{inc failures.coalescedFailures}} unplaced

    @@ -99,13 +101,13 @@ {{/if}} {{#if model.runningDeployment}} -
    +
    Active Deployment - {{model.runningDeployment.shortId}} + {{model.runningDeployment.shortId}} {{#if model.runningDeployment.version.submitTime}} - {{moment-from-now model.runningDeployment.version.submitTime}} + {{moment-from-now model.runningDeployment.version.submitTime}} {{/if}}
    @@ -125,7 +127,7 @@ {{/job-deployment-details}}
    - + {{if isShowingDeploymentDetails "Hide" "Show"}} deployment task groups and allocations
    @@ -154,7 +156,7 @@ {{#t.sort-by prop="reservedEphemeralDisk"}}Reserved Disk{{/t.sort-by}} {{/t.head}} {{#t.body as |row|}} - {{task-group-row taskGroup=row.model onClick=(action "gotoTaskGroup" row.model)}} + {{task-group-row data-test-task-group taskGroup=row.model onClick=(action "gotoTaskGroup" row.model)}} {{/t.body}} {{/list-table}} {{/list-pagination}} @@ -175,12 +177,12 @@ Placement Failures {{/t.head}} {{#t.body as |row|}} - - {{row.model.shortId}} - {{row.model.priority}} - {{row.model.triggeredBy}} - {{row.model.status}} - + + {{row.model.shortId}} + {{row.model.priority}} + {{row.model.triggeredBy}} + {{row.model.status}} + {{#if (eq row.model.status "blocked")}} N/A - In Progress {{else if row.model.hasPlacementFailures}} diff --git a/ui/app/templates/jobs/job/loading.hbs b/ui/app/templates/jobs/job/loading.hbs index 503faa81f..666de358d 100644 --- a/ui/app/templates/jobs/job/loading.hbs +++ b/ui/app/templates/jobs/job/loading.hbs @@ -1,6 +1,8 @@ {{#global-header class="page-header"}} - {{#each breadcrumbs as |breadcrumb|}} - {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}} + {{#each breadcrumbs as |breadcrumb index|}} +
  • + {{#link-to params=breadcrumb.args}}{{breadcrumb.label}}{{/link-to}} +
    • {{/each}} {{/global-header}} {{#gutter-menu class="page-body"}} diff --git a/ui/app/templates/jobs/job/subnav.hbs b/ui/app/templates/jobs/job/subnav.hbs index 63e712a6c..cfbdeb672 100644 --- a/ui/app/templates/jobs/job/subnav.hbs +++ b/ui/app/templates/jobs/job/subnav.hbs @@ -1,10 +1,10 @@
      -
    • {{#link-to "jobs.job.index" job activeClass="is-active"}}Overview{{/link-to}}
      • -
    • {{#link-to "jobs.job.definition" job activeClass="is-active"}}Definition{{/link-to}}
      • -
    • {{#link-to "jobs.job.versions" job activeClass="is-active"}}Versions{{/link-to}}
      • +
    • {{#link-to "jobs.job.index" job activeClass="is-active"}}Overview{{/link-to}}
      • +
    • {{#link-to "jobs.job.definition" job activeClass="is-active"}}Definition{{/link-to}}
      • +
    • {{#link-to "jobs.job.versions" job activeClass="is-active"}}Versions{{/link-to}}
      • {{#if job.supportsDeployments}} -
    • {{#link-to "jobs.job.deployments" job activeClass="is-active"}}Deployments{{/link-to}}
      • +
    • {{#link-to "jobs.job.deployments" job activeClass="is-active"}}Deployments{{/link-to}}
      • {{/if}}
    diff --git a/ui/app/templates/jobs/job/task-group.hbs b/ui/app/templates/jobs/job/task-group.hbs index 3d94ee812..90928f830 100644 --- a/ui/app/templates/jobs/job/task-group.hbs +++ b/ui/app/templates/jobs/job/task-group.hbs @@ -1,13 +1,15 @@ {{#global-header class="page-header"}} - {{#each breadcrumbs as |breadcrumb|}} - {{#link-to - params=(append - breadcrumb.args - (query-params jobNamespace=(or model.namespace.id "default")) - ) - class="breadcrumb"}} - {{breadcrumb.label}} - {{/link-to}} + {{#each breadcrumbs as |breadcrumb index|}} +
  • + {{#link-to + data-test-breadcrumb=breadcrumb.label + params=(append + breadcrumb.args + (query-params jobNamespace=(or model.namespace.id "default")) + )}} + {{breadcrumb.label}} + {{/link-to}} +
    • {{/each}} {{/global-header}} {{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}} @@ -25,10 +27,10 @@
    Task Group Details - # Tasks {{model.tasks.length}} - Reserved CPU {{model.reservedCPU}} MHz - Reserved Memory {{model.reservedMemory}} MiB - Reserved Disk {{model.reservedEphemeralDisk}} MiB + # Tasks {{model.tasks.length}} + Reserved CPU {{model.reservedCPU}} MHz + Reserved Memory {{model.reservedMemory}} MiB + Reserved Disk {{model.reservedEphemeralDisk}} MiB
    @@ -84,7 +86,7 @@ Memory {{/t.head}} {{#t.body as |row|}} - {{allocation-row allocation=row.model context="job" onClick=(action "gotoAllocation" row.model)}} + {{allocation-row data-test-allocation allocation=row.model context="job" onClick=(action "gotoAllocation" row.model)}} {{/t.body}} {{/list-table}}
    @@ -99,8 +101,8 @@
    {{else}}
    -
    -

    No Matches

    +
    +

    No Matches

    No allocations match the term {{searchTerm}}

    diff --git a/ui/app/templates/jobs/job/versions.hbs b/ui/app/templates/jobs/job/versions.hbs index fac0992db..6aadbe617 100644 --- a/ui/app/templates/jobs/job/versions.hbs +++ b/ui/app/templates/jobs/job/versions.hbs @@ -1,6 +1,8 @@ {{#global-header class="page-header"}} - {{#each breadcrumbs as |breadcrumb|}} - {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}} + {{#each breadcrumbs as |breadcrumb index|}} +
  • + {{#link-to params=breadcrumb.args}}{{breadcrumb.label}}{{/link-to}} +
    • {{/each}} {{/global-header}} {{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}} diff --git a/ui/app/templates/jobs/loading.hbs b/ui/app/templates/jobs/loading.hbs index f754d94ff..58bc6ef5b 100644 --- a/ui/app/templates/jobs/loading.hbs +++ b/ui/app/templates/jobs/loading.hbs @@ -1,5 +1,7 @@ {{#global-header class="page-header"}} - Jobs +
  • + {{#link-to "jobs.index"}}Jobs{{/link-to}} +
    • {{/global-header}} {{#gutter-menu class="page-body"}}
    {{partial "partials/loading-spinner"}}
    diff --git a/ui/app/templates/partials/forbidden-message.hbs b/ui/app/templates/partials/forbidden-message.hbs index a421e08e9..9fad4e384 100644 --- a/ui/app/templates/partials/forbidden-message.hbs +++ b/ui/app/templates/partials/forbidden-message.hbs @@ -1,6 +1,6 @@ -
    -

    Not Authorized

    -

    +

    +

    Not Authorized

    +

    {{#if token.secret}} Your {{#link-to "settings.tokens"}}ACL token{{/link-to}} does not provide the required permissions. Contact your administrator if this is an error. {{else}} diff --git a/ui/app/templates/servers.hbs b/ui/app/templates/servers.hbs index 133422482..6a639191d 100644 --- a/ui/app/templates/servers.hbs +++ b/ui/app/templates/servers.hbs @@ -1,6 +1,8 @@

    {{#global-header class="page-header"}} - Servers +
  • + {{#link-to "servers.index"}}Servers{{/link-to}} +
    • {{/global-header}} {{#gutter-menu class="page-body"}}
    @@ -25,7 +27,7 @@ {{#t.sort-by prop="datacenter"}}Datacenter{{/t.sort-by}} {{/t.head}} {{#t.body as |row|}} - {{server-agent-row agent=row.model}} + {{server-agent-row data-test-server-agent-row agent=row.model}} {{/t.body}} {{/list-table}}
    diff --git a/ui/app/templates/servers/server.hbs b/ui/app/templates/servers/server.hbs index 231d704e1..c9ef7a925 100644 --- a/ui/app/templates/servers/server.hbs +++ b/ui/app/templates/servers/server.hbs @@ -13,7 +13,7 @@ {{#each sortedTags as |tag|}} - + {{tag.name}} {{tag.value}} diff --git a/ui/app/templates/settings/tokens.hbs b/ui/app/templates/settings/tokens.hbs index 7f3e75673..e17b84393 100644 --- a/ui/app/templates/settings/tokens.hbs +++ b/ui/app/templates/settings/tokens.hbs @@ -20,16 +20,22 @@
    - +

    Sent with every request to determine authorization

    -

    +

    {{/if}} {{#if tokenIsValid}} -
    +

    Token Authenticated!

    @@ -40,7 +46,7 @@ {{/if}} {{#if tokenIsInvalid}} -
    +

    Token Failed to Authenticate

    @@ -58,26 +64,26 @@

    Policies

    {{#if (eq tokenRecord.type "management")}} -
    +
    The management token has all permissions
    {{else}} {{#each tokenRecord.policies as |policy|}} -
    -
    +
    +
    {{policy.name}}
    -

    +

    {{#if policy.description}} {{policy.description}} {{else}} No description {{/if}}

    - 
    {{policy.rules}}
    + 
    {{policy.rules}}
    {{/each}} diff --git a/ui/app/utils/classes/abstract-logger.js b/ui/app/utils/classes/abstract-logger.js index 37ab2578b..55eb2da1e 100644 --- a/ui/app/utils/classes/abstract-logger.js +++ b/ui/app/utils/classes/abstract-logger.js @@ -1,16 +1,16 @@ -import Ember from 'ember'; +import { assert } from '@ember/debug'; +import Mixin from '@ember/object/mixin'; +import { computed } from '@ember/object'; +import { assign } from '@ember/polyfills'; import queryString from 'npm:query-string'; -const { Mixin, computed, assign } = Ember; const MAX_OUTPUT_LENGTH = 50000; export default Mixin.create({ url: '', params: computed(() => ({})), logFetch() { - Ember.assert( - 'Loggers need a logFetch method, which should have an interface like window.fetch' - ); + assert('Loggers need a logFetch method, which should have an interface like window.fetch'); }, endOffset: null, diff --git a/ui/app/utils/classes/log.js b/ui/app/utils/classes/log.js index 219be0b4e..5e873182a 100644 --- a/ui/app/utils/classes/log.js +++ b/ui/app/utils/classes/log.js @@ -1,11 +1,13 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import { assert } from '@ember/debug'; +import Evented from '@ember/object/evented'; +import EmberObject, { computed } from '@ember/object'; +import { assign } from '@ember/polyfills'; import queryString from 'npm:query-string'; import { task } from 'ember-concurrency'; import StreamLogger from 'nomad-ui/utils/classes/stream-logger'; import PollLogger from 'nomad-ui/utils/classes/poll-logger'; -const { Object: EmberObject, Evented, computed, assign } = Ember; - const MAX_OUTPUT_LENGTH = 50000; const Log = EmberObject.extend(Evented, { @@ -14,14 +16,12 @@ const Log = EmberObject.extend(Evented, { url: '', params: computed(() => ({})), logFetch() { - Ember.assert( - 'Log objects need a logFetch method, which should have an interface like window.fetch' - ); + assert('Log objects need a logFetch method, which should have an interface like window.fetch'); }, // Read-only state - isStreaming: computed.alias('logStreamer.poll.isRunning'), + isStreaming: alias('logStreamer.poll.isRunning'), logPointer: null, logStreamer: null, diff --git a/ui/app/utils/classes/poll-logger.js b/ui/app/utils/classes/poll-logger.js index 3077e80a0..e6c7078a7 100644 --- a/ui/app/utils/classes/poll-logger.js +++ b/ui/app/utils/classes/poll-logger.js @@ -1,14 +1,14 @@ -import Ember from 'ember'; +import EmberObject from '@ember/object'; import { task, timeout } from 'ember-concurrency'; import AbstractLogger from './abstract-logger'; -const { Object: EmberObject } = Ember; - export default EmberObject.extend(AbstractLogger, { interval: 1000, start() { - return this.get('poll').perform(); + return this.get('poll') + .linked() + .perform(); }, stop() { diff --git a/ui/app/utils/classes/promise-object.js b/ui/app/utils/classes/promise-object.js index 8732062b3..fd762b728 100644 --- a/ui/app/utils/classes/promise-object.js +++ b/ui/app/utils/classes/promise-object.js @@ -1,5 +1,4 @@ -import Ember from 'ember'; - -const { ObjectProxy, PromiseProxyMixin } = Ember; +import ObjectProxy from '@ember/object/proxy'; +import PromiseProxyMixin from '@ember/object/promise-proxy-mixin'; export default ObjectProxy.extend(PromiseProxyMixin); diff --git a/ui/app/utils/classes/stream-logger.js b/ui/app/utils/classes/stream-logger.js index f19f0c668..ee1018734 100644 --- a/ui/app/utils/classes/stream-logger.js +++ b/ui/app/utils/classes/stream-logger.js @@ -1,10 +1,8 @@ -import Ember from 'ember'; +import EmberObject, { computed } from '@ember/object'; import { task } from 'ember-concurrency'; import TextDecoder from 'nomad-ui/utils/classes/text-decoder'; import AbstractLogger from './abstract-logger'; -const { Object: EmberObject, computed } = Ember; - export default EmberObject.extend(AbstractLogger, { reader: null, diff --git a/ui/app/utils/fetch.js b/ui/app/utils/fetch.js index 98b81a889..bad071006 100644 --- a/ui/app/utils/fetch.js +++ b/ui/app/utils/fetch.js @@ -1,8 +1,10 @@ import Ember from 'ember'; import fetch from 'fetch'; +import config from '../config/environment'; // The ember-fetch polyfill does not provide streaming // Additionally, Mirage/Pretender does not support fetch -const fetchToUse = Ember.testing ? fetch : window.fetch || fetch; +const mirageEnabled = config['ember-cli-mirage'] && config['ember-cli-mirage'].enabled !== false; +const fetchToUse = Ember.testing || mirageEnabled ? fetch : window.fetch || fetch; export default fetchToUse; diff --git a/ui/app/utils/properties/short-uuid.js b/ui/app/utils/properties/short-uuid.js index 67ac94ea6..0a7af211c 100644 --- a/ui/app/utils/properties/short-uuid.js +++ b/ui/app/utils/properties/short-uuid.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { computed } = Ember; +import { computed } from '@ember/object'; // An Ember.Computed property for taking the first segment // of a uuid. diff --git a/ui/app/utils/properties/style-string.js b/ui/app/utils/properties/style-string.js index 0f91706f8..e6119aced 100644 --- a/ui/app/utils/properties/style-string.js +++ b/ui/app/utils/properties/style-string.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { computed } = Ember; +import { computed } from '@ember/object'; // An Ember.Computed property for transforming an object into an // html compatible style attribute diff --git a/ui/app/utils/properties/sum-aggregation.js b/ui/app/utils/properties/sum-aggregation.js index e6561ced3..41a486a0e 100644 --- a/ui/app/utils/properties/sum-aggregation.js +++ b/ui/app/utils/properties/sum-aggregation.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { computed } = Ember; +import { computed } from '@ember/object'; // An Ember.Computed property for summating all properties from a // set of objects. @@ -9,6 +7,8 @@ const { computed } = Ember; // sum: sumAggregationProperty('list', 'foo') // 4 export default function sumAggregationProperty(listKey, propKey) { return computed(`${listKey}.@each.${propKey}`, function() { - return this.get(listKey).mapBy(propKey).reduce((sum, count) => sum + count, 0); + return this.get(listKey) + .mapBy(propKey) + .reduce((sum, count) => sum + count, 0); }); } diff --git a/ui/app/utils/timeout.js b/ui/app/utils/timeout.js index f9db48850..5cff0fa99 100644 --- a/ui/app/utils/timeout.js +++ b/ui/app/utils/timeout.js @@ -1,6 +1,4 @@ -import Ember from 'ember'; - -const { RSVP } = Ember; +import RSVP from 'rsvp'; // An always failing promise used to race against other promises export default function timeout(duration) { diff --git a/ui/config/targets.js b/ui/config/targets.js index 2bebfacad..547445947 100644 --- a/ui/config/targets.js +++ b/ui/config/targets.js @@ -1,10 +1,5 @@ /* eslint-env node */ module.exports = { - browsers: [ - 'ie 9', - 'last 1 Chrome versions', - 'last 1 Firefox versions', - 'last 1 Safari versions' - ] + browsers: ['ie 9', 'last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'], }; diff --git a/ui/mirage/config.js b/ui/mirage/config.js index dd23a35e7..b32c70b7c 100644 --- a/ui/mirage/config.js +++ b/ui/mirage/config.js @@ -14,6 +14,7 @@ export default function() { this.timing = 0; // delay for each request, automatically set to 0 during testing this.namespace = 'v1'; + this.trackRequests = Ember.testing; this.get('/jobs', function({ jobs }, { queryParams }) { const json = this.serialize(jobs.all()); diff --git a/ui/mirage/factories/client-stats.js b/ui/mirage/factories/client-stats.js index 8b8b4e13f..6924f07f6 100644 --- a/ui/mirage/factories/client-stats.js +++ b/ui/mirage/factories/client-stats.js @@ -12,27 +12,31 @@ export default Factory.extend({ }), CPU: () => [ - Array(faker.list.random(1, 2, 4, 6, 8, 12, 16, 24, 32)).fill(0).map((cpu, index) => ({ - CPU: `cpu${index}`, - Idle: 20, - System: 40, - Total: 80, - User: 40, - })), + Array(faker.list.random(1, 2, 4, 6, 8, 12, 16, 24, 32)) + .fill(0) + .map((cpu, index) => ({ + CPU: `cpu${index}`, + Idle: 20, + System: 40, + Total: 80, + User: 40, + })), ], CPUTicksConsumed: 1000000, diskStats: () => [ - Array(faker.random.number({ min: 1, max: 5 })).fill(0).map((disk, index) => ({ - Available: 100000000000, - Device: `/dev/disk${index}`, - InodesUsedPercent: 0.10000000001, - Mountpoint: '/', - Size: 2000000000000, - Used: 1000000000000, - UsedPercent: 50.0, - })), + Array(faker.random.number({ min: 1, max: 5 })) + .fill(0) + .map((disk, index) => ({ + Available: 100000000000, + Device: `/dev/disk${index}`, + InodesUsedPercent: 0.10000000001, + Mountpoint: '/', + Size: 2000000000000, + Used: 1000000000000, + UsedPercent: 50.0, + })), ], memory: () => ({ diff --git a/ui/mirage/serializers/application.js b/ui/mirage/serializers/application.js index 5bee3867e..6957d8991 100644 --- a/ui/mirage/serializers/application.js +++ b/ui/mirage/serializers/application.js @@ -1,6 +1,12 @@ import { RestSerializer } from 'ember-cli-mirage'; -const keyCase = str => (str === 'id' ? 'ID' : str.camelize().capitalize().replace(/Id/g, 'ID')); +const keyCase = str => + str === 'id' + ? 'ID' + : str + .camelize() + .capitalize() + .replace(/Id/g, 'ID'); export default RestSerializer.extend({ serialize() { diff --git a/ui/package.json b/ui/package.json index d56b7749b..914d94ad2 100644 --- a/ui/package.json +++ b/ui/package.json @@ -8,71 +8,68 @@ }, "repository": "", "scripts": { - "build": "ember build -prod", - "start": "ember server --proxy=http://127.0.0.1:4646", - "test": "ember test", + "build": "./node_modules/ember-cli/bin/ember build -prod", + "start": "./node_modules/ember-cli/bin/ember server", + "test": "./node_modules/ember-cli/bin/ember test", "precommit": "lint-staged" }, "lint-staged": { - "gitDir": "../", - "linters": { - "ui/{app,tests,config,lib,mirage}/**/*.js": [ - "prettier --single-quote --trailing-comma es5 --print-width 100 --write", - "git add" - ], - "ui/app/styles/**/*.*": [ - "prettier --write", - "git add" - ] - } + "ui/{app,tests,config,lib,mirage}/**/*.js": [ + "prettier --write", + "git add" + ], + "ui/app/styles/**/*.*": [ + "prettier --write", + "git add" + ] }, "devDependencies": { "broccoli-asset-rev": "^2.4.5", - "bulma": "0.4.2", + "bulma": "0.6.1", "core-js": "^2.4.1", "d3-selection": "^1.1.0", "d3-transition": "^1.1.0", "ember-ajax": "^3.0.0", - "ember-browserify": "^1.1.13", - "ember-cli": "2.13.2", + "ember-browserify": "^1.2.0", + "ember-cli": "2.17.1", "ember-cli-babel": "^6.0.0", "ember-cli-bourbon": "2.0.0-beta.1", - "ember-cli-dependency-checker": "^1.3.0", - "ember-cli-eslint": "^3.0.0", - "ember-cli-htmlbars": "^1.1.1", - "ember-cli-htmlbars-inline-precompile": "^0.4.0", + "ember-cli-dependency-checker": "^2.1.0", + "ember-cli-eslint": "^4.2.3", + "ember-cli-htmlbars": "^2.0.3", + "ember-cli-htmlbars-inline-precompile": "^1.0.2", "ember-cli-inject-live-reload": "^1.4.1", - "ember-cli-mirage": "^0.3.3", - "ember-cli-moment-shim": "^3.3.3", - "ember-cli-qunit": "^4.0.0", - "ember-cli-sass": "^6.2.0", - "ember-cli-shims": "^1.1.0", + "ember-cli-mirage": "^0.4.1", + "ember-cli-moment-shim": "^3.5.0", + "ember-cli-qunit": "^4.2.1", + "ember-cli-sass": "^7.1.2", + "ember-cli-shims": "^1.2.0", "ember-cli-sri": "^2.1.0", - "ember-cli-string-helpers": "^1.4.0", - "ember-cli-uglify": "^1.2.0", + "ember-cli-string-helpers": "^1.5.0", + "ember-cli-uglify": "^2.0.0", "ember-composable-helpers": "^2.0.3", "ember-concurrency": "^0.8.12", - "ember-data": "^2.14.0", + "ember-data": "~2.17.0", "ember-data-model-fragments": "^2.14.0", "ember-export-application-global": "^2.0.0", - "ember-fetch": "^3.2.7", - "ember-freestyle": "^0.4.1", - "ember-href-to": "^1.13.0", + "ember-fetch": "^3.4.3", + "ember-freestyle": "~0.6.2", "ember-inline-svg": "^0.1.11", "ember-load-initializers": "^1.0.0", - "ember-moment": "^7.3.1", + "ember-moment": "^7.5.0", "ember-native-dom-helpers": "^0.5.4", - "ember-power-select": "^1.9.9", - "ember-resolver": "^4.0.0", - "ember-sinon": "^0.7.0", - "ember-source": "~2.14.0", - "ember-truth-helpers": "^1.3.0", + "ember-power-select": "^1.10.4", + "ember-resolver": "^4.5.0", + "ember-sinon": "^1.0.1", + "ember-source": "~2.17.0", + "ember-test-selectors": "^0.3.8", + "ember-truth-helpers": "^2.0.0", "ember-welcome-page": "^3.0.0", - "eslint": "^4.0.0", - "flat": "^2.0.1", - "husky": "^0.13.4", + "eslint": "^4.13.1", + "flat": "^4.0.0", + "husky": "^0.14.3", "json-formatter-js": "^2.2.0", - "lint-staged": "^3.6.1", + "lint-staged": "^6.0.0", "loader.js": "^4.2.3", "prettier": "^1.4.4", "query-string": "^5.0.0" diff --git a/ui/testem.js b/ui/testem.js index 9a0e1deb1..919ed563a 100644 --- a/ui/testem.js +++ b/ui/testem.js @@ -2,6 +2,22 @@ module.exports = { test_page: 'tests/index.html?hidepassed', disable_watching: true, - launch_in_ci: ['PhantomJS'], + launch_in_ci: ['Chrome'], launch_in_dev: ['Chrome'], + browser_args: { + // New format in testem/master, but not in a release yet + // Chrome: { + // ci: ['--headless', '--disable-gpu', '--remote-debugging-port=9222', '--window-size=1440,900'], + // }, + Chrome: { + mode: 'ci', + args: [ + '--headless', + '--no-sandbox', + '--disable-gpu', + '--remote-debugging-port=9222', + '--window-size=1440,900', + ], + }, + }, }; diff --git a/ui/tests/acceptance/allocation-detail-test.js b/ui/tests/acceptance/allocation-detail-test.js index cd31e6c00..de651ca10 100644 --- a/ui/tests/acceptance/allocation-detail-test.js +++ b/ui/tests/acceptance/allocation-detail-test.js @@ -1,11 +1,9 @@ -import Ember from 'ember'; +import $ from 'jquery'; import { click, findAll, currentURL, find, visit } from 'ember-native-dom-helpers'; import { test } from 'qunit'; import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance'; import moment from 'moment'; -const { $ } = Ember; - let job; let node; let allocation; @@ -27,20 +25,23 @@ moduleForAcceptance('Acceptance | allocation detail', { test('/allocation/:id should name the allocation and link to the corresponding job and node', function( assert ) { - assert.ok(find('h1').textContent.includes(allocation.name), 'Allocation name is in the heading'); + assert.ok( + find('[data-test-title]').textContent.includes(allocation.name), + 'Allocation name is in the heading' + ); assert.equal( - find('.inline-definitions .job-link a').textContent.trim(), + find('[data-test-allocation-details] [data-test-job-link]').textContent.trim(), job.name, 'Job name is in the subheading' ); assert.equal( - find('.inline-definitions .node-link a').textContent.trim(), + find('[data-test-allocation-details] [data-test-client-link]').textContent.trim(), node.id.split('-')[0], 'Node short id is in the subheading' ); andThen(() => { - click('.inline-definitions .job-link a'); + click('[data-test-allocation-details] [data-test-job-link]'); }); andThen(() => { @@ -50,7 +51,7 @@ test('/allocation/:id should name the allocation and link to the corresponding j visit(`/allocations/${allocation.id}`); andThen(() => { - click('.inline-definitions .node-link a'); + click('[data-test-allocation-details] [data-test-client-link]'); }); andThen(() => { @@ -60,7 +61,7 @@ test('/allocation/:id should name the allocation and link to the corresponding j test('/allocation/:id should list all tasks for the allocation', function(assert) { assert.equal( - findAll('.tasks tbody tr').length, + findAll('[data-test-task-row]').length, server.db.taskStates.where({ allocationId: allocation.id }).length, 'Table lists all tasks' ); @@ -73,13 +74,13 @@ test('each task row should list high-level information for the task', function(a .sortBy('name')[0]; const reservedPorts = taskResources.resources.Networks[0].ReservedPorts; const dynamicPorts = taskResources.resources.Networks[0].DynamicPorts; - const taskRow = $(findAll('.tasks tbody tr')[0]); + const taskRow = $(findAll('[data-test-task-row]')[0]); const events = server.db.taskEvents.where({ taskStateId: task.id }); const event = events[events.length - 1]; assert.equal( taskRow - .find('td:eq(0)') + .find('[data-test-name]') .text() .trim(), task.name, @@ -87,7 +88,7 @@ test('each task row should list high-level information for the task', function(a ); assert.equal( taskRow - .find('td:eq(1)') + .find('[data-test-state]') .text() .trim(), task.state, @@ -95,7 +96,7 @@ test('each task row should list high-level information for the task', function(a ); assert.equal( taskRow - .find('td:eq(2)') + .find('[data-test-message]') .text() .trim(), event.message, @@ -103,7 +104,7 @@ test('each task row should list high-level information for the task', function(a ); assert.equal( taskRow - .find('td:eq(3)') + .find('[data-test-time]') .text() .trim(), moment(event.time / 1000000).format('MM/DD/YY HH:mm:ss'), @@ -113,7 +114,7 @@ test('each task row should list high-level information for the task', function(a assert.ok(reservedPorts.length, 'The task has reserved ports'); assert.ok(dynamicPorts.length, 'The task has dynamic ports'); - const addressesText = taskRow.find('td:eq(4)').text(); + const addressesText = taskRow.find('[data-test-ports]').text(); reservedPorts.forEach(port => { assert.ok(addressesText.includes(port.Label), `Found label ${port.Label}`); assert.ok(addressesText.includes(port.Value), `Found value ${port.Value}`); @@ -136,9 +137,9 @@ test('when the allocation is not found, an error message is shown, but the URL p 'A request to the non-existent allocation is made' ); assert.equal(currentURL(), '/allocations/not-a-real-allocation', 'The URL persists'); - assert.ok(find('.error-message'), 'Error message is shown'); + assert.ok(find('[data-test-error]'), 'Error message is shown'); assert.equal( - find('.error-message .title').textContent, + find('[data-test-error-title]').textContent, 'Not Found', 'Error message is for 404' ); diff --git a/ui/tests/acceptance/application-errors-test.js b/ui/tests/acceptance/application-errors-test.js index b5e2e636e..121e572c6 100644 --- a/ui/tests/acceptance/application-errors-test.js +++ b/ui/tests/acceptance/application-errors-test.js @@ -16,13 +16,13 @@ test('transitioning away from an error page resets the global error', function(a visit('/clients'); andThen(() => { - assert.ok(find('.error-message'), 'Application has errored'); + assert.ok(find('[data-test-error]'), 'Application has errored'); }); visit('/jobs'); andThen(() => { - assert.notOk(find('.error-message'), 'Application is no longer in an error state'); + assert.notOk(find('[data-test-error]'), 'Application is no longer in an error state'); }); }); @@ -34,16 +34,16 @@ test('the 403 error page links to the ACL tokens page', function(assert) { visit(`/jobs/${job.id}`); andThen(() => { - assert.ok(find('.error-message'), 'Error message is shown'); + assert.ok(find('[data-test-error]'), 'Error message is shown'); assert.equal( - find('.error-message .title').textContent, + find('[data-test-error] .title').textContent, 'Not Authorized', 'Error message is for 403' ); }); andThen(() => { - click('.error-message a'); + click('[data-test-error-acl-link]'); }); andThen(() => { diff --git a/ui/tests/acceptance/client-detail-test.js b/ui/tests/acceptance/client-detail-test.js index 6cc1743ea..1b0788b00 100644 --- a/ui/tests/acceptance/client-detail-test.js +++ b/ui/tests/acceptance/client-detail-test.js @@ -1,12 +1,10 @@ -import Ember from 'ember'; +import $ from 'jquery'; import { click, find, findAll, currentURL, visit } from 'ember-native-dom-helpers'; import { test } from 'qunit'; import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance'; import { formatBytes } from 'nomad-ui/helpers/format-bytes'; import moment from 'moment'; -const { $ } = Ember; - let node; moduleForAcceptance('Acceptance | client detail', { @@ -25,16 +23,20 @@ test('/clients/:id should have a breadrcumb trail linking back to clients', func visit(`/clients/${node.id}`); andThen(() => { - assert.equal(findAll('.breadcrumb')[0].textContent, 'Clients', 'First breadcrumb says clients'); assert.equal( - findAll('.breadcrumb')[1].textContent, + find('[data-test-breadcrumb="clients"]').textContent, + 'Clients', + 'First breadcrumb says clients' + ); + assert.equal( + find('[data-test-breadcrumb="client"]').textContent, node.id.split('-')[0], 'Second breadcrumb says the node short id' ); }); andThen(() => { - click(findAll('.breadcrumb')[0]); + click(find('[data-test-breadcrumb="clients"]')); }); andThen(() => { @@ -46,12 +48,9 @@ test('/clients/:id should list immediate details for the node in the title', fun visit(`/clients/${node.id}`); andThen(() => { - assert.ok(find('.title').textContent.includes(node.name), 'Title includes name'); - assert.ok(find('.title').textContent.includes(node.id), 'Title includes id'); - assert.ok( - findAll(`.title .node-status-light.${node.status}`).length, - 'Title includes status light' - ); + assert.ok(find('[data-test-title]').textContent.includes(node.name), 'Title includes name'); + assert.ok(find('[data-test-title]').textContent.includes(node.id), 'Title includes id'); + assert.ok(find(`[data-test-node-status="${node.status}"]`), 'Title includes status light'); }); }); @@ -65,16 +64,16 @@ test('/clients/:id should list additional detail for the node below the title', 'Status is in additional details' ); assert.ok( - $('.inline-definitions .pair:eq(0) .status-text').hasClass(`node-${node.status}`), + $('[data-test-status-definition] .status-text').hasClass(`node-${node.status}`), 'Status is decorated with a status class' ); assert.equal( - findAll('.inline-definitions .pair')[1].textContent, + find('[data-test-address-definition]').textContent, `Address ${node.httpAddr}`, 'Address is in additional detals' ); assert.equal( - findAll('.inline-definitions .pair')[2].textContent, + find('[data-test-datacenter-definition]').textContent, `Datacenter ${node.datacenter}`, 'Datacenter is in additional details' ); @@ -88,7 +87,7 @@ test('/clients/:id should list all allocations on the node', function(assert) { andThen(() => { assert.equal( - findAll('.allocations tbody tr').length, + findAll('[data-test-allocation]').length, allocationsCount, `Allocations table lists all ${allocationsCount} associated allocations` ); @@ -114,10 +113,10 @@ test('each allocation should have high-level details for the allocation', functi visit(`/clients/${node.id}`); andThen(() => { - const allocationRow = $(findAll('.allocations tbody tr')[0]); + const allocationRow = $(find('[data-test-allocation]')); assert.equal( allocationRow - .find('td:eq(0)') + .find('[data-test-short-id]') .text() .trim(), allocation.id.split('-')[0], @@ -125,7 +124,7 @@ test('each allocation should have high-level details for the allocation', functi ); assert.equal( allocationRow - .find('td:eq(1)') + .find('[data-test-modify-time]') .text() .trim(), moment(allocation.modifyTime / 1000000).format('MM/DD HH:mm:ss'), @@ -133,7 +132,7 @@ test('each allocation should have high-level details for the allocation', functi ); assert.equal( allocationRow - .find('td:eq(2)') + .find('[data-test-name]') .text() .trim(), allocation.name, @@ -141,56 +140,57 @@ test('each allocation should have high-level details for the allocation', functi ); assert.equal( allocationRow - .find('td:eq(3)') + .find('[data-test-client-status]') .text() .trim(), allocation.clientStatus, 'Client status' ); - assert.ok( + assert.equal( allocationRow - .find('td:eq(4)') + .find('[data-test-job]') .text() - .includes(server.db.jobs.find(allocation.jobId).name), + .trim(), + server.db.jobs.find(allocation.jobId).name, 'Job name' ); assert.ok( allocationRow - .find('td:eq(4) .is-faded') + .find('[data-test-task-group]') .text() .includes(allocation.taskGroup), 'Task group name' ); assert.ok( allocationRow - .find('td:eq(5)') + .find('[data-test-job-version]') .text() .includes(allocation.jobVersion), 'Job Version' ); assert.equal( allocationRow - .find('td:eq(6)') + .find('[data-test-cpu]') .text() .trim(), Math.floor(allocStats.resourceUsage.CpuStats.TotalTicks) / cpuUsed, 'CPU %' ); assert.equal( - allocationRow.find('td:eq(6) .tooltip').attr('aria-label'), + allocationRow.find('[data-test-cpu] .tooltip').attr('aria-label'), `${Math.floor(allocStats.resourceUsage.CpuStats.TotalTicks)} / ${cpuUsed} MHz`, 'Detailed CPU information is in a tooltip' ); assert.equal( allocationRow - .find('td:eq(7)') + .find('[data-test-mem]') .text() .trim(), allocStats.resourceUsage.MemoryStats.RSS / 1024 / 1024 / memoryUsed, 'Memory used' ); assert.equal( - allocationRow.find('td:eq(7) .tooltip').attr('aria-label'), + allocationRow.find('[data-test-mem] .tooltip').attr('aria-label'), `${formatBytes([allocStats.resourceUsage.MemoryStats.RSS])} / ${memoryUsed} MiB`, 'Detailed memory information is in a tooltip' ); @@ -217,7 +217,7 @@ test('each allocation should show job information even if the job is incomplete visit(`/clients/${node.id}`); andThen(() => { - const allocationRow = $(findAll('.allocations tbody tr')[0]); + const allocationRow = $(find('[data-test-allocation]')); const allocation = server.db.allocations .where({ nodeId: node.id }) .sortBy('modifyIndex') @@ -225,14 +225,14 @@ test('each allocation should show job information even if the job is incomplete assert.ok( allocationRow - .find('td:eq(4)') + .find('[data-test-job]') .text() .includes(server.db.jobs.find(allocation.jobId).name), 'Job name' ); assert.ok( allocationRow - .find('td:eq(4) .is-faded') + .find('[data-test-task-group]') .text() .includes(allocation.taskGroup), 'Task group name' @@ -249,7 +249,7 @@ test('each allocation should link to the allocation detail page', function(asser visit(`/clients/${node.id}`); andThen(() => { - click($('.allocations tbody tr:eq(0) td:eq(0) a').get(0)); + click('[data-test-short-id] a'); }); andThen(() => { @@ -268,7 +268,7 @@ test('each allocation should link to the job the allocation belongs to', functio const job = server.db.jobs.find(allocation.jobId); andThen(() => { - click($('.allocations tbody tr:eq(0) td:eq(4) a').get(0)); + click('[data-test-job]'); }); andThen(() => { @@ -284,7 +284,7 @@ test('/clients/:id should list all attributes for the node', function(assert) { visit(`/clients/${node.id}`); andThen(() => { - assert.ok(find('.attributes-table'), 'Attributes table is on the page'); + assert.ok(find('[data-test-attributes]'), 'Attributes table is on the page'); }); }); @@ -300,9 +300,9 @@ test('when the node is not found, an error message is shown, but the URL persist 'A request to the non-existent node is made' ); assert.equal(currentURL(), '/clients/not-a-real-node', 'The URL persists'); - assert.ok(find('.error-message'), 'Error message is shown'); + assert.ok(find('[data-test-error]'), 'Error message is shown'); assert.equal( - find('.error-message .title').textContent, + find('[data-test-error-title]').textContent, 'Not Found', 'Error message is for 404' ); diff --git a/ui/tests/acceptance/job-definition-test.js b/ui/tests/acceptance/job-definition-test.js index 0317ec93b..5a5478fb8 100644 --- a/ui/tests/acceptance/job-definition-test.js +++ b/ui/tests/acceptance/job-definition-test.js @@ -18,7 +18,7 @@ test('visiting /jobs/:job_id/definition', function(assert) { }); test('the job definition page contains a json viewer component', function(assert) { - assert.ok(findAll('.json-viewer').length, 'JSON viewer found'); + assert.ok(findAll('[data-test-definition-view]').length, 'JSON viewer found'); }); test('the job definition page requests the job to display in an unmutated form', function(assert) { diff --git a/ui/tests/acceptance/job-deployments-test.js b/ui/tests/acceptance/job-deployments-test.js index f69bebea0..b2bcfffe4 100644 --- a/ui/tests/acceptance/job-deployments-test.js +++ b/ui/tests/acceptance/job-deployments-test.js @@ -1,10 +1,10 @@ +import { get } from '@ember/object'; +import $ from 'jquery'; import { click, findAll, find, visit } from 'ember-native-dom-helpers'; -import Ember from 'ember'; import { test } from 'qunit'; import moment from 'moment'; import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance'; -const { get, $ } = Ember; const sum = (list, key) => list.reduce((sum, item) => sum + get(item, key), 0); let job; @@ -33,7 +33,7 @@ test('/jobs/:id/deployments should list all job deployments', function(assert) { visit(`/jobs/${job.id}/deployments`); andThen(() => { assert.ok( - findAll('.timeline-object').length, + findAll('[data-test-deployment]').length, deployments.length, 'Each deployment gets a row in the timeline' ); @@ -51,17 +51,32 @@ test('each deployment mentions the deployment shortId, status, version, and time jobId: deployment.jobId, version: deployment.versionNumber, }); - const deploymentRow = $(findAll('.timeline-object')[0]); + const deploymentRow = $(find('[data-test-deployment]')); assert.ok(deploymentRow.text().includes(deployment.id.split('-')[0]), 'Short ID'); - assert.equal(deploymentRow.find('.tag').text(), deployment.status, 'Status'); + assert.equal( + deploymentRow.find('[data-test-deployment-status]').text(), + deployment.status, + 'Status' + ); assert.ok( - deploymentRow.find('.tag').hasClass(classForStatus(deployment.status)), + deploymentRow + .find('[data-test-deployment-status]') + .hasClass(classForStatus(deployment.status)), 'Status Class' ); - assert.ok(deploymentRow.text().includes(deployment.versionNumber), 'Version #'); assert.ok( - deploymentRow.text().includes(moment(version.submitTime / 1000000).fromNow()), + deploymentRow + .find('[data-test-deployment-version]') + .text() + .includes(deployment.versionNumber), + 'Version #' + ); + assert.ok( + deploymentRow + .find('[data-test-deployment-submit-time]') + .text() + .includes(moment(version.submitTime / 1000000).fromNow()), 'Submit time ago' ); }); @@ -90,9 +105,9 @@ test('when the deployment is running and needs promotion, the deployment item sa visit(`/jobs/${job.id}/deployments`); andThen(() => { - const deploymentRow = $(findAll('.timeline-object')[0]); + const deploymentRow = find('[data-test-deployment]'); assert.ok( - deploymentRow.find('.badge:contains("Requires Promotion")').length, + deploymentRow.querySelector('[data-test-promotion-required]'), 'Requires Promotion badge found' ); }); @@ -104,14 +119,20 @@ test('each deployment item can be opened to show details', function(assert) { visit(`/jobs/${job.id}/deployments`); andThen(() => { - deploymentRow = $(findAll('.timeline-object')[0]); + deploymentRow = find('[data-test-deployment]'); - assert.ok(deploymentRow.find('.boxed-section-body').length === 0, 'No deployment body'); + assert.notOk( + deploymentRow.querySelector('[data-test-deployment-details]'), + 'No deployment body' + ); - click(deploymentRow.find('button').get(0)); + click(deploymentRow.querySelector('[data-test-deployment-toggle-details]')); andThen(() => { - assert.ok(deploymentRow.find('.boxed-section-body').length, 'Deployment body found'); + assert.ok( + deploymentRow.querySelector('[data-test-deployment-details]'), + 'Deployment body found' + ); }); }); }); @@ -121,18 +142,16 @@ test('when open, a deployment shows the deployment metrics', function(assert) { andThen(() => { const deployment = sortedDeployments.models[0]; - const deploymentRow = $(findAll('.timeline-object')[0]); + const deploymentRow = find('[data-test-deployment]'); const taskGroupSummaries = deployment.deploymentTaskGroupSummaryIds.map(id => server.db.deploymentTaskGroupSummaries.find(id) ); - click(deploymentRow.find('button').get(0)); + click(deploymentRow.querySelector('[data-test-deployment-toggle-details]')); andThen(() => { assert.equal( - $('.deployment-metrics .label:contains("Canaries") + .value') - .get(0) - .textContent.trim(), + find('[data-test-deployment-metric="canaries"]').textContent.trim(), `${sum(taskGroupSummaries, 'placedCanaries')} / ${sum( taskGroupSummaries, 'desiredCanaries' @@ -141,39 +160,31 @@ test('when open, a deployment shows the deployment metrics', function(assert) { ); assert.equal( - $('.deployment-metrics .label:contains("Placed") + .value') - .get(0) - .textContent.trim(), + find('[data-test-deployment-metric="placed"]').textContent.trim(), sum(taskGroupSummaries, 'placedAllocs'), 'Placed allocs aggregates across task groups' ); assert.equal( - $('.deployment-metrics .label:contains("Desired") + .value') - .get(0) - .textContent.trim(), + find('[data-test-deployment-metric="desired"]').textContent.trim(), sum(taskGroupSummaries, 'desiredTotal'), 'Desired allocs aggregates across task groups' ); assert.equal( - $('.deployment-metrics .label:contains("Healthy") + .value') - .get(0) - .textContent.trim(), + find('[data-test-deployment-metric="healthy"]').textContent.trim(), sum(taskGroupSummaries, 'healthyAllocs'), 'Healthy allocs aggregates across task groups' ); assert.equal( - $('.deployment-metrics .label:contains("Unhealthy") + .value') - .get(0) - .textContent.trim(), + find('[data-test-deployment-metric="unhealthy"]').textContent.trim(), sum(taskGroupSummaries, 'unhealthyAllocs'), 'Unhealthy allocs aggregates across task groups' ); assert.equal( - find('.deployment-metrics .notification').textContent.trim(), + find('[data-test-deployment-notification]').textContent.trim(), deployment.statusDescription, 'Status description is in the metrics block' ); @@ -188,85 +199,65 @@ test('when open, a deployment shows a list of all task groups and their respecti andThen(() => { const deployment = sortedDeployments.models[0]; - const deploymentRow = $(findAll('.timeline-object')[0]); + const deploymentRow = find('[data-test-deployment]'); const taskGroupSummaries = deployment.deploymentTaskGroupSummaryIds.map(id => server.db.deploymentTaskGroupSummaries.find(id) ); - click(deploymentRow.find('button').get(0)); + click(deploymentRow.querySelector('[data-test-deployment-toggle-details]')); andThen(() => { - assert.ok( - deploymentRow.find('.boxed-section-head:contains("Task Groups")').length, - 'Task groups found' - ); + const taskGroupTable = deploymentRow.querySelector('[data-test-deployment-task-groups]'); - const taskGroupTable = deploymentRow.find( - '.boxed-section-head:contains("Task Groups") + .boxed-section-body tbody' - ); + assert.ok(taskGroupTable, 'Task groups found'); assert.equal( - taskGroupTable.find('tr').length, + taskGroupTable.querySelectorAll('[data-test-deployment-task-group]').length, taskGroupSummaries.length, 'One row per task group' ); const taskGroup = taskGroupSummaries[0]; - const taskGroupRow = taskGroupTable.find('tr:eq(0)'); + const taskGroupRow = taskGroupTable.querySelector('[data-test-deployment-task-group]'); assert.equal( - taskGroupRow - .find('td:eq(0)') - .text() - .trim(), + taskGroupRow.querySelector('[data-test-deployment-task-group-name]').textContent.trim(), taskGroup.name, 'Name' ); assert.equal( taskGroupRow - .find('td:eq(1)') - .text() - .trim(), + .querySelector('[data-test-deployment-task-group-promotion]') + .textContent.trim(), promotionTestForTaskGroup(taskGroup), 'Needs Promotion' ); assert.equal( taskGroupRow - .find('td:eq(2)') - .text() - .trim(), + .querySelector('[data-test-deployment-task-group-auto-revert]') + .textContent.trim(), taskGroup.autoRevert ? 'Yes' : 'No', 'Auto Revert' ); assert.equal( - taskGroupRow - .find('td:eq(3)') - .text() - .trim(), + taskGroupRow.querySelector('[data-test-deployment-task-group-canaries]').textContent.trim(), `${taskGroup.placedCanaries} / ${taskGroup.desiredCanaries}`, 'Canaries' ); assert.equal( - taskGroupRow - .find('td:eq(4)') - .text() - .trim(), + taskGroupRow.querySelector('[data-test-deployment-task-group-allocs]').textContent.trim(), `${taskGroup.placedAllocs} / ${taskGroup.desiredTotal}`, 'Allocs' ); assert.equal( - taskGroupRow - .find('td:eq(5)') - .text() - .trim(), + taskGroupRow.querySelector('[data-test-deployment-task-group-healthy]').textContent.trim(), taskGroup.healthyAllocs, 'Healthy Allocs' ); assert.equal( taskGroupRow - .find('td:eq(6)') - .text() - .trim(), + .querySelector('[data-test-deployment-task-group-unhealthy]') + .textContent.trim(), taskGroup.unhealthyAllocs, 'Unhealthy Allocs' ); @@ -281,38 +272,31 @@ test('when open, a deployment shows a list of all allocations for the deployment andThen(() => { const deployment = sortedDeployments.models[0]; - const deploymentRow = $(findAll('.timeline-object')[0]); + const deploymentRow = find('[data-test-deployment]'); // TODO: Make this less brittle. This logic is copied from the mirage config, // since there is no reference to allocations on the deployment model. const allocations = server.db.allocations.where({ jobId: deployment.jobId }).slice(0, 3); - click(deploymentRow.find('button').get(0)); + click(deploymentRow.querySelector('[data-test-deployment-toggle-details]')); andThen(() => { assert.ok( - deploymentRow.find('.boxed-section-head:contains("Allocations")').length, + deploymentRow.querySelector('[data-test-deployment-allocations]'), 'Allocations found' ); - const allocationsTable = deploymentRow.find( - '.boxed-section-head:contains("Allocations") + .boxed-section-body tbody' - ); - assert.equal( - allocationsTable.find('tr').length, + deploymentRow.querySelectorAll('[data-test-deployment-allocation]').length, allocations.length, 'One row per allocation' ); const allocation = allocations[0]; - const allocationRow = allocationsTable.find('tr:eq(0)'); + const allocationRow = deploymentRow.querySelector('[data-test-deployment-allocation]'); assert.equal( - allocationRow - .find('td:eq(0)') - .text() - .trim(), + allocationRow.querySelector('[data-test-short-id]').textContent.trim(), allocation.id.split('-')[0], 'Allocation is as expected' ); diff --git a/ui/tests/acceptance/job-detail-test.js b/ui/tests/acceptance/job-detail-test.js index cf3b1bcc5..a1df252ec 100644 --- a/ui/tests/acceptance/job-detail-test.js +++ b/ui/tests/acceptance/job-detail-test.js @@ -1,10 +1,9 @@ +import { get } from '@ember/object'; import { click, findAll, currentURL, find, visit } from 'ember-native-dom-helpers'; -import Ember from 'ember'; import moment from 'moment'; import { test } from 'qunit'; import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance'; -const { get, $ } = Ember; const sum = (list, key) => list.reduce((sum, item) => sum + get(item, key), 0); let job; @@ -22,14 +21,18 @@ test('visiting /jobs/:job_id', function(assert) { }); test('breadcrumbs includes job name and link back to the jobs list', function(assert) { - assert.equal(findAll('.breadcrumb')[0].textContent, 'Jobs', 'First breadcrumb says jobs'); assert.equal( - findAll('.breadcrumb')[1].textContent, + find('[data-test-breadcrumb="Jobs"]').textContent, + 'Jobs', + 'First breadcrumb says jobs' + ); + assert.equal( + find(`[data-test-breadcrumb="${job.name}"]`).textContent, job.name, 'Second breadcrumb says the job name' ); - click(findAll('.breadcrumb')[0]); + click(find('[data-test-breadcrumb="Jobs"]')); andThen(() => { assert.equal(currentURL(), '/jobs', 'First breadcrumb links back to jobs'); }); @@ -38,7 +41,7 @@ test('breadcrumbs includes job name and link back to the jobs list', function(as test('the subnav includes links to definition, versions, and deployments when type = service', function( assert ) { - const subnavLabels = findAll('.tabs.is-subnav a').map(anchor => anchor.textContent); + const subnavLabels = findAll('[data-test-tab]').map(anchor => anchor.textContent); assert.ok(subnavLabels.some(label => label === 'Definition'), 'Definition link'); assert.ok(subnavLabels.some(label => label === 'Versions'), 'Versions link'); assert.ok(subnavLabels.some(label => label === 'Deployments'), 'Deployments link'); @@ -49,7 +52,7 @@ test('the subnav includes links to definition and versions when type != service' visit(`/jobs/${job.id}`); andThen(() => { - const subnavLabels = findAll('.tabs.is-subnav a').map(anchor => anchor.textContent); + const subnavLabels = findAll('[data-test-tab]').map(anchor => anchor.textContent); assert.ok(subnavLabels.some(label => label === 'Definition'), 'Definition link'); assert.ok(subnavLabels.some(label => label === 'Versions'), 'Versions link'); assert.notOk(subnavLabels.some(label => label === 'Deployments'), 'Deployments link'); @@ -57,15 +60,15 @@ test('the subnav includes links to definition and versions when type != service' }); test('the job detail page should contain basic information about the job', function(assert) { - assert.ok(findAll('.title .tag')[0].textContent.includes(job.status), 'Status'); - assert.ok(findAll('.job-stats span')[0].textContent.includes(job.type), 'Type'); - assert.ok(findAll('.job-stats span')[1].textContent.includes(job.priority), 'Priority'); - assert.notOk(findAll('.job-stats span')[2], 'Namespace is not included'); + assert.ok(find('[data-test-job-status]').textContent.includes(job.status), 'Status'); + assert.ok(find('[data-test-job-stat="type"]').textContent.includes(job.type), 'Type'); + assert.ok(find('[data-test-job-stat="priority"]').textContent.includes(job.priority), 'Priority'); + assert.notOk(find('[data-test-job-stat="namespace"]'), 'Namespace is not included'); }); test('the job detail page should list all task groups', function(assert) { assert.equal( - findAll('.task-group-row').length, + findAll('[data-test-task-group]').length, server.db.taskGroups.where({ jobId: job.id }).length ); }); @@ -74,45 +77,38 @@ test('each row in the task group table should show basic information about the t assert ) { const taskGroup = job.taskGroupIds.map(id => server.db.taskGroups.find(id)).sortBy('name')[0]; - const taskGroupRow = $(findAll('.task-group-row')[0]); + const taskGroupRow = find('[data-test-task-group]'); const tasks = server.db.tasks.where({ taskGroupId: taskGroup.id }); const sum = (list, key) => list.reduce((sum, item) => sum + get(item, key), 0); assert.equal( - taskGroupRow - .find('td:eq(0)') - .text() - .trim(), + taskGroupRow.querySelector('[data-test-task-group-name]').textContent.trim(), taskGroup.name, 'Name' ); assert.equal( - taskGroupRow - .find('td:eq(1)') - .text() - .trim(), + taskGroupRow.querySelector('[data-test-task-group-count]').textContent.trim(), taskGroup.count, 'Count' ); assert.equal( - taskGroupRow.find('td:eq(3)').text(), + taskGroupRow.querySelector('[data-test-task-group-cpu]').textContent.trim(), `${sum(tasks, 'Resources.CPU')} MHz`, 'Reserved CPU' ); assert.equal( - taskGroupRow.find('td:eq(4)').text(), + taskGroupRow.querySelector('[data-test-task-group-mem]').textContent.trim(), `${sum(tasks, 'Resources.MemoryMB')} MiB`, 'Reserved Memory' ); assert.equal( - taskGroupRow.find('td:eq(5)').text(), + taskGroupRow.querySelector('[data-test-task-group-disk]').textContent.trim(), `${taskGroup.ephemeralDisk.SizeMB} MiB`, 'Reserved Disk' ); }); test('the allocations diagram lists all allocation status figures', function(assert) { - const legend = find('.distribution-bar .legend'); const jobSummary = server.db.jobSummaries.findBy({ jobId: job.id }); const statusCounts = Object.keys(jobSummary.Summary).reduce( (counts, key) => { @@ -129,37 +125,37 @@ test('the allocations diagram lists all allocation status figures', function(ass ); assert.equal( - legend.querySelector('li.queued .value').textContent, + find('[data-test-legend-value="queued"]').textContent, statusCounts.queued, `${statusCounts.queued} are queued` ); assert.equal( - legend.querySelector('li.starting .value').textContent, + find('[data-test-legend-value="starting"]').textContent, statusCounts.starting, `${statusCounts.starting} are starting` ); assert.equal( - legend.querySelector('li.running .value').textContent, + find('[data-test-legend-value="running"]').textContent, statusCounts.running, `${statusCounts.running} are running` ); assert.equal( - legend.querySelector('li.complete .value').textContent, + find('[data-test-legend-value="complete"]').textContent, statusCounts.complete, `${statusCounts.complete} are complete` ); assert.equal( - legend.querySelector('li.failed .value').textContent, + find('[data-test-legend-value="failed"]').textContent, statusCounts.failed, `${statusCounts.failed} are failed` ); assert.equal( - legend.querySelector('li.lost .value').textContent, + find('[data-test-legend-value="lost"]').textContent, statusCounts.lost, `${statusCounts.lost} are lost` ); @@ -174,7 +170,7 @@ test('there is no active deployment section when the job has no active deploymen visit(`/jobs/${job.id}`); andThen(() => { - assert.ok(findAll('.active-deployment').length === 0, 'No active deployment'); + assert.notOk(find('[data-test-active-deployment]'), 'No active deployment'); }); }); @@ -193,27 +189,21 @@ test('the active deployment section shows up for the currently running deploymen visit(`/jobs/${job.id}`); andThen(() => { - assert.ok(findAll('.active-deployment').length === 1, 'Active deployment'); + assert.ok(find('[data-test-active-deployment]'), 'Active deployment'); assert.equal( - $('.active-deployment > .boxed-section-head .badge') - .get(0) - .textContent.trim(), + find('[data-test-active-deployment-stat="id"]').textContent.trim(), deployment.id.split('-')[0], 'The active deployment is the most recent running deployment' ); assert.equal( - $('.active-deployment > .boxed-section-head .submit-time') - .get(0) - .textContent.trim(), + find('[data-test-active-deployment-stat="submit-time"]').textContent.trim(), moment(version.submitTime / 1000000).fromNow(), 'Time since the job was submitted is in the active deployment header' ); assert.equal( - $('.deployment-metrics .label:contains("Canaries") + .value') - .get(0) - .textContent.trim(), + find('[data-test-deployment-metric="canaries"]').textContent.trim(), `${sum(taskGroupSummaries, 'placedCanaries')} / ${sum( taskGroupSummaries, 'desiredCanaries' @@ -222,41 +212,31 @@ test('the active deployment section shows up for the currently running deploymen ); assert.equal( - $('.deployment-metrics .label:contains("Placed") + .value') - .get(0) - .textContent.trim(), + find('[data-test-deployment-metric="placed"]').textContent.trim(), sum(taskGroupSummaries, 'placedAllocs'), 'Placed allocs aggregates across task groups' ); assert.equal( - $('.deployment-metrics .label:contains("Desired") + .value') - .get(0) - .textContent.trim(), + find('[data-test-deployment-metric="desired"]').textContent.trim(), sum(taskGroupSummaries, 'desiredTotal'), 'Desired allocs aggregates across task groups' ); assert.equal( - $('.deployment-metrics .label:contains("Healthy") + .value') - .get(0) - .textContent.trim(), + find('[data-test-deployment-metric="healthy"]').textContent.trim(), sum(taskGroupSummaries, 'healthyAllocs'), 'Healthy allocs aggregates across task groups' ); assert.equal( - $('.deployment-metrics .label:contains("Unhealthy") + .value') - .get(0) - .textContent.trim(), + find('[data-test-deployment-metric="unhealthy"]').textContent.trim(), sum(taskGroupSummaries, 'unhealthyAllocs'), 'Unhealthy allocs aggregates across task groups' ); assert.equal( - $('.deployment-metrics .notification') - .get(0) - .textContent.trim(), + find('[data-test-deployment-notification]').textContent.trim(), deployment.statusDescription, 'Status description is in the metrics block' ); @@ -270,29 +250,17 @@ test('the active deployment section can be expanded to show task groups and allo visit(`/jobs/${job.id}`); andThen(() => { - assert.ok( - $('.active-deployment .boxed-section-head:contains("Task Groups")').length === 0, - 'Task groups not found' - ); - assert.ok( - $('.active-deployment .boxed-section-head:contains("Allocations")').length === 0, - 'Allocations not found' - ); + assert.notOk(find('[data-test-deployment-task-groups]'), 'Task groups not found'); + assert.notOk(find('[data-test-deployment-allocations]'), 'Allocations not found'); }); andThen(() => { - click('.active-deployment-details-toggle'); + click('[data-test-deployment-toggle-details]'); }); andThen(() => { - assert.ok( - $('.active-deployment .boxed-section-head:contains("Task Groups")').length === 1, - 'Task groups found' - ); - assert.ok( - $('.active-deployment .boxed-section-head:contains("Allocations")').length === 1, - 'Allocations found' - ); + assert.ok(find('[data-test-deployment-task-groups]'), 'Task groups found'); + assert.ok(find('[data-test-deployment-allocations]'), 'Allocations found'); }); }); @@ -307,25 +275,37 @@ test('the evaluations table lists evaluations sorted by modify index', function( andThen(() => { assert.equal( - findAll('.evaluations tbody tr').length, + findAll('[data-test-evaluation]').length, evaluations.length, 'A row for each evaluation' ); evaluations.forEach((evaluation, index) => { - const row = $(findAll('.evaluations tbody tr')[index]); + const row = findAll('[data-test-evaluation]')[index]; assert.equal( - row.find('td:eq(0)').text(), + row.querySelector('[data-test-id]').textContent, evaluation.id.split('-')[0], `Short ID, row ${index}` ); }); const firstEvaluation = evaluations[0]; - const row = $(findAll('.evaluations tbody tr')[0]); - assert.equal(row.find('td:eq(1)').text(), '' + firstEvaluation.priority, 'Priority'); - assert.equal(row.find('td:eq(2)').text(), firstEvaluation.triggeredBy, 'Triggered By'); - assert.equal(row.find('td:eq(3)').text(), firstEvaluation.status, 'Status'); + const row = find('[data-test-evaluation]'); + assert.equal( + row.querySelector('[data-test-priority]').textContent, + '' + firstEvaluation.priority, + 'Priority' + ); + assert.equal( + row.querySelector('[data-test-triggered-by]').textContent, + firstEvaluation.triggeredBy, + 'Triggered By' + ); + assert.equal( + row.querySelector('[data-test-status]').textContent, + firstEvaluation.status, + 'Status' + ); }); }); @@ -342,9 +322,9 @@ test('when the job has placement failures, they are called out', function(assert visit(`/jobs/${job.id}`); andThen(() => { - assert.ok(find('.placement-failures'), 'Placement failures section found'); + assert.ok(find('[data-test-placement-failures]'), 'Placement failures section found'); - const taskGroupLabels = findAll('.placement-failures h3.title').map(title => + const taskGroupLabels = findAll('[data-test-placement-failure-task-group]').map(title => title.textContent.trim() ); failedTaskGroupNames.forEach(name => { @@ -369,7 +349,7 @@ test('when the job has no placement failures, the placement failures section is visit(`/jobs/${job.id}`); andThen(() => { - assert.notOk(find('.placement-failures'), 'Placement failures section not found'); + assert.notOk(find('[data-test-placement-failures]'), 'Placement failures section not found'); }); }); @@ -385,9 +365,9 @@ test('when the job is not found, an error message is shown, but the URL persists 'A request to the non-existent job is made' ); assert.equal(currentURL(), '/jobs/not-a-real-job', 'The URL persists'); - assert.ok(find('.error-message'), 'Error message is shown'); + assert.ok(find('[data-test-error]'), 'Error message is shown'); assert.equal( - find('.error-message .title').textContent, + find('[data-test-error-title]').textContent, 'Not Found', 'Error message is for 404' ); @@ -411,7 +391,7 @@ test('when there are namespaces, the job detail page states the namespace for th andThen(() => { assert.ok( - findAll('.job-stats span')[2].textContent.includes(namespace.name), + find('[data-test-job-stat="namespace"]').textContent.includes(namespace.name), 'Namespace included in stats' ); }); @@ -427,7 +407,7 @@ test('when switching namespaces, the app redirects to /jobs with the new namespa visit(`/jobs/${job.id}?namespace=${namespace.name}`); andThen(() => { - selectChoose('.namespace-switcher', label); + selectChoose('[data-test-namespace-switcher]', label); }); andThen(() => { @@ -436,13 +416,15 @@ test('when switching namespaces, the app redirects to /jobs with the new namespa .where({ namespace: otherNamespace }) .sortBy('modifyIndex') .reverse(); - assert.equal(findAll('.job-row').length, jobs.length, 'Shows the right number of jobs'); + assert.equal( + findAll('[data-test-job-row]').length, + jobs.length, + 'Shows the right number of jobs' + ); jobs.forEach((job, index) => { + const jobRow = findAll('[data-test-job-row]')[index]; assert.equal( - $(findAll('.job-row')[index]) - .find('td:eq(0)') - .text() - .trim(), + jobRow.querySelector('[data-test-job-name]').textContent.trim(), job.name, `Job ${index} is right` ); diff --git a/ui/tests/acceptance/job-versions-test.js b/ui/tests/acceptance/job-versions-test.js index 9c63240a4..8a20f366b 100644 --- a/ui/tests/acceptance/job-versions-test.js +++ b/ui/tests/acceptance/job-versions-test.js @@ -1,11 +1,8 @@ -import Ember from 'ember'; -import { findAll, visit } from 'ember-native-dom-helpers'; +import { find, findAll, visit } from 'ember-native-dom-helpers'; import { test } from 'qunit'; import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance'; import moment from 'moment'; -const { $ } = Ember; - let job; let versions; @@ -20,7 +17,7 @@ moduleForAcceptance('Acceptance | job versions', { test('/jobs/:id/versions should list all job versions', function(assert) { assert.ok( - findAll('.timeline-object').length, + findAll('[data-test-version]').length, versions.length, 'Each version gets a row in the timeline' ); @@ -30,16 +27,16 @@ test('each version mentions the version number, the stability, and the submitted assert ) { const version = versions.sortBy('submitTime').reverse()[0]; - const versionRow = $(findAll('.timeline-object')[0]); + const versionRow = find('[data-test-version]'); - assert.ok(versionRow.text().includes(`Version #${version.version}`), 'Version #'); + assert.ok(versionRow.textContent.includes(`Version #${version.version}`), 'Version #'); assert.equal( - versionRow.find('.version-stability .badge').text(), + versionRow.querySelector('[data-test-version-stability]').textContent, version.stable.toString(), 'Stability' ); assert.equal( - versionRow.find('.version-submit-date .submit-date').text(), + versionRow.querySelector('[data-test-version-submit-date]').textContent, moment(version.submitTime / 1000000).format('MM/DD/YY HH:mm:ss'), 'Submit time' ); diff --git a/ui/tests/acceptance/jobs-list-test.js b/ui/tests/acceptance/jobs-list-test.js index c1cbaadbe..d7f870214 100644 --- a/ui/tests/acceptance/jobs-list-test.js +++ b/ui/tests/acceptance/jobs-list-test.js @@ -1,10 +1,7 @@ -import Ember from 'ember'; import { click, find, findAll, currentURL, visit, fillIn } from 'ember-native-dom-helpers'; import { test } from 'qunit'; import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance'; -const { $ } = Ember; - moduleForAcceptance('Acceptance | jobs list', { beforeEach() { // Required for placing allocations (a result of creating jobs) @@ -29,10 +26,11 @@ test('/jobs should list the first page of jobs sorted by modify index', function andThen(() => { const sortedJobs = server.db.jobs.sortBy('modifyIndex').reverse(); - assert.equal(findAll('.job-row').length, pageSize); + assert.equal(findAll('[data-test-job-row]').length, pageSize); for (var jobNumber = 0; jobNumber < pageSize; jobNumber++) { + const jobRow = findAll('[data-test-job-row]')[jobNumber]; assert.equal( - $(`.job-row:eq(${jobNumber}) td:eq(0)`).text(), + jobRow.querySelector('[data-test-job-name]').textContent, sortedJobs[jobNumber].name, 'Jobs are ordered' ); @@ -48,26 +46,28 @@ test('each job row should contain information about the job', function(assert) { visit('/jobs'); andThen(() => { - const jobRow = $(findAll('.job-row')[0]); + const jobRow = find('[data-test-job-row]'); - assert.equal(jobRow.find('td:eq(0)').text(), job.name, 'Name'); - assert.equal(jobRow.find('td:eq(0) a').attr('href'), `/ui/jobs/${job.id}`, 'Detail Link'); + assert.equal(jobRow.querySelector('[data-test-job-name]').textContent, job.name, 'Name'); assert.equal( - jobRow - .find('td:eq(1)') - .text() - .trim(), + jobRow.querySelector('[data-test-job-name] a').getAttribute('href'), + `/ui/jobs/${job.id}`, + 'Detail Link' + ); + assert.equal( + jobRow.querySelector('[data-test-job-status]').textContent.trim(), job.status, 'Status' ); - assert.equal(jobRow.find('td:eq(2)').text(), job.type, 'Type'); - assert.equal(jobRow.find('td:eq(3)').text(), job.priority, 'Priority'); + assert.equal(jobRow.querySelector('[data-test-job-type]').textContent, job.type, 'Type'); + assert.equal( + jobRow.querySelector('[data-test-job-priority]').textContent, + job.priority, + 'Priority' + ); andThen(() => { assert.equal( - jobRow - .find('td:eq(4)') - .text() - .trim(), + jobRow.querySelector('[data-test-job-task-groups]').textContent.trim(), taskGroups.length, '# Groups' ); @@ -82,7 +82,7 @@ test('each job row should link to the corresponding job', function(assert) { visit('/jobs'); andThen(() => { - click($('.job-row:eq(0) td:eq(0) a').get(0)); + click('[data-test-job-name] a'); }); andThen(() => { @@ -94,8 +94,8 @@ test('when there are no jobs, there is an empty message', function(assert) { visit('/jobs'); andThen(() => { - assert.ok(find('.empty-message')); - assert.equal(find('.empty-message-headline').textContent, 'No Jobs'); + assert.ok(find('[data-test-empty-jobs-list]')); + assert.equal(find('[data-test-empty-jobs-list-headline]').textContent, 'No Jobs'); }); }); @@ -108,12 +108,12 @@ test('when there are jobs, but no matches for a search result, there is an empty visit('/jobs'); andThen(() => { - fillIn('.search-box input', 'dog'); + fillIn('[data-test-jobs-search] input', 'dog'); }); andThen(() => { - assert.ok(find('.empty-message')); - assert.equal(find('.empty-message-headline').textContent, 'No Matches'); + assert.ok(find('[data-test-empty-jobs-list]')); + assert.equal(find('[data-test-empty-jobs-list-headline]').textContent, 'No Matches'); }); }); @@ -127,16 +127,20 @@ test('when the namespace query param is set, only matching jobs are shown and th visit('/jobs'); andThen(() => { - assert.equal(findAll('.job-row').length, 1, 'One job in the default namespace'); - assert.equal(find('.job-row td').textContent, job1.name, 'The correct job is shown'); + assert.equal(findAll('[data-test-job-row]').length, 1, 'One job in the default namespace'); + assert.equal(find('[data-test-job-name]').textContent, job1.name, 'The correct job is shown'); }); const secondNamespace = server.db.namespaces[1]; visit(`/jobs?namespace=${secondNamespace.id}`); andThen(() => { - assert.equal(findAll('.job-row').length, 1, `One job in the ${secondNamespace.name} namespace`); - assert.equal(find('.job-row td').textContent, job2.name, 'The correct job is shown'); + assert.equal( + findAll('[data-test-job-row]').length, + 1, + `One job in the ${secondNamespace.name} namespace` + ); + assert.equal(find('[data-test-job-name]').textContent, job2.name, 'The correct job is shown'); }); }); @@ -148,11 +152,11 @@ test('when accessing jobs is forbidden, show a message with a link to the tokens visit('/jobs'); andThen(() => { - assert.equal(find('.empty-message-headline').textContent, 'Not Authorized'); + assert.equal(find('[data-test-error-title]').textContent, 'Not Authorized'); }); andThen(() => { - click('.empty-message-body a'); + click('[data-test-error-message] a'); }); andThen(() => { diff --git a/ui/tests/acceptance/namespaces-test.js b/ui/tests/acceptance/namespaces-test.js index 12b0df203..9237fed75 100644 --- a/ui/tests/acceptance/namespaces-test.js +++ b/ui/tests/acceptance/namespaces-test.js @@ -42,11 +42,11 @@ test('the namespace switcher lists all namespaces', function(assert) { visit('/jobs'); andThen(() => { - assert.ok(find('.gutter .menu .namespace-switcher'), 'Namespace switcher found'); + assert.ok(find('[data-test-namespace-switcher]'), 'Namespace switcher found'); }); andThen(() => { - click('.gutter .menu .namespace-switcher .ember-power-select-trigger'); + click('[data-test-namespace-switcher] .ember-power-select-trigger'); }); andThen(() => { @@ -81,7 +81,7 @@ test('changing the namespace sets the namespace in localStorage', function(asser visit('/jobs'); - selectChoose('.namespace-switcher', namespace.name); + selectChoose('[data-test-namespace-switcher]', namespace.name); andThen(() => { assert.equal( window.localStorage.nomadActiveNamespace, @@ -106,7 +106,7 @@ test('changing the namespace refreshes the jobs list when on the jobs page', fun ); }); - selectChoose('.namespace-switcher', namespace.name); + selectChoose('[data-test-namespace-switcher]', namespace.name); andThen(() => { const requests = server.pretender.handledRequests.filter(req => req.url.startsWith('/v1/jobs')); diff --git a/ui/tests/acceptance/nodes-list-test.js b/ui/tests/acceptance/nodes-list-test.js index c78d83b4b..dde20b744 100644 --- a/ui/tests/acceptance/nodes-list-test.js +++ b/ui/tests/acceptance/nodes-list-test.js @@ -1,12 +1,9 @@ -import Ember from 'ember'; import { click, find, findAll, currentURL, visit } from 'ember-native-dom-helpers'; import { test } from 'qunit'; import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance'; import { findLeader } from '../../mirage/config'; import ipParts from 'nomad-ui/utils/ip-parts'; -const { $ } = Ember; - function minimumSetup() { server.createList('node', 1); server.createList('agent', 1); @@ -25,14 +22,15 @@ test('/clients should list one page of clients', function(assert) { visit('/clients'); andThen(() => { - assert.equal(findAll('.client-node-row').length, pageSize); - assert.ok(findAll('.pagination').length, 'Pagination found on the page'); + assert.equal(findAll('[data-test-client-node-row]').length, pageSize); + assert.ok(find('[data-test-pagination]'), 'Pagination found on the page'); const sortedNodes = server.db.nodes.sortBy('modifyIndex').reverse(); for (var nodeNumber = 0; nodeNumber < pageSize; nodeNumber++) { + const nodeRow = findAll('[data-test-client-node-row]')[nodeNumber]; assert.equal( - $(`.client-node-row:eq(${nodeNumber}) td:eq(0)`).text(), + nodeRow.querySelector('[data-test-client-id]').textContent.trim(), sortedNodes[nodeNumber].id.split('-')[0], 'Clients are ordered' ); @@ -47,17 +45,41 @@ test('each client record should show high-level info of the client', function(as visit('/clients'); andThen(() => { - const nodeRow = $(findAll('.client-node-row')[0]); + const nodeRow = find('[data-test-client-node-row]'); const allocations = server.db.allocations.where({ nodeId: node.id }); const { address, port } = ipParts(node.httpAddr); - assert.equal(nodeRow.find('td:eq(0)').text(), node.id.split('-')[0], 'ID'); - assert.equal(nodeRow.find('td:eq(1)').text(), node.name, 'Name'); - assert.equal(nodeRow.find('td:eq(2)').text(), node.status, 'Status'); - assert.equal(nodeRow.find('td:eq(3)').text(), address, 'Address'); - assert.equal(nodeRow.find('td:eq(4)').text(), port, 'Port'); - assert.equal(nodeRow.find('td:eq(5)').text(), node.datacenter, 'Datacenter'); - assert.equal(nodeRow.find('td:eq(6)').text(), allocations.length, '# Allocations'); + assert.equal( + nodeRow.querySelector('[data-test-client-id]').textContent.trim(), + node.id.split('-')[0], + 'ID' + ); + assert.equal( + nodeRow.querySelector('[data-test-client-name]').textContent.trim(), + node.name, + 'Name' + ); + assert.equal( + nodeRow.querySelector('[data-test-client-status]').textContent.trim(), + node.status, + 'Status' + ); + assert.equal( + nodeRow.querySelector('[data-test-client-address]').textContent.trim(), + address, + 'Address' + ); + assert.equal(nodeRow.querySelector('[data-test-client-port]').textContent.trim(), port, 'Port'); + assert.equal( + nodeRow.querySelector('[data-test-client-datacenter]').textContent.trim(), + node.datacenter, + 'Datacenter' + ); + assert.equal( + nodeRow.querySelector('[data-test-client-allocations]').textContent.trim(), + allocations.length, + '# Allocations' + ); }); }); @@ -67,7 +89,7 @@ test('each client should link to the client detail page', function(assert) { visit('/clients'); andThen(() => { - click(findAll('.client-node-row')[0]); + click('[data-test-client-node-row]'); }); andThen(() => { @@ -81,8 +103,8 @@ test('when there are no clients, there is an empty message', function(assert) { visit('/clients'); andThen(() => { - assert.ok(find('.empty-message')); - assert.equal(find('.empty-message-headline').textContent, 'No Clients'); + assert.ok(find('[data-test-empty-clients-list]')); + assert.equal(find('[data-test-empty-clients-list-headline]').textContent, 'No Clients'); }); }); @@ -99,8 +121,8 @@ test('when there are clients, but no matches for a search term, there is an empt }); andThen(() => { - assert.ok(find('.empty-message')); - assert.equal(find('.empty-message-headline').textContent, 'No Matches'); + assert.ok(find('[data-test-empty-clients-list]')); + assert.equal(find('[data-test-empty-clients-list-headline]').textContent, 'No Matches'); }); }); @@ -114,11 +136,11 @@ test('when accessing clients is forbidden, show a message with a link to the tok visit('/clients'); andThen(() => { - assert.equal(find('.empty-message-headline').textContent, 'Not Authorized'); + assert.equal(find('[data-test-error-title]').textContent, 'Not Authorized'); }); andThen(() => { - click('.empty-message-body a'); + click('[data-test-error-message] a'); }); andThen(() => { @@ -138,7 +160,7 @@ test('/servers should list all servers', function(assert) { visit('/servers'); andThen(() => { - assert.equal(findAll('.server-agent-row').length, pageSize); + assert.equal(findAll('[data-test-server-agent-row]').length, pageSize); const sortedAgents = server.db.agents .sort((a, b) => { @@ -152,10 +174,11 @@ test('/servers should list all servers', function(assert) { .reverse(); for (var agentNumber = 0; agentNumber < 8; agentNumber++) { + const serverRow = findAll('[data-test-server-agent-row]')[agentNumber]; assert.equal( - $(`.server-agent-row:eq(${agentNumber}) td:eq(0)`).text(), + serverRow.querySelector('[data-test-server-name]').textContent.trim(), sortedAgents[agentNumber].name, - 'Clients are ordered' + 'Servers are ordered' ); } }); @@ -168,14 +191,34 @@ test('each server should show high-level info of the server', function(assert) { visit('/servers'); andThen(() => { - const agentRow = $(findAll('.server-agent-row')[0]); + const agentRow = find('[data-test-server-agent-row]'); - assert.equal(agentRow.find('td:eq(0)').text(), agent.name, 'Name'); - assert.equal(agentRow.find('td:eq(1)').text(), agent.status, 'Status'); - assert.equal(agentRow.find('td:eq(2)').text(), 'True', 'Leader?'); - assert.equal(agentRow.find('td:eq(3)').text(), agent.address, 'Address'); - assert.equal(agentRow.find('td:eq(4)').text(), agent.serf_port, 'Serf Port'); - assert.equal(agentRow.find('td:eq(5)').text(), agent.tags.dc, 'Datacenter'); + assert.equal(agentRow.querySelector('[data-test-server-name]').textContent, agent.name, 'Name'); + assert.equal( + agentRow.querySelector('[data-test-server-status]').textContent, + agent.status, + 'Status' + ); + assert.equal( + agentRow.querySelector('[data-test-server-is-leader]').textContent, + 'True', + 'Leader?' + ); + assert.equal( + agentRow.querySelector('[data-test-server-address]').textContent, + agent.address, + 'Address' + ); + assert.equal( + agentRow.querySelector('[data-test-server-port]').textContent, + agent.serf_port, + 'Serf Port' + ); + assert.equal( + agentRow.querySelector('[data-test-server-datacenter]').textContent, + agent.tags.dc, + 'Datacenter' + ); }); }); @@ -185,7 +228,7 @@ test('each server should link to the server detail page', function(assert) { visit('/servers'); andThen(() => { - click(findAll('.server-agent-row')[0]); + click('[data-test-server-agent-row]'); }); andThen(() => { @@ -202,11 +245,11 @@ test('when accessing servers is forbidden, show a message with a link to the tok visit('/servers'); andThen(() => { - assert.equal(find('.empty-message-headline').textContent, 'Not Authorized'); + assert.equal(find('[data-test-error-title]').textContent, 'Not Authorized'); }); andThen(() => { - click('.empty-message-body a'); + click('[data-test-error-message] a'); }); andThen(() => { diff --git a/ui/tests/acceptance/server-detail-test.js b/ui/tests/acceptance/server-detail-test.js index 94bd414b6..1ef079e4a 100644 --- a/ui/tests/acceptance/server-detail-test.js +++ b/ui/tests/acceptance/server-detail-test.js @@ -1,10 +1,8 @@ -import Ember from 'ember'; +import $ from 'jquery'; import { find, findAll, currentURL, visit } from 'ember-native-dom-helpers'; import { test } from 'qunit'; import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance'; -const { $ } = Ember; - let agent; moduleForAcceptance('Acceptance | server detail', { @@ -22,7 +20,7 @@ test('visiting /servers/:server_name', function(assert) { test('the server detail page should list all tags for the server', function(assert) { const tags = agent.tags; - assert.equal(findAll('.server-tags tbody tr').length, Object.keys(tags).length, '# of tags'); + assert.equal(findAll('[data-test-server-tag]').length, Object.keys(tags).length, '# of tags'); Object.keys(tags) .map(name => ({ name, value: tags[name] })) .sortBy('name') @@ -34,13 +32,21 @@ test('the server detail page should list all tags for the server', function(asse }); test('the list of servers from /servers should still be present', function(assert) { - assert.equal(findAll('.server-agent-row').length, server.db.agents.length, '# of servers'); + assert.equal( + findAll('[data-test-server-agent-row]').length, + server.db.agents.length, + '# of servers' + ); }); test('the active server should be denoted in the table', function(assert) { - assert.equal(findAll('.server-agent-row.is-active').length, 1, 'Only one active server'); assert.equal( - findAll('.server-agent-row.is-active td')[0].textContent, + findAll('[data-test-server-agent-row].is-active').length, + 1, + 'Only one active server' + ); + assert.equal( + find('[data-test-server-agent-row].is-active [data-test-server-name]').textContent.trim(), agent.name, 'Active server matches current route' ); @@ -53,9 +59,9 @@ test('when the server is not found, an error message is shown, but the URL persi andThen(() => { assert.equal(currentURL(), '/servers/not-a-real-server', 'The URL persists'); - assert.ok(find('.error-message'), 'Error message is shown'); + assert.ok(find('[data-test-error]'), 'Error message is shown'); assert.equal( - find('.error-message .title').textContent, + find('[data-test-error-title]').textContent, 'Not Found', 'Error message is for 404' ); diff --git a/ui/tests/acceptance/task-detail-test.js b/ui/tests/acceptance/task-detail-test.js index 2c90da4d7..b0cbc65da 100644 --- a/ui/tests/acceptance/task-detail-test.js +++ b/ui/tests/acceptance/task-detail-test.js @@ -1,12 +1,9 @@ -import Ember from 'ember'; import { click, findAll, currentURL, find, visit } from 'ember-native-dom-helpers'; import { test } from 'qunit'; import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance'; import moment from 'moment'; import ipParts from 'nomad-ui/utils/ip-parts'; -const { $ } = Ember; - let allocation; let task; @@ -27,36 +24,40 @@ moduleForAcceptance('Acceptance | task detail', { test('/allocation/:id/:task_name should name the task and list high-level task information', function( assert ) { - assert.ok(find('.title').textContent.includes(task.name), 'Task name'); - assert.ok(find('.title').textContent.includes(task.state), 'Task state'); + assert.ok(find('[data-test-title]').textContent.includes(task.name), 'Task name'); + assert.ok(find('[data-test-state]').textContent.includes(task.state), 'Task state'); - const inlineDefinitions = findAll('.inline-definitions .pair'); assert.ok( - inlineDefinitions[0].textContent.includes(moment(task.startedAt).format('MM/DD/YY HH:mm:ss')), + find('[data-test-started-at]').textContent.includes( + moment(task.startedAt).format('MM/DD/YY HH:mm:ss') + ), 'Task started at' ); }); test('breadcrumbs includes allocations and link to the allocation detail page', function(assert) { - const breadcrumbs = findAll('.breadcrumb'); assert.equal( - breadcrumbs[0].textContent.trim(), + find('[data-test-breadcrumb="allocations"]').textContent.trim(), 'Allocations', 'Allocations is the first breadcrumb' ); - assert.notEqual( - breadcrumbs[0].tagName.toLowerCase(), - 'a', - 'Allocations breadcrumb is not a link' + assert.equal( + find('[data-test-breadcrumb="allocations"]').getAttribute('href'), + '#', + "Allocations breadcrumb doesn't link anywhere" ); assert.equal( - breadcrumbs[1].textContent.trim(), + find('[data-test-breadcrumb="allocation"]').textContent.trim(), allocation.id.split('-')[0], 'Allocation short id is the second breadcrumb' ); - assert.equal(breadcrumbs[2].textContent.trim(), task.name, 'Task name is the third breadcrumb'); + assert.equal( + find('[data-test-breadcrumb="task"]').textContent.trim(), + task.name, + 'Task name is the third breadcrumb' + ); - click(breadcrumbs[1]); + click('[data-test-breadcrumb="allocation"]'); andThen(() => { assert.equal( currentURL(), @@ -75,7 +76,7 @@ test('the addresses table lists all reserved and dynamic ports', function(assert const addresses = reservedPorts.concat(dynamicPorts); assert.equal( - findAll('.addresses-list tbody tr').length, + findAll('[data-test-task-address]').length, addresses.length, 'All addresses are listed' ); @@ -90,28 +91,19 @@ test('each address row shows the label and value of the address', function(asser const dynamicPorts = taskResources.resources.Networks[0].DynamicPorts; const address = reservedPorts.concat(dynamicPorts).sortBy('Label')[0]; - const addressRow = $(find('.addresses-list tbody tr')); + const addressRow = find('[data-test-task-address]'); assert.equal( - addressRow - .find('td:eq(0)') - .text() - .trim(), + addressRow.querySelector('[data-test-task-address-is-dynamic]').textContent.trim(), reservedPorts.includes(address) ? 'No' : 'Yes', 'Dynamic port is denoted as such' ); assert.equal( - addressRow - .find('td:eq(1)') - .text() - .trim(), + addressRow.querySelector('[data-test-task-address-name]').textContent.trim(), address.Label, 'Label' ); assert.equal( - addressRow - .find('td:eq(2)') - .text() - .trim(), + addressRow.querySelector('[data-test-task-address-address]').textContent.trim(), `${ipParts(node.httpAddr).address}:${address.Value}`, 'Value' ); @@ -121,7 +113,7 @@ test('the events table lists all recent events', function(assert) { const events = server.db.taskEvents.where({ taskStateId: task.id }); assert.equal( - findAll('.task-events tbody tr').length, + findAll('[data-test-task-event]').length, events.length, `Lists ${events.length} events` ); @@ -131,29 +123,20 @@ test('each recent event should list the time, type, and description of the event assert ) { const event = server.db.taskEvents.where({ taskStateId: task.id })[0]; - const recentEvent = $('.task-events tbody tr:last'); + const recentEvent = findAll('[data-test-task-event]').get('lastObject'); assert.equal( - recentEvent - .find('td:eq(0)') - .text() - .trim(), + recentEvent.querySelector('[data-test-task-event-time]').textContent.trim(), moment(event.time / 1000000).format('MM/DD/YY HH:mm:ss'), 'Event timestamp' ); assert.equal( - recentEvent - .find('td:eq(1)') - .text() - .trim(), + recentEvent.querySelector('[data-test-task-event-type]').textContent.trim(), event.type, 'Event type' ); assert.equal( - recentEvent - .find('td:eq(2)') - .text() - .trim(), + recentEvent.querySelector('[data-test-task-event-message]').textContent.trim(), event.message, 'Event message' ); @@ -173,9 +156,9 @@ test('when the allocation is not found, the application errors', function(assert `/allocations/not-a-real-allocation/${task.name}`, 'The URL persists' ); - assert.ok(find('.error-message'), 'Error message is shown'); + assert.ok(find('[data-test-error]'), 'Error message is shown'); assert.equal( - find('.error-message .title').textContent, + find('[data-test-error-title]').textContent, 'Not Found', 'Error message is for 404' ); @@ -196,9 +179,9 @@ test('when the allocation is found but the task is not, the application errors', `/allocations/${allocation.id}/not-a-real-task-name`, 'The URL persists' ); - assert.ok(find('.error-message'), 'Error message is shown'); + assert.ok(find('[data-test-error]'), 'Error message is shown'); assert.equal( - find('.error-message .title').textContent, + find('[data-test-error-title]').textContent, 'Not Found', 'Error message is for 404' ); @@ -218,5 +201,5 @@ moduleForAcceptance('Acceptance | task detail (no addresses)', { }); test('when the task has no addresses, the addresses table is not shown', function(assert) { - assert.notOk(find('.addresses-list'), 'No addresses table'); + assert.notOk(find('[data-test-task-addresses]'), 'No addresses table'); }); diff --git a/ui/tests/acceptance/task-group-detail-test.js b/ui/tests/acceptance/task-group-detail-test.js index e729e1300..c9665b966 100644 --- a/ui/tests/acceptance/task-group-detail-test.js +++ b/ui/tests/acceptance/task-group-detail-test.js @@ -1,12 +1,9 @@ -import Ember from 'ember'; import { click, find, findAll, fillIn, currentURL, visit } from 'ember-native-dom-helpers'; import { test } from 'qunit'; import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance'; import { formatBytes } from 'nomad-ui/helpers/format-bytes'; import moment from 'moment'; -const { $ } = Ember; - let job; let taskGroup; let tasks; @@ -58,43 +55,47 @@ test('/jobs/:id/:task-group should list high-level metrics for the allocation', const totalDisk = taskGroup.ephemeralDisk.SizeMB; assert.equal( - findAll('.inline-definitions .pair')[0].textContent, + find('[data-test-task-group-tasks]').textContent, `# Tasks ${tasks.length}`, '# Tasks' ); assert.equal( - findAll('.inline-definitions .pair')[1].textContent, + find('[data-test-task-group-cpu]').textContent, `Reserved CPU ${totalCPU} MHz`, 'Aggregated CPU reservation for all tasks' ); assert.equal( - findAll('.inline-definitions .pair')[2].textContent, + find('[data-test-task-group-mem]').textContent, `Reserved Memory ${totalMemory} MiB`, 'Aggregated Memory reservation for all tasks' ); assert.equal( - findAll('.inline-definitions .pair')[3].textContent, + find('[data-test-task-group-disk]').textContent, `Reserved Disk ${totalDisk} MiB`, 'Aggregated Disk reservation for all tasks' ); }); test('/jobs/:id/:task-group should have breadcrumbs for job and jobs', function(assert) { - assert.equal(findAll('.breadcrumb')[0].textContent.trim(), 'Jobs', 'First breadcrumb says jobs'); assert.equal( - findAll('.breadcrumb')[1].textContent.trim(), + find('[data-test-breadcrumb="Jobs"]').textContent.trim(), + 'Jobs', + 'First breadcrumb says jobs' + ); + assert.equal( + find(`[data-test-breadcrumb="${job.name}"]`).textContent.trim(), job.name, 'Second breadcrumb says the job name' ); assert.equal( - findAll('.breadcrumb')[2].textContent.trim(), + find(`[data-test-breadcrumb="${taskGroup.name}"]`).textContent.trim(), taskGroup.name, 'Third breadcrumb says the job name' ); }); test('/jobs/:id/:task-group first breadcrumb should link to jobs', function(assert) { - click(findAll('.breadcrumb')[0]); + click('[data-test-breadcrumb="Jobs"]'); andThen(() => { assert.equal(currentURL(), '/jobs', 'First breadcrumb links back to jobs'); }); @@ -103,7 +104,7 @@ test('/jobs/:id/:task-group first breadcrumb should link to jobs', function(asse test('/jobs/:id/:task-group second breadcrumb should link to the job for the task group', function( assert ) { - click(findAll('.breadcrumb')[1]); + click(`[data-test-breadcrumb="${job.name}"]`); andThen(() => { assert.equal( currentURL(), @@ -133,7 +134,7 @@ test('/jobs/:id/:task-group should list one page of allocations for the task gro ); assert.equal( - findAll('.allocations tbody tr').length, + findAll('[data-test-allocation]').length, pageSize, 'All allocations for the task group' ); @@ -142,60 +143,42 @@ test('/jobs/:id/:task-group should list one page of allocations for the task gro test('each allocation should show basic information about the allocation', function(assert) { const allocation = allocations.sortBy('modifyIndex').reverse()[0]; - const allocationRow = $(findAll('.allocations tbody tr')[0]); + const allocationRow = find('[data-test-allocation]'); andThen(() => { assert.equal( - allocationRow - .find('td:eq(0)') - .text() - .trim(), + allocationRow.querySelector('[data-test-short-id]').textContent.trim(), allocation.id.split('-')[0], 'Allocation short id' ); assert.equal( - allocationRow - .find('td:eq(1)') - .text() - .trim(), + allocationRow.querySelector('[data-test-modify-time]').textContent.trim(), moment(allocation.modifyTime / 1000000).format('MM/DD HH:mm:ss'), 'Allocation modify time' ); assert.equal( - allocationRow - .find('td:eq(2)') - .text() - .trim(), + allocationRow.querySelector('[data-test-name]').textContent.trim(), allocation.name, 'Allocation name' ); assert.equal( - allocationRow - .find('td:eq(3)') - .text() - .trim(), + allocationRow.querySelector('[data-test-client-status]').textContent.trim(), allocation.clientStatus, 'Client status' ); assert.equal( - allocationRow - .find('td:eq(4)') - .text() - .trim(), + allocationRow.querySelector('[data-test-job-version]').textContent.trim(), allocation.jobVersion, 'Job Version' ); assert.equal( - allocationRow - .find('td:eq(5)') - .text() - .trim(), + allocationRow.querySelector('[data-test-client]').textContent.trim(), server.db.nodes.find(allocation.nodeId).id.split('-')[0], 'Node ID' ); }); - click(allocationRow.find('td:eq(5) a').get(0)); + click(allocationRow.querySelector('[data-test-client] a')); andThen(() => { assert.equal(currentURL(), `/clients/${allocation.nodeId}`, 'Node links to node page'); @@ -206,7 +189,7 @@ test('each allocation should show stats about the allocation, retrieved directly assert ) { const allocation = allocations.sortBy('name')[0]; - const allocationRow = $(findAll('.allocations tbody tr')[0]); + const allocationRow = find('[data-test-allocation]'); const allocStats = server.db.clientAllocationStats.find(allocation.id); const tasks = taskGroup.taskIds.map(id => server.db.tasks.find(id)); @@ -214,31 +197,25 @@ test('each allocation should show stats about the allocation, retrieved directly const memoryUsed = tasks.reduce((sum, task) => sum + task.Resources.MemoryMB, 0); assert.equal( - allocationRow - .find('td:eq(6)') - .text() - .trim(), + allocationRow.querySelector('[data-test-cpu]').textContent.trim(), Math.floor(allocStats.resourceUsage.CpuStats.TotalTicks) / cpuUsed, 'CPU %' ); assert.equal( - allocationRow.find('td:eq(6) .tooltip').attr('aria-label'), + allocationRow.querySelector('[data-test-cpu] .tooltip').getAttribute('aria-label'), `${Math.floor(allocStats.resourceUsage.CpuStats.TotalTicks)} / ${cpuUsed} MHz`, 'Detailed CPU information is in a tooltip' ); assert.equal( - allocationRow - .find('td:eq(7)') - .text() - .trim(), + allocationRow.querySelector('[data-test-mem]').textContent.trim(), allocStats.resourceUsage.MemoryStats.RSS / 1024 / 1024 / memoryUsed, 'Memory used' ); assert.equal( - allocationRow.find('td:eq(7) .tooltip').attr('aria-label'), + allocationRow.querySelector('[data-test-mem] .tooltip').getAttribute('aria-label'), `${formatBytes([allocStats.resourceUsage.MemoryStats.RSS])} / ${memoryUsed} MiB`, 'Detailed memory information is in a tooltip' ); @@ -256,7 +233,7 @@ test('when the allocation search has no matches, there is an empty message', fun fillIn('.search-box input', 'zzzzzz'); andThen(() => { - assert.ok(find('.allocations .empty-message')); - assert.equal(find('.allocations .empty-message-headline').textContent, 'No Matches'); + assert.ok(find('[data-test-empty-allocations-list]')); + assert.equal(find('[data-test-empty-allocations-list-headline]').textContent, 'No Matches'); }); }); diff --git a/ui/tests/acceptance/task-logs-test.js b/ui/tests/acceptance/task-logs-test.js index 77614c1e6..e59fb6af2 100644 --- a/ui/tests/acceptance/task-logs-test.js +++ b/ui/tests/acceptance/task-logs-test.js @@ -1,10 +1,8 @@ -import Ember from 'ember'; +import { run } from '@ember/runloop'; import { find } from 'ember-native-dom-helpers'; import { test } from 'qunit'; import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance'; -const { run } = Ember; - let allocation; let task; @@ -24,7 +22,7 @@ moduleForAcceptance('Acceptance | task logs', { test('/allocation/:id/:task_name/logs should have a log component', function(assert) { assert.equal(currentURL(), `/allocations/${allocation.id}/${task.name}/logs`, 'No redirect'); - assert.ok(find('.task-log'), 'Task log component found'); + assert.ok(find('[data-test-task-log]'), 'Task log component found'); }); test('the stdout log immediately starts streaming', function(assert) { diff --git a/ui/tests/acceptance/token-test.js b/ui/tests/acceptance/token-test.js index 2e62bd9e1..110d72010 100644 --- a/ui/tests/acceptance/token-test.js +++ b/ui/tests/acceptance/token-test.js @@ -1,10 +1,7 @@ import { find, findAll, fillIn, click, visit } from 'ember-native-dom-helpers'; -import Ember from 'ember'; import { test, skip } from 'ember-qunit'; import moduleForAcceptance from 'nomad-ui/tests/helpers/module-for-acceptance'; -const { $ } = Ember; - let job; let node; let managementToken; @@ -28,8 +25,8 @@ test('the token form sets the token in session storage', function(assert) { andThen(() => { assert.ok(window.sessionStorage.nomadTokenSecret == null, 'No token secret set'); - fillIn('.token-secret', secretId); - click('.token-submit'); + fillIn('[data-test-token-secret]', secretId); + click('[data-test-token-submit]'); andThen(() => { assert.equal(window.sessionStorage.nomadTokenSecret, secretId, 'Token secret was set'); @@ -57,8 +54,8 @@ skip('the X-Nomad-Token header gets sent with requests once it is set', function visit('/settings/tokens'); andThen(() => { - fillIn('.token-secret', secretId); - click('.token-submit'); + fillIn('[data-test-token-secret]', secretId); + click('[data-test-token-submit]'); }); visit(`/jobs/${job.id}`); @@ -87,17 +84,17 @@ test('an error message is shown when authenticating a token fails', function(ass visit('/settings/tokens'); andThen(() => { - fillIn('.token-secret', bogusSecret); - click('.token-submit'); + fillIn('[data-test-token-secret]', bogusSecret); + click('[data-test-token-submit]'); andThen(() => { assert.ok( window.sessionStorage.nomadTokenSecret == null, 'Token secret is discarded on failure' ); - assert.ok(find('.token-error'), 'Token error message is shown'); - assert.notOk(find('.token-success'), 'Token success message is not shown'); - assert.notOk(find('.token-policy'), 'No token policies are shown'); + assert.ok(find('[data-test-token-error]'), 'Token error message is shown'); + assert.notOk(find('[data-test-token-success]'), 'Token success message is not shown'); + assert.notOk(find('[data-test-token-policy]'), 'No token policies are shown'); }); }); }); @@ -110,14 +107,14 @@ test('a success message and a special management token message are shown when au visit('/settings/tokens'); andThen(() => { - fillIn('.token-secret', secretId); - click('.token-submit'); + fillIn('[data-test-token-secret]', secretId); + click('[data-test-token-submit]'); andThen(() => { - assert.ok(find('.token-success'), 'Token success message is shown'); - assert.notOk(find('.token-error'), 'Token error message is not shown'); - assert.ok(find('.token-management-message'), 'Token management message is shown'); - assert.notOk(find('.token-policy'), 'No token policies are shown'); + assert.ok(find('[data-test-token-success]'), 'Token success message is shown'); + assert.notOk(find('[data-test-token-error]'), 'Token error message is not shown'); + assert.ok(find('[data-test-token-management-message]'), 'Token management message is shown'); + assert.notOk(find('[data-test-token-policy]'), 'No token policies are shown'); }); }); }); @@ -132,39 +129,36 @@ test('a success message and associated policies are shown when authenticating su visit('/settings/tokens'); andThen(() => { - fillIn('.token-secret', secretId); - click('.token-submit'); + fillIn('[data-test-token-secret]', secretId); + click('[data-test-token-submit]'); andThen(() => { - assert.ok(find('.token-success'), 'Token success message is shown'); - assert.notOk(find('.token-error'), 'Token error message is not shown'); - assert.notOk(find('.token-management-message'), 'Token management message is not shown'); + assert.ok(find('[data-test-token-success]'), 'Token success message is shown'); + assert.notOk(find('[data-test-token-error]'), 'Token error message is not shown'); + assert.notOk( + find('[data-test-token-management-message]'), + 'Token management message is not shown' + ); assert.equal( - findAll('.token-policy').length, + findAll('[data-test-token-policy]').length, clientToken.policies.length, 'Each policy associated with the token is listed' ); - const policyElement = $(find('.token-policy')); + const policyElement = find('[data-test-token-policy]'); assert.equal( - policyElement - .find('.boxed-section-head') - .text() - .trim(), + policyElement.querySelector('[data-test-policy-name]').textContent.trim(), policy.name, 'Policy Name' ); assert.equal( - policyElement - .find('.boxed-section-body p.content') - .text() - .trim(), + policyElement.querySelector('[data-test-policy-description]').textContent.trim(), policy.description, 'Policy Description' ); assert.equal( - policyElement.find('.boxed-section-body pre code').text(), + policyElement.querySelector('[data-test-policy-rules]').textContent, policy.rules, 'Policy Rules' ); @@ -184,8 +178,8 @@ test('setting a token clears the store', function(assert) { visit('/settings/tokens'); andThen(() => { - fillIn('.token-secret', secretId); - click('.token-submit'); + fillIn('[data-test-token-secret]', secretId); + click('[data-test-token-submit]'); }); // Don't return jobs from the API the second time around @@ -198,7 +192,7 @@ test('setting a token clears the store', function(assert) { visit('/jobs'); // If jobs are lingering in the store, they would show up - assert.notOk(find('.job-row'), 'No jobs found'); + assert.notOk(find('[data-test-job-row]'), 'No jobs found'); }); function getHeader({ requestHeaders }, name) { diff --git a/ui/tests/helpers/destroy-app.js b/ui/tests/helpers/destroy-app.js index 1807e213c..28dec908e 100644 --- a/ui/tests/helpers/destroy-app.js +++ b/ui/tests/helpers/destroy-app.js @@ -1,7 +1,7 @@ -import Ember from 'ember'; +import { run } from '@ember/runloop'; export default function destroyApp(application) { - Ember.run(application, 'destroy'); + run(application, 'destroy'); if (window.server) { window.server.shutdown(); } diff --git a/ui/tests/helpers/module-for-acceptance.js b/ui/tests/helpers/module-for-acceptance.js index e37a54003..44fe4e0e2 100644 --- a/ui/tests/helpers/module-for-acceptance.js +++ b/ui/tests/helpers/module-for-acceptance.js @@ -1,10 +1,8 @@ +import { Promise } from 'rsvp'; import { module } from 'qunit'; -import Ember from 'ember'; import startApp from '../helpers/start-app'; import destroyApp from '../helpers/destroy-app'; -const { RSVP: { Promise } } = Ember; - export default function(name, options = {}) { module(name, { beforeEach() { diff --git a/ui/tests/helpers/module-for-serializer.js b/ui/tests/helpers/module-for-serializer.js index e2a1fec8a..d5cd2fc8b 100644 --- a/ui/tests/helpers/module-for-serializer.js +++ b/ui/tests/helpers/module-for-serializer.js @@ -1,9 +1,7 @@ -import Ember from 'ember'; +import { getOwner } from '@ember/application'; import { moduleForModel } from 'ember-qunit'; import { initialize as fragmentSerializerInitializer } from 'nomad-ui/initializers/fragment-serializer'; -const { getOwner } = Ember; - export default function(modelName, description, options = { needs: [] }) { // moduleForModel correctly wires up #Serializer.store, // but module does not. diff --git a/ui/tests/helpers/start-app.js b/ui/tests/helpers/start-app.js index 56b8b8e02..2ff98a176 100644 --- a/ui/tests/helpers/start-app.js +++ b/ui/tests/helpers/start-app.js @@ -1,4 +1,5 @@ -import Ember from 'ember'; +import { run } from '@ember/runloop'; +import { merge } from '@ember/polyfills'; import Application from '../../app'; import config from '../../config/environment'; import registerPowerSelectHelpers from '../../tests/helpers/ember-power-select'; @@ -6,10 +7,10 @@ import registerPowerSelectHelpers from '../../tests/helpers/ember-power-select'; registerPowerSelectHelpers(); export default function startApp(attrs) { - let attributes = Ember.merge({}, config.APP); - attributes = Ember.merge(attributes, attrs); // use defaults, but you can override; + let attributes = merge({}, config.APP); + attributes = merge(attributes, attrs); // use defaults, but you can override; - return Ember.run(() => { + return run(() => { let application = Application.create(attributes); application.setupForTesting(); application.injectTestHelpers(); diff --git a/ui/tests/integration/attributes-table-test.js b/ui/tests/integration/attributes-table-test.js index 3147ff638..ea0fe99d5 100644 --- a/ui/tests/integration/attributes-table-test.js +++ b/ui/tests/integration/attributes-table-test.js @@ -1,4 +1,4 @@ -import { findAll } from 'ember-native-dom-helpers'; +import { find, findAll } from 'ember-native-dom-helpers'; import { test, moduleForComponent } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import flat from 'npm:flat'; @@ -32,7 +32,7 @@ test('should render a row for each key/value pair in a deep object', function(as const rowsCount = Object.keys(flatten(commonAttributes)).length; assert.equal( - this.$('tbody tr').has('td:eq(1)').length, + this.$('[data-test-attributes-section]').has('[data-test-value]').length, rowsCount, `Table has ${rowsCount} rows with values` ); @@ -42,40 +42,21 @@ test('should render the full path of key/value pair from the root of the object' this.set('attributes', commonAttributes); this.render(hbs`{{attributes-table attributes=attributes}}`); - assert.equal( - this.$('tbody tr:eq(0) td') - .get(0) - .textContent.trim(), - 'key', - 'Simple row renders only the key' - ); - assert.equal( - this.$('tbody tr:eq(0) td') - .get(1) - .textContent.trim(), - 'value' - ); + assert.equal(find('[data-test-key]').textContent.trim(), 'key', 'Row renders the key'); + assert.equal(find('[data-test-value]').textContent.trim(), 'value', 'Row renders the value'); + const deepRow = findAll('[data-test-attributes-section]')[8]; assert.equal( - this.$('tbody tr:eq(8) td') - .get(0) - .textContent.trim(), + deepRow.querySelector('[data-test-key]').textContent.trim(), 'so.are.deeply.nested', 'Complex row renders the full path to the key' ); assert.equal( - this.$('tbody tr:eq(8) td:eq(0) .is-faded') - .get(0) - .textContent.trim(), + deepRow.querySelector('[data-test-prefix]').textContent.trim(), 'so.are.deeply.', 'The prefix is faded to put emphasis on the attribute' ); - assert.equal( - this.$('tbody tr:eq(8) td') - .get(1) - .textContent.trim(), - 'properties' - ); + assert.equal(deepRow.querySelector('[data-test-value]').textContent.trim(), 'properties'); }); test('should render a row for key/value pairs even when the value is another object', function( @@ -86,7 +67,7 @@ test('should render a row for key/value pairs even when the value is another obj const countOfParentRows = countOfParentKeys(commonAttributes); assert.equal( - findAll('tbody tr td[colspan="2"]').length, + findAll('[data-test-heading]').length, countOfParentRows, 'Each key for a nested object gets a row with no value' ); diff --git a/ui/tests/integration/job-diff-test.js b/ui/tests/integration/job-diff-test.js index 087cbbd9f..d1821e452 100644 --- a/ui/tests/integration/job-diff-test.js +++ b/ui/tests/integration/job-diff-test.js @@ -29,22 +29,28 @@ test('job field diffs', function(assert) { this.render(commonTemplate); assert.equal( - findAll('.diff-section-label').length, + findAll('[data-test-diff-section-label]').length, 5, 'A section label for each line, plus one for the group' ); assert.equal( - cleanWhitespace(find('.diff-section-label .diff-section-label.is-added').textContent), + cleanWhitespace( + find('[data-test-diff-section-label="field"][data-test-diff-field="added"]').textContent + ), '+ Added Field: "Foobar"', 'Added field is rendered correctly' ); assert.equal( - cleanWhitespace(find('.diff-section-label .diff-section-label.is-edited').textContent), + cleanWhitespace( + find('[data-test-diff-section-label="field"][data-test-diff-field="edited"]').textContent + ), '+/- Edited Field: "256" => "512"', 'Edited field is rendered correctly' ); assert.equal( - cleanWhitespace(find('.diff-section-label .diff-section-label.is-deleted').textContent), + cleanWhitespace( + find('[data-test-diff-section-label="field"][data-test-diff-field="deleted"]').textContent + ), '- Removed Field: "12"', 'Removed field is rendered correctly' ); @@ -98,51 +104,53 @@ test('job object diffs', function(assert) { assert.ok( cleanWhitespace( - find('.diff-section-label > .diff-section-label.is-added').textContent + find('[data-test-diff-section-label="object"][data-test-diff-field="added"]').textContent ).startsWith('+ DeepConfiguration {'), 'Added object starts with a JSON block' ); assert.ok( cleanWhitespace( - find('.diff-section-label > .diff-section-label.is-edited').textContent + find('[data-test-diff-section-label="object"][data-test-diff-field="edited"]').textContent ).startsWith('+/- ComplexProperty {'), 'Edited object starts with a JSON block' ); assert.ok( cleanWhitespace( - find('.diff-section-label > .diff-section-label.is-deleted').textContent + find('[data-test-diff-section-label="object"][data-test-diff-field="deleted"]').textContent ).startsWith('- DatedStuff {'), 'Removed object starts with a JSON block' ); assert.ok( cleanWhitespace( - find('.diff-section-label > .diff-section-label.is-added').textContent + find('[data-test-diff-section-label="object"][data-test-diff-field="added"]').textContent ).endsWith('}'), 'Added object ends the JSON block' ); assert.ok( cleanWhitespace( - find('.diff-section-label > .diff-section-label.is-edited').textContent + find('[data-test-diff-section-label="object"][data-test-diff-field="edited"]').textContent ).endsWith('}'), 'Edited object starts with a JSON block' ); assert.ok( cleanWhitespace( - find('.diff-section-label > .diff-section-label.is-deleted').textContent + find('[data-test-diff-section-label="object"][data-test-diff-field="deleted"]').textContent ).endsWith('}'), 'Removed object ends the JSON block' ); assert.equal( - findAll('.diff-section-label > .diff-section-label.is-added > .diff-section-label').length, + findAll( + '[data-test-diff-section-label="object"][data-test-diff-field="added"] > [data-test-diff-section-label]' + ).length, this.get('diff').Objects[1].Objects.length + this.get('diff').Objects[1].Fields.length, 'Edited block contains each nested field and object' ); assert.equal( findAll( - '.diff-section-label > .diff-section-label.is-added > .diff-section-label > .diff-section-label .diff-section-table-row' + '[data-test-diff-section-label="object"][data-test-diff-field="added"] [data-test-diff-section-label="object"] [data-test-diff-section-label="field"]' ).length, this.get('diff').Objects[1].Objects[0].Fields.length, 'Objects within objects are rendered' diff --git a/ui/tests/integration/task-log-test.js b/ui/tests/integration/task-log-test.js index 2d58d6fe4..62f849ae6 100644 --- a/ui/tests/integration/task-log-test.js +++ b/ui/tests/integration/task-log-test.js @@ -1,4 +1,4 @@ -import Ember from 'ember'; +import { run } from '@ember/runloop'; import { test, moduleForComponent } from 'ember-qunit'; import wait from 'ember-test-helpers/wait'; import { find, click } from 'ember-native-dom-helpers'; @@ -6,8 +6,6 @@ import hbs from 'htmlbars-inline-precompile'; import Pretender from 'pretender'; import { logEncode } from '../../mirage/data/logs'; -const { run } = Ember; - const HOST = '1.1.1.1:1111'; const commonProps = { interval: 50, @@ -64,13 +62,13 @@ test('Basic appearance', function(assert) { this.setProperties(commonProps); this.render(hbs`{{task-log allocation=allocation task=task}}`); - assert.ok(find('.action-stdout'), 'Stdout button'); - assert.ok(find('.action-stderr'), 'Stderr button'); - assert.ok(find('.action-head'), 'Head button'); - assert.ok(find('.action-tail'), 'Tail button'); - assert.ok(find('.action-toggle-stream'), 'Stream toggle button'); + assert.ok(find('[data-test-log-action="stdout"]'), 'Stdout button'); + assert.ok(find('[data-test-log-action="stderr"]'), 'Stderr button'); + assert.ok(find('[data-test-log-action="head"]'), 'Head button'); + assert.ok(find('[data-test-log-action="tail"]'), 'Tail button'); + assert.ok(find('[data-test-log-action="toggle-stream"]'), 'Stream toggle button'); - assert.ok(find('.boxed-section-body.is-full-bleed.is-dark'), 'Body is full-bleed and dark'); + assert.ok(find('[data-test-log-box].is-full-bleed.is-dark'), 'Body is full-bleed and dark'); assert.ok(find('pre.cli-window'), 'Cli is preformatted and using the cli-window component class'); }); @@ -89,7 +87,7 @@ test('Streaming starts on creation', function(assert) { return wait().then(() => { assert.equal( - find('.cli-window').textContent, + find('[data-test-log-cli]').textContent, streamFrames[0], 'First chunk of streaming log is shown' ); @@ -100,7 +98,7 @@ test('Clicking Head loads the log head', function(assert) { this.setProperties(commonProps); this.render(hbs`{{task-log allocation=allocation task=task}}`); - click('.action-head'); + click('[data-test-log-action="head"]'); return wait().then(() => { assert.ok( @@ -109,7 +107,7 @@ test('Clicking Head loads the log head', function(assert) { ), 'Log head request was made' ); - assert.equal(find('.cli-window').textContent, logHead[0], 'Head of the log is shown'); + assert.equal(find('[data-test-log-cli]').textContent, logHead[0], 'Head of the log is shown'); }); }); @@ -117,7 +115,7 @@ test('Clicking Tail loads the log tail', function(assert) { this.setProperties(commonProps); this.render(hbs`{{task-log allocation=allocation task=task}}`); - click('.action-tail'); + click('[data-test-log-action="tail"]'); return wait().then(() => { assert.ok( @@ -126,7 +124,7 @@ test('Clicking Tail loads the log tail', function(assert) { ), 'Log tail request was made' ); - assert.equal(find('.cli-window').textContent, logTail[0], 'Tail of the log is shown'); + assert.equal(find('[data-test-log-cli]').textContent, logTail[0], 'Tail of the log is shown'); }); }); @@ -136,21 +134,25 @@ test('Clicking toggleStream starts and stops the log stream', function(assert) { this.render(hbs`{{task-log allocation=allocation task=task interval=interval}}`); run.later(() => { - click('.action-toggle-stream'); + click('[data-test-log-action="toggle-stream"]'); }, interval); return wait().then(() => { - assert.equal(find('.cli-window').textContent, streamFrames[0], 'First frame loaded'); + assert.equal(find('[data-test-log-cli]').textContent, streamFrames[0], 'First frame loaded'); run.later(() => { - assert.equal(find('.cli-window').textContent, streamFrames[0], 'Still only first frame'); - click('.action-toggle-stream'); + assert.equal( + find('[data-test-log-cli]').textContent, + streamFrames[0], + 'Still only first frame' + ); + click('[data-test-log-action="toggle-stream"]'); run.later(run, run.cancelTimers, interval * 2); }, interval * 2); return wait().then(() => { assert.equal( - find('.cli-window').textContent, + find('[data-test-log-cli]').textContent, streamFrames[0] + streamFrames[0] + streamFrames[1], 'Now includes second frame' ); @@ -162,7 +164,7 @@ test('Clicking stderr switches the log to standard error', function(assert) { this.setProperties(commonProps); this.render(hbs`{{task-log allocation=allocation task=task}}`); - click('.action-stderr'); + click('[data-test-log-action="stderr"]'); run.later(run, run.cancelTimers, commonProps.interval); return wait().then(() => { diff --git a/ui/tests/unit/mixins/searchable-test.js b/ui/tests/unit/mixins/searchable-test.js index dbe9d56a6..4478913a2 100644 --- a/ui/tests/unit/mixins/searchable-test.js +++ b/ui/tests/unit/mixins/searchable-test.js @@ -1,15 +1,15 @@ -import Ember from 'ember'; +import { alias } from '@ember/object/computed'; +import { getOwner } from '@ember/application'; +import EmberObject, { computed } from '@ember/object'; import { moduleFor, test } from 'ember-qunit'; import Searchable from 'nomad-ui/mixins/searchable'; -const { getOwner, computed } = Ember; - moduleFor('mixin:searchable', 'Unit | Mixin | Searchable', { subject() { - const SearchableObject = Ember.Object.extend(Searchable, { + const SearchableObject = EmberObject.extend(Searchable, { source: null, searchProps: computed(() => ['id', 'name']), - listToSearch: computed.alias('source'), + listToSearch: alias('source'), }); this.register('test-container:searchable-object', SearchableObject); diff --git a/ui/tests/unit/models/task-group-test.js b/ui/tests/unit/models/task-group-test.js index b5262e4fa..7f7014bcd 100644 --- a/ui/tests/unit/models/task-group-test.js +++ b/ui/tests/unit/models/task-group-test.js @@ -1,7 +1,6 @@ -import Ember from 'ember'; +import { get } from '@ember/object'; import { moduleForModel, test } from 'ember-qunit'; -const { get } = Ember; const sum = (list, key) => list.reduce((sum, item) => sum + get(item, key), 0); moduleForModel('task-group', 'Unit | Model | task-group', { diff --git a/ui/tests/unit/utils/log-test.js b/ui/tests/unit/utils/log-test.js index e4842301a..94faed822 100644 --- a/ui/tests/unit/utils/log-test.js +++ b/ui/tests/unit/utils/log-test.js @@ -1,11 +1,11 @@ -import Ember from 'ember'; +import EmberObject from '@ember/object'; +import RSVP from 'rsvp'; +import { run } from '@ember/runloop'; import sinon from 'sinon'; import wait from 'ember-test-helpers/wait'; import { module, test } from 'ember-qunit'; import _Log from 'nomad-ui/utils/classes/log'; -const { Object: EmberObject, RSVP, run } = Ember; - let startSpy, stopSpy, initSpy, fetchSpy; const MockStreamer = EmberObject.extend({ diff --git a/ui/yarn.lock b/ui/yarn.lock index 62c3cdee1..31ac06177 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -2,86 +2,24 @@ # yarn lockfile v1 -"@glimmer/compiler@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.22.3.tgz#3aef9448460af1d320a82423323498a6ff38a0c6" +"@ember/test-helpers@^0.7.9": + version "0.7.13" + resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-0.7.13.tgz#89523a101b5bd731e9dcaf7d0c57155b6386a4e3" dependencies: - "@glimmer/syntax" "^0.22.3" - "@glimmer/util" "^0.22.3" - "@glimmer/wire-format" "^0.22.3" - simple-html-tokenizer "^0.3.0" + broccoli-funnel "^2.0.1" + ember-cli-babel "^6.10.0" + ember-cli-htmlbars-inline-precompile "^1.0.0" "@glimmer/di@^0.2.0": version "0.2.0" resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.2.0.tgz#73bfd4a6ee4148a80bf092e8a5d29bcac9d4ce7e" -"@glimmer/interfaces@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.22.3.tgz#1c2e3289ae41a750f0c8ddcc64529b9e90dda604" - dependencies: - "@glimmer/wire-format" "^0.22.3" - -"@glimmer/node@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.22.3.tgz#ff33eea6e65147a20c1bd1f05fdc4a6c3595c54c" - dependencies: - "@glimmer/runtime" "^0.22.3" - simple-dom "^0.3.0" - -"@glimmer/object-reference@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/object-reference/-/object-reference-0.22.3.tgz#31db68c8912324c63509b1ef83213f7ad4ef312b" - dependencies: - "@glimmer/reference" "^0.22.3" - "@glimmer/util" "^0.22.3" - -"@glimmer/object@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/object/-/object-0.22.3.tgz#1fc9fd7465c7d12e5b92464ad40038b595de8ed0" - dependencies: - "@glimmer/object-reference" "^0.22.3" - "@glimmer/util" "^0.22.3" - -"@glimmer/reference@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.22.3.tgz#6f2ef8cd97fe756d89fef75f8c3c79003502a2a9" - dependencies: - "@glimmer/util" "^0.22.3" - "@glimmer/resolver@^0.4.1": version "0.4.1" resolved "https://registry.yarnpkg.com/@glimmer/resolver/-/resolver-0.4.1.tgz#cd9644572c556e7e799de1cf8eff2b999cf5b878" dependencies: "@glimmer/di" "^0.2.0" -"@glimmer/runtime@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.22.3.tgz#b8cb28efc9cc86c406ee996f5c2cf6730620d404" - dependencies: - "@glimmer/interfaces" "^0.22.3" - "@glimmer/object" "^0.22.3" - "@glimmer/object-reference" "^0.22.3" - "@glimmer/reference" "^0.22.3" - "@glimmer/util" "^0.22.3" - "@glimmer/wire-format" "^0.22.3" - -"@glimmer/syntax@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.22.3.tgz#8528d19324bf7f920f5cfd31925e452e51781b44" - dependencies: - handlebars "^4.0.6" - simple-html-tokenizer "^0.3.0" - -"@glimmer/util@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.22.3.tgz#8272f50905d1bb904ee371e8ade83fd779b51508" - -"@glimmer/wire-format@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.22.3.tgz#19b226d9b93ba6ee54472d9ffb1d48e7c0d80a0d" - dependencies: - "@glimmer/util" "^0.22.3" - JSONStream@^1.0.3: version "1.3.1" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a" @@ -121,7 +59,11 @@ acorn@^4.0.3: version "4.0.13" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" -acorn@^5.0.3, acorn@^5.1.1: +acorn@^5.0.3, acorn@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7" + +acorn@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75" @@ -149,6 +91,15 @@ ajv@^5.2.0: json-schema-traverse "^0.3.0" json-stable-stringify "^1.0.1" +ajv@^5.3.0: + version "5.5.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.1.tgz#b38bb8876d9e86bee994956a04e721e88b248eb2" + dependencies: + co "^4.6.0" + fast-deep-equal "^1.0.0" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.3.0" + align-text@^0.1.1, align-text@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" @@ -163,18 +114,18 @@ alter@~0.2.0: dependencies: stable "~0.1.3" -amd-name-resolver@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.6.tgz#d3e4ba2dfcaab1d820c1be9de947c67828cfe595" - dependencies: - ensure-posix-path "^1.0.1" - 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" dependencies: ensure-posix-path "^1.0.1" +amd-name-resolver@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.0.0.tgz#0e593b28d6fa3326ab1798107edaea961046e8d8" + dependencies: + ensure-posix-path "^1.0.1" + amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" @@ -203,11 +154,11 @@ ansi-styles@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de" -ansi-styles@^2.1.0, ansi-styles@^2.2.1: +ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -ansi-styles@^3.1.0: +ansi-styles@^3.0.0, ansi-styles@^3.1.0, ansi-styles@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88" dependencies: @@ -217,6 +168,10 @@ ansicolors@~0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef" +any-observable@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.2.0.tgz#c67870058003579009083f54ac0abafb5c33d242" + anymatch@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" @@ -245,7 +200,7 @@ are-we-there-yet@~1.1.2: delegates "^1.0.0" readable-stream "^2.0.6" -argparse@^1.0.7, argparse@~1.0.2: +argparse@^1.0.7: version "1.0.9" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86" dependencies: @@ -318,8 +273,8 @@ arrify@^1.0.0: resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" asn1.js@^4.0.0: - version "4.9.1" - resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40" + version "4.9.2" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.2.tgz#8117ef4f7ed87cd8f89044b5bff97ac243a16c9a" dependencies: bn.js "^4.0.0" inherits "^2.0.1" @@ -402,6 +357,10 @@ async@~0.2.9: version "0.2.10" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" +async@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9" + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -414,7 +373,7 @@ aws4@^1.2.1: version "1.6.0" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" -babel-code-frame@^6.16.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: +babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" dependencies: @@ -637,7 +596,7 @@ babel-plugin-debug-macros@^0.1.10, babel-plugin-debug-macros@^0.1.11: dependencies: semver "^5.3.0" -babel-plugin-ember-modules-api-polyfill@^1.5.1: +babel-plugin-ember-modules-api-polyfill@^1.4.2, babel-plugin-ember-modules-api-polyfill@^1.5.1: 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" dependencies: @@ -649,6 +608,12 @@ babel-plugin-ember-modules-api-polyfill@^2.0.1: dependencies: ember-rfc176-data "^0.3.0" +babel-plugin-ember-modules-api-polyfill@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.3.0.tgz#0c01f359658cfb9c797f705af6b09f6220205ae0" + dependencies: + ember-rfc176-data "^0.3.0" + 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" @@ -1217,9 +1182,9 @@ broccoli-brocfile-loader@^0.18.0: dependencies: findup-sync "^0.4.2" -broccoli-builder@^0.18.3: - version "0.18.8" - resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.8.tgz#fe54694d544c3cdfdb01028e802eeca65749a879" +broccoli-builder@^0.18.8: + version "0.18.10" + resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.10.tgz#9767e0061ff5b5e6eb1619d1a972ef2c7fd07631" dependencies: heimdalljs "^0.2.0" promise-map-series "^0.2.1" @@ -1303,6 +1268,17 @@ broccoli-debug@^0.6.1, broccoli-debug@^0.6.2: symlink-or-copy "^1.1.8" tree-sync "^1.2.2" +broccoli-debug@^0.6.3: + version "0.6.4" + resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.4.tgz#986eb3d2005e00e3bb91f9d0a10ab137210cd150" + dependencies: + broccoli-plugin "^1.2.1" + fs-tree-diff "^0.5.2" + heimdalljs "^0.2.1" + heimdalljs-logger "^0.1.7" + symlink-or-copy "^1.1.8" + tree-sync "^1.2.2" + broccoli-file-creator@^1.0.0, 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" @@ -1354,7 +1330,7 @@ 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.0.6, broccoli-funnel@^1.1.0, broccoli-funnel@^1.2.0: +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" dependencies: @@ -1373,6 +1349,24 @@ 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@^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" + fast-ordered-set "^1.0.0" + fs-tree-diff "^0.5.3" + heimdalljs "^0.2.0" + minimatch "^3.0.0" + mkdirp "^0.5.0" + path-posix "^1.0.0" + rimraf "^2.4.3" + 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.4: version "0.2.9" resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc" @@ -1387,19 +1381,19 @@ broccoli-kitchen-sink-helpers@^0.3.1: glob "^5.0.10" mkdirp "^0.5.1" -broccoli-lint-eslint@^3.3.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/broccoli-lint-eslint/-/broccoli-lint-eslint-3.3.1.tgz#35c675546a5a7ad8f3319edd732e3aad8ca241de" +broccoli-lint-eslint@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/broccoli-lint-eslint/-/broccoli-lint-eslint-4.2.1.tgz#f780dc083a7357a9746a9cfa8f76feb092777477" dependencies: aot-test-generators "^0.1.0" broccoli-concat "^3.2.2" - broccoli-persistent-filter "^1.2.0" - eslint "^3.0.0" + broccoli-persistent-filter "^1.4.3" + eslint "^4.0.0" json-stable-stringify "^1.0.1" 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.2.1: +broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.2: version "1.2.4" resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5" dependencies: @@ -1419,14 +1413,14 @@ broccoli-merge-trees@^2.0.0: broccoli-plugin "^1.3.0" merge-trees "^1.0.1" -broccoli-middleware@^1.0.0-beta.8: +broccoli-middleware@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-1.0.0.tgz#92f4e1fb9a791ea986245a7077f35cc648dab097" dependencies: handlebars "^4.0.4" mime "^1.2.11" -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.2: +broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.4.0, broccoli-persistent-filter@^1.4.2, 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: @@ -1489,6 +1483,17 @@ broccoli-sass-source-maps@^2.0.0: object-assign "^2.0.0" rsvp "^3.0.6" +broccoli-sass-source-maps@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.1.1.tgz#5d71d3734234acb102000e5d7776d4c722aad756" + dependencies: + broccoli-caching-writer "^3.0.3" + include-path-searcher "^0.1.0" + mkdirp "^0.3.5" + node-sass "^4.1.0" + object-assign "^2.0.0" + rsvp "^3.0.6" + broccoli-slow-trees@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/broccoli-slow-trees/-/broccoli-slow-trees-3.0.1.tgz#9bf2a9e2f8eb3ed3a3f2abdde988da437ccdc9b4" @@ -1543,19 +1548,19 @@ broccoli-templater@^1.0.0: broccoli-stew "^1.2.0" lodash.template "^3.3.2" -broccoli-uglify-sourcemap@^1.0.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-1.5.2.tgz#04f84ab0db539031fa868ccfa563c9932d50cedb" +broccoli-uglify-sourcemap@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-2.0.1.tgz#e8f2f6c49e04b6e921f1ecd30e12f06fb75e585f" dependencies: broccoli-plugin "^1.2.1" - debug "^2.2.0" - lodash.merge "^4.5.1" - matcher-collection "^1.0.0" + debug "^3.1.0" + lodash.defaultsdeep "^4.6.0" + matcher-collection "^1.0.5" mkdirp "^0.5.0" - source-map-url "^0.3.0" + source-map-url "^0.4.0" symlink-or-copy "^1.0.1" - uglify-js "^2.7.0" - walk-sync "^0.1.3" + uglify-es "^3.1.3" + walk-sync "^0.3.2" broccoli-unwatched-tree@^0.1.1: version "0.1.3" @@ -1591,14 +1596,15 @@ browser-resolve@^1.11.0, browser-resolve@^1.7.0: resolve "1.1.7" browserify-aes@^1.0.0, browserify-aes@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a" + version "1.1.1" + resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f" dependencies: - buffer-xor "^1.0.2" + buffer-xor "^1.0.3" cipher-base "^1.0.0" create-hash "^1.1.0" - evp_bytestokey "^1.0.0" + evp_bytestokey "^1.0.3" inherits "^2.0.1" + safe-buffer "^5.0.1" browserify-cipher@^1.0.0: version "1.0.0" @@ -1700,13 +1706,20 @@ browserslist@^2.1.2: caniuse-lite "^1.0.30000718" electron-to-chromium "^1.3.18" +browserslist@^2.2.2: + version "2.10.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.10.0.tgz#bac5ee1cc69ca9d96403ffb8a3abdc5b6aed6346" + dependencies: + caniuse-lite "^1.0.30000780" + electron-to-chromium "^1.3.28" + bser@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719" dependencies: node-int64 "^0.4.0" -buffer-xor@^1.0.2: +buffer-xor@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" @@ -1718,6 +1731,21 @@ buffer@^4.1.0: ieee754 "^1.1.4" isarray "^1.0.0" +build@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/build/-/build-0.1.4.tgz#707fe026ffceddcacbfdcdf356eafda64f151046" + dependencies: + cssmin "0.3.x" + jsmin "1.x" + jxLoader "*" + moo-server "*" + promised-io "*" + timespan "2.x" + uglify-js "1.x" + walker "1.x" + winston "*" + wrench "1.3.x" + builtin-modules@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" @@ -1730,9 +1758,9 @@ builtins@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" -bulma@0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.4.2.tgz#3be8c832cf6658bfc421ecb41f6dc5a8a0c7c0e5" +bulma@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.6.1.tgz#5f21a77c0c06f7d80051c06628c23516081bd649" bytes@1: version "1.0.0" @@ -1746,7 +1774,7 @@ 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.0.0: +calculate-cache-key-for-tree@^1.0.0, 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" dependencies: @@ -1799,18 +1827,22 @@ caniuse-lite@^1.0.30000718: version "1.0.30000718" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000718.tgz#0dd24290beb11310b2d80f6b70a823c2a65a6fad" +caniuse-lite@^1.0.30000780: + version "1.0.30000782" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000782.tgz#5b82b8c385f25348745c471ca51320afb1b7f254" + capture-exit@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f" dependencies: rsvp "^3.3.3" -cardinal@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-0.5.0.tgz#00d5f661dbd4aabfdf7d41ce48a5a59bca35a291" +cardinal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9" dependencies: ansicolors "~0.2.1" - redeyed "~0.5.0" + redeyed "~1.0.0" caseless@~0.12.0: version "0.12.0" @@ -1851,6 +1883,14 @@ chalk@^2.0.0, chalk@^2.1.0: escape-string-regexp "^1.0.5" supports-color "^4.0.0" +chalk@^2.0.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba" + dependencies: + ansi-styles "^3.1.0" + escape-string-regexp "^1.0.5" + supports-color "^4.0.0" + charm@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35" @@ -1928,6 +1968,10 @@ cli-spinners@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c" +cli-spinners@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.1.0.tgz#f1847b168844d917a671eb9d147e3df497c90d06" + cli-table2@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/cli-table2/-/cli-table2-0.2.0.tgz#2d1ef7f218a0e786e214540562d4bd177fe32d97" @@ -2002,7 +2046,7 @@ color-name@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" -colors@1.0.3: +colors@1.0.3, colors@1.0.x: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" @@ -2037,6 +2081,20 @@ commander@2.9.0, commander@^2.5.0, commander@^2.6.0, commander@^2.9.0: dependencies: graceful-readlink ">= 1.0.0" +commander@^2.11.0: + version "2.13.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" + +commander@~2.12.1: + version "2.12.2" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555" + +common-tags@^1.4.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.6.0.tgz#788e4bcc582f16993e5b2c92f76b1ccb80731537" + dependencies: + babel-runtime "^6.26.0" + commoner@~0.10.3: version "0.10.8" resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5" @@ -2089,7 +2147,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.4.7, concat-stream@^1.5.2, concat-stream@^1.6.0: +concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" dependencies: @@ -2126,13 +2184,13 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" -console-ui@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-1.0.3.tgz#31c524461b63422769f9e89c173495d91393721c" +console-ui@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-2.0.1.tgz#56d0721ebcc44e6c9c3de02f355f898aba41ea79" dependencies: - chalk "^1.1.3" - inquirer "^1.2.3" - ora "^0.2.0" + chalk "^2.1.0" + inquirer "^2" + ora "^1.3.0" through "^2.3.8" consolidate@^0.14.0: @@ -2181,15 +2239,19 @@ 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.4.1, core-js@^2.5.0: +core-js@^2.4.0, core-js@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.0.tgz#569c050918be6486b3837552028ae0466b717086" +core-js@^2.4.1: + version "2.5.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" + 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@^3.0.0: +core-object@^3.1.3: version "3.1.5" resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.5.tgz#fa627b87502adc98045e44678e9a8ec3b9c0d2a9" dependencies: @@ -2199,18 +2261,14 @@ core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" -cosmiconfig@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-1.1.0.tgz#0dea0f9804efdfb929fbb1b188e25553ea053d37" +cosmiconfig@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-3.1.0.tgz#640a94bf9847f321800403cd273af60665c73397" dependencies: - graceful-fs "^4.1.2" - js-yaml "^3.4.3" - minimist "^1.2.0" - object-assign "^4.0.1" - os-homedir "^1.0.1" - parse-json "^2.2.0" - pinkie-promise "^2.0.0" - require-from-string "^1.1.0" + is-directory "^0.3.1" + js-yaml "^3.9.0" + parse-json "^3.0.0" + require-from-string "^2.0.1" create-ecdh@^4.0.0: version "4.0.0" @@ -2246,7 +2304,7 @@ cross-spawn@^3.0.0: lru-cache "^4.0.1" which "^1.2.9" -cross-spawn@^5.0.0, cross-spawn@^5.0.1, cross-spawn@^5.1.0: +cross-spawn@^5.0.1, cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" dependencies: @@ -2261,8 +2319,8 @@ cryptiles@2.x.x: boom "2.x.x" crypto-browserify@^3.0.0: - version "3.11.1" - resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.1.tgz#948945efc6757a400d6e5e5af47194d10064279f" + version "3.12.0" + resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" dependencies: browserify-cipher "^1.0.0" browserify-sign "^4.0.0" @@ -2274,11 +2332,16 @@ crypto-browserify@^3.0.0: pbkdf2 "^3.0.3" public-encrypt "^4.0.0" randombytes "^2.0.0" + randomfill "^1.0.3" 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" +cssmin@0.3.x: + version "0.3.2" + resolved "https://registry.yarnpkg.com/cssmin/-/cssmin-0.3.2.tgz#ddce4c547b510ae0d594a8f1fbf8aaf8e2c5c00d" + csso@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/csso/-/csso-2.0.0.tgz#178b43a44621221c27756086f531e02f42900ee8" @@ -2292,6 +2355,10 @@ currently-unhandled@^0.4.1: dependencies: array-find-index "^1.0.1" +cycle@1.0.x: + version "1.0.3" + resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2" + d3-color@1: version "1.0.3" resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.0.3.tgz#bc7643fca8e53a8347e2fbdaffa236796b58509b" @@ -2311,16 +2378,16 @@ d3-interpolate@1: d3-color "1" d3-selection@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.1.0.tgz#1998684896488f839ca0372123da34f1d318809c" + version "1.2.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.2.0.tgz#1b8ec1c7cedadfb691f2ba20a4a3cfbeb71bbc88" d3-timer@1: version "1.0.6" resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.6.tgz#4044bf15d7025c06ce7d1149f73cd07b54dbd784" d3-transition@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.1.0.tgz#cfc85c74e5239324290546623572990560c3966f" + version "1.1.1" + resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.1.1.tgz#d8ef89c3b848735b060e54a39b32aaebaa421039" dependencies: d3-color "1" d3-dispatch "1" @@ -2335,6 +2402,10 @@ d@1: dependencies: es5-ext "^0.10.9" +dag-map@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/dag-map/-/dag-map-2.0.2.tgz#9714b472de82a1843de2fba9b6876938cab44c68" + dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -2367,6 +2438,12 @@ debug@2.6.8, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.4. dependencies: ms "2.0.0" +debug@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + dependencies: + ms "2.0.0" + decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -2375,6 +2452,10 @@ decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" +dedent@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" + deep-extend@~0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" @@ -2476,7 +2557,14 @@ detect-indent@^4.0.0: dependencies: repeating "^2.0.0" -detective@^4.0.0, detective@^4.3.1: +detective@^4.0.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.0.tgz#6276e150f9e50829ad1f90ace4d9a2304188afcf" + dependencies: + acorn "^5.2.1" + defined "^1.0.0" + +detective@^4.3.1: version "4.5.0" resolved "https://registry.yarnpkg.com/detective/-/detective-4.5.0.tgz#6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1" dependencies: @@ -2502,6 +2590,12 @@ doctrine@^2.0.0: esutils "^2.0.2" isarray "^1.0.0" +doctrine@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.2.tgz#68f96ce8efc56cc42651f1faadb4f175273b0075" + dependencies: + esutils "^2.0.2" + domain-browser@~1.1.0: version "1.1.7" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" @@ -2536,6 +2630,10 @@ electron-to-chromium@^1.3.18: version "1.3.18" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.18.tgz#3dcc99da3e6b665f6abbc71c28ad51a2cd731a9c" +electron-to-chromium@^1.3.28: + version "1.3.28" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.28.tgz#8dd4e6458086644e9f9f0a1cf32e2a1f9dffd9ee" + elegant-spinner@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" @@ -2558,16 +2656,16 @@ ember-ajax@^3.0.0: dependencies: ember-cli-babel "^6.0.0" -ember-basic-dropdown@^0.33.1: - version "0.33.6" - resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-0.33.6.tgz#120d462c33ee5ea5ccb25a169e2b5af20d762d8a" +ember-basic-dropdown@^0.34.0: + version "0.34.0" + resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-0.34.0.tgz#a0371b7c06756cdd3170e7d4a9ed4f4890bc2d59" dependencies: - ember-cli-babel "^6.8.1" + ember-cli-babel "^6.8.2" ember-cli-htmlbars "^2.0.3" ember-native-dom-helpers "^0.5.4" ember-wormhole "^0.5.2" -ember-browserify@^1.1.13: +ember-browserify@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/ember-browserify/-/ember-browserify-1.2.0.tgz#c774896dc44ab2c5c608226f31628994348a3fd5" dependencies: @@ -2604,7 +2702,25 @@ ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7: 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.0.0-beta.9, ember-cli-babel@^6.1.0, ember-cli-babel@^6.4.1, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1: +ember-cli-babel@^6.0.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.11.0.tgz#79cb184bac3c05bfe181ddc306bac100ab1f9493" + dependencies: + amd-name-resolver "0.0.7" + babel-plugin-debug-macros "^0.1.11" + babel-plugin-ember-modules-api-polyfill "^2.3.0" + babel-plugin-transform-es2015-modules-amd "^6.24.0" + babel-polyfill "^6.16.0" + babel-preset-env "^1.5.1" + broccoli-babel-transpiler "^6.1.2" + broccoli-debug "^0.6.2" + broccoli-funnel "^1.0.0" + broccoli-source "^1.1.0" + clone "^2.0.0" + ember-cli-version-checker "^2.1.0" + semver "^5.4.1" + +ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.0.0-beta.9, ember-cli-babel@^6.4.1, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1: version "6.8.1" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.8.1.tgz#695f94c57a9375c2a0e219306a41105d6b937991" dependencies: @@ -2621,6 +2737,24 @@ ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-be clone "^2.0.0" ember-cli-version-checker "^2.0.0" +ember-cli-babel@^6.10.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.7.2: + version "6.10.0" + resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.10.0.tgz#81424acd1d97fb13658168121eeb2007d6edee84" + dependencies: + amd-name-resolver "0.0.7" + babel-plugin-debug-macros "^0.1.11" + babel-plugin-ember-modules-api-polyfill "^2.0.1" + babel-plugin-transform-es2015-modules-amd "^6.24.0" + babel-polyfill "^6.16.0" + babel-preset-env "^1.5.1" + broccoli-babel-transpiler "^6.1.2" + broccoli-debug "^0.6.2" + broccoli-funnel "^1.0.0" + broccoli-source "^1.1.0" + clone "^2.0.0" + ember-cli-version-checker "^2.1.0" + semver "^5.4.1" + ember-cli-babel@^6.8.2: version "6.9.0" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.9.0.tgz#5147391389bdbb7091d15f81ae1dff1eb49d71aa" @@ -2656,21 +2790,22 @@ ember-cli-broccoli-sane-watcher@^2.0.4: rsvp "^3.0.18" sane "^1.1.1" -ember-cli-dependency-checker@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-1.4.0.tgz#2b13f977e1eea843fc1a21a001be6ca5d4ef1942" +ember-cli-dependency-checker@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-2.1.0.tgz#9d66286a7c778e94733eaf21320d129c4fd0dd64" dependencies: - chalk "^0.5.1" - is-git-url "^0.2.0" - semver "^4.1.0" + chalk "^1.1.3" + is-git-url "^1.0.0" + resolve "^1.5.0" + semver "^5.3.0" -ember-cli-eslint@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/ember-cli-eslint/-/ember-cli-eslint-3.1.0.tgz#8d9e2a867654835ac1b24858d9117e143fa54bd4" +ember-cli-eslint@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/ember-cli-eslint/-/ember-cli-eslint-4.2.3.tgz#2844d3f5e8184f19b2d7132ba99eb0b370b55598" dependencies: - broccoli-lint-eslint "^3.3.0" - ember-cli-version-checker "^1.3.1" - rsvp "^3.2.1" + broccoli-lint-eslint "^4.2.1" + ember-cli-version-checker "^2.1.0" + rsvp "^4.6.1" walk-sync "^0.3.0" ember-cli-get-component-path-option@^1.0.0: @@ -2681,13 +2816,14 @@ ember-cli-get-dependency-depth@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-get-dependency-depth/-/ember-cli-get-dependency-depth-1.0.0.tgz#e0afecf82a2d52f00f28ab468295281aec368d11" -ember-cli-htmlbars-inline-precompile@^0.4.0: - version "0.4.4" - resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-0.4.4.tgz#24a7617152630d64a047e553b72e00963a4f8d73" +ember-cli-htmlbars-inline-precompile@^1.0.0, ember-cli-htmlbars-inline-precompile@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-1.0.2.tgz#5b544f664d5d9911f08cd979c5f70d8cb0ca2add" dependencies: babel-plugin-htmlbars-inline-precompile "^0.2.3" ember-cli-version-checker "^2.0.0" hash-for-dep "^1.0.2" + heimdalljs-logger "^0.1.7" silent-error "^1.1.0" ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.1.1, ember-cli-htmlbars@^1.3.0: @@ -2743,44 +2879,48 @@ ember-cli-legacy-blueprints@^0.1.2: rsvp "^3.0.17" silent-error "^1.0.0" -ember-cli-lodash-subset@^1.0.11, ember-cli-lodash-subset@^1.0.7: +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.3.3: - version "0.3.4" - resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.3.4.tgz#eeb9d6e02c0c49c81915762178bab9a42d86ada8" +ember-cli-lodash-subset@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2" + +ember-cli-mirage@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.4.1.tgz#bfdfe61e5e74dc3881ed31f12112dae1a29f0d4c" dependencies: broccoli-funnel "^1.0.2" broccoli-merge-trees "^1.1.0" broccoli-stew "^1.5.0" chalk "^1.1.1" - ember-cli-babel "^5.1.7" + ember-cli-babel "^6.8.2" ember-cli-node-assets "^0.1.4" - ember-get-config "0.2.1" + 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" faker "^3.0.0" - pretender "^1.4.2" + pretender "^1.6.1" route-recognizer "^0.2.3" -ember-cli-moment-shim@^3.3.3: - version "3.4.0" - resolved "https://registry.yarnpkg.com/ember-cli-moment-shim/-/ember-cli-moment-shim-3.4.0.tgz#2fbe13d8654097da86abb64016cddf12ff19a3de" +ember-cli-moment-shim@^3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/ember-cli-moment-shim/-/ember-cli-moment-shim-3.5.0.tgz#7ea8d42b0a04c767258287b30447681e52fba0c4" dependencies: - broccoli-funnel "^1.1.0" + broccoli-funnel "^2.0.0" broccoli-merge-trees "^2.0.0" broccoli-source "^1.1.0" - broccoli-stew "^1.4.0" + broccoli-stew "^1.5.0" chalk "^1.1.3" - ember-cli-babel "^6.6.0" + ember-cli-babel "^6.8.2" ember-cli-import-polyfill "^0.2.0" exists-sync "^0.0.4" lodash.defaults "^4.2.0" moment "^2.18.1" - moment-timezone "~0.5.11" + moment-timezone "^0.5.13" ember-cli-node-assets@^0.1.4: version "0.1.6" @@ -2816,22 +2956,14 @@ ember-cli-preprocess-registry@^3.1.0: process-relative-require "^1.0.0" silent-error "^1.0.0" -ember-cli-qunit@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-4.0.0.tgz#1f0022469a5bd64f627b8102880a25e94e533a3b" +ember-cli-qunit@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-4.2.1.tgz#89580e6eb157ee98b9eefbd48fba9bb75ea64544" dependencies: - broccoli-funnel "^1.0.1" - broccoli-merge-trees "^2.0.0" - ember-cli-babel "^6.0.0-beta.7" - ember-cli-test-loader "^2.0.0" - ember-cli-version-checker "^1.1.4" - ember-qunit "^2.1.3" - qunit-notifications "^0.1.1" - qunitjs "^2.0.1" - resolve "^1.1.6" - silent-error "^1.0.0" + ember-cli-babel "^6.8.1" + ember-qunit "^3.2.2" -ember-cli-sass@^6.1.3, ember-cli-sass@^6.2.0: +ember-cli-sass@^6.1.3: version "6.2.0" resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-6.2.0.tgz#e1f81289678e1e22d9cf9dbf7fa2de76a0de9a2f" dependencies: @@ -2841,12 +2973,23 @@ ember-cli-sass@^6.1.3, ember-cli-sass@^6.2.0: ember-cli-version-checker "^1.0.2" merge "^1.2.0" -ember-cli-shims@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ember-cli-shims/-/ember-cli-shims-1.1.0.tgz#0e3b8a048be865b4f81cc81d397ff1eeb13f75b6" +ember-cli-sass@^7.1.2: + version "7.1.3" + resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-7.1.3.tgz#d4a418d68bb513c40270b88576bd2cf07301fdf2" dependencies: - ember-cli-babel "^6.0.0-beta.7" - ember-cli-version-checker "^1.2.0" + broccoli-funnel "^1.0.0" + broccoli-merge-trees "^1.1.0" + broccoli-sass-source-maps "^2.1.0" + ember-cli-version-checker "^1.0.2" + +ember-cli-shims@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/ember-cli-shims/-/ember-cli-shims-1.2.0.tgz#0f53aff0aab80b5f29da3a9731bac56169dd941f" + dependencies: + broccoli-file-creator "^1.1.1" + broccoli-merge-trees "^2.0.0" + ember-cli-version-checker "^2.0.0" + ember-rfc176-data "^0.3.1" silent-error "^1.0.1" ember-cli-showdown@^3.2.1: @@ -2869,12 +3012,12 @@ ember-cli-sri@^2.1.0: dependencies: broccoli-sri-hash "^2.1.0" -ember-cli-string-helpers@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ember-cli-string-helpers/-/ember-cli-string-helpers-1.4.0.tgz#f7142a9499a149f69a9f2662b94f5f21eae0ec48" +ember-cli-string-helpers@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/ember-cli-string-helpers/-/ember-cli-string-helpers-1.5.0.tgz#b7c1b27ffd4bb4bf4846b3167f730f0125a96f44" dependencies: broccoli-funnel "^1.0.1" - ember-cli-babel "^5.1.7" + ember-cli-babel "^6.3.0" ember-cli-string-utils@^1.0.0, ember-cli-string-utils@^1.1.0: version "1.1.0" @@ -2886,17 +3029,18 @@ ember-cli-test-info@^1.0.0: dependencies: ember-cli-string-utils "^1.0.0" -ember-cli-test-loader@^2.0.0: +ember-cli-test-loader@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-2.2.0.tgz#3fb8d5d1357e4460d3f0a092f5375e71b6f7c243" dependencies: ember-cli-babel "^6.8.1" -ember-cli-uglify@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-1.2.0.tgz#3208c32b54bc2783056e8bb0d5cfe9bbaf17ffb2" +ember-cli-uglify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-2.0.0.tgz#b096727d7d1718acc9bfe5d1bc81ce26cafdf6ca" dependencies: - broccoli-uglify-sourcemap "^1.0.0" + broccoli-uglify-sourcemap "^2.0.0" + lodash.defaultsdeep "^4.6.0" ember-cli-valid-component-name@^1.0.0: version "1.0.0" @@ -2904,7 +3048,7 @@ ember-cli-valid-component-name@^1.0.0: dependencies: silent-error "^1.0.0" -ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4, ember-cli-version-checker@^1.1.6, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0, ember-cli-version-checker@^1.3.1: +ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4, ember-cli-version-checker@^1.1.6, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz#0bc2d134c830142da64bf9627a0eded10b61ae72" dependencies: @@ -2924,53 +3068,53 @@ ember-cli-version-checker@^2.1.0: resolve "^1.3.3" semver "^5.3.0" -ember-cli@2.13.2: - version "2.13.2" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.13.2.tgz#a561f08e69b184fa3175f706cced299c0d1684e5" +ember-cli@2.17.1: + version "2.17.1" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.17.1.tgz#915a140732cd28d6c3d5b2e890731864ea55ad5b" dependencies: - amd-name-resolver "0.0.6" + amd-name-resolver "1.0.0" babel-plugin-transform-es2015-modules-amd "^6.24.0" bower-config "^1.3.0" bower-endpoint-parser "0.2.2" broccoli-babel-transpiler "^6.0.0" broccoli-brocfile-loader "^0.18.0" - broccoli-builder "^0.18.3" + broccoli-builder "^0.18.8" broccoli-concat "^3.2.2" broccoli-config-loader "^1.0.0" broccoli-config-replace "^1.1.2" - broccoli-funnel "^1.0.6" + broccoli-debug "^0.6.3" + broccoli-funnel "^2.0.0" broccoli-funnel-reducer "^1.0.0" broccoli-merge-trees "^2.0.0" - broccoli-middleware "^1.0.0-beta.8" + broccoli-middleware "^1.0.0" broccoli-source "^1.1.0" broccoli-stew "^1.2.0" calculate-cache-key-for-tree "^1.0.0" capture-exit "^1.1.0" - chalk "^1.1.3" + chalk "^2.0.1" clean-base-url "^1.0.0" compression "^1.4.4" configstore "^3.0.0" - console-ui "^1.0.2" - core-object "^3.0.0" + console-ui "^2.0.0" + core-object "^3.1.3" + dag-map "^2.0.2" diff "^3.2.0" ember-cli-broccoli-sane-watcher "^2.0.4" - ember-cli-get-component-path-option "^1.0.0" ember-cli-is-package-missing "^1.0.0" ember-cli-legacy-blueprints "^0.1.2" - ember-cli-lodash-subset "^1.0.11" + ember-cli-lodash-subset "^2.0.1" ember-cli-normalize-entity-name "^1.0.0" ember-cli-preprocess-registry "^3.1.0" ember-cli-string-utils "^1.0.0" - ember-try "^0.2.14" + ember-try "^0.2.15" ensure-posix-path "^1.0.2" - escape-string-regexp "^1.0.3" - execa "^0.6.0" + execa "^0.8.0" exists-sync "0.0.4" exit "^0.1.2" express "^4.12.3" filesize "^3.1.3" find-up "^2.1.0" - fs-extra "2.0.0" + fs-extra "^4.0.0" fs-tree-diff "^0.5.2" get-caller-file "^1.0.0" git-repo-info "^1.4.1" @@ -2981,14 +3125,14 @@ ember-cli@2.13.2: heimdalljs-logger "^0.1.7" http-proxy "^1.9.0" inflection "^1.7.0" - is-git-url "^0.2.0" + is-git-url "^1.0.0" isbinaryfile "^3.0.0" js-yaml "^3.6.1" json-stable-stringify "^1.0.1" leek "0.0.24" lodash.template "^4.2.5" markdown-it "^8.3.0" - markdown-it-terminal "0.0.4" + markdown-it-terminal "0.1.0" minimatch "^3.0.0" morgan "^1.8.1" node-modules-path "^1.0.0" @@ -2998,14 +3142,14 @@ ember-cli@2.13.2: promise-map-series "^0.2.1" quick-temp "^0.1.8" resolve "^1.3.0" - rsvp "^3.3.3" + rsvp "^4.7.0" sane "^1.6.0" semver "^5.1.1" silent-error "^1.0.0" sort-package-json "^1.4.0" symlink-or-copy "^1.1.8" temp "0.8.3" - testem "^1.15.0" + testem "^1.18.0" tiny-lr "^1.0.3" tree-sync "^1.2.1" uuid "^3.0.0" @@ -3014,20 +3158,11 @@ ember-cli@2.13.2: yam "0.0.22" ember-composable-helpers@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-2.0.3.tgz#9b5e595bf5a45bc4431adfe27821f23b1d534be0" + 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.1.0" - -ember-concurrency@^0.8.1: - version "0.8.10" - resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.8.10.tgz#5788d1a43ed1e73562495719b29efe903c789675" - dependencies: - babel-core "^6.24.1" ember-cli-babel "^6.6.0" - ember-getowner-polyfill "^2.0.0" - ember-maybe-import-regenerator "^0.1.5" ember-concurrency@^0.8.12: version "0.8.12" @@ -3049,11 +3184,12 @@ ember-data-model-fragments@^2.14.0: git-repo-info "^1.4.1" npm-git-info "^1.0.3" -ember-data@^2.14.0: - version "2.14.10" - resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.14.10.tgz#acf66ffffb062a7fc999f9d989d0e0d2e3858cd3" +ember-data@~2.17.0: + version "2.17.0" + resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.17.0.tgz#d952cf98d7461abf41ed6d248cf2a5836c623276" dependencies: amd-name-resolver "0.0.7" + babel-plugin-ember-modules-api-polyfill "^1.4.2" babel-plugin-feature-flags "^0.3.1" babel-plugin-filter-imports "^0.3.1" babel-plugin-transform-es2015-block-scoping "^6.24.1" @@ -3063,10 +3199,11 @@ ember-data@^2.14.0: broccoli-debug "^0.6.2" broccoli-file-creator "^1.0.0" broccoli-funnel "^1.2.0" - broccoli-merge-trees "^1.0.0" + 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.4.1" + ember-cli-babel "^6.8.2" ember-cli-path-utils "^1.0.0" ember-cli-string-utils "^1.0.0" ember-cli-test-info "^1.0.0" @@ -3080,7 +3217,6 @@ ember-data@^2.14.0: npm-git-info "^1.0.0" semver "^5.1.0" silent-error "^1.0.0" - testem "1.15.0" ember-export-application-global@^2.0.0: version "2.0.0" @@ -3094,42 +3230,38 @@ ember-factory-for-polyfill@^1.1.0: dependencies: ember-cli-version-checker "^1.2.0" -ember-fetch@^3.2.7: - version "3.3.1" - resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-3.3.1.tgz#47f7c0d282bfe61d4899f3a9d5af9f71e5558910" +ember-fetch@^3.4.3: + 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.1" - node-fetch "^2.0.0-alpha.3" + ember-cli-babel "^6.8.2" + node-fetch "^2.0.0-alpha.9" whatwg-fetch "^2.0.3" -ember-freestyle@^0.4.1: - version "0.4.2" - resolved "https://registry.yarnpkg.com/ember-freestyle/-/ember-freestyle-0.4.2.tgz#ae1593be2106e4212b319e5474a3f9432fa4e329" +ember-freestyle@~0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/ember-freestyle/-/ember-freestyle-0.6.2.tgz#c325f96a32b4984b78e00cbd29e6dad23f0b1864" dependencies: broccoli-flatiron "0.0.0" - broccoli-funnel "^1.0.1" broccoli-merge-trees "^2.0.0" - broccoli-source "^1.1.0" - broccoli-stew "^1.2.0" broccoli-writer "^0.1.1" - ember-cli-babel "^6.0.0" + ember-cli-babel "^6.6.0" ember-cli-htmlbars "^1.3.0" ember-cli-sass "^6.1.3" ember-cli-showdown "^3.2.1" ember-runtime-enumerable-includes-polyfill "^2.0.0" es6-promise "^4.1.0" glob "^7.1.1" - highlight.js "^9.3.0" -ember-get-config@0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-0.2.1.tgz#a1325cceefcb4534c78fc6ccb2be87a3feda6817" +ember-get-config@^0.2.2: + version "0.2.4" + resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-0.2.4.tgz#118492a2a03d73e46004ed777928942021fe1ecd" dependencies: broccoli-file-creator "^1.1.1" - ember-cli-babel "^5.1.6" + ember-cli-babel "^6.3.0" ember-getowner-polyfill@^1.2.2: version "1.2.5" @@ -3146,12 +3278,6 @@ ember-getowner-polyfill@^2.0.0, ember-getowner-polyfill@^2.0.1: ember-cli-version-checker "^1.2.0" ember-factory-for-polyfill "^1.1.0" -ember-href-to@^1.13.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/ember-href-to/-/ember-href-to-1.13.0.tgz#308ab4803d9d08e30a92af888cc67412a800468d" - dependencies: - ember-cli-babel "^5.1.6" - ember-inflector@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-2.0.1.tgz#e9ac469ffa17992a43276bb1c9b8d87992b10d37" @@ -3191,14 +3317,14 @@ ember-lodash@^4.17.3: ember-cli-babel "^6.4.1" lodash-es "^4.17.4" -ember-macro-helpers@^0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/ember-macro-helpers/-/ember-macro-helpers-0.15.1.tgz#a402651fafb3a25b3612a8c09843bc4061553a13" +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" dependencies: - ember-cli-babel "^6.0.0" + ember-cli-babel "^6.6.0" ember-cli-string-utils "^1.1.0" ember-cli-test-info "^1.0.0" - ember-weakmap "^2.0.0" + ember-weakmap "^3.0.0" ember-maybe-import-regenerator@^0.1.5: version "0.1.6" @@ -3209,41 +3335,47 @@ ember-maybe-import-regenerator@^0.1.5: ember-cli-babel "^6.0.0-beta.4" regenerator-runtime "^0.9.5" -ember-moment@^7.3.1: - version "7.4.1" - resolved "https://registry.yarnpkg.com/ember-moment/-/ember-moment-7.4.1.tgz#88018c4d981643bb4521ad39539f60ba3ec6bf42" +ember-moment@^7.5.0: + version "7.5.0" + resolved "https://registry.yarnpkg.com/ember-moment/-/ember-moment-7.5.0.tgz#9ed25b32ae941b2f1d9116c44f518a52bdb01722" dependencies: - ember-cli-babel "^6.6.0" + ember-cli-babel "^6.7.2" ember-getowner-polyfill "^2.0.1" - ember-macro-helpers "^0.15.1" + ember-macro-helpers "^0.17.0" ember-native-dom-helpers@^0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/ember-native-dom-helpers/-/ember-native-dom-helpers-0.5.4.tgz#0bc1506a643fb7adc0abf1d09c44a7914459296b" + version "0.5.10" + resolved "https://registry.yarnpkg.com/ember-native-dom-helpers/-/ember-native-dom-helpers-0.5.10.tgz#9c7172e4ddfa5dd86830c46a936e2f8eca3e5896" dependencies: broccoli-funnel "^1.1.0" ember-cli-babel "^6.6.0" -ember-power-select@^1.9.9: - version "1.9.9" - resolved "https://registry.yarnpkg.com/ember-power-select/-/ember-power-select-1.9.9.tgz#24b733f5be603a434dffdb57dffe702759448ca5" +ember-power-select@^1.10.4: + version "1.10.4" + resolved "https://registry.yarnpkg.com/ember-power-select/-/ember-power-select-1.10.4.tgz#7f0bb8c55279375391f2d97591ed65f727061579" dependencies: - ember-basic-dropdown "^0.33.1" - ember-cli-babel "^6.6.0" + ember-basic-dropdown "^0.34.0" + ember-cli-babel "^6.10.0" ember-cli-htmlbars "^2.0.1" - ember-concurrency "^0.8.1" - ember-text-measurer "^0.3.3" - ember-truth-helpers "^1.3.0" + ember-concurrency "^0.8.12" + ember-text-measurer "^0.4.0" + ember-truth-helpers "^2.0.0" -ember-qunit@^2.1.3: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-2.2.0.tgz#3cdf400031c93a38de781a7304819738753b7f99" +ember-qunit@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-3.2.2.tgz#96c8818ecfa3894580a3dc805f7e7f1e82e07c4a" dependencies: - ember-test-helpers "^0.6.3" + "@ember/test-helpers" "^0.7.9" + broccoli-funnel "^2.0.1" + broccoli-merge-trees "^2.0.0" + common-tags "^1.4.0" + ember-cli-babel "^6.3.0" + ember-cli-test-loader "^2.2.0" + qunit "^2.4.1" -ember-resolver@^4.0.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-4.4.0.tgz#211ad00dea0ff2f3344aea156e556de42fc7ec74" +ember-resolver@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-4.5.0.tgz#9248bf534dfc197fafe3118fff538d436078bf99" dependencies: "@glimmer/resolver" "^0.4.1" babel-plugin-debug-macros "^0.1.10" @@ -3257,11 +3389,11 @@ 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.0, ember-rfc176-data@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.1.tgz#6a5a4b8b82ec3af34f3010965fa96b936ca94519" -ember-router-generator@^1.0.0: +ember-router-generator@^1.0.0, ember-router-generator@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-1.2.3.tgz#8ed2ca86ff323363120fc14278191e9e8f1315ee" dependencies: @@ -3274,75 +3406,73 @@ ember-runtime-enumerable-includes-polyfill@^2.0.0: ember-cli-babel "^6.0.0" ember-cli-version-checker "^1.1.6" -ember-sinon@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/ember-sinon/-/ember-sinon-0.7.0.tgz#41b83b5b1c71626db26e8ffb4a52cdab9c039a29" +ember-sinon@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ember-sinon/-/ember-sinon-1.0.1.tgz#056390eacc9367b4c3955ce1cb5a04246f8197f5" dependencies: - broccoli-funnel "^1.1.0" - broccoli-merge-trees "^1.2.1" - ember-cli-babel "^5.1.7" - sinon "^2.1.0" + broccoli-funnel "^2.0.0" + broccoli-merge-trees "^2.0.0" + ember-cli-babel "^6.3.0" + sinon "^3.2.1" -ember-source@~2.14.0: - version "2.14.1" - resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.14.1.tgz#4abf0b4c916f2da8bf317349df4750905df7e628" +ember-source@~2.17.0: + version "2.17.0" + resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.17.0.tgz#b78871dd49bd8d642b80176df4faf7fd7d059dac" dependencies: - "@glimmer/compiler" "^0.22.3" - "@glimmer/node" "^0.22.3" - "@glimmer/reference" "^0.22.3" - "@glimmer/runtime" "^0.22.3" - "@glimmer/util" "^0.22.3" broccoli-funnel "^1.2.0" broccoli-merge-trees "^2.0.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-test-info "^1.0.0" ember-cli-valid-component-name "^1.0.0" - ember-cli-version-checker "^1.3.1" - handlebars "^4.0.6" + ember-cli-version-checker "^2.1.0" + ember-router-generator "^1.2.3" + fs-extra "^4.0.1" + inflection "^1.12.0" jquery "^3.2.1" resolve "^1.3.3" - rsvp "^3.5.0" - simple-dom "^0.3.0" - simple-html-tokenizer "^0.4.1" -ember-test-helpers@^0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/ember-test-helpers/-/ember-test-helpers-0.6.3.tgz#f864cdf6f4e75f3f8768d6537785b5ab6e82d907" - -ember-text-measurer@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/ember-text-measurer/-/ember-text-measurer-0.3.3.tgz#0762809a71c2e1f2e60ab00c53c6eb1b63c9f963" +ember-test-selectors@^0.3.8: + version "0.3.8" + resolved "https://registry.yarnpkg.com/ember-test-selectors/-/ember-test-selectors-0.3.8.tgz#1e8ae3e78c64bacc4bbfe87f9973c85805699db2" dependencies: - ember-cli-babel "^5.1.6" + broccoli-stew "^1.4.0" + ember-cli-babel "^6.8.2" + ember-cli-version-checker "^2.0.0" -ember-truth-helpers@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/ember-truth-helpers/-/ember-truth-helpers-1.3.0.tgz#6ed9f83ce9a49f52bb416d55e227426339a64c60" +ember-text-measurer@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/ember-text-measurer/-/ember-text-measurer-0.4.0.tgz#a676195378d4eb4c1617678c2d198a2344b4d12b" dependencies: - ember-cli-babel "^5.1.6" + ember-cli-babel "^6.8.2" -ember-try-config@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ember-try-config/-/ember-try-config-2.1.0.tgz#e0e156229a542346a58ee6f6ad605104c98edfe0" +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" + dependencies: + ember-cli-babel "^6.8.2" + +ember-try-config@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ember-try-config/-/ember-try-config-2.2.0.tgz#6be0af6c71949813e02ac793564fddbf8336b807" dependencies: lodash "^4.6.1" node-fetch "^1.3.3" rsvp "^3.2.1" semver "^5.1.0" -ember-try@^0.2.14: - version "0.2.16" - resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-0.2.16.tgz#cf7092d8a8fea9701d7faa73cbdbff37a8ada330" +ember-try@^0.2.15: + version "0.2.22" + resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-0.2.22.tgz#3989e9c013c1d5c209ec97f5dfcf4234e594d5e2" dependencies: chalk "^1.0.0" cli-table2 "^0.2.0" core-object "^1.1.0" debug "^2.2.0" - ember-cli-version-checker "^1.1.6" - ember-try-config "^2.0.1" + ember-try-config "^2.2.0" extend "^3.0.0" fs-extra "^0.26.0" promise-map-series "^0.2.1" @@ -3351,11 +3481,13 @@ ember-try@^0.2.14: rsvp "^3.0.17" semver "^5.1.0" -ember-weakmap@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ember-weakmap/-/ember-weakmap-2.0.0.tgz#71c6819a8bfd0b077ae17ca1d9053fc5db06e4ac" +ember-weakmap@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/ember-weakmap/-/ember-weakmap-3.1.1.tgz#2ae6e0080b5b80cf0d108f7752dc69ea9603dbd7" dependencies: - ember-cli-babel "^5.1.6" + browserslist "^2.2.2" + debug "^3.1.0" + ember-cli-babel "^6.3.0" ember-welcome-page@^3.0.0: version "3.1.1" @@ -3429,7 +3561,7 @@ entities@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" -error-ex@^1.2.0: +error-ex@^1.2.0, error-ex@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" dependencies: @@ -3502,7 +3634,7 @@ escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" -escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -3522,45 +3654,9 @@ eslint-scope@^3.7.1: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint@^3.0.0: - version "3.19.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc" - dependencies: - babel-code-frame "^6.16.0" - chalk "^1.1.3" - concat-stream "^1.5.2" - debug "^2.1.1" - doctrine "^2.0.0" - escope "^3.6.0" - espree "^3.4.0" - esquery "^1.0.0" - estraverse "^4.2.0" - esutils "^2.0.2" - file-entry-cache "^2.0.0" - glob "^7.0.3" - globals "^9.14.0" - ignore "^3.2.0" - imurmurhash "^0.1.4" - inquirer "^0.12.0" - is-my-json-valid "^2.10.0" - is-resolvable "^1.0.0" - js-yaml "^3.5.1" - json-stable-stringify "^1.0.0" - levn "^0.3.0" - lodash "^4.0.0" - mkdirp "^0.5.0" - natural-compare "^1.4.0" - optionator "^0.8.2" - path-is-inside "^1.0.1" - pluralize "^1.2.1" - progress "^1.1.8" - require-uncached "^1.0.2" - shelljs "^0.7.5" - strip-bom "^3.0.0" - strip-json-comments "~2.0.1" - table "^3.7.8" - text-table "~0.2.0" - user-home "^2.0.0" +eslint-visitor-keys@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" eslint@^4.0.0: version "4.5.0" @@ -3604,16 +3700,61 @@ eslint@^4.0.0: table "^4.0.1" text-table "~0.2.0" -espree@^3.4.0, espree@^3.5.0: +eslint@^4.13.1: + version "4.15.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.15.0.tgz#89ab38c12713eec3d13afac14e4a89e75ef08145" + dependencies: + ajv "^5.3.0" + babel-code-frame "^6.22.0" + chalk "^2.1.0" + concat-stream "^1.6.0" + cross-spawn "^5.1.0" + debug "^3.1.0" + doctrine "^2.0.2" + eslint-scope "^3.7.1" + eslint-visitor-keys "^1.0.0" + espree "^3.5.2" + esquery "^1.0.0" + esutils "^2.0.2" + file-entry-cache "^2.0.0" + functional-red-black-tree "^1.0.1" + glob "^7.1.2" + globals "^11.0.1" + ignore "^3.3.3" + imurmurhash "^0.1.4" + inquirer "^3.0.6" + is-resolvable "^1.0.0" + js-yaml "^3.9.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.3.0" + lodash "^4.17.4" + minimatch "^3.0.2" + mkdirp "^0.5.1" + natural-compare "^1.4.0" + optionator "^0.8.2" + path-is-inside "^1.0.2" + pluralize "^7.0.0" + progress "^2.0.0" + require-uncached "^1.0.3" + semver "^5.3.0" + strip-ansi "^4.0.0" + strip-json-comments "~2.0.1" + table "^4.0.1" + text-table "~0.2.0" + +espree@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.0.tgz#98358625bdd055861ea27e2867ea729faf463d8d" dependencies: acorn "^5.1.1" acorn-jsx "^3.0.0" -esprima-fb@~12001.1.0-dev-harmony-fb: - version "12001.1.0-dev-harmony-fb" - resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-12001.1.0-dev-harmony-fb.tgz#d84400384ba95ce2678c617ad24a7f40808da915" +espree@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca" + dependencies: + acorn "^5.2.1" + acorn-jsx "^3.0.0" esprima-fb@~15001.1001.0-dev-harmony-fb: version "15001.1001.0-dev-harmony-fb" @@ -3627,6 +3768,10 @@ esprima@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804" +esprima@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9" + esprima@~3.1.0: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" @@ -3675,9 +3820,9 @@ events@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" -evp_bytestokey@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.2.tgz#f66bb88ecd57f71a766821e20283ea38c68bf80a" +evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" dependencies: md5.js "^1.3.4" safe-buffer "^5.1.1" @@ -3688,9 +3833,9 @@ exec-sh@^0.2.0: dependencies: merge "^1.1.3" -execa@^0.6.0: - version "0.6.3" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.6.3.tgz#57b69a594f081759c69e5370f0d17b9cb11658fe" +execa@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" dependencies: cross-spawn "^5.0.1" get-stream "^3.0.0" @@ -3700,9 +3845,9 @@ execa@^0.6.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" +execa@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da" dependencies: cross-spawn "^5.0.1" get-stream "^3.0.0" @@ -3813,6 +3958,10 @@ extsprintf@1.3.0, extsprintf@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" +eyes@0.1.x: + version "0.1.8" + resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" + 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" @@ -3825,6 +3974,10 @@ fast-deep-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff" +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -3861,7 +4014,7 @@ fb-watchman@^2.0.0: dependencies: bser "^2.0.0" -figures@^1.3.5, figures@^1.7.0: +figures@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" dependencies: @@ -3960,11 +4113,11 @@ flat-cache@^1.2.1: graceful-fs "^4.1.2" write "^0.2.1" -flat@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/flat/-/flat-2.0.1.tgz#70e29188a74be0c3c89409eed1fa9577907ae32f" +flat@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/flat/-/flat-4.0.0.tgz#3abc7f3b588e64ce77dc42fd59aa35806622fea8" dependencies: - is-buffer "~1.1.2" + is-buffer "~1.1.5" for-in@^1.0.1: version "1.0.2" @@ -3988,7 +4141,7 @@ form-data@~2.1.1: combined-stream "^1.0.5" mime-types "^2.1.12" -formatio@1.2.0: +formatio@1.2.0, formatio@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.2.0.tgz#f3b2167d9068c4698a8d51f4f760a39a54d818eb" dependencies: @@ -4006,13 +4159,6 @@ fs-exists-sync@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" -fs-extra@2.0.0, fs-extra@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.0.0.tgz#337352bded4a0b714f3eb84de8cea765e9d37600" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^2.1.0" - fs-extra@^0.24.0: version "0.24.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952" @@ -4050,11 +4196,35 @@ fs-extra@^1.0.0: jsonfile "^2.1.0" klaw "^1.0.0" +fs-extra@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.0.0.tgz#337352bded4a0b714f3eb84de8cea765e9d37600" + dependencies: + graceful-fs "^4.1.2" + jsonfile "^2.1.0" + +fs-extra@^4.0.0, fs-extra@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + 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.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.0: + version "0.5.7" + resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.7.tgz#315e2b098d5fe7f622880ac965b1b051868ac871" + dependencies: + heimdalljs-logger "^0.1.7" + object-assign "^4.1.0" + path-posix "^1.0.0" + symlink-or-copy "^1.1.8" + +fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6: version "0.5.6" resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.6.tgz#342665749e8dca406800b672268c8f5073f3e623" dependencies: @@ -4125,20 +4295,14 @@ gaze@^1.0.0: 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" - -generate-object-property@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0" - dependencies: - is-property "^1.0.0" - get-caller-file@^1.0.0, get-caller-file@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" +get-own-enumerable-property-symbols@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-2.0.1.tgz#5c4ad87f2834c4b9b4e84549dc1e0650fb38c24b" + get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" @@ -4218,11 +4382,15 @@ global-prefix@^0.1.4: is-windows "^0.2.0" which "^1.2.12" +globals@^11.0.1: + version "11.1.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4" + globals@^6.4.0: version "6.4.1" resolved "https://registry.yarnpkg.com/globals/-/globals-6.4.1.tgz#8498032b3b6d1cc81eebc5f79690d8fe29fabf4f" -globals@^9.14.0, globals@^9.17.0, globals@^9.18.0: +globals@^9.17.0, globals@^9.18.0: version "9.18.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" @@ -4257,7 +4425,7 @@ growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" -handlebars@^4.0.4, handlebars@^4.0.6: +handlebars@^4.0.4: version "4.0.10" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f" dependencies: @@ -4388,10 +4556,6 @@ heimdalljs@^0.3.0: dependencies: rsvp "~3.2.1" -highlight.js@^9.3.0: - version "9.12.0" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e" - hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -4460,14 +4624,13 @@ https-browserify@~0.0.0: version "0.0.1" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82" -husky@^0.13.4: - version "0.13.4" - resolved "https://registry.yarnpkg.com/husky/-/husky-0.13.4.tgz#48785c5028de3452a51c48c12c4f94b2124a1407" +husky@^0.14.3: + version "0.14.3" + resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3" dependencies: - chalk "^1.1.3" - find-parent-dir "^0.3.0" - is-ci "^1.0.9" + is-ci "^1.0.10" normalize-path "^1.0.0" + strip-indent "^2.0.0" iconv-lite@^0.4.17, iconv-lite@^0.4.5, iconv-lite@~0.4.13: version "0.4.18" @@ -4477,7 +4640,7 @@ ieee754@^1.1.4: version "1.1.8" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" -ignore@^3.2.0, ignore@^3.3.3: +ignore@^3.3.3: version "3.3.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.4.tgz#85ab6d0a9ca8b27b31604c09efe1c14dc21ab872" @@ -4507,7 +4670,7 @@ indexof@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" -inflection@^1.7.0, inflection@^1.7.1, inflection@^1.8.0: +inflection@^1.12.0, inflection@^1.7.0, inflection@^1.7.1, inflection@^1.8.0: version "1.12.0" resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416" @@ -4546,40 +4709,22 @@ inline-source-map@~0.6.0: 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" - dependencies: - ansi-escapes "^1.1.0" - ansi-regex "^2.0.0" - chalk "^1.0.0" - cli-cursor "^1.0.1" - cli-width "^2.0.0" - figures "^1.3.5" - lodash "^4.3.0" - readline2 "^1.0.1" - run-async "^0.1.0" - rx-lite "^3.1.2" - string-width "^1.0.1" - strip-ansi "^3.0.0" - through "^2.3.6" - -inquirer@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-1.2.3.tgz#4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918" +inquirer@^2: + version "2.0.0" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-2.0.0.tgz#e1351687b90d150ca403ceaa3cefb1e3065bef4b" dependencies: ansi-escapes "^1.1.0" chalk "^1.0.0" cli-cursor "^1.0.1" cli-width "^2.0.0" external-editor "^1.1.0" - figures "^1.3.5" + figures "^2.0.0" lodash "^4.3.0" mute-stream "0.0.6" pinkie-promise "^2.0.0" run-async "^2.2.0" rx "^4.1.0" - string-width "^1.0.1" + string-width "^2.0.0" strip-ansi "^3.0.0" through "^2.3.6" @@ -4615,10 +4760,6 @@ insert-module-globals@^7.0.0: through2 "^2.0.0" xtend "^4.0.0" -interpret@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90" - invariant@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360" @@ -4643,7 +4784,11 @@ 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.2: +is-buffer@^1.1.0, is-buffer@~1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + +is-buffer@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc" @@ -4653,12 +4798,16 @@ is-builtin-module@^1.0.0: dependencies: builtin-modules "^1.0.0" -is-ci@^1.0.9: +is-ci@^1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e" dependencies: ci-info "^1.0.0" +is-directory@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" + is-dotfile@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" @@ -4677,6 +4826,10 @@ is-extglob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + is-finite@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" @@ -4693,9 +4846,9 @@ is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" -is-git-url@^0.2.0: - version "0.2.3" - resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-0.2.3.tgz#445200d6fbd6da028fb5e01440d9afc93f3ccb64" +is-git-url@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b" is-glob@^2.0.0, is-glob@^2.0.1: version "2.0.1" @@ -4703,21 +4856,18 @@ is-glob@^2.0.0, is-glob@^2.0.1: dependencies: is-extglob "^1.0.0" +is-glob@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" + dependencies: + is-extglob "^2.1.1" + 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-my-json-valid@^2.10.0: - version "2.16.1" - resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11" - dependencies: - generate-function "^2.0.0" - generate-object-property "^1.1.0" - jsonpointer "^4.0.0" - xtend "^4.0.0" - is-number@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" @@ -4730,10 +4880,16 @@ is-number@^3.0.0: dependencies: kind-of "^3.0.2" -is-obj@^1.0.0: +is-obj@^1.0.0, is-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" +is-observable@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2" + dependencies: + symbol-observable "^0.2.2" + is-path-cwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" @@ -4762,9 +4918,9 @@ is-promise@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" -is-property@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" +is-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" is-resolvable@^1.0.0: version "1.0.0" @@ -4816,7 +4972,7 @@ isobject@^2.0.0: dependencies: isarray "1.0.0" -isstream@~0.1.2: +isstream@0.1.x, isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" @@ -4828,6 +4984,19 @@ istextorbinary@2.1.0: editions "^1.1.1" textextensions "1 || 2" +jest-get-type@^21.2.0: + version "21.2.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-21.2.0.tgz#f6376ab9db4b60d81e39f30749c6c466f40d4a23" + +jest-validate@^21.1.0: + version "21.2.1" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-21.2.1.tgz#cc0cbca653cd54937ba4f2a111796774530dd3c7" + dependencies: + chalk "^2.0.1" + jest-get-type "^21.2.0" + leven "^2.1.0" + pretty-format "^21.2.1" + jquery@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787" @@ -4848,13 +5017,24 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" -js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.6.1, js-yaml@^3.9.1: +js-yaml@0.3.x: + version "0.3.7" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-0.3.7.tgz#d739d8ee86461e54b354d6a7d7d1f2ad9a167f62" + +js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.6.1, js-yaml@^3.9.1: version "3.9.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.1.tgz#08775cebdfdd359209f0d2acd383c8f86a6904a0" dependencies: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^3.9.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc" + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + js-yaml@~3.6.0: version "3.6.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30" @@ -4886,6 +5066,10 @@ jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" +jsmin@1.x: + version "1.0.1" + resolved "https://registry.yarnpkg.com/jsmin/-/jsmin-1.0.1.tgz#e7bd0dcd6496c3bf4863235bf461a3d98aa3b98c" + json-formatter-js@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/json-formatter-js/-/json-formatter-js-2.2.0.tgz#1ed987223ef2f1d945304597faae78b580a8212b" @@ -4898,6 +5082,10 @@ json-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" @@ -4932,6 +5120,12 @@ jsonfile@^2.1.0: optionalDependencies: graceful-fs "^4.1.6" +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + optionalDependencies: + graceful-fs "^4.1.6" + jsonify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" @@ -4940,10 +5134,6 @@ jsonparse@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" -jsonpointer@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" - jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -4953,6 +5143,19 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" +just-extend@^1.1.26: + version "1.1.27" + resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-1.1.27.tgz#ec6e79410ff914e472652abfa0e603c03d60e905" + +jxLoader@*: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jxLoader/-/jxLoader-0.1.1.tgz#0134ea5144e533b594fc1ff25ff194e235c53ecd" + dependencies: + js-yaml "0.3.x" + moo-server "1.3.x" + promised-io "*" + walker "1.x" + kind-of@^3.0.2: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -5001,6 +5204,10 @@ leven@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/leven/-/leven-1.0.2.tgz#9144b6eebca5f1d0680169f1a6770dcea60b75c3" +leven@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580" + levn@^0.3.0, levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" @@ -5020,33 +5227,38 @@ linkify-it@^2.0.0: dependencies: uc.micro "^1.0.1" -linkify-it@~1.2.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-1.2.4.tgz#0773526c317c8fd13bd534ee1d180ff88abf881a" - dependencies: - uc.micro "^1.0.1" - -lint-staged@^3.6.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-3.6.1.tgz#24423c8b7bd99d96e15acd1ac8cb392a78e58582" +lint-staged@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-6.0.0.tgz#7ab7d345f2fe302ff196f1de6a005594ace03210" dependencies: app-root-path "^2.0.0" - cosmiconfig "^1.1.0" - execa "^0.7.0" - listr "^0.12.0" - lodash.chunk "^4.2.0" + chalk "^2.1.0" + commander "^2.11.0" + cosmiconfig "^3.1.0" + debug "^3.1.0" + dedent "^0.7.0" + execa "^0.8.0" + find-parent-dir "^0.3.0" + is-glob "^4.0.0" + jest-validate "^21.1.0" + listr "^0.13.0" + lodash "^4.17.4" + log-symbols "^2.0.0" minimatch "^3.0.0" npm-which "^3.0.1" p-map "^1.1.1" + path-is-inside "^1.0.2" + pify "^3.0.0" staged-git-files "0.0.4" + stringify-object "^3.2.0" listr-silent-renderer@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e" -listr-update-renderer@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz#ca80e1779b4e70266807e8eed1ad6abe398550f9" +listr-update-renderer@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.4.0.tgz#344d980da2ca2e8b145ba305908f32ae3f4cc8a7" dependencies: chalk "^1.1.3" cli-truncate "^0.2.1" @@ -5066,25 +5278,26 @@ listr-verbose-renderer@^0.4.0: date-fns "^1.27.2" figures "^1.7.0" -listr@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/listr/-/listr-0.12.0.tgz#6bce2c0f5603fa49580ea17cd6a00cc0e5fa451a" +listr@^0.13.0: + version "0.13.0" + resolved "https://registry.yarnpkg.com/listr/-/listr-0.13.0.tgz#20bb0ba30bae660ee84cc0503df4be3d5623887d" dependencies: chalk "^1.1.3" cli-truncate "^0.2.1" figures "^1.7.0" indent-string "^2.1.0" + is-observable "^0.2.0" is-promise "^2.1.0" is-stream "^1.1.0" listr-silent-renderer "^1.1.1" - listr-update-renderer "^0.2.0" + listr-update-renderer "^0.4.0" listr-verbose-renderer "^0.4.0" log-symbols "^1.0.2" log-update "^1.0.2" ora "^0.2.3" p-map "^1.1.1" - rxjs "^5.0.0-beta.11" - stream-to-observable "^0.1.0" + rxjs "^5.4.2" + stream-to-observable "^0.2.0" strip-ansi "^3.0.1" livereload-js@^2.2.2: @@ -5125,14 +5338,6 @@ lodash-es@^4.17.4: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7" -lodash._arraycopy@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1" - -lodash._arrayeach@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz#bab156b2a90d3f1bbd5c653403349e5e5933ef9e" - lodash._baseassign@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e" @@ -5185,10 +5390,6 @@ lodash._baseflatten@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" -lodash._basefor@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash._basefor/-/lodash._basefor-3.0.3.tgz#7550b4e9218ef09fad24343b612021c79b4c20c2" - lodash._basetostring@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5" @@ -5307,10 +5508,6 @@ lodash.bind@~2.3.0: lodash._renative "~2.3.0" lodash._slice "~2.3.0" -lodash.chunk@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.chunk/-/lodash.chunk-4.2.0.tgz#66e5ce1f76ed27b4303d8c6512e8d1216e8106bc" - lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.4.1: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" @@ -5376,6 +5573,10 @@ lodash.forown@~2.3.0: lodash._objecttypes "~2.3.0" lodash.keys "~2.3.0" +lodash.get@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + lodash.identity@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/lodash.identity/-/lodash.identity-2.3.0.tgz#6b01a210c9485355c2a913b48b6711219a173ded" @@ -5398,18 +5599,6 @@ lodash.isobject@~2.3.0: dependencies: lodash._objecttypes "~2.3.0" -lodash.isplainobject@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz#9a8238ae16b200432960cd7346512d0123fbf4c5" - dependencies: - lodash._basefor "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.keysin "^3.0.0" - -lodash.istypedarray@^3.0.0: - version "3.0.6" - resolved "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62" - lodash.keys@^3.0.0: version "3.1.2" resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" @@ -5426,34 +5615,11 @@ lodash.keys@~2.3.0: lodash._shimkeys "~2.3.0" lodash.isobject "~2.3.0" -lodash.keysin@^3.0.0: - version "3.0.8" - resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-3.0.8.tgz#22c4493ebbedb1427962a54b445b2c8a767fb47f" - dependencies: - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - 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@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-3.3.2.tgz#0d90d93ed637b1878437bb3e21601260d7afe994" - dependencies: - lodash._arraycopy "^3.0.0" - lodash._arrayeach "^3.0.0" - lodash._createassigner "^3.0.0" - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - lodash.isplainobject "^3.0.0" - lodash.istypedarray "^3.0.0" - lodash.keys "^3.0.0" - lodash.keysin "^3.0.0" - lodash.toplainobject "^3.0.0" - -lodash.merge@^4.3.0, lodash.merge@^4.4.0, lodash.merge@^4.5.1: +lodash.merge@^4.3.0, lodash.merge@^4.4.0, lodash.merge@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5" @@ -5532,13 +5698,6 @@ lodash.templatesettings@~2.3.0: lodash._reinterpolate "~2.3.0" lodash.escape "~2.3.0" -lodash.toplainobject@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz#28790ad942d293d78aa663a07ecf7f52ca04198d" - dependencies: - lodash._basecopy "^3.0.0" - lodash.keysin "^3.0.0" - lodash.uniq@^4.2.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -5567,6 +5726,12 @@ log-symbols@^1.0.2: dependencies: chalk "^1.0.0" +log-symbols@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.1.0.tgz#f35fa60e278832b538dc4dddcbb478a45d3e3be6" + dependencies: + chalk "^2.0.1" + log-update@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1" @@ -5578,6 +5743,10 @@ lolex@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6" +lolex@^2.1.2: + version "2.3.1" + resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.3.1.tgz#3d2319894471ea0950ef64692ead2a5318cff362" + longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" @@ -5618,27 +5787,17 @@ 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" -markdown-it-terminal@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.0.4.tgz#3f2ce624ba2ca964a78b8b388d605ee330de9ced" +markdown-it-terminal@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.1.0.tgz#545abd8dd01c3d62353bfcea71db580b51d22bd9" dependencies: - ansi-styles "^2.1.0" - cardinal "^0.5.0" + ansi-styles "^3.0.0" + cardinal "^1.0.0" cli-table "^0.3.1" - lodash.merge "^3.3.2" - markdown-it "^4.4.0" + lodash.merge "^4.6.0" + markdown-it "^8.3.1" -markdown-it@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-4.4.0.tgz#3df373dbea587a9a7fef3e56311b68908f75c414" - dependencies: - argparse "~1.0.2" - entities "~1.1.1" - linkify-it "~1.2.0" - mdurl "~1.0.0" - uc.micro "^1.0.0" - -markdown-it@^8.3.0: +markdown-it@^8.3.0, markdown-it@^8.3.1: version "8.4.0" resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.0.tgz#e2400881bf171f7018ed1bd9da441dac8af6306d" dependencies: @@ -5654,6 +5813,12 @@ matcher-collection@^1.0.0: dependencies: minimatch "^3.0.2" +matcher-collection@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.0.5.tgz#2ee095438372cb8884f058234138c05c644ec339" + dependencies: + minimatch "^3.0.2" + md5-hex@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4" @@ -5677,7 +5842,7 @@ md5.js@^1.3.4: hash-base "^3.0.0" inherits "^2.0.1" -mdurl@^1.0.1, mdurl@~1.0.0: +mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" @@ -5754,8 +5919,8 @@ micromatch@^2.1.5, micromatch@^2.3.7: regex-cache "^0.4.2" miller-rabin@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d" + version "4.0.1" + resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" dependencies: bn.js "^4.0.0" brorand "^1.0.1" @@ -5848,9 +6013,9 @@ module-deps@^4.0.8: through2 "^2.0.0" xtend "^4.0.0" -moment-timezone@~0.5.11: - version "0.5.13" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.13.tgz#99ce5c7d827262eb0f1f702044177f60745d7b90" +moment-timezone@^0.5.13: + version "0.5.14" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.14.tgz#4eb38ff9538b80108ba467a458f3ed4268ccfcb1" dependencies: moment ">= 2.9.0" @@ -5858,6 +6023,10 @@ moment-timezone@~0.5.11: version "2.18.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f" +moo-server@*, moo-server@1.3.x: + version "1.3.0" + resolved "https://registry.yarnpkg.com/moo-server/-/moo-server-1.3.0.tgz#5dc79569565a10d6efed5439491e69d2392e58f1" + morgan@^1.8.1: version "1.8.2" resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.8.2.tgz#784ac7734e4a453a9c6e6e8680a9329275c8b687" @@ -5888,10 +6057,6 @@ mustache@^2.2.1: version "2.3.0" resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.0.tgz#4028f7778b17708a489930a6e52ac3bca0da41d0" -mute-stream@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" - mute-stream@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db" @@ -5916,6 +6081,16 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" +nise@^1.0.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/nise/-/nise-1.2.0.tgz#079d6cadbbcb12ba30e38f1c999f36ad4d6baa53" + dependencies: + formatio "^1.2.0" + just-extend "^1.1.26" + lolex "^1.6.0" + path-to-regexp "^1.7.0" + text-encoding "^0.6.4" + node-fetch@^1.3.3: version "1.7.2" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.2.tgz#c54e9aac57e432875233525f3c891c4159ffefd7" @@ -5923,9 +6098,9 @@ node-fetch@^1.3.3: encoding "^0.1.11" is-stream "^1.0.1" -node-fetch@^2.0.0-alpha.3: - version "2.0.0-alpha.8" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.0.0-alpha.8.tgz#f586cf6730ce30431c7d4528ce561d81add8ba90" +node-fetch@^2.0.0-alpha.9: + version "2.0.0-alpha.9" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.0.0-alpha.9.tgz#990c0634f510f76449a0d6f6eaec96b22f273628" node-gyp@^3.3.1: version "3.6.2" @@ -6150,7 +6325,7 @@ options@>=0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" -ora@^0.2.0, ora@^0.2.3: +ora@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4" dependencies: @@ -6159,6 +6334,15 @@ ora@^0.2.0, ora@^0.2.3: cli-spinners "^0.1.2" object-assign "^4.0.1" +ora@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/ora/-/ora-1.3.0.tgz#80078dd2b92a934af66a3ad72a5b910694ede51a" + dependencies: + chalk "^1.1.1" + cli-cursor "^2.1.0" + cli-spinners "^1.0.0" + log-symbols "^1.0.2" + os-browserify@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.1.2.tgz#49ca0293e0b19590a5f5de10c7f265a617d8fe54" @@ -6257,6 +6441,12 @@ parse-json@^2.2.0: dependencies: error-ex "^1.2.0" +parse-json@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-3.0.0.tgz#fa6f47b18e23826ead32f263e744d0e1e847fb13" + dependencies: + error-ex "^1.3.1" + parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" @@ -6350,8 +6540,8 @@ path-type@^2.0.0: pify "^2.0.0" pbkdf2@^3.0.3: - version "3.0.13" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.13.tgz#c37d295531e786b1da3e3eadc840426accb0ae25" + version "3.0.14" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade" dependencies: create-hash "^1.1.2" create-hmac "^1.1.4" @@ -6367,6 +6557,10 @@ pify@^2.0.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" @@ -6377,14 +6571,14 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" -pluralize@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45" - pluralize@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-4.0.0.tgz#59b708c1c0190a2f692f1c7618c446b052fd1762" +pluralize@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" + portfinder@^1.0.7: version "1.0.13" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9" @@ -6401,16 +6595,23 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -pretender@^1.4.2: - version "1.5.1" - resolved "https://registry.yarnpkg.com/pretender/-/pretender-1.5.1.tgz#bd9098c03d39c3bc7dcb84a28ee27e096e2e32b8" +pretender@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/pretender/-/pretender-1.6.1.tgz#77d1e42ac8c6b298f5cd43534a87645df035db8c" dependencies: fake-xml-http-request "^1.6.0" route-recognizer "^0.3.3" prettier@^1.4.4: - version "1.6.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.6.0.tgz#23e9c68251f440feb847f558821bead21765919a" + version "1.10.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93" + +pretty-format@^21.2.1: + version "21.2.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-21.2.1.tgz#ae5407f3cf21066cd011aa1ba5fce7b6a2eddb36" + dependencies: + ansi-regex "^3.0.0" + ansi-styles "^3.2.0" printf@^0.2.3: version "0.2.5" @@ -6434,10 +6635,6 @@ process@~0.11.0: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" -progress@^1.1.8: - version "1.1.8" - resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" - progress@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f" @@ -6448,6 +6645,10 @@ promise-map-series@^0.2.0, promise-map-series@^0.2.1: dependencies: rsvp "^3.0.14" +promised-io@*: + version "0.3.5" + resolved "https://registry.yarnpkg.com/promised-io/-/promised-io-0.3.5.tgz#4ad217bb3658bcaae9946b17a8668ecd851e1356" + proxy-addr@~1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.5.tgz#71c0ee3b102de3f202f3b64f608d173fcba1a918" @@ -6490,8 +6691,8 @@ qs@~6.4.0: resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" query-string@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.0.0.tgz#fbdf7004b4d2aff792f9871981b7a2794f555947" + version "5.0.1" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.0.1.tgz#6e2b86fe0e08aef682ecbe86e85834765402bd88" dependencies: decode-uri-component "^0.2.0" object-assign "^4.1.0" @@ -6513,13 +6714,9 @@ 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-notifications@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/qunit-notifications/-/qunit-notifications-0.1.1.tgz#3001afc6a6a77dfbd962ccbcddde12dec5286c09" - -qunitjs@^2.0.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/qunitjs/-/qunitjs-2.4.0.tgz#58f3a81e846687f2e7f637c5bedc9c267f887261" +qunit@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.4.1.tgz#373c826b3b91795f3e5479cc94f0f6fa14dedc47" dependencies: chokidar "1.6.1" commander "2.9.0" @@ -6536,12 +6733,19 @@ randomatic@^1.1.3: is-number "^3.0.0" kind-of "^4.0.0" -randombytes@^2.0.0, randombytes@^2.0.1: +randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79" dependencies: safe-buffer "^5.1.0" +randomfill@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62" + dependencies: + randombytes "^2.0.5" + safe-buffer "^5.1.0" + range-parser@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" @@ -6639,14 +6843,6 @@ readdirp@^2.0.0: readable-stream "^2.0.2" set-immediate-shim "^1.0.1" -readline2@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - mute-stream "0.0.5" - recast@0.10.33, recast@^0.10.10: version "0.10.33" resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.33.tgz#942808f7aa016f1fa7142c461d7e5704aaa8d697" @@ -6665,12 +6861,6 @@ recast@^0.11.17, recast@^0.11.3: private "~0.1.5" source-map "~0.5.0" -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" @@ -6678,11 +6868,11 @@ redent@^1.0.0: indent-string "^2.1.0" strip-indent "^1.0.1" -redeyed@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-0.5.0.tgz#7ab000e60ee3875ac115d29edb32c1403c6c25d1" +redeyed@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-1.0.1.tgz#e96c193b40c0816b00aec842698e61185e55498a" dependencies: - esprima-fb "~12001.1.0-dev-harmony-fb" + esprima "~3.0.0" regenerate@^1.2.1: version "1.3.2" @@ -6809,15 +6999,15 @@ require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" -require-from-string@^1.1.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418" +require-from-string@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.1.tgz#c545233e9d7da6616e9d59adfb39fc9f588676ff" require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" -require-uncached@^1.0.2, require-uncached@^1.0.3: +require-uncached@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3" dependencies: @@ -6849,12 +7039,18 @@ resolve@1.3.2: dependencies: path-parse "^1.0.5" -resolve@^1.1.2, resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.0, resolve@^1.3.3, resolve@^1.4.0: +resolve@^1.1.2, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.0, resolve@^1.3.3, resolve@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86" dependencies: path-parse "^1.0.5" +resolve@^1.1.3, resolve@^1.1.4, 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" + restore-cursor@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" @@ -6910,6 +7106,10 @@ rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0. version "3.6.2" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" +rsvp@^4.6.1, rsvp@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.7.0.tgz#dc1b0b1a536f7dec9d2be45e0a12ad4197c9fd96" + rsvp@~3.0.6: version "3.0.21" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.21.tgz#49c588fe18ef293bcd0ab9f4e6756e6ac433359f" @@ -6918,12 +7118,6 @@ rsvp@~3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a" -run-async@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389" - dependencies: - once "^1.3.0" - run-async@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" @@ -6940,19 +7134,15 @@ 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" - rx@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" -rxjs@^5.0.0-beta.11: - version "5.4.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.3.tgz#0758cddee6033d68e0fd53676f0f3596ce3d483f" +rxjs@^5.4.2: + version "5.5.6" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.6.tgz#e31fb96d6fd2ff1fd84bcea8ae9c02d007179c02" dependencies: - symbol-observable "^1.0.1" + symbol-observable "1.0.1" safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" @@ -6998,14 +7188,10 @@ scss-tokenizer@^0.2.3: js-base64 "^2.1.8" source-map "^0.4.2" -"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.1.1, semver@^5.3.0: +"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.1.1, semver@^5.3.0, semver@^5.4.1: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" -semver@^4.1.0: - version "4.3.6" - resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" - semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" @@ -7050,10 +7236,11 @@ setprototypeof@1.0.3: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04" sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4: - version "2.4.8" - resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f" + version "2.4.9" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.9.tgz#98f64880474b74f4a38b8da9d3c0f2d104633e7d" dependencies: inherits "^2.0.1" + safe-buffer "^5.0.1" shasum@^1.0.0: version "1.0.2" @@ -7081,14 +7268,6 @@ shell-quote@^1.6.1: array-reduce "~0.0.0" jsonify "~0.0.0" -shelljs@^0.7.5: - version "0.7.8" - resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3" - dependencies: - glob "^7.0.0" - interpret "^1.0.0" - rechoir "^0.6.2" - shellwords@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" @@ -7109,34 +7288,25 @@ silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0: dependencies: debug "^2.2.0" -simple-dom@^0.3.0: - version "0.3.2" - resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-0.3.2.tgz#0663d10f1556f1500551d518f56e3aba0871371d" - simple-fmt@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/simple-fmt/-/simple-fmt-0.1.0.tgz#191bf566a59e6530482cb25ab53b4a8dc85c3a6b" -simple-html-tokenizer@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.3.0.tgz#9b8b5559d80e331a544dd13dd59382e5d0d94411" - -simple-html-tokenizer@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.4.1.tgz#028988bb7fe8b2e6645676d82052587d440b02d3" - simple-is@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/simple-is/-/simple-is-0.2.0.tgz#2abb75aade39deb5cc815ce10e6191164850baf0" -sinon@^2.1.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/sinon/-/sinon-2.4.1.tgz#021fd64b54cb77d9d2fb0d43cdedfae7629c3a36" +sinon@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-3.3.0.tgz#9132111b4bbe13c749c2848210864250165069b1" dependencies: + build "^0.1.4" diff "^3.1.0" formatio "1.2.0" - lolex "^1.6.0" + lodash.get "^4.4.2" + lolex "^2.1.2" native-promise-only "^0.8.1" + nise "^1.0.1" path-to-regexp "^1.7.0" samsam "^1.1.3" text-encoding "0.6.4" @@ -7226,6 +7396,10 @@ source-map-url@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9" +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, source-map@~0.1.x: version "0.1.32" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266" @@ -7242,6 +7416,10 @@ source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, sour version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" +source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + sourcemap-validator@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/sourcemap-validator/-/sourcemap-validator-1.0.5.tgz#f9b960f48c6469e288a19af305f005da3dc1df3a" @@ -7306,6 +7484,10 @@ stable@~0.1.3: version "0.1.6" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.6.tgz#910f5d2aed7b520c6e777499c1f32e139fdecb10" +stack-trace@0.0.x: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" + staged-git-files@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-0.0.4.tgz#d797e1b551ca7a639dec0237dc6eb4bb9be17d35" @@ -7351,9 +7533,11 @@ stream-splicer@^2.0.0: inherits "^2.0.1" readable-stream "^2.0.2" -stream-to-observable@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.1.0.tgz#45bf1d9f2d7dc09bed81f1c307c430e68b84cffe" +stream-to-observable@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.2.0.tgz#59d6ea393d87c2c0ddac10aa0d561bc6ba6f0e10" + dependencies: + any-observable "^0.2.0" strict-uri-encode@^1.0.0: version "1.1.0" @@ -7388,6 +7572,14 @@ string_decoder@~1.0.3: dependencies: safe-buffer "~5.1.0" +stringify-object@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.1.tgz#2720c2eff940854c819f6ee252aaeb581f30624d" + dependencies: + get-own-enumerable-property-symbols "^2.0.1" + is-obj "^1.0.1" + is-regexp "^1.0.0" + stringmap@~0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/stringmap/-/stringmap-0.2.2.tgz#556c137b258f942b8776f5b2ef582aa069d7d1b1" @@ -7438,6 +7630,10 @@ strip-indent@^1.0.1: dependencies: get-stdin "^4.0.1" +strip-indent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" + 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" @@ -7484,9 +7680,13 @@ svgo@^0.6.3: sax "~1.2.1" whet.extend "~0.9.9" -symbol-observable@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d" +symbol-observable@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" + +symbol-observable@^0.2.2: + version "0.2.4" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40" symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8: version "1.1.8" @@ -7498,17 +7698,6 @@ syntax-error@^1.1.1: dependencies: acorn "^4.0.3" -table@^3.7.8: - version "3.8.3" - resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f" - dependencies: - ajv "^4.7.0" - ajv-keywords "^1.0.0" - chalk "^1.1.1" - lodash "^4.0.0" - slice-ansi "0.0.4" - string-width "^2.0.0" - table@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/table/-/table-4.0.1.tgz#a8116c133fac2c61f4a420ab6cdf5c4d61f0e435" @@ -7557,37 +7746,7 @@ temp@0.8.3: os-tmpdir "^1.0.0" rimraf "~2.2.6" -testem@1.15.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/testem/-/testem-1.15.0.tgz#2e3a9e7ac29f16a20f718eb0c4b12e7a44900675" - dependencies: - backbone "^1.1.2" - bluebird "^3.4.6" - charm "^1.0.0" - commander "^2.6.0" - consolidate "^0.14.0" - cross-spawn "^5.0.0" - express "^4.10.7" - fireworm "^0.7.0" - glob "^7.0.4" - http-proxy "^1.13.1" - js-yaml "^3.2.5" - lodash.assignin "^4.1.0" - lodash.clonedeep "^4.4.1" - lodash.find "^4.5.1" - mkdirp "^0.5.1" - mustache "^2.2.1" - node-notifier "^5.0.1" - npmlog "^4.0.0" - printf "^0.2.3" - rimraf "^2.4.4" - socket.io "1.6.0" - spawn-args "^0.2.0" - styled_string "0.0.1" - tap-parser "^5.1.0" - xmldom "^0.1.19" - -testem@^1.15.0: +testem@^1.18.0: version "1.18.4" resolved "https://registry.yarnpkg.com/testem/-/testem-1.18.4.tgz#e45fed922bec2f54a616c43f11922598ac97eb41" dependencies: @@ -7618,7 +7777,7 @@ testem@^1.15.0: tap-parser "^5.1.0" xmldom "^0.1.19" -text-encoding@0.6.4: +text-encoding@0.6.4, text-encoding@^0.6.4: version "0.6.4" resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19" @@ -7647,6 +7806,10 @@ timers-browserify@^1.0.1: dependencies: process "~0.11.0" +timespan@2.x: + version "2.3.0" + resolved "https://registry.yarnpkg.com/timespan/-/timespan-2.3.0.tgz#4902ce040bd13d845c8f59b27e9d59bad6f39929" + tiny-lr@^1.0.3: version "1.0.5" resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.0.5.tgz#21f40bf84ebd1f853056680375eef1670c334112" @@ -7763,11 +7926,22 @@ typedarray@^0.0.6, typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.3: +uc.micro@^1.0.1, uc.micro@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192" -uglify-js@^2.6, uglify-js@^2.7.0: +uglify-es@^3.1.3: + version "3.2.2" + resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.2.2.tgz#15c62b7775002c81b7987a1c49ecd3f126cace73" + dependencies: + commander "~2.12.1" + source-map "~0.6.1" + +uglify-js@1.x: + version "1.3.5" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-1.3.5.tgz#4b5bfff9186effbaa888e4c9e94bd9fc4c94929d" + +uglify-js@^2.6: version "2.8.29" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" dependencies: @@ -7809,6 +7983,10 @@ unique-string@^1.0.0: dependencies: crypto-random-string "^1.0.0" +universalify@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7" + unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -7830,12 +8008,6 @@ 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" - dependencies: - os-homedir "^1.0.0" - username-sync@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.1.tgz#1cde87eefcf94b8822984d938ba2b797426dae1f" @@ -7907,14 +8079,14 @@ walk-sync@^0.2.5, walk-sync@^0.2.7: ensure-posix-path "^1.0.0" matcher-collection "^1.0.0" -walk-sync@^0.3.0, walk-sync@^0.3.1: +walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.3.2.tgz#4827280afc42d0e035367c4a4e31eeac0d136f75" dependencies: ensure-posix-path "^1.0.0" matcher-collection "^1.0.0" -walker@~1.0.5: +walker@1.x, walker@~1.0.5: version "1.0.7" resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" dependencies: @@ -7970,6 +8142,17 @@ window-size@^0.1.2: version "0.1.4" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" +winston@*: + version "2.4.0" + resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.0.tgz#808050b93d52661ed9fb6c26b3f0c826708b0aee" + dependencies: + async "~1.0.0" + colors "1.0.x" + cycle "1.0.x" + eyes "0.1.x" + isstream "0.1.x" + stack-trace "0.0.x" + wordwrap@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" @@ -7999,6 +8182,10 @@ wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" +wrench@1.3.x: + version "1.3.9" + resolved "https://registry.yarnpkg.com/wrench/-/wrench-1.3.9.tgz#6f13ec35145317eb292ca5f6531391b244111411" + write-file-atomic@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"