Skip to content

Commit 8efa096

Browse files
committed
Merge branch 'trunk' into refactor-kieckhafer-moveNotificationsPlugin
2 parents b59d93d + b71780d commit 8efa096

File tree

224 files changed

+1767
-8782
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+1767
-8782
lines changed

jest.config.cjs

+3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,18 @@
44

55
// Any packages that are published only as ESM need to be listed here
66
const externalNodeModules = [
7+
"@reactioncommerce/api-core",
78
"@reactioncommerce/api-plugin-accounts",
89
"@reactioncommerce/api-plugin-address-validation-test",
910
"@reactioncommerce/api-plugin-address-validation",
1011
"@reactioncommerce/api-plugin-catalogs",
1112
"@reactioncommerce/api-plugin-i18n",
13+
"@reactioncommerce/api-plugin-job-queue",
1214
"@reactioncommerce/api-plugin-notifications",
1315
"@reactioncommerce/api-plugin-settings",
1416
"@reactioncommerce/api-plugin-simple-schema",
1517
"@reactioncommerce/api-plugin-shops",
18+
"@reactioncommerce/api-plugin-tags",
1619
"@reactioncommerce/api-utils",
1720
"@reactioncommerce/db-version-check",
1821
"@reactioncommerce/plugin-authentication",

package-lock.json

+203-285
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+7-20
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,19 @@
2020
"url": "https://github.com/reactioncommerce/reaction/issues"
2121
},
2222
"dependencies": {
23-
"@apollo/federation": "^0.12.0",
23+
"@reactioncommerce/api-core": "~1.1.1",
2424
"@reactioncommerce/api-plugin-accounts": "~1.2.0",
2525
"@reactioncommerce/api-plugin-address-validation": "~1.3.0",
2626
"@reactioncommerce/api-plugin-address-validation-test": "~1.0.0",
2727
"@reactioncommerce/api-plugin-catalogs": "~1.0.0",
2828
"@reactioncommerce/api-plugin-i18n": "~1.0.0",
29-
"@reactioncommerce/api-plugin-notifications": "^1.0.0",
29+
"@reactioncommerce/api-plugin-job-queue": "~1.0.0",
30+
"@reactioncommerce/api-plugin-notifications": "~1.0.0",
3031
"@reactioncommerce/api-plugin-settings": "~1.0.0",
3132
"@reactioncommerce/api-plugin-shops": "~1.0.0",
3233
"@reactioncommerce/api-plugin-simple-schema": "~1.0.0",
34+
"@reactioncommerce/api-plugin-tags": "~1.0.0",
3335
"@reactioncommerce/api-utils": "~1.10.0",
34-
"@reactioncommerce/db-version-check": "~1.0.0",
3536
"@reactioncommerce/file-collections": "~0.7.0",
3637
"@reactioncommerce/file-collections-sa-gridfs": "~0.1.0",
3738
"@reactioncommerce/logger": "~1.1.2",
@@ -41,34 +42,20 @@
4142
"@reactioncommerce/plugin-navigation": "~1.0.2",
4243
"@reactioncommerce/plugin-payments-example": "~1.0.0",
4344
"@reactioncommerce/plugin-simple-authorization": "~1.1.0",
44-
"@reactioncommerce/plugin-sitemap-generator": "~1.1.0",
45+
"@reactioncommerce/plugin-sitemap-generator": "~1.1.1",
4546
"@reactioncommerce/plugin-system-information": "~1.0.0",
4647
"@reactioncommerce/plugin-translations": "~1.0.0",
4748
"@reactioncommerce/random": "~1.0.2",
4849
"@reactioncommerce/reaction-error": "~1.0.1",
4950
"accounting-js": "~1.1.1",
50-
"apollo-server": "~2.9.4",
51-
"apollo-server-express": "~2.9.4",
52-
"body-parser": "~1.19.0",
53-
"cors": "~2.8.5",
54-
"cuid": "~2.1.6",
55-
"dataloader": "~1.4.0",
56-
"diehard": "~1.5.2",
57-
"ejson": "^2.2.0",
5851
"envalid": "~5.0.0",
59-
"express": "~4.17.1",
6052
"faker": "~4.1.0",
61-
"graphql": "~14.5.8",
62-
"graphql-fields": "~2.0.3",
63-
"graphql-iso-date": "~3.6.1",
53+
"graphql": "~14.6.0",
6454
"graphql-tools": "~4.0.5",
65-
"handlebars": "^4.7.2",
55+
"handlebars": "~4.7.6",
6656
"later": "~1.2.0",
6757
"lodash": "~4.17.15",
68-
"mongodb": "~3.3.4",
6958
"node-fetch": "~2.6.0",
70-
"object-hash": "~1.3.1",
71-
"promise-retry": "^1.1.1",
7259
"ramda": "~0.26.1",
7360
"semver": "~6.3.0",
7461
"sharp": "~0.23.1",

plugins.json

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"accounts": "@reactioncommerce/api-plugin-accounts",
3+
"addressValidation": "@reactioncommerce/api-plugin-address-validation",
4+
"addressValidationTest": "@reactioncommerce/api-plugin-address-validation-test",
5+
"authentication": "@reactioncommerce/plugin-authentication",
6+
"authorization": "@reactioncommerce/plugin-simple-authorization",
7+
"cart": "./src/core-services/cart/index.js",
8+
"catalogs": "@reactioncommerce/api-plugin-catalogs",
9+
"discountCodes": "@reactioncommerce/plugin-discount-codes",
10+
"discounts": "./src/core-services/discounts/index.js",
11+
"email": "./src/core-services/email/index.js",
12+
"emailTemplates": "./src/plugins/email-templates/index.js",
13+
"examplePayments": "@reactioncommerce/plugin-payments-example",
14+
"files": "./src/core-services/files/index.js",
15+
"i18": "@reactioncommerce/api-plugin-i18n",
16+
"inventory": "./src/core-services/inventory/index.js",
17+
"jobQueue": "@reactioncommerce/api-plugin-job-queue",
18+
"navigation": "@reactioncommerce/plugin-navigation",
19+
"notifications": "@reactioncommerce/api-plugin-notifications",
20+
"orders": "./src/core-services/orders/index.js",
21+
"payments": "./src/core-services/payments/index.js",
22+
"pricing": "./src/plugins/simple-pricing/index.js",
23+
"product": "./src/core-services/product/index.js",
24+
"sMTPEmail": "./src/plugins/email-smtp/index.js",
25+
"settings": "@reactioncommerce/api-plugin-settings",
26+
"shipping": "./src/core-services/shipping/index.js",
27+
"shippingRates": "./src/plugins/shipping-rates/index.js",
28+
"shops": "@reactioncommerce/api-plugin-shops",
29+
"simpleInventory": "./src/plugins/simple-inventory/index.js",
30+
"simpleSchema": "@reactioncommerce/api-plugin-simple-schema",
31+
"sitemapGenerator": "@reactioncommerce/plugin-sitemap-generator",
32+
"stripePayments": "./src/plugins/payments-stripe/index.js",
33+
"surcharges": "./src/plugins/surcharges/index.js",
34+
"systemInfo": "@reactioncommerce/plugin-system-information",
35+
"tags": "@reactioncommerce/api-plugin-tags",
36+
"taxes": "./src/core-services/taxes/index.js",
37+
"taxesRates": "./src/plugins/taxes-rates/index.js",
38+
"translations": "@reactioncommerce/plugin-translations"
39+
}

src/core-services/tags/i18n/en.json

-101
This file was deleted.

src/core-services/tags/i18n/index.js

-14
This file was deleted.

src/core-services/tags/i18n/pt.json

-101
This file was deleted.

src/core-services/tags/index.js

-44
This file was deleted.

src/core-services/tags/mutations/__snapshots__/addTag.test.js.snap

-3
This file was deleted.

src/core-services/tags/mutations/__snapshots__/removeTag.test.js.snap

-3
This file was deleted.

src/core-services/tags/mutations/__snapshots__/updateTag.test.js.snap

-3
This file was deleted.

0 commit comments

Comments
 (0)