Skip to content

Commit

Permalink
Merge branch 'improved-errors' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelbromley committed Sep 29, 2020
2 parents 9b2c088 + 65c50d4 commit 2f0ec5b
Show file tree
Hide file tree
Showing 122 changed files with 11,789 additions and 7,263 deletions.
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
generated-types.ts
lazy-extensions.module.ts
shared-extensions.module.ts
generated-graphql-shop-errors.ts
generated-graphql-admin-errors.ts
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"docs:watch": "concurrently --restart-tries 5 -n docgen,hugo,webpack -c green,blue,cyan \"yarn generate-graphql-docs && yarn generate-typescript-docs -w\" \"cd docs && hugo server\" \"cd docs && yarn webpack -w\"",
"docs:build": "yarn generate-graphql-docs && yarn generate-typescript-docs && cd docs && yarn webpack --prod && node build.js && hugo",
"docs:deploy": "cd docs && yarn && cd .. && yarn docs:build",
"codegen": "ts-node scripts/codegen/generate-graphql-types.ts",
"codegen": "tsc -p scripts/codegen/plugins && ts-node scripts/codegen/generate-graphql-types.ts",
"generate-typescript-docs": "ts-node scripts/docs/generate-typescript-docs.ts",
"generate-graphql-docs": "ts-node scripts/docs/generate-graphql-docs.ts --api=shop && ts-node scripts/docs/generate-graphql-docs.ts --api=admin",
"version": "yarn check-imports && yarn build && yarn generate-changelog && git add CHANGELOG.md && git add */version.ts",
Expand All @@ -29,12 +29,12 @@
"devDependencies": {
"@commitlint/cli": "^8.2.0",
"@commitlint/config-conventional": "^8.2.0",
"@graphql-codegen/add": "1.13.1",
"@graphql-codegen/cli": "1.13.1",
"@graphql-codegen/fragment-matcher": "1.13.1",
"@graphql-codegen/typescript": "1.13.1",
"@graphql-codegen/typescript-compatibility": "1.13.1",
"@graphql-codegen/typescript-operations": "1.13.1",
"@graphql-codegen/add": "2.0.1",
"@graphql-codegen/cli": "1.17.8",
"@graphql-codegen/fragment-matcher": "1.17.8",
"@graphql-codegen/typescript": "1.17.9",
"@graphql-codegen/typescript-compatibility": "2.0.0",
"@graphql-codegen/typescript-operations": "1.17.8",
"@types/graphql": "^14.0.5",
"@types/jest": "^25.1.4",
"@types/klaw-sync": "^6.0.0",
Expand Down
Loading

0 comments on commit 2f0ec5b

Please sign in to comment.