Permalink
Browse files

Upgrading deps, fixing CI (#394)

* Upgrading deps, fixing CI
  • Loading branch information...
1 parent acbe6d4 commit 9a4a30c1246f237c17e01e71bb764331716fa5e6 @jasonmit committed on GitHub Oct 31, 2016
Showing with 20,217 additions and 942 deletions.
  1. +3 −2 .travis.yml
  2. +0 −14 packages/ember-intl-format-cache/.editorconfig
  3. +1 −1 packages/ember-intl-format-cache/.gitignore
  4. +1 −1 packages/ember-intl-format-cache/.jshintrc
  5. +0 −34 packages/ember-intl-format-cache/.travis.yml
  6. +2 −4 packages/ember-intl-format-cache/bower.json
  7. +10 −5 packages/ember-intl-format-cache/config/ember-try.js
  8. +17 −17 packages/ember-intl-format-cache/package.json
  9. +1 −1 packages/ember-intl-format-cache/tests/.jshintrc
  10. +4 −4 packages/ember-intl-format-cache/tests/dummy/app/index.html
  11. +2 −1 packages/ember-intl-format-cache/tests/dummy/app/router.js
  12. +5 −2 packages/ember-intl-format-cache/tests/dummy/config/environment.js
  13. +6 −6 packages/ember-intl-format-cache/tests/helpers/module-for-acceptance.js
  14. +8 −9 packages/ember-intl-format-cache/tests/index.html
  15. +4,804 −0 packages/ember-intl-format-cache/yarn.lock
  16. +0 −14 packages/ember-intl-messageformat-parser/.editorconfig
  17. +1 −1 packages/ember-intl-messageformat-parser/.gitignore
  18. +1 −1 packages/ember-intl-messageformat-parser/.jshintrc
  19. +0 −34 packages/ember-intl-messageformat-parser/.travis.yml
  20. +2 −4 packages/ember-intl-messageformat-parser/bower.json
  21. +10 −5 packages/ember-intl-messageformat-parser/config/ember-try.js
  22. +15 −15 packages/ember-intl-messageformat-parser/package.json
  23. +1 −1 packages/ember-intl-messageformat-parser/tests/.jshintrc
  24. +4 −4 packages/ember-intl-messageformat-parser/tests/dummy/app/index.html
  25. +2 −1 packages/ember-intl-messageformat-parser/tests/dummy/app/router.js
  26. +5 −2 packages/ember-intl-messageformat-parser/tests/dummy/config/environment.js
  27. +6 −6 packages/ember-intl-messageformat-parser/tests/helpers/module-for-acceptance.js
  28. +8 −9 packages/ember-intl-messageformat-parser/tests/index.html
  29. +4,804 −0 packages/ember-intl-messageformat-parser/yarn.lock
  30. +0 −14 packages/ember-intl-messageformat/.editorconfig
  31. +1 −1 packages/ember-intl-messageformat/.gitignore
  32. +1 −1 packages/ember-intl-messageformat/.jshintrc
  33. +0 −34 packages/ember-intl-messageformat/.travis.yml
  34. +2 −4 packages/ember-intl-messageformat/bower.json
  35. +10 −5 packages/ember-intl-messageformat/config/ember-try.js
  36. +17 −17 packages/ember-intl-messageformat/package.json
  37. +1 −1 packages/ember-intl-messageformat/tests/.jshintrc
  38. +4 −4 packages/ember-intl-messageformat/tests/dummy/app/index.html
  39. +2 −1 packages/ember-intl-messageformat/tests/dummy/app/router.js
  40. +5 −2 packages/ember-intl-messageformat/tests/dummy/config/environment.js
  41. +6 −6 packages/ember-intl-messageformat/tests/helpers/module-for-acceptance.js
  42. +9 −10 packages/ember-intl-messageformat/tests/index.html
  43. +4,823 −0 packages/ember-intl-messageformat/yarn.lock
  44. +0 −14 packages/ember-intl-relativeformat/.editorconfig
  45. +1 −1 packages/ember-intl-relativeformat/.gitignore
  46. +1 −1 packages/ember-intl-relativeformat/.jshintrc
  47. +0 −34 packages/ember-intl-relativeformat/.travis.yml
  48. +2 −4 packages/ember-intl-relativeformat/bower.json
  49. +10 −5 packages/ember-intl-relativeformat/config/ember-try.js
  50. +17 −17 packages/ember-intl-relativeformat/package.json
  51. +1 −1 packages/ember-intl-relativeformat/tests/.jshintrc
  52. +4 −4 packages/ember-intl-relativeformat/tests/dummy/app/index.html
  53. +2 −1 packages/ember-intl-relativeformat/tests/dummy/app/router.js
  54. +5 −2 packages/ember-intl-relativeformat/tests/dummy/config/environment.js
  55. +6 −6 packages/ember-intl-relativeformat/tests/helpers/module-for-acceptance.js
  56. +9 −10 packages/ember-intl-relativeformat/tests/index.html
  57. +4,819 −0 packages/ember-intl-relativeformat/yarn.lock
  58. +0 −14 packages/ember-intl/.editorconfig
  59. +1 −1 packages/ember-intl/.jshintrc
  60. +2 −4 packages/ember-intl/bower.json
  61. +10 −5 packages/ember-intl/config/ember-try.js
  62. +16 −18 packages/ember-intl/package.json
  63. +1 −1 packages/ember-intl/tests/.jshintrc
  64. +13 −13 packages/ember-intl/tests/acceptance/smoke-test.js
  65. +4 −4 packages/ember-intl/tests/dummy/app/index.html
  66. +1 −0 packages/ember-intl/tests/dummy/app/router.js
  67. +5 −2 packages/ember-intl/tests/dummy/config/environment.js
  68. +6 −6 packages/ember-intl/tests/helpers/module-for-acceptance.js
  69. +2 −4 packages/ember-intl/tests/helpers/start-app.js
  70. +14 −14 packages/ember-intl/tests/index.html
  71. +3 −1 packages/ember-intl/tests/unit/helpers/format-number-test.js
  72. +3 −2 packages/ember-intl/tests/unit/helpers/format-relative-test.js
  73. +655 −455 packages/ember-intl/yarn.lock
View
@@ -1,7 +1,7 @@
---
language: node_js
node_js:
- - "0.12"
+ - "4"
sudo: false
@@ -14,8 +14,9 @@ cache:
- packages/ember-intl-relativeformat/node_modules
env:
- - EMBER_TRY_SCENARIO=default
+ # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-1.13
+ - EMBER_TRY_SCENARIO=ember-lts-2.4
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
@@ -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
@@ -13,5 +13,5 @@
/connect.lock
/coverage/*
/libpeerconnection.log
-npm-debug.log
+npm-debug.log*
testem.log
@@ -27,6 +27,6 @@
"strict": false,
"white": false,
"eqnull": true,
- "esnext": true,
+ "esversion": 6,
"unused": true
}
@@ -1,34 +0,0 @@
----
-language: node_js
-node_js:
- - "0.12"
-
-sudo: false
-
-cache:
- directories:
- - node_modules
-
-env:
- - EMBER_TRY_SCENARIO=default
- - EMBER_TRY_SCENARIO=ember-release
- - EMBER_TRY_SCENARIO=ember-beta
- - EMBER_TRY_SCENARIO=ember-canary
-
-matrix:
- fast_finish: true
- allow_failures:
- - env: EMBER_TRY_SCENARIO=ember-canary
-
-before_install:
- - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
- - "npm config set spin false"
- - "npm install -g npm@^2"
-
-install:
- - npm install -g bower
- - npm install
- - bower install
-
-script:
- - ember try $EMBER_TRY_SCENARIO test
@@ -1,9 +1,7 @@
{
"name": "ember-intl-format-cache",
"dependencies": {
- "ember": "~2.4.1",
- "ember-cli-shims": "0.1.0",
- "ember-cli-test-loader": "0.2.2",
- "ember-qunit-notifications": "0.1.0"
+ "ember": "~2.9.0",
+ "ember-cli-shims": "0.1.3"
}
}
@@ -2,19 +2,24 @@
module.exports = {
scenarios: [
{
- name: 'default',
+ name: 'ember-1.13',
bower: {
- dependencies: { }
+ dependencies: {
+ 'ember': '~1.13.0'
+ },
+ resolutions: {
+ 'ember': '~1.13.0'
+ }
}
},
{
- name: 'ember-1.13',
+ name: 'ember-lts-2.4',
bower: {
dependencies: {
- 'ember': '~1.13.0'
+ 'ember': 'components/ember#lts-2-4'
},
resolutions: {
- 'ember': '~1.13.0'
+ 'ember': 'lts-2-4'
}
}
},
@@ -11,39 +11,39 @@
"start": "ember server",
"test": "ember try:testall"
},
- "repository": "",
+ "repository": "https://github.com/jasonmit/ember-intl/tree/master/packages/ember-intl-format-cache",
+ "homepage": "https://github.com/jasonmit/ember-intl",
"engines": {
"node": ">= 0.10.0"
},
"author": "jason.mitchell.w@gmail.com",
"license": "BSD-3-Clause",
"devDependencies": {
- "broccoli-asset-rev": "^2.2.0",
- "ember-cli": "2.4.1",
- "ember-cli-app-version": "^1.0.0",
- "ember-cli-dependency-checker": "^1.2.0",
- "ember-cli-htmlbars": "^1.0.1",
- "ember-cli-htmlbars-inline-precompile": "^0.3.1",
- "ember-cli-inject-live-reload": "^1.3.1",
- "ember-cli-qunit": "^1.2.1",
- "ember-cli-release": "0.2.8",
- "ember-cli-sri": "^2.1.0",
+ "broccoli-asset-rev": "^2.4.5",
+ "ember-cli": "2.9.1",
+ "ember-cli-app-version": "^2.0.0",
+ "ember-cli-dependency-checker": "^1.3.0",
+ "ember-cli-htmlbars": "^1.0.10",
+ "ember-cli-htmlbars-inline-precompile": "^0.3.3",
+ "ember-cli-inject-live-reload": "^1.4.1",
+ "ember-cli-jshint": "^1.0.4",
+ "ember-cli-qunit": "^3.0.1",
+ "ember-cli-release": "^0.2.9",
+ "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.4",
- "ember-load-initializers": "^0.5.0",
+ "ember-export-application-global": "^1.0.5",
+ "ember-load-initializers": "^0.5.1",
"ember-resolver": "^2.0.3",
- "ember-try": "^0.1.2",
- "loader.js": "^4.0.0"
+ "loader.js": "^4.0.10"
},
"keywords": [
"ember-addon"
],
"dependencies": {
"broccoli-funnel": "^1.0.0",
"broccoli-merge-trees": "^1.0.0",
- "ember-cli-babel": "^5.1.5",
+ "ember-cli-babel": "^5.1.7",
"intl-format-cache": "^2.0.5"
},
"ember-addon": {
@@ -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>
@@ -2,7 +2,8 @@ import Ember from 'ember';
import config from './config/environment';
const Router = Ember.Router.extend({
- location: config.locationType
+ location: config.locationType,
+ rootURL: config.rootURL
});
Router.map(function() {
@@ -4,12 +4,16 @@ module.exports = function(environment) {
var ENV = {
modulePrefix: 'dummy',
environment: environment,
- baseURL: '/',
+ rootURL: '/',
locationType: 'auto',
EmberENV: {
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
}
},
@@ -29,7 +33,6 @@ module.exports = function(environment) {
if (environment === 'test') {
// Testem prefers this...
- ENV.baseURL = '/';
ENV.locationType = 'none';
// keep test console output quieter
@@ -1,23 +1,23 @@
import { module } from 'qunit';
+import Ember from 'ember';
import startApp from '../helpers/start-app';
import destroyApp from '../helpers/destroy-app';
+const { RSVP: { Promise } } = Ember;
+
export default function(name, options = {}) {
module(name, {
beforeEach() {
this.application = startApp();
if (options.beforeEach) {
- options.beforeEach.apply(this, arguments);
+ return options.beforeEach.apply(this, arguments);
}
},
afterEach() {
- if (options.afterEach) {
- options.afterEach.apply(this, arguments);
- }
-
- destroyApp(this.application);
+ let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
+ return Promise.resolve(afterEach).then(() => destroyApp(this.application));
}
});
}
@@ -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="/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"}}
Oops, something went wrong.

0 comments on commit 9a4a30c

Please sign in to comment.