Skip to content

Commit d86e566

Browse files
Require ember >= 4.4, node >= 16 (#1478)
* Update to Ember 5 * Add back ember 3.28 to ember-try * Remove 3.28 again * Update package.json * Stop testing against classic and jQuery * Update svg-jar * Update .eslintrc.js * Downgrade ember-cli-babel * Remove IE from targets * Update package.json
1 parent 147d47d commit d86e566

File tree

63 files changed

+3475
-3041
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3475
-3041
lines changed

.ember-cli

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"disableAnalytics": false,
99

1010
/**
11-
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12-
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
1313
*/
1414
"isTypeScriptProject": false
1515
}

.eslintignore

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,16 @@
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-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try
2614

2715
# Test apps
2816
/test-apps/

.eslintrc.js

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
11
'use strict';
22

3-
const { buildEmberPlugins } = require('ember-cli-babel');
4-
53
module.exports = {
64
globals: {
75
server: true,
86
},
97
root: true,
108
parser: '@babel/eslint-parser',
119
parserOptions: {
12-
ecmaVersion: 2020,
10+
ecmaVersion: 'latest',
1311
sourceType: 'module',
1412
requireConfigFile: false,
1513
babelOptions: {
16-
babelrc: false,
17-
configFile: false,
18-
// your babel options
19-
plugins: buildEmberPlugins(),
20-
},
21-
ecmaFeatures: {
22-
legacyDecorators: true,
14+
plugins: [
15+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
16+
],
2317
},
2418
},
2519
plugins: ['ember'],
@@ -56,6 +50,7 @@ module.exports = {
5650
files: [
5751
'./.eslintrc.js',
5852
'./.prettierrc.js',
53+
'./.stylelintrc.js',
5954
'./.template-lintrc.js',
6055
'./ember-cli-build.js',
6156
'./index.js',
@@ -75,8 +70,7 @@ module.exports = {
7570
browser: false,
7671
node: true,
7772
},
78-
plugins: ['node'],
79-
extends: ['plugin:node/recommended'],
73+
extends: ['plugin:n/recommended'],
8074
},
8175
// node test files
8276
{
@@ -88,7 +82,7 @@ module.exports = {
8882
},
8983
files: ['tests-node/**/*.js'],
9084
rules: {
91-
'node/no-unpublished-require': 'off',
85+
'n/no-unpublished-require': 'off',
9286
},
9387
},
9488
{

.github/workflows/ci-cd.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,11 @@ jobs:
9696
fail-fast: false
9797
matrix:
9898
try-scenario:
99-
- 'ember-lts-3.28'
10099
- 'ember-lts-4.4'
101100
- 'ember-lts-4.8'
102101
- 'ember-release'
103102
- 'ember-beta'
104103
- 'ember-canary'
105-
- 'ember-default-with-jquery'
106-
- 'ember-classic'
107104
- 'embroider-safe'
108105
# - 'embroider-optimized'
109106
timeout-minutes: 7

.gitignore

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
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
.DS_Store
2519
/.node_modules.ember-try/
26-
/bower.json.ember-try
2720
/npm-shrinkwrap.json.ember-try
2821
/package.json.ember-try
2922
/package-lock.json.ember-try

.npmignore

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

5-
# dependencies
6-
/bower_components/
7-
85
# misc
9-
/.bowerrc
106
/.editorconfig
117
/.ember-cli
128
/.env*
@@ -18,10 +14,10 @@
1814
/.gitignore
1915
/.prettierignore
2016
/.prettierrc.js
17+
/.stylelintignore
18+
/.stylelintrc.js
2119
/.template-lintrc.js
2220
/.watchmanconfig
23-
/bower.json
24-
/config/ember-try.js
2521
/CONTRIBUTING.md
2622
/ember-cli-build.js
2723
/testem.js
@@ -35,13 +31,8 @@
3531

3632
# ember-try
3733
/.node_modules.ember-try/
38-
/bower.json.ember-try
3934
/npm-shrinkwrap.json.ember-try
4035
/package.json.ember-try
4136
/package-lock.json.ember-try
4237
/yarn.lock.ember-try
4338
/test-apps
44-
45-
# TODO: should be removed (so that it is included!) once
46-
# https://github.com/ember-modifier/ember-modifier/issues/102 is resolved
47-
/babel.config.js

.prettierignore

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +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
17-
.lint-todo/
10+
.*/
1811

1912
# ember-try
2013
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try

.prettierrc.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
'use strict';
22

33
module.exports = {
4-
singleQuote: true,
54
overrides: [
65
{
7-
files: '**/*.hbs',
6+
files: '*.{js,ts}',
87
options: {
9-
parser: 'glimmer',
10-
singleQuote: false,
8+
singleQuote: true,
119
},
1210
},
1311
],

.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)