Skip to content

Commit

Permalink
Merge branch 'main' into shipping-label-attribute
Browse files Browse the repository at this point in the history
  • Loading branch information
JannikZed committed Jan 24, 2025
2 parents 8fa8d1a + fb220b3 commit ab4fe8c
Show file tree
Hide file tree
Showing 14 changed files with 992 additions and 498 deletions.
11 changes: 11 additions & 0 deletions .changeset/brave-snakes-ring.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
"app-avatax": patch
"cms-v2": patch
"klaviyo": patch
"products-feed": patch
"search": patch
"segment": patch
"smtp": patch
---

Bumping app-sdk to v0.52.0 - adding native APL support for vercel-kv and redis
10 changes: 9 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
types:
- synchronize
- opened
push:
branches:
- main

jobs:
lint:
Expand Down Expand Up @@ -53,4 +56,9 @@ jobs:
- name: Install dependencies
run: pnpm install --frozen-lockfile
- name: Run tests
run: pnpm test
run: pnpm test:ci
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@0da7aa657d958d32c117fc47e1f977e7524753c7 # v5.3.0
with:
token: ${{ secrets.CODECOV_TOKEN }}
slug: saleor/apps
4 changes: 3 additions & 1 deletion apps/avatax/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"migrate": "pnpm tsx --require dotenv/config ./scripts/run-webhooks-migration.ts",
"migrate:dry-run": "pnpm tsx --require dotenv/config ./scripts/run-webhooks-migration.ts --dry-run",
"start": "next start",
"test": "vitest --project units"
"test": "vitest --project units",
"test:ci": "vitest run --coverage --project units"
},
"dependencies": {
"@aws-sdk/client-dynamodb": "3.651.1",
Expand Down Expand Up @@ -94,6 +95,7 @@
"@types/react": "18.2.5",
"@types/react-dom": "18.2.5",
"@vitejs/plugin-react": "4.3.1",
"@vitest/coverage-v8": "1.6.0",
"aws-sdk-client-mock": "4.0.1",
"eslint": "../../node_modules/eslint",
"eslint-config-saleor": "workspace:*",
Expand Down
4 changes: 3 additions & 1 deletion apps/cms-v2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"lint": "eslint .",
"lint:fix": "eslint --fix .",
"start": "next start",
"test": "vitest"
"test": "vitest",
"test:ci": "vitest run --coverage"
},
"dependencies": {
"@datocms/cma-client-browser": "2.0.0",
Expand Down Expand Up @@ -76,6 +77,7 @@
"@graphql-typed-document-node/core": "3.2.0",
"@testing-library/react": "^14.0.0",
"@testing-library/react-hooks": "^8.0.1",
"@vitest/coverage-v8": "1.6.0",
"@types/qs": "^6.9.7",
"@types/react": "18.2.5",
"@types/react-dom": "18.2.5",
Expand Down
4 changes: 3 additions & 1 deletion apps/products-feed/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"lint": "eslint .",
"lint:fix": "eslint --fix .",
"start": "next start",
"test": "vitest"
"test": "vitest",
"test:ci": "vitest run --coverage"
},
"dependencies": {
"@aws-sdk/client-s3": "^3.332.0",
Expand Down Expand Up @@ -75,6 +76,7 @@
"@graphql-typed-document-node/core": "3.2.0",
"@testing-library/react": "^14.0.0",
"@testing-library/react-hooks": "^8.0.1",
"@vitest/coverage-v8": "1.6.0",
"@types/react": "18.2.5",
"@types/react-dom": "18.2.5",
"eslint": "../../node_modules/eslint",
Expand Down
4 changes: 3 additions & 1 deletion apps/search/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"lint:fix": "eslint --fix .",
"migrate": "pnpm tsx ./scripts/migrations/run-webhooks-migration.ts",
"start": "next start",
"test": "vitest"
"test": "vitest",
"test:ci": "vitest run --coverage"
},
"dependencies": {
"@hookform/resolvers": "^3.3.1",
Expand Down Expand Up @@ -74,6 +75,7 @@
"@types/react": "18.2.5",
"@types/react-dom": "18.2.5",
"@vitejs/plugin-react": "4.3.1",
"@vitest/coverage-v8": "1.6.0",
"eslint": "../../node_modules/eslint",
"eslint-config-saleor": "workspace:*",
"node-mocks-http": "^1.12.2",
Expand Down
4 changes: 3 additions & 1 deletion apps/segment/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"migrate": "pnpm tsx --require dotenv/config ./scripts/run-webhooks-migration.ts",
"migrate:dry-run": "pnpm tsx --require dotenv/config ./scripts/run-webhooks-migration.ts --dry-run",
"start": "next start",
"test": "vitest"
"test": "vitest",
"test:ci": "vitest run --coverage"
},
"dependencies": {
"@aws-sdk/client-dynamodb": "3.651.1",
Expand Down Expand Up @@ -84,6 +85,7 @@
"@types/react": "18.2.5",
"@types/react-dom": "18.2.5",
"@typescript-eslint/eslint-plugin": "7.15.0",
"@vitest/coverage-v8": "1.6.0",
"@typescript-eslint/parser": "7.15.0",
"aws-sdk-client-mock": "4.0.1",
"eslint": "../../node_modules/eslint",
Expand Down
4 changes: 3 additions & 1 deletion apps/smtp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"lint": "eslint .",
"lint:fix": "eslint --fix .",
"start": "next start",
"test": "vitest"
"test": "vitest",
"test:ci": "vitest run --coverage"
},
"dependencies": {
"@hookform/resolvers": "^3.3.1",
Expand Down Expand Up @@ -80,6 +81,7 @@
"@graphql-typed-document-node/core": "3.2.0",
"@testing-library/react": "^14.0.0",
"@testing-library/react-hooks": "^8.0.1",
"@vitest/coverage-v8": "1.6.0",
"@types/handlebars-helpers": "^0.5.6",
"@types/html-to-text": "^9.0.0",
"@types/mjml": "4.7.4",
Expand Down
51 changes: 51 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
coverage:
status:
project:
default: off
app-avatax:
flags: [avatax]
app-cms:
flags: [cms]
app-products-feed:
flags: [products-feed]
app-search:
flags: [search]
app-segment:
flags: [segment]
app-smtp:
flags: [smtp]
packages-logger:
flags: [logger]
packages-shared:
flags: [shared]
packages-webhook-utils:
flags: [webhook-utils]

flags:
avatax:
paths:
- apps/avatax/
cms:
paths:
- apps/cms-v2/
products-feed:
paths:
- apps/products-feed/
search:
paths:
- apps/search/
segment:
paths:
- apps/segment/
smtp:
paths:
- apps/smtp/
logger:
paths:
- packages/logger/
shared:
paths:
- packages/shared/
webhook-utils:
paths:
- packages/webhook-utils/
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"prepare": "husky",
"start": "turbo run start",
"test": "turbo run test",
"test:ci": "turbo run test:ci",
"knip": "knip"
},
"devDependencies": {
Expand All @@ -36,7 +37,7 @@
"@opentelemetry/sdk-trace-base": "1.18.1",
"@opentelemetry/sdk-trace-node": "1.18.1",
"@opentelemetry/semantic-conventions": "1.18.1",
"@saleor/app-sdk": "0.50.3",
"@saleor/app-sdk": "0.52.0",
"@sentry/cli": "2.32.1",
"@sentry/nextjs": "7.117.0",
"@sentry/node": "7.117.0",
Expand Down
4 changes: 3 additions & 1 deletion packages/logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"check-types": "tsc --noEmit",
"lint": "eslint .",
"lint:fix": "eslint --fix .",
"test": "vitest"
"test": "vitest",
"test:ci": "vitest run --coverage"
},
"dependencies": {
"eslint": "../../node_modules/eslint",
Expand All @@ -16,6 +17,7 @@
"@saleor/app-sdk": "link:../../node_modules/@saleor/app-sdk",
"@sentry/nextjs": "../../node_modules/@sentry/nextjs",
"eslint-config-saleor": "workspace:*",
"@vitest/coverage-v8": "1.6.0",
"vite": "5.3.3",
"vitest": "1.6.0",
"modern-errors": "7.0.1",
Expand Down
4 changes: 3 additions & 1 deletion packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"check-types": "tsc --noEmit",
"lint": "eslint .",
"lint:fix": "eslint --fix .",
"test": "vitest"
"test": "vitest",
"test:ci": "vitest run --coverage"
},
"dependencies": {
"@urql/exchange-auth": "2.1.4",
Expand All @@ -24,6 +25,7 @@
"react-dom": "18.2.0",
"typescript": "5.5.4",
"urql": "4.0.4",
"@vitest/coverage-v8": "1.6.0",
"vite": "5.3.3",
"vitest": "1.6.0",
"zod": "3.21.4"
Expand Down
4 changes: 3 additions & 1 deletion packages/webhook-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"generate": "graphql-codegen",
"lint": "eslint .",
"lint:fix": "eslint --fix .",
"test": "vitest"
"test": "vitest",
"test:ci": "vitest run --coverage"
},
"dependencies": {
"@saleor/app-sdk": "link:../../node_modules/@saleor/app-sdk",
Expand All @@ -32,6 +33,7 @@
"graphql-config": "5.0.3",
"typescript": "5.5.4",
"urql": "4.0.4",
"@vitest/coverage-v8": "1.6.0",
"vite": "5.3.3",
"vitest": "1.6.0"
},
Expand Down
Loading

0 comments on commit ab4fe8c

Please sign in to comment.