Skip to content

Commit f5842d6

Browse files
committed
breaking: Drop node 16 support, min node v18.
1 parent 9d5aa76 commit f5842d6

4 files changed

Lines changed: 39 additions & 21 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install Node
2626
uses: actions/setup-node@v3
2727
with:
28-
node-version: 16.x
28+
node-version: 18.x
2929
cache: yarn
3030
- name: Install Dependencies
3131
run: yarn install --frozen-lockfile
@@ -43,7 +43,7 @@ jobs:
4343
- uses: actions/checkout@v3
4444
- uses: actions/setup-node@v3
4545
with:
46-
node-version: 16.x
46+
node-version: 18.x
4747
cache: yarn
4848
- name: Install Dependencies
4949
run: yarn install --no-lockfile
@@ -81,7 +81,7 @@ jobs:
8181
- name: Install Node
8282
uses: actions/setup-node@v3
8383
with:
84-
node-version: 16.x
84+
node-version: 18.x
8585
cache: yarn
8686
- name: Install Dependencies
8787
run: yarn install --frozen-lockfile

blueprints/ember-apollo-client/index.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ module.exports = {
99
* https://github.com/ember-cli/ember-fetch/issues/98
1010
*/
1111
afterInstall() {
12-
return this.addPackagesToProject([
13-
{ name: 'ember-fetch', target: '^8.0.4' },
14-
{ name: 'graphql', target: '^16.0.0' },
15-
]);
12+
return this.addPackagesToProject([{ name: 'graphql', target: '^16.0.0' }]);
1613
},
1714
};

package.json

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,8 @@
9191
"peerDependencies": {
9292
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
9393
},
94-
"//resolutions": {
95-
"isbinaryfile": "later versions of isbinaryfile require node.js 18 or later, while this addon maintains compatibility with node.js 16. To ensure compatibility, we pin isbinaryfile to version 5.0.0.",
96-
"glob": "later versions of glob require node.js 18 or later, while this addon maintains compatibility with node.js 16. To ensure compatibility, we pin glob to version ^7.2.3.",
97-
"minimatch": "later versions of minimatch require node.js 18 or later, while this addon maintains compatibility with node.js 16. To ensure compatibility, we pin minimatch to version ^5.1.6."
98-
},
99-
"resolutions": {
100-
"isbinaryfile": "5.0.0",
101-
"glob": "^7.2.3",
102-
"minimatch": "^5.1.6"
103-
},
10494
"engines": {
105-
"node": "16.* || >= 18"
95+
"node": ">= 18"
10696
},
10797
"ember": {
10898
"edition": "octane"

yarn.lock

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2364,6 +2364,14 @@ bower-endpoint-parser@0.2.2:
23642364
resolved "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz#00b565adbfab6f2d35addde977e97962acbcb3f6"
23652365
integrity sha512-YWZHhWkPdXtIfH3VRu3QIV95sa75O9vrQWBOHjexWCLBCTy5qJvRr36LXTqFwTchSXVlzy5piYJOjzHr7qhsNg==
23662366

2367+
brace-expansion@^1.1.7:
2368+
version "1.1.12"
2369+
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
2370+
integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
2371+
dependencies:
2372+
balanced-match "^1.0.0"
2373+
concat-map "0.0.1"
2374+
23672375
brace-expansion@^2.0.1:
23682376
version "2.0.2"
23692377
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
@@ -3233,6 +3241,11 @@ compression@^1.7.4:
32333241
safe-buffer "5.2.1"
32343242
vary "~1.1.2"
32353243

3244+
concat-map@0.0.1:
3245+
version "0.0.1"
3246+
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
3247+
integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
3248+
32363249
configstore@^5.0.1:
32373250
version "5.0.1"
32383251
resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
@@ -5405,7 +5418,7 @@ glob-to-regexp@^0.4.1:
54055418
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
54065419
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
54075420

5408-
glob@*, glob@^5.0.10, glob@^7.0.4, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6, glob@^7.1.7, glob@^7.2.0, glob@^7.2.3:
5421+
glob@*, glob@^7.0.4, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6, glob@^7.1.7, glob@^7.2.0:
54095422
version "7.2.3"
54105423
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
54115424
integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -5417,6 +5430,17 @@ glob@*, glob@^5.0.10, glob@^7.0.4, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6, glob@^
54175430
once "^1.3.0"
54185431
path-is-absolute "^1.0.0"
54195432

5433+
glob@^5.0.10:
5434+
version "5.0.15"
5435+
resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
5436+
integrity sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==
5437+
dependencies:
5438+
inflight "^1.0.4"
5439+
inherits "2"
5440+
minimatch "2 || 3"
5441+
once "^1.3.0"
5442+
path-is-absolute "^1.0.0"
5443+
54205444
global-modules@^1.0.0:
54215445
version "1.0.0"
54225446
resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -6275,7 +6299,7 @@ isarray@^2.0.5:
62756299
resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
62766300
integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
62776301

6278-
isbinaryfile@5.0.0, isbinaryfile@^5.0.0:
6302+
isbinaryfile@^5.0.0:
62796303
version "5.0.0"
62806304
resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz#034b7e54989dab8986598cbcea41f66663c65234"
62816305
integrity sha512-UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg==
@@ -7034,13 +7058,20 @@ mini-css-extract-plugin@^2.5.2:
70347058
schema-utils "^4.0.0"
70357059
tapable "^2.2.1"
70367060

7037-
minimatch@*, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^5.1.0, minimatch@^5.1.6:
7061+
minimatch@*, minimatch@^5.1.0, minimatch@^5.1.6:
70387062
version "5.1.6"
70397063
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
70407064
integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
70417065
dependencies:
70427066
brace-expansion "^2.0.1"
70437067

7068+
"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1:
7069+
version "3.1.2"
7070+
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
7071+
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
7072+
dependencies:
7073+
brace-expansion "^1.1.7"
7074+
70447075
minimist@^0.2.1:
70457076
version "0.2.4"
70467077
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.4.tgz#0085d5501e29033748a2f2a4da0180142697a475"

0 commit comments

Comments
 (0)