Skip to content

Commit

Permalink
Ember 3.11 (#281)
Browse files Browse the repository at this point in the history
  • Loading branch information
RobbieTheWagner authored Aug 4, 2019
1 parent 09d879b commit 726fb85
Show file tree
Hide file tree
Showing 9 changed files with 477 additions and 576 deletions.
5 changes: 2 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
ecmaVersion: 2018,
sourceType: 'module'
},
plugins: [
Expand Down Expand Up @@ -43,8 +43,7 @@ module.exports = {
'tests/dummy/app/**'
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015
sourceType: 'script'
},
env: {
browser: false,
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:
- env: EMBER_TRY_SCENARIO=ember-lts-2.16
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
Expand Down
1 change: 1 addition & 0 deletions addon/-private/data-view/utils/supports-passive.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ try {
let opts = Object.defineProperty({}, 'passive', {
get() {
supportsPassive = true;
return supportsPassive;
}
});

Expand Down
1 change: 0 additions & 1 deletion addon/components/vertical-collection/component.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* global Array, Math */
import { empty, readOnly } from '@ember/object/computed';

import Component from '@ember/component';
Expand Down
326 changes: 164 additions & 162 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,192 +2,194 @@

const getChannelURL = require('ember-source-channel-url');

module.exports = function() {
return Promise.all([
getChannelURL('release'),
getChannelURL('beta'),
getChannelURL('canary')
]).then((urls) => {
return {
useYarn: true,
scenarios: [
{
name: 'ember-1.12',
bower: {
dependencies: {
ember: '~1.12.0',
'ember-cli-shims': 'ember-cli/ember-cli-shims#0.0.3',
'ember-data': '~1.13.0'
},
resolutions: {
ember: '~1.12.0',
'ember-cli-shims': '0.0.3',
'ember-data': '~1.13.0'
}
module.exports = async function() {
return {
useYarn: true,
scenarios: [
{
name: 'ember-1.12',
bower: {
dependencies: {
ember: '~1.12.0',
'ember-cli-shims': 'ember-cli/ember-cli-shims#0.0.3',
'ember-data': '~1.13.0'
},
npm: {
devDependencies: {
'ember-cli-shims': null,
'ember-cli-fastboot': null,
'ember-data': '~1.13.0',
'ember-source': null
}
resolutions: {
ember: '~1.12.0',
'ember-cli-shims': '0.0.3',
'ember-data': '~1.13.0'
}
},
{
name: 'ember-1.13',
bower: {
dependencies: {
'ember': '~1.13.0',
'ember-cli-shims': '0.0.6',
'ember-data': '~1.13.0'
},
resolutions: {
'ember': '~1.13.0',
'ember-cli-shims': '0.0.6',
'ember-data': '~1.13.0'
}
},
npm: {
devDependencies: {
'ember-cli-shims': null,
'ember-cli-fastboot': null,
'ember-data': '~1.13.15',
'ember-source': null
}
npm: {
devDependencies: {
'ember-cli-shims': null,
'ember-cli-fastboot': null,
'ember-data': '~1.13.0',
'ember-source': null
}
},
{
name: 'ember-lts-2.4',
bower: {
dependencies: {
'ember-cli-shims': '~0.1.0',
'ember': 'components/ember#lts-2-4'
},
resolutions: {
'ember-cli-shims': '0.1.0',
'ember': 'lts-2-4'
}
}
},
{
name: 'ember-1.13',
bower: {
dependencies: {
'ember': '~1.13.0',
'ember-cli-shims': '0.0.6',
'ember-data': '~1.13.0'
},
npm: {
devDependencies: {
'ember-cli-shims': null,
'ember-cli-fastboot': null,
'ember-data': '~2.4.0',
'ember-source': null
}
resolutions: {
'ember': '~1.13.0',
'ember-cli-shims': '0.0.6',
'ember-data': '~1.13.0'
}
},
{
name: 'ember-lts-2.8',
bower: {
dependencies: {
'ember': 'components/ember#lts-2-8'
},
resolutions: {
'ember': 'lts-2-8'
}
},
npm: {
devDependencies: {
'ember-cli-shims': '^1.2.0',
'ember-data': '~2.8.0',
'ember-source': null
}
npm: {
devDependencies: {
'ember-cli-shims': null,
'ember-cli-fastboot': null,
'ember-data': '~1.13.15',
'ember-source': null
}
},
{
name: 'ember-lts-2.12',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
}
},
{
name: 'ember-lts-2.4',
bower: {
dependencies: {
'ember-cli-shims': '~0.1.0',
'ember': 'components/ember#lts-2-4'
},
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1',
'ember-source': '~2.12.0'
}
resolutions: {
'ember-cli-shims': '0.1.0',
'ember': 'lts-2-4'
}
},
{
name: 'ember-lts-2.16',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
},
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1',
'ember-source': '~2.16.0'
}
npm: {
devDependencies: {
'ember-cli-shims': null,
'ember-cli-fastboot': null,
'ember-data': '~2.4.0',
'ember-source': null
}
},
{
name: 'ember-lts-2.18',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
}
},
{
name: 'ember-lts-2.8',
bower: {
dependencies: {
'ember': 'components/ember#lts-2-8'
},
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1',
'ember-source': '~2.18.0'
}
resolutions: {
'ember': 'lts-2-8'
}
},
{
name: 'ember-lts-3.4',
npm: {
devDependencies: {
'ember-source': '~3.4.0'
}
npm: {
devDependencies: {
'ember-cli-shims': '^1.2.0',
'ember-data': '~2.8.0',
'ember-source': null
}
}
},
{
name: 'ember-lts-2.12',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
},
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': urls[0]
}
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1',
'ember-source': '~2.12.0'
}
}
},
{
name: 'ember-lts-2.16',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': urls[1]
}
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1',
'ember-source': '~2.16.0'
}
}
},
{
name: 'ember-lts-2.18',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': urls[2]
}
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1',
'ember-source': '~2.18.0'
}
},
// The default `.travis.yml` runs this scenario via `yarn test`,
// not via `ember try`. It's still included here so that running
// `ember try:each` manually or from a customized CI config will run it
// along with all the other scenarios.
{
name: 'ember-default',
npm: {
devDependencies: {}
}
},
{
name: 'ember-lts-3.4',
npm: {
devDependencies: {
'ember-source': '~3.4.0'
}
}
},
{
name: 'ember-lts-3.8',
npm: {
devDependencies: {
'ember-source': '~3.8.0'
}
}
},
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': await getChannelURL('release')
}
}
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': await getChannelURL('beta')
}
}
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': await getChannelURL('canary')
}
}
},
// The default `.travis.yml` runs this scenario via `yarn test`,
// not via `ember try`. It's still included here so that running
// `ember try:each` manually or from a customized CI config will run it
// along with all the other scenarios.
{
name: 'ember-default',
npm: {
devDependencies: {}
}
},
{
name: 'ember-default-with-jquery',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': true
})
},
{
name: 'ember-default-with-jquery',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': true
})
},
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1'
}
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1'
}
}
]
};
});
}
]
};
};
Loading

0 comments on commit 726fb85

Please sign in to comment.