Skip to content

Commit c6cf2fb

Browse files
westlywrightwestlywright
committed
Upgrade Ember to latest stable release
upgrade to 3.5 upgrade to 3.6 upgrade to ember 3.7 upgrades for 3.7 package upgrades eslint changes upgrade to 3.8 HanlderInfos deprecation logger deprecations shadowed block param deps route fixes upgrade engines and add workaround for infinite loop query params refresh issue ember-engines/ember-engines number 614 update read me
1 parent 8e463d9 commit c6cf2fb

File tree

34 files changed

+2791
-1083
lines changed

34 files changed

+2791
-1083
lines changed

‎.ember-cli

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@
99
"port" : 8000,
1010
"host" : "0.0.0.0",
1111
"usePods" : true,
12+
"liveReloadPort" : 37531,
1213
"ssl" : true
1314
}

‎.eslintignore

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
1-
blueprints/*
1+
# unconventional js
2+
/blueprints/*
3+
/vendor/*
24
config/*
35
**/config/*
4-
dist/*
5-
server/*
6-
tmp/*
7-
vendor/*
8-
bower.js
9-
ember-cli-build.js
6+
/server/*
7+
8+
# compiled output
9+
/dist/
10+
/tmp/
11+
12+
# dependencies
13+
/bower_components/
14+
/node_modules/
15+
16+
# misc
17+
/coverage/
18+
!.*
19+
20+
# ember-try
21+
/.node_modules.ember-try/
22+
/bower.json.ember-try
23+
/package.json.ember-try

‎.eslintrc.js

Lines changed: 153 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ const propertyOrder = [
1414
'redirect',
1515
'setupController',
1616
'resetController',
17-
['lifecycle-hook','activate','deactivate','didDestroyElement',
18-
'didInsertElement','didReceiveAttrs','didRender','didUpdate',
19-
'didUpdateAttrs','renderTemplate','serialize','setupController',
20-
'willClearRender','willDestroyElement','willInsertElement','willRender','willUpdate'
17+
['lifecycle-hook', 'activate', 'deactivate', 'didDestroyElement',
18+
'didInsertElement', 'didReceiveAttrs', 'didRender', 'didUpdate',
19+
'didUpdateAttrs', 'renderTemplate', 'serialize', 'setupController',
20+
'willClearRender', 'willDestroyElement', 'willInsertElement', 'willRender', 'willUpdate'
2121
],
2222

2323
'actions',
@@ -26,155 +26,183 @@ const propertyOrder = [
2626
];
2727

2828
module.exports = {
29-
root: true,
30-
parser: 'babel-eslint',
29+
root: true,
30+
parser: 'babel-eslint',
3131
parserOptions: {
32-
ecmaVersion: 2017,
33-
sourceType: "module",
32+
ecmaVersion: 2017,
33+
sourceType: 'module',
3434
allowImportExportEverywhere: true
3535
},
3636
extends: [
37-
"eslint:recommended",
38-
"plugin:ember/recommended"
37+
'eslint:recommended',
38+
'plugin:ember/recommended'
3939
],
4040
globals: {
41-
"$": true,
42-
"ALY": true,
43-
"AWS": true,
44-
"HW": true,
45-
"Stripe": true,
46-
"Ui": true,
47-
"WebSocket": true,
48-
"document": true,
49-
"jQuery": true,
50-
"navigator": true,
51-
"window": true,
41+
'$': true,
42+
'ALY': true,
43+
'AWS': true,
44+
'HW': true,
45+
'Stripe': true,
46+
'Ui': true,
47+
'WebSocket': true,
48+
'document': true,
49+
'jQuery': true,
50+
'navigator': true,
51+
'window': true,
5252
},
5353
env: {
5454
browser: true,
55-
es6: true
55+
es6: true,
56+
node: true
5657
},
5758
rules: {
5859
// Overrides
59-
"curly": "error",
60-
"dot-notation": "off",
61-
"ember/alias-model-in-controller": "off",
62-
"ember/avoid-leaking-state-in-ember-objects": "off",
63-
"ember/closure-actions": "off",
64-
"ember/jquery-ember-run": "off",
65-
"ember/named-functions-in-promises": "off",
66-
"ember/no-capital-letters-in-routes": "off",
67-
"ember/no-function-prototype-extensions": "off",
68-
"ember/no-observers": "off",
69-
"ember/no-on-calls-in-components": "off",
70-
"ember/no-side-effects": "off",
71-
"ember/no-old-shims": "error",
72-
"ember/order-in-components": ["error", { order: propertyOrder }],
73-
"ember/order-in-controllers": ["error", { order: propertyOrder }],
74-
"ember/order-in-models": ["error", { order: propertyOrder }],
75-
"ember/order-in-routes": ["error", { order: propertyOrder }],
76-
"ember/use-brace-expansion": "off",
77-
"ember/use-ember-get-and-set": "off",
78-
"ember/new-module-imports": "error",
79-
"eqeqeq": "error",
80-
"generator-star-spacing": "off",
81-
"guard-for-in": "off",
82-
"linebreak-style": "off",
83-
"new-cap": "off",
84-
"no-caller": "error",
85-
"no-cond-assign": [ "error", "except-parens" ],
86-
"no-console": "off",
87-
"no-debugger": "warn",
88-
"no-empty": "off",
89-
"no-eq-null": "error",
90-
"no-eval": "error",
91-
"no-extra-boolean-cast": "off",
92-
"no-new": "off",
93-
"no-plusplus": "off",
94-
"no-undef": "error",
95-
"no-unused-vars": "warn",
96-
"no-useless-escape": "off",
97-
"strict": "off",
98-
"wrap-iife": "off",
99-
100-
//stylistic
101-
"array-bracket-spacing": "error",
102-
"padded-blocks": [ "error", "never" ],
103-
"block-spacing": [ "error", "always" ],
104-
"brace-style": [ "error", "1tbs" ],
105-
"comma-spacing": "error",
106-
"func-call-spacing": [ "error", "never" ],
107-
"implicit-arrow-linebreak": "error",
108-
"indent": ["error", 2],
109-
"key-spacing": [ "error", {
110-
"align": {
111-
"beforeColon": false,
112-
"afterColon": true,
113-
"on": "value",
114-
"mode": "minimum"
60+
'curly': 'error',
61+
'dot-notation': 'off',
62+
'ember/alias-model-in-controller': 'off',
63+
'ember/avoid-leaking-state-in-ember-objects': 'off',
64+
'ember/closure-actions': 'off',
65+
'ember/jquery-ember-run': 'off',
66+
'ember/named-functions-in-promises': 'off',
67+
'ember/no-capital-letters-in-routes': 'off',
68+
'ember/no-function-prototype-extensions': 'off',
69+
'ember/no-observers': 'off',
70+
'ember/no-on-calls-in-components': 'off',
71+
'ember/no-side-effects': 'off',
72+
'ember/no-old-shims': 'error',
73+
'ember/order-in-components': ['error', { order: propertyOrder }],
74+
'ember/order-in-controllers': ['error', { order: propertyOrder }],
75+
'ember/order-in-models': ['error', { order: propertyOrder }],
76+
'ember/order-in-routes': ['error', { order: propertyOrder }],
77+
'ember/use-brace-expansion': 'off',
78+
'ember/use-ember-get-and-set': 'off',
79+
'ember/new-module-imports': 'error',
80+
'eqeqeq': 'error',
81+
'generator-star-spacing': 'off',
82+
'guard-for-in': 'off',
83+
'linebreak-style': 'off',
84+
'new-cap': 'off',
85+
'no-caller': 'error',
86+
'no-cond-assign': ['error', 'except-parens'],
87+
'no-console': 'off',
88+
'no-debugger': 'warn',
89+
'no-empty': 'off',
90+
'no-eq-null': 'error',
91+
'no-eval': 'error',
92+
'no-extra-boolean-cast': 'off',
93+
'no-new': 'off',
94+
'no-plusplus': 'off',
95+
'no-undef': 'error',
96+
'no-unused-vars': 'warn',
97+
'no-useless-escape': 'off',
98+
'strict': 'off',
99+
'wrap-iife': 'off',
100+
files: [
101+
'.eslintrc.js',
102+
'tests/.eslintrc.js',
103+
'.template-lintrc.js',
104+
'ember-cli-build.js',
105+
'testem.js',
106+
'blueprints/*/index.js',
107+
'config/**/*.js',
108+
'lib/*/index.js'
109+
],
110+
// stylistic
111+
'array-bracket-spacing': 'error',
112+
'padded-blocks': ['error', 'never'],
113+
'block-spacing': ['error', 'always'],
114+
'brace-style': ['error', '1tbs'],
115+
'comma-spacing': 'error',
116+
'func-call-spacing': ['error', 'never'],
117+
'implicit-arrow-linebreak': 'error',
118+
'indent': ['error', 2],
119+
'key-spacing': ['error', {
120+
'align': {
121+
'beforeColon': false,
122+
'afterColon': true,
123+
'on': 'value',
124+
'mode': 'minimum'
125+
},
126+
'multiLine': {
127+
'beforeColon': false,
128+
'afterColon': true
129+
},
130+
}],
131+
'keyword-spacing': 'error',
132+
'lines-between-class-members': 'error',
133+
'newline-per-chained-call': ['error', { 'ignoreChainWithDepth': 4 }],
134+
'no-whitespace-before-property': 'error',
135+
'object-curly-newline': ['error', {
136+
'ObjectExpression': {
137+
'multiline': true,
138+
'minProperties': 3
115139
},
116-
"multiLine": {
117-
"beforeColon": false,
118-
"afterColon": true
140+
'ObjectPattern': {
141+
'multiline': true,
142+
'minProperties': 3
119143
},
120-
} ],
121-
"keyword-spacing": "error",
122-
"lines-between-class-members": "error",
123-
"newline-per-chained-call": ["error", { "ignoreChainWithDepth": 4 }],
124-
"no-whitespace-before-property": "error",
125-
"object-curly-newline": [ "error", {
126-
"ObjectExpression": { "multiline": true, "minProperties": 3 },
127-
"ObjectPattern": { "multiline": true, "minProperties": 3 },
128-
"ImportDeclaration": { "multiline": true, "minProperties": 5 },
129-
"ExportDeclaration": { "multiline": true, "minProperties": 3 }
130-
} ],
131-
"object-curly-spacing": [ "error", "always" ],
132-
"object-property-newline": "error",
133-
"padding-line-between-statements": [
134-
"error",
144+
'ImportDeclaration': {
145+
'multiline': true,
146+
'minProperties': 5
147+
},
148+
'ExportDeclaration': {
149+
'multiline': true,
150+
'minProperties': 3
151+
}
152+
}],
153+
'object-curly-spacing': ['error', 'always'],
154+
'object-property-newline': 'error',
155+
'padding-line-between-statements': [
156+
'error',
135157
{
136-
"blankLine": "always",
137-
"prev": "*",
138-
"next": "return",
158+
'blankLine': 'always',
159+
'prev': '*',
160+
'next': 'return',
139161
},
140162
// This configuration would require blank lines after every sequence of variable declarations
141163
{
142-
blankLine: "always",
143-
prev: ["const", "let", "var"],
144-
next: "*"
164+
blankLine: 'always',
165+
prev: ['const', 'let', 'var'],
166+
next: '*'
145167
},
146168
{
147-
blankLine: "any",
148-
prev: ["const", "let", "var"],
149-
next: ["const", "let", "var"]
169+
blankLine: 'any',
170+
prev: ['const', 'let', 'var'],
171+
next: ['const', 'let', 'var']
150172
}
151173
],
152174
quotes: [
153-
"error",
154-
"single",
175+
'error',
176+
'single',
155177
{
156-
"avoidEscape": true,
157-
"allowTemplateLiterals": true
178+
'avoidEscape': true,
179+
'allowTemplateLiterals': true
158180
},
159181
],
160-
"space-before-function-paren": [ "error", "never" ],
161-
"space-infix-ops": "error",
162-
"space-unary-ops": [
163-
"error",
164-
{ "words": true, "nonwords": false, }
182+
'space-before-function-paren': ['error', 'never'],
183+
'space-infix-ops': 'error',
184+
'space-unary-ops': [
185+
'error',
186+
{
187+
'words': true,
188+
'nonwords': false,
189+
}
165190
],
166-
"spaced-comment": "error",
167-
"switch-colon-spacing": "error",
191+
'spaced-comment': 'error',
192+
'switch-colon-spacing': 'error',
168193

169194
// ECMAScript 6
170-
"arrow-parens": "error",
171-
"arrow-spacing": [ "error", { "before": true, "after": true } ],
172-
"no-trailing-spaces": "error",
173-
"object-shorthand": "error",
174-
"prefer-arrow-callback": "error",
175-
"prefer-template": "error",
176-
"rest-spread-spacing": "error",
177-
"template-curly-spacing": [ "error", "always" ],
178-
"yield-star-spacing": [ "error", "both" ],
195+
'arrow-parens': 'error',
196+
'arrow-spacing': ['error', {
197+
'before': true,
198+
'after': true
199+
}],
200+
'no-trailing-spaces': 'error',
201+
'object-shorthand': 'error',
202+
'prefer-arrow-callback': 'error',
203+
'prefer-template': 'error',
204+
'rest-spread-spacing': 'error',
205+
'template-curly-spacing': ['error', 'always'],
206+
'yield-star-spacing': ['error', 'both'],
179207
}
180208
};

‎.gitignore

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

1111
# misc
12+
/.env*
13+
/.pnp*
1214
/.sass-cache
1315
/connect.lock
1416
/coverage/*

0 commit comments

Comments
 (0)