Skip to content

Commit

Permalink
chore: ember 3.12 update
Browse files Browse the repository at this point in the history
  • Loading branch information
saintsebastian authored and GreatWizard committed Oct 17, 2019
1 parent 6d41651 commit 5a8da98
Show file tree
Hide file tree
Showing 9 changed files with 1,787 additions and 961 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2017,
sourceType: "module"
Expand Down
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
/.env*
/.eslintignore
/.eslintrc.js
/.git/
/.gitignore
/.template-lintrc.js
/.travis.yml
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: node_js
node_js:
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "6"
- "8"

sudo: false
dist: trusty
Expand Down Expand Up @@ -49,8 +49,8 @@ jobs:
# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- stage: "Additional Tests"
env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
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
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ Hot plug your features: `ember-feature-controls` provides an administration pane

## Compatibility

- Ember.js v2.18 or above
- Ember CLI v2.13 or above
* Ember.js v3.4 or above
* Ember CLI v2.13 or above
* Node.js v8 or above

## Installation

Expand Down
133 changes: 60 additions & 73 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,85 +2,72 @@

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-lts-2.18",
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
"jquery-integration": true
})
},
npm: {
devDependencies: {
"@ember/jquery": "^0.5.1",
"ember-source": "~2.18.0"
}
module.exports = async function() {
return {
scenarios: [
{
name: 'ember-lts-3.4',
npm: {
devDependencies: {
'ember-source': '~3.4.0'
}
},
{
name: "ember-lts-3.4",
npm: {
devDependencies: {
"ember-source": "~3.4.0"
}
}
},
{
name: "ember-release",
npm: {
devDependencies: {
"ember-source": urls[0]
}
}
},
{
name: 'ember-lts-3.8',
npm: {
devDependencies: {
'ember-source': '~3.8.0'
}
},
{
name: "ember-beta",
npm: {
devDependencies: {
"ember-source": urls[1]
}
}
},
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': await getChannelURL('release')
}
},
{
name: "ember-canary",
npm: {
devDependencies: {
"ember-source": urls[2]
}
}
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': await getChannelURL('beta')
}
},
// The default `.travis.yml` runs this scenario via `npm 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-canary',
npm: {
devDependencies: {
'ember-source': await getChannelURL('canary')
}
}
},
// The default `.travis.yml` runs this scenario via `npm 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'
}
}
]
};
});
}
]
};
};
41 changes: 21 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,45 +27,46 @@
"test:all": "ember try:each"
},
"dependencies": {
"ember-cli-babel": "^7.1.2",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-babel": "^7.11.1",
"ember-cli-htmlbars": "^4.0.0",
"ember-feature-flags": "^5.0.0",
"ember-get-config": "^0.2.4",
"ember-local-storage": "^1.4.1",
"ember-truth-helpers": "^2.0.0"
},
"devDependencies": {
"@ember/optional-features": "^0.6.3",
"broccoli-asset-rev": "^2.7.0",
"ember-cli": "~3.8.3",
"@ember/optional-features": "^1.0.0",
"babel-eslint": "^10.0.3",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.13.1",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli-eslint": "^4.2.3",
"ember-cli-eslint": "^5.1.0",
"ember-cli-github-pages": "0.2.1",
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
"ember-cli-inject-live-reload": "^1.8.2",
"ember-cli-htmlbars-inline-precompile": "^3.0.0",
"ember-cli-inject-live-reload": "^2.0.1",
"ember-cli-sass": "^7.1.7",
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.1",
"ember-cli-uglify": "^2.1.0",
"ember-cli-template-lint": "^1.0.0-beta.3",
"ember-cli-uglify": "^3.0.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.1.0",
"ember-load-initializers": "^2.1.0",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-milligram": "^0.2.0",
"ember-qunit": "^3.4.1",
"ember-resolver": "^5.0.1",
"ember-source": "~3.8.0",
"ember-source-channel-url": "^1.1.0",
"ember-qunit": "^4.5.1",
"ember-resolver": "^5.3.0",
"ember-source": "~3.13.0",
"ember-source-channel-url": "^2.0.1",
"ember-test-selectors": "^1.0.0",
"ember-try": "^1.0.0",
"eslint-plugin-ember": "^5.2.0",
"eslint-plugin-node": "^7.0.1",
"ember-try": "^1.2.1",
"eslint-plugin-ember": "^7.1.0",
"eslint-plugin-node": "^10.0.0",
"loader.js": "^4.7.0",
"milligram": "^1.3.0",
"qunit-dom": "^0.8.0"
"qunit-dom": "^0.9.0"
},
"engines": {
"node": "6.* || 8.* || >= 10.*"
"node": "8.* || >= 10.*"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
1 change: 0 additions & 1 deletion testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ module.exports = {
// --no-sandbox is needed when running Chrome inside a container
process.env.CI ? '--no-sandbox' : null,
'--headless',
'--disable-gpu',
'--disable-dev-shm-usage',
'--disable-software-rasterizer',
'--mute-audio',
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = function(environment) {
EmberENV: {
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Expand Down
Loading

0 comments on commit 5a8da98

Please sign in to comment.