Skip to content

Commit 4ad71e4

Browse files
committed
Bump Ember from 3.12 to 3.14
1 parent 3dfa79f commit 4ad71e4

File tree

7 files changed

+1972
-307
lines changed

7 files changed

+1972
-307
lines changed

.eslintrc.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
module.exports = {
22
root: true,
3+
parser: 'babel-eslint',
34
parserOptions: {
45
ecmaVersion: 2018,
5-
sourceType: 'module'
6+
sourceType: 'module',
7+
ecmaFeatures: {
8+
legacyDecorators: true
9+
}
610
},
711
plugins: [
812
'ember'
@@ -15,6 +19,7 @@ module.exports = {
1519
browser: true
1620
},
1721
rules: {
22+
'ember/no-jquery': 'error'
1823
},
1924
overrides: [
2025
// node files

.npmignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
# misc
99
/.bowerrc
1010
/.editorconfig
11-
/.ember-cli
11+
/.ember-cli.js
1212
/.env*
1313
/.eslintignore
1414
/.eslintrc.js
15+
/.git/
1516
/.gitignore
1617
/.template-lintrc.js
1718
/.travis.yml

addon/mixin.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable ember/no-new-mixins */
12
import Ember from 'ember';
23
import Mixin from '@ember/object/mixin';
34
import { isArray } from '@ember/array';

package.json

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,37 @@
2727
"test:all": "ember try:each"
2828
},
2929
"dependencies": {
30-
"ember-cli-babel": "^7.7.3",
30+
"ember-cli-babel": "^7.11.1",
31+
"ember-cli-htmlbars": "^4.0.5",
3132
"ember-notify-property-change-polyfill": "^0.0.1"
3233
},
3334
"devDependencies": {
34-
"@ember/optional-features": "^0.7.0",
35+
"@ember/optional-features": "^1.0.0",
36+
"babel-eslint": "^10.0.3",
3537
"broccoli-asset-rev": "^3.0.0",
36-
"ember-cli": "~3.12.0",
38+
"ember-auto-import": "^1.5.2",
39+
"ember-cli": "~3.14.0",
3740
"ember-cli-dependency-checker": "^3.1.0",
3841
"ember-cli-eslint": "^5.1.0",
39-
"ember-cli-htmlbars": "^3.0.1",
40-
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
41-
"ember-cli-inject-live-reload": "^1.8.2",
42+
"ember-cli-inject-live-reload": "^2.0.1",
4243
"ember-cli-release": "^1.0.0-beta.2",
4344
"ember-cli-sri": "^2.1.1",
44-
"ember-cli-template-lint": "^1.0.0-beta.1",
45-
"ember-cli-uglify": "^2.1.0",
45+
"ember-cli-template-lint": "^1.0.0-beta.3",
46+
"ember-cli-uglify": "^3.0.0",
4647
"ember-cli-update": "^0.45.0",
4748
"ember-disable-prototype-extensions": "^1.1.3",
4849
"ember-export-application-global": "^2.0.0",
49-
"ember-load-initializers": "^2.0.0",
50+
"ember-load-initializers": "^2.1.0",
5051
"ember-maybe-import-regenerator": "^0.1.6",
51-
"ember-qunit": "^4.4.1",
52-
"ember-resolver": "^5.0.1",
53-
"ember-source": "~3.12.0",
54-
"ember-source-channel-url": "^1.1.0",
55-
"ember-try": "^1.0.0",
56-
"eslint-plugin-ember": "^6.2.0",
57-
"eslint-plugin-node": "^9.0.1",
52+
"ember-qunit": "^4.5.1",
53+
"ember-resolver": "^5.3.0",
54+
"ember-source": "~3.14.1",
55+
"ember-source-channel-url": "^2.0.1",
56+
"ember-try": "^1.2.1",
57+
"eslint-plugin-ember": "^7.1.0",
58+
"eslint-plugin-node": "^10.0.0",
5859
"loader.js": "^4.7.0",
59-
"qunit-dom": "^0.8.4"
60+
"qunit-dom": "^0.9.0"
6061
},
6162
"engines": {
6263
"node": "8.* || >= 10.*"

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)