From 537200e54872fba109b59f0b41bb30368c8a7f8b Mon Sep 17 00:00:00 2001 From: Anthony Shull Date: Wed, 20 Jan 2021 11:39:32 -0600 Subject: [PATCH 1/2] don't copy files that are unnecessary for order apps --- src/core/generators/apps-new.ts | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/src/core/generators/apps-new.ts b/src/core/generators/apps-new.ts index 5d53bfb..87ec63a 100644 --- 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}`, From e47ab7aab65d6f29771734f391cb2a16e4d78fef Mon Sep 17 00:00:00 2001 From: Anthony Shull Date: Wed, 20 Jan 2021 11:50:47 -0600 Subject: [PATCH 2/2] tests --- templates/order-source/index.yaml | 1 - test/specs/core/generators/apps-new.spec.js | 6 ------ 2 files changed, 7 deletions(-) diff --git a/templates/order-source/index.yaml b/templates/order-source/index.yaml index ac781f6..8ec74ff 100644 --- 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 index 9ebd17f..3c16d57 100644 --- 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",