Skip to content
This repository was archived by the owner on Sep 2, 2021. It is now read-only.

Commit a32eb13

Browse files
committed
Upgrade Ember, and Friends, to 3.14
Note that ember-data has been moved to `devDependencies`. This is to avoid stomping on the host application's copy.
1 parent 75295d1 commit a32eb13

File tree

8 files changed

+2893
-120
lines changed

8 files changed

+2893
-120
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ jobs:
9898
at: .
9999

100100
- run:
101-
name: 'Run Tests for Ember 3.4'
101+
name: 'Run Tests for Ember 3.8'
102102
command: |
103-
yarn ember try:one ember-lts-3.4 --skip-cleanup
103+
yarn ember try:one ember-lts-3.8 --skip-cleanup
104104
105105
run_beta_tests:
106106
<<: *defaults

.eslintrc.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ module.exports = {
33
parser: 'babel-eslint',
44
parserOptions: {
55
ecmaVersion: 2018,
6-
sourceType: 'module'
6+
sourceType: 'module',
7+
ecmaFeatures: {
8+
legacyDecorators: true
9+
}
710
},
811
plugins: [
912
'ember'

.npmignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# misc
99
/.bowerrc
1010
/.editorconfig
11-
/.ember-cli
11+
/.ember-cli.js
1212
/.env*
1313
/.eslintignore
1414
/.eslintrc.js

config/ember-try.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@ module.exports = async function() {
66
return {
77
useYarn: true,
88
scenarios: [
9-
{
10-
name: 'ember-lts-3.4',
11-
npm: {
12-
devDependencies: {
13-
'ember-source': '~3.4.0'
14-
}
15-
}
16-
},
179
{
1810
name: 'ember-lts-3.8',
1911
npm: {

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,28 @@
2222
},
2323
"dependencies": {
2424
"ember-cli-babel": "^7.11.1",
25-
"ember-cli-htmlbars": "^4.0.0",
26-
"ember-data": "< 4"
25+
"ember-cli-htmlbars": "^4.0.5"
2726
},
2827
"devDependencies": {
2928
"@ember/optional-features": "^1.0.0",
3029
"babel-eslint": "^10.0.3",
3130
"broccoli-asset-rev": "^3.0.0",
32-
"ember-cli": "~3.13.1",
31+
"ember-auto-import": "^1.5.2",
32+
"ember-cli": "~3.14.0",
3333
"ember-cli-dependency-checker": "^3.1.0",
3434
"ember-cli-eslint": "^5.1.0",
3535
"ember-cli-inject-live-reload": "^2.0.1",
3636
"ember-cli-sri": "^2.1.1",
3737
"ember-cli-template-lint": "^1.0.0-beta.3",
3838
"ember-cli-uglify": "^3.0.0",
39+
"ember-data": "< 4",
3940
"ember-disable-prototype-extensions": "^1.1.3",
4041
"ember-export-application-global": "^2.0.0",
4142
"ember-load-initializers": "^2.1.0",
4243
"ember-maybe-import-regenerator": "^0.1.6",
4344
"ember-qunit": "^4.5.1",
4445
"ember-resolver": "^5.3.0",
45-
"ember-source": "~3.13.0",
46+
"ember-source": "~3.14.0",
4647
"ember-source-channel-url": "^2.0.1",
4748
"ember-try": "^1.2.1",
4849
"eslint-plugin-ember": "^7.1.0",

tests/dummy/app/app.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ import Resolver from './resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

6-
const App = Application.extend({
7-
modulePrefix: config.modulePrefix,
8-
podModulePrefix: config.podModulePrefix,
9-
Resolver
10-
});
6+
export default class App extends Application {
7+
modulePrefix = config.modulePrefix;
8+
podModulePrefix = config.podModulePrefix;
9+
Resolver = Resolver;
10+
}
1111

1212
loadInitializers(App, config.modulePrefix);
13-
14-
export default App;

tests/dummy/app/router.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import EmberRouter from '@ember/routing/router';
22
import config from './config/environment';
33

4-
const Router = EmberRouter.extend({
5-
location: config.locationType,
6-
rootURL: config.rootURL
7-
});
4+
export default class Router extends EmberRouter {
5+
location = config.locationType;
6+
rootURL = config.rootURL;
7+
}
88

99
Router.map(function() {
1010
});
11-
12-
export default Router;

0 commit comments

Comments
 (0)