Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: move email-templates plugin to NPM pkg #6219

Merged
merged 5 commits into from
Apr 22, 2020
Merged

refactor: move email-templates plugin to NPM pkg #6219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e95d731
refactor: move email-templates plugin to NPM pkg
aldeed Apr 21, 2020
13d6918
refactor: add email-templates to lock file
aldeed Apr 21, 2020
fbe9329
chore: update CI node_modules cache
aldeed Apr 21, 2020
9e5000e
chore: empty commit
aldeed Apr 21, 2020
76df8ed
Merge branch 'trunk' into refactor-aldeed-moveEmailTemplatesPlugin
kieckhafer Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ jobs:
- checkout
- restore_cache:
keys:
- reaction-v4-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- reaction-v4-node-modules-{{ .Branch }}
- reaction-v5-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- reaction-v5-node-modules-{{ .Branch }}
- run:
name: Install NPM dependencies
command: npm ci
- save_cache:
key: reaction-v4-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
key: reaction-v5-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
paths:
- node_modules
- save_cache:
key: reaction-v4-node-modules-{{ .Branch }}
key: reaction-v5-node-modules-{{ .Branch }}
paths:
- node_modules

Expand All @@ -49,8 +49,8 @@ jobs:
- checkout
- restore_cache:
keys:
- reaction-v4-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- reaction-v4-node-modules-{{ .Branch }}
- reaction-v5-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- reaction-v5-node-modules-{{ .Branch }}
- run:
name: Lint JavaScript
command: npm run lint
Expand All @@ -61,8 +61,8 @@ jobs:
- checkout
- restore_cache:
keys:
- reaction-v4-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- reaction-v4-node-modules-{{ .Branch }}
- reaction-v5-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- reaction-v5-node-modules-{{ .Branch }}
- run:
name: Lint GraphQL schemas
command: npm run lint:gql
Expand All @@ -73,8 +73,8 @@ jobs:
- checkout
- restore_cache:
keys:
- reaction-v4-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- reaction-v4-node-modules-{{ .Branch }}
- reaction-v5-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- reaction-v5-node-modules-{{ .Branch }}
- run:
name: Run Unit Tests
command: npm run test:unit
Expand All @@ -92,8 +92,8 @@ jobs:
- checkout
- restore_cache:
keys:
- reaction-v4-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- reaction-v4-node-modules-{{ .Branch }}
- reaction-v5-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- reaction-v5-node-modules-{{ .Branch }}
- run:
name: Run Integration Query Tests
command: MONGO_URL=mongodb://localhost:27017/test npm run test:integration:query
Expand All @@ -111,8 +111,8 @@ jobs:
- checkout
- restore_cache:
keys:
- reaction-v4-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- reaction-v4-node-modules-{{ .Branch }}
- reaction-v5-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- reaction-v5-node-modules-{{ .Branch }}
- run:
name: Run Integration Mutation Tests
command: MONGO_URL=mongodb://localhost:27017/test npm run test:integration:mutation
Expand Down
1 change: 1 addition & 0 deletions jest.config.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const externalNodeModules = [
"@reactioncommerce/api-plugin-carts",
"@reactioncommerce/api-plugin-catalogs",
"@reactioncommerce/api-plugin-email",
"@reactioncommerce/api-plugin-email-templates",
"@reactioncommerce/api-plugin-i18n",
"@reactioncommerce/api-plugin-job-queue",
"@reactioncommerce/api-plugin-notifications",
Expand Down
13 changes: 13 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"@reactioncommerce/api-plugin-carts": "^1.0.0",
"@reactioncommerce/api-plugin-catalogs": "~1.0.0",
"@reactioncommerce/api-plugin-email": "~1.0.0",
"@reactioncommerce/api-plugin-email-templates": "~1.0.0",
"@reactioncommerce/api-plugin-i18n": "~1.0.0",
"@reactioncommerce/api-plugin-job-queue": "~1.0.0",
"@reactioncommerce/api-plugin-notifications": "~1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"discountCodes": "@reactioncommerce/plugin-discount-codes",
"discounts": "./src/core-services/discounts/index.js",
"email": "@reactioncommerce/api-plugin-email",
"emailTemplates": "./src/plugins/email-templates/index.js",
"emailTemplates": "@reactioncommerce/api-plugin-email-templates",
"examplePayments": "@reactioncommerce/plugin-payments-example",
"files": "./src/core-services/files/index.js",
"i18": "@reactioncommerce/api-plugin-i18n",
Expand Down
43 changes: 0 additions & 43 deletions src/plugins/email-templates/index.js
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions src/plugins/email-templates/mutations/index.js
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions src/plugins/email-templates/mutations/renderEmail.js
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions src/plugins/email-templates/mutations/updateTemplate.js
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/plugins/email-templates/policies.json
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions src/plugins/email-templates/queries/emailTemplates.js
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/plugins/email-templates/queries/index.js
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/plugins/email-templates/resolvers/Mutation/index.js
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions src/plugins/email-templates/resolvers/Mutation/updateTemplate.js
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/plugins/email-templates/resolvers/Query/emailTemplates.js
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/plugins/email-templates/resolvers/Query/index.js
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/plugins/email-templates/resolvers/Template/index.js
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/plugins/email-templates/resolvers/index.js
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/plugins/email-templates/schemas/index.js
View file
Open in desktop

This file was deleted.

Loading