diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d139cbe..ed74c1a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - name: Install Node uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x cache: yarn - name: Install Dependencies run: yarn install --frozen-lockfile @@ -43,7 +43,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x cache: yarn - name: Install Dependencies run: yarn install --no-lockfile @@ -81,7 +81,7 @@ jobs: - name: Install Node uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x cache: yarn - name: Install Dependencies run: yarn install --frozen-lockfile diff --git a/blueprints/ember-apollo-client/index.js b/blueprints/ember-apollo-client/index.js index 4cd65c0..a1cedf8 100644 --- a/blueprints/ember-apollo-client/index.js +++ b/blueprints/ember-apollo-client/index.js @@ -9,9 +9,6 @@ module.exports = { * https://github.com/ember-cli/ember-fetch/issues/98 */ afterInstall() { - return this.addPackagesToProject([ - { name: 'ember-fetch', target: '^8.0.4' }, - { name: 'graphql', target: '^16.0.0' }, - ]); + return this.addPackagesToProject([{ name: 'graphql', target: '^16.0.0' }]); }, }; diff --git a/package.json b/package.json index f3957f4..dbdd0c8 100644 --- a/package.json +++ b/package.json @@ -91,18 +91,8 @@ "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0" }, - "//resolutions": { - "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.", - "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.", - "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." - }, - "resolutions": { - "isbinaryfile": "5.0.0", - "glob": "^7.2.3", - "minimatch": "^5.1.6" - }, "engines": { - "node": "16.* || >= 18" + "node": ">= 18" }, "ember": { "edition": "octane" diff --git a/yarn.lock b/yarn.lock index 2b7587d..11ff11d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2364,6 +2364,14 @@ bower-endpoint-parser@0.2.2: resolved "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz#00b565adbfab6f2d35addde977e97962acbcb3f6" integrity sha512-YWZHhWkPdXtIfH3VRu3QIV95sa75O9vrQWBOHjexWCLBCTy5qJvRr36LXTqFwTchSXVlzy5piYJOjzHr7qhsNg== +brace-expansion@^1.1.7: + version "1.1.12" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843" + integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + brace-expansion@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7" @@ -3233,6 +3241,11 @@ compression@^1.7.4: safe-buffer "5.2.1" vary "~1.1.2" +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== + configstore@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" @@ -5405,7 +5418,7 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -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: +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: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" 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@^ once "^1.3.0" path-is-absolute "^1.0.0" +glob@^5.0.10: + version "5.0.15" + resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" + integrity sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA== + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + global-modules@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" @@ -6275,7 +6299,7 @@ isarray@^2.0.5: resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== -isbinaryfile@5.0.0, isbinaryfile@^5.0.0: +isbinaryfile@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz#034b7e54989dab8986598cbcea41f66663c65234" integrity sha512-UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg== @@ -7034,13 +7058,20 @@ mini-css-extract-plugin@^2.5.2: schema-utils "^4.0.0" tapable "^2.2.1" -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: +minimatch@*, minimatch@^5.1.0, minimatch@^5.1.6: version "5.1.6" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== dependencies: brace-expansion "^2.0.1" +"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + minimist@^0.2.1: version "0.2.4" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.4.tgz#0085d5501e29033748a2f2a4da0180142697a475"