Fixed exports in local

package-lock.json

@@ -2121,7 +2121,6 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
       "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2804,6 +2803,17 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/import-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz",
+      "integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==",
+      "dependencies": {
+        "import-from": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -2827,6 +2837,17 @@
         "node": ">=4"
       }
     },
+    "node_modules/import-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz",
+      "integrity": "sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==",
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/indexes-of": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
@@ -5904,6 +5925,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/retry": {
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
@@ -6993,6 +7022,8 @@
       "license": "MIT",
       "dependencies": {
         "@vercel/fetch": "^6.1.1",
+        "deepmerge": "^4.2.2",
+        "import-cwd": "^3.0.0",
         "js-cookie": "^2.2.1",
         "swr": "^0.5.6"
       },
@@ -7000,7 +7031,6 @@
         "@types/js-cookie": "^2.2.6",
         "@types/node": "^15.12.4",
         "@types/react": "^17.0.8",
-        "deepmerge": "^4.2.2",
         "next": "^12.0.3",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
@@ -7968,7 +7998,8 @@
         "@types/node": "^15.12.4",
         "@types/react": "^17.0.8",
         "@vercel/fetch": "^6.1.1",
-        "deepmerge": "^4.2.2",
+        "deepmerge": "*",
+        "import-cwd": "*",
         "js-cookie": "^2.2.1",
         "next": "^12.0.3",
         "react": "^17.0.2",
@@ -8780,8 +8811,7 @@
     "deepmerge": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
-      "dev": true
     },
     "define-properties": {
       "version": "1.1.3",
@@ -9294,6 +9324,14 @@
         "queue": "6.0.2"
       }
     },
+    "import-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz",
+      "integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==",
+      "requires": {
+        "import-from": "^3.0.0"
+      }
+    },
     "import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -9310,6 +9348,14 @@
         }
       }
     },
+    "import-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz",
+      "integrity": "sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==",
+      "requires": {
+        "resolve-from": "^5.0.0"
+      }
+    },
     "indexes-of": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
@@ -11622,6 +11668,11 @@
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
     },
+    "resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
+    },
     "retry": {
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",

packages/commerce/package.json

@@ -25,6 +25,8 @@
   },
   "dependencies": {
     "@vercel/fetch": "^6.1.1",
+    "deepmerge": "^4.2.2",
+    "import-cwd": "^3.0.0",
     "js-cookie": "^2.2.1",
     "swr": "^0.5.6"
   },
@@ -37,7 +39,6 @@
     "@types/js-cookie": "^2.2.6",
     "@types/node": "^15.12.4",
     "@types/react": "^17.0.8",
-    "deepmerge": "^4.2.2",
     "next": "^12.0.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

packages/commerce/src/config.cjs

@@ -4,6 +4,7 @@
 
 const path = require('path')
 const merge = require('deepmerge')
+const importCwd = require('import-cwd')
 
 function withCommerceConfig(nextConfig = {}) {
   const commerce = nextConfig.commerce || {}
@@ -15,7 +16,7 @@ function withCommerceConfig(nextConfig = {}) {
     )
   }
 
-  const commerceNextConfig = require(path.join(provider, 'next.config'))
+  const commerceNextConfig = importCwd(path.join(provider, 'next.config'))
   const config = merge(nextConfig, commerceNextConfig)
 
   config.env = config.env || {}

packages/local/package.json

@@ -7,8 +7,22 @@
     "dev": "npm run build -- --watch"
   },
   "sideEffects": false,
-  "main": "index.js",
+  "type": "module",
-  "types": "index.d.ts",
+  "exports": {
+    "./*": "./dist/*.js",
+    "./next.config": "./dist/next.config.cjs"
+  },
+  "typesVersions": {
+    "*": {
+      "*": [
+        "src/*",
+        "src/*/index"
+      ],
+      "next.config": [
+        "dist/next.config.d.cts"
+      ]
+    }
+  },
   "dependencies": {
     "@vercel/commerce": "^0.0.1",
     "@vercel/fetch": "^6.1.1",

site/next-env.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited