Merge pull request #124 from ShipEngine/PLAT-1587-generated-files-cha…

…nges-only don't copy files that are unnecessary for order apps
ShipEngine · Jan 20, 2021 · 02ef103 · 02ef103
2 parents 56b84d7 + e47ab7a
commit 02ef103
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 28 deletions.
diff --git a/src/core/generators/apps-new.ts b/src/core/generators/apps-new.ts
@@ -258,13 +258,6 @@ class AppsNew extends Generator {
       );
     }
 
-
-    this.fs.copyTpl(
-      this.templatePath("connect.config.js"),
-      this.destinationPath("connect.config.js"),
-      this,
-    );
-
     if (this.fs.exists(this.destinationPath("./package.json"))) {
       fixpack(
         this.destinationPath("./package.json"),
@@ -277,12 +270,6 @@ class AppsNew extends Generator {
       sortPjson(this.pjson),
     );
 
-    this.fs.copyTpl(
-      this.templatePath("connect.config.js"),
-      this.destinationPath("connect.config.js"),
-      this,
-    );
-
     this.fs.copyTpl(
       this.templatePath("README.md.ejs"),
       this.destinationPath("README.md"),
@@ -308,6 +295,12 @@ class AppsNew extends Generator {
 
     switch (this.type) {
       case AppType.Carrier:
+        this.fs.copyTpl(
+          this.templatePath("connect.config.js"),
+          this.destinationPath("connect.config.js"),
+          this,
+        );
+
         if (!fs.existsSync("src")) {
           this.fs.copyTpl(
             this.templatePath(`carrier/index.${this._definitionExt}`),
@@ -468,14 +461,6 @@ class AppsNew extends Generator {
             this,
           );
 
-          this.fs.copyTpl(
-            this.templatePath(
-              `order-source/forms/settings.${this._definitionExt}`,
-            ),
-            this.destinationPath(`src/forms/settings.${this._definitionExt}`),
-            this,
-          );
-
           this.fs.copyTpl(
             this.templatePath(
               `order-source/methods/get-sales-order-by-date.${this._codeExt}`,

diff --git a/templates/order-source/index.yaml b/templates/order-source/index.yaml
@@ -5,7 +5,6 @@ websiteURL: https://www.order-source.com
 logo: ./logo.svg
 icon: ./logo.svg
 connectionForm: ./forms/connect.yaml
-settingsForm": ./forms/settings.yaml
 
 getSalesOrdersByDate: ./methods/get-sales-order-by-date.<%- _codeExt %>
 shipmentCreated: ./methods/shipment-created.<%- _codeExt %>

diff --git a/test/specs/core/generators/apps-new.spec.js b/test/specs/core/generators/apps-new.spec.js
@@ -346,7 +346,6 @@ describe("new generator", () => {
               "src/methods/shipment-created.js",
               "src/methods/acknowledge-orders.js",
               "src/forms/connect.yaml",
-              "src/forms/settings.yaml",
               "README.md",
               ".npmignore",
               "package.json",
@@ -389,7 +388,6 @@ describe("new generator", () => {
               "src/methods/shipment-created.ts",
               "src/methods/acknowledge-orders.ts",
               "src/forms/connect.ts",
-              "src/forms/settings.ts",
               "README.md",
               ".npmignore",
               "package.json",
@@ -434,7 +432,6 @@ describe("new generator", () => {
               "src/methods/shipment-created.ts",
               "src/methods/acknowledge-orders.ts",
               "src/forms/connect.json",
-              "src/forms/settings.json",
               "README.md",
               "package.json",
               ".npmignore",
@@ -478,7 +475,6 @@ describe("new generator", () => {
               "src/methods/shipment-created.ts",
               "src/methods/acknowledge-orders.ts",
               "src/forms/connect.yaml",
-              "src/forms/settings.yaml",
               "README.md",
               "package.json",
               ".npmignore",
@@ -523,7 +519,6 @@ describe("new generator", () => {
               "src/methods/shipment-created.js",
               "src/methods/acknowledge-orders.js",
               "src/forms/connect.json",
-              "src/forms/settings.json",
               "README.md",
               ".npmignore",
               "package.json",
@@ -565,7 +560,6 @@ describe("new generator", () => {
               "src/methods/shipment-created.js",
               "src/methods/acknowledge-orders.js",
               "src/forms/connect.yaml",
-              "src/forms/settings.yaml",
               "README.md",
               ".npmignore",
               "package.json",