Skip to content

Commit 302bd06

Browse files
committed
Bump Ember from 3.4 to 3.8
1 parent d435afb commit 302bd06

File tree

11 files changed

+1314
-513
lines changed

11 files changed

+1314
-513
lines changed

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88

99
# dependencies
1010
/bower_components/
11+
/node_modules/
1112

1213
# misc
1314
/coverage/
15+
!.*
1416

1517
# ember-try
1618
/.node_modules.ember-try/

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ module.exports = {
2020
// node files
2121
{
2222
files: [
23+
'.eslintrc.js',
2324
'.template-lintrc.js',
2425
'ember-cli-build.js',
2526
'index.js',

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
/node_modules/
1010

1111
# misc
12+
/.env*
1213
/.idea
14+
/.pnp*
1315
/.sass-cache
1416
/connect.lock
1517
/coverage/

.npmignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
/.bowerrc
1010
/.editorconfig
1111
/.ember-cli
12+
/.env*
1213
/.eslintignore
1314
/.eslintrc.js
1415
/.gitignore
15-
/.watchmanconfig
16+
/.template-lintrc.js
1617
/.travis.yml
18+
/.watchmanconfig
1719
/bower.json
1820
/config/ember-try.js
21+
/CONTRIBUTING.md
1922
/ember-cli-build.js
2023
/testem.js
2124
/tests/

.travis.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ env:
1919
# See https://git.io/vdao3 for details.
2020
- JOBS=1
2121

22+
branches:
23+
only:
24+
- master
25+
# npm version tags
26+
- /^v\d+\.\d+\.\d+/
27+
2228
jobs:
2329
fail_fast: true
2430
allow_failures:
@@ -40,6 +46,7 @@ jobs:
4046
- env: EMBER_TRY_SCENARIO=ember-lts-2.12
4147
- env: EMBER_TRY_SCENARIO=ember-lts-2.16
4248
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
49+
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
4350
- env: EMBER_TRY_SCENARIO=ember-release
4451
- env: EMBER_TRY_SCENARIO=ember-beta
4552
- env: EMBER_TRY_SCENARIO=ember-canary

CONTRIBUTING.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# How To Contribute
2+
3+
## Installation
4+
5+
* `git clone` this repository
6+
* `cd ember-buffered-proxy`
7+
* `yarn install`
8+
9+
## Linting
10+
11+
* `npm run lint:hbs`
12+
* `npm run lint:js`
13+
* `npm run lint:js -- --fix`
14+
15+
## Running tests
16+
17+
* `ember test` – Runs the test suite on the current Ember version
18+
* `ember test --server` – Runs the test suite in "watch mode"
19+
* `ember try:each` – Runs the test suite against multiple Ember versions
20+
21+
## Running the dummy application
22+
23+
* `ember serve`
24+
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
25+
26+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016
3+
Copyright (c) 2016-2019
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

README.md

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -98,32 +98,16 @@ var buffer = ObjectProxy.extend(BufferedMixin).create({
9898
```
9999

100100

101-
## development
102-
103-
### Installation
104-
105-
* `git clone` this repository
106-
* `cd ember-buffered-proxy`
107-
* `yarn install`
108-
109-
### Linting
110-
111-
* `npm run lint:hbs`
112-
* `npm run lint:js`
113-
* `npm run lint:js -- --fix`
114-
115-
### Running tests
116-
117-
* `ember test` – Runs the test suite on the current Ember version
118-
* `ember test --server` – Runs the test suite in "watch mode"
119-
* `ember try:each` – Runs the test suite against multiple Ember versions
101+
Compatibility
102+
------------------------------------------------------------------------------
120103

121-
### Running the dummy application
104+
* Ember.js v2.12 or above
105+
* Ember CLI v2.12 or above
122106

123-
* `ember serve`
124-
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
107+
Contributing
108+
------------------------------------------------------------------------------
125109

126-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
110+
See the [Contributing](CONTRIBUTING.md) guide for details.
127111

128112
License
129113
------------------------------------------------------------------------------

config/ember-try.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@ module.exports = function() {
4747
}
4848
}
4949
},
50+
{
51+
name: 'ember-lts-3.4',
52+
npm: {
53+
devDependencies: {
54+
'ember-source': '~3.4.0'
55+
}
56+
}
57+
},
5058
{
5159
name: 'ember-release',
5260
npm: {
@@ -71,6 +79,10 @@ module.exports = function() {
7179
}
7280
}
7381
},
82+
// The default `.travis.yml` runs this scenario via `npm test`,
83+
// not via `ember try`. It's still included here so that running
84+
// `ember try:each` manually or from a customized CI config will run it
85+
// along with all the other scenarios.
7486
{
7587
name: 'ember-default',
7688
npm: {

package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,18 @@
2727
"test:all": "ember try:each"
2828
},
2929
"dependencies": {
30-
"ember-cli-babel": "^6.16.0",
30+
"ember-cli-babel": "^7.1.2",
3131
"ember-notify-property-change-polyfill": "^0.0.1"
3232
},
3333
"devDependencies": {
3434
"@ember/optional-features": "^0.6.3",
3535
"broccoli-asset-rev": "^2.7.0",
36-
"ember-ajax": "^3.1.0",
37-
"ember-cli": "~3.4.4",
38-
"ember-cli-dependency-checker": "^3.0.0",
36+
"ember-cli": "~3.8.3",
37+
"ember-cli-dependency-checker": "^3.1.0",
3938
"ember-cli-eslint": "^4.2.3",
4039
"ember-cli-htmlbars": "^3.0.0",
4140
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
4241
"ember-cli-inject-live-reload": "^1.8.2",
43-
"ember-cli-qunit": "^4.3.2",
4442
"ember-cli-release": "^1.0.0-beta.2",
4543
"ember-cli-sri": "^2.1.1",
4644
"ember-cli-template-lint": "^1.0.0-beta.1",
@@ -50,14 +48,15 @@
5048
"ember-export-application-global": "^2.0.0",
5149
"ember-load-initializers": "^1.1.0",
5250
"ember-maybe-import-regenerator": "^0.1.6",
51+
"ember-qunit": "^3.4.1",
5352
"ember-resolver": "^5.0.1",
54-
"ember-source": "~3.4.0",
53+
"ember-source": "~3.8.0",
5554
"ember-source-channel-url": "^1.1.0",
5655
"ember-try": "^1.0.0",
5756
"eslint-plugin-ember": "^5.2.0",
5857
"eslint-plugin-node": "^7.0.1",
5958
"loader.js": "^4.7.0",
60-
"qunit-dom": "^0.7.1"
59+
"qunit-dom": "^0.8.0"
6160
},
6261
"engines": {
6362
"node": "6.* || 8.* || >= 10.*"

0 commit comments

Comments
 (0)