-
Notifications
You must be signed in to change notification settings - Fork 82
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update ember cli 2.10 #80
Merged
lukemelia
merged 3 commits into
ember-cli-deploy:master
from
jrjohnson:update-ember-cli-2.10
Dec 22, 2016
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,6 +28,6 @@ | |
| "strict": false, | ||
| "white": false, | ||
| "eqnull": true, | ||
| "esnext": true, | ||
| "esversion": 6, | ||
| "unused": true | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,16 @@ | ||
| bower_components/ | ||
| tests/ | ||
| tmp/ | ||
|
|
||
| /bower_components | ||
| /config/ember-try.js | ||
| /dist | ||
| /tests | ||
| /tmp | ||
| **/.gitkeep | ||
| .bowerrc | ||
| .editorconfig | ||
| .ember-cli | ||
| .gitignore | ||
| .jshintrc | ||
| .watchmanconfig | ||
| .travis.yml | ||
| .npmignore | ||
| **/.gitkeep | ||
| bower.json | ||
| Brocfile.js | ||
| testem.json | ||
| ember-cli-build.js | ||
| testem.js |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "ignore_dirs": ["tmp", "dist"] | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,7 @@ | ||
| { | ||
| "name": "ember-cli-deploy-s3", | ||
| "dependencies": { | ||
| "ember": "1.11.1", | ||
| "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", | ||
| "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", | ||
| "ember-data": "1.0.0-beta.16.1", | ||
| "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4", | ||
| "ember-qunit": "0.3.1", | ||
| "ember-qunit-notifications": "0.0.7", | ||
| "ember-resolver": "~0.1.15", | ||
| "jquery": "^1.11.1", | ||
| "loader.js": "ember-cli/loader.js#3.2.0", | ||
| "qunit": "~1.17.1" | ||
| "ember": "~2.10.0", | ||
| "ember-cli-shims": "0.1.3" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /*jshint node:true*/ | ||
| module.exports = { | ||
| scenarios: [ | ||
| { | ||
| name: 'ember-lts-2.4', | ||
| bower: { | ||
| dependencies: { | ||
| 'ember': 'components/ember#lts-2-4' | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'lts-2-4' | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-lts-2.8', | ||
| bower: { | ||
| dependencies: { | ||
| 'ember': 'components/ember#lts-2-8' | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'lts-2-8' | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-release', | ||
| bower: { | ||
| dependencies: { | ||
| 'ember': 'components/ember#release' | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'release' | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-beta', | ||
| bower: { | ||
| dependencies: { | ||
| 'ember': 'components/ember#beta' | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'beta' | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-canary', | ||
| bower: { | ||
| dependencies: { | ||
| 'ember': 'components/ember#canary' | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'canary' | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| /*jshint node:true*/ | ||
| 'use strict'; | ||
|
|
||
| module.exports = function(/* environment, appConfig */) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| /*jshint node:true*/ | ||
| /* global require, module */ | ||
| var EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); | ||
|
|
||
| module.exports = function(defaults) { | ||
| var app = new EmberAddon(defaults, { | ||
| // Add options here | ||
| }); | ||
|
|
||
| /* | ||
| This build file specifies the options for the dummy test app of this | ||
| addon, located in `/tests/dummy` | ||
| This build file does *not* influence how the addon or the app using it | ||
| behave. You most likely want to be modifying `./index.js` or app's build file | ||
| */ | ||
|
|
||
| return app.toTree(); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| /*jshint node:true*/ | ||
| module.exports = { | ||
| "framework": "qunit", | ||
| "test_page": "tests/index.html?hidepassed", | ||
| "disable_watching": true, | ||
| "launch_in_ci": [ | ||
| "PhantomJS" | ||
| ], | ||
| "launch_in_dev": [ | ||
| "PhantomJS", | ||
| "Chrome" | ||
| ] | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jrjohnson this change is not appropriate because it makes travis try to run ember tests instead of the node tests specified in package.json.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Damn. I fixed that. Must have gotten lost when I was messing with what to include / not include in this PR. Good catch. Sorry. I pushed the fix, should I squash commits? Or do you prefer them separate?