Skip to content

Commit

Permalink
upgrade to ember-cli 2.11.1
Browse files Browse the repository at this point in the history
  • Loading branch information
bantic committed Mar 6, 2017
1 parent 522ebb4 commit 381b424
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 40 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
Expand All @@ -13,5 +13,5 @@
/connect.lock
/coverage/*
/libpeerconnection.log
npm-debug.log
npm-debug.log*
testem.log
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ cache:
- $HOME/.cache

env:
- EMBER_TRY_SCENARIO=default
- EMBER_TRY_SCENARIO=1.13
- EMBER_TRY_SCENARIO=ember-lts-2.4
- EMBER_TRY_SCENARIO=ember-lts-2.8
Expand Down
6 changes: 1 addition & 5 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
"name": "ember-mobiledoc-dom-renderer",
"dependencies": {
"ember": "^2.11.0",
"ember-cli-shims": "0.1.1",
"ember-qunit-notifications": "0.1.0"
}
"dependencies": {}
}
36 changes: 30 additions & 6 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
/*jshint node:true*/
module.exports = {
scenarios: [
{
name: 'default',
bower: {
dependencies: { }
}
},
{
name: '1.13',
bower: {
dependencies: {
"ember": "^1.13"
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
Expand All @@ -24,6 +23,11 @@ module.exports = {
resolutions: {
'ember': 'lts-2-4'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
Expand All @@ -35,6 +39,11 @@ module.exports = {
resolutions: {
'ember': 'lts-2-8'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
Expand All @@ -46,6 +55,11 @@ module.exports = {
resolutions: {
'ember': 'release'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
Expand All @@ -57,6 +71,11 @@ module.exports = {
resolutions: {
'ember': 'beta'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
Expand All @@ -68,6 +87,11 @@ module.exports = {
resolutions: {
'ember': 'canary'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
}
]
Expand Down
52 changes: 27 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,60 @@
"name": "ember-mobiledoc-dom-renderer",
"version": "0.5.9",
"description": "provides a runtime mobiledoc dom-renderer to ember apps",
"keywords": [
"ember-addon",
"mobiledoc",
"mobiledoc-kit"
],
"license": "MIT",
"author": "Bustlelabs",
"directories": {
"doc": "doc",
"test": "tests"
},
"repository": "https://github.com/bustlelabs/ember-mobiledoc-dom-renderer",
"scripts": {
"build": "ember build",
"start": "ember server",
"test": "ember try:each",
"update-changelog": "conventional-changelog -i CHANGELOG.md -r 0 -s",
"version": "npm run update-changlog && git add CHANGELOG.md"
},
"repository": "https://github.com/bustlelabs/ember-mobiledoc-dom-renderer",
"engines": {
"node": ">= 0.10.0"
"dependencies": {
"broccoli-funnel": "^1.0.0",
"broccoli-merge-trees": "^1.0.0",
"ember-cli-babel": "^5.1.7",
"ember-cli-htmlbars": "^1.1.1",
"ember-getowner-polyfill": "^1.2.2",
"ember-wormhole": "^0.5.1",
"mobiledoc-dom-renderer": "^0.6.3"
},
"author": "Bustlelabs",
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.4.2",
"conventional-changelog": "^1.1.0",
"conventional-changelog-cli": "^1.1.1",
"ember-cli": "2.7.0",
"ember-cli": "2.11.1",
"ember-cli-app-version": "^1.0.0",
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-inject-live-reload": "^1.4.0",
"ember-cli-jshint": "^1.0.0",
"ember-cli-qunit": "^2.0.0",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-jshint": "^2.0.1",
"ember-cli-qunit": "^3.0.1",
"ember-cli-release": "^0.2.9",
"ember-cli-shims": "^1.0.2",
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.5.1",
"ember-load-initializers": "^0.6.0",
"ember-source": "~2.11.0",
"ember-resolver": "^2.0.3",
"loader.js": "^4.0.10"
},
"keywords": [
"ember-addon",
"mobiledoc",
"mobiledoc-kit"
],
"dependencies": {
"broccoli-funnel": "^1.0.0",
"broccoli-merge-trees": "^1.0.0",
"ember-cli-babel": "^5.1.6",
"ember-cli-htmlbars": "^1.0.3",
"ember-getowner-polyfill": "^1.2.2",
"ember-wormhole": "^0.5.1",
"mobiledoc-dom-renderer": "^0.6.3"
"engines": {
"node": ">= 0.12.0"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
1 change: 1 addition & 0 deletions tests/dummy/app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{outlet}}
4 changes: 4 additions & 0 deletions tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ module.exports = function(environment) {
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
},
EXTEND_PROTOTYPES: {
// prevent Ember Data from overriding Date.parse.
Date: false
}
},

Expand Down
2 changes: 1 addition & 1 deletion tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{{content-for "body"}}
{{content-for "test-body"}}

<script src="{{rootURL}}testem.js" integrity=""></script>
<script src="/testem.js" integrity=""></script>
<script src="{{rootURL}}assets/vendor.js"></script>
<script src="{{rootURL}}assets/test-support.js"></script>
<script src="{{rootURL}}assets/dummy.js"></script>
Expand Down

0 comments on commit 381b424

Please sign in to comment.