Skip to content

Commit 32dfd90

Browse files
Merge pull request #415 from ember-graphql/upgrade/ember-v4
Upgrade to Ember v4 and all other deps
2 parents c9db367 + 3ee6494 commit 32dfd90

22 files changed

+3292
-4892
lines changed

.eslintignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,13 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
17+
.eslintcache
1618

1719
# ember-try
1820
/.node_modules.ember-try/
1921
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2023
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

.eslintrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ module.exports = {
1818
},
1919
rules: {
2020
'ember/no-legacy-test-waiters': 'off',
21+
'ember/no-classic-classes': 'off',
22+
'ember/no-classic-components': 'off',
23+
'ember/require-tagless-components': 'off',
24+
'ember/no-computed-properties-in-native-classes': 'off',
25+
'ember/no-actions-hash': 'off',
2126
},
2227
overrides: [
2328
// node files

.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,11 @@ jobs:
3939
fail-fast: true
4040
matrix:
4141
ember-try-scenario:
42-
- ember-lts-3.16
43-
- ember-lts-3.20
42+
- ember-lts-3.24
43+
- ember-lts-3.28
4444
- ember-release
4545
- ember-beta
4646
- ember-canary
47-
- ember-default-with-jquery
4847
- ember-classic
4948

5049
steps:

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/.env*
1313
/.pnp*
1414
/.sass-cache
15+
/.eslintcache
1516
/connect.lock
1617
/coverage/
1718
/libpeerconnection.log
@@ -23,4 +24,7 @@ jsconfig.json
2324
# ember-try
2425
/.node_modules.ember-try/
2526
/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

.npmignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,14 @@
1010
/.editorconfig
1111
/.ember-cli
1212
/.env*
13+
/.eslintcache
1314
/.eslintignore
1415
/.eslintrc.js
16+
/.git/
17+
/.github/
1518
/.gitignore
19+
/.prettierignore
20+
/.prettierrc.js
1621
/.template-lintrc.js
1722
/.travis.yml
1823
/.watchmanconfig
@@ -22,6 +27,7 @@
2227
/ember-cli-build.js
2328
/testem.js
2429
/tests/
30+
/yarn-error.log
2531
/yarn.lock
2632
.gitkeep
2733
/.github
@@ -32,4 +38,7 @@ jsconfig.json
3238
# ember-try
3339
/.node_modules.ember-try/
3440
/bower.json.ember-try
41+
/npm-shrinkwrap.json.ember-try
3542
/package.json.ember-try
43+
/package-lock.json.ember-try
44+
/yarn.lock.ember-try

.prettierignore

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
.lint-todo/
18+
19+
# ember-try
20+
/.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

.template-lintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'octane',
4+
extends: 'recommended',
55
rules: {
66
'no-action': false,
77
},

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ Install the [Apollo Client Developer tools for Chrome](https://chrome.google.com
2222
## Compatibility
2323

2424
* Apollo Client v3.0 or above
25-
* Ember.js v3.12 or above
25+
* Ember.js v3.24 or above
2626
* Ember CLI v2.13 or above
27-
* Node.js v10 or above
27+
* Node.js v12 or above
2828
* FastBoot 1.0+
2929

3030
For compatibility with Ember versions below 3.4, use version 1.x.

addon/services/apollo.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ function newDataFunc(observable, resultKey, resolve, unsubscribeFn = null) {
116116
export default class ApolloService extends Service {
117117
client = null;
118118

119-
init() {
120-
super.init(...arguments);
119+
constructor(...args) {
120+
super(...args);
121121

122122
this.client = new ApolloClient(this.clientOptions());
123123
}

config/ember-try.js

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
'use strict';
22

33
const getChannelURL = require('ember-source-channel-url');
4+
const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
45

56
module.exports = async function () {
67
return {
78
useYarn: true,
89
scenarios: [
910
{
10-
name: 'ember-lts-3.16',
11+
name: 'ember-lts-3.24',
1112
npm: {
1213
devDependencies: {
13-
'ember-source': '~3.16.0',
14+
'ember-source': '~3.24.3',
1415
},
1516
},
1617
},
1718
{
18-
name: 'ember-lts-3.20',
19+
name: 'ember-lts-3.28',
1920
npm: {
2021
devDependencies: {
21-
'ember-source': '~3.20.5',
22+
'ember-source': '~3.28.0',
2223
},
2324
},
2425
},
@@ -46,19 +47,6 @@ module.exports = async function () {
4647
},
4748
},
4849
},
49-
{
50-
name: 'ember-default-with-jquery',
51-
env: {
52-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
53-
'jquery-integration': true,
54-
}),
55-
},
56-
npm: {
57-
devDependencies: {
58-
'@ember/jquery': '^1.1.0',
59-
},
60-
},
61-
},
6250
{
6351
name: 'ember-classic',
6452
env: {
@@ -69,11 +57,16 @@ module.exports = async function () {
6957
}),
7058
},
7159
npm: {
60+
devDependencies: {
61+
'ember-source': '~3.28.0',
62+
},
7263
ember: {
7364
edition: 'classic',
7465
},
7566
},
7667
},
68+
embroiderSafe(),
69+
embroiderOptimized(),
7770
],
7871
};
7972
};

0 commit comments

Comments
 (0)