Skip to content

Commit 5738444

Browse files
ef4ef4
authored
Merge pull request #178 from lolmaus/ember-5-upgrade
Upgrade Ember CLI to 5.4
2 parents c5c90b6 + 1c7e288 commit 5738444

31 files changed

+9759
-6651
lines changed

‎.ember-cli

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
{
22
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
5-
6-
Setting `disableAnalytics` to true will prevent any data from being sent.
3+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
4+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
75
*/
8-
"disableAnalytics": false
6+
"isTypeScriptProject": false
97
}

‎.eslintignore

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
1610
.*/
17-
.eslintcache
1811

1912
# ember-try
2013
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/package.json.ember-try

‎.eslintrc.js

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
module.exports = {
44
root: true,
5-
parser: 'babel-eslint',
5+
parser: '@babel/eslint-parser',
66
parserOptions: {
7-
ecmaVersion: 2018,
7+
ecmaVersion: 'latest',
88
sourceType: 'module',
9-
ecmaFeatures: {
10-
legacyDecorators: true,
9+
requireConfigFile: false,
10+
babelOptions: {
11+
plugins: [
12+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
13+
],
1114
},
1215
},
1316
plugins: ['ember'],
@@ -24,16 +27,17 @@ module.exports = {
2427
// node files
2528
{
2629
files: [
27-
'.eslintrc.js',
28-
'.prettierrc.js',
29-
'.template-lintrc.js',
30-
'ember-cli-build.js',
30+
'./.eslintrc.js',
31+
'./.prettierrc.js',
32+
'./.stylelintrc.js',
33+
'./.template-lintrc.js',
34+
'./ember-cli-build.js',
3135
'generate-deprecations-tree.js',
32-
'index.js',
33-
'testem.js',
34-
'blueprints/*/index.js',
35-
'config/**/*.js',
36-
'tests/dummy/config/**/*.js',
36+
'./index.js',
37+
'./testem.js',
38+
'./blueprints/*/index.js',
39+
'./config/**/*.js',
40+
'./tests/dummy/config/**/*.js',
3741
],
3842
excludedFiles: [
3943
'addon/**',
@@ -48,14 +52,14 @@ module.exports = {
4852
browser: false,
4953
node: true,
5054
},
51-
plugins: ['node'],
52-
extends: ['plugin:node/recommended'],
55+
plugins: ['n'],
56+
extends: ['plugin:n/recommended'],
5357
rules: {
5458
'ember/new-module-imports': 0,
5559
},
5660
},
5761
{
58-
// Test files:
62+
// test files
5963
files: ['tests/**/*-test.{js,ts}'],
6064
extends: ['plugin:qunit/recommended'],
6165
},

‎.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ jobs:
7171
ember-lts-4.4,
7272
ember-lts-4.8,
7373
ember-lts-4.12,
74+
ember-release,
75+
ember-beta,
76+
ember-canary,
7477
ember-3.28-with-jquery,
7578
ember-3.28-classic,
7679
]

‎.gitignore

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
5-
/tmp/
3+
/declarations/
64

75
# dependencies
8-
/bower_components/
96
/node_modules/
107

118
# misc
129
/.env*
1310
/.pnp*
14-
/.sass-cache
1511
/.eslintcache
16-
/connect.lock
1712
/coverage/
18-
/libpeerconnection.log
1913
/npm-debug.log*
2014
/testem.log
2115
/yarn-error.log
2216

2317
# ember-try
2418
/.node_modules.ember-try/
25-
/bower.json.ember-try
19+
/npm-shrinkwrap.json.ember-try
2620
/package.json.ember-try
21+
/package-lock.json.ember-try
22+
/yarn.lock.ember-try
23+
24+
# broccoli-debug
25+
/DEBUG/

‎.npmignore

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,23 @@
22
/dist/
33
/tmp/
44

5-
# dependencies
6-
/bower_components/
7-
85
# misc
9-
/.bowerrc
106
/.editorconfig
117
/.ember-cli
128
/.env*
139
/.eslintcache
1410
/.eslintignore
1511
/.eslintrc.js
1612
/.git/
13+
/.github/
1714
/.gitignore
1815
/.prettierignore
1916
/.prettierrc.js
17+
/.stylelintignore
18+
/.stylelintrc.js
2019
/.template-lintrc.js
2120
/.travis.yml
2221
/.watchmanconfig
23-
/bower.json
24-
/config/ember-try.js
2522
/CONTRIBUTING.md
2623
/ember-cli-build.js
2724
/testem.js
@@ -32,5 +29,7 @@
3229

3330
# ember-try
3431
/.node_modules.ember-try/
35-
/bower.json.ember-try
32+
/npm-shrinkwrap.json.ember-try
3633
/package.json.ember-try
34+
/package-lock.json.ember-try
35+
/yarn.lock.ember-try

‎.prettierignore

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
16-
.eslintcache
10+
.*/
1711

1812
# ember-try
1913
/.node_modules.ember-try/
20-
/bower.json.ember-try
21-
/package.json.ember-try

‎.prettierrc.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
'use strict';
22

33
module.exports = {
4-
singleQuote: true,
4+
overrides: [
5+
{
6+
files: '*.{js,ts}',
7+
options: {
8+
singleQuote: true,
9+
},
10+
},
11+
],
512
};

‎.stylelintignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# unconventional files
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/
6+
7+
# addons
8+
/.node_modules.ember-try/

‎.stylelintrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
5+
};

0 commit comments

Comments
 (0)