diff --git a/package-copy.json b/package-copy.json index 0252f5392..4d124eeda 100644 --- a/package-copy.json +++ b/package-copy.json @@ -9,7 +9,6 @@ "lint": "next lint", "prettier-fix": "prettier --write .", "find:unused": "npx next-unused", - "generate": "graphql-codegen", "generate:shopify": "DOTENV_CONFIG_PATH=./.env.local graphql-codegen -r dotenv/config --config framework/shopify/codegen.json", "generate:vendure": "graphql-codegen --config framework/vendure/codegen.json", "generate:definitions": "node framework/bigcommerce/scripts/generate-definitions.js", @@ -86,43 +85,20 @@ } }, "lint-staged": { - "**/*.{js,jsx,ts,tsx}": [ - "eslint", - "prettier --write", - "git add" - ], - "**/*.{md,mdx,json}": [ - "prettier --write", - "git add" - ] + "**/*.{js,jsx,ts,tsx}": ["eslint", "prettier --write", "git add"], + "**/*.{md,mdx,json}": ["prettier --write", "git add"] }, "next-unused": { "alias": { - "@lib/*": [ - "lib/*" - ], - "@assets/*": [ - "assets/*" - ], - "@config/*": [ - "config/*" - ], - "@components/*": [ - "components/*" - ], - "@utils/*": [ - "utils/*" - ] + "@lib/*": ["lib/*"], + "@assets/*": ["assets/*"], + "@config/*": ["config/*"], + "@components/*": ["components/*"], + "@utils/*": ["utils/*"] }, "debug": true, - "include": [ - "components", - "lib", - "pages" - ], + "include": ["components", "lib", "pages"], "exclude": [], - "entrypoints": [ - "pages" - ] + "entrypoints": ["pages"] } } diff --git a/package-lock.json b/package-lock.json index 5102bc753..7d0109cad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13631,8 +13631,13 @@ "@vercel/fetch": "^6.1.1" }, "devDependencies": { + "@graphql-codegen/cli": "^2.3.1", + "@graphql-codegen/schema-ast": "^2.4.1", + "@graphql-codegen/typescript": "^2.4.2", + "@graphql-codegen/typescript-operations": "^2.2.2", "@types/node": "^15.12.4", "@types/react": "^17.0.8", + "dotenv": "^12.0.3", "lint-staged": "^12.1.7", "next": "^12.0.3", "prettier": "^2.5.1", @@ -13646,6 +13651,15 @@ "react-dom": "^17" } }, + "packages/shopify/node_modules/dotenv": { + "version": "12.0.3", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-12.0.3.tgz", + "integrity": "sha512-RlOysyzyGiABgDFgITo5fRnMV1QStdoVvkXhnxQc5Or/CiQo52s2Bh6DVMvzZsmFQ9IrNxYHOC/gdpNwHsitnQ==", + "dev": true, + "engines": { + "node": ">=12" + } + }, "packages/shopify/node_modules/typescript": { "version": "4.6.0-dev.20220114", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.0-dev.20220114.tgz", @@ -15894,10 +15908,10 @@ "@vercel/commerce-saleor": { "version": "file:packages/saleor", "requires": { - "@graphql-codegen/cli": "*", - "@graphql-codegen/schema-ast": "*", - "@graphql-codegen/typescript": "*", - "@graphql-codegen/typescript-operations": "*", + "@graphql-codegen/cli": "^2.3.1", + "@graphql-codegen/schema-ast": "^2.4.1", + "@graphql-codegen/typescript": "^2.4.2", + "@graphql-codegen/typescript-operations": "^2.2.2", "@types/node": "^15.12.4", "@types/react": "^17.0.8", "@vercel/commerce": "^0.0.1", @@ -15921,10 +15935,15 @@ "@vercel/commerce-shopify": { "version": "file:packages/shopify", "requires": { + "@graphql-codegen/cli": "^2.3.1", + "@graphql-codegen/schema-ast": "^2.4.1", + "@graphql-codegen/typescript": "^2.4.2", + "@graphql-codegen/typescript-operations": "^2.2.2", "@types/node": "^15.12.4", "@types/react": "^17.0.8", "@vercel/commerce": "^0.0.1", "@vercel/fetch": "^6.1.1", + "dotenv": "*", "lint-staged": "^12.1.7", "next": "^12.0.3", "prettier": "^2.5.1", @@ -15933,6 +15952,12 @@ "typescript": "^4.6.0-dev.20220108" }, "dependencies": { + "dotenv": { + "version": "12.0.3", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-12.0.3.tgz", + "integrity": "sha512-RlOysyzyGiABgDFgITo5fRnMV1QStdoVvkXhnxQc5Or/CiQo52s2Bh6DVMvzZsmFQ9IrNxYHOC/gdpNwHsitnQ==", + "dev": true + }, "typescript": { "version": "4.6.0-dev.20220114", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.0-dev.20220114.tgz", diff --git a/packages/shopify/codegen.json b/packages/shopify/codegen.json index 9d7dcf8a9..4b1dd2087 100644 --- a/packages/shopify/codegen.json +++ b/packages/shopify/codegen.json @@ -8,13 +8,13 @@ }, "documents": [ { - "./framework/shopify/**/*.{ts,tsx}": { + "./src/**/*.{ts,tsx}": { "noRequire": true } } ], "generates": { - "./framework/shopify/schema.d.ts": { + "./schema.d.ts": { "plugins": ["typescript", "typescript-operations"], "config": { "scalars": { @@ -22,7 +22,7 @@ } } }, - "./framework/shopify/schema.graphql": { + "./schema.graphql": { "plugins": ["schema-ast"] } }, diff --git a/packages/shopify/package.json b/packages/shopify/package.json index 736c93449..1609d3e73 100644 --- a/packages/shopify/package.json +++ b/packages/shopify/package.json @@ -5,7 +5,8 @@ "scripts": { "build": "rm -fr dist/* && tsc", "dev": "npm run build -- --watch", - "prettier-fix": "prettier --write ." + "prettier-fix": "prettier --write .", + "generate": "DOTENV_CONFIG_PATH=./.env graphql-codegen -r dotenv/config" }, "sideEffects": false, "type": "module", @@ -55,8 +56,13 @@ "react-dom": "^17" }, "devDependencies": { + "@graphql-codegen/cli": "^2.3.1", + "@graphql-codegen/schema-ast": "^2.4.1", + "@graphql-codegen/typescript": "^2.4.2", + "@graphql-codegen/typescript-operations": "^2.2.2", "@types/node": "^15.12.4", "@types/react": "^17.0.8", + "dotenv": "^12.0.3", "lint-staged": "^12.1.7", "next": "^12.0.3", "prettier": "^2.5.1",