Skip to content

Commit ac332c4

Browse files
m-adlerbtecu
authored andcommitted
Update dependencies
Used `npx ember-cli-update --to 3.9.0` to update ember. Some parts have also been adjusted according to the diff of `ember init`.
1 parent 84abbb8 commit ac332c4

File tree

7 files changed

+750
-785
lines changed

7 files changed

+750
-785
lines changed

.ember-cli

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
{
2+
/**
3+
Ember CLI sends analytics information by default. The data is completely
4+
anonymous, but there are times when you might want to disable this behavior.
5+
6+
Setting `disableAnalytics` to true will prevent any data from being sent.
7+
*/
28
"disableAnalytics": true
39
}

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
# misc
1212
/.env*
13+
/.pnp*
1314
/.sass-cache
1415
/connect.lock
1516
/coverage/

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ jobs:
4949
# we recommend new addons test the current and previous LTS
5050
# as well as latest stable release (bonus points to beta/canary)
5151
- stage: "Additional Tests"
52-
env: EMBER_TRY_SCENARIO=ember-lts-3.4
52+
env: EMBER_TRY_SCENARIO=ember-lts-2.18
53+
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
5354
- env: EMBER_TRY_SCENARIO=ember-release
5455
- env: EMBER_TRY_SCENARIO=ember-beta
5556
- env: EMBER_TRY_SCENARIO=ember-canary

config/ember-try.js

+22
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@ module.exports = function() {
1111
return {
1212
useYarn: true,
1313
scenarios: [
14+
{
15+
name: 'ember-lts-2.18',
16+
env: {
17+
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
18+
},
19+
npm: {
20+
devDependencies: {
21+
'@ember/jquery': '^0.5.1',
22+
'ember-source': '~2.18.0'
23+
}
24+
}
25+
},
1426
{
1527
name: 'ember-lts-3.4',
1628
npm: {
@@ -43,6 +55,16 @@ module.exports = function() {
4355
}
4456
}
4557
},
58+
// The default `.travis.yml` runs this scenario via `yarn test`,
59+
// not via `ember try`. It's still included here so that running
60+
// `ember try:each` manually or from a customized CI config will run it
61+
// along with all the other scenarios.
62+
{
63+
name: 'ember-default',
64+
npm: {
65+
devDependencies: {}
66+
}
67+
},
4668
{
4769
name: 'ember-default-with-jquery',
4870
env: {

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,30 +32,30 @@
3232
"test:all": "ember try:each"
3333
},
3434
"dependencies": {
35+
"btecu-eonasdan-bootstrap-datetimepicker": "4.17.48",
3536
"ember-cli-babel": "^7.6.0",
36-
"ember-cli-htmlbars": "^3.0.1",
37-
"btecu-eonasdan-bootstrap-datetimepicker": "4.17.48"
37+
"ember-cli-htmlbars": "^3.0.1"
3838
},
3939
"devDependencies": {
4040
"@ember/jquery": "^0.6.0",
4141
"@ember/optional-features": "^0.7.0",
4242
"broccoli-asset-rev": "^3.0.0",
43-
"ember-cli": "~3.8.1",
43+
"ember-cli": "~3.9.0",
4444
"ember-cli-dependency-checker": "^3.1.0",
4545
"ember-cli-eslint": "^5.1.0",
4646
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
4747
"ember-cli-inject-live-reload": "^1.8.2",
4848
"ember-cli-moment-shim": "3.7.1",
49-
"ember-cli-qunit": "^4.4.0",
5049
"ember-cli-sri": "^2.1.1",
5150
"ember-cli-template-lint": "^1.0.0-beta.1",
5251
"ember-cli-uglify": "^2.1.0",
5352
"ember-disable-prototype-extensions": "^1.1.3",
5453
"ember-export-application-global": "^2.0.0",
5554
"ember-load-initializers": "^2.0.0",
5655
"ember-maybe-import-regenerator": "^0.1.6",
56+
"ember-qunit": "4.4.1",
5757
"ember-resolver": "^5.1.3",
58-
"ember-source": "~3.8.0",
58+
"ember-source": "~3.9.0",
5959
"ember-source-channel-url": "^1.1.0",
6060
"ember-try": "^1.1.0",
6161
"eslint-plugin-ember": "^6.3.0",

tests/dummy/config/environment.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@ module.exports = function(environment) {
77
rootURL: '/',
88
locationType: 'auto',
99
EmberENV: {
10-
EXTEND_PROTOTYPES: false,
1110
FEATURES: {
1211
// Here you can enable experimental features on an ember canary build
13-
// e.g. 'with-controller': true
12+
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
13+
},
14+
EXTEND_PROTOTYPES: {
15+
// Prevent Ember Data from overriding Date.parse.
16+
Date: false
1417
}
1518
},
1619

0 commit comments

Comments
 (0)