Skip to content

Commit fbe6006

Browse files
Gaurav0sivakumar-kailasam
authored andcommitted
ember-cli-update to 3.16
1 parent df5c1ce commit fbe6006

File tree

11 files changed

+1187
-522
lines changed

11 files changed

+1187
-522
lines changed

.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
root = true
66

7-
87
[*]
98
end_of_line = lf
109
charset = utf-8

.eslintrc.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
5+
parser: 'babel-eslint',
36
parserOptions: {
47
ecmaVersion: 2018,
5-
sourceType: 'module'
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true
11+
}
612
},
713
plugins: [
814
'ember'

.template-lintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'use strict';
33

44
module.exports = {
5-
extends: 'recommended',
5+
extends: 'octane',
66
rules: {
77
'attribute-indentation': false,
88
'no-unnecessary-concat': false,

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ env:
1616
# See https://git.io/vdao3 for details.
1717
- JOBS=1
1818

19+
branches:
20+
only:
21+
- master
22+
1923
before_install:
2024
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.1
2125
- export PATH=$HOME/.yarn/bin:$PATH

app/app.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import Application from '@ember/application';
2-
import Resolver from './resolver';
2+
import Resolver from 'ember-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;

app/resolver.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/router.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import { scheduleOnce } from '@ember/runloop';
33
import config from './config/environment';
44
import { inject as service } from '@ember/service';
55

6-
const AppRouter = Router.extend({
7-
location: config.locationType,
8-
rootURL: config.routerRootURL,
6+
class AppRouter extends Router {
7+
location = config.locationType;
8+
rootURL = config.routerRootURL;
99

10-
metrics: service(),
11-
fastboot: service(),
10+
@service metrics;
11+
@service fastboot;
1212

1313
init() {
1414
this._super(...arguments);

config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.12.1",
6+
"version": "3.16.1",
77
"blueprints": [
88
{
99
"name": "app",

config/optional-features.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"jquery-integration": true
2+
"application-template-wrapper": false,
3+
"default-async-observers": true,
4+
"jquery-integration": true,
5+
"template-only-glimmer-components": true
36
}

package.json

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,76 +13,77 @@
1313
"test": "tests"
1414
},
1515
"scripts": {
16-
"build": "ember build",
16+
"build": "ember build --environment=production",
1717
"lint:hbs": "ember-template-lint .",
1818
"lint:js": "eslint .",
1919
"start:local": "API_HOST=http://localhost:5050 ember serve",
2020
"start": "ember serve",
2121
"test": "node run-tests.js"
2222
},
2323
"devDependencies": {
24-
"@ember/jquery": "^0.6.0",
25-
"@ember/optional-features": "^0.7.0",
24+
"@ember/optional-features": "^1.3.0",
25+
"@glimmer/component": "^1.0.0",
26+
"@glimmer/tracking": "^1.0.0",
2627
"algoliasearch": "^3.32.1",
28+
"babel-eslint": "^10.0.3",
2729
"bourbon": "5.1.0",
2830
"bourbon-neat": "^1.9.1",
2931
"broccoli-asset-rev": "^3.0.0",
3032
"broccoli-funnel": "^2.0.1",
3133
"broccoli-merge-trees": "^2.0.0",
3234
"ember-a11y-testing": "^0.5.4",
3335
"ember-anchor": "^1.0.3",
34-
"ember-auto-import": "1.2.21",
35-
"ember-cli": "~3.12.1",
36+
"ember-auto-import": "^1.5.3",
37+
"ember-cli": "~3.16.1",
3638
"ember-cli-app-version": "^3.2.0",
3739
"ember-cli-autoprefixer": "^1.0.0",
38-
"ember-cli-babel": "^7.7.3",
40+
"ember-cli-babel": "^7.17.2",
3941
"ember-cli-bourbon": "^2.0.1",
4042
"ember-cli-browserstack": "^1.0.1",
4143
"ember-cli-clipboard": "^0.8.1",
4244
"ember-cli-content-security-policy": "^0.6.1",
43-
"ember-cli-dependency-checker": "^3.1.0",
45+
"ember-cli-dependency-checker": "^3.2.0",
4446
"ember-cli-deploy": "^1.0.1",
4547
"ember-cli-deploy-build": "^1.1.0",
4648
"ember-cli-deploy-gzip": "^1.0.0",
4749
"ember-cli-deprecation-workflow": "^1.0.1",
4850
"ember-cli-document-title-northm": "^1.0.3",
4951
"ember-cli-eslint": "^5.1.0",
5052
"ember-cli-fastboot": "^2.0.0",
51-
"ember-cli-htmlbars": "^3.0.1",
52-
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
53-
"ember-cli-inject-live-reload": "^1.8.2",
53+
"ember-cli-htmlbars": "^4.2.2",
54+
"ember-cli-inject-live-reload": "^2.0.2",
5455
"ember-cli-meta-tags": "^5.1.0",
5556
"ember-cli-sass": "^10.0.1",
5657
"ember-cli-shims": "^1.2.0",
57-
"ember-cli-template-lint": "^1.0.0-beta.2",
58-
"ember-cli-uglify": "^2.1.0",
58+
"ember-cli-template-lint": "^1.0.0-beta.3",
59+
"ember-cli-uglify": "^3.0.0",
5960
"ember-composable-helpers": "^3.1.1",
6061
"ember-concurrency": "^1.1.6",
61-
"ember-data": "~3.12.0",
62+
"ember-data": "~3.16.0",
6263
"ember-data-fastboot": "^0.1.2",
6364
"ember-exam": "^1.0.0",
64-
"ember-export-application-global": "^2.0.0",
65+
"ember-export-application-global": "^2.0.1",
6566
"ember-fetch": "^7.0.1",
6667
"ember-inflector": "^3.0.0",
67-
"ember-load-initializers": "^2.0.0",
68+
"ember-load-initializers": "^2.1.1",
6869
"ember-maybe-import-regenerator": "^0.1.6",
6970
"ember-metrics": "^0.14.0",
7071
"ember-percy": "^1.5.0",
7172
"ember-power-select": "^2.3.5",
72-
"ember-qunit": "^4.4.1",
73-
"ember-resolver": "^5.0.1",
73+
"ember-qunit": "^4.6.0",
74+
"ember-resolver": "^7.0.0",
7475
"ember-rfc176-data": "^0.3.5",
7576
"ember-route-action-helper": "^2.0.5",
7677
"ember-sinon": "^4.1.1",
77-
"ember-source": "~3.12.0",
78+
"ember-source": "~3.16.0",
7879
"ember-styleguide": "^2.3.1",
7980
"ember-svg-jar": "^1.2.2",
8081
"ember-test-selectors": "^2.0.0",
8182
"ember-tether": "1.0.0",
8283
"ember-truth-helpers": "^2.1.0",
8384
"ember-web-app": "^2.0.0",
84-
"eslint-plugin-ember": "^6.2.0",
85-
"eslint-plugin-node": "^9.0.1",
85+
"eslint-plugin-ember": "^7.7.2",
86+
"eslint-plugin-node": "^11.0.0",
8687
"express-sslify": "^1.2.0",
8788
"fastboot-app-server": "^2.0.0",
8889
"loader.js": "^4.7.0",
@@ -94,7 +95,7 @@
9495
"lodash.values": "^4.3.0",
9596
"minimist": "^1.2.0",
9697
"normalize.css": "^8.0.1",
97-
"qunit-dom": "^0.8.4",
98+
"qunit-dom": "^1.0.0",
9899
"sanitize-html": "^1.19.3",
99100
"sass": "^1.25.0",
100101
"semver-compare": "^1.0.0",
@@ -105,9 +106,12 @@
105106
"browserslist": "2.11.3"
106107
},
107108
"engines": {
108-
"node": "10.* || 12.*",
109+
"node": "10.* || >= 12",
109110
"npm": "5"
110111
},
112+
"ember": {
113+
"edition": "octane"
114+
},
111115
"cacheDirectories": [
112116
"node_modules"
113117
],
@@ -118,7 +122,7 @@
118122
"abortcontroller-polyfill/dist/cjs-ponyfill"
119123
],
120124
"volta": {
121-
"node": "11.15.0",
125+
"node": "12.16.1",
122126
"yarn": "1.22.4"
123127
}
124128
}

0 commit comments

Comments
 (0)