Merge pull request #6219 from reactioncommerce/refactor-aldeed-moveEm…

…ailTemplatesPlugin refactor: move email-templates plugin to NPM pkg
reactioncommerce · Apr 22, 2020 · 520b4ab · 520b4ab
2 parents 1b009ac + 76df8ed
commit 520b4ab
Show file tree

Hide file tree

Showing 39 changed files with 34 additions and 3,476 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -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
 
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/jest.config.cjs b/jest.config.cjs
@@ -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",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -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",

diff --git a/plugins.json b/plugins.json
@@ -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",

diff --git a/src/plugins/email-templates/index.js b/src/plugins/email-templates/index.js
diff --git a/src/plugins/email-templates/mutations/index.js b/src/plugins/email-templates/mutations/index.js
diff --git a/src/plugins/email-templates/mutations/renderEmail.js b/src/plugins/email-templates/mutations/renderEmail.js
diff --git a/src/plugins/email-templates/mutations/updateTemplate.js b/src/plugins/email-templates/mutations/updateTemplate.js
diff --git a/src/plugins/email-templates/policies.json b/src/plugins/email-templates/policies.json
diff --git a/src/plugins/email-templates/queries/emailTemplates.js b/src/plugins/email-templates/queries/emailTemplates.js
diff --git a/src/plugins/email-templates/queries/index.js b/src/plugins/email-templates/queries/index.js
diff --git a/src/plugins/email-templates/resolvers/Mutation/index.js b/src/plugins/email-templates/resolvers/Mutation/index.js
diff --git a/src/plugins/email-templates/resolvers/Mutation/updateTemplate.js b/src/plugins/email-templates/resolvers/Mutation/updateTemplate.js
diff --git a/src/plugins/email-templates/resolvers/Query/emailTemplates.js b/src/plugins/email-templates/resolvers/Query/emailTemplates.js
diff --git a/src/plugins/email-templates/resolvers/Query/index.js b/src/plugins/email-templates/resolvers/Query/index.js
diff --git a/src/plugins/email-templates/resolvers/Template/index.js b/src/plugins/email-templates/resolvers/Template/index.js
diff --git a/src/plugins/email-templates/resolvers/index.js b/src/plugins/email-templates/resolvers/index.js
diff --git a/src/plugins/email-templates/schemas/index.js b/src/plugins/email-templates/schemas/index.js