Remove RSK as a direct dependency in the demo stores (#398)

Shopify · Jan 30, 2023 · bb9ee26 · bb9ee26
1 parent d4382cc
commit bb9ee26
Show file tree

Hide file tree

Showing 55 changed files with 156 additions and 107 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/hydrogen/package.json b/packages/hydrogen/package.json
@@ -11,7 +11,8 @@
   "types": "dist/production/index.d.ts",
   "sideEffects": false,
   "scripts": {
-    "build": "tsup --clean --config ../../tsup.config.ts",
+    "build": "tsup --clean --config ../../tsup.config.ts && npm run copy-hydrogen-react",
+    "copy-hydrogen-react": "cp ../../node_modules/@shopify/hydrogen-react/storefront.schema.json dist && cp ../../node_modules/@shopify/hydrogen-react/dist/types/storefront-api-types.d.ts dist",
     "dev": "tsup --watch --config ../../tsup.config.ts",
     "typecheck": "tsc --noEmit",
     "test": "vitest"
@@ -39,18 +40,27 @@
       "import": "./dist/build/index.js",
       "default": "./dist/build/index.js"
     },
+    "./storefront-api-types": "./dist/storefront-api-types.d.ts",
+    "./storefront.schema.json": "./dist/storefront.schema.json",
     "./package.json": "./package.json"
   },
+  "typesVersions": {
+    "*": {
+      "storefront-api-types": [
+        "./dist/storefront-api-types.d.ts"
+      ]
+    }
+  },
   "files": [
     "dist"
   ],
   "peerDependencies": {
     "@remix-run/react": "*",
-    "@remix-run/server-runtime": "1.11.0",
-    "@shopify/storefront-kit-react": "*"
+    "@remix-run/server-runtime": "1.11.0"
   },
   "dependencies": {
-    "recursive-readdir": "^2.2.3"
+    "recursive-readdir": "^2.2.3",
+    "@shopify/storefront-kit-react": "^2023.1.3"
   },
   "devDependencies": {
     "@shopify/storefront-kit-react": "*",

diff --git a/packages/hydrogen/src/index.ts b/packages/hydrogen/src/index.ts
@@ -12,3 +12,41 @@ export {storefrontRedirect} from './routing/redirect';
 export {graphiqlLoader} from './routing/graphiql';
 export {Seo} from './seo/seo';
 export type {SeoHandleFunction} from './seo/seo';
+
+export {
+  AnalyticsEventName,
+  AnalyticsPageType,
+  ExternalVideo,
+  flattenConnection,
+  getClientBrowserParameters,
+  getShopifyCookies,
+  Image,
+  MediaFile,
+  ModelViewer,
+  Money,
+  parseMetafield,
+  sendShopifyAnalytics,
+  ShopifyAppSource,
+  ShopPayButton,
+  storefrontApiCustomScalars,
+  useShopifyCookies,
+  Video,
+} from '@shopify/storefront-kit-react';
+
+export type {
+  ClientBrowserParameters,
+  ParsedMetafields,
+  ShopifyAddToCart,
+  ShopifyAddToCartPayload,
+  ShopifyAnalytics,
+  ShopifyAnalyticsPayload,
+  ShopifyAnalyticsProduct,
+  ShopifyCookies,
+  ShopifyPageView,
+  ShopifyPageViewPayload,
+  StorefrontApiResponse,
+  StorefrontApiResponseError,
+  StorefrontApiResponseOk,
+  StorefrontApiResponseOkPartial,
+  StorefrontApiResponsePartial,
+} from '@shopify/storefront-kit-react';
diff --git a/rfc/cart.md b/rfc/cart.md
@@ -144,7 +144,7 @@ export async function cartAdd({cartId, lines, storefront}) {
 
 ```jsx
 import {useFetcher} from '@remix-run/react';
-import {flattenConnection} from '@shopify/storefront-kit-react';
+import {flattenConnection} from '@shopify/hydrogen-react';
 
 export function ProductCard({product}) {
   const firstVariant = flattenConnection(product?.variants)[0];

diff --git a/rfc/fetching-data.md b/rfc/fetching-data.md
@@ -41,7 +41,7 @@ export default {
 To load data into your Hydrogen app, use a Remix `loader` and write a GraphQL query. Hydrogen provides a special `storefront` param to make queries against your Shopify storefront.
 
 ```ts
-import type {ProductType} from '@shopify/storefront-kit-react/storefront-api-types';
+import type {ProductType} from '@shopify/hydrogen/storefront-api-types';
 import {json, useLoaderData, type LoaderArgs} from '@shopify/remix-oxygen';
 
 export async function loader({params, context: {storefront}}: LoaderArgs) {

diff --git a/rfc/guide-internationalization.md b/rfc/guide-internationalization.md
@@ -68,7 +68,7 @@
    import {
      CountryCode,
      LanguageCode,
-   } from '@shopify/storefront-kit-react/storefront-api-types';
+   } from '@shopify/hydrogen/storefront-api-types';
 
    export type Locale = {
      language: LanguageCode,
@@ -634,7 +634,7 @@ export function getLocaleFromRequest(request: Request): Locale {
    import {
      CountryCode,
      LanguageCode,
-   } from '@shopify/storefront-kit-react/storefront-api-types';
+   } from '@shopify/hydrogen/storefront-api-types';
    import {redirect, type AppLoadContext, type ActionFunction} from '@shopify/remix-oxygen';
    import invariant from 'tiny-invariant';
    import {updateCartBuyerIdentity} from '~/data';