Permalink
Browse files

Update ember-cli et al (#1044)

* update ember-cli et al

* fix ember-try config
  • Loading branch information...
1 parent 31462f1 commit 3bcbe01c72ba02a7ca2f10e86d43c727347f3cf4 @marcoow marcoow committed on GitHub Aug 3, 2016
Showing with 88 additions and 80 deletions.
  1. +0 −14 .editorconfig
  2. +1 −1 .jshintrc
  3. +7 −2 .travis.yml
  4. +5 −4 bower.json
  5. +50 −30 config/ember-try.js
  6. +11 −13 package.json
  7. +1 −1 tests/.jshintrc
  8. +4 −4 tests/dummy/app/index.html
  9. +1 −2 tests/dummy/config/environment.js
  10. +8 −9 tests/index.html
View
@@ -13,22 +13,8 @@ insert_final_newline = true
indent_style = space
indent_size = 2
-[*.js]
-indent_style = space
-indent_size = 2
-
[*.hbs]
insert_final_newline = false
-indent_style = space
-indent_size = 2
-
-[*.css]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
[*.{diff,md}]
trim_trailing_whitespace = false
View
@@ -27,6 +27,6 @@
"strict": false,
"white": false,
"eqnull": true,
- "esnext": true,
+ "esversion": 6,
"unused": true
}
View
@@ -10,7 +10,8 @@ cache:
- node_modules
env:
- - EMBER_TRY_SCENARIO=ember-earliest
+ - EMBER_TRY_SCENARIO=default
+ - EMBER_TRY_SCENARIO=ember-1.12
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
@@ -23,14 +24,18 @@ matrix:
before_install:
- npm config set spin false
- npm install -g bower
+ - bower --version
- npm install phantomjs-prebuilt
+ - phantomjs --version
install:
- npm install
- bower install
script:
- - ember try $EMBER_TRY_SCENARIO test --skip-cleanup
+ # Usually, it's ok to finish the test scenario without reverting
+ # to the addon's original dependency state, skipping "cleanup".
+ - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
notifications:
email: false
View
@@ -1,11 +1,12 @@
{
"name": "ember-simple-auth",
"dependencies": {
- "bootstrap": "~3.3.6",
- "ember": "~2.6.0",
+ "bootstrap": "~3.3.7",
+ "ember": "~2.7.0",
+ "mocha": "~2.2.4",
+ "chai": "~2.3.0",
+ "ember-mocha-adapter": "~0.3.1",
"ember-cli-shims": "0.1.1",
- "ember-cli-test-loader": "0.2.2",
- "ember-mocha": "~0.8.11",
"sinonjs": "~1.17.1",
"base64": "~1.0.0",
"pretender": "~1.1.0"
View
@@ -1,53 +1,73 @@
+/*jshint node:true*/
module.exports = {
scenarios: [
{
name: 'default',
- dependencies: { }
+ bower: {
+ dependencies: {}
+ }
},
{
- name: 'ember-release',
- dependencies: {
- 'ember': 'components/ember#release',
- 'ember-data': 'components/ember-data#release'
- },
- resolutions: {
- 'ember': 'release',
- 'ember-data': 'beta'
+ name: 'ember-1.12',
+ bower: {
+ dependencies: {
+ 'ember': '~1.12.0',
+ 'ember-data': '~1.13.0',
+ 'ember-cli-shims': '0.0.6'
+ },
+ resolutions: {
+ 'ember': '~1.12.0',
+ 'ember-data': '~1.13.0',
+ 'ember-cli-shims': '0.0.6'
+ }
}
},
{
- name: 'ember-earliest',
- dependencies: {
- 'ember': 'components/ember#1.12',
- 'ember-data': 'components/ember-data#1.13',
- 'ember-cli-shims': '0.0.6'
+ name: 'ember-release',
+ bower: {
+ dependencies: {
+ 'ember': 'components/ember#release'
+ },
+ resolutions: {
+ 'ember': 'release'
+ }
},
- resolutions: {
- 'ember': '1.12',
- 'ember-data': '1.13',
- 'ember-cli-shims': '0.0.6'
+ npm: {
+ devDependencies: {
+ 'ember-data': 'emberjs/data#release'
+ }
}
},
{
name: 'ember-beta',
- dependencies: {
- 'ember': 'components/ember#beta',
- 'ember-data': 'components/ember-data#beta'
+ bower: {
+ dependencies: {
+ 'ember': 'components/ember#beta'
+ },
+ resolutions: {
+ 'ember': 'beta'
+ }
},
- resolutions: {
- 'ember': 'beta',
- 'ember-data': 'beta'
+ npm: {
+ devDependencies: {
+ 'ember-data': 'emberjs/data#beta'
+ }
}
},
{
name: 'ember-canary',
- dependencies: {
- 'ember': 'components/ember#canary',
- 'ember-data': 'components/ember-data#canary'
+ bower: {
+ dependencies: {
+ 'ember': 'components/ember#canary'
+ },
+ resolutions: {
+ 'ember': 'canary'
+ }
},
- resolutions: {
- 'ember': 'canary',
- 'ember-data': 'canary'
+ npm: {
+ devDependencies: {
+ 'ember-data': 'emberjs/data#master'
+ }
}
}
]
View
@@ -21,11 +21,11 @@
"devDependencies": {
"body-parser": "1.15.2",
"broccoli-asset-rev": "^2.4.2",
- "broccoli-merge-trees": "^1.1.1",
+ "broccoli-merge-trees": "^1.1.2",
"broccoli-yuidoc": "~2.1.0",
"ember-ajax": "^2.0.1",
- "ember-browserify": "1.1.9",
- "ember-cli": "2.6.2",
+ "ember-browserify": "1.1.11",
+ "ember-cli": "2.7.0",
"ember-cli-app-version": "^1.0.0",
"ember-cli-base64": "~0.0.1",
"ember-cli-blueprint-test-helpers": "~0.13.0",
@@ -39,27 +39,25 @@
"ember-cli-pretender": "~0.6.0",
"ember-cli-release": "^0.2.9",
"ember-cli-sri": "^2.1.0",
+ "ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
- "ember-data": "^2.6.0",
+ "ember-data": "^2.7.0",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.5.1",
"ember-resolver": "^2.0.3",
- "ember-welcome-page": "^1.0.1",
"ember-sinon": "~0.5.0",
- "ember-suave": "~3.0.1",
- "ember-try": "^0.2.2",
+ "ember-suave": "~4.0.0",
"express": "^4.14.0",
- "git-repo-version": "^0.3.0",
- "glob": "^7.0.4",
+ "git-repo-version": "^0.3.1",
+ "glob": "^7.0.5",
"handlebars": "~4.0.5",
"loader.js": "^4.0.1",
- "lodash": "^4.13.1",
- "marked": "^0.3.5",
- "mocha": "^2.5.3",
+ "lodash": "^4.14.1",
+ "marked": "^0.3.6",
+ "mocha": "^3.0.0",
"mocha-only-detector": "0.1.0",
"morgan": "^1.5.2",
- "rimraf": "^2.5.2",
"sinon-chai": "~2.8.0",
"torii": "~0.8.0"
},
View
@@ -47,6 +47,6 @@
"strict": false,
"white": false,
"eqnull": true,
- "esnext": true,
+ "esversion": 6,
"unused": true
}
@@ -9,16 +9,16 @@
{{content-for "head"}}
- <link rel="stylesheet" href="assets/vendor.css">
- <link rel="stylesheet" href="assets/dummy.css">
+ <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+ <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
{{content-for "head-footer"}}
</head>
<body>
{{content-for "body"}}
- <script src="assets/vendor.js"></script>
- <script src="assets/dummy.js"></script>
+ <script src="{{rootURL}}assets/vendor.js"></script>
+ <script src="{{rootURL}}assets/dummy.js"></script>
{{content-for "body-footer"}}
</body>
@@ -4,7 +4,7 @@ module.exports = function(environment) {
var ENV = {
modulePrefix: 'dummy',
environment: environment,
- baseURL: '/',
+ rootURL: '/',
locationType: 'auto',
EmberENV: {
FEATURES: {
@@ -45,7 +45,6 @@ module.exports = function(environment) {
if (environment === 'test') {
// Testem prefers this...
- ENV.baseURL = '/';
ENV.locationType = 'none';
// keep test console output quieter
View
@@ -10,9 +10,9 @@
{{content-for "head"}}
{{content-for "test-head"}}
- <link rel="stylesheet" href="assets/vendor.css">
- <link rel="stylesheet" href="assets/dummy.css">
- <link rel="stylesheet" href="assets/test-support.css">
+ <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+ <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
+ <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
{{content-for "head-footer"}}
{{content-for "test-head-footer"}}
@@ -21,12 +21,11 @@
{{content-for "body"}}
{{content-for "test-body"}}
- <script src="testem.js" integrity=""></script>
- <script src="assets/vendor.js"></script>
- <script src="assets/test-support.js"></script>
- <script src="assets/dummy.js"></script>
- <script src="assets/tests.js"></script>
- <script src="assets/test-loader.js"></script>
+ <script src="{{rootURL}}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>
+ <script src="{{rootURL}}assets/tests.js"></script>
{{content-for "body-footer"}}
{{content-for "test-body-footer"}}

0 comments on commit 3bcbe01

Please sign in to comment.