From ee664768789f725442998005d9827adef53b2ce8 Mon Sep 17 00:00:00 2001 From: martinmalinda Date: Mon, 27 Mar 2017 15:57:44 +0200 Subject: [PATCH 1/9] move sorted project versions to project model --- app/controllers/project-version.js | 18 ++---------------- app/models/project.js | 24 +++++++++++++++++++++++- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/app/controllers/project-version.js b/app/controllers/project-version.js index 32662483f..2e872b7e3 100644 --- a/app/controllers/project-version.js +++ b/app/controllers/project-version.js @@ -1,7 +1,4 @@ import Ember from 'ember'; -import _ from 'lodash'; -import semverCompare from 'npm:semver-compare'; -import getMinorVersion from "../utils/get-minor-version"; import FilterParams from '../mixins/filter-params'; const { Controller, computed, A, inject: {service} } = Ember; @@ -53,6 +50,8 @@ export default Controller.extend(FilterParams, { return A(sorted).toArray().map(id => id.split('-').pop()); }, + projectVersions: computed.alias('model.project.sortedProjectVersions'), + shownClassesIDs: computed('showPrivateClasses', 'classesIDs', 'publicClassesIDs', function() { return this.get('showPrivateClasses') ? this.get('classesIDs') : this.get('publicClassesIDs'); }), @@ -65,19 +64,6 @@ export default Controller.extend(FilterParams, { return this.get('showPrivateClasses') ? this.get('namespaceIDs') : this.get('publicNamespaceIDs'); }), - projectVersions: computed('metaStore.availableProjectVersions', 'model.project.id', function() { - const projectVersions = this.get('metaStore.availableProjectVersions')[this.get('model.project.id')]; - let versions = projectVersions.sort((a, b) => semverCompare(b, a)); - - versions = versions.map((version) => { - const minorVersion = getMinorVersion(version); - return { id: version, minorVersion }; - }); - let groupedVersions = _.groupBy(versions, version => version.minorVersion); - - return _.values(groupedVersions).map(groupedVersion => groupedVersion[0]); - }), - selectedProjectVersion:computed('projectVersions.[]', 'model.version', function() { return this.get('projectVersions').filter(pV => pV.id === this.get('model.version'))[0]; }), diff --git a/app/models/project.js b/app/models/project.js index e55505d45..9f594ebc9 100644 --- a/app/models/project.js +++ b/app/models/project.js @@ -1,9 +1,31 @@ import DS from 'ember-data'; +import Ember from 'ember'; +import semverCompare from 'npm:semver-compare'; +import getMinorVersion from "../utils/get-minor-version"; +import _ from 'lodash'; + const {Model, attr, hasMany} = DS; +const {computed} = Ember; export default Model.extend({ name: attr(), githubUrl: attr(), - projectVersions: hasMany('project-version', {async: true}) + projectVersions: hasMany('project-version', {async: true}), + + latestProjectVersion: computed.alias('sortedProjectVersions.firstObject'), + sortedProjectVersions: computed(function() { + let projectVersions = this.hasMany('projectVersions').ids().map(id => id.split('-')[1]); + let sortedVersions = projectVersions.sort((a, b) => semverCompare(b, a)); + + sortedVersions = sortedVersions.map((version) => { + const minorVersion = getMinorVersion(version); + return { id: version, minorVersion }; + }); + + let groupedVersions = _.groupBy(sortedVersions, version => version.minorVersion); + + return _.values(groupedVersions).map(groupedVersion => groupedVersion[0]); + }), + }); From 60a04cd8dc066b9067faea4faefd8a4923cac554 Mon Sep 17 00:00:00 2001 From: martinmalinda Date: Mon, 27 Mar 2017 16:30:22 +0200 Subject: [PATCH 2/9] add handling for current version param --- app/models/project.js | 10 +++++++--- app/routes/project-version.js | 8 +++++--- app/routes/project-version/class.js | 3 ++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/models/project.js b/app/models/project.js index 9f594ebc9..c23b81231 100644 --- a/app/models/project.js +++ b/app/models/project.js @@ -6,7 +6,7 @@ import _ from 'lodash'; const {Model, attr, hasMany} = DS; -const {computed} = Ember; +const {computed,A} = Ember; export default Model.extend({ name: attr(), @@ -22,10 +22,14 @@ export default Model.extend({ const minorVersion = getMinorVersion(version); return { id: version, minorVersion }; }); - + let groupedVersions = _.groupBy(sortedVersions, version => version.minorVersion); - return _.values(groupedVersions).map(groupedVersion => groupedVersion[0]); + return A(_.values(groupedVersions).map(groupedVersion => groupedVersion[0])); }), + getProjectVersion(version){ + return version === 'current' ? this.get('latestProjectVersion.id') : version; + } + }); diff --git a/app/routes/project-version.js b/app/routes/project-version.js index 0aa128e70..ee88b95a2 100644 --- a/app/routes/project-version.js +++ b/app/routes/project-version.js @@ -9,9 +9,11 @@ export default Ember.Route.extend({ }, model(params) { - const id = `${params.project}-${params.project_version}`; - this.get('projectService').setVersion(params.project_version); - return this.store.findRecord('project', params.project).then(() => { + + return this.store.findRecord('project', params.project).then(project => { + this.get('projectService').setVersion(params.project_version); + const version = project.getProjectVersion(params.project_version); + const id = `${params.project}-${version}`; return this.store.findRecord('project-version', id, { includes: 'project' }); }); }, diff --git a/app/routes/project-version/class.js b/app/routes/project-version/class.js index 7ccb1cd1f..f0672c862 100644 --- a/app/routes/project-version/class.js +++ b/app/routes/project-version/class.js @@ -17,8 +17,9 @@ export default Ember.Route.extend({ }, getModel(typeName, params, transition) { + const projectModel = this.modelFor('project-version').get('project.content'); const projectID = transition.params['project-version'].project; - const version = transition.params['project-version'].project_version; + const version = projectModel.getProjectVersion(transition.params['project-version'].project_version); const klass = params[typeName]; return this.find(typeName, `${projectID}-${version}-${klass}`); }, From b99bcea4c70c77f7965bfb306758433b7642bb6c Mon Sep 17 00:00:00 2001 From: martinmalinda Date: Tue, 18 Apr 2017 21:00:57 +0200 Subject: [PATCH 3/9] use 'release' instead of 'current' for displaying latest version --- app/models/project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/project.js b/app/models/project.js index c23b81231..44d6946de 100644 --- a/app/models/project.js +++ b/app/models/project.js @@ -29,7 +29,7 @@ export default Model.extend({ }), getProjectVersion(version){ - return version === 'current' ? this.get('latestProjectVersion.id') : version; + return version === 'release' ? this.get('latestProjectVersion.id') : version; } }); From edd98800fb9891ad9ccfc82625d7db8b4aaa01de Mon Sep 17 00:00:00 2001 From: martinmalinda Date: Wed, 19 Apr 2017 13:52:21 +0200 Subject: [PATCH 4/9] make sure that links on /release also link to /release --- app/controllers/project-version/class.js | 2 +- app/helpers/url-param.js | 16 ++++++++++++++++ app/routes/project-version/module.js | 3 ++- app/templates/class-index.hbs | 3 ++- app/templates/components/table-of-contents.hbs | 6 +++--- app/templates/project-version/class.hbs | 16 ++++++++-------- app/templates/project-version/module.hbs | 2 +- 7 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 app/helpers/url-param.js diff --git a/app/controllers/project-version/class.js b/app/controllers/project-version/class.js index fc233c9aa..963c3e607 100644 --- a/app/controllers/project-version/class.js +++ b/app/controllers/project-version/class.js @@ -5,7 +5,7 @@ const { Controller } = Ember; export default Controller.extend(ParentNameMixin, { filterData: Ember.inject.service(), - + actions: { updateFilter(filter) { this.toggleProperty(`filterData.${filter}`); diff --git a/app/helpers/url-param.js b/app/helpers/url-param.js new file mode 100644 index 000000000..741bd04f0 --- /dev/null +++ b/app/helpers/url-param.js @@ -0,0 +1,16 @@ +import Ember from 'ember'; + +const { inject, computed} = Ember; + +export default Ember.Helper.extend({ + + '-routing': inject.service(), + + compute([modelName, paramName]){ + return this.get(`-routing.router.currentState.routerJsState.params.${modelName}.${paramName}`); + } +}); + +// export default Ember.Helper.helper(function([projectModel, version]){ +// return model.getProjectVersion(version); +// }); \ No newline at end of file diff --git a/app/routes/project-version/module.js b/app/routes/project-version/module.js index b33ffcd62..23b8e385e 100644 --- a/app/routes/project-version/module.js +++ b/app/routes/project-version/module.js @@ -12,8 +12,9 @@ export default ClassRoute.extend({ }, getModel(typeName, params, transition) { + const projectModel = this.modelFor('project-version').get('project.content'); const projectID = transition.params['project-version'].project; - const version = transition.params['project-version'].project_version; + const version = projectModel.getProjectVersion(transition.params['project-version'].project_version); let klass = params[typeName]; if (!~klass.indexOf(projectID)) { klass = `${projectID}-${klass}`; diff --git a/app/templates/class-index.hbs b/app/templates/class-index.hbs index 7c177e46c..7ee620b34 100644 --- a/app/templates/class-index.hbs +++ b/app/templates/class-index.hbs @@ -1,3 +1,4 @@ + {{#api-index-filter model=model filterData=filterData as |filteredModel|}} {{#api-index itemData=filteredModel classNames="api__index__content" as |sectionData|}} {{#each sectionData.sections as |section|}} @@ -8,7 +9,7 @@
  • {{#link-to (concat parentName section.routeSuffix) model.project.id - model.projectVersion.version + (url-param "project-version" "project_version") model.name item.name (query-params anchor=item.name)}} diff --git a/app/templates/components/table-of-contents.hbs b/app/templates/components/table-of-contents.hbs index 303e653c9..d3a182f0b 100644 --- a/app/templates/components/table-of-contents.hbs +++ b/app/templates/components/table-of-contents.hbs @@ -3,7 +3,7 @@ Modules
      {{#each moduleIDs as |moduleID|}} -
    1. {{#link-to 'project-version.module' version moduleID}}{{moduleID}}{{/link-to}}
      2. +
    2. {{#link-to 'project-version.module' (url-param "project-version" "project_version") moduleID}}{{moduleID}}{{/link-to}}
      3. {{/each}}
    • @@ -11,7 +11,7 @@ Namespaces
      {{#each namespaceIDs as |namespaceID|}} -
    1. {{#link-to 'project-version.namespace' version namespaceID}}{{namespaceID}}{{/link-to}}
      2. +
    2. {{#link-to 'project-version.namespace' (url-param "project-version" "project_version") namespaceID}}{{namespaceID}}{{/link-to}}
      3. {{/each}}
    @@ -19,7 +19,7 @@ Classes
      {{#each classesIDs as |classID|}} -
    1. {{#link-to 'project-version.class' version classID}}{{classID}}{{/link-to}}
      2. +
    2. {{#link-to 'project-version.class' (url-param "project-version" "project_version") classID}}{{classID}}{{/link-to}}
      3. {{/each}}
    diff --git a/app/templates/project-version/class.hbs b/app/templates/project-version/class.hbs index c4723deb3..bd6bf0ae0 100644 --- a/app/templates/project-version/class.hbs +++ b/app/templates/project-version/class.hbs @@ -8,7 +8,7 @@ {{#if model.extends}}
    Extends: - {{#link-to 'project-version.class' model.projectVersion.version model.extends}}{{model.extends}}{{/link-to}} + {{#link-to 'project-version.class' (url-param "project-version" "project_version") model.extends}}{{model.extends}}{{/link-to}}
    {{/if}} {{#if model.uses}} @@ -17,7 +17,7 @@ {{#each model.uses as |parentClass idx|}} {{#unless (eq idx 0)}},{{/unless}} - {{#link-to 'project-version.class' model.projectVersion.version parentClass}}{{parentClass}}{{/link-to}} + {{#link-to 'project-version.class' (url-param "project-version" "project_version") parentClass}}{{parentClass}}{{/link-to}} {{/each}} @@ -26,14 +26,14 @@
    Defined in: - {{model.file}}:{{model.line}} + {{model.file}}:{{model.line}}
    {{/if}} {{#if model.module}}
    Module: - {{#link-to 'project-version.module' model.projectVersion.version model.module}}{{model.module}}{{/link-to}} + {{#link-to 'project-version.module' (url-param "project-version" "project_version") model.module}}{{model.module}}{{/link-to}}
    {{/if}} @@ -45,7 +45,7 @@
      {{#link-to (concat parentName ".index") model.project.id - model.projectVersion.version + (url-param "project-version" "project_version") model.name (query-params anchor="") tagName="li" @@ -58,7 +58,7 @@ {{#if model.methods}} {{#link-to (concat parentName ".methods") model.project.id - model.projectVersion.version + (url-param "project-version" "project_version") model.name (query-params anchor="") tagName="li" @@ -72,7 +72,7 @@ {{#if model.properties}} {{#link-to (concat parentName ".properties") model.project.id - model.projectVersion.version + (url-param "project-version" "project_version") model.name (query-params anchor="") tagName="li" @@ -86,7 +86,7 @@ {{#if model.events}} {{#link-to (concat parentName ".events") model.project.id - model.projectVersion.version + (url-param "project-version" "project_version") model.name (query-params anchor="") tagName="li" diff --git a/app/templates/project-version/module.hbs b/app/templates/project-version/module.hbs index 92585daf3..d3c113d66 100644 --- a/app/templates/project-version/module.hbs +++ b/app/templates/project-version/module.hbs @@ -5,7 +5,7 @@ {{#if model.parent}}
      Parent: - {{#link-to 'project-version.module' model.projectVersion.version model.parent}}{{model.parent}}{{/link-to}} + {{#link-to 'project-version.module' (url-param "project-version" "project_version") model.parent}}{{model.parent}}{{/link-to}}
      {{/if}}

      From 4556ebf7b985615aaddac302c11915b919fb0c44 Mon Sep 17 00:00:00 2001 From: martinmalinda Date: Wed, 19 Apr 2017 13:58:21 +0200 Subject: [PATCH 5/9] add suport for LTS version --- app/models/project.js | 11 ++++++++++- config/environment.js | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/models/project.js b/app/models/project.js index 44d6946de..f170e7c4d 100644 --- a/app/models/project.js +++ b/app/models/project.js @@ -3,6 +3,7 @@ import Ember from 'ember'; import semverCompare from 'npm:semver-compare'; import getMinorVersion from "../utils/get-minor-version"; import _ from 'lodash'; +import config from 'ember-api-docs/config/environment'; const {Model, attr, hasMany} = DS; @@ -29,7 +30,15 @@ export default Model.extend({ }), getProjectVersion(version){ - return version === 'release' ? this.get('latestProjectVersion.id') : version; + if (version === 'release') { + return this.get('latestProjectVersion.id'); + } + + if(version === 'lts') { + return config.ltsVersion; + } + + return version; } }); diff --git a/config/environment.js b/config/environment.js index 81b1235b8..8f30757ba 100644 --- a/config/environment.js +++ b/config/environment.js @@ -2,6 +2,7 @@ module.exports = function(environment) { var ENV = { + ltsVersion: '2.8.3', modulePrefix: 'ember-api-docs', environment: environment, rootURL: '/', From c1e4cb201fed85b6e7d96b598a0a91a266baa7ed Mon Sep 17 00:00:00 2001 From: martinmalinda Date: Wed, 19 Apr 2017 14:22:33 +0200 Subject: [PATCH 6/9] make version sorting work for ember data as well --- app/controllers/project-version/class.js | 1 - app/helpers/url-param.js | 8 ++------ app/models/project.js | 11 +++++------ tests/acceptance/switch-project-test.js | 12 ++++++------ 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/app/controllers/project-version/class.js b/app/controllers/project-version/class.js index 963c3e607..6fa82eabb 100644 --- a/app/controllers/project-version/class.js +++ b/app/controllers/project-version/class.js @@ -5,7 +5,6 @@ const { Controller } = Ember; export default Controller.extend(ParentNameMixin, { filterData: Ember.inject.service(), - actions: { updateFilter(filter) { this.toggleProperty(`filterData.${filter}`); diff --git a/app/helpers/url-param.js b/app/helpers/url-param.js index 741bd04f0..e1f433666 100644 --- a/app/helpers/url-param.js +++ b/app/helpers/url-param.js @@ -1,16 +1,12 @@ import Ember from 'ember'; -const { inject, computed} = Ember; +const { inject } = Ember; export default Ember.Helper.extend({ '-routing': inject.service(), - compute([modelName, paramName]){ + compute([modelName, paramName]) { return this.get(`-routing.router.currentState.routerJsState.params.${modelName}.${paramName}`); } }); - -// export default Ember.Helper.helper(function([projectModel, version]){ -// return model.getProjectVersion(version); -// }); \ No newline at end of file diff --git a/app/models/project.js b/app/models/project.js index f170e7c4d..b1be24584 100644 --- a/app/models/project.js +++ b/app/models/project.js @@ -16,9 +16,10 @@ export default Model.extend({ latestProjectVersion: computed.alias('sortedProjectVersions.firstObject'), sortedProjectVersions: computed(function() { - let projectVersions = this.hasMany('projectVersions').ids().map(id => id.split('-')[1]); + let projectVersions = this.hasMany('projectVersions').ids().map(id => { + return id.replace(this.id, '').split('-')[1]; + }); let sortedVersions = projectVersions.sort((a, b) => semverCompare(b, a)); - sortedVersions = sortedVersions.map((version) => { const minorVersion = getMinorVersion(version); return { id: version, minorVersion }; @@ -29,15 +30,13 @@ export default Model.extend({ return A(_.values(groupedVersions).map(groupedVersion => groupedVersion[0])); }), - getProjectVersion(version){ + getProjectVersion(version) { if (version === 'release') { return this.get('latestProjectVersion.id'); } - - if(version === 'lts') { + if (version === 'lts') { return config.ltsVersion; } - return version; } diff --git a/tests/acceptance/switch-project-test.js b/tests/acceptance/switch-project-test.js index 6e712722f..bf7791ded 100644 --- a/tests/acceptance/switch-project-test.js +++ b/tests/acceptance/switch-project-test.js @@ -6,14 +6,14 @@ moduleForAcceptance('Acceptance | Switch Project'); test('Can switch projects back and forth', function(assert) { - let ensureVersionsExist = () => { + let ensureVersionsExist = projectName => { andThen(() => { selectSearch('.select-container', '2'); }); andThen(() => { - assert.equal(find('.ember-power-select-options').length, 1); - assert.ok(find('.ember-power-select-options')[0].children.length > 1); + assert.equal(find('.ember-power-select-options').length, 1, `There is one power select for ${projectName}`); + assert.ok(find('.ember-power-select-options')[0].children.length > 1, `There is more than 1 option for ${projectName}`); }); }; @@ -23,21 +23,21 @@ test('Can switch projects back and forth', function(assert) { click('.spec-ember-data'); andThen(() => { - ensureVersionsExist(); + ensureVersionsExist('ember-data'); assert.ok(findWithAssert('.spec-ember-data').hasClass('active')); }); click('.spec-ember'); andThen(() => { - ensureVersionsExist(); + ensureVersionsExist('ember'); assert.ok(findWithAssert('.spec-ember').hasClass('active')); }); click('.spec-ember-data'); andThen(() => { - ensureVersionsExist(); + ensureVersionsExist('ember-data (2)'); assert.ok(findWithAssert('.spec-ember-data').hasClass('active')); }); }); From 9183835de5ba145bf508a533d4b2513b7313c3b4 Mon Sep 17 00:00:00 2001 From: martinmalinda Date: Wed, 19 Apr 2017 17:12:58 +0200 Subject: [PATCH 7/9] add acceptance test for /lts and /release --- .../release-lts-project-versions-test.js | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 tests/acceptance/release-lts-project-versions-test.js diff --git a/tests/acceptance/release-lts-project-versions-test.js b/tests/acceptance/release-lts-project-versions-test.js new file mode 100644 index 000000000..a3307d72c --- /dev/null +++ b/tests/acceptance/release-lts-project-versions-test.js @@ -0,0 +1,78 @@ +import { test } from 'qunit'; +import moduleForAcceptance from 'ember-api-docs/tests/helpers/module-for-acceptance'; +import { click } from 'ember-native-dom-helpers'; +import Ember from 'ember'; + +const {$} = Ember; + +moduleForAcceptance('Acceptance | release lts project versions'); + +test('release url param', function(assert) { + visit('/ember/release/namespaces/Ember'); + + let checkLinks = (label, selector, versionString) => { + return $('.attributes a').toArray().forEach(el => { + let href = el.attributes.href.value; + if (href[0] === '/') { + + assert.ok(href.indexOf(versionString) > -1, `${label} link contains ${versionString} - ${href}`); + } + }); + }; + + let checkSidebarLinks = versionString => { + return checkLinks('side', + '.toc-level-1.modules li:first-child a, .toc-level-1.namespaces li:first-child a, .toc-level-1.classes li:first-child a', + versionString); + }; + + let checkAttributeLinks = versionString => { + return checkLinks('attributes', '.attributes a', versionString); + }; + + let checkIndexListLinks = versionString => { + return checkLinks('index-list', '.api-index-filter a', versionString); + }; + + let checkActiveClass = versionString => { + return assert.ok($('.tabbed-layout__menu li:first-child').hasClass('tabbed-layout__menu__item_selected'), `active class works with ${versionString}`) + }; + + andThen(function() { + assert.equal(currentURL(), '/ember/release/namespaces/Ember'); + + checkSidebarLinks('release'); + checkActiveClass('release'); + checkIndexListLinks('release'); + checkAttributeLinks('release'); + + return click('.tabbed-layout__menu__item:nth-child(2)'); //clicking methods + }); + + andThen(() => { + assert.equal(currentURL(), '/ember/release/namespaces/Ember/methods?anchor='); + return visit('/ember-data/release/namespaces/DS'); + }); + + andThen(() => { + assert.equal(currentURL(), '/ember-data/release/namespaces/DS'); + + checkSidebarLinks('release'); + checkActiveClass('release'); + checkIndexListLinks('release'); + checkAttributeLinks('release'); + + return visit('/ember/lts/namespaces/Ember'); + }); + + return andThen(() => { + assert.equal(currentURL(), '/ember/lts/namespaces/Ember'); + + checkSidebarLinks('lts'); + checkActiveClass('lts'); + checkIndexListLinks('lts'); + checkAttributeLinks('lts'); + + return this; + }); +}); From 2a4bd8ee2e30282b18ad25d6a79284f70dffa21b Mon Sep 17 00:00:00 2001 From: martinmalinda Date: Thu, 20 Apr 2017 13:02:24 +0200 Subject: [PATCH 8/9] add ember-router-service --- app/helpers/url-param.js | 4 ++-- package.json | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/helpers/url-param.js b/app/helpers/url-param.js index e1f433666..0cd588dac 100644 --- a/app/helpers/url-param.js +++ b/app/helpers/url-param.js @@ -4,9 +4,9 @@ const { inject } = Ember; export default Ember.Helper.extend({ - '-routing': inject.service(), + router: inject.service(), compute([modelName, paramName]) { - return this.get(`-routing.router.currentState.routerJsState.params.${modelName}.${paramName}`); + return this.get(`router.router.state.params.${modelName}.${paramName}`); } }); diff --git a/package.json b/package.json index 97d92b846..8fb6b4fcc 100644 --- a/package.json +++ b/package.json @@ -58,10 +58,6 @@ "ember-cli-qunit": "^3.1.2", "ember-cli-release": "^1.0.0-beta.2", "ember-cli-sass": "^6.1.2", - "ember-service-worker": "0.6.2", - "ember-service-worker-asset-cache": "0.6.0", - "ember-service-worker-cache-fallback": "0.6.0", - "ember-service-worker-index": "0.6.1", "ember-cli-shims": "^1.0.2", "ember-cli-template-lint": "^0.5.2", "ember-cli-test-loader": "^1.1.1", @@ -78,6 +74,11 @@ "ember-power-select": "^1.6.1", "ember-resolver": "^3.0.0", "ember-route-action-helper": "^2.0.2", + "ember-router-service": "^1.0.2", + "ember-service-worker": "0.6.2", + "ember-service-worker-asset-cache": "0.6.0", + "ember-service-worker-cache-fallback": "0.6.0", + "ember-service-worker-index": "0.6.1", "ember-source": "~2.12.0", "ember-tether": "0.4.1", "ember-truth-helpers": "^1.3.0", From 7453459dc6777dbf027c63efc0b073daa251d8fe Mon Sep 17 00:00:00 2001 From: martinmalinda Date: Thu, 20 Apr 2017 13:06:56 +0200 Subject: [PATCH 9/9] add short circuit to env variable to lts version --- config/environment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environment.js b/config/environment.js index 8f30757ba..50e0173b9 100644 --- a/config/environment.js +++ b/config/environment.js @@ -2,7 +2,7 @@ module.exports = function(environment) { var ENV = { - ltsVersion: '2.8.3', + ltsVersion: process.env.LTS_VERSION || '2.8.3', modulePrefix: 'ember-api-docs', environment: environment, rootURL: '/',