Skip to content

Commit 2bfb0c4

Browse files
authoredMay 17, 2023
Merge pull request #853 from elwayman02/drop-versions
Drop Ember 3.28, Node 14
2 parents b69bf2c + aaaae20 commit 2bfb0c4

13 files changed

+909
-188
lines changed
 

‎.eslintrc.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@ module.exports = {
44
root: true,
55
parser: '@babel/eslint-parser',
66
parserOptions: {
7-
ecmaVersion: 2022,
7+
ecmaVersion: 'latest',
88
sourceType: 'module',
99
requireConfigFile: false,
1010
babelOptions: {
1111
plugins: [
12-
[
13-
'@babel/plugin-proposal-decorators',
14-
{ decoratorsBeforeExport: true, version: '2018-09' },
15-
],
12+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
1613
],
1714
},
1815
},
@@ -32,6 +29,7 @@ module.exports = {
3229
files: [
3330
'./.eslintrc.js',
3431
'./.prettierrc.js',
32+
'./.stylelintrc.js',
3533
'./.template-lintrc.js',
3634
'./ember-cli-build.js',
3735
'./index.js',
@@ -47,8 +45,7 @@ module.exports = {
4745
browser: false,
4846
node: true,
4947
},
50-
plugins: ['node'],
51-
extends: ['plugin:node/recommended'],
48+
extends: ['plugin:n/recommended'],
5249
},
5350
{
5451
// test files

‎.github/workflows/ci.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@ jobs:
5252
fail-fast: false
5353
matrix:
5454
try-scenario:
55-
- ember-lts-3.28
5655
- ember-lts-4.4
56+
- ember-lts-4.8
5757
- ember-release
58-
- ember-classic
5958
- embroider-safe
6059
experimental: [false]
6160
include:

‎.npmignore

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
/.gitignore
1919
/.prettierignore
2020
/.prettierrc.js
21+
/.stylelintignore
22+
/.stylelintrc.js
2123
/.template-lintrc.js
2224
/.travis.yml
2325
/.watchmanconfig

‎.prettierrc.js

+8-1
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

+8
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

+5
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+
};

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ We adhere to the [Ember Community Guidelines](https://emberjs.com/guidelines/) f
1111

1212
## Compatibility
1313

14-
* Ember.js v3.28 or above
15-
* Ember CLI v3.28 or above
14+
* Ember.js v4.4 or above
15+
* Ember CLI v4.4 or above
1616
* Node.js v14 or above
1717
* [All N-1 Browsers](https://caniuse.com/#feat=intersectionobserver)
1818

‎package.json

+15-8
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
"scripts": {
1919
"build": "ember build --environment=production",
2020
"lint": "concurrently \"npm:lint:*(!fix|hbs)\" --names \"lint:\"",
21+
"lint:css": "stylelint \"**/*.css\"",
22+
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
2123
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
2224
"lint:hbs": "ember-template-lint .",
2325
"lint:hbs:fix": "ember-template-lint . --fix",
@@ -37,7 +39,9 @@
3739
},
3840
"devDependencies": {
3941
"@babel/eslint-parser": "^7.21.8",
42+
"@babel/plugin-proposal-decorators": "^7.21.0",
4043
"@ember/optional-features": "^2.0.0",
44+
"@ember/string": "^3.0.1",
4145
"@ember/test-helpers": "^2.9.3",
4246
"@embroider/test-setup": "^2.1.1",
4347
"@glimmer/component": "^1.1.2",
@@ -52,21 +56,21 @@
5256
"ember-cli-sass": "^11.0.0",
5357
"ember-cli-sri": "^2.1.1",
5458
"ember-cli-terser": "^4.0.2",
55-
"ember-data": "~4.9.1",
59+
"ember-data": "~4.12.0",
5660
"ember-fetch": "^8.1.2",
5761
"ember-load-initializers": "^2.1.2",
5862
"ember-page-title": "^7.0.0",
5963
"ember-qunit": "^6.2.0",
60-
"ember-resolver": "^9.0.1",
64+
"ember-resolver": "^10.0.0",
6165
"ember-sinon-qunit": "^6.0.0",
6266
"ember-source": "~4.12.0",
6367
"ember-source-channel-url": "^3.0.0",
6468
"ember-template-lint": "^5.7.3",
65-
"ember-try": "^2.0.0",
69+
"ember-try": "^3.0.0-beta.1",
6670
"eslint": "^8.40.0",
6771
"eslint-config-prettier": "^8.8.0",
6872
"eslint-plugin-ember": "^11.5.2",
69-
"eslint-plugin-node": "^11.1.0",
73+
"eslint-plugin-n": "^15.7.0",
7074
"eslint-plugin-prettier": "^4.2.1",
7175
"eslint-plugin-qunit": "^7.3.4",
7276
"field-guide": "^2.4.0",
@@ -79,19 +83,22 @@
7983
"release-it": "^15.10.3",
8084
"release-it-lerna-changelog": "^5.0.0",
8185
"sass": "^1.62.1",
82-
"webpack": "^5.82.0"
86+
"stylelint": "^15.4.0",
87+
"stylelint-config-standard": "^32.0.0",
88+
"stylelint-prettier": "^3.0.0",
89+
"webpack": "^5.82.1"
8390
},
8491
"fastbootDependencies": [
8592
"crypto"
8693
],
8794
"peerDependencies": {
88-
"ember-source": "^3.28.0 || ^4.0.0 || ^5.0.0"
95+
"ember-source": "^4.0.0 || ^5.0.0"
8996
},
9097
"engines": {
91-
"node": "14.* || 16.* || >= 18"
98+
"node": "16.* || >= 18"
9299
},
93100
"volta": {
94-
"node": "14.21.1",
101+
"node": "16.19.0",
95102
"yarn": "1.22.19"
96103
},
97104
"ember": {

‎tests/dummy/app/styles/app.css

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* Ember supports plain CSS out of the box. More info: https://cli.emberjs.com/release/advanced-use/stylesheets/ */

‎tests/dummy/config/deprecation-workflow.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
window.deprecationWorkflow = window.deprecationWorkflow || {};
99
window.deprecationWorkflow.config = {
1010
// If we uncomment the line below, any unhandled error i.e a new error introduced would fail the tests.
11-
// throwOnUnhandled: true,
12-
workflow: [{ handler: 'silence', matchId: 'this-property-fallback' }],
11+
throwOnUnhandled: true,
12+
workflow: [{ handler: 'silence', matchId: 'ember-string.add-package' }],
1313
};

‎tests/dummy/config/ember-cli-update.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "4.9.0",
6+
"version": "4.12.1",
77
"blueprints": [
88
{
99
"name": "addon",

‎tests/dummy/config/ember-try.js

+4-22
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ module.exports = async function () {
88
useYarn: true,
99
scenarios: [
1010
{
11-
name: 'ember-lts-3.28',
11+
name: 'ember-lts-4.4',
1212
npm: {
1313
devDependencies: {
14-
'ember-source': '~3.28.0',
14+
'ember-source': '~4.4.0',
1515
},
1616
},
1717
},
1818
{
19-
name: 'ember-lts-4.4',
19+
name: 'ember-lts-4.8',
2020
npm: {
2121
devDependencies: {
22-
'ember-source': '~4.4.0',
22+
'ember-source': '~4.8.0',
2323
},
2424
},
2525
},
@@ -47,24 +47,6 @@ module.exports = async function () {
4747
},
4848
},
4949
},
50-
{
51-
name: 'ember-classic',
52-
env: {
53-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
54-
'application-template-wrapper': true,
55-
'default-async-observers': false,
56-
'template-only-glimmer-components': false,
57-
}),
58-
},
59-
npm: {
60-
devDependencies: {
61-
'ember-source': '~3.28.0',
62-
},
63-
ember: {
64-
edition: 'classic',
65-
},
66-
},
67-
},
6850
embroiderSafe(),
6951
embroiderOptimized(),
7052
],

0 commit comments

Comments
 (0)