.changeset/hungry-humans-lie.md

@@ -0,0 +1,8 @@
+---
+"@shopify/storefront-api-client": patch
+"@shopify/admin-api-client": patch
+"@shopify/graphql-client": patch
+"@shopify/shopify-api": patch
+---
+
+Updated global fetch types to more closely match reality

.changeset/little-suits-sleep.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/many-brooms-switch.md

@@ -0,0 +1,5 @@
+---
+"@shopify/shopify-api": minor
+---
+
+Export GraphqlClient class from types

.changeset/polite-bugs-sneeze.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/rare-carrots-push.md

@@ -0,0 +1,2 @@
+---
+---

packages/graphql-client/.eslintignore → .eslintignore

@@ -1,6 +1,5 @@
 rollup.config.js
-rollup-common.js
-rollup-umd.config.js
+rollup.config.cjs
 .eslintrc.cjs
 node_modules/
 dist/

.eslintrc.cjs

@@ -1,12 +1,25 @@
+const { GlobSync } = require("glob");
+
+const packageDir = ["."];
+if (process.cwd().includes("shopify-api-js/packages")) {
+  packageDir.push(__dirname);
+} else {
+  const glob = new GlobSync(`${__dirname}/packages/*`);
+  glob.found.forEach((path) =>
+    packageDir.push(path.replace(/^.*\/shopify-api-js\//, ""))
+  );
+}
+
 module.exports = {
   env: {
     browser: false,
     es2021: true,
   },
-  extends: ['plugin:@shopify/typescript', 'plugin:@shopify/prettier'],
-  ignorePatterns: ['dist/'],
+  extends: ["plugin:@shopify/typescript", "plugin:@shopify/prettier"],
+  ignorePatterns: ["dist/", "node_modules/"],
   rules: {
-    'no-console': 0,
-    '@typescript-eslint/naming-convention': 0,
+    "no-console": 0,
+    "@typescript-eslint/naming-convention": 0,
+    "import/no-extraneous-dependencies": ["error", { packageDir }],
   },
 };

.github/workflows/ci.yml

@@ -12,8 +12,11 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.version }}
+      # TODO Remove the --ignore-engines flag when we drop support for Node 16
       - name: Install
-        run: yarn install
+        run: yarn install --ignore-engines
+      - name: Build
+        run: yarn build
       - name: Lint
         run: yarn lint
       - name: Test

.github/workflows/main-release.yml

@@ -21,8 +21,9 @@ jobs:
           node-version: 16.x
           cache: 'yarn'
 
+      # TODO Remove the --ignore-engines flag when we drop support for Node 16
       - name: Install dependencies
-        run: yarn --frozen-lockfile
+        run: yarn --frozen-lockfile --ignore-engines
 
       - name: Create release Pull Request or publish to NPM
         id: changesets

.github/workflows/release-candidate.yml

@@ -21,8 +21,9 @@ jobs:
           node-version: 16.x
           cache: 'yarn'
 
+      # TODO Remove the --ignore-engines flag when we drop support for Node 16
       - name: Install dependencies
-        run: yarn --frozen-lockfile
+        run: yarn --frozen-lockfile --ignore-engines
 
       - name: Create release candidate PR or publish to NPM
         id: changesets

.vscode/settings.json

@@ -1,3 +1,5 @@
 {
-  "cSpell.words": ["isbot"]
+  "cSpell.words": [
+    "isbot"
+  ]
 }

README.md

@@ -1,16 +1,29 @@
 # `@shopify/shopify-api-js`
 
-This mono-repo is a collection of Shopify's JavaScript API client libraries.
+This mono-repo is a collection of Shopify's JavaScript API client libraries and utilities.
 
-### [`@shopify/shopify-api`](./packages/shopify-api)
+## [`@shopify/shopify-api`](./packages/shopify-api)
 
-This library provides support for the backends of TypeScript/JavaScript Shopify apps to access the Shopify Admin API, by making it easier to perform the following actions:
+A library supporting Shopify apps to access Shopify's APIs, by making it easier to perform the following actions:
 
 - Creating online or offline access tokens for the Admin API via OAuth
-- Making requests to the REST API
-- Making requests to the GraphQL API
+- Making requests to the Admin API (REST or GraphQL) and Storefront API (GraphQL).
 - Register/process webhooks
 
-Once your app has access to the Admin API, you can also access the Shopify Storefront API to run GraphQL queries using the unauthenticated_* access scopes.
+For use on the server.
 
-This library can be used in any application that runs on one of the supported runtimes. It doesn't rely on any specific framework, so you can include it alongside your preferred stack and only use the features that you need to build your app.
+## [`@shopify/storefront-api-client`](./packages/storefront-api-client)
+
+A library to interact with Shopify's GraphQL Storefront API. For use on the client or server.
+
+## [`@shopify/admin-api-client`](./packages/admin-api-client)
+
+A library to interact with Shopify's GraphQL and REST Admin APIs. For use on the server.
+
+## [`@shopify/graphql-client`](./packages/graphql-client)
+
+A client to interact with any of Shopify's GraphQL APIs.
+
+## [`@shopify/api-codegen-preset`](./packages/api-codegen-preset)
+
+Enables JavaScript / TypeScript apps to use a `#graphql` tag to parse queries with `graphql-codegen`.

RELEASING.md

@@ -53,7 +53,7 @@ See the sections below for specific details related to the steps outlined above.
    git checkout changeset-release/main
    ```
 
-1. Update the version string in the `lib/version.ts` file to match the version in the `package.json` file in this branch.
+1. Update the version string in the `packages/shopify-api/lib/version.ts` file to match the version in the `package.json` file in this branch.
 
 1. If needed, edit/remove any of the comments in the `CHANGELOG.md` files and commit them to the `changeset-release/main` branch.
 
@@ -94,7 +94,7 @@ For significant API changes that could result in significant refactoring on the
    git checkout changeset-release/release-candidate
    ```
 
-1. Update the version string in the `lib/version.ts` file to match the version in the `package.json` file. Make sure to add an `-rc.X` to the version, like so:
+1. Update the version string in the `packages/shopify-api/lib/version.ts` file to match the version in the `package.json` file. Make sure to add an `-rc.X` to the version, like so:
 
    ```text
    7.0.0-rc.1

package.json

@@ -7,7 +7,7 @@
     "build": "turbo build",
     "dev": "turbo dev --no-cache --continue",
     "lint": "turbo lint",
-    "clean": "turbo clean && rm -rf node_modules",
+    "clean": "turbo clean",
     "format": "prettier --write \"**/*.{ts,tsx,md}\"",
     "changeset": "changeset",
     "version-packages": "changeset version",
@@ -16,16 +16,41 @@
     "test:ci": "turbo run test:ci --parallel"
   },
   "devDependencies": {
+    "@babel/core": "^7.23.9",
+    "@babel/plugin-transform-async-to-generator": "^7.20.7",
+    "@babel/plugin-transform-runtime": "^7.23.9",
+    "@babel/preset-env": "^7.23.8",
+    "@babel/preset-typescript": "^7.23.3",
+    "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.22.0",
-    "@shopify/eslint-plugin": "^42.0.0",
+    "@rollup/plugin-babel": "^6.0.3",
+    "@rollup/plugin-commonjs": "^24.0.1",
+    "@rollup/plugin-eslint": "^9.0.3",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-replace": "^5.0.2",
+    "@rollup/plugin-terser": "^0.4.0",
+    "@rollup/plugin-typescript": "^11.1.6",
+    "@shopify/babel-preset": "^25.0.0",
+    "@shopify/eslint-plugin": "^44.0.0",
     "@shopify/prettier-config": "^1.1.2",
-    "eslint": "^7.32.0",
+    "@shopify/typescript-configs": "^5.1.0",
+    "@types/jest": "^29.5.0",
+    "@types/regenerator-runtime": "^0.13.5",
+    "@typescript-eslint/parser": "^6.19.1",
+    "babel-jest": "^29.5.0",
+    "eslint": "^8.56.0",
     "jest": "^29.7.0",
+    "jest-fetch-mock": "^3.0.3",
     "jest-runner-eslint": "^2.1.2",
-    "prettier": "^2.5.1",
-    "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1",
-    "turbo": "^1.9.3"
+    "prettier": "^3.1.0",
+    "regenerator-runtime": "^0.14.1",
+    "rollup": "^3.19.1",
+    "rollup-plugin-dts": "^6.1.0",
+    "ts-jest": "^29.1.2",
+    "ts-node": "^10.9.2",
+    "tslib": "^2.5.0",
+    "turbo": "^1.11.2",
+    "typescript": "^5.3.2"
   },
   "dependencies": {},
   "workspaces": [

packages/admin-api-client/.gitignore

@@ -0,0 +1,18 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+node_modules/
+dist/
+
+package-lock.json
+.vscode/
+.DS_Store
+.rollup.cache/
+
+# ignore any locally packed packages
+*.tgz
+!*.d.ts