Skip to content

Commit 88cd722

Browse files
m3l1xArtyom Melichow
andauthored
breaking: upgrade ember to v4.8.0 (#110)
Co-authored-by: Artyom Melichow <[email protected]>
1 parent 8753628 commit 88cd722

20 files changed

+3333
-1452
lines changed

.ember-cli

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": false,
9+
10+
/**
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.
13+
*/
14+
"isTypeScriptProject": false
915
}

.eslintignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717

1818
# ember-try
1919
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/npm-shrinkwrap.json.ember-try
2022
/package.json.ember-try
21-
22-
.eslintrc.js
23-
.prettierrc.js
23+
/package-lock.json.ember-try
24+
/yarn.lock.ember-try

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module.exports = {
4242
extends: ['plugin:node/recommended'],
4343
},
4444
{
45-
// Test files:
45+
// test files
4646
files: ['tests/**/*-test.{js,ts}'],
4747
extends: ['plugin:qunit/recommended'],
4848
},

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,11 @@ jsconfig.json
2323

2424
# ember-try
2525
/.node_modules.ember-try/
26+
/bower.json.ember-try
27+
/npm-shrinkwrap.json.ember-try
2628
/package.json.ember-try
29+
/package-lock.json.ember-try
30+
/yarn.lock.ember-try
31+
32+
# broccoli-debug
33+
/DEBUG/

.npmignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
/.eslintignore
1111
/.eslintrc.js
1212
/.git/
13+
/.github/
1314
/.gitignore
1415
/.prettierignore
1516
/.prettierrc.js
@@ -26,4 +27,8 @@
2627

2728
# ember-try
2829
/.node_modules.ember-try/
30+
/bower.json.ember-try
31+
/npm-shrinkwrap.json.ember-try
2932
/package.json.ember-try
33+
/package-lock.json.ember-try
34+
/yarn.lock.ember-try

.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
/coverage/
1515
!.*
1616
.eslintcache
17+
.lint-todo/
1718

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2123
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
- `ember serve`
2323
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2424

25-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
25+
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
Ember components to build drag-and-drop multi-column grids powered by [gridstack.js](https://gridstackjs.com/)
44

5-
## Installation
5+
## Compatibility
6+
7+
- Ember.js v3.28 or above
8+
- Ember CLI v3.28 or above
9+
- Node.js v14 or above
610

7-
- Ember.js v3.20 or above
8-
- Ember CLI v3.20 or above
9-
- Node.js v12 or above
11+
## Installation
1012

1113
```
1214
ember install ember-gridstack

config/ember-try.js

Lines changed: 4 additions & 17 deletions
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.20',
11+
name: 'ember-lts-3.28',
1212
npm: {
1313
devDependencies: {
14-
'ember-source': '~3.20.5',
14+
'ember-source': '~3.28.0',
1515
},
1616
},
1717
},
1818
{
19-
name: 'ember-lts-3.24',
19+
name: 'ember-lts-4.4',
2020
npm: {
2121
devDependencies: {
22-
'ember-source': '~3.24.3',
22+
'ember-source': '~4.4.0',
2323
},
2424
},
2525
},
@@ -59,19 +59,6 @@ module.exports = async function () {
5959
},
6060
},
6161
},
62-
{
63-
name: 'ember-default-with-jquery',
64-
env: {
65-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
66-
'jquery-integration': true,
67-
}),
68-
},
69-
npm: {
70-
devDependencies: {
71-
'@ember/jquery': '^1.1.0',
72-
},
73-
},
74-
},
7562
{
7663
name: 'ember-classic',
7764
env: {

ember-cli-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

55
module.exports = function (defaults) {
6-
let app = new EmberAddon(defaults, {
6+
const app = new EmberAddon(defaults, {
77
// Add options here
88
});
99

package.json

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@
2020
],
2121
"scripts": {
2222
"build": "ember build --environment=production",
23-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
24-
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
23+
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
24+
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
2525
"lint:hbs": "ember-template-lint .",
2626
"lint:hbs:fix": "ember-template-lint . --fix",
2727
"lint:js": "eslint . --cache",
2828
"lint:js:fix": "eslint . --fix",
2929
"start": "ember serve",
30-
"test": "npm-run-all lint test:*",
30+
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
3131
"test:ember": "ember test",
3232
"test:ember-compatibility": "ember try:each",
3333
"semantic-release": "semantic-release"
3434
},
3535
"dependencies": {
3636
"@ember/render-modifiers": "^2.0.2",
37-
"ember-auto-import": "^1.11.3",
38-
"ember-cli-babel": "^7.26.6",
39-
"ember-cli-htmlbars": "^5.7.1",
37+
"ember-auto-import": "^2.4.3",
38+
"ember-cli-babel": "^7.26.11",
39+
"ember-cli-htmlbars": "^6.1.1",
4040
"ember-modifier": "^3.0.0",
4141
"gridstack": "^7.2.2"
4242
},
@@ -46,49 +46,48 @@
4646
"@commitlint/prompt-cli": "^11.0.0",
4747
"@denali-design/ember": "^1.0.0-alpha.31",
4848
"@ember/optional-features": "^2.0.0",
49-
"@ember/test-helpers": "^2.4.2",
50-
"@embroider/test-setup": "^0.43.5",
51-
"@glimmer/component": "^1.0.4",
52-
"@glimmer/tracking": "^1.0.4",
49+
"@ember/test-helpers": "^2.8.1",
50+
"@embroider/test-setup": "^1.8.3",
51+
"@glimmer/component": "^1.1.2",
52+
"@glimmer/tracking": "^1.1.2",
5353
"babel-eslint": "^10.1.0",
5454
"broccoli-asset-rev": "^3.0.0",
55-
"ember-cli": "~3.28.3",
56-
"ember-cli-dependency-checker": "^3.2.0",
55+
"ember-cli": "~4.8.0",
56+
"ember-cli-dependency-checker": "^3.3.1",
5757
"ember-cli-github-pages": "^0.2.2",
5858
"ember-cli-inject-live-reload": "^2.1.0",
5959
"ember-cli-sass": "^10.0.1",
6060
"ember-cli-sri": "^2.1.1",
6161
"ember-cli-terser": "^4.0.2",
6262
"ember-disable-prototype-extensions": "^1.1.3",
63-
"ember-export-application-global": "^2.0.1",
6463
"ember-load-initializers": "^2.1.2",
65-
"ember-maybe-import-regenerator": "^0.1.6",
66-
"ember-page-title": "^6.2.2",
67-
"ember-qunit": "^5.1.4",
68-
"ember-resolver": "^8.0.2",
69-
"ember-source": "~3.28.0",
64+
"ember-page-title": "^7.0.0",
65+
"ember-qunit": "^6.0.0",
66+
"ember-resolver": "^8.0.3",
67+
"ember-source": "~4.8.0",
7068
"ember-source-channel-url": "^3.0.0",
71-
"ember-template-lint": "^3.6.0",
72-
"ember-try": "^1.4.0",
69+
"ember-template-lint": "^4.16.1",
70+
"ember-try": "^2.0.0",
7371
"eslint": "^7.32.0",
74-
"eslint-config-prettier": "^8.3.0",
75-
"eslint-plugin-ember": "^10.5.4",
72+
"eslint-config-prettier": "^8.5.0",
73+
"eslint-plugin-ember": "^11.1.0",
7674
"eslint-plugin-node": "^11.1.0",
77-
"eslint-plugin-prettier": "^3.4.1",
78-
"eslint-plugin-qunit": "^6.2.0",
75+
"eslint-plugin-prettier": "^4.2.1",
76+
"eslint-plugin-qunit": "^7.3.1",
7977
"highlight.js": "^11.3.1",
8078
"husky": "^4.2.3",
8179
"loader.js": "^4.7.0",
8280
"npm-run-all": "^4.1.5",
83-
"prettier": "^2.3.2",
81+
"prettier": "^2.7.1",
8482
"pretty-quick": "^2.0.1",
85-
"qunit": "^2.16.0",
86-
"qunit-dom": "^1.6.0",
83+
"qunit": "^2.19.2",
84+
"qunit-dom": "^2.0.0",
8785
"sass": "^1.43.3",
88-
"semantic-release": "^17.4.2"
86+
"semantic-release": "^17.4.2",
87+
"webpack": "^5.74.0"
8988
},
9089
"engines": {
91-
"node": "12.* || 14.* || >= 16"
90+
"node": "14.* || 16.* || >= 18"
9291
},
9392
"ember": {
9493
"edition": "octane"

tests/dummy/app/index.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
4+
<meta charset="utf-8" />
65
<title>Dummy</title>
7-
<meta name="description" content="">
8-
<meta name="viewport" content="width=device-width, initial-scale=1">
6+
<meta name="description" content="" />
7+
<meta name="viewport" content="width=device-width, initial-scale=1" />
98

109
{{content-for "head"}}
1110

12-
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
13-
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/dummy.css">
11+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css" />
12+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/dummy.css" />
1413

1514
{{content-for "head-footer"}}
1615
</head>

tests/dummy/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.28.3",
6+
"version": "4.8.0",
77
"blueprints": [
88
{
99
"name": "addon",

tests/dummy/config/environment.js

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

33
module.exports = function (environment) {
4-
let ENV = {
4+
const ENV = {
55
modulePrefix: 'dummy',
66
environment,
77
rootURL: '/',
8-
locationType: 'auto',
8+
locationType: 'history',
99
EmberENV: {
1010
FEATURES: {
1111
// Here you can enable experimental features on an ember canary build
1212
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
1313
},
14-
EXTEND_PROTOTYPES: {
15-
// Prevent Ember Data from overriding Date.parse.
16-
Date: false,
17-
},
1814
},
1915

2016
APP: {

tests/dummy/config/targets.js

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,6 @@
22

33
const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
44

5-
// Ember's browser support policy is changing, and IE11 support will end in
6-
// v4.0 onwards.
7-
//
8-
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
9-
//
10-
// If you need IE11 support on a version of Ember that still offers support
11-
// for it, uncomment the code block below.
12-
//
13-
// const isCI = Boolean(process.env.CI);
14-
// const isProduction = process.env.EMBER_ENV === 'production';
15-
//
16-
// if (isCI || isProduction) {
17-
// browsers.push('ie 11');
18-
// }
19-
205
module.exports = {
216
browsers,
227
};

tests/helpers/.gitkeep

Whitespace-only changes.

tests/helpers/index.js

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
import {
2+
setupApplicationTest as upstreamSetupApplicationTest,
3+
setupRenderingTest as upstreamSetupRenderingTest,
4+
setupTest as upstreamSetupTest,
5+
} from 'ember-qunit';
6+
7+
// This file exists to provide wrappers around ember-qunit's / ember-mocha's
8+
// test setup functions. This way, you can easily extend the setup that is
9+
// needed per test type.
10+
11+
function setupApplicationTest(hooks, options) {
12+
upstreamSetupApplicationTest(hooks, options);
13+
14+
// Additional setup for application tests can be done here.
15+
//
16+
// For example, if you need an authenticated session for each
17+
// application test, you could do:
18+
//
19+
// hooks.beforeEach(async function () {
20+
// await authenticateSession(); // ember-simple-auth
21+
// });
22+
//
23+
// This is also a good place to call test setup functions coming
24+
// from other addons:
25+
//
26+
// setupIntl(hooks); // ember-intl
27+
// setupMirage(hooks); // ember-cli-mirage
28+
}
29+
30+
function setupRenderingTest(hooks, options) {
31+
upstreamSetupRenderingTest(hooks, options);
32+
33+
// Additional setup for rendering tests can be done here.
34+
}
35+
36+
function setupTest(hooks, options) {
37+
upstreamSetupTest(hooks, options);
38+
39+
// Additional setup for unit tests can be done here.
40+
}
41+
42+
export { setupApplicationTest, setupRenderingTest, setupTest };

tests/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<html>
33
<head>
44
<meta charset="utf-8" />
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
65
<title>Dummy Tests</title>
76
<meta name="description" content="" />
87
<meta name="viewport" content="width=device-width, initial-scale=1" />

0 commit comments

Comments
 (0)