From 4fbdfd51a26610726d02e0812cf929fc11f3fc2b Mon Sep 17 00:00:00 2001 From: Martyn Janes Date: Mon, 7 Aug 2017 11:23:36 +0300 Subject: [PATCH] Rationalised logging/display interfaces --- CHANGELOG.md | 5 + .../javascript/jasmine/app.spec.js | 2 +- .../javascript/mocha-chai/app.spec.js | 2 +- .../typescript/jasmine/app.spec.ts | 2 +- .../typescript/mocha-chai/app.spec.ts | 2 +- .../javascript/jasmine/app.spec.js | 2 +- .../javascript/mocha-chai/app.spec.js | 2 +- .../typescript/jasmine/app.spec.ts | 2 +- .../typescript/mocha-chai/app.spec.ts | 2 +- .../javascript/jasmine/app.spec.js | 2 +- .../javascript/mocha-chai/app.spec.js | 2 +- .../typescript/jasmine/app.spec.ts | 2 +- .../typescript/mocha-chai/app.spec.ts | 2 +- .../javascript/jasmine/app.spec.js | 2 +- .../javascript/mocha-chai/app.spec.js | 2 +- .../typescript/jasmine/app.spec.ts | 2 +- .../typescript/mocha-chai/app.spec.ts | 2 +- .../javascript/jasmine/app.spec.js | 2 +- .../javascript/mocha-chai/app.spec.js | 2 +- .../typescript/jasmine/app.spec.ts | 2 +- .../typescript/mocha-chai/app.spec.ts | 2 +- .../javascript/jasmine/app.spec.js | 2 +- .../javascript/mocha-chai/app.spec.js | 2 +- .../typescript/jasmine/app.spec.ts | 2 +- .../typescript/mocha-chai/app.spec.ts | 2 +- assets/gulp/tasks/util/unite-config.js | 2 +- dist/engine/engine.d.ts | 4 +- dist/engine/engine.js | 114 +++++++-------- dist/engine/enginePipelineStepBase.d.ts | 15 +- dist/engine/enginePipelineStepBase.js | 26 ++-- dist/interfaces/IEnginePipelineStep.d.ts | 5 +- dist/packageManagers/npmPackageManager.d.ts | 4 +- dist/packageManagers/npmPackageManager.js | 11 +- dist/packageManagers/yarnPackageManager.d.ts | 4 +- dist/packageManagers/yarnPackageManager.js | 17 +-- .../applicationFramework/aurelia.d.ts | 5 +- .../applicationFramework/aurelia.js | 21 ++- .../applicationFramework/plainApp.d.ts | 3 +- .../applicationFramework/plainApp.js | 12 +- .../applicationFramework/react.d.ts | 3 +- .../applicationFramework/react.js | 12 +- .../sharedAppFramework.d.ts | 13 +- .../sharedAppFramework.js | 65 ++++----- dist/pipelineSteps/bundler/browserify.d.ts | 5 +- dist/pipelineSteps/bundler/browserify.js | 9 +- dist/pipelineSteps/bundler/requireJs.d.ts | 5 +- dist/pipelineSteps/bundler/requireJs.js | 9 +- .../bundler/systemJsBuilder.d.ts | 5 +- dist/pipelineSteps/bundler/systemJsBuilder.js | 9 +- dist/pipelineSteps/bundler/webpack.d.ts | 5 +- dist/pipelineSteps/bundler/webpack.js | 9 +- dist/pipelineSteps/content/assetsSource.d.ts | 3 +- dist/pipelineSteps/content/assetsSource.js | 18 +-- dist/pipelineSteps/content/gitIgnore.d.ts | 3 +- dist/pipelineSteps/content/gitIgnore.js | 10 +- dist/pipelineSteps/content/htmlTemplate.d.ts | 5 +- dist/pipelineSteps/content/htmlTemplate.js | 16 +- dist/pipelineSteps/content/license.d.ts | 3 +- dist/pipelineSteps/content/license.js | 9 +- dist/pipelineSteps/content/packageJson.d.ts | 3 +- dist/pipelineSteps/content/packageJson.js | 13 +- dist/pipelineSteps/content/readMe.d.ts | 3 +- dist/pipelineSteps/content/readMe.js | 10 +- .../cssPostProcessor/postCss.d.ts | 3 +- .../pipelineSteps/cssPostProcessor/postCss.js | 12 +- .../cssPostProcessor/postCssNone.d.ts | 3 +- .../cssPostProcessor/postCssNone.js | 4 +- dist/pipelineSteps/cssPreProcessor/css.d.ts | 3 +- dist/pipelineSteps/cssPreProcessor/css.js | 9 +- dist/pipelineSteps/cssPreProcessor/less.d.ts | 3 +- dist/pipelineSteps/cssPreProcessor/less.js | 9 +- dist/pipelineSteps/cssPreProcessor/sass.d.ts | 3 +- dist/pipelineSteps/cssPreProcessor/sass.js | 9 +- .../pipelineSteps/cssPreProcessor/stylus.d.ts | 3 +- dist/pipelineSteps/cssPreProcessor/stylus.js | 9 +- .../e2eTestRunner/protractor.d.ts | 3 +- .../pipelineSteps/e2eTestRunner/protractor.js | 12 +- .../e2eTestRunner/webdriverIo.d.ts | 3 +- .../e2eTestRunner/webdriverIo.js | 12 +- dist/pipelineSteps/language/babel.d.ts | 3 +- dist/pipelineSteps/language/babel.js | 12 +- dist/pipelineSteps/language/typeScript.d.ts | 3 +- dist/pipelineSteps/language/typeScript.js | 10 +- dist/pipelineSteps/lint/esLint.d.ts | 5 +- dist/pipelineSteps/lint/esLint.js | 25 ++-- dist/pipelineSteps/lint/tsLint.d.ts | 5 +- dist/pipelineSteps/lint/tsLint.js | 17 +-- dist/pipelineSteps/moduleType/amd.d.ts | 3 +- dist/pipelineSteps/moduleType/amd.js | 9 +- dist/pipelineSteps/moduleType/commonJs.d.ts | 3 +- dist/pipelineSteps/moduleType/commonJs.js | 9 +- dist/pipelineSteps/moduleType/systemJs.d.ts | 3 +- dist/pipelineSteps/moduleType/systemJs.js | 9 +- dist/pipelineSteps/scaffold/appScaffold.d.ts | 3 +- dist/pipelineSteps/scaffold/appScaffold.js | 9 +- .../scaffold/e2eTestScaffold.d.ts | 3 +- .../pipelineSteps/scaffold/e2eTestScaffold.js | 9 +- .../scaffold/outputDirectory.d.ts | 3 +- .../pipelineSteps/scaffold/outputDirectory.js | 13 +- .../scaffold/unitTestScaffold.d.ts | 3 +- .../scaffold/unitTestScaffold.js | 9 +- .../uniteConfigurationDirectories.d.ts | 3 +- .../scaffold/uniteConfigurationDirectories.js | 9 +- .../scaffold/uniteConfigurationJson.d.ts | 3 +- .../scaffold/uniteConfigurationJson.js | 11 +- .../scaffold/uniteThemeConfigurationJson.d.ts | 3 +- .../scaffold/uniteThemeConfigurationJson.js | 11 +- dist/pipelineSteps/server/browserSync.d.ts | 3 +- dist/pipelineSteps/server/browserSync.js | 9 +- dist/pipelineSteps/taskManager/gulp.d.ts | 15 +- dist/pipelineSteps/taskManager/gulp.js | 138 +++++++++--------- dist/pipelineSteps/testFramework/jasmine.d.ts | 3 +- dist/pipelineSteps/testFramework/jasmine.js | 9 +- .../testFramework/mochaChai.d.ts | 3 +- dist/pipelineSteps/testFramework/mochaChai.js | 7 +- dist/pipelineSteps/unitTestRunner/karma.d.ts | 3 +- dist/pipelineSteps/unitTestRunner/karma.js | 14 +- package.json | 14 +- src/engine/engine.ts | 118 +++++++-------- src/engine/enginePipelineStepBase.ts | 29 +--- src/interfaces/IEnginePipelineStep.ts | 3 - src/packageManagers/npmPackageManager.ts | 11 +- src/packageManagers/yarnPackageManager.ts | 17 +-- .../applicationFramework/aurelia.ts | 18 +-- .../applicationFramework/plainApp.ts | 11 +- .../applicationFramework/react.ts | 11 +- .../sharedAppFramework.ts | 54 +++---- src/pipelineSteps/bundler/browserify.ts | 6 +- src/pipelineSteps/bundler/requireJs.ts | 6 +- src/pipelineSteps/bundler/systemJsBuilder.ts | 6 +- src/pipelineSteps/bundler/webpack.ts | 6 +- src/pipelineSteps/content/assetsSource.ts | 17 +-- src/pipelineSteps/content/gitIgnore.ts | 9 +- src/pipelineSteps/content/htmlTemplate.ts | 14 +- src/pipelineSteps/content/license.ts | 7 +- src/pipelineSteps/content/packageJson.ts | 11 +- src/pipelineSteps/content/readMe.ts | 9 +- src/pipelineSteps/cssPostProcessor/postCss.ts | 11 +- .../cssPostProcessor/postCssNone.ts | 3 +- src/pipelineSteps/cssPreProcessor/css.ts | 10 +- src/pipelineSteps/cssPreProcessor/less.ts | 10 +- src/pipelineSteps/cssPreProcessor/sass.ts | 10 +- src/pipelineSteps/cssPreProcessor/stylus.ts | 10 +- src/pipelineSteps/e2eTestRunner/protractor.ts | 11 +- .../e2eTestRunner/webdriverIo.ts | 11 +- src/pipelineSteps/language/babel.ts | 11 +- src/pipelineSteps/language/typeScript.ts | 9 +- src/pipelineSteps/lint/esLint.ts | 22 ++- src/pipelineSteps/lint/tsLint.ts | 14 +- src/pipelineSteps/moduleType/amd.ts | 7 +- src/pipelineSteps/moduleType/commonJs.ts | 7 +- src/pipelineSteps/moduleType/systemJs.ts | 7 +- src/pipelineSteps/scaffold/appScaffold.ts | 7 +- src/pipelineSteps/scaffold/e2eTestScaffold.ts | 7 +- src/pipelineSteps/scaffold/outputDirectory.ts | 11 +- .../scaffold/unitTestScaffold.ts | 7 +- .../scaffold/uniteConfigurationDirectories.ts | 7 +- .../scaffold/uniteConfigurationJson.ts | 9 +- .../scaffold/uniteThemeConfigurationJson.ts | 9 +- src/pipelineSteps/server/browserSync.ts | 7 +- src/pipelineSteps/taskManager/gulp.ts | 131 +++++++++-------- src/pipelineSteps/testFramework/jasmine.ts | 7 +- src/pipelineSteps/testFramework/mochaChai.ts | 5 +- src/pipelineSteps/unitTestRunner/karma.ts | 13 +- 164 files changed, 806 insertions(+), 997 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e798cab..7eaed0b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# v0.7.1 +* Rationalised logging/display interfaces +* Renamed repo to engine +* Moved unite.json up one level + # v0.7.0 * Main command is now "configure" not "init" as it can be run repeatedly * Main app now created in www sub directory in preparation for platform wrappers diff --git a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/jasmine/app.spec.js b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/jasmine/app.spec.js index 976b78bd..fcbf0481 100644 --- a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/jasmine/app.spec.js +++ b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/jasmine/app.spec.js @@ -3,7 +3,7 @@ */ describe("App", () => { it("the title is set", (done) => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); browser.loadAndWaitForAureliaPage("/") .then(() => { browser.getTitle() diff --git a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/mocha-chai/app.spec.js b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/mocha-chai/app.spec.js index 0faef314..8d82277e 100644 --- a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/mocha-chai/app.spec.js +++ b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/mocha-chai/app.spec.js @@ -5,7 +5,7 @@ import {expect} from "chai"; describe("App", () => { it("the title is set", (done) => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); browser.loadAndWaitForAureliaPage("/") .then(() => { browser.getTitle() diff --git a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/jasmine/app.spec.ts b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/jasmine/app.spec.ts index 522377a8..4dca8a1b 100644 --- a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/jasmine/app.spec.ts +++ b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/jasmine/app.spec.ts @@ -5,7 +5,7 @@ import { $, browser, by } from "protractor"; describe("App", () => { it("the title is set", (done) => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); browser.loadAndWaitForAureliaPage("/") .then(() => { browser.getTitle() diff --git a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/mocha-chai/app.spec.ts b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/mocha-chai/app.spec.ts index fd7c10e3..6ad9fdbe 100644 --- a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/mocha-chai/app.spec.ts +++ b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/mocha-chai/app.spec.ts @@ -6,7 +6,7 @@ import { $, browser, by } from "protractor"; describe("App", () => { it("the title is set", (done) => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); browser.loadAndWaitForAureliaPage("/") .then(() => { browser.getTitle() diff --git a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/jasmine/app.spec.js b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/jasmine/app.spec.js index 0914181e..eb5d47d3 100644 --- a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/jasmine/app.spec.js +++ b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/jasmine/app.spec.js @@ -3,7 +3,7 @@ */ describe("App", () => { it("the title is set", () => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); return browser .url("/") .getTitle() diff --git a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/mocha-chai/app.spec.js b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/mocha-chai/app.spec.js index 7a9e2d2f..0ad4e139 100644 --- a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/mocha-chai/app.spec.js +++ b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/mocha-chai/app.spec.js @@ -5,7 +5,7 @@ import {expect} from "chai"; describe("App", () => { it("the title is set", () => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); return browser .url("/") .getTitle() diff --git a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/jasmine/app.spec.ts b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/jasmine/app.spec.ts index bd1406ad..661c1d3e 100644 --- a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/jasmine/app.spec.ts +++ b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/jasmine/app.spec.ts @@ -4,7 +4,7 @@ /// describe("App", () => { it("the title is set", () => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); return browser .url("/") .getTitle() diff --git a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/mocha-chai/app.spec.ts b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/mocha-chai/app.spec.ts index 5713d024..75a26cf4 100644 --- a/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/mocha-chai/app.spec.ts +++ b/assets/appFramework/aurelia/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/mocha-chai/app.spec.ts @@ -6,7 +6,7 @@ import { expect } from "chai"; describe("App", () => { it("the title is set", () => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); return browser .url("/") .getTitle() diff --git a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/jasmine/app.spec.js b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/jasmine/app.spec.js index dfe9da9e..a35091de 100644 --- a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/jasmine/app.spec.js +++ b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/jasmine/app.spec.js @@ -3,7 +3,7 @@ */ describe("App", () => { it("the title is set", (done) => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); browser.get("/") .then(() => { browser.getTitle() diff --git a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/mocha-chai/app.spec.js b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/mocha-chai/app.spec.js index 9eb940f9..b83b8e18 100644 --- a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/mocha-chai/app.spec.js +++ b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/mocha-chai/app.spec.js @@ -5,7 +5,7 @@ import {expect} from "chai"; describe("App", () => { it("the title is set", (done) => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); browser.get("/") .then(() => { browser.getTitle() diff --git a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/jasmine/app.spec.ts b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/jasmine/app.spec.ts index 0f094576..0f3c7489 100644 --- a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/jasmine/app.spec.ts +++ b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/jasmine/app.spec.ts @@ -6,7 +6,7 @@ import { $, browser, by } from "protractor"; describe("App", () => { it("the title is set", (done) => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); browser.get("/") .then(() => { browser.getTitle() diff --git a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/mocha-chai/app.spec.ts b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/mocha-chai/app.spec.ts index 622a4940..32a69824 100644 --- a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/mocha-chai/app.spec.ts +++ b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/mocha-chai/app.spec.ts @@ -7,7 +7,7 @@ import { $, browser, by } from "protractor"; describe("App", () => { it("the title is set", (done) => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); browser.get("/") .then(() => { browser.getTitle() diff --git a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/jasmine/app.spec.js b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/jasmine/app.spec.js index d1128629..c3460ac3 100644 --- a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/jasmine/app.spec.js +++ b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/jasmine/app.spec.js @@ -3,7 +3,7 @@ */ describe("App", () => { it("the title is set", () => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); return browser .url("/") .getTitle() diff --git a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/mocha-chai/app.spec.js b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/mocha-chai/app.spec.js index 4f338bca..97730351 100644 --- a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/mocha-chai/app.spec.js +++ b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/mocha-chai/app.spec.js @@ -5,7 +5,7 @@ import {expect} from "chai"; describe("App", () => { it("the title is set", () => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); return browser .url("/") .getTitle() diff --git a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/jasmine/app.spec.ts b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/jasmine/app.spec.ts index f01612b2..0bc2432e 100644 --- a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/jasmine/app.spec.ts +++ b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/jasmine/app.spec.ts @@ -4,7 +4,7 @@ /// describe("App", () => { it("the title is set", () => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); return browser .url("/") .getTitle() diff --git a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/mocha-chai/app.spec.ts b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/mocha-chai/app.spec.ts index 3e766672..a3ba9efa 100644 --- a/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/mocha-chai/app.spec.ts +++ b/assets/appFramework/plainapp/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/mocha-chai/app.spec.ts @@ -6,7 +6,7 @@ import { expect } from "chai"; describe("App", () => { it("the title is set", () => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); return browser .url("/") .getTitle() diff --git a/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/jasmine/app.spec.js b/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/jasmine/app.spec.js index 57b4ed44..1b0c71b3 100644 --- a/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/jasmine/app.spec.js +++ b/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/jasmine/app.spec.js @@ -3,7 +3,7 @@ */ describe("App", () => { it("the title is set", (done) => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); browser.get("/") .then(() => { browser.getTitle() diff --git a/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/mocha-chai/app.spec.js b/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/mocha-chai/app.spec.js index 5d0dc051..0659854e 100644 --- a/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/mocha-chai/app.spec.js +++ b/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/javascript/mocha-chai/app.spec.js @@ -5,7 +5,7 @@ import { expect } from "chai"; describe("App", () => { it("the title is set", (done) => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); browser.get("/") .then(() => { browser.getTitle() diff --git a/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/jasmine/app.spec.ts b/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/jasmine/app.spec.ts index 7d05182c..2532524b 100644 --- a/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/jasmine/app.spec.ts +++ b/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/jasmine/app.spec.ts @@ -6,7 +6,7 @@ import { $, browser, by } from "protractor"; describe("App", () => { it("the title is set", (done) => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); browser.get("/") .then(() => { browser.getTitle() diff --git a/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/mocha-chai/app.spec.ts b/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/mocha-chai/app.spec.ts index 7f1dbacd..1ada7b83 100644 --- a/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/mocha-chai/app.spec.ts +++ b/assets/appFramework/react/test/e2e/src/e2eTestRunner/protractor/sourceLanguage/typescript/mocha-chai/app.spec.ts @@ -7,7 +7,7 @@ import { $, browser, by } from "protractor"; describe("App", () => { it("the title is set", (done) => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); browser.get("/") .then(() => { browser.getTitle() diff --git a/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/jasmine/app.spec.js b/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/jasmine/app.spec.js index c2c7a974..7fb45b1f 100644 --- a/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/jasmine/app.spec.js +++ b/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/jasmine/app.spec.js @@ -3,7 +3,7 @@ */ describe("App", () => { it("the title is set", () => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); return browser .url("/") .getTitle() diff --git a/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/mocha-chai/app.spec.js b/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/mocha-chai/app.spec.js index 85f02116..4b003aa3 100644 --- a/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/mocha-chai/app.spec.js +++ b/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/javascript/mocha-chai/app.spec.js @@ -5,7 +5,7 @@ import {expect} from "chai"; describe("App", () => { it("the title is set", () => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); return browser .url("/") .getTitle() diff --git a/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/jasmine/app.spec.ts b/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/jasmine/app.spec.ts index 72696daa..9242f475 100644 --- a/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/jasmine/app.spec.ts +++ b/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/jasmine/app.spec.ts @@ -4,7 +4,7 @@ /// describe("App", () => { it("the title is set", () => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); return browser .url("/") .getTitle() diff --git a/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/mocha-chai/app.spec.ts b/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/mocha-chai/app.spec.ts index 5b2c9c67..ed45c5e7 100644 --- a/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/mocha-chai/app.spec.ts +++ b/assets/appFramework/react/test/e2e/src/e2eTestRunner/webdriverio/sourceLanguage/typescript/mocha-chai/app.spec.ts @@ -6,7 +6,7 @@ import { expect } from "chai"; describe("App", () => { it("the title is set", () => { - const uniteJson = require("../../../unite.json"); + const uniteJson = require("../../../../unite.json"); return browser .url("/") .getTitle() diff --git a/assets/gulp/tasks/util/unite-config.js b/assets/gulp/tasks/util/unite-config.js index 270eb789..f3ae5160 100644 --- a/assets/gulp/tasks/util/unite-config.js +++ b/assets/gulp/tasks/util/unite-config.js @@ -8,7 +8,7 @@ const util = require("util"); async function getUniteConfig () { try { - const data = await util.promisify(fs.readFile)("./unite.json"); + const data = await util.promisify(fs.readFile)("../unite.json"); return JSON.parse(data.toString()); } catch (err) { display.error("Reading unite.json", err); diff --git a/dist/engine/engine.d.ts b/dist/engine/engine.d.ts index f78d29ff..db21cf72 100644 --- a/dist/engine/engine.d.ts +++ b/dist/engine/engine.d.ts @@ -1,4 +1,3 @@ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { IncludeMode } from "../configuration/models/unite/includeMode"; @@ -19,11 +18,10 @@ import { IEngine } from "../interfaces/IEngine"; import { ModuleOperation } from "../interfaces/moduleOperation"; export declare class Engine implements IEngine { private _logger; - private _display; private _fileSystem; private _coreRoot; private _assetsFolder; - constructor(logger: ILogger, display: IDisplay, fileSystem: IFileSystem); + constructor(logger: ILogger, fileSystem: IFileSystem); configure(packageName: string | undefined | null, title: string | undefined | null, license: string | undefined | null, sourceLanguage: UniteSourceLanguage | undefined | null, moduleType: UniteModuleType | undefined | null, bundler: UniteBundler | undefined | null, unitTestRunner: UniteUnitTestRunner | undefined | null, unitTestFramework: UniteUnitTestFramework | undefined | null, e2eTestRunner: UniteE2eTestRunner | undefined | null, e2eTestFramework: UniteE2eTestFramework | undefined | null, linter: UniteLinter | undefined | null, cssPre: UniteCssPreProcessor | undefined | null, cssPost: UniteCssPostProcessor | undefined | null, packageManager: UnitePackageManager | undefined | null, applicationFramework: UniteApplicationFramework | undefined | null, outputDirectory: string | undefined | null): Promise; clientPackage(operation: ModuleOperation | undefined | null, packageName: string | undefined | null, version: string | undefined | null, preload: boolean, includeMode: IncludeMode | undefined | null, main: string | undefined | null, mainMinified: string | undefined | null, isPackage: boolean, wrapAssets: string | undefined | null, packageManager: UnitePackageManager | undefined | null, outputDirectory: string | undefined | null): Promise; buildConfiguration(operation: BuildConfigurationOperation | undefined | null, configurationName: string | undefined | null, bundle: boolean, minify: boolean, sourcemaps: boolean, outputDirectory: string | undefined | null): Promise; diff --git a/dist/engine/engine.js b/dist/engine/engine.js index a359267f..b4c66ae4 100644 --- a/dist/engine/engine.js +++ b/dist/engine/engine.js @@ -59,9 +59,8 @@ const mochaChai_1 = require("../pipelineSteps/testFramework/mochaChai"); const karma_1 = require("../pipelineSteps/unitTestRunner/karma"); const engineVariables_1 = require("./engineVariables"); class Engine { - constructor(logger, display, fileSystem) { + constructor(logger, fileSystem) { this._logger = logger; - this._display = display; this._fileSystem = fileSystem; this._coreRoot = fileSystem.pathCombine(__dirname, "../../"); this._assetsFolder = fileSystem.pathCombine(this._coreRoot, "/assets/"); @@ -92,16 +91,16 @@ class Engine { uniteConfiguration.cssPre = cssPre || uniteConfiguration.cssPre; uniteConfiguration.cssPost = cssPost || uniteConfiguration.cssPost; uniteConfiguration.buildConfigurations = uniteConfiguration.buildConfigurations || {}; - if (!parameterValidation_1.ParameterValidation.checkPackageName(this._display, "packageName", uniteConfiguration.packageName)) { + if (!parameterValidation_1.ParameterValidation.checkPackageName(this._logger, "packageName", uniteConfiguration.packageName)) { return 1; } - if (!parameterValidation_1.ParameterValidation.notEmpty(this._display, "title", uniteConfiguration.title)) { + if (!parameterValidation_1.ParameterValidation.notEmpty(this._logger, "title", uniteConfiguration.title)) { return 1; } let spdxLicense; try { const licenseData = yield this._fileSystem.fileReadJson(this._assetsFolder, "spdx-full.json"); - if (!parameterValidation_1.ParameterValidation.contains(this._display, "license", Object.keys(licenseData), uniteConfiguration.license, "does not match any of the possible SPDX license values (see https://spdx.org/licenses/).")) { + if (!parameterValidation_1.ParameterValidation.contains(this._logger, "license", Object.keys(licenseData), uniteConfiguration.license, "does not match any of the possible SPDX license values (see https://spdx.org/licenses/).")) { return 1; } else { @@ -109,50 +108,50 @@ class Engine { } } catch (e) { - this._display.error("There was a problem reading the spdx-full.json file", e); + this._logger.error("There was a problem reading the spdx-full.json file", e); return 1; } - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "sourceLanguage", uniteConfiguration.sourceLanguage, ["JavaScript", "TypeScript"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "sourceLanguage", uniteConfiguration.sourceLanguage, ["JavaScript", "TypeScript"])) { return 1; } - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "moduleType", uniteConfiguration.moduleType, ["AMD", "CommonJS", "SystemJS"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "moduleType", uniteConfiguration.moduleType, ["AMD", "CommonJS", "SystemJS"])) { return 1; } - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "bundler", uniteConfiguration.bundler, ["Browserify", "RequireJS", "SystemJSBuilder", "Webpack"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "bundler", uniteConfiguration.bundler, ["Browserify", "RequireJS", "SystemJSBuilder", "Webpack"])) { return 1; } - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "unitTestRunner", uniteConfiguration.unitTestRunner, ["None", "Karma"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "unitTestRunner", uniteConfiguration.unitTestRunner, ["None", "Karma"])) { return 1; } if (unitTestRunner !== "None") { - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "unitTestFramework", uniteConfiguration.unitTestFramework, ["Mocha-Chai", "Jasmine"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "unitTestFramework", uniteConfiguration.unitTestFramework, ["Mocha-Chai", "Jasmine"])) { return 1; } } - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "e2eTestRunner", uniteConfiguration.e2eTestRunner, ["None", "WebdriverIO", "Protractor"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "e2eTestRunner", uniteConfiguration.e2eTestRunner, ["None", "WebdriverIO", "Protractor"])) { return 1; } if (e2eTestRunner !== "None") { - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "e2eTestFramework", uniteConfiguration.e2eTestFramework, ["Mocha-Chai", "Jasmine"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "e2eTestFramework", uniteConfiguration.e2eTestFramework, ["Mocha-Chai", "Jasmine"])) { return 1; } } - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "linter", uniteConfiguration.linter, ["None", "ESLint", "TSLint"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "linter", uniteConfiguration.linter, ["None", "ESLint", "TSLint"])) { return 1; } - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "cssPre", uniteConfiguration.cssPre, ["Css", "Less", "Sass", "Stylus"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "cssPre", uniteConfiguration.cssPre, ["Css", "Less", "Sass", "Stylus"])) { return 1; } - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "cssPost", uniteConfiguration.cssPost, ["None", "PostCss"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "cssPost", uniteConfiguration.cssPost, ["None", "PostCss"])) { return 1; } - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "packageManager", uniteConfiguration.packageManager, ["Npm", "Yarn"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "packageManager", uniteConfiguration.packageManager, ["Npm", "Yarn"])) { return 1; } - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "applicationFramework", uniteConfiguration.applicationFramework, ["PlainApp", "Aurelia", "React"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "applicationFramework", uniteConfiguration.applicationFramework, ["PlainApp", "Aurelia", "React"])) { return 1; } - this._display.log(""); + this._logger.info(""); return this.configureRun(outputDirectory, uniteConfiguration, spdxLicense); }); } @@ -164,23 +163,23 @@ class Engine { includeMode = "both"; } if (!uniteConfiguration) { - this._display.error("There is no unite.json to configure."); + this._logger.error("There is no unite.json to configure."); return 1; } else { uniteConfiguration.clientPackages = uniteConfiguration.clientPackages || {}; uniteConfiguration.packageManager = packageManager || uniteConfiguration.packageManager || "Npm"; } - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "operation", operation, ["add", "remove"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "operation", operation, ["add", "remove"])) { return 1; } - if (!parameterValidation_1.ParameterValidation.notEmpty(this._display, "packageName", packageName)) { + if (!parameterValidation_1.ParameterValidation.notEmpty(this._logger, "packageName", packageName)) { return 1; } - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "packageManager", uniteConfiguration.packageManager, ["Npm", "Yarn"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "packageManager", uniteConfiguration.packageManager, ["Npm", "Yarn"])) { return 1; } - this._display.log(""); + this._logger.info(""); if (operation === "add") { return yield this.clientPackageAdd(packageName, version, preload, includeMode, main, mainMinified, isPackage, wrapAssets, outputDirectory, uniteConfiguration); } @@ -195,19 +194,19 @@ class Engine { outputDirectory = this.cleanupOutputDirectory(outputDirectory); const uniteConfiguration = yield this.loadConfiguration(outputDirectory); if (!uniteConfiguration) { - this._display.error("There is no unite.json to configure."); + this._logger.error("There is no unite.json to configure."); return 1; } else { uniteConfiguration.buildConfigurations = uniteConfiguration.buildConfigurations || {}; } - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "operation", operation, ["add", "remove"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "operation", operation, ["add", "remove"])) { return 1; } - if (!parameterValidation_1.ParameterValidation.notEmpty(this._display, "configurationName", configurationName)) { + if (!parameterValidation_1.ParameterValidation.notEmpty(this._logger, "configurationName", configurationName)) { return 1; } - this._display.log(""); + this._logger.info(""); if (operation === "add") { return yield this.buildConfigurationAdd(configurationName, bundle, minify, sourcemaps, outputDirectory, uniteConfiguration); } @@ -225,11 +224,6 @@ class Engine { else { outputDirectory = this._fileSystem.pathFormat(outputDirectory); } - // if the user has specified the www folder then move one up - outputDirectory = this._fileSystem.pathFormat(outputDirectory); - if (outputDirectory.endsWith("www")) { - outputDirectory = this._fileSystem.pathFormat(this._fileSystem.pathCombine(outputDirectory, "../")); - } return outputDirectory; } loadConfiguration(outputDirectory) { @@ -237,21 +231,19 @@ class Engine { let uniteConfiguration; // check if there is a unite.json we can load for default options try { - const wwwFolder = this._fileSystem.pathCombine(outputDirectory, "www"); - const exists = yield this._fileSystem.fileExists(wwwFolder, "unite.json"); + const exists = yield this._fileSystem.fileExists(outputDirectory, "unite.json"); if (exists) { - uniteConfiguration = yield this._fileSystem.fileReadJson(wwwFolder, "unite.json"); + uniteConfiguration = yield this._fileSystem.fileReadJson(outputDirectory, "unite.json"); } } catch (e) { - // we can ignore any failures here + this._logger.error("Reading existing unite.json", e); } return uniteConfiguration; }); } configureRun(outputDirectory, uniteConfiguration, license) { return __awaiter(this, void 0, void 0, function* () { - this._logger.info("Engine::init", { outputDirectory, uniteConfiguration }); const engineVariables = new engineVariables_1.EngineVariables(); let ret = yield this.createEngineVariables(outputDirectory, uniteConfiguration, engineVariables); if (ret === 0) { @@ -299,8 +291,8 @@ class Engine { pipelineSteps.push(new uniteConfigurationJson_1.UniteConfigurationJson()); ret = yield this.runPipeline(pipelineSteps, uniteConfiguration, engineVariables); if (ret === 0) { - this._display.banner("You should probably run npm install / yarn install before running any gulp commands."); - this._display.banner("Successfully Completed."); + this._logger.warning("You should probably run npm install / yarn install before running any gulp commands."); + this._logger.banner("Successfully Completed."); } } return ret; @@ -308,11 +300,11 @@ class Engine { } clientPackageAdd(packageName, version, preload, includeMode, main, mainMinified, isPackage, wrapAssets, outputDirectory, uniteConfiguration) { return __awaiter(this, void 0, void 0, function* () { - if (!parameterValidation_1.ParameterValidation.checkOneOf(this._display, "includeMode", includeMode, ["app", "test", "both"])) { + if (!parameterValidation_1.ParameterValidation.checkOneOf(this._logger, "includeMode", includeMode, ["app", "test", "both"])) { return 1; } if (uniteConfiguration.clientPackages[packageName]) { - this._display.error("Package has already been added."); + this._logger.error("Package has already been added."); return 1; } const engineVariables = new engineVariables_1.EngineVariables(); @@ -359,7 +351,7 @@ class Engine { pipelineSteps.push(new uniteConfigurationJson_1.UniteConfigurationJson()); ret = yield this.runPipeline(pipelineSteps, uniteConfiguration, engineVariables); if (ret === 0) { - this._display.banner("Successfully Completed."); + this._logger.banner("Successfully Completed."); } } return ret; @@ -368,7 +360,7 @@ class Engine { clientPackageRemove(packageName, outputDirectory, uniteConfiguration) { return __awaiter(this, void 0, void 0, function* () { if (!uniteConfiguration.clientPackages[packageName]) { - this._display.error("Package has not been added."); + this._logger.error("Package has not been added."); return 1; } delete uniteConfiguration.clientPackages[packageName]; @@ -389,7 +381,7 @@ class Engine { pipelineSteps.push(new uniteConfigurationJson_1.UniteConfigurationJson()); ret = yield this.runPipeline(pipelineSteps, uniteConfiguration, engineVariables); if (ret === 0) { - this._display.banner("Successfully Completed."); + this._logger.banner("Successfully Completed."); } } return ret; @@ -409,7 +401,7 @@ class Engine { pipelineSteps.push(new uniteConfigurationJson_1.UniteConfigurationJson()); ret = yield this.runPipeline(pipelineSteps, uniteConfiguration, engineVariables); if (ret === 0) { - this._display.banner("Successfully Completed."); + this._logger.banner("Successfully Completed."); } } return ret; @@ -427,7 +419,7 @@ class Engine { pipelineSteps.push(new uniteConfigurationJson_1.UniteConfigurationJson()); ret = yield this.runPipeline(pipelineSteps, uniteConfiguration, engineVariables); if (ret === 0) { - this._display.banner("Successfully Completed."); + this._logger.banner("Successfully Completed."); } } return ret; @@ -435,6 +427,15 @@ class Engine { } createEngineVariables(outputDirectory, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { + try { + this._logger.info("Loading dependencies", { core: this._coreRoot, dependenciesFile: "package.json" }); + engineVariables.corePackageJson = yield this._fileSystem.fileReadJson(this._coreRoot, "package.json"); + uniteConfiguration.uniteVersion = engineVariables.corePackageJson.version; + } + catch (err) { + this._logger.error("Loading dependencies failed", err, { core: this._coreRoot, dependenciesFile: "package.json" }); + return 1; + } engineVariables.coreFolder = this._coreRoot; engineVariables.rootFolder = outputDirectory; engineVariables.wwwFolder = this._fileSystem.pathCombine(engineVariables.rootFolder, "www"); @@ -456,10 +457,10 @@ class Engine { engineVariables.sourceLanguageExt = uniteConfiguration.sourceLanguage === "JavaScript" ? "js" : "ts"; engineVariables.gitIgnore = []; if (uniteConfiguration.packageManager === "Npm") { - engineVariables.packageManager = new npmPackageManager_1.NpmPackageManager(this._logger, this._display, this._fileSystem); + engineVariables.packageManager = new npmPackageManager_1.NpmPackageManager(this._logger, this._fileSystem); } else if (uniteConfiguration.packageManager === "Yarn") { - engineVariables.packageManager = new yarnPackageManager_1.YarnPackageManager(this._logger, this._display, this._fileSystem); + engineVariables.packageManager = new yarnPackageManager_1.YarnPackageManager(this._logger, this._fileSystem); } uniteConfiguration.buildConfigurations = uniteConfiguration.buildConfigurations || {}; uniteConfiguration.buildConfigurations.dev = uniteConfiguration.buildConfigurations.dev || @@ -486,28 +487,19 @@ class Engine { engineVariables.lintEnv = {}; engineVariables.lintGlobals = {}; engineVariables.transpileProperties = {}; - try { - this._logger.log("Loading dependencies", { core: engineVariables.coreFolder, dependenciesFile: "package.json" }); - engineVariables.corePackageJson = yield this._fileSystem.fileReadJson(engineVariables.coreFolder, "package.json"); - uniteConfiguration.uniteVersion = engineVariables.corePackageJson.version; - } - catch (err) { - this._logger.error("Loading dependencies failed", err, { core: engineVariables.coreFolder, dependenciesFile: "package.json" }); - return 1; - } return 0; }); } runPipeline(pipelineSteps, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { for (const pipelineStep of pipelineSteps) { - const ret = yield pipelineStep.prerequisites(this._logger, this._display, this._fileSystem, uniteConfiguration, engineVariables); + const ret = yield pipelineStep.prerequisites(this._logger, this._fileSystem, uniteConfiguration, engineVariables); if (ret !== 0) { return ret; } } for (const pipelineStep of pipelineSteps) { - const ret = yield pipelineStep.process(this._logger, this._display, this._fileSystem, uniteConfiguration, engineVariables); + const ret = yield pipelineStep.process(this._logger, this._fileSystem, uniteConfiguration, engineVariables); if (ret !== 0) { return ret; } @@ -518,4 +510,4 @@ class Engine { } exports.Engine = Engine; -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../../src/engine/engine.ts"],"names":[],"mappings":"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","file":"engine/engine.js","sourceRoot":"../src"} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../../src/engine/engine.ts"],"names":[],"mappings":"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","file":"engine/engine.js","sourceRoot":"../src"} diff --git a/dist/engine/enginePipelineStepBase.d.ts b/dist/engine/enginePipelineStepBase.d.ts index 93d44246..6e14f623 100644 --- a/dist/engine/enginePipelineStepBase.d.ts +++ b/dist/engine/enginePipelineStepBase.d.ts @@ -1,7 +1,6 @@ /** * Base implementation of engine pipeline step. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../configuration/models/unite/uniteConfiguration"; @@ -9,16 +8,10 @@ import { IEnginePipelineStep } from "../interfaces/IEnginePipelineStep"; import { EngineVariables } from "./engineVariables"; export declare abstract class EnginePipelineStepBase implements IEnginePipelineStep { static MARKER: string; - prerequisites(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; - abstract process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; - log(logger: ILogger, display: IDisplay, message: string, args?: { - [id: string]: any; - }): void; - error(logger: ILogger, display: IDisplay, message: string, err?: any, args?: { - [id: string]: any; - }): void; - copyFile(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, sourceFolder: string, sourceFilename: string, destFolder: string, destFilename: string): Promise; - deleteFile(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, folder: string, filename: string): Promise; + prerequisites(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + abstract process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + copyFile(logger: ILogger, fileSystem: IFileSystem, sourceFolder: string, sourceFilename: string, destFolder: string, destFilename: string): Promise; + deleteFile(logger: ILogger, fileSystem: IFileSystem, folder: string, filename: string): Promise; wrapGeneratedMarker(before: string, after: string): string; fileHasGeneratedMarker(fileSystem: IFileSystem, folder: string, filename: string): Promise; } diff --git a/dist/engine/enginePipelineStepBase.js b/dist/engine/enginePipelineStepBase.js index 31a08e24..048a7618 100644 --- a/dist/engine/enginePipelineStepBase.js +++ b/dist/engine/enginePipelineStepBase.js @@ -9,24 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", { value: true }); class EnginePipelineStepBase { - prerequisites(logger, display, fileSystem, uniteConfiguration, engineVariables) { + prerequisites(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { return 0; }); } - log(logger, display, message, args) { - display.log(message, args); - logger.log(message, args); - } - error(logger, display, message, err, args) { - display.error(message, err, args); - logger.error(message, args); - } - copyFile(logger, display, fileSystem, sourceFolder, sourceFilename, destFolder, destFilename) { + copyFile(logger, fileSystem, sourceFolder, sourceFilename, destFolder, destFilename) { return __awaiter(this, void 0, void 0, function* () { const hasGeneratedMarker = yield this.fileHasGeneratedMarker(fileSystem, destFolder, destFilename); if (hasGeneratedMarker) { - this.log(logger, display, `Copying ${sourceFilename}`, { from: sourceFolder, to: destFolder }); + logger.info(`Copying ${sourceFilename}`, { from: sourceFolder, to: destFolder }); const folderWithFile = fileSystem.pathCombine(destFolder, destFilename); const folderOnly = fileSystem.pathGetDirectory(folderWithFile); const dirExists = yield fileSystem.directoryExists(folderOnly); @@ -37,29 +29,29 @@ class EnginePipelineStepBase { yield fileSystem.fileWriteLines(destFolder, destFilename, lines); } else { - this.log(logger, display, `Skipping ${sourceFilename} as it has no generated marker`, { from: sourceFolder, to: destFolder }); + logger.info(`Skipping ${sourceFilename} as it has no generated marker`, { from: sourceFolder, to: destFolder }); } }); } - deleteFile(logger, display, fileSystem, folder, filename) { + deleteFile(logger, fileSystem, folder, filename) { return __awaiter(this, void 0, void 0, function* () { const hasGeneratedMarker = yield this.fileHasGeneratedMarker(fileSystem, folder, filename); if (hasGeneratedMarker) { - this.log(logger, display, `Deleting ${filename}`, { from: folder }); try { const exists = yield fileSystem.fileExists(filename, folder); if (exists) { + logger.info(`Deleting ${filename}`, { from: folder }); yield fileSystem.fileDelete(filename, folder); } return 0; } catch (err) { - this.error(logger, display, `Deleting ${filename} failed`, err); + logger.error(`Deleting ${filename} failed`, err); return 1; } } else { - this.log(logger, display, `Skipping Delete of ${filename} as it has no generated marker`, { from: folder }); + logger.info(`Skipping Delete of ${filename} as it has no generated marker`, { from: folder }); return 0; } }); @@ -93,4 +85,4 @@ class EnginePipelineStepBase { EnginePipelineStepBase.MARKER = "Generated by UniteJS"; exports.EnginePipelineStepBase = EnginePipelineStepBase; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbmdpbmUvZW5naW5lUGlwZWxpbmVTdGVwQmFzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBVUE7SUFHaUIsYUFBYSxDQUFDLE1BQWUsRUFDZixPQUFpQixFQUNqQixVQUF1QixFQUN2QixrQkFBc0MsRUFDdEMsZUFBZ0M7O1lBQ3ZELE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7SUFRTSxHQUFHLENBQUMsTUFBZSxFQUFFLE9BQWlCLEVBQUUsT0FBZSxFQUFFLElBQTJCO1FBQ3ZGLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzNCLE1BQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzlCLENBQUM7SUFFTSxLQUFLLENBQUMsTUFBZSxFQUFFLE9BQWlCLEVBQUUsT0FBZSxFQUFFLEdBQVMsRUFBRSxJQUEyQjtRQUNwRyxPQUFPLENBQUMsS0FBSyxDQUFDLE9BQU8sRUFBRSxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDbEMsTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDaEMsQ0FBQztJQUVZLFFBQVEsQ0FBQyxNQUFlLEVBQ2YsT0FBaUIsRUFDakIsVUFBdUIsRUFDdkIsWUFBb0IsRUFDcEIsY0FBc0IsRUFDdEIsVUFBa0IsRUFDbEIsWUFBb0I7O1lBQ3RDLE1BQU0sa0JBQWtCLEdBQUcsTUFBTSxJQUFJLENBQUMsc0JBQXNCLENBQUMsVUFBVSxFQUFFLFVBQVUsRUFBRSxZQUFZLENBQUMsQ0FBQztZQUVuRyxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxXQUFXLGNBQWMsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsVUFBVSxFQUFF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LENBQUM7b0JBQ1QsTUFBTSxhQUFhLEdBQUcsTUFBTSxVQUFVLENBQUMsYUFBYSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQztvQkFDdkUsd0RBQXdEO29CQUN4RCxFQUFFLENBQUMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO3dCQUNoQixTQUFTLEdBQUcsS0FBSyxDQUFDO3dCQUNsQixHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxhQUFhLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxhQUFhLENBQUMsTUFBTSxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDOzRCQUNoRyxTQUFTLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7d0JBQzdFLENBQUM7b0JBQ0wsQ0FBQztnQkFDTCxDQUFDO2dCQUNELE1BQU0sQ0FBQyxTQUFTLENBQUM7WUFDckIsQ0FBQztZQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ1gsTUFBTSxDQUFDLElBQUksQ0FBQztZQUNoQixDQUFDO1FBQ0wsQ0FBQztLQUFBOztBQW5HYSw2QkFBTSxHQUFXLHNCQUFzQixDQUFDO0FBRDFELHdEQXFHQyIsImZpbGUiOiJlbmdpbmUvZW5naW5lUGlwZWxpbmVTdGVwQmFzZS5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbmdpbmUvZW5naW5lUGlwZWxpbmVTdGVwQmFzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBU0E7SUFHaUIsYUFBYSxDQUFDLE1BQWUsRUFDZixVQUF1QixFQUN2QixrQkFBc0MsRUFDdEMsZUFBZ0M7O1lBQ3ZELE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7SUFPWSxRQUFRLENBQUMsTUFBZSxFQUNmLFVBQXVCLEVBQ3ZCLFlBQW9CLEVBQ3BCLGNBQXNCLEVBQ3RCLFVBQWtCLEVBQ2xCLFlBQW9COztZQUN0QyxNQUFNLGtCQUFrQixHQUFHLE1BQU0sSUFBSSxDQUFDLHNCQUFzQixDQUFDLFVBQVUsRUFBRSxVQUFVLEVBQUUsWUFBWSxDQUFDLENBQUM7WUFFbkcsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDO2dCQUNyQixNQUFNLENBQUMsSUFBSSxDQUFDLFdBQVcsY0FBYyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsWUFBWSxFQUFFLEVBQUUsRUFBRSxVQUFVLEVBQUUsQ0FBQyxDQUFDO2dCQUVqRixNQUFNLGNBQWMsR0FBRyxVQUFVLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxZQUFZLENBQUMsQ0FBQztnQkFDeEUsTUFBTSxVQUFVLEdBQUcsVUFBVSxDQUFDLGdCQUFnQixDQUFDLGNBQWMsQ0FBQyxDQUFDO2dCQUMvRCxNQUFNLFNBQVMsR0FBRyxNQUFNLFVBQVUsQ0FBQyxlQUFlLENBQUMsVUFBVSxDQUFDLENBQUM7Z0JBQy9ELEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztvQkFDYixNQUFNLFVBQVUsQ0FBQyxlQUFlLENBQUMsVUFBVSxDQUFDLENBQUM7Z0JBQ2pELENBQUM7Z0JBRUQsTUFBTSxLQUFLLEdBQUcsTUFBTSxVQUFVLENBQUMsYUFBYSxDQUFDLFlBQVksRUFBRSxjQUFjLENBQUMsQ0FBQztnQkFDM0UsTUFBTSxVQUFVLENBQUMsY0FBYyxDQUFDLFVBQVUsRUFBRSxZQUFZLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFDckUsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLE1BQU0sQ0FBQyxJQUFJLENBQUMsWUFBWSxjQUFjLGdDQUFnQyxFQUMxRCxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsRUFBRSxFQUFFLFVBQVUsRUFBRSxDQUFDLENBQUM7WUFDeEQsQ0FBQztRQUNMLENBQUM7S0FBQTtJQUVZLFVBQVUsQ0FBQyxNQUFlLEVBQUUsVUFBdUIsRUFDeEMsTUFBYyxFQUFFLFFBQWdCOztZQUNwRCxNQUFNLGtCQUFrQixHQUFHLE1BQU0sSUFBSSxDQUFDLHNCQUFzQixDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLENBQUM7WUFFM0YsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDO2dCQUNyQixJQUFJLENBQUM7b0JBQ0QsTUFBTSxNQUFNLEdBQUcsTUFBTSxVQUFVLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztvQkFDN0QsRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQzt3QkFDVCxNQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksUUFBUSxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQzt3QkFDdEQsTUFBTSxVQUFVLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztvQkFDbEQsQ0FBQztvQkFDRCxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7Z0JBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztvQkFDWCxNQUFNLENBQUMsS0FBSyxDQUFDLFlBQVksUUFBUSxTQUFTLEVBQUUsR0FBRyxDQUFDLENBQUM7b0JBQ2pELE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDSixNQUFNLENBQUMsSUFBSSxDQUFDLHNCQUFzQixRQUFRLGdDQUFnQyxFQUFFLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7Z0JBQzlGLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDYixDQUFDO1FBQ0wsQ0FBQztLQUFBO0lBRU0sbUJBQW1CLENBQUMsTUFBYyxFQUFFLEtBQWE7UUFDcEQsTUFBTSxDQUFDLE1BQU0sR0FBRyxzQkFBc0IsQ0FBQyxNQUFNLEdBQUcsS0FBSyxDQUFDO0lBQzFELENBQUM7SUFFWSxzQkFBc0IsQ0FBQyxVQUF1QixFQUFFLE1BQWMsRUFBRSxRQUFnQjs7WUFDekYsSUFBSSxTQUFTLEdBQUcsSUFBSSxDQUFDO1lBRXJCLElBQUksQ0FBQztnQkFDRCxNQUFNLE1BQU0sR0FBRyxNQUFNLFVBQVUsQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxDQUFDO2dCQUM3RCxFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO29CQUNULE1BQU0sYUFBYSxHQUFHLE1BQU0sVUFBVSxDQUFDLGFBQWEsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLENBQUM7b0JBQ3ZFLHdEQUF3RDtvQkFDeEQsRUFBRSxDQUFDLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQzt3QkFDaEIsU0FBUyxHQUFHLEtBQUssQ0FBQzt3QkFDbEIsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsYUFBYSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksYUFBYSxDQUFDLE1BQU0sR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQzs0QkFDaEcsU0FBUyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsc0JBQXNCLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO3dCQUM3RSxDQUFDO29CQUNMLENBQUM7Z0JBQ0wsQ0FBQztnQkFDRCxNQUFNLENBQUMsU0FBUyxDQUFDO1lBQ3JCLENBQUM7WUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNYLE1BQU0sQ0FBQyxJQUFJLENBQUM7WUFDaEIsQ0FBQztRQUNMLENBQUM7S0FBQTs7QUFyRmEsNkJBQU0sR0FBVyxzQkFBc0IsQ0FBQztBQUQxRCx3REF1RkMiLCJmaWxlIjoiZW5naW5lL2VuZ2luZVBpcGVsaW5lU3RlcEJhc2UuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/interfaces/IEnginePipelineStep.d.ts b/dist/interfaces/IEnginePipelineStep.d.ts index 9406ff37..be4db298 100644 --- a/dist/interfaces/IEnginePipelineStep.d.ts +++ b/dist/interfaces/IEnginePipelineStep.d.ts @@ -1,12 +1,11 @@ /** * Interface for pipeline steps. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../configuration/models/unite/uniteConfiguration"; import { EngineVariables } from "../engine/engineVariables"; export interface IEnginePipelineStep { - prerequisites(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + prerequisites(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/packageManagers/npmPackageManager.d.ts b/dist/packageManagers/npmPackageManager.d.ts index 838fdd68..bab95ff9 100644 --- a/dist/packageManagers/npmPackageManager.d.ts +++ b/dist/packageManagers/npmPackageManager.d.ts @@ -1,13 +1,11 @@ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { PackageConfiguration } from "../configuration/models/packages/packageConfiguration"; import { IPackageManager } from "../interfaces/IPackageManager"; export declare class NpmPackageManager implements IPackageManager { private _logger; - private _display; private _fileSystem; - constructor(logger: ILogger, display: IDisplay, fileSystem: IFileSystem); + constructor(logger: ILogger, fileSystem: IFileSystem); info(packageName: string): Promise; add(workingDirectory: string, packageName: string, version: string, isDev: boolean): Promise; remove(workingDirectory: string, packageName: string, isDev: boolean): Promise; diff --git a/dist/packageManagers/npmPackageManager.js b/dist/packageManagers/npmPackageManager.js index 1480408c..8a8cd072 100644 --- a/dist/packageManagers/npmPackageManager.js +++ b/dist/packageManagers/npmPackageManager.js @@ -13,14 +13,13 @@ Object.defineProperty(exports, "__esModule", { value: true }); */ const npm = require("npm"); class NpmPackageManager { - constructor(logger, display, fileSystem) { + constructor(logger, fileSystem) { this._logger = logger; - this._display = display; this._fileSystem = fileSystem; } info(packageName) { return __awaiter(this, void 0, void 0, function* () { - this._display.info("Looking up package info..."); + this._logger.info("Looking up package info..."); return new Promise((resolve, reject) => { npm.load({ json: true }, (err, result) => { if (err) { @@ -48,7 +47,7 @@ class NpmPackageManager { } add(workingDirectory, packageName, version, isDev) { return __awaiter(this, void 0, void 0, function* () { - this._display.info("Adding package..."); + this._logger.info("Adding package..."); return new Promise((resolve, reject) => { const config = {}; config.prefix = this._fileSystem.pathFormat(workingDirectory); @@ -78,7 +77,7 @@ class NpmPackageManager { } remove(workingDirectory, packageName, isDev) { return __awaiter(this, void 0, void 0, function* () { - this._display.info("Removing package..."); + this._logger.info("Removing package..."); return new Promise((resolve, reject) => { const config = {}; config.prefix = this._fileSystem.pathFormat(workingDirectory); @@ -109,4 +108,4 @@ class NpmPackageManager { } exports.NpmPackageManager = NpmPackageManager; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYWNrYWdlTWFuYWdlcnMvbnBtUGFja2FnZU1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBOztHQUVHO0FBQ0gsMkJBQTJCO0FBTzNCO0lBS0ksWUFBWSxNQUFlLEVBQUUsT0FBaUIsRUFBRSxVQUF1QjtRQUNuRSxJQUFJLENBQUMsT0FBTyxHQUFHLE1BQU0sQ0FBQztRQUN0QixJQUFJLENBQUMsUUFBUSxHQUFHLE9BQU8sQ0FBQztRQUN4QixJQUFJLENBQUMsV0FBVyxHQUFHLFVBQVUsQ0FBQztJQUNsQyxDQUFDO0lBRVksSUFBSSxDQUFDLFdBQW1COztZQUNqQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO1lBQ2pELE1BQU0sQ0FBQyxJQUFJLE9BQU8sQ0FBdUIsQ0FBQyxPQUFPLEVBQUUsTUFBTTtnQkFDckQsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFDLElBQUksRUFBRSxJQUFJLEVBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNO29CQUMvQixFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO3dCQUNOLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztvQkFDaEIsQ0FBQztvQkFBQyxJQUFJLENBQUMsQ0FBQzt3QkFDSixHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDLFdBQVcsRUFBRSxTQUFTLEVBQUUsTUFBTSxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTzs0QkFDekYsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztnQ0FDUCxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7NEJBQ2pCLENBQUM7NEJBQUMsSUFBSSxDQUFDLENBQUM7Z0NBQ0osTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztnQ0FDbEMsRUFB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QyxDQUFDO29CQUNoQixDQUFDO29CQUFDLElBQUksQ0FBQyxDQUFDO3dCQUNKLEdBQUcsQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTzs0QkFDM0UsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztnQ0FDUCxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7NEJBQ2pCLENBQUM7NEJBQUMsSUFBSSxDQUFDLENBQUM7Z0NBQ0osT0FBTyxFQUFFLENBQUM7NEJBQ2QsQ0FBQzt3QkFDTCxDQUFDLENBQUMsQ0FBQztvQkFDUCxDQUFDO2dCQUNMLENBQUMsQ0FBQyxDQUFDO1lBQ1AsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDO0tBQUE7Q0FDSjtBQXRGRCw4Q0FzRkMiLCJmaWxlIjoicGFja2FnZU1hbmFnZXJzL25wbVBhY2thZ2VNYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYWNrYWdlTWFuYWdlcnMvbnBtUGFja2FnZU1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBOztHQUVHO0FBQ0gsMkJBQTJCO0FBTTNCO0lBSUksWUFBWSxNQUFlLEVBQUUsVUFBdUI7UUFDaEQsSUFBSSxDQUFDLE9BQU8sR0FBRyxNQUFNLENBQUM7UUFDdEIsSUFBSSxDQUFDLFdBQVcsR0FBRyxVQUFVLENBQUM7SUFDbEMsQ0FBQztJQUVZLElBQUksQ0FBQyxXQUFtQjs7WUFDakMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsNEJBQTRCLENBQUMsQ0FBQztZQUNoRCxNQUFNLENBQUMsSUFBSSxPQUFPLENBQXVCLENBQUMsT0FBTyxFQUFFLE1BQU07Z0JBQ3JELEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBQyxJQUFJLEVBQUUsSUFBSSxFQUFDLEVBQUUsQ0FBQyxHQUFHLEVBQUUsTUFBTTtvQkFDL0IsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQzt3QkFDTixNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7b0JBQ2hCLENBQUM7b0JBQUMsSUFBSSxDQUFDLENBQUM7d0JBQ0osR0FBRyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxXQUFXLEVBQUUsU0FBUyxFQUFFLE1BQU0sQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE9BQU87NEJBQ3pGLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7Z0NBQ1AsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDOzRCQUNqQixDQUFDOzRCQUFDLElBQUksQ0FBQyxDQUFDO2dDQUNKLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7Z0NBQ2xDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztvQ0FDbEIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dDQUM5QixDQUFDO2dDQUFDLElBQUksQ0FBQyxDQUFDO29DQUNKLE1BQU0sQ0FBQyxJQUFJLEtBQUssQ0FBQywrQkFBK0IsQ0FBQyxDQUFDLENBQUM7Z0NBQ3ZELENBQUM7NEJBQ0wsQ0FBQzt3QkFDTCxDQUFDLENBQUMsQ0FBQztvQkFDUCxDQUFDO2dCQUNMLENBQUMsQ0FBQyxDQUFDO1lBQ1AsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDO0tBQUE7SUFFWSxHQUFHLENBQUMsZ0JBQXdCLEVBQUUsV0FBbUIsRUFBRSxPQUFlLEVBQUUsS0FBYzs7WUFDM0YsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsbUJBQW1CLENBQUMsQ0FBQztZQUN2QyxNQUFNLENBQUMsSUFBSSxPQUFPLENBQU8sQ0FBQyxPQUFPLEVBQUUsTUFBTTtnQkFDckMsTUFBTSxNQUFNLEdBQTBCLEVBQUUsQ0FBQztnQkFDekMsTUFBTSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO2dCQUM5RCxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO29CQUNSLE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxJQUFJLENBQUM7Z0JBQzlCLENBQUM7Z0JBQUMsSUFBSSxDQUFDLENBQUM7b0JBQ0osTUFBTSxDQUFDLFdBQVcsQ0FBQyxHQUFHLElBQUksQ0FBQztnQkFDL0IsQ0FBQztnQkFDRCxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNO29CQUN6QixFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO3dCQUNOLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztvQkFDaEIsQ0FBQztvQkFBQyxJQUFJLENBQUMsQ0FBQzt3QkFDSixHQUFHLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsV0FBVyxJQUFJLE9BQU8sRUFBRSxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTzs0QkFDekYsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztnQ0FDUCxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7NEJBQ2pCLENBQUM7NEJBQUMsSUFBSSxDQUFDLENBQUM7Z0NBQ0osT0FBTyxFQUFFLENBQUM7NEJBQ2QsQ0FBQzt3QkFDTCxDQUFDLENBQUMsQ0FBQztvQkFDUCxDQUFDO2dCQUNMLENBQUMsQ0FBQyxDQUFDO1lBQ1AsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDO0tBQUE7SUFFWSxNQUFNLENBQUMsZ0JBQXdCLEVBQUUsV0FBbUIsRUFBRSxLQUFjOztZQUM3RSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO1lBQ3pDLE1BQU0sQ0FBQyxJQUFJLE9BQU8sQ0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNO2dCQUNyQyxNQUFNLE1BQU0sR0FBMEIsRUFBRSxDQUFDO2dCQUN6QyxNQUFNLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLGdCQUFnQixDQUFDLENBQUM7Z0JBQzlELEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7b0JBQ1IsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLElBQUksQ0FBQztnQkFDOUIsQ0FBQztnQkFBQyxJQUFJLENBQUMsQ0FBQztvQkFDSixNQUFNLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztnQkFDdkIsQ0FBQztnQkFDRCxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNO29CQUN6QixFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO3dCQUNOLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztvQkFDaEIsQ0FBQztvQkFBQyxJQUFJLENBQUMsQ0FBQzt3QkFDSixHQUFHLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE9BQU87NEJBQzNFLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7Z0NBQ1AsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDOzRCQUNqQixDQUFDOzRCQUFDLElBQUksQ0FBQyxDQUFDO2dDQUNKLE9BQU8sRUFBRSxDQUFDOzRCQUNkLENBQUM7d0JBQ0wsQ0FBQyxDQUFDLENBQUM7b0JBQ1AsQ0FBQztnQkFDTCxDQUFDLENBQUMsQ0FBQztZQUNQLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQztLQUFBO0NBQ0o7QUFwRkQsOENBb0ZDIiwiZmlsZSI6InBhY2thZ2VNYW5hZ2Vycy9ucG1QYWNrYWdlTWFuYWdlci5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== diff --git a/dist/packageManagers/yarnPackageManager.d.ts b/dist/packageManagers/yarnPackageManager.d.ts index 1eed305a..cd35c052 100644 --- a/dist/packageManagers/yarnPackageManager.d.ts +++ b/dist/packageManagers/yarnPackageManager.d.ts @@ -1,13 +1,11 @@ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { PackageConfiguration } from "../configuration/models/packages/packageConfiguration"; import { IPackageManager } from "../interfaces/IPackageManager"; export declare class YarnPackageManager implements IPackageManager { private _logger; - private _display; private _fileSystem; - constructor(logger: ILogger, display: IDisplay, fileSystem: IFileSystem); + constructor(logger: ILogger, fileSystem: IFileSystem); info(packageName: string): Promise; add(workingDirectory: string, packageName: string, version: string, isDev: boolean): Promise; remove(workingDirectory: string, packageName: string, isDev: boolean): Promise; diff --git a/dist/packageManagers/yarnPackageManager.js b/dist/packageManagers/yarnPackageManager.js index 7c5a2f3c..1cc25d81 100644 --- a/dist/packageManagers/yarnPackageManager.js +++ b/dist/packageManagers/yarnPackageManager.js @@ -14,15 +14,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); const child = require("child_process"); const npm = require("npm"); class YarnPackageManager { - constructor(logger, display, fileSystem) { + constructor(logger, fileSystem) { this._logger = logger; - this._display = display; this._fileSystem = fileSystem; } info(packageName) { return __awaiter(this, void 0, void 0, function* () { // We still use NPM for this as yarn doesn't have this facility yet - this._display.info("Looking up package info..."); + this._logger.info("Looking up package info..."); return new Promise((resolve, reject) => { npm.load({ json: true }, (err, result) => { if (err) { @@ -50,7 +49,7 @@ class YarnPackageManager { } add(workingDirectory, packageName, version, isDev) { return __awaiter(this, void 0, void 0, function* () { - this._display.info("Adding package..."); + this._logger.info("Adding package..."); const args = ["add", `${packageName}@${version}`]; if (isDev) { args.push("--dev"); @@ -60,7 +59,7 @@ class YarnPackageManager { } remove(workingDirectory, packageName, isDev) { return __awaiter(this, void 0, void 0, function* () { - this._display.info("Removing package..."); + this._logger.info("Removing package..."); const args = ["remove", packageName]; if (isDev) { args.push("--dev"); @@ -74,15 +73,15 @@ class YarnPackageManager { return new Promise((resolve, reject) => { const spawnProcess = child.spawn(`yarn${isWin ? ".cmd" : ""}`, args, { cwd: this._fileSystem.pathFormat(workingDirectory) }); spawnProcess.stdout.on("data", (data) => { - this._display.log((data ? data.toString() : "").replace(/\n/g, "")); + this._logger.info((data ? data.toString() : "").replace(/\n/g, "")); }); spawnProcess.stderr.on("data", (data) => { const error = (data ? data.toString() : "").replace(/\n/g, ""); if (error.startsWith("warning")) { - this._display.info(error); + this._logger.info(error); } else { - this._display.error(error); + this._logger.error(error); } }); spawnProcess.on("error", (err) => { @@ -102,4 +101,4 @@ class YarnPackageManager { } exports.YarnPackageManager = YarnPackageManager; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYWNrYWdlTWFuYWdlcnMveWFyblBhY2thZ2VNYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQTs7R0FFRztBQUNILHVDQUF1QztBQUN2QywyQkFBMkI7QUFPM0I7SUFLSSxZQUFZLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCO1FBQ25FLElBQUksQ0FBQyxPQUFPLEdBQUcsTUFBTSxDQUFDO1FBQ3RCLElBQUksQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDO1FBQ3hCLElBQUksQ0FBQyxXQUFXLEdBQUcsVUFBVSxDQUFDO0lBQ2xDLENBQUM7SUFFWSxJQUFJLENBQUMsV0FBbUI7O1lBQ2pDLG1FQUFtRTtZQUNuRSxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO1lBQ2pELE1BQU0sQ0FBQyxJQUFJLE9BQU8sQ0FBdUIsQ0FBQyxPQUFPLEVBQUUsTUFBTTtnQkFDckQsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFDLElBQUksRUFBRSxJQUFJLEVBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNO29CQUMvQixFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO3dCQUNOLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztvQkFDaEIsQ0FBQztvQkFBQyxJQUFJLENBQUMsQ0FBQzt3QkFDSixHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDLFdBQVcsRUFBRSxTQUFTLEVBQUUsTUFBTSxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTzs0QkFDekYsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztnQ0FDUCxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7NEJBQ2pCLENBQUM7NEJBQUMsSUFBSSxDQUFDLENBQUM7Z0NBQ0osTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztnQ0FDbEMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO29DQUNsQixPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0NBQzlCLENBQUM7Z0NBQUMsSUFBSSxDQUFDLENBQUM7b0NBQ0osTUFBTSxDQUFDLElBQUksS0FBSyxDQUFDLCtCQUErQixDQUFDLENBQUMsQ0FBQztnQ0FDdkQsQ0FBQzs0QkFDTCxDQUFDO3dCQUNMLENBQUMsQ0FBQyxDQUFDO29CQUNQLENBQUM7Z0JBQ0wsQ0FBQyxDQUFDLENBQUM7WUFDUCxDQUFDLENBQUMsQ0FBQztRQUNQLENBQUM7S0FBQTtJQUVZLEdBQUcsQ0FBQyxnQkFBd0IsRUFBRSxXQUFtQixFQUFFLE9BQWUsRUFBRSxLQUFjOztZQUMzRixJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO1lBRXhDLE1BQU0sSUFBSSxHQUFHLENBQUMsS0FBSyxFQUFFLEdBQUcsV0FBVyxJQUFJLE9BQU8sRUFBRSxDQUFDLENBQUM7WUFDbEQsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztnQkFDUixJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ3ZCLENBQUM7WUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUNqRCxDQUFDO0tBQUE7SUFFWSxNQUFNLENBQUMsZ0JBQXdCLEVBQUUsV0FBbUIsRUFBRSxLQUFjOztZQUM3RSxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO1lBRTFDLE1BQU0sSUFBSSxHQUFHLENBQUMsUUFBUSxFQUFFLFdBQVcsQ0FBQyxDQUFDO1lBQ3JDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7Z0JBQ1IsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUN2QixDQUFDO1lBRUQsTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDakQsQ0FBQztLQUFBO0lBRWEsUUFBUSxDQUFDLGdCQUF3QixFQUFFLElBQWM7O1lBQzNELE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBRTVDLE1BQU0sQ0FBQyxJQUFJLE9BQU8sQ0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNO2dCQUNyQyxNQUFNLFlBQVksR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDLE9BQU8sS0FBSyxHQUFHLE1BQU0sR0FBRyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFBRSxHQUFHLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsRUFBRSxDQUFDLENBQUM7Z0JBRTdILFlBQVksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDLElBQUk7b0JBQ2hDLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxRQUFRLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUM7Z0JBQ3hFLENBQUMsQ0FBQyxDQUFDO2dCQUVILFlBQVksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDLElBQUk7b0JBQ2hDLE1BQU0sS0FBSyxHQUFHLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxRQUFRLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO29CQUMvRCxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQzt3QkFDOUIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7b0JBQzlCLENBQUM7b0JBQUMsSUFBSSxDQUFDLENBQUM7d0JBQ0osSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7b0JBQy9CLENBQUM7Z0JBQ0wsQ0FBQyxDQUFDLENBQUM7Z0JBRUgsWUFBWSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxHQUFHO29CQUN6QixNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQ2hCLENBQUMsQ0FBQyxDQUFDO2dCQUVILFlBQVksQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLENBQUMsUUFBUTtvQkFDOUIsRUFBRSxDQUFDLENBQUMsUUFBUSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7d0JBQ2pCLE9BQU8sRUFBRSxDQUFDO29CQUNkLENBQUM7b0JBQUMsSUFBSSxDQUFDLENBQUM7d0JBQ0osTUFBTSxFQUFFLENBQUM7b0JBQ2IsQ0FBQztnQkFDTCxDQUFDLENBQUMsQ0FBQztZQUNQLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQztLQUFBO0NBQ0o7QUExRkQsZ0RBMEZDIiwiZmlsZSI6InBhY2thZ2VNYW5hZ2Vycy95YXJuUGFja2FnZU1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYWNrYWdlTWFuYWdlcnMveWFyblBhY2thZ2VNYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQTs7R0FFRztBQUNILHVDQUF1QztBQUN2QywyQkFBMkI7QUFNM0I7SUFJSSxZQUFZLE1BQWUsRUFBRSxVQUF1QjtRQUNoRCxJQUFJLENBQUMsT0FBTyxHQUFHLE1BQU0sQ0FBQztRQUN0QixJQUFJLENBQUMsV0FBVyxHQUFHLFVBQVUsQ0FBQztJQUNsQyxDQUFDO0lBRVksSUFBSSxDQUFDLFdBQW1COztZQUNqQyxtRUFBbUU7WUFDbkUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsNEJBQTRCLENBQUMsQ0FBQztZQUNoRCxNQUFNLENBQUMsSUFBSSxPQUFPLENBQXVCLENBQUMsT0FBTyxFQUFFLE1BQU07Z0JBQ3JELEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBQyxJQUFJLEVBQUUsSUFBSSxFQUFDLEVBQUUsQ0FBQyxHQUFHLEVBQUUsTUFBTTtvQkFDL0IsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQzt3QkFDTixNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7b0JBQ2hCLENBQUM7b0JBQUMsSUFBSSxDQUFDLENBQUM7d0JBQ0osR0FBRyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxXQUFXLEVBQUUsU0FBUyxFQUFFLE1BQU0sQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE9BQU87NEJBQ3pGLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7Z0NBQ1AsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDOzRCQUNqQixDQUFDOzRCQUFDLElBQUksQ0FBQyxDQUFDO2dDQUNKLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7Z0NBQ2xDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FB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QUFDO3dCQUNKLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO29CQUM5QixDQUFDO2dCQUNMLENBQUMsQ0FBQyxDQUFDO2dCQUVILFlBQVksQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLENBQUMsR0FBRztvQkFDekIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUNoQixDQUFDLENBQUMsQ0FBQztnQkFFSCxZQUFZLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxDQUFDLFFBQVE7b0JBQzlCLEVBQUUsQ0FBQyxDQUFDLFFBQVEsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO3dCQUNqQixPQUFPLEVBQUUsQ0FBQztvQkFDZCxDQUFDO29CQUFDLElBQUksQ0FBQyxDQUFDO3dCQUNKLE1BQU0sRUFBRSxDQUFDO29CQUNiLENBQUM7Z0JBQ0wsQ0FBQyxDQUFDLENBQUM7WUFDUCxDQUFDLENBQUMsQ0FBQztRQUNQLENBQUM7S0FBQTtDQUNKO0FBeEZELGdEQXdGQyIsImZpbGUiOiJwYWNrYWdlTWFuYWdlcnMveWFyblBhY2thZ2VNYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 diff --git a/dist/pipelineSteps/applicationFramework/aurelia.d.ts b/dist/pipelineSteps/applicationFramework/aurelia.d.ts index 5a3249ba..7d2f7c39 100644 --- a/dist/pipelineSteps/applicationFramework/aurelia.d.ts +++ b/dist/pipelineSteps/applicationFramework/aurelia.d.ts @@ -1,15 +1,14 @@ /** * Pipeline step to generate scaffolding for Aurelia application. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EngineVariables } from "../../engine/engineVariables"; import { SharedAppFramework } from "./sharedAppFramework"; export declare class Aurelia extends SharedAppFramework { - prerequisites(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + prerequisites(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; private toggleAllPackages(uniteConfiguration, engineVariables); private toggleClientPackages(uniteConfiguration, engineVariables, location, clientPackages); } diff --git a/dist/pipelineSteps/applicationFramework/aurelia.js b/dist/pipelineSteps/applicationFramework/aurelia.js index ec2731ab..60ac16b6 100644 --- a/dist/pipelineSteps/applicationFramework/aurelia.js +++ b/dist/pipelineSteps/applicationFramework/aurelia.js @@ -10,36 +10,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const sharedAppFramework_1 = require("./sharedAppFramework"); class Aurelia extends sharedAppFramework_1.SharedAppFramework { - prerequisites(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + prerequisites(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { if (uniteConfiguration.applicationFramework === "Aurelia") { if (uniteConfiguration.bundler === "Browserify" || uniteConfiguration.bundler === "Webpack") { - _super("error").call(this, logger, display, `Aurelia does not currently support bundling with ${uniteConfiguration.bundler}`); + logger.error(`Aurelia does not currently support bundling with ${uniteConfiguration.bundler}`); return 1; } } return 0; }); } - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["aurelia-protractor-plugin"], uniteConfiguration.applicationFramework === "Aurelia" && uniteConfiguration.e2eTestRunner === "Protractor"); engineVariables.protractorPlugins["aurelia-protractor-plugin"] = uniteConfiguration.applicationFramework === "Aurelia" && uniteConfiguration.e2eTestRunner === "Protractor"; this.toggleAllPackages(uniteConfiguration, engineVariables); if (uniteConfiguration.applicationFramework === "Aurelia") { - let ret = yield this.generateAppSource(logger, display, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper", "entryPoint", "child/child"]); + let ret = yield this.generateAppSource(logger, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper", "entryPoint", "child/child"]); if (ret === 0) { - ret = yield _super("generateAppHtml").call(this, logger, display, fileSystem, uniteConfiguration, engineVariables, ["app", "child/child"]); + ret = yield _super("generateAppHtml").call(this, logger, fileSystem, uniteConfiguration, engineVariables, ["app", "child/child"]); if (ret === 0) { - ret = yield _super("generateAppCss").call(this, logger, display, fileSystem, uniteConfiguration, engineVariables, ["child/child"]); + ret = yield _super("generateAppCss").call(this, logger, fileSystem, uniteConfiguration, engineVariables, ["child/child"]); if (ret === 0) { - ret = yield _super("generateE2eTest").call(this, logger, display, fileSystem, uniteConfiguration, engineVariables, ["app"]); + ret = yield _super("generateE2eTest").call(this, logger, fileSystem, uniteConfiguration, engineVariables, ["app"]); if (ret === 0) { - ret = yield this.generateUnitTest(logger, display, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper"]); + ret = yield this.generateUnitTest(logger, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper"]); if (ret === 0) { - ret = yield _super("generateCss").call(this, logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = yield _super("generateCss").call(this, logger, fileSystem, uniteConfiguration, engineVariables); } } } @@ -101,4 +100,4 @@ class Aurelia extends sharedAppFramework_1.SharedAppFramework { } exports.Aurelia = Aurelia; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2FwcGxpY2F0aW9uRnJhbWV3b3JrL2F1cmVsaWEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQVFBLDZEQUEwRDtBQUUxRCxhQUFxQixTQUFRLHVDQUFrQjtJQUM5QixhQUFhLENBQUMsTUFBZSxFQUNmLE9BQWlCLEVBQ2pCLFVBQXVCLEVBQ3ZCLGtCQUFzQyxFQUN0QyxlQUFnQzs7O1lBQ3ZELEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLG9CQUFvQixLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3hELEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLE9BQU8sS0FBSyxZQUFZLElBQUksa0JBQWtCLENBQUMsT0FBTyxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUM7b0JBQzFGLGVBQVcsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLG9EQUFvRCxrQkFBa0IsQ0FBQyxPQUFPLEVBQUUsRUFBRTtvQkFDL0csTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO1lBQ0wsQ0FBQztZQUNELE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7SUFFWSxPQUFPLENBQUMsTUFBZSxFQUFFLE9BQWlCLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ3RKLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLDJCQUEyQixDQUFDLEVBQUUsa0JBQWtCLENBQUMsb0JBQW9CLEtBQUssU0FBUyxJQUFJLGtCQUFrQixDQUFDLGFBQWEsS0FBSyxZQUFZLENBQUMsQ0FBQztZQUMvSyxlQUFlLENBQUMsaUJBQWlCLENBQUMsMkJBQTJCLENBQUMsR0FBRyxrQkFBa0IsQ0FBQyxvQkFBb0IsS0FBSyxTQUFTLElBQUksa0JBQWtCLENBQUMsYUFBYSxLQUFLLFlBQVksQ0FBQztZQUU1SyxJQUFJLENBQUMsaUJBQWlCLENBQUMsa0JBQWtCLEVBQUUsZUFBZSxDQUFDLENBQUM7WUFF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TSxFQUNOLEtBQUssRUFDTCxrQkFBa0IsQ0FBQyxvQkFBb0IsS0FBSyxTQUFTLENBQUMsQ0FBQztJQUMvRCxDQUFDO0lBRU8sb0JBQW9CLENBQUMsa0JBQXNDLEVBQ3RDLGVBQWdDLEVBQ2hDLFFBQWdCLEVBQ2hCLGNBQXVEO1FBRWhGLGNBQWMsQ0FBQyxPQUFPLENBQUMsYUFBYTtZQUNoQyxlQUFlLENBQUMsbUJBQW1CLENBQy9CLGFBQWEsQ0FBQyxJQUFJLEVBQ2xCLEdBQUcsUUFBUSxHQUFHLGFBQWEsQ0FBQyxJQUFJLEtBQUssRUFDckMsU0FBUyxFQUNULEtBQUssRUFDTCxNQUFNLEVBQ04sYUFBYSxDQUFDLFNBQVMsR0FBRyxJQUFJLEdBQUcsS0FBSyxFQUN0QyxrQkFBa0IsQ0FBQyxvQkFBb0IsS0FBSyxTQUFTLENBQUMsQ0FBQztRQUMvRCxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7Q0FDSjtBQXJIRCwwQkFxSEMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9hcHBsaWNhdGlvbkZyYW1ld29yay9hdXJlbGlhLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2FwcGxpY2F0aW9uRnJhbWV3b3JrL2F1cmVsaWEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU9BLDZEQUEwRDtBQUUxRCxhQUFxQixTQUFRLHVDQUFrQjtJQUM5QixhQUFhLENBQUMsTUFBZSxFQUNmLFVBQXVCLEVBQ3ZCLGtCQUFzQyxFQUN0QyxlQUFnQzs7WUFDdkQsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsb0JBQW9CLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQztnQkFDeEQsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsT0FBTyxLQUFLLFlBQVksSUFBSSxrQkFBa0IsQ0FBQyxPQUFPLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQztvQkFDMUYsTUFBTSxDQUFDLEtBQUssQ0FBQyxvREFBb0Qsa0JBQWtCLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztvQkFDL0YsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO1lBQ0wsQ0FBQztZQUNELE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7SUFFWSxPQUFPLENBQUMsTUFBZSxFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUNuSSxlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQywyQkFBMkIsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLG9CQUFvQixLQUFLLFNBQVMsSUFBSSxrQkFBa0IsQ0FBQyxhQUFhLEtBQUssWUFBWSxDQUFDLENBQUM7WUFDL0ssZUFBZSxDQUFDLGlCQUFpQixDQUFDLDJCQUEyQixDQUFDLEdBQUcsa0JBQWtCLENBQUMsb0JBQW9CLEtBQUssU0FBUyxJQUFJLGtCQUFrQixDQUFDLGFBQWEsS0FBSyxZQUFZLENBQUM7WUFFNUssSUFBSSxDQUFDLGlCQUFpQixDQUFDLGtCQUFrQixFQUFFLGVBQWUsQ0FBQyxDQUFDO1lBRTVELEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFD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QUFJLEVBQUUsaUJBQWlCLEVBQUU7WUFDM0IsRUFBRSxJQUFJLEVBQUUseUJBQXlCLEVBQUU7WUFDbkMsRUFBRSxJQUFJLEVBQUUsZ0JBQWdCLEVBQUU7WUFDMUIsRUFBRSxJQUFJLEVBQUUsd0JBQXdCLEVBQUU7WUFDbEMsRUFBRSxJQUFJLEVBQUUsaUJBQWlCLEVBQUU7WUFDM0IsRUFBRSxJQUFJLEVBQUUseUJBQXlCLEVBQUU7WUFDbkMsRUFBRSxJQUFJLEVBQUUsa0JBQWtCLEVBQUU7WUFDNUIsRUFBRSxJQUFJLEVBQUUsYUFBYSxFQUFFO1lBQ3ZCLEVBQUUsSUFBSSxFQUFFLHFCQUFxQixFQUFFO1lBQy9CLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRTtZQUN4QixFQUFFLElBQUksRUFBRSxtQkFBbUIsRUFBRTtZQUM3QixFQUFFLElBQUksRUFBRSwwQkFBMEIsRUFBRTtZQUNwQyxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRTtZQUMxQixFQUFFLElBQUksRUFBRSxvQkFBb0IsRUFBRTtZQUM5QixFQUFFLElBQUksRUFBRSxvQkFBb0IsRUFBRTtZQUM5QixFQUFFLElBQUksRUFBRSw0QkFBNEIsRUFBRTtZQUN0QyxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFO1lBQzNDLEVBQUUsSUFBSSxFQUFFLDhCQUE4QixFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUU7WUFDekQsRUFBRSxJQUFJLEVBQUUsMkJBQTJCLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRTtZQUN0RCxFQUFFLElBQUksRUFBRSxvQkFBb0IsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFO1NBQ2xELENBQUMsQ0FBQztRQUVILGVBQWUsQ0FBQyxtQkFBbUIsQ0FDL0IsY0FBYyxFQUNkLFVBQVUsRUFDVixTQUFTLEVBQ1QsS0FBSyxFQUNMLE1BQU0sRUFDTixLQUFLLEVBQ0wsa0JBQWtCLENBQUMsb0JBQW9CLEtBQUssU0FBUyxDQUFDLENBQUM7SUFDL0QsQ0FBQztJQUVPLG9CQUFvQixDQUFDLGtCQUFzQyxFQUN0QyxlQUFnQyxFQUNoQyxRQUFnQixFQUNoQixjQUF1RDtRQUVoRixjQUFjLENBQUMsT0FBTyxDQUFDLGFBQWE7WUFDaEMsZUFBZSxDQUFDLG1CQUFtQixDQUMvQixhQUFhLENBQUMsSUFBSSxFQUNsQixHQUFHLFFBQVEsR0FBRyxhQUFhLENBQUMsSUFBSSxLQUFLLEVBQ3JDLFNBQVMsRUFDVCxLQUFLLEVBQ0wsTUFBTSxFQUNOLGFBQWEsQ0FBQyxTQUFTLEdBQUcsSUFBSSxHQUFHLEtBQUssRUFDdEMsa0JBQWtCLENBQUMsb0JBQW9CLEtBQUssU0FBUyxDQUFDLENBQUM7UUFDL0QsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO0NBQ0o7QUFwSEQsMEJBb0hDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvYXBwbGljYXRpb25GcmFtZXdvcmsvYXVyZWxpYS5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== diff --git a/dist/pipelineSteps/applicationFramework/plainApp.d.ts b/dist/pipelineSteps/applicationFramework/plainApp.d.ts index dde842a9..a2636a45 100644 --- a/dist/pipelineSteps/applicationFramework/plainApp.d.ts +++ b/dist/pipelineSteps/applicationFramework/plainApp.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate scaffolding for plain application. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EngineVariables } from "../../engine/engineVariables"; import { SharedAppFramework } from "./sharedAppFramework"; export declare class PlainApp extends SharedAppFramework { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/applicationFramework/plainApp.js b/dist/pipelineSteps/applicationFramework/plainApp.js index 7d2a893d..14a6fc4a 100644 --- a/dist/pipelineSteps/applicationFramework/plainApp.js +++ b/dist/pipelineSteps/applicationFramework/plainApp.js @@ -10,17 +10,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const sharedAppFramework_1 = require("./sharedAppFramework"); class PlainApp extends sharedAppFramework_1.SharedAppFramework { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { if (uniteConfiguration.applicationFramework === "PlainApp") { - let ret = yield this.generateAppSource(logger, display, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper", "entryPoint"]); + let ret = yield this.generateAppSource(logger, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper", "entryPoint"]); if (ret === 0) { - ret = yield _super("generateE2eTest").call(this, logger, display, fileSystem, uniteConfiguration, engineVariables, ["app"]); + ret = yield _super("generateE2eTest").call(this, logger, fileSystem, uniteConfiguration, engineVariables, ["app"]); if (ret === 0) { - ret = yield this.generateUnitTest(logger, display, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper"]); + ret = yield this.generateUnitTest(logger, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper"]); if (ret === 0) { - ret = yield _super("generateCss").call(this, logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = yield _super("generateCss").call(this, logger, fileSystem, uniteConfiguration, engineVariables); } } } @@ -32,4 +32,4 @@ class PlainApp extends sharedAppFramework_1.SharedAppFramework { } exports.PlainApp = PlainApp; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2FwcGxpY2F0aW9uRnJhbWV3b3JrL3BsYWluQXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFRQSw2REFBMEQ7QUFFMUQsY0FBc0IsU0FBUSx1Q0FBa0I7SUFDL0IsT0FBTyxDQUFDLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUN0SixFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxvQkFBb0IsS0FBSyxVQUFVLENBQUMsQ0FBQyxDQUFDO2dCQUN6RCxJQUFJLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxrQkFBa0IsRUFBRSxlQUFlLEVBQUUsQ0FBQyxLQUFLLEVBQUUsY0FBYyxFQUFFLFlBQVksQ0FBQyxDQUFDLENBQUM7Z0JBRWhKLEVBQUUsQ0FBQyxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUNaLEdBQUcsR0FBRyxNQUFNLHlCQUFxQixZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLGtCQUFrQixFQUFFLGVBQWUsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7b0JBRTdHLEVBQUUsQ0FBQyxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO3dCQUNaLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxrQkFBa0IsRUFBRSxlQUFlLEVBQUUsQ0FBQyxLQUFLLEVBQUUsY0FBYyxDQUFDLENBQUMsQ0FBQzt3QkFFN0gsRUFBRSxDQUFDLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7NEJBQ1osR0FBRyxHQUFHLE1BQU0scUJBQWlCLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsa0JBQWtCLEVBQUUsZUFBZSxDQUFDLENBQUM7d0JBQ3BHLENBQUM7b0JBQ0wsQ0FBQztnQkFDTCxDQUFDO2dCQUVELE1BQU0sQ0FBQyxHQUFHLENBQUM7WUFDZixDQUFDO1lBQ0QsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtDQUNKO0FBckJELDRCQXFCQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2FwcGxpY2F0aW9uRnJhbWV3b3JrL3BsYWluQXBwLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2FwcGxpY2F0aW9uRnJhbWV3b3JrL3BsYWluQXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFPQSw2REFBMEQ7QUFFMUQsY0FBc0IsU0FBUSx1Q0FBa0I7SUFDL0IsT0FBTyxDQUFDLE1BQWUsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOzs7WUFDbkksRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsb0JBQW9CLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQztnQkFDekQsSUFBSSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMsaUJBQWlCLENBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxrQkFBa0IsRUFBRSxlQUFlLEVBQUUsQ0FBQyxLQUFLLEVBQUUsY0FBYyxFQUFFLFlBQVksQ0FBQyxDQUFDLENBQUM7Z0JBRXZJLEVBQUUsQ0FBQyxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUNaLEdBQUcsR0FBRyxNQUFNLHlCQUFxQixZQUFDLE1BQU0sRUFBRSxVQUFVLEVBQUUsa0JBQWtCLEVBQUUsZUFBZSxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztvQkFFcEcsRUFBRSxDQUFDLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7d0JBQ1osR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sRUFBRSxVQUFVLEVBQUUsa0JBQWtCLEVBQUUsZUFBZSxFQUFFLENBQUMsS0FBSyxFQUFFLGNBQWMsQ0FBQyxDQUFDLENBQUM7d0JBRXBILEVBQUUsQ0FBQyxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDOzRCQUNaLEdBQUcsR0FBRyxNQUFNLHFCQUFpQixZQUFDLE1BQU0sRUFBRSxVQUFVLEVBQUUsa0JBQWtCLEVBQUUsZUFBZSxDQUFDLENBQUM7d0JBQzNGLENBQUM7b0JBQ0wsQ0FBQztnQkFDTCxDQUFDO2dCQUVELE1BQU0sQ0FBQyxHQUFHLENBQUM7WUFDZixDQUFDO1lBQ0QsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtDQUNKO0FBckJELDRCQXFCQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2FwcGxpY2F0aW9uRnJhbWV3b3JrL3BsYWluQXBwLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 diff --git a/dist/pipelineSteps/applicationFramework/react.d.ts b/dist/pipelineSteps/applicationFramework/react.d.ts index fd63b094..4582f219 100644 --- a/dist/pipelineSteps/applicationFramework/react.d.ts +++ b/dist/pipelineSteps/applicationFramework/react.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate scaffolding for React application. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EngineVariables } from "../../engine/engineVariables"; import { SharedAppFramework } from "./sharedAppFramework"; export declare class React extends SharedAppFramework { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/applicationFramework/react.js b/dist/pipelineSteps/applicationFramework/react.js index 661bccef..508042de 100644 --- a/dist/pipelineSteps/applicationFramework/react.js +++ b/dist/pipelineSteps/applicationFramework/react.js @@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const sharedAppFramework_1 = require("./sharedAppFramework"); class React extends sharedAppFramework_1.SharedAppFramework { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["babel-preset-react"], uniteConfiguration.applicationFramework === "React" && uniteConfiguration.sourceLanguage === "JavaScript"); @@ -26,18 +26,18 @@ class React extends sharedAppFramework_1.SharedAppFramework { engineVariables.transpileProperties.jsx = { required: uniteConfiguration.applicationFramework === "React" && uniteConfiguration.sourceLanguage === "TypeScript", object: "react" }; if (uniteConfiguration.applicationFramework === "React") { const codeExtension = uniteConfiguration.sourceLanguage === "JavaScript" ? "!jsx" : "!tsx"; - let ret = yield this.generateAppSource(logger, display, fileSystem, uniteConfiguration, engineVariables, [ + let ret = yield this.generateAppSource(logger, fileSystem, uniteConfiguration, engineVariables, [ `app${codeExtension}`, `child/child${codeExtension}`, "bootstrapper", "entryPoint" ]); if (ret === 0) { - ret = yield _super("generateE2eTest").call(this, logger, display, fileSystem, uniteConfiguration, engineVariables, ["app"]); + ret = yield _super("generateE2eTest").call(this, logger, fileSystem, uniteConfiguration, engineVariables, ["app"]); if (ret === 0) { - ret = yield this.generateUnitTest(logger, display, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper"]); + ret = yield this.generateUnitTest(logger, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper"]); if (ret === 0) { - ret = yield _super("generateCss").call(this, logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = yield _super("generateCss").call(this, logger, fileSystem, uniteConfiguration, engineVariables); } } } @@ -48,4 +48,4 @@ class React extends sharedAppFramework_1.SharedAppFramework { } exports.React = React; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2FwcGxpY2F0aW9uRnJhbWV3b3JrL3JlYWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFRQSw2REFBMEQ7QUFFMUQsV0FBbUIsU0FBUSx1Q0FBa0I7SUFDNUIsT0FBTyxDQUFDLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUN0SixlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxvQkFBb0IsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLG9CQUFvQixLQUFLLE9BQU8sSUFBSSxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssWUFBWSxDQUFDLENBQUM7WUFDdkssZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMscUJBQXFCLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxvQkFBb0IsS0FBSyxPQUFPLElBQUksa0JBQWtCLENBQUMsTUFBTSxLQUFLLFFBQVEsQ0FBQyxDQUFDO1lBRTVKLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLGNBQWMsRUFBRSxrQkFBa0IsRUFBRSx5QkFBeUIsQ0FBQyxFQUMvRCxrQkFBa0IsQ0FBQyxvQkFBb0IsS0FBSyxPQUFPLElBQUksa0JBQWtCLENBQUMsY0FBYyxLQUFLLFlBQVksQ0FBQyxDQUFDO1lBRS9JLGVBQWUsQ0FBQyxtQkFBbUIsQ0FDL0IsT0FBTyxFQUNQLGVBQWUsRUFDZixtQkFBbUIsRUFDbkIsS0FBSyxFQUNMLE1BQU0sRUFDTixLQUFLLEVBQ0wsa0JBQWtCLENBQUMsb0JBQW9CLEtBQUssT0FBTyxDQUFDLENBQUM7WUFFekQsZUFBZSxDQUFDLG1CQUFtQixDQUMvQixXQUFXLEVBQ1gsbUJBQW1CLEVBQ25CLHVCQUF1QixFQUN2QixLQUFLLEVBQ0wsTUFBTSxFQUNOLEtBQUssRUFDTCxrQkFBa0IsQ0FBQyxvQkFBb0IsS0FBSyxPQUFPLENBQUMsQ0FBQztZQUV6RCxlQUFlLENBQUMsbUJBQW1CLENBQy9CLGtCQUFrQixFQUNsQix5QkFBeUIsRUFDekIsNkJBQTZCLEVBQzdCLEtBQUssRUFDTCxNQUFNLEVBQ04sS0FBSyxFQUNMLGtCQUFrQixDQUFDLG9CQUFvQixLQUFLLE9BQU8sQ0FBQyxDQUFDO1lBRXpELGVBQWUsQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLEdBQUcsa0JBQWtCLENBQUMsb0JBQW9CLEtBQUssT0FBTyxJQUFJLGtCQUFrQixDQUFDLGNBQWMsS0FBSyxZQUFZLENBQUM7WUFDbkosZUFBZSxDQUFDLFlBQVksQ0FBQyxHQUFHLEdBQUcsRUFBRSxRQUFRLEVBQUUsa0JBQWtCLENBQUMsb0JBQW9CLEtBQUssT0FBTyxJQUFJLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxRQUFRLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDO1lBQzdKLGVBQWUsQ0FBQyxXQUFXLENBQUMsMEJBQTBCLENBQUMsR0FBRyxrQkFBa0IsQ0FBQyxvQkFBb0IsS0FBSyxPQUFPLElBQUksa0JBQWtCLENBQUMsTUFBTSxLQUFLLFFBQVEsQ0FBQztZQUN4SixlQUFlLENBQUMsV0FBVyxDQUFDLEtBQUssR0FBRyxrQkFBa0IsQ0FBQyxvQkFBb0IsS0FBSyxPQUFPLElBQUksa0JBQWtCLENBQUMsTUFBTSxLQUFLLFFBQVEsQ0FBQztZQUVsSSxlQUFlLENBQUMsbUJBQW1CLENBQUMsR0FBRyxHQUFHLEVBQUMsUUFBUSxFQUFFLGtCQUFrQixDQUFDLG9CQUFvQixLQUFLLE9BQU8sSUFBSSxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssWUFBWSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUMsQ0FBQztZQUVqTCxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxvQkFBb0IsS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDO2dCQUN0RCxNQUFNLGFBQWEsR0FBRyxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssWUFBWSxHQUFHLE1BQU0sR0FBRyxNQUFNLENBQUM7Z0JBQzNGLElBQUksR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLGlCQUFpQixDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLGtCQUFrQixFQUFFLGVBQWUsRUFBRTtvQkFDckcsTUFBTSxhQUFhLEVBQUU7b0JBQ3JCLGNBQWMsYUFBYSxFQUFFO29CQUM3QixjQUFjO29CQUNkLFlBQVk7aUJBQUMsQ0FBQyxDQUFDO2dCQUVuQixFQUFFLENBQUMsQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztvQkFDWixHQUFHLEdBQUcsTUFBTSx5QkFBcUIsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxrQkFBa0IsRUFBRSxlQUFlLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO29CQUU3RyxFQUFFLENBQUMsQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQzt3QkFDWixHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsa0JBQWtCLEVBQUUsZUFBZSxFQUFFLENBQUMsS0FBSyxFQUFFLGNBQWMsQ0FBQyxDQUFDLENBQUM7d0JBRTdILEVBQUUsQ0FBQyxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDOzRCQUNaLEdBQUcsR0FBRyxNQUFNLHFCQUFpQixZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLGtCQUFrQixFQUFFLGVBQWUsQ0FBQyxDQUFDO3dCQUNwRyxDQUFDO29CQUNMLENBQUM7Z0JBQ0wsQ0FBQztZQUNMLENBQUM7WUFFRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0NBQ0o7QUFqRUQsc0JBaUVDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvYXBwbGljYXRpb25GcmFtZXdvcmsvcmVhY3QuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2FwcGxpY2F0aW9uRnJhbWV3b3JrL3JlYWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFPQSw2REFBMEQ7QUFFMUQsV0FBbUIsU0FBUSx1Q0FBa0I7SUFDNUIsT0FBTyxDQUFDLE1BQWUsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOzs7WUFDbkksZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsb0JBQW9CLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxvQkFBb0IsS0FBSyxPQUFPLElBQUksa0JBQWtCLENBQUMsY0FBYyxLQUFLLFlBQVksQ0FBQyxDQUFDO1lBQ3ZLLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLHFCQUFxQixDQUFDLEVBQUUsa0JBQWtCLENBQUMsb0JBQW9CLEtBQUssT0FBTyxJQUFJLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxRQUFRLENBQUMsQ0FBQztZQUU1SixlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxjQUFjLEVBQUUsa0JBQWtCLEVBQUUseUJBQXlCLENBQUMsRUFDL0Qsa0JBQWtCLENBQUMsb0JBQW9CLEtBQUssT0FBTyxJQUFJLGtCQUFrQixDQUFDLGNBQWMsS0FBSyxZQUFZLENBQUMsQ0FBQztZQUUvSSxlQUFlLENBQUMsbUJBQW1CLENBQy9CLE9BQU8sRUFDUCxlQUFlLEVBQ2YsbUJBQW1CLEVBQ25CLEtBQUssRUFDTCxNQUFNLEVBQ04sS0FBSyxFQUNMLGtCQUFrQixDQUFDLG9CQUFvQixLQUFLLE9BQU8sQ0FBQyxDQUFDO1lBRXpELGVBQWUsQ0FBQyxtQkFBbUIsQ0FDL0IsV0FBVyxFQUNYLG1CQUFtQixFQUNuQix1QkFBdUIsRUFDdkIsS0FBSyxFQUNMLE1BQU0sRUFDTixLQUFLLEVBQ0wsa0JBQWtCLENBQUMsb0JBQW9CLEtBQUssT0FBTyxDQUFDLENBQUM7WUFFekQsZUFBZSxDQUFDLG1CQUFtQixDQUMvQixrQkFBa0IsRUFDbEIseUJBQXlCLEVBQ3pCLDZCQUE2QixFQUM3QixLQUFLLEVBQ0wsTUFBTSxFQUNOLEtBQUssRUFDTCxrQkFBa0IsQ0FBQyxvQkFBb0IsS0FBSyxPQUFPLENBQUMsQ0FBQztZQUV6RCxlQUFlLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxHQUFHLGtCQUFrQixDQUFDLG9CQUFvQixLQUFLLE9BQU8sSUFBSSxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssWUFBWSxDQUFDO1lBQ25KLGVBQWUsQ0FBQyxZQUFZLENBQUMsR0FBRyxHQUFHLEVBQUUsUUFBUSxFQUFFLGtCQUFrQixDQUFDLG9CQUFvQixLQUFLLE9BQU8sSUFBSSxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssUUFBUSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQztZQUM3SixlQUFlLENBQUMsV0FBVyxDQUFDLDBCQUEwQixDQUFDLEdBQUcsa0JBQWtCLENBQUMsb0JBQW9CLEtBQUssT0FBTyxJQUFJLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxRQUFRLENBQUM7WUFDeEosZUFBZSxDQUFDLFdBQVcsQ0FBQyxLQUFLLEdBQUcsa0JBQWtCLENBQUMsb0JBQW9CLEtBQUssT0FBTyxJQUFJLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxRQUFRLENBQUM7WUFFbEksZUFBZSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsR0FBRyxFQUFDLFFBQVEsRUFBRSxrQkFBa0IsQ0FBQyxvQkFBb0IsS0FBSyxPQUFPLElBQUksa0JBQWtCLENBQUMsY0FBYyxLQUFLLFlBQVksRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFDLENBQUM7WUFFakwsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsb0JBQW9CLEtBQUssT0FBTyxDQUFDLENBQUMsQ0FBQztnQkFDdEQsTUFBTSxhQUFhLEdBQUcsa0JBQWtCLENBQUMsY0FBYyxLQUFLLFlBQVksR0FBRyxNQUFNLEdBQUcsTUFBTSxDQUFDO2dCQUMzRixJQUFJLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGtCQUFrQixFQUFFLGVBQWUsRUFBRTtvQkFDNUYsTUFBTSxhQUFhLEVBQUU7b0JBQ3JCLGNBQWMsYUFBYSxFQUFFO29CQUM3QixjQUFjO29CQUNkLFlBQVk7aUJBQUMsQ0FBQyxDQUFDO2dCQUVuQixFQUFFLENBQUMsQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztvQkFDWixHQUFHLEdBQUcsTUFBTSx5QkFBcUIsWUFBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGtCQUFrQixFQUFFLGVBQWUsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7b0JBRXBHLEVBQUUsQ0FBQyxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO3dCQUNaLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGtCQUFrQixFQUFFLGVBQWUsRUFBRSxDQUFDLEtBQUssRUFBRSxjQUFjLENBQUMsQ0FBQyxDQUFDO3dCQUVwSCxFQUFFLENBQUMsQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQzs0QkFDWixHQUFHLEdBQUcsTUFBTSxxQkFBaUIsWUFBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGtCQUFrQixFQUFFLGVBQWUsQ0FBQyxDQUFDO3dCQUMzRixDQUFDO29CQUNMLENBQUM7Z0JBQ0wsQ0FBQztZQUNMLENBQUM7WUFFRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0NBQ0o7QUFqRUQsc0JBaUVDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvYXBwbGljYXRpb25GcmFtZXdvcmsvcmVhY3QuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/applicationFramework/sharedAppFramework.d.ts b/dist/pipelineSteps/applicationFramework/sharedAppFramework.d.ts index b5220180..197e3611 100644 --- a/dist/pipelineSteps/applicationFramework/sharedAppFramework.d.ts +++ b/dist/pipelineSteps/applicationFramework/sharedAppFramework.d.ts @@ -1,17 +1,16 @@ /** * Pipeline step to generate scaffolding for shared application. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare abstract class SharedAppFramework extends EnginePipelineStepBase { - protected generateAppSource(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, files: string[]): Promise; - protected generateAppHtml(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, htmlFiles: string[]): Promise; - protected generateAppCss(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, cssFiles: string[]): Promise; - protected generateUnitTest(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, specs: string[]): Promise; - protected generateE2eTest(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, specs: string[]): Promise; - protected generateCss(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + protected generateAppSource(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, files: string[]): Promise; + protected generateAppHtml(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, htmlFiles: string[]): Promise; + protected generateAppCss(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, cssFiles: string[]): Promise; + protected generateUnitTest(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, specs: string[]): Promise; + protected generateE2eTest(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, specs: string[]): Promise; + protected generateCss(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/applicationFramework/sharedAppFramework.js b/dist/pipelineSteps/applicationFramework/sharedAppFramework.js index 75a56406..65546351 100644 --- a/dist/pipelineSteps/applicationFramework/sharedAppFramework.js +++ b/dist/pipelineSteps/applicationFramework/sharedAppFramework.js @@ -10,12 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class SharedAppFramework extends enginePipelineStepBase_1.EnginePipelineStepBase { - generateAppSource(logger, display, fileSystem, uniteConfiguration, engineVariables, files) { - const _super = name => super[name]; + generateAppSource(logger, fileSystem, uniteConfiguration, engineVariables, files) { return __awaiter(this, void 0, void 0, function* () { const scaffoldFolder = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `appFramework/${uniteConfiguration.applicationFramework.toLowerCase()}/src/${uniteConfiguration.sourceLanguage.toLowerCase()}`); try { - _super("log").call(this, logger, display, "Generating App Source in", { appSourceFolder: engineVariables.srcFolder }); + logger.info("Generating App Source in", { appSourceFolder: engineVariables.srcFolder }); for (let file of files) { if (file.indexOf("!") >= 0) { file = file.replace("!", "."); @@ -23,67 +22,64 @@ class SharedAppFramework extends enginePipelineStepBase_1.EnginePipelineStepBase else { file += `.${engineVariables.sourceLanguageExt}`; } - yield this.copyFile(logger, display, fileSystem, scaffoldFolder, file, engineVariables.srcFolder, file); + yield this.copyFile(logger, fileSystem, scaffoldFolder, file, engineVariables.srcFolder, file); } return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating App Source failed", err, { appSourceFolder: engineVariables.srcFolder }); + logger.error("Generating App Source failed", err, { appSourceFolder: engineVariables.srcFolder }); return 1; } }); } - generateAppHtml(logger, display, fileSystem, uniteConfiguration, engineVariables, htmlFiles) { - const _super = name => super[name]; + generateAppHtml(logger, fileSystem, uniteConfiguration, engineVariables, htmlFiles) { return __awaiter(this, void 0, void 0, function* () { const scaffoldFolder = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `appFramework/${uniteConfiguration.applicationFramework.toLowerCase()}/src/html/`); try { - _super("log").call(this, logger, display, "Generating App HTML in", { appSourceFolder: engineVariables.srcFolder }); + logger.info("Generating App HTML in", { appSourceFolder: engineVariables.srcFolder }); for (const htmlFile of htmlFiles) { - yield this.copyFile(logger, display, fileSystem, scaffoldFolder, `${htmlFile}.html`, engineVariables.srcFolder, `${htmlFile}.html`); + yield this.copyFile(logger, fileSystem, scaffoldFolder, `${htmlFile}.html`, engineVariables.srcFolder, `${htmlFile}.html`); } return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating App HTML failed", err, { appSourceFolder: engineVariables.srcFolder }); + logger.error("Generating App HTML failed", err, { appSourceFolder: engineVariables.srcFolder }); return 1; } }); } - generateAppCss(logger, display, fileSystem, uniteConfiguration, engineVariables, cssFiles) { - const _super = name => super[name]; + generateAppCss(logger, fileSystem, uniteConfiguration, engineVariables, cssFiles) { return __awaiter(this, void 0, void 0, function* () { const scaffoldFolder = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `appFramework/${uniteConfiguration.applicationFramework.toLowerCase()}/src/css/${uniteConfiguration.cssPre.toLowerCase()}/`); try { - _super("log").call(this, logger, display, "Generating App CSS in", { appSourceFolder: engineVariables.srcFolder }); + logger.info("Generating App CSS in", { appSourceFolder: engineVariables.srcFolder }); for (const cssFile of cssFiles) { - yield this.copyFile(logger, display, fileSystem, scaffoldFolder, `${cssFile}.${engineVariables.styleLanguageExt}`, engineVariables.srcFolder, `${cssFile}.${engineVariables.styleLanguageExt}`); + yield this.copyFile(logger, fileSystem, scaffoldFolder, `${cssFile}.${engineVariables.styleLanguageExt}`, engineVariables.srcFolder, `${cssFile}.${engineVariables.styleLanguageExt}`); } return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating CSS HTML failed", err, { appSourceFolder: engineVariables.srcFolder }); + logger.error("Generating CSS HTML failed", err, { appSourceFolder: engineVariables.srcFolder }); return 1; } }); } - generateUnitTest(logger, display, fileSystem, uniteConfiguration, engineVariables, specs) { - const _super = name => super[name]; + generateUnitTest(logger, fileSystem, uniteConfiguration, engineVariables, specs) { return __awaiter(this, void 0, void 0, function* () { if (uniteConfiguration.unitTestRunner !== "None") { try { - _super("log").call(this, logger, display, "Generating unit test scaffold shared", { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); + logger.info("Generating unit test scaffold shared", { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); const unitTestsScaffold = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `appFramework/shared/test/unit/src/sourceLanguage/${uniteConfiguration.sourceLanguage.toLowerCase()}/` + `${uniteConfiguration.unitTestFramework.toLowerCase()}/`); const unitTestsScaffoldModuleType = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `appFramework/shared/test/unit/moduleType/${uniteConfiguration.moduleType.toLowerCase()}/`); for (const spec of specs) { - yield this.copyFile(logger, display, fileSystem, unitTestsScaffold, `${spec}.spec.${engineVariables.sourceLanguageExt}`, engineVariables.unitTestSrcFolder, `${spec}.spec.${engineVariables.sourceLanguageExt}`); + yield this.copyFile(logger, fileSystem, unitTestsScaffold, `${spec}.spec.${engineVariables.sourceLanguageExt}`, engineVariables.unitTestSrcFolder, `${spec}.spec.${engineVariables.sourceLanguageExt}`); } - yield this.copyFile(logger, display, fileSystem, unitTestsScaffoldModuleType, "unit-bootstrap.js", engineVariables.unitTestFolder, "unit-bootstrap.js"); + yield this.copyFile(logger, fileSystem, unitTestsScaffoldModuleType, "unit-bootstrap.js", engineVariables.unitTestFolder, "unit-bootstrap.js"); return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating application unit test failed", err, { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); + logger.error("Generating application unit test failed", err, { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); return 1; } } @@ -92,28 +88,27 @@ class SharedAppFramework extends enginePipelineStepBase_1.EnginePipelineStepBase } }); } - generateE2eTest(logger, display, fileSystem, uniteConfiguration, engineVariables, specs) { - const _super = name => super[name]; + generateE2eTest(logger, fileSystem, uniteConfiguration, engineVariables, specs) { return __awaiter(this, void 0, void 0, function* () { if (uniteConfiguration.e2eTestRunner !== "None") { try { - _super("log").call(this, logger, display, "Generating e2e test scaffold shared", { unitTestSrcFolder: engineVariables.e2eTestSrcFolder }); + logger.info("Generating e2e test scaffold shared", { unitTestSrcFolder: engineVariables.e2eTestSrcFolder }); const e2eTestsScaffold = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `appFramework/${uniteConfiguration.applicationFramework.toLowerCase()}/test/e2e/src/e2eTestRunner/` + `${uniteConfiguration.e2eTestRunner.toLowerCase()}/sourceLanguage/` + `${uniteConfiguration.sourceLanguage.toLowerCase()}/${uniteConfiguration.e2eTestFramework.toLowerCase()}/`); const e2eTestsScaffoldRunner = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `appFramework/${uniteConfiguration.applicationFramework.toLowerCase()}/` + `test/e2e/e2eTestRunner/${uniteConfiguration.e2eTestRunner.toLowerCase()}`); for (const spec of specs) { - yield this.copyFile(logger, display, fileSystem, e2eTestsScaffold, `${spec}.spec.${engineVariables.sourceLanguageExt}`, engineVariables.e2eTestSrcFolder, `${spec}.spec.${engineVariables.sourceLanguageExt}`); + yield this.copyFile(logger, fileSystem, e2eTestsScaffold, `${spec}.spec.${engineVariables.sourceLanguageExt}`, engineVariables.e2eTestSrcFolder, `${spec}.spec.${engineVariables.sourceLanguageExt}`); } - yield this.copyFile(logger, display, fileSystem, e2eTestsScaffoldRunner, "e2e-bootstrap.js", engineVariables.e2eTestFolder, "e2e-bootstrap.js"); + yield this.copyFile(logger, fileSystem, e2eTestsScaffoldRunner, "e2e-bootstrap.js", engineVariables.e2eTestFolder, "e2e-bootstrap.js"); if (uniteConfiguration.sourceLanguage === "TypeScript") { - yield this.copyFile(logger, display, fileSystem, e2eTestsScaffoldRunner, "e2e-bootstrap.d.ts", engineVariables.e2eTestFolder, "e2e-bootstrap.d.ts"); + yield this.copyFile(logger, fileSystem, e2eTestsScaffoldRunner, "e2e-bootstrap.d.ts", engineVariables.e2eTestFolder, "e2e-bootstrap.d.ts"); } return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating application e2e test failed", err, { unitTestSrcFolder: engineVariables.e2eTestSrcFolder }); + logger.error("Generating application e2e test failed", err, { unitTestSrcFolder: engineVariables.e2eTestSrcFolder }); return 1; } } @@ -122,19 +117,19 @@ class SharedAppFramework extends enginePipelineStepBase_1.EnginePipelineStepBase } }); } - generateCss(logger, display, fileSystem, uniteConfiguration, engineVariables) { + generateCss(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { try { - _super("log").call(this, logger, display, "Generating application css scaffold shared"); + logger.info("Generating application css scaffold shared", { cssSrcFolder: engineVariables.cssSrcFolder }); const assetCssFolder = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `appFramework/shared/css/${uniteConfiguration.cssPre.toLowerCase()}`); - yield _super("copyFile").call(this, logger, display, fileSystem, assetCssFolder, `app.${engineVariables.styleLanguageExt}`, engineVariables.cssSrcFolder, `app.${engineVariables.styleLanguageExt}`); - yield _super("copyFile").call(this, logger, display, fileSystem, assetCssFolder, `main.${engineVariables.styleLanguageExt}`, engineVariables.cssSrcFolder, `main.${engineVariables.styleLanguageExt}`); - yield _super("copyFile").call(this, logger, display, fileSystem, assetCssFolder, `reset.${engineVariables.styleLanguageExt}`, engineVariables.cssSrcFolder, `reset.${engineVariables.styleLanguageExt}`); + yield _super("copyFile").call(this, logger, fileSystem, assetCssFolder, `app.${engineVariables.styleLanguageExt}`, engineVariables.cssSrcFolder, `app.${engineVariables.styleLanguageExt}`); + yield _super("copyFile").call(this, logger, fileSystem, assetCssFolder, `main.${engineVariables.styleLanguageExt}`, engineVariables.cssSrcFolder, `main.${engineVariables.styleLanguageExt}`); + yield _super("copyFile").call(this, logger, fileSystem, assetCssFolder, `reset.${engineVariables.styleLanguageExt}`, engineVariables.cssSrcFolder, `reset.${engineVariables.styleLanguageExt}`); return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating application css failed", err); + logger.error("Generating application css failed", err); return 1; } }); @@ -142,4 +137,4 @@ class SharedAppFramework extends enginePipelineStepBase_1.EnginePipelineStepBase } exports.SharedAppFramework = SharedAppFramework; -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../../src/pipelineSteps/applicationFramework/sharedAppFramework.ts"],"names":[],"mappings":"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","file":"pipelineSteps/applicationFramework/sharedAppFramework.js","sourceRoot":"../src"} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../../src/pipelineSteps/applicationFramework/sharedAppFramework.ts"],"names":[],"mappings":"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","file":"pipelineSteps/applicationFramework/sharedAppFramework.js","sourceRoot":"../src"} diff --git a/dist/pipelineSteps/bundler/browserify.d.ts b/dist/pipelineSteps/bundler/browserify.d.ts index bea25efc..d6d4c1ae 100644 --- a/dist/pipelineSteps/bundler/browserify.d.ts +++ b/dist/pipelineSteps/bundler/browserify.d.ts @@ -1,13 +1,12 @@ /** * Pipeline step to generate configuration for browserify. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class Browserify extends EnginePipelineStepBase { - prerequisites(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + prerequisites(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/bundler/browserify.js b/dist/pipelineSteps/bundler/browserify.js index 200a6fef..01fd3d65 100644 --- a/dist/pipelineSteps/bundler/browserify.js +++ b/dist/pipelineSteps/bundler/browserify.js @@ -10,19 +10,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class Browserify extends enginePipelineStepBase_1.EnginePipelineStepBase { - prerequisites(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + prerequisites(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { if (uniteConfiguration.bundler === "Browserify") { if (uniteConfiguration.moduleType !== "CommonJS") { - _super("error").call(this, logger, display, "You can only use CommonJS modules with Browserify"); + logger.error("You can only use CommonJS modules with Browserify"); return 1; } } return 0; }); } - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["browserify"], uniteConfiguration.bundler === "Browserify"); return 0; @@ -31,4 +30,4 @@ class Browserify extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.Browserify = Browserify; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2J1bmRsZXIvYnJvd3NlcmlmeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBT0EsZ0ZBQTZFO0FBRzdFLGdCQUF3QixTQUFRLCtDQUFzQjtJQUNyQyxhQUFhLENBQUMsTUFBZSxFQUNmLE9BQWlCLEVBQ2pCLFVBQXVCLEVBQ3ZCLGtCQUFzQyxFQUN0QyxlQUFnQzs7O1lBQ3ZELEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLE9BQU8sS0FBSyxZQUFZLENBQUMsQ0FBQyxDQUFDO2dCQUM5QyxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxVQUFVLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQztvQkFDL0MsZUFBVyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsbURBQW1ELEVBQUU7b0JBQ2xGLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFDRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0lBRVksT0FBTyxDQUFDLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7O1lBQ3RKLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLFlBQVksQ0FBQyxFQUFFLGtCQUFrQixDQUFDLE9BQU8sS0FBSyxZQUFZLENBQUMsQ0FBQztZQUVqRyxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0NBQ0o7QUFwQkQsZ0NBb0JDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvYnVuZGxlci9icm93c2VyaWZ5LmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2J1bmRsZXIvYnJvd3NlcmlmeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBTUEsZ0ZBQTZFO0FBRzdFLGdCQUF3QixTQUFRLCtDQUFzQjtJQUNyQyxhQUFhLENBQUMsTUFBZSxFQUNmLFVBQXVCLEVBQ3ZCLGtCQUFzQyxFQUN0QyxlQUFnQzs7WUFDdkQsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsT0FBTyxLQUFLLFlBQVksQ0FBQyxDQUFDLENBQUM7Z0JBQzlDLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLFVBQVUsS0FBSyxVQUFVLENBQUMsQ0FBQyxDQUFDO29CQUMvQyxNQUFNLENBQUMsS0FBSyxDQUFDLG1EQUFtRCxDQUFDLENBQUM7b0JBQ2xFLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFDRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0lBRVksT0FBTyxDQUFDLE1BQWUsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOztZQUNuSSxlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxZQUFZLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxPQUFPLEtBQUssWUFBWSxDQUFDLENBQUM7WUFFakcsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtDQUNKO0FBbkJELGdDQW1CQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2J1bmRsZXIvYnJvd3NlcmlmeS5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== diff --git a/dist/pipelineSteps/bundler/requireJs.d.ts b/dist/pipelineSteps/bundler/requireJs.d.ts index 1655d628..155f3f45 100644 --- a/dist/pipelineSteps/bundler/requireJs.d.ts +++ b/dist/pipelineSteps/bundler/requireJs.d.ts @@ -1,13 +1,12 @@ /** * Pipeline step to generate configuration for requirejs optimizer. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class RequireJs extends EnginePipelineStepBase { - prerequisites(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + prerequisites(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/bundler/requireJs.js b/dist/pipelineSteps/bundler/requireJs.js index 894ac767..2f889a79 100644 --- a/dist/pipelineSteps/bundler/requireJs.js +++ b/dist/pipelineSteps/bundler/requireJs.js @@ -10,19 +10,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class RequireJs extends enginePipelineStepBase_1.EnginePipelineStepBase { - prerequisites(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + prerequisites(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { if (uniteConfiguration.bundler === "RequireJS") { if (uniteConfiguration.moduleType !== "AMD") { - _super("error").call(this, logger, display, "You can only use AMD modules with RequireJS"); + logger.error("You can only use AMD modules with RequireJS"); return 1; } } return 0; }); } - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["requirejs"], uniteConfiguration.bundler === "RequireJS"); return 0; @@ -31,4 +30,4 @@ class RequireJs extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.RequireJs = RequireJs; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2J1bmRsZXIvcmVxdWlyZUpzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFPQSxnRkFBNkU7QUFHN0UsZUFBdUIsU0FBUSwrQ0FBc0I7SUFDcEMsYUFBYSxDQUFDLE1BQWUsRUFDZixPQUFpQixFQUNqQixVQUF1QixFQUN2QixrQkFBc0MsRUFDdEMsZUFBZ0M7OztZQUN2RCxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLEtBQUssV0FBVyxDQUFDLENBQUMsQ0FBQztnQkFDN0MsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsVUFBVSxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUM7b0JBQzFDLGVBQVcsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLDZDQUE2QyxFQUFFO29CQUM1RSxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7WUFDTCxDQUFDO1lBQ0QsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtJQUVZLE9BQU8sQ0FBQyxNQUFlLEVBQUUsT0FBaUIsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOztZQUN0SixlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxXQUFXLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxPQUFPLEtBQUssV0FBVyxDQUFDLENBQUM7WUFFL0YsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtDQUNKO0FBcEJELDhCQW9CQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2J1bmRsZXIvcmVxdWlyZUpzLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2J1bmRsZXIvcmVxdWlyZUpzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFNQSxnRkFBNkU7QUFHN0UsZUFBdUIsU0FBUSwrQ0FBc0I7SUFDcEMsYUFBYSxDQUFDLE1BQWUsRUFDZixVQUF1QixFQUN2QixrQkFBc0MsRUFDdEMsZUFBZ0M7O1lBQ3ZELEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLE9BQU8sS0FBSyxXQUFXLENBQUMsQ0FBQyxDQUFDO2dCQUM3QyxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxVQUFVLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQztvQkFDMUMsTUFBTSxDQUFDLEtBQUssQ0FBQyw2Q0FBNkMsQ0FBQyxDQUFDO29CQUM1RCxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7WUFDTCxDQUFDO1lBQ0QsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtJQUVZLE9BQU8sQ0FBQyxNQUFlLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7WUFDbkksZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsV0FBVyxDQUFDLEVBQUUsa0JBQWtCLENBQUMsT0FBTyxLQUFLLFdBQVcsQ0FBQyxDQUFDO1lBRS9GLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7Q0FDSjtBQW5CRCw4QkFtQkMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9idW5kbGVyL3JlcXVpcmVKcy5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== diff --git a/dist/pipelineSteps/bundler/systemJsBuilder.d.ts b/dist/pipelineSteps/bundler/systemJsBuilder.d.ts index 9f01ec21..dab28acc 100644 --- a/dist/pipelineSteps/bundler/systemJsBuilder.d.ts +++ b/dist/pipelineSteps/bundler/systemJsBuilder.d.ts @@ -1,13 +1,12 @@ /** * Pipeline step to generate configuration for systemjs builder. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class SystemJsBuilder extends EnginePipelineStepBase { - prerequisites(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + prerequisites(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/bundler/systemJsBuilder.js b/dist/pipelineSteps/bundler/systemJsBuilder.js index d97e1a0e..aed47b7d 100644 --- a/dist/pipelineSteps/bundler/systemJsBuilder.js +++ b/dist/pipelineSteps/bundler/systemJsBuilder.js @@ -10,19 +10,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class SystemJsBuilder extends enginePipelineStepBase_1.EnginePipelineStepBase { - prerequisites(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + prerequisites(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { if (uniteConfiguration.bundler === "SystemJSBuilder") { if (uniteConfiguration.moduleType !== "SystemJS") { - _super("error").call(this, logger, display, "You can only use SystemJS modules with SystemJSBuilder"); + logger.error("You can only use SystemJS modules with SystemJSBuilder"); return 1; } } return 0; }); } - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["systemjs-builder"], uniteConfiguration.bundler === "SystemJSBuilder"); return 0; @@ -31,4 +30,4 @@ class SystemJsBuilder extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.SystemJsBuilder = SystemJsBuilder; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2J1bmRsZXIvc3lzdGVtSnNCdWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFPQSxnRkFBNkU7QUFHN0UscUJBQTZCLFNBQVEsK0NBQXNCO0lBQzFDLGFBQWEsQ0FBQyxNQUFlLEVBQ2YsT0FBaUIsRUFDakIsVUFBdUIsRUFDdkIsa0JBQXNDLEVBQ3RDLGVBQWdDOzs7WUFDdkQsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsT0FBTyxLQUFLLGlCQUFpQixDQUFDLENBQUMsQ0FBQztnQkFDbkQsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsVUFBVSxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUM7b0JBQy9DLGVBQVcsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLHdEQUF3RCxFQUFFO29CQUN2RixNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7WUFDTCxDQUFDO1lBQ0QsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtJQUVZLE9BQU8sQ0FBQyxNQUFlLEVBQUUsT0FBaUIsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOztZQUN0SixlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLE9BQU8sS0FBSyxpQkFBaUIsQ0FBQyxDQUFDO1lBRTVHLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFFYixDQUFDO0tBQUE7Q0FDSjtBQXJCRCwwQ0FxQkMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9idW5kbGVyL3N5c3RlbUpzQnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2J1bmRsZXIvc3lzdGVtSnNCdWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFNQSxnRkFBNkU7QUFHN0UscUJBQTZCLFNBQVEsK0NBQXNCO0lBQzFDLGFBQWEsQ0FBQyxNQUFlLEVBQ2YsVUFBdUIsRUFDdkIsa0JBQXNDLEVBQ3RDLGVBQWdDOztZQUN2RCxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLEtBQUssaUJBQWlCLENBQUMsQ0FBQyxDQUFDO2dCQUNuRCxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxVQUFVLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQztvQkFDL0MsTUFBTSxDQUFDLEtBQUssQ0FBQyx3REFBd0QsQ0FBQyxDQUFDO29CQUN2RSxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7WUFDTCxDQUFDO1lBQ0QsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtJQUVZLE9BQU8sQ0FBQyxNQUFlLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7WUFDbkksZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsa0JBQWtCLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxPQUFPLEtBQUssaUJBQWlCLENBQUMsQ0FBQztZQUU1RyxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBRWIsQ0FBQztLQUFBO0NBQ0o7QUFwQkQsMENBb0JDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvYnVuZGxlci9zeXN0ZW1Kc0J1aWxkZXIuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/bundler/webpack.d.ts b/dist/pipelineSteps/bundler/webpack.d.ts index 32433eb4..e36a819b 100644 --- a/dist/pipelineSteps/bundler/webpack.d.ts +++ b/dist/pipelineSteps/bundler/webpack.d.ts @@ -1,13 +1,12 @@ /** * Pipeline step to generate configuration for webpack. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class Webpack extends EnginePipelineStepBase { - prerequisites(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + prerequisites(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/bundler/webpack.js b/dist/pipelineSteps/bundler/webpack.js index 21b884ef..1116ed17 100644 --- a/dist/pipelineSteps/bundler/webpack.js +++ b/dist/pipelineSteps/bundler/webpack.js @@ -10,19 +10,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class Webpack extends enginePipelineStepBase_1.EnginePipelineStepBase { - prerequisites(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + prerequisites(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { if (uniteConfiguration.bundler === "Webpack") { if (uniteConfiguration.moduleType !== "CommonJS") { - _super("error").call(this, logger, display, "You can only use CommonJS modules with Webpack"); + logger.error("You can only use CommonJS modules with Webpack"); return 1; } } return 0; }); } - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["webpack", "source-map-loader", "uglifyjs-webpack-plugin"], uniteConfiguration.bundler === "Webpack"); return 0; @@ -31,4 +30,4 @@ class Webpack extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.Webpack = Webpack; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2J1bmRsZXIvd2VicGFjay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBT0EsZ0ZBQTZFO0FBRzdFLGFBQXFCLFNBQVEsK0NBQXNCO0lBQ2xDLGFBQWEsQ0FBQyxNQUFlLEVBQ2YsT0FBaUIsRUFDakIsVUFBdUIsRUFDdkIsa0JBQXNDLEVBQ3RDLGVBQWdDOzs7WUFDdkQsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsT0FBTyxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUM7Z0JBQzNDLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLFVBQVUsS0FBSyxVQUFVLENBQUMsQ0FBQyxDQUFDO29CQUMvQyxlQUFXLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxnREFBZ0QsRUFBRTtvQkFDL0UsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO1lBQ0wsQ0FBQztZQUNELE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7SUFFWSxPQUFPLENBQUMsTUFBZSxFQUFFLE9BQWlCLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7WUFDdEosZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsU0FBUyxFQUFFLG1CQUFtQixFQUFFLHlCQUF5QixDQUFDLEVBQUUsa0JBQWtCLENBQUMsT0FBTyxLQUFLLFNBQVMsQ0FBQyxDQUFDO1lBRTNJLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7Q0FDSjtBQXBCRCwwQkFvQkMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9idW5kbGVyL3dlYnBhY2suanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2J1bmRsZXIvd2VicGFjay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBTUEsZ0ZBQTZFO0FBRzdFLGFBQXFCLFNBQVEsK0NBQXNCO0lBQ2xDLGFBQWEsQ0FBQyxNQUFlLEVBQ2YsVUFBdUIsRUFDdkIsa0JBQXNDLEVBQ3RDLGVBQWdDOztZQUN2RCxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQztnQkFDM0MsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsVUFBVSxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUM7b0JBQy9DLE1BQU0sQ0FBQyxLQUFLLENBQUMsZ0RBQWdELENBQUMsQ0FBQztvQkFDL0QsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO1lBQ0wsQ0FBQztZQUNELE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7SUFFWSxPQUFPLENBQUMsTUFBZSxFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7O1lBQ25JLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLFNBQVMsRUFBRSxtQkFBbUIsRUFBRSx5QkFBeUIsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLE9BQU8sS0FBSyxTQUFTLENBQUMsQ0FBQztZQUUzSSxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0NBQ0o7QUFuQkQsMEJBbUJDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvYnVuZGxlci93ZWJwYWNrLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 diff --git a/dist/pipelineSteps/content/assetsSource.d.ts b/dist/pipelineSteps/content/assetsSource.d.ts index 70a3880e..c22e1045 100644 --- a/dist/pipelineSteps/content/assetsSource.d.ts +++ b/dist/pipelineSteps/content/assetsSource.d.ts @@ -1,7 +1,6 @@ /** * Pipeline step to create asset sources. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -10,5 +9,5 @@ import { EngineVariables } from "../../engine/engineVariables"; export declare class AssetsSource extends EnginePipelineStepBase { private static FILENAME; private static FILENAME2; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/content/assetsSource.js b/dist/pipelineSteps/content/assetsSource.js index 8c47c301..48044bfd 100644 --- a/dist/pipelineSteps/content/assetsSource.js +++ b/dist/pipelineSteps/content/assetsSource.js @@ -10,35 +10,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class AssetsSource extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["unitejs-image-cli"], true); try { - _super("log").call(this, logger, display, "Creating Directory", { assetsSourceFolder: engineVariables.assetsSourceFolder }); + logger.info("Creating Directory", { assetsSourceFolder: engineVariables.assetsSourceFolder }); yield fileSystem.directoryCreate(engineVariables.assetsSourceFolder); } catch (err) { - _super("error").call(this, logger, display, "Creating Assets Source folder failed", err); + logger.error("Creating Assets Source folder failed", err); return 1; } try { - _super("log").call(this, logger, display, "Creating Directory", { assetsFolder: engineVariables.assetsFolder }); + logger.info("Creating Directory", { assetsFolder: engineVariables.assetsFolder }); yield fileSystem.directoryCreate(engineVariables.assetsFolder); } catch (err) { - _super("error").call(this, logger, display, "Creating Assets folder failed", err); + logger.error("Creating Assets folder failed", err); return 1; } try { const sourceThemeFolder = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, "assetsSource/theme/"); const destThemeFolder = fileSystem.pathCombine(engineVariables.assetsSourceFolder, "theme/"); - yield _super("copyFile").call(this, logger, display, fileSystem, sourceThemeFolder, AssetsSource.FILENAME, destThemeFolder, AssetsSource.FILENAME); - yield _super("copyFile").call(this, logger, display, fileSystem, sourceThemeFolder, AssetsSource.FILENAME2, destThemeFolder, AssetsSource.FILENAME2); + yield _super("copyFile").call(this, logger, fileSystem, sourceThemeFolder, AssetsSource.FILENAME, destThemeFolder, AssetsSource.FILENAME); + yield _super("copyFile").call(this, logger, fileSystem, sourceThemeFolder, AssetsSource.FILENAME2, destThemeFolder, AssetsSource.FILENAME2); return 0; } catch (err) { - _super("error").call(this, logger, display, "Copy Assets failed", err); + logger.error("Copy Assets failed", err); return 1; } }); @@ -48,4 +48,4 @@ AssetsSource.FILENAME = "logo-tile.svg"; AssetsSource.FILENAME2 = "logo-transparent.svg"; exports.AssetsSource = AssetsSource; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2NvbnRlbnQvYXNzZXRzU291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFPQSxnRkFBNkU7QUFHN0Usa0JBQTBCLFNBQVEsK0NBQXNCO0lBSXZDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsT0FBaUIsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOzs7WUFDdEosZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsbUJBQW1CLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQztZQUVqRSxJQUFJLENBQUM7Z0JBQ0QsYUFBUyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsRUFBRSxrQkFBa0IsRUFBRSxlQUFlLENBQUMsa0JBQWtCLEVBQUUsRUFBRTtnQkFFN0csTUFBTSxVQUFVLENBQUMsZUFBZSxDQUFDLGVBQWUsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1lBQ3pFLENBQUM7WUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNYLGVBQVcsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLHNDQUFzQyxFQUFFLEdBQUcsRUFBRTtnQkFDMUUsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7WUFFRCxJQUFJLENBQUM7Z0JBQ0QsYUFBUyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsRUFBRSxZQUFZLEVBQUUsZUFBZSxDQUFDLFlBQVksRUFBRSxFQUFFO2dCQUVqRyxNQUFNLFVBQVUsQ0FBQyxlQUFlLENBQUMsZUFBZSxDQUFDLFlBQVksQ0FBQyxDQUFDO1lBRW5FLENBQUM7WUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNYLGVBQVcsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLCtCQUErQixFQUFFLEdBQUcsRUFBRTtnQkFDbkUsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7WUFFRCxJQUFJLENBQUM7Z0JBQ0QsTUFBTSxpQkFBaUIsR0FBRyxVQUFVLENBQUMsV0FBVyxDQUFDLGVBQWUsQ0FBQyxzQkFBc0IsRUFBRSxxQkFBcUIsQ0FBQyxDQUFDO2dCQUNoSCxNQUFNLGVBQWUsR0FBRyxVQUFVLENBQUMsV0FBVyxDQUFDLGVBQWUsQ0FBQyxrQkFBa0IsRUFBRSxRQUFRLENBQUMsQ0FBQztnQkFFN0YsTUFBTSxrQkFBYyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLGlCQUFpQixFQUFFLFlBQVksQ0FBQyxRQUFRLEVBQUUsZUFBZSxFQUFFLFlBQVksQ0FBQyxRQUFRLENBQUMsQ0FBQztnQkFDcEksTUFBTSxrQkFBYyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLGlCQUFpQixFQUFFLFlBQVksQ0FBQyxTQUFTLEVBQUUsZUFBZSxFQUFFLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQztnQkFFdEksTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7WUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNYLGVBQVcsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLEdBQUcsRUFBRTtnQkFDeEQsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7UUFDTCxDQUFDO0tBQUE7O0FBckNjLHFCQUFRLEdBQVcsZUFBZSxDQUFDO0FBQ25DLHNCQUFTLEdBQVcsc0JBQXNCLENBQUM7QUFGOUQsb0NBdUNDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvY29udGVudC9hc3NldHNTb3VyY2UuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2NvbnRlbnQvYXNzZXRzU291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFNQSxnRkFBNkU7QUFHN0Usa0JBQTBCLFNBQVEsK0NBQXNCO0lBSXZDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ25JLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLG1CQUFtQixDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUM7WUFFakUsSUFBSSxDQUFDO2dCQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsb0JBQW9CLEVBQUUsRUFBRSxrQkFBa0IsRUFBRSxlQUFlLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxDQUFDO2dCQUU5RixNQUFNLFVBQVUsQ0FBQyxlQUFlLENBQUMsZUFBZSxDQUFDLGtCQUFrQixDQUFDLENBQUM7WUFDekUsQ0FBQztZQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQyxzQ0FBc0MsRUFBRSxHQUFHLENBQUMsQ0FBQztnQkFDMUQsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7WUFFRCxJQUFJLENBQUM7Z0JBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxFQUFFLFlBQVksRUFBRSxlQUFlLENBQUMsWUFBWSxFQUFFLENBQUMsQ0FBQztnQkFFbEYsTUFBTSxVQUFVLENBQUMsZUFBZSxDQUFDLGVBQWUsQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUVuRSxDQUFDO1lBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFDWCxNQUFNLENBQUMsS0FBSyxDQUFDLCtCQUErQixFQUFFLEdBQUcsQ0FBQyxDQUFDO2dCQUNuRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztZQUVELElBQUksQ0FBQztnQkFDRCxNQUFNLGlCQUFpQixHQUFHLFVBQVUsQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLHNCQUFzQixFQUFFLHFCQUFxQixDQUFDLENBQUM7Z0JBQ2hILE1BQU0sZUFBZSxHQUFHLFVBQVUsQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLGtCQUFrQixFQUFFLFFBQVEsQ0FBQyxDQUFDO2dCQUU3RixNQUFNLGtCQUFjLFlBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxpQkFBaUIsRUFBRSxZQUFZLENBQUMsUUFBUSxFQUFFLGVBQWUsRUFBRSxZQUFZLENBQUMsUUFBUSxDQUFDLENBQUM7Z0JBQzNILE1BQU0sa0JBQWMsWUFBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGlCQUFpQixFQUFFLFlBQVksQ0FBQyxTQUFTLEVBQUUsZUFBZSxFQUFFLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQztnQkFFN0gsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7WUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNYLE1BQU0sQ0FBQyxLQUFLLENBQUMsb0JBQW9CLEVBQUUsR0FBRyxDQUFDLENBQUM7Z0JBQ3hDLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDYixDQUFDO1FBQ0wsQ0FBQztLQUFBOztBQXJDYyxxQkFBUSxHQUFXLGVBQWUsQ0FBQztBQUNuQyxzQkFBUyxHQUFXLHNCQUFzQixDQUFDO0FBRjlELG9DQXVDQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2NvbnRlbnQvYXNzZXRzU291cmNlLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 diff --git a/dist/pipelineSteps/content/gitIgnore.d.ts b/dist/pipelineSteps/content/gitIgnore.d.ts index 61546155..004534e2 100644 --- a/dist/pipelineSteps/content/gitIgnore.d.ts +++ b/dist/pipelineSteps/content/gitIgnore.d.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate .gitignore. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,5 +8,5 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class GitIgnore extends EnginePipelineStepBase { private static FILENAME; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/content/gitIgnore.js b/dist/pipelineSteps/content/gitIgnore.js index abd78748..03b3004e 100644 --- a/dist/pipelineSteps/content/gitIgnore.js +++ b/dist/pipelineSteps/content/gitIgnore.js @@ -10,24 +10,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class GitIgnore extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { try { const hasGeneratedMarker = yield _super("fileHasGeneratedMarker").call(this, fileSystem, engineVariables.wwwFolder, GitIgnore.FILENAME); if (hasGeneratedMarker) { - _super("log").call(this, logger, display, `Writing ${GitIgnore.FILENAME}`); + logger.info(`Generating ${GitIgnore.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); engineVariables.gitIgnore.push("node_modules"); engineVariables.gitIgnore.push(_super("wrapGeneratedMarker").call(this, "# ", "")); yield fileSystem.fileWriteLines(engineVariables.wwwFolder, GitIgnore.FILENAME, engineVariables.gitIgnore); } else { - _super("log").call(this, logger, display, `Skipping ${GitIgnore.FILENAME} as it has no generated marker`); + logger.info(`Skipping ${GitIgnore.FILENAME} as it has no generated marker`); } return 0; } catch (err) { - _super("error").call(this, logger, display, `Writing ${GitIgnore.FILENAME} failed`, err); + logger.error(`Generating ${GitIgnore.FILENAME} failed`, err); return 1; } }); @@ -36,4 +36,4 @@ class GitIgnore extends enginePipelineStepBase_1.EnginePipelineStepBase { GitIgnore.FILENAME = ".gitignore"; exports.GitIgnore = GitIgnore; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2NvbnRlbnQvZ2l0SWdub3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFPQSxnRkFBNkU7QUFHN0UsZUFBdUIsU0FBUSwrQ0FBc0I7SUFHcEMsT0FBTyxDQUFDLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUN0SixJQUFJLENBQUM7Z0JBQ0QsTUFBTSxrQkFBa0IsR0FBRyxNQUFNLGdDQUE0QixZQUFDLFVBQVUsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQztnQkFFekgsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDO29CQUNyQixhQUFTLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxXQUFXLFNBQVMsQ0FBQyxRQUFRLEVBQUUsRUFBRTtvQkFFNUQsZUFBZSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7b0JBQy9DLGVBQWUsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLDZCQUF5QixZQUFDLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQztvQkFFcEUsTUFBTSxVQUFVLENBQUMsY0FBYyxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLFFBQVEsRUFBRSxlQUFlLENBQUMsU0FBUyxDQUFDLENBQUM7Z0JBQzlHLENBQUM7Z0JBQUMsSUFBSSxDQUFDLENBQUM7b0JBQ0osYUFBUyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsWUFBWSxTQUFTLENBQUMsUUFBUSxnQ0FBZ0MsRUFBRTtnQkFDL0YsQ0FBQztnQkFFRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztZQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ1gsZUFBVyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsV0FBVyxTQUFTLENBQUMsUUFBUSxTQUFTLEVBQUUsR0FBRyxFQUFFO2dCQUMxRSxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztRQUNMLENBQUM7S0FBQTs7QUF0QmMsa0JBQVEsR0FBVyxZQUFZLENBQUM7QUFEbkQsOEJBd0JDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvY29udGVudC9naXRJZ25vcmUuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2NvbnRlbnQvZ2l0SWdub3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFNQSxnRkFBNkU7QUFHN0UsZUFBdUIsU0FBUSwrQ0FBc0I7SUFHcEMsT0FBTyxDQUFDLE1BQWUsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOzs7WUFDbkksSUFBSSxDQUFDO2dCQUNELE1BQU0sa0JBQWtCLEdBQUcsTUFBTSxnQ0FBNEIsWUFBQyxVQUFVLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxTQUFTLENBQUMsUUFBUSxDQUFDLENBQUM7Z0JBRXpILEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQztvQkFDckIsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLFNBQVMsQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLFNBQVMsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFDLENBQUMsQ0FBQztvQkFFekYsZUFBZSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7b0JBQy9DLGVBQWUsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLDZCQUF5QixZQUFDLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQztvQkFFcEUsTUFBTSxVQUFVLENBQUMsY0FBYyxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLFFBQVEsRUFBRSxlQUFlLENBQUMsU0FBUyxDQUFDLENBQUM7Z0JBQzlHLENBQUM7Z0JBQUMsSUFBSSxDQUFDLENBQUM7b0JBQ0osTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLFNBQVMsQ0FBQyxRQUFRLGdDQUFnQyxDQUFDLENBQUM7Z0JBQ2hGLENBQUM7Z0JBRUQsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7WUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNYLE1BQU0sQ0FBQyxLQUFLLENBQUMsY0FBYyxTQUFTLENBQUMsUUFBUSxTQUFTLEVBQUUsR0FBRyxDQUFDLENBQUM7Z0JBQzdELE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDYixDQUFDO1FBQ0wsQ0FBQztLQUFBOztBQXRCYyxrQkFBUSxHQUFXLFlBQVksQ0FBQztBQURuRCw4QkF3QkMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9jb250ZW50L2dpdElnbm9yZS5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== diff --git a/dist/pipelineSteps/content/htmlTemplate.d.ts b/dist/pipelineSteps/content/htmlTemplate.d.ts index 5855c7e8..5ed136e3 100644 --- a/dist/pipelineSteps/content/htmlTemplate.d.ts +++ b/dist/pipelineSteps/content/htmlTemplate.d.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate html template. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -11,7 +10,7 @@ import { EngineVariablesHtml } from "../../engine/engineVariablesHtml"; export declare class HtmlTemplate extends EnginePipelineStepBase { private static FILENAME_NO_BUNDLE; private static FILENAME_BUNDLE; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; - createTemplate(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, filename: string, engineVariablesHtml: EngineVariablesHtml): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + createTemplate(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, filename: string, engineVariablesHtml: EngineVariablesHtml): Promise; private addLine(indent, lines, content); } diff --git a/dist/pipelineSteps/content/htmlTemplate.js b/dist/pipelineSteps/content/htmlTemplate.js index 4b38f98b..1d0c9864 100644 --- a/dist/pipelineSteps/content/htmlTemplate.js +++ b/dist/pipelineSteps/content/htmlTemplate.js @@ -10,22 +10,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class HtmlTemplate extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { - let ret = yield this.createTemplate(logger, display, fileSystem, uniteConfiguration, engineVariables, HtmlTemplate.FILENAME_NO_BUNDLE, engineVariables.htmlNoBundle); + let ret = yield this.createTemplate(logger, fileSystem, uniteConfiguration, engineVariables, HtmlTemplate.FILENAME_NO_BUNDLE, engineVariables.htmlNoBundle); if (ret === 0) { - ret = yield this.createTemplate(logger, display, fileSystem, uniteConfiguration, engineVariables, HtmlTemplate.FILENAME_BUNDLE, engineVariables.htmlBundle); + ret = yield this.createTemplate(logger, fileSystem, uniteConfiguration, engineVariables, HtmlTemplate.FILENAME_BUNDLE, engineVariables.htmlBundle); } return ret; }); } - createTemplate(logger, display, fileSystem, uniteConfiguration, engineVariables, filename, engineVariablesHtml) { + createTemplate(logger, fileSystem, uniteConfiguration, engineVariables, filename, engineVariablesHtml) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { try { const hasGeneratedMarker = yield _super("fileHasGeneratedMarker").call(this, fileSystem, engineVariables.wwwFolder, filename); if (hasGeneratedMarker) { - _super("log").call(this, logger, display, `Generating ${filename}`, { wwwFolder: engineVariables.wwwFolder }); + logger.info(`Generating ${filename}`, { wwwFolder: engineVariables.wwwFolder }); const lines = []; let indent = 0; this.addLine(indent, lines, ""); @@ -63,12 +63,12 @@ class HtmlTemplate extends enginePipelineStepBase_1.EnginePipelineStepBase { yield fileSystem.fileWriteLines(engineVariables.wwwFolder, filename, lines); } else { - _super("log").call(this, logger, display, `Skipping ${filename} as it has no generated marker`, { wwwFolder: engineVariables.wwwFolder }); + logger.info(`Skipping ${filename} as it has no generated marker`, { wwwFolder: engineVariables.wwwFolder }); } return 0; } catch (err) { - _super("error").call(this, logger, display, `Generating ${filename} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Generating ${filename} failed`, err, { wwwFolder: engineVariables.wwwFolder }); return 1; } }); @@ -81,4 +81,4 @@ HtmlTemplate.FILENAME_NO_BUNDLE = "index-no-bundle.html"; HtmlTemplate.FILENAME_BUNDLE = "index-bundle.html"; exports.HtmlTemplate = HtmlTemplate; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2NvbnRlbnQvaHRtbFRlbXBsYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFPQSxnRkFBNkU7QUFJN0Usa0JBQTBCLFNBQVEsK0NBQXNCO0lBSXZDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsT0FBaUIsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOztZQUN0SixJQUFJLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsa0JBQWtCLEVBQUUsZUFBZSxFQUFFLFlBQVksQ0FBQyxrQkFBa0IsRUFBRSxlQUFlLENBQUMsWUFBWSxDQUFDLENBQUM7WUFFckssRUFBRSxDQUFDLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ1osR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxrQkFBa0IsRUFBRSxlQUFlLEVBQUUsWUFBWSxDQUFDLGVBQWUsRUFBRSxlQUFlLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDaEssQ0FBQztZQUVELE1BQU0sQ0FBQyxHQUFHLENBQUM7UUFDZixDQUFDO0tBQUE7SUFFWSxjQUFjLENBQUMsTUFBZSxFQUNmLE9BQWlCLEVBQ2pCLFVBQXVCLEVBQ3ZCLGtCQUFzQyxFQUN0QyxlQUFnQyxFQUNoQyxRQUFnQixFQUNoQixtQkFBd0M7OztZQUNoRSxJQUFJLENBQUM7Z0JBQ0QsTUFBTSxrQkFBa0IsR0FBRyxNQUFNLGdDQUE0QixZQUFDLFVBQVUsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLFFBQVEsQ0FBQyxDQUFDO2dCQUUvRyxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7b0JBQ3JCLGFBQVMsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLGNBQWMsUUFBUSxFQUFFLEVBQUUsRUFBRSxT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UyxFQUFFLEVBQUU7Z0JBQy9ILENBQUM7Z0JBRUQsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7WUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNYLGVBQVcsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLGNBQWMsUUFBUSxTQUFTLEVBQUUsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsRUFBRTtnQkFDN0csTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7UUFDTCxDQUFDO0tBQUE7SUFFTyxPQUFPLENBQUMsTUFBYyxFQUFFLEtBQWUsRUFBRSxPQUFlO1FBQzVELEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLEdBQUcsT0FBTyxDQUFDLENBQUM7SUFDakQsQ0FBQzs7QUE5RWMsK0JBQWtCLEdBQVcsc0JBQXNCLENBQUM7QUFDcEQsNEJBQWUsR0FBVyxtQkFBbUIsQ0FBQztBQUZqRSxvQ0FnRkMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9jb250ZW50L2h0bWxUZW1wbGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2NvbnRlbnQvaHRtbFRlbXBsYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFNQSxnRkFBNkU7QUFJN0Usa0JBQTBCLFNBQVEsK0NBQXNCO0lBSXZDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7WUFDbkksSUFBSSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLE1BQU0sRUFBRSxVQUFVLEVBQUUsa0JBQWtCLEVBQUUsZUFBZSxFQUFFLFlBQVksQ0FBQyxrQkFBa0IsRUFBRSxlQUFlLENBQUMsWUFBWSxDQUFDLENBQUM7WUFFNUosRUFBRSxDQUFDLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ1osR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGtCQUFrQixFQUFFLGVBQWUsRUFBRSxZQUFZLENBQUMsZUFBZSxFQUFFLGVBQWUsQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUN2SixDQUFDO1lBRUQsTUFBTSxDQUFDLEdBQUcsQ0FBQztRQUNmLENBQUM7S0FBQTtJQUVZLGNBQWMsQ0FBQyxNQUFlLEVBQ2YsVUFBdUIsRUFDdkIsa0JBQXNDLEVBQ3RDLGVBQWdDLEVBQ2hDLFFBQWdCLEVBQ2hCLG1CQUF3Qzs7O1lBQ2hFLElBQUksQ0FBQztnQkFDRCxNQUFNLGtCQUFrQixHQUFHLE1BQU0sZ0NBQTRCLFlBQUMsVUFBVSxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQUM7Z0JBRS9HLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQztvQkFDckIsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLFFBQVEsRUFBRSxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDO29CQUVoRixNQUFNLEtB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YixDQUFDO1lBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFDWCxNQUFNLENBQUMsS0FBSyxDQUFDLGNBQWMsUUFBUSxTQUFTLEVBQUUsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDO2dCQUM3RixNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztRQUNMLENBQUM7S0FBQTtJQUVPLE9BQU8sQ0FBQyxNQUFjLEVBQUUsS0FBZSxFQUFFLE9BQWU7UUFDNUQsS0FBSyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsR0FBRyxPQUFPLENBQUMsQ0FBQztJQUNqRCxDQUFDOztBQTdFYywrQkFBa0IsR0FBVyxzQkFBc0IsQ0FBQztBQUNwRCw0QkFBZSxHQUFXLG1CQUFtQixDQUFDO0FBRmpFLG9DQStFQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2NvbnRlbnQvaHRtbFRlbXBsYXRlLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 diff --git a/dist/pipelineSteps/content/license.d.ts b/dist/pipelineSteps/content/license.d.ts index 17f782f6..0cecfea7 100644 --- a/dist/pipelineSteps/content/license.d.ts +++ b/dist/pipelineSteps/content/license.d.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate LICENSE. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,5 +8,5 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class License extends EnginePipelineStepBase { private static FILENAME; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/content/license.js b/dist/pipelineSteps/content/license.js index f0dde5f8..2d335ef8 100644 --- a/dist/pipelineSteps/content/license.js +++ b/dist/pipelineSteps/content/license.js @@ -10,16 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class License extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { try { - _super("log").call(this, logger, display, `Writing ${License.FILENAME}`); + logger.info(`Generating ${License.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); yield fileSystem.fileWriteLines(engineVariables.wwwFolder, License.FILENAME, engineVariables.license.licenseText.split("\n")); return 0; } catch (err) { - _super("error").call(this, logger, display, `Writing ${License.FILENAME} failed`, err); + logger.error(`Generating ${License.FILENAME} failed`, err); return 1; } }); @@ -28,4 +27,4 @@ class License extends enginePipelineStepBase_1.EnginePipelineStepBase { License.FILENAME = "LICENSE"; exports.License = License; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2NvbnRlbnQvbGljZW5zZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBT0EsZ0ZBQTZFO0FBRzdFLGFBQXFCLFNBQVEsK0NBQXNCO0lBR2xDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsT0FBaUIsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOzs7WUFDdEosSUFBSSxDQUFDO2dCQUNELGFBQVMsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLFdBQVcsT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFO2dCQUUxRCxNQUFNLFVBQVUsQ0FBQyxjQUFjLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsUUFBUSxFQUFFLGVBQWUsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO2dCQUU5SCxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztZQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ1gsZUFBVyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsV0FBVyxPQUFPLENBQUMsUUFBUSxTQUFTLEVBQUUsR0FBRyxFQUFFO2dCQUN4RSxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztRQUNMLENBQUM7S0FBQTs7QUFiYyxnQkFBUSxHQUFXLFNBQVMsQ0FBQztBQURoRCwwQkFlQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2NvbnRlbnQvbGljZW5zZS5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2NvbnRlbnQvbGljZW5zZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBTUEsZ0ZBQTZFO0FBRzdFLGFBQXFCLFNBQVEsK0NBQXNCO0lBR2xDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7WUFDbkksSUFBSSxDQUFDO2dCQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxPQUFPLENBQUMsUUFBUSxFQUFFLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBQyxDQUFDLENBQUM7Z0JBRXZGLE1BQU0sVUFBVSxDQUFDLGNBQWMsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxRQUFRLEVBQUUsZUFBZSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7Z0JBRTlILE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDYixDQUFDO1lBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFDWCxNQUFNLENBQUMsS0FBSyxDQUFDLGNBQWMsT0FBTyxDQUFDLFFBQVEsU0FBUyxFQUFFLEdBQUcsQ0FBQyxDQUFDO2dCQUMzRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztRQUNMLENBQUM7S0FBQTs7QUFiYyxnQkFBUSxHQUFXLFNBQVMsQ0FBQztBQURoRCwwQkFlQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2NvbnRlbnQvbGljZW5zZS5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== diff --git a/dist/pipelineSteps/content/packageJson.d.ts b/dist/pipelineSteps/content/packageJson.d.ts index df48b37c..a937185e 100644 --- a/dist/pipelineSteps/content/packageJson.d.ts +++ b/dist/pipelineSteps/content/packageJson.d.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate package.json. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,6 +8,6 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class PackageJson extends EnginePipelineStepBase { private static FILENAME; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; private sortDependencies(dependencies); } diff --git a/dist/pipelineSteps/content/packageJson.js b/dist/pipelineSteps/content/packageJson.js index 41044bf8..9d64971a 100644 --- a/dist/pipelineSteps/content/packageJson.js +++ b/dist/pipelineSteps/content/packageJson.js @@ -11,23 +11,22 @@ Object.defineProperty(exports, "__esModule", { value: true }); const packageConfiguration_1 = require("../../configuration/models/packages/packageConfiguration"); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class PackageJson extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { try { let existingPackageJson; try { const exists = yield fileSystem.fileExists(engineVariables.wwwFolder, PackageJson.FILENAME); if (exists) { - _super("log").call(this, logger, display, `Loading existing ${PackageJson.FILENAME}`, { core: engineVariables.wwwFolder, dependenciesFile: PackageJson.FILENAME }); + logger.info(`Loading existing ${PackageJson.FILENAME}`, { core: engineVariables.wwwFolder, dependenciesFile: PackageJson.FILENAME }); existingPackageJson = yield fileSystem.fileReadJson(engineVariables.wwwFolder, PackageJson.FILENAME); } } catch (err) { - _super("error").call(this, logger, display, `Loading existing ${PackageJson.FILENAME} failed`, err, { core: engineVariables.wwwFolder, dependenciesFile: PackageJson.FILENAME }); + logger.error(`Loading existing ${PackageJson.FILENAME} failed`, err, { core: engineVariables.wwwFolder, dependenciesFile: PackageJson.FILENAME }); return 1; } - _super("log").call(this, logger, display, `Generating ${PackageJson.FILENAME} in`, { wwwFolder: engineVariables.wwwFolder }); + logger.info(`Generating ${PackageJson.FILENAME} in`, { wwwFolder: engineVariables.wwwFolder }); const packageJson = existingPackageJson || new packageConfiguration_1.PackageConfiguration(); packageJson.name = uniteConfiguration.packageName; packageJson.version = packageJson.version || "0.0.1"; @@ -43,7 +42,7 @@ class PackageJson extends enginePipelineStepBase_1.EnginePipelineStepBase { return 0; } catch (err) { - _super("error").call(this, logger, display, `Generating ${PackageJson.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Generating ${PackageJson.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); return 1; } }); @@ -61,4 +60,4 @@ class PackageJson extends enginePipelineStepBase_1.EnginePipelineStepBase { PackageJson.FILENAME = "package.json"; exports.PackageJson = PackageJson; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2NvbnRlbnQvcGFja2FnZUpzb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU1BLG1HQUFnRztBQUVoRyxnRkFBNkU7QUFHN0UsaUJBQXlCLFNBQVEsK0NBQXNCO0lBR3RDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsT0FBaUIsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOzs7WUFDdEosSUFBSSxDQUFDO2dCQUNELElBQUksbUJBQXFELENBQUM7Z0JBQzFELElBQUksQ0FBQztvQkFDRCxNQUFNLE1BQU0sR0FBRyxNQUFNLFVBQVUsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxXQUFXLENBQUMsUUFBUSxDQUFDLENBQUM7b0JBRTVGLEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7d0JBQ1QsYUFBUyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsb0JBQW9CLFdBQVcsQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLGdCQUFnQixFQUFFLFdBQVcsQ0FBQyxRQUFRLEVBQUUsRUFBRTt3QkFFcEosbUJBQW1CLEdBQUcsTUFBTSxVQUFVLENBQUMsWUFBWSxDQUF1QixlQUFlLENBQUMsU0FBUyxFQUFFLFdBQVcsQ0FBQyxRQUFRLENBQUMsQ0FBQztvQkFDL0gsQ0FBQztnQkFDTCxDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsZUFBVyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsb0JBQW9CLFdBQVcsQ0FBQyxRQUFRLFNBQVMsRUFBRSxHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxnQkFBZ0IsRUFBRSxXQUFXLENBQUMsUUFBUSxFQUFFLEVBQUU7b0JBQ2xLLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztnQkFFRCxhQUFTLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxjQUFjLFdBQVcsQ0FBQyxRQUFRLEtBQUssRUFBRSxFQUFFLFNBQVMsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLEVBQUU7Z0JBRTlHLE1BQU0sV0FBVyxHQUFHLG1CQUFtQixJQUFJLElBQUksMkNBQW9CLEVBQUUsQ0FBQztnQkFDdEUsV0FBVyxDQUFDLElBQUksR0FBRyxrQkFBa0IsQ0FBQyxXQUFXLENBQUM7Z0JBQ2xELFdBQVcsQ0FBQyxPQUFPLEdBQUcsV0FBVyxDQUFDLE9BQU8sSUFBSSxPQUFPLENBQUM7Z0JBQ3JELFdBQVcsQ0FBQyxPQUFPLEdBQUcsa0JBQWtCLENBQUMsT0FBTyxDQUFDO2dCQUNqRCxXQUFXLENBQUMsZUFBZSxHQUFHLFdBQVcsQ0FBQyxlQUFlLElBQUksRUFBRSxDQUFDO2dCQUNoRSxXQUFXLENBQUMsWUFBWSxHQUFHLFdBQVcsQ0FBQyxZQUFZLElBQUksRUFBRSxDQUFDO2dCQUMxRCxXQUFXLENBQUMsT0FBTyxHQUFHLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxDQUFDO2dCQUUxQyxlQUFlLENBQUMsaUJBQWlCLENBQUMsa0JBQWtCLEVBQUUsV0FBVyxDQUFDLFlBQVksQ0FBQyxDQUFDO2dCQUNoRixlQUFlLENBQUMsb0JBQW9CLENBQUMsV0FBVyxDQUFDLGVBQWUsQ0FBQyxDQUFDO2dCQUVsRSxXQUFXLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxXQUFXLENBQUMsWUFBWSxDQUFDLENBQUM7Z0JBQzNFLFdBQVcsQ0FBQyxlQUFlLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFdBQVcsQ0FBQyxlQUFlLENBQUMsQ0FBQztnQkFFakYsTUFBTSxVQUFVLENBQUMsYUFBYSxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsV0FBVyxDQUFDLFFBQVEsRUFBRSxXQUFXLENBQUMsQ0FBQztnQkFDN0YsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7WUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNYLGVBQVcsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLGNBQWMsV0FBVyxDQUFDLFFBQVEsU0FBUyxFQUFFLEdBQUcsRUFBRSxFQUFFLFNBQVMsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLEVBQUU7Z0JBQ3pILE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDYixDQUFDO1FBQ0wsQ0FBQztLQUFBO0lBRU8sZ0JBQWdCLENBQUMsWUFBc0M7UUFDM0QsTUFBTSxlQUFlLEdBQTZCLEVBQUUsQ0FBQztRQUNyRCxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3ZDLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNaLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRztZQUNaLGVBQWUsQ0FBQyxHQUFHLENBQUMsR0FBRyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDN0MsQ0FBQyxDQUFDLENBQUM7UUFFSCxNQUFNLENBQUMsZUFBZSxDQUFDO0lBRTNCLENBQUM7O0FBcERjLG9CQUFRLEdBQVcsY0FBYyxDQUFDO0FBRHJELGtDQXNEQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2NvbnRlbnQvcGFja2FnZUpzb24uanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2NvbnRlbnQvcGFja2FnZUpzb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUtBLG1HQUFnRztBQUVoRyxnRkFBNkU7QUFHN0UsaUJBQXlCLFNBQVEsK0NBQXNCO0lBR3RDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7WUFDbkksSUFBSSxDQUFDO2dCQUNELElBQUksbUJBQXFELENBQUM7Z0JBQzFELElBQUksQ0FBQztvQkFDRCxNQUFNLE1BQU0sR0FBRyxNQUFNLFVBQVUsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxXQUFXLENBQUMsUUFBUSxDQUFDLENBQUM7b0JBRTVGLEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7d0JBQ1QsTUFBTSxDQUFDLElBQUksQ0FBQyxvQkFBb0IsV0FBVyxDQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsZ0JBQWdCLEVBQUUsV0FBVyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7d0JBRXJJLG1CQUFtQixHQUFHLE1BQU0sVUFBVSxDQUFDLFlBQVksQ0FBdUIsZUFBZSxDQUFDLFNBQVMsRUFBRSxXQUFXLENBQUMsUUFBUSxDQUFDLENBQUM7b0JBQy9ILENBQUM7Z0JBQ0wsQ0FBQztnQkFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUNYLE1BQU0sQ0FBQyxLQUFLLENBQUMsb0JBQW9CLFdBQVcsQ0FBQyxRQUFRLFNBQVMsRUFBRSxHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxnQkFBZ0IsRUFBRSxXQUFXLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztvQkFDbEosTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUVELE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxXQUFXLENBQUMsUUFBUSxLQUFLLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7Z0JBRS9GLE1BQU0sV0FBVyxHQUFHLG1CQUFtQixJQUFJLElBQUksMkNBQW9CLEVBQUUsQ0FBQztnQkFDdEUsV0FBVyxDQUFDLElBQUksR0FBRyxrQkFBa0IsQ0FBQyxXQUFXLENBQUM7Z0JBQ2xELFdBQVcsQ0FBQyxPQUFPLEdBQUcsV0FBVyxDQUFDLE9BQU8sSUFBSSxPQUFPLENBQUM7Z0JBQ3JELFdBQVcsQ0FBQyxPQUFPLEdBQUcsa0JBQWtCLENBQUMsT0FBTyxDQUFDO2dCQUNqRCxXQUFXLENBQUMsZUFBZSxHQUFHLFdBQVcsQ0FBQyxlQUFlLElBQUksRUFBRSxDQUFDO2dCQUNoRSxXQUFXLENBQUMsWUFBWSxHQUFHLFdBQVcsQ0FBQyxZQUFZLElBQUksRUFBRSxDQUFDO2dCQUMxRCxXQUFXLENBQUMsT0FBTyxHQUFHLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxDQUFDO2dCQUUxQyxlQUFlLENBQUMsaUJBQWlCLENBQUMsa0JBQWtCLEVBQUUsV0FBVyxDQUFDLFlBQVksQ0FBQyxDQUFDO2dCQUNoRixlQUFlLENBQUMsb0JBQW9CLENBQUMsV0FBVyxDQUFDLGVBQWUsQ0FBQyxDQUFDO2dCQUVsRSxXQUFXLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxXQUFXLENBQUMsWUFBWSxDQUFDLENBQUM7Z0JBQzNFLFdBQVcsQ0FBQyxlQUFlLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFdBQVcsQ0FBQyxlQUFlLENBQUMsQ0FBQztnQkFFakYsTUFBTSxVQUFVLENBQUMsYUFBYSxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsV0FBVyxDQUFDLFFBQVEsRUFBRSxXQUFXLENBQUMsQ0FBQztnQkFDN0YsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7WUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNYLE1BQU0sQ0FBQyxLQUFLLENBQUMsY0FBYyxXQUFXLENBQUMsUUFBUSxTQUFTLEVBQUUsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDO2dCQUN6RyxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztRQUNMLENBQUM7S0FBQTtJQUVPLGdCQUFnQixDQUFDLFlBQXNDO1FBQzNELE1BQU0sZUFBZSxHQUE2QixFQUFFLENBQUM7UUFDckQsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUN2QyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDWixJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUc7WUFDWixlQUFlLENBQUMsR0FBRyxDQUFDLEdBQUcsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzdDLENBQUMsQ0FBQyxDQUFDO1FBRUgsTUFBTSxDQUFDLGVBQWUsQ0FBQztJQUUzQixDQUFDOztBQXBEYyxvQkFBUSxHQUFXLGNBQWMsQ0FBQztBQURyRCxrQ0FzREMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9jb250ZW50L3BhY2thZ2VKc29uLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 diff --git a/dist/pipelineSteps/content/readMe.d.ts b/dist/pipelineSteps/content/readMe.d.ts index 23a8b06d..22c690b5 100644 --- a/dist/pipelineSteps/content/readMe.d.ts +++ b/dist/pipelineSteps/content/readMe.d.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate README.md. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,5 +8,5 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class ReadMe extends EnginePipelineStepBase { private static FILENAME; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/content/readMe.js b/dist/pipelineSteps/content/readMe.js index 9db82c3f..b34e2d44 100644 --- a/dist/pipelineSteps/content/readMe.js +++ b/dist/pipelineSteps/content/readMe.js @@ -10,13 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class ReadMe extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { try { const hasGeneratedMarker = yield _super("fileHasGeneratedMarker").call(this, fileSystem, engineVariables.wwwFolder, ReadMe.FILENAME); if (hasGeneratedMarker) { - _super("log").call(this, logger, display, `Writing ${ReadMe.FILENAME}`); + logger.info(`Generating ${ReadMe.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); const lines = yield fileSystem.fileReadLines(engineVariables.packageAssetsDirectory, ReadMe.FILENAME); lines.unshift(""); lines.unshift(`# ${uniteConfiguration.title}`); @@ -25,12 +25,12 @@ class ReadMe extends enginePipelineStepBase_1.EnginePipelineStepBase { yield fileSystem.fileWriteLines(engineVariables.wwwFolder, ReadMe.FILENAME, lines); } else { - _super("log").call(this, logger, display, `Skipping ${ReadMe.FILENAME} as it has no generated marker`); + logger.info(`Skipping ${ReadMe.FILENAME} as it has no generated marker`); } return 0; } catch (err) { - _super("error").call(this, logger, display, `Writing ${ReadMe.FILENAME} failed`, err); + logger.error(`Generating ${ReadMe.FILENAME} failed`, err); return 1; } }); @@ -39,4 +39,4 @@ class ReadMe extends enginePipelineStepBase_1.EnginePipelineStepBase { ReadMe.FILENAME = "README.md"; exports.ReadMe = ReadMe; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2NvbnRlbnQvcmVhZE1lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFPQSxnRkFBNkU7QUFHN0UsWUFBb0IsU0FBUSwrQ0FBc0I7SUFHakMsT0FBTyxDQUFDLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUN0SixJQUFJLENBQUM7Z0JBQ0QsTUFBTSxrQkFBa0IsR0FBRyxNQUFNLGdDQUE0QixZQUFDLFVBQVUsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQztnQkFFdEgsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDO29CQUNyQixhQUFTLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxXQUFXLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRTtvQkFFekQsTUFBTSxLQUFLLEdBQUcsTUFBTSxVQUFVLENBQUMsYUFBYSxDQUFDLGVBQWUsQ0FBQyxzQkFBc0IsRUFBRSxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7b0JBRXRHLEtBQUssQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUM7b0JBQ2xCLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxrQkFBa0IsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO29CQUUvQyxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO29CQUNsQixLQUFLLENBQUMsSUFBSSxDQUFDLDZCQUF5QixZQUFDLEdBQUcsRUFBRSxTQUFTLEVBQUUsQ0FBQztvQkFFdEQsTUFBTSxVQUFVLENBQUMsY0FBYyxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsQ0FBQztnQkFDdkYsQ0FBQztnQkFBQyxJQUFJLENBQUMsQ0FBQztvQkFDSixhQUFTLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxZQUFZLE1BQU0sQ0FBQyxRQUFRLGdDQUFnQyxFQUFFO2dCQUM1RixDQUFDO2dCQUVELE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDYixDQUFDO1lBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFDWCxlQUFXLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxXQUFXLE1BQU0sQ0FBQyxRQUFRLFNBQVMsRUFBRSxHQUFHLEVBQUU7Z0JBQ3ZFLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDYixDQUFDO1FBQ0wsQ0FBQztLQUFBOztBQTNCYyxlQUFRLEdBQVcsV0FBVyxDQUFDO0FBRGxELHdCQTZCQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2NvbnRlbnQvcmVhZE1lLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2NvbnRlbnQvcmVhZE1lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFNQSxnRkFBNkU7QUFHN0UsWUFBb0IsU0FBUSwrQ0FBc0I7SUFHakMsT0FBTyxDQUFDLE1BQWUsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOzs7WUFDbkksSUFBSSxDQUFDO2dCQUNELE1BQU0sa0JBQWtCLEdBQUcsTUFBTSxnQ0FBNEIsWUFBQyxVQUFVLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7Z0JBRXRILEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQztvQkFDckIsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLFNBQVMsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFDLENBQUMsQ0FBQztvQkFFdEYsTUFBTSxLQUFLLEdBQUcsTUFBTSxVQUFVLENBQUMsYUFBYSxDQUFDLGVBQWUsQ0FBQyxzQkFBc0IsRUFBRSxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7b0JBRXRHLEtBQUssQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUM7b0JBQ2xCLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxrQkFBa0IsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO29CQUUvQyxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO29CQUNsQixLQUFLLENBQUMsSUFBSSxDQUFDLDZCQUF5QixZQUFDLEdBQUcsRUFBRSxTQUFTLEVBQUUsQ0FBQztvQkFFdEQsTUFBTSxVQUFVLENBQUMsY0FBYyxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsQ0FBQztnQkFDdkYsQ0FBQztnQkFBQyxJQUFJLENBQUMsQ0FBQztvQkFDSixNQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksTUFBTSxDQUFDLFFBQVEsZ0NBQWdDLENBQUMsQ0FBQztnQkFDN0UsQ0FBQztnQkFFRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztZQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQyxjQUFjLE1BQU0sQ0FBQyxRQUFRLFNBQVMsRUFBRSxHQUFHLENBQUMsQ0FBQztnQkFDMUQsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7UUFDTCxDQUFDO0tBQUE7O0FBM0JjLGVBQVEsR0FBVyxXQUFXLENBQUM7QUFEbEQsd0JBNkJDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvY29udGVudC9yZWFkTWUuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/cssPostProcessor/postCss.d.ts b/dist/pipelineSteps/cssPostProcessor/postCss.d.ts index 8e1ef231..e160cd24 100644 --- a/dist/pipelineSteps/cssPostProcessor/postCss.d.ts +++ b/dist/pipelineSteps/cssPostProcessor/postCss.d.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate handle postCss styling. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,6 +8,6 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class PostCss extends EnginePipelineStepBase { private static FILENAME; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; private generateConfig(existing); } diff --git a/dist/pipelineSteps/cssPostProcessor/postCss.js b/dist/pipelineSteps/cssPostProcessor/postCss.js index 169f31cf..1b1e7104 100644 --- a/dist/pipelineSteps/cssPostProcessor/postCss.js +++ b/dist/pipelineSteps/cssPostProcessor/postCss.js @@ -11,13 +11,13 @@ Object.defineProperty(exports, "__esModule", { value: true }); const postCssConfiguration_1 = require("../../configuration/models/postcss/postCssConfiguration"); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class PostCss extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["postcss", "postcss-import", "autoprefixer", "cssnano"], uniteConfiguration.cssPost === "PostCss"); if (uniteConfiguration.cssPost === "PostCss") { try { - _super("log").call(this, logger, display, `Generating ${PostCss.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); + logger.info(`Generating ${PostCss.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); let existing; try { const exists = yield fileSystem.fileExists(engineVariables.wwwFolder, PostCss.FILENAME); @@ -26,7 +26,7 @@ class PostCss extends enginePipelineStepBase_1.EnginePipelineStepBase { } } catch (err) { - _super("error").call(this, logger, display, `Loading existing ${PostCss.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Loading existing ${PostCss.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); return 1; } const config = this.generateConfig(existing); @@ -34,12 +34,12 @@ class PostCss extends enginePipelineStepBase_1.EnginePipelineStepBase { return 0; } catch (err) { - _super("error").call(this, logger, display, `Generating ${PostCss.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Generating ${PostCss.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); return 1; } } else { - return yield _super("deleteFile").call(this, logger, display, fileSystem, engineVariables.wwwFolder, PostCss.FILENAME); + return yield _super("deleteFile").call(this, logger, fileSystem, engineVariables.wwwFolder, PostCss.FILENAME); } }); } @@ -54,4 +54,4 @@ class PostCss extends enginePipelineStepBase_1.EnginePipelineStepBase { PostCss.FILENAME = ".postcssrc.json"; exports.PostCss = PostCss; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2Nzc1Bvc3RQcm9jZXNzb3IvcG9zdENzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBTUEsa0dBQStGO0FBRS9GLGdGQUE2RTtBQUc3RSxhQUFxQixTQUFRLCtDQUFzQjtJQUdsQyxPQUFPLENBQUMsTUFBZSxFQUFFLE9BQWlCLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ3RKLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLFNBQVMsRUFBRSxnQkFBZ0IsRUFBRSxjQUFjLEVBQUUsU0FBUyxDQUFDLEVBQUUsa0JBQWtCLENBQUMsT0FBTyxLQUFLLFNBQVMsQ0FBQyxDQUFDO1lBRXhJLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLE9BQU8sS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDO2dCQUMzQyxJQUFJLENBQUM7b0JBQ0QsYUFBUyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsY0FBYyxPQUFPLENBQUMsUUFBUSxFQUFFLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxFQUFFO29CQUV2RyxJQUFJLFFBQVEsQ0FBQztvQkFFYixJQUFJLENBQUM7d0JBQ0QsTUFBTSxNQUFNLEdBQUcsTUFBTSxVQUFVLENBQUMsVUFBVSxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO3dCQUV4RixFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDOzRCQUNULFFBQVEsR0FBRyxNQUFNLFVBQVUsQ0FBQyxZQUFZLENBQXVCLGVBQWUsQ0FBQyxTQUFTLEVBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO3dCQUVoSCxDQUFDO29CQUNMLENBQUM7b0JBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQzt3QkFDWCxlQUFXLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxvQkFBb0IsT0FBTyxDQUFDLFFBQVEsU0FBUyxFQUFFLEdBQUcsRUFBRSxFQUFFLFNBQVMsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLEVBQUU7d0JBQzNILE1BQU0sQ0FBQyxDQUFDLENBQUM7b0JBQ2IsQ0FBQztvQkFFRCxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxDQUFDO29CQUU3QyxNQUFNLFVBQVUsQ0FBQyxhQUFhLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLENBQUMsQ0FBQztvQkFDckYsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsZUFBVyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsY0FBYyxPQUFPLENBQUMsUUFBUSxTQUFTLEVBQUUsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsRUFBRTtvQkFDckgsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO1lBQ0wsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLE1BQU0sQ0FBQyxNQUFNLG9CQUFnQixZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQzVHLENBQUM7UUFDTCxDQUFDO0tBQUE7SUFFTyxjQUFjLENBQUMsUUFBMEM7UUFDN0QsTUFBTSxNQUFNLEdBQUcsUUFBUSxJQUFJLElBQUksMkNBQW9CLEVBQUUsQ0FBQztRQUN0RCxNQUFNLENBQUMsT0FBTyxHQUFHLE1BQU0sQ0FBQyxPQUFPLElBQUksRUFBRSxDQUFDO1FBRXRDLE1BQU0sQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDdEMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxZQUFZLEdBQUcsRUFBRSxDQUFDO1FBRWpDLE1BQU0sQ0FBQyxNQUFNLENBQUM7SUFDbEIsQ0FBQzs7QUE1Q2MsZ0JBQVEsR0FBVyxpQkFBaUIsQ0FBQztBQUR4RCwwQkE4Q0MiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9jc3NQb3N0UHJvY2Vzc29yL3Bvc3RDc3MuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2Nzc1Bvc3RQcm9jZXNzb3IvcG9zdENzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBS0Esa0dBQStGO0FBRS9GLGdGQUE2RTtBQUc3RSxhQUFxQixTQUFRLCtDQUFzQjtJQUdsQyxPQUFPLENBQUMsTUFBZSxFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUNuSSxlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxTQUFTLEVBQUUsZ0JBQWdCLEVBQUUsY0FBYyxFQUFFLFNBQVMsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLE9BQU8sS0FBSyxTQUFTLENBQUMsQ0FBQztZQUV4SSxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQztnQkFDM0MsSUFBSSxDQUFDO29CQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxPQUFPLENBQUMsUUFBUSxFQUFFLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7b0JBRXhGLElBQUksUUFBUSxDQUFDO29CQUViLElBQUksQ0FBQzt3QkFDRCxNQUFNLE1BQU0sR0FBRyxNQUFNLFVBQVUsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7d0JBRXhGLEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7NEJBQ1QsUUFBUSxHQUFHLE1BQU0sVUFBVSxDQUFDLFlBQVksQ0FBdUIsZUFBZSxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7d0JBRWhILENBQUM7b0JBQ0wsQ0FBQztvQkFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO3dCQUNYLE1BQU0sQ0FBQyxLQUFLLENBQUMsb0JBQW9CLE9BQU8sQ0FBQyxRQUFRLFNBQVMsRUFBRSxHQUFHLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7d0JBQzNHLE1BQU0sQ0FBQyxDQUFDLENBQUM7b0JBQ2IsQ0FBQztvQkFFRCxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxDQUFDO29CQUU3QyxNQUFNLFVBQVUsQ0FBQyxhQUFhLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLENBQUMsQ0FBQztvQkFDckYsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQyxjQUFjLE9BQU8sQ0FBQyxRQUFRLFNBQVMsRUFBRSxHQUFHLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7b0JBQ3JHLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDSixNQUFNLENBQUMsTUFBTSxvQkFBZ0IsWUFBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ25HLENBQUM7UUFDTCxDQUFDO0tBQUE7SUFFTyxjQUFjLENBQUMsUUFBMEM7UUFDN0QsTUFBTSxNQUFNLEdBQUcsUUFBUSxJQUFJLElBQUksMkNBQW9CLEVBQUUsQ0FBQztRQUN0RCxNQUFNLENBQUMsT0FBTyxHQUFHLE1BQU0sQ0FBQyxPQUFPLElBQUksRUFBRSxDQUFDO1FBRXRDLE1BQU0sQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDdEMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxZQUFZLEdBQUcsRUFBRSxDQUFDO1FBRWpDLE1BQU0sQ0FBQyxNQUFNLENBQUM7SUFDbEIsQ0FBQzs7QUE1Q2MsZ0JBQVEsR0FBVyxpQkFBaUIsQ0FBQztBQUR4RCwwQkE4Q0MiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9jc3NQb3N0UHJvY2Vzc29yL3Bvc3RDc3MuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/cssPostProcessor/postCssNone.d.ts b/dist/pipelineSteps/cssPostProcessor/postCssNone.d.ts index 7ec15da5..f1bbfc85 100644 --- a/dist/pipelineSteps/cssPostProcessor/postCssNone.d.ts +++ b/dist/pipelineSteps/cssPostProcessor/postCssNone.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate handle none post css styling. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class PostCssNone extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/cssPostProcessor/postCssNone.js b/dist/pipelineSteps/cssPostProcessor/postCssNone.js index cf8aed7a..f4ab2a21 100644 --- a/dist/pipelineSteps/cssPostProcessor/postCssNone.js +++ b/dist/pipelineSteps/cssPostProcessor/postCssNone.js @@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class PostCssNone extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["cssnano", "gulp-cssnano"], uniteConfiguration.cssPost === "None"); return 0; @@ -19,4 +19,4 @@ class PostCssNone extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.PostCssNone = PostCssNone; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2Nzc1Bvc3RQcm9jZXNzb3IvcG9zdENzc05vbmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU9BLGdGQUE2RTtBQUc3RSxpQkFBeUIsU0FBUSwrQ0FBc0I7SUFDdEMsT0FBTyxDQUFDLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7O1lBQ3RKLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLFNBQVMsRUFBRSxjQUFjLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxPQUFPLEtBQUssTUFBTSxDQUFDLENBQUM7WUFFeEcsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtDQUNKO0FBTkQsa0NBTUMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9jc3NQb3N0UHJvY2Vzc29yL3Bvc3RDc3NOb25lLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2Nzc1Bvc3RQcm9jZXNzb3IvcG9zdENzc05vbmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU1BLGdGQUE2RTtBQUc3RSxpQkFBeUIsU0FBUSwrQ0FBc0I7SUFDdEMsT0FBTyxDQUFDLE1BQWUsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOztZQUNuSSxlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxTQUFTLEVBQUUsY0FBYyxDQUFDLEVBQUUsa0JBQWtCLENBQUMsT0FBTyxLQUFLLE1BQU0sQ0FBQyxDQUFDO1lBRXhHLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7Q0FDSjtBQU5ELGtDQU1DIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvY3NzUG9zdFByb2Nlc3Nvci9wb3N0Q3NzTm9uZS5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== diff --git a/dist/pipelineSteps/cssPreProcessor/css.d.ts b/dist/pipelineSteps/cssPreProcessor/css.d.ts index 8ef9d6dd..e11c8234 100644 --- a/dist/pipelineSteps/cssPreProcessor/css.d.ts +++ b/dist/pipelineSteps/cssPreProcessor/css.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate handle css styling. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class Css extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/cssPreProcessor/css.js b/dist/pipelineSteps/cssPreProcessor/css.js index 5f51c03a..627ab5a5 100644 --- a/dist/pipelineSteps/cssPreProcessor/css.js +++ b/dist/pipelineSteps/cssPreProcessor/css.js @@ -10,20 +10,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class Css extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { if (uniteConfiguration.cssPre === "Css") { try { - _super("log").call(this, logger, display, "Creating cssSrc folder", { cssSrcFolder: engineVariables.cssSrcFolder }); engineVariables.cssSrcFolder = fileSystem.pathCombine(engineVariables.wwwFolder, "cssSrc"); + logger.info("Creating cssSrc folder", { cssSrcFolder: engineVariables.cssSrcFolder }); engineVariables.styleLanguageExt = "css"; yield fileSystem.directoryCreate(engineVariables.cssSrcFolder); yield fileSystem.directoryCreate(engineVariables.cssDistFolder); return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating css folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); + logger.error("Generating css folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); return 1; } } @@ -33,4 +32,4 @@ class Css extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.Css = Css; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2Nzc1ByZVByb2Nlc3Nvci9jc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU9BLGdGQUE2RTtBQUc3RSxTQUFpQixTQUFRLCtDQUFzQjtJQUM5QixPQUFPLENBQUMsTUFBZSxFQUFFLE9BQWlCLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ3RKLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDO2dCQUN0QyxJQUFJLENBQUM7b0JBQ0QsYUFBUyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsRUFBRSxZQUFZLEVBQUUsZUFBZSxDQUFDLFlBQVksRUFBRSxFQUFFO29CQUVyRyxlQUFlLENBQUMsWUFBWSxHQUFHLFVBQVUsQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxRQUFRLENBQUMsQ0FBQztvQkFDM0YsZUFBZSxDQUFDLGdCQUFnQixHQUFHLEtBQUssQ0FBQztvQkFFekMsTUFBTSxVQUFVLENBQUMsZUFBZSxDQUFDLGVBQWUsQ0FBQyxZQUFZLENBQUMsQ0FBQztvQkFDL0QsTUFBTSxVQUFVLENBQUMsZUFBZSxDQUFDLGVBQWUsQ0FBQyxhQUFhLENBQUMsQ0FBQztvQkFFaEUsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsZUFBVyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsOEJBQThCLEVBQUUsR0FBRyxFQUFFLEVBQUUsWUFBWSxFQUFFLGVBQWUsQ0FBQyxZQUFZLEVBQUUsRUFBRTtvQkFDbEgsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO1lBQ0wsQ0FBQztZQUVELE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7Q0FDSjtBQXJCRCxrQkFxQkMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9jc3NQcmVQcm9jZXNzb3IvY3NzLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2Nzc1ByZVByb2Nlc3Nvci9jc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU1BLGdGQUE2RTtBQUc3RSxTQUFpQixTQUFRLCtDQUFzQjtJQUM5QixPQUFPLENBQUMsTUFBZSxFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7O1lBQ25JLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDO2dCQUN0QyxJQUFJLENBQUM7b0JBQ0QsZUFBZSxDQUFDLFlBQVksR0FBRyxVQUFVLENBQUMsV0FBVyxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQUM7b0JBRTNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsd0JBQXdCLEVBQUUsRUFBRSxZQUFZLEVBQUUsZUFBZSxDQUFDLFlBQVksRUFBRSxDQUFDLENBQUM7b0JBRXRGLGVBQWUsQ0FBQyxnQkFBZ0IsR0FBRyxLQUFLLENBQUM7b0JBRXpDLE1BQU0sVUFBVSxDQUFDLGVBQWUsQ0FBQyxlQUFlLENBQUMsWUFBWSxDQUFDLENBQUM7b0JBQy9ELE1BQU0sVUFBVSxDQUFDLGVBQWUsQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLENBQUM7b0JBRWhFLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztnQkFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUNYLE1BQU0sQ0FBQyxLQUFLLENBQUMsOEJBQThCLEVBQUUsR0FBRyxFQUFFLEVBQUUsWUFBWSxFQUFFLGVBQWUsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUFDO29CQUNsRyxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7WUFDTCxDQUFDO1lBRUQsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtDQUNKO0FBdEJELGtCQXNCQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2Nzc1ByZVByb2Nlc3Nvci9jc3MuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/cssPreProcessor/less.d.ts b/dist/pipelineSteps/cssPreProcessor/less.d.ts index 71ac19c2..0c3a6329 100644 --- a/dist/pipelineSteps/cssPreProcessor/less.d.ts +++ b/dist/pipelineSteps/cssPreProcessor/less.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate handle less styling. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class Less extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/cssPreProcessor/less.js b/dist/pipelineSteps/cssPreProcessor/less.js index 8237bba6..5fd4eda1 100644 --- a/dist/pipelineSteps/cssPreProcessor/less.js +++ b/dist/pipelineSteps/cssPreProcessor/less.js @@ -10,21 +10,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class Less extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["less"], uniteConfiguration.cssPre === "Less"); if (uniteConfiguration.cssPre === "Less") { try { - _super("log").call(this, logger, display, "Creating Less folder", { cssSrcFolder: engineVariables.cssSrcFolder }); engineVariables.cssSrcFolder = fileSystem.pathCombine(engineVariables.wwwFolder, "less"); + logger.info("Creating Less folder", { cssSrcFolder: engineVariables.cssSrcFolder }); engineVariables.styleLanguageExt = "less"; yield fileSystem.directoryCreate(engineVariables.cssSrcFolder); yield fileSystem.directoryCreate(engineVariables.cssDistFolder); return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating Less folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); + logger.error("Generating Less folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); return 1; } } @@ -34,4 +33,4 @@ class Less extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.Less = Less; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2Nzc1ByZVByb2Nlc3Nvci9sZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFPQSxnRkFBNkU7QUFHN0UsVUFBa0IsU0FBUSwrQ0FBc0I7SUFDL0IsT0FBTyxDQUFDLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUN0SixlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxNQUFNLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssTUFBTSxDQUFDLENBQUM7WUFFcEYsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsTUFBTSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ3ZDLElBQUksQ0FBQztvQkFDRCxhQUFTLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxFQUFFLFlBQVksRUFBRSxlQUFlLENBQUMsWUFBWSxFQUFFLEVBQUU7b0JBRW5HLGVBQWUsQ0FBQyxZQUFZLEdBQUcsVUFBVSxDQUFDLFdBQVcsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxDQUFDO29CQUN6RixlQUFlLENBQUMsZ0JBQWdCLEdBQUcsTUFBTSxDQUFDO29CQUUxQyxNQUFNLFVBQVUsQ0FBQyxlQUFlLENBQUMsZUFBZSxDQUFDLFlBQVksQ0FBQyxDQUFDO29CQUMvRCxNQUFNLFVBQVUsQ0FBQyxlQUFlLENBQUMsZUFBZSxDQUFDLGFBQWEsQ0FBQyxDQUFDO29CQUVoRSxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7Z0JBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztvQkFDWCxlQUFXLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSwrQkFBK0IsRUFBRSxHQUFHLEVBQUUsRUFBRSxZQUFZLEVBQUUsZUFBZSxDQUFDLFlBQVksRUFBRSxFQUFFO29CQUNuSCxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7WUFDTCxDQUFDO1lBRUQsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtDQUNKO0FBdkJELG9CQXVCQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2Nzc1ByZVByb2Nlc3Nvci9sZXNzLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2Nzc1ByZVByb2Nlc3Nvci9sZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFNQSxnRkFBNkU7QUFHN0UsVUFBa0IsU0FBUSwrQ0FBc0I7SUFDL0IsT0FBTyxDQUFDLE1BQWUsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOztZQUNuSSxlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxNQUFNLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssTUFBTSxDQUFDLENBQUM7WUFFcEYsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsTUFBTSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ3ZDLElBQUksQ0FBQztvQkFDRCxlQUFlLENBQUMsWUFBWSxHQUFHLFVBQVUsQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQztvQkFFekYsTUFBTSxDQUFDLElBQUksQ0FBQyxzQkFBc0IsRUFBRSxFQUFFLFlBQVksRUFBRSxlQUFlLENBQUMsWUFBWSxFQUFFLENBQUMsQ0FBQztvQkFFcEYsZUFBZSxDQUFDLGdCQUFnQixHQUFHLE1BQU0sQ0FBQztvQkFFMUMsTUFBTSxVQUFVLENBQUMsZUFBZSxDQUFDLGVBQWUsQ0FBQyxZQUFZLENBQUMsQ0FBQztvQkFDL0QsTUFBTSxVQUFVLENBQUMsZUFBZSxDQUFDLGVBQWUsQ0FBQyxhQUFhLENBQUMsQ0FBQztvQkFFaEUsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQywrQkFBK0IsRUFBRSxHQUFHLEVBQUUsRUFBRSxZQUFZLEVBQUUsZUFBZSxDQUFDLFlBQVksRUFBRSxDQUFDLENBQUM7b0JBQ25HLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFFRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0NBQ0o7QUF4QkQsb0JBd0JDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvY3NzUHJlUHJvY2Vzc29yL2xlc3MuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/cssPreProcessor/sass.d.ts b/dist/pipelineSteps/cssPreProcessor/sass.d.ts index 23794152..b9ca137f 100644 --- a/dist/pipelineSteps/cssPreProcessor/sass.d.ts +++ b/dist/pipelineSteps/cssPreProcessor/sass.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate handle sass styling. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class Sass extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/cssPreProcessor/sass.js b/dist/pipelineSteps/cssPreProcessor/sass.js index 7cc59158..0a0a2cbf 100644 --- a/dist/pipelineSteps/cssPreProcessor/sass.js +++ b/dist/pipelineSteps/cssPreProcessor/sass.js @@ -10,21 +10,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class Sass extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["node-sass"], uniteConfiguration.cssPre === "Sass"); if (uniteConfiguration.cssPre === "Sass") { try { - _super("log").call(this, logger, display, "Creating Sass folder", { cssSrcFolder: engineVariables.cssSrcFolder }); engineVariables.cssSrcFolder = fileSystem.pathCombine(engineVariables.wwwFolder, "sass"); + logger.info("Creating Sass folder", { cssSrcFolder: engineVariables.cssSrcFolder }); engineVariables.styleLanguageExt = "scss"; yield fileSystem.directoryCreate(engineVariables.cssSrcFolder); yield fileSystem.directoryCreate(engineVariables.cssDistFolder); return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating Sass folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); + logger.error("Generating Sass folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); return 1; } } @@ -34,4 +33,4 @@ class Sass extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.Sass = Sass; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2Nzc1ByZVByb2Nlc3Nvci9zYXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFPQSxnRkFBNkU7QUFHN0UsVUFBa0IsU0FBUSwrQ0FBc0I7SUFDL0IsT0FBTyxDQUFDLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUN0SixlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxXQUFXLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssTUFBTSxDQUFDLENBQUM7WUFFekYsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsTUFBTSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ3ZDLElBQUksQ0FBQztvQkFDRCxhQUFTLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxFQUFFLFlBQVksRUFBRSxlQUFlLENBQUMsWUFBWSxFQUFFLEVBQUU7b0JBRW5HLGVBQWUsQ0FBQyxZQUFZLEdBQUcsVUFBVSxDQUFDLFdBQVcsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxDQUFDO29CQUN6RixlQUFlLENBQUMsZ0JBQWdCLEdBQUcsTUFBTSxDQUFDO29CQUUxQyxNQUFNLFVBQVUsQ0FBQyxlQUFlLENBQUMsZUFBZSxDQUFDLFlBQVksQ0FBQyxDQUFDO29CQUMvRCxNQUFNLFVBQVUsQ0FBQyxlQUFlLENBQUMsZUFBZSxDQUFDLGFBQWEsQ0FBQyxDQUFDO29CQUVoRSxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7Z0JBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztvQkFDWCxlQUFXLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSwrQkFBK0IsRUFBRSxHQUFHLEVBQUUsRUFBRSxZQUFZLEVBQUUsZUFBZSxDQUFDLFlBQVksRUFBRSxFQUFFO29CQUNuSCxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7WUFDTCxDQUFDO1lBRUQsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtDQUNKO0FBdkJELG9CQXVCQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2Nzc1ByZVByb2Nlc3Nvci9zYXNzLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2Nzc1ByZVByb2Nlc3Nvci9zYXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFNQSxnRkFBNkU7QUFHN0UsVUFBa0IsU0FBUSwrQ0FBc0I7SUFDL0IsT0FBTyxDQUFDLE1BQWUsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOztZQUNuSSxlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxXQUFXLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssTUFBTSxDQUFDLENBQUM7WUFFekYsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsTUFBTSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ3ZDLElBQUksQ0FBQztvQkFDRCxlQUFlLENBQUMsWUFBWSxHQUFHLFVBQVUsQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQztvQkFFekYsTUFBTSxDQUFDLElBQUksQ0FBQyxzQkFBc0IsRUFBRSxFQUFFLFlBQVksRUFBRSxlQUFlLENBQUMsWUFBWSxFQUFFLENBQUMsQ0FBQztvQkFFcEYsZUFBZSxDQUFDLGdCQUFnQixHQUFHLE1BQU0sQ0FBQztvQkFFMUMsTUFBTSxVQUFVLENBQUMsZUFBZSxDQUFDLGVBQWUsQ0FBQyxZQUFZLENBQUMsQ0FBQztvQkFDL0QsTUFBTSxVQUFVLENBQUMsZUFBZSxDQUFDLGVBQWUsQ0FBQyxhQUFhLENBQUMsQ0FBQztvQkFFaEUsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQywrQkFBK0IsRUFBRSxHQUFHLEVBQUUsRUFBRSxZQUFZLEVBQUUsZUFBZSxDQUFDLFlBQVksRUFBRSxDQUFDLENBQUM7b0JBQ25HLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFFRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0NBQ0o7QUF4QkQsb0JBd0JDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvY3NzUHJlUHJvY2Vzc29yL3Nhc3MuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/cssPreProcessor/stylus.d.ts b/dist/pipelineSteps/cssPreProcessor/stylus.d.ts index 2abe5f1a..154a70bb 100644 --- a/dist/pipelineSteps/cssPreProcessor/stylus.d.ts +++ b/dist/pipelineSteps/cssPreProcessor/stylus.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate handle stylus styling. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class Stylus extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/cssPreProcessor/stylus.js b/dist/pipelineSteps/cssPreProcessor/stylus.js index 35d6c936..b3164a2f 100644 --- a/dist/pipelineSteps/cssPreProcessor/stylus.js +++ b/dist/pipelineSteps/cssPreProcessor/stylus.js @@ -10,21 +10,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class Stylus extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["stylus"], uniteConfiguration.cssPre === "Stylus"); if (uniteConfiguration.cssPre === "Stylus") { try { - _super("log").call(this, logger, display, "Creating Stylus folder", { cssSrcFolder: engineVariables.cssSrcFolder }); engineVariables.cssSrcFolder = fileSystem.pathCombine(engineVariables.wwwFolder, "stylus"); + logger.info("Creating Stylus folder", { cssSrcFolder: engineVariables.cssSrcFolder }); engineVariables.styleLanguageExt = "styl"; yield fileSystem.directoryCreate(engineVariables.cssSrcFolder); yield fileSystem.directoryCreate(engineVariables.cssDistFolder); return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating Stylus folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); + logger.error("Generating Stylus folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); return 1; } } @@ -34,4 +33,4 @@ class Stylus extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.Stylus = Stylus; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2Nzc1ByZVByb2Nlc3Nvci9zdHlsdXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU9BLGdGQUE2RTtBQUc3RSxZQUFvQixTQUFRLCtDQUFzQjtJQUNqQyxPQUFPLENBQUMsTUFBZSxFQUFFLE9BQWlCLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ3RKLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxRQUFRLENBQUMsQ0FBQztZQUV4RixFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztnQkFDekMsSUFBSSxDQUFDO29CQUNELGFBQVMsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLHdCQUF3QixFQUFFLEVBQUUsWUFBWSxFQUFFLGVBQWUsQ0FBQyxZQUFZLEVBQUUsRUFBRTtvQkFFckcsZUFBZSxDQUFDLFlBQVksR0FBRyxVQUFVLENBQUMsV0FBVyxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQUM7b0JBQzNGLGVBQWUsQ0FBQyxnQkFBZ0IsR0FBRyxNQUFNLENBQUM7b0JBRTFDLE1BQU0sVUFBVSxDQUFDLGVBQWUsQ0FBQyxlQUFlLENBQUMsWUFBWSxDQUFDLENBQUM7b0JBQy9ELE1BQU0sVUFBVSxDQUFDLGVBQWUsQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLENBQUM7b0JBRWhFLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztnQkFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUNYLGVBQVcsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLGlDQUFpQyxFQUFFLEdBQUcsRUFBRSxFQUFFLFlBQVksRUFBRSxlQUFlLENBQUMsWUFBWSxFQUFFLEVBQUU7b0JBQ3JILE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFFRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0NBQ0o7QUF2QkQsd0JBdUJDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvY3NzUHJlUHJvY2Vzc29yL3N0eWx1cy5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2Nzc1ByZVByb2Nlc3Nvci9zdHlsdXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU1BLGdGQUE2RTtBQUc3RSxZQUFvQixTQUFRLCtDQUFzQjtJQUNqQyxPQUFPLENBQUMsTUFBZSxFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7O1lBQ25JLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxRQUFRLENBQUMsQ0FBQztZQUV4RixFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztnQkFDekMsSUFBSSxDQUFDO29CQUNELGVBQWUsQ0FBQyxZQUFZLEdBQUcsVUFBVSxDQUFDLFdBQVcsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLFFBQVEsQ0FBQyxDQUFDO29CQUUzRixNQUFNLENBQUMsSUFBSSxDQUFDLHdCQUF3QixFQUFFLEVBQUUsWUFBWSxFQUFFLGVBQWUsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUFDO29CQUV0RixlQUFlLENBQUMsZ0JBQWdCLEdBQUcsTUFBTSxDQUFDO29CQUUxQyxNQUFNLFVBQVUsQ0FBQyxlQUFlLENBQUMsZUFBZSxDQUFDLFlBQVksQ0FBQyxDQUFDO29CQUMvRCxNQUFNLFVBQVUsQ0FBQyxlQUFlLENBQUMsZUFBZSxDQUFDLGFBQWEsQ0FBQyxDQUFDO29CQUVoRSxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7Z0JBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztvQkFDWCxNQUFNLENBQUMsS0FBSyxDQUFDLGlDQUFpQyxFQUFFLEdBQUcsRUFBRSxFQUFFLFlBQVksRUFBRSxlQUFlLENBQUMsWUFBWSxFQUFFLENBQUMsQ0FBQztvQkFDckcsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO1lBQ0wsQ0FBQztZQUVELE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7Q0FDSjtBQXhCRCx3QkF3QkMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9jc3NQcmVQcm9jZXNzb3Ivc3R5bHVzLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 diff --git a/dist/pipelineSteps/e2eTestRunner/protractor.d.ts b/dist/pipelineSteps/e2eTestRunner/protractor.d.ts index e358f993..fa18e8df 100644 --- a/dist/pipelineSteps/e2eTestRunner/protractor.d.ts +++ b/dist/pipelineSteps/e2eTestRunner/protractor.d.ts @@ -1,4 +1,3 @@ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -6,6 +5,6 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class Protractor extends EnginePipelineStepBase { private static FILENAME; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; private generateConfig(fileSystem, uniteConfiguration, engineVariables, lines); } diff --git a/dist/pipelineSteps/e2eTestRunner/protractor.js b/dist/pipelineSteps/e2eTestRunner/protractor.js index 7b179cfc..b29543fd 100644 --- a/dist/pipelineSteps/e2eTestRunner/protractor.js +++ b/dist/pipelineSteps/e2eTestRunner/protractor.js @@ -15,7 +15,7 @@ const jsonHelper_1 = require("unitejs-framework/dist/helpers/jsonHelper"); const protractorConfiguration_1 = require("../../configuration/models/protractor/protractorConfiguration"); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class Protractor extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["protractor", "browser-sync"], uniteConfiguration.e2eTestRunner === "Protractor"); @@ -27,23 +27,23 @@ class Protractor extends enginePipelineStepBase_1.EnginePipelineStepBase { try { const hasGeneratedMarker = yield _super("fileHasGeneratedMarker").call(this, fileSystem, engineVariables.wwwFolder, Protractor.FILENAME); if (hasGeneratedMarker) { - _super("log").call(this, logger, display, `Generating ${Protractor.FILENAME}`); + logger.info(`Generating ${Protractor.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); const lines = []; this.generateConfig(fileSystem, uniteConfiguration, engineVariables, lines); yield fileSystem.fileWriteLines(engineVariables.wwwFolder, Protractor.FILENAME, lines); } else { - _super("log").call(this, logger, display, `Skipping ${Protractor.FILENAME} as it has no generated marker`); + logger.info(`Skipping ${Protractor.FILENAME} as it has no generated marker`); } return 0; } catch (err) { - _super("error").call(this, logger, display, `Generating ${Protractor.FILENAME} failed`, err); + logger.error(`Generating ${Protractor.FILENAME} failed`, err); return 1; } } else { - return yield _super("deleteFile").call(this, logger, display, fileSystem, engineVariables.wwwFolder, Protractor.FILENAME); + return yield _super("deleteFile").call(this, logger, fileSystem, engineVariables.wwwFolder, Protractor.FILENAME); } }); } @@ -124,4 +124,4 @@ class Protractor extends enginePipelineStepBase_1.EnginePipelineStepBase { Protractor.FILENAME = "protractor.conf.js"; exports.Protractor = Protractor; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2UyZVRlc3RSdW5uZXIvcHJvdHJhY3Rvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUE7O0dBRUc7QUFDSCwwRUFBdUU7QUFJdkUsMkdBQXdHO0FBRXhHLGdGQUE2RTtBQUc3RSxnQkFBd0IsU0FBUSwrQ0FBc0I7SUFHckMsT0FBTyxDQUFDLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUN0SixlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxZQUFZLEVBQUUsY0FBYyxDQUFDLEVBQUUsa0JBQWtCLENBQUMsYUFBYSxLQUFLLFlBQVksQ0FBQyxDQUFDO1lBQ3ZILGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLG1DQUFtQyxFQUFFLHVCQUF1QixDQUFDLEVBQzlELGtCQUFrQixDQUFDLGFBQWEsS0FBSyxZQUFZLElBQUksa0JBQWtCLENBQUMsZ0JBQWdCLEtBQUssU0FBUyxDQUFDLENBQUM7WUFDNUksZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMseUJBQXlCLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxhQUFhLEtBQUssWUFBWSxJQUFJLGtCQUFrQixDQUFDLGdCQUFnQixLQUFLLFlBQVksQ0FBQyxDQUFDO1lBRTVLLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLG1CQUFtQixDQUFDLEVBQUUsa0JBQWtCLENBQUMsYUFBYSxLQUFLLFlBQVksSUFBSSxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssWUFBWSxDQUFDLENBQUM7WUFFcEssZUFBZSxDQUFDLE9BQU8sQ0FBQyxVQUFVLEdBQUcsa0JBQWtCLENBQUMsYUFBYSxLQUFLLFlBQVksSUFBSSxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssUUFBUSxDQUFDO1lBRWpJLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLGFBQWEsS0FBSyxZQUFZLENBQUMsQ0FBQyxDQUFDO2dCQUNwRCxJQUFJLENB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 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2UyZVRlc3RSdW5uZXIvcHJvdHJhY3Rvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUE7O0dBRUc7QUFDSCwwRUFBdUU7QUFHdkUsMkdBQXdHO0FBRXhHLGdGQUE2RTtBQUc3RSxnQkFBd0IsU0FBUSwrQ0FBc0I7SUFHckMsT0FBTyxDQUFDLE1BQWUsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOzs7WUFDbkksZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsWUFBWSxFQUFFLGNBQWMsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLGFBQWEsS0FBSyxZQUFZLENBQUMsQ0FBQztZQUN2SCxlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxtQ0FBbUMsRUFBRSx1QkFBdUIsQ0FBQyxFQUM5RCxrQkFBa0IsQ0FBQyxhQUFhLEtBQUssWUFBWSxJQUFJLGtCQUFrQixDQUFDLGdCQUFnQixLQUFLLFNBQVMsQ0FBQyxDQUFDO1lBQzVJLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLHlCQUF5QixDQUFDLEVBQUUsa0JBQWtCLENBQUMsYUFBYSxLQUFLLFlBQVksSUFBSSxrQkFBa0IsQ0FBQyxnQkFBZ0IsS0FBSyxZQUFZLENBQUMsQ0FBQztZQUU1SyxlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLGFBQWEsS0FBSyxZQUFZLElBQUksa0JBQWtCLENBQUMsY0FBYyxLQUFLLFlBQVksQ0FBQyxDQUFDO1lBRXBLLGVBQWUsQ0FBQyxPQUFPLENBQUMsVUFBVSxHQUFHLGtCQUFrQixDQUFDLGFBQWEsS0FBSyxZQUFZLElBQUksa0JBQWtCLENBQUMsTUFBTSxLQUFLLFFBQVEsQ0FBQztZQUVqSSxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxhQUFhLEtBQUssWUFBWSxDQUFDLENBQUMsQ0FBQztnQkFDcEQsSUFBSSxDQUFDO29CQUNELE1B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 diff --git a/dist/pipelineSteps/e2eTestRunner/webdriverIo.d.ts b/dist/pipelineSteps/e2eTestRunner/webdriverIo.d.ts index b1cbfc59..863dd379 100644 --- a/dist/pipelineSteps/e2eTestRunner/webdriverIo.d.ts +++ b/dist/pipelineSteps/e2eTestRunner/webdriverIo.d.ts @@ -1,4 +1,3 @@ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -6,6 +5,6 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class WebdriverIo extends EnginePipelineStepBase { private static FILENAME; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; private generateConfig(fileSystem, uniteConfiguration, engineVariables, lines); } diff --git a/dist/pipelineSteps/e2eTestRunner/webdriverIo.js b/dist/pipelineSteps/e2eTestRunner/webdriverIo.js index 89115380..04c1b4c6 100644 --- a/dist/pipelineSteps/e2eTestRunner/webdriverIo.js +++ b/dist/pipelineSteps/e2eTestRunner/webdriverIo.js @@ -15,7 +15,7 @@ const jsonHelper_1 = require("unitejs-framework/dist/helpers/jsonHelper"); const webdriverIoConfiguration_1 = require("../../configuration/models/webdriverIo/webdriverIoConfiguration"); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class WebdriverIo extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["webdriverio", @@ -34,23 +34,23 @@ class WebdriverIo extends enginePipelineStepBase_1.EnginePipelineStepBase { try { const hasGeneratedMarker = yield _super("fileHasGeneratedMarker").call(this, fileSystem, engineVariables.wwwFolder, WebdriverIo.FILENAME); if (hasGeneratedMarker) { - _super("log").call(this, logger, display, `Generating ${WebdriverIo.FILENAME}`); + logger.info(`Generating ${WebdriverIo.FILENAME}`); const lines = []; this.generateConfig(fileSystem, uniteConfiguration, engineVariables, lines); yield fileSystem.fileWriteLines(engineVariables.wwwFolder, WebdriverIo.FILENAME, lines); } else { - _super("log").call(this, logger, display, `Skipping ${WebdriverIo.FILENAME} as it has no generated marker`); + logger.info(`Skipping ${WebdriverIo.FILENAME} as it has no generated marker`); } return 0; } catch (err) { - _super("error").call(this, logger, display, `Generating ${WebdriverIo.FILENAME} failed`, err); + logger.error(`Generating ${WebdriverIo.FILENAME} failed`, err); return 1; } } else { - return yield _super("deleteFile").call(this, logger, display, fileSystem, engineVariables.wwwFolder, WebdriverIo.FILENAME); + return yield _super("deleteFile").call(this, logger, fileSystem, engineVariables.wwwFolder, WebdriverIo.FILENAME); } }); } @@ -88,4 +88,4 @@ class WebdriverIo extends enginePipelineStepBase_1.EnginePipelineStepBase { WebdriverIo.FILENAME = "wdio.conf.js"; exports.WebdriverIo = WebdriverIo; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2UyZVRlc3RSdW5uZXIvd2ViZHJpdmVySW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBOztHQUVHO0FBQ0gsMEVBQXVFO0FBS3ZFLDhHQUEyRztBQUMzRyxnRkFBNkU7QUFHN0UsaUJBQXlCLFNBQVEsK0NBQXNCO0lBR3RDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsT0FBaUIsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOzs7WUFDdEosZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsYUFBYTtnQkFDYixvQkFBb0I7Z0JBQ3BCLHNCQUFzQjtnQkFDdEIsY0FBYztnQkFDZCxxQkFBcUI7Z0JBQ3JCLG9CQUFvQixDQUFDLEVBQ3RCLGtCQUFrQixDQUFDLGFBQWEsS0FBSyxhQUFhLENBQUMsQ0FBQztZQUV4RixlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyx3QkFBd0IsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLGFBQWEsS0FBSyxhQUFhLElBQUksa0JBQWtCLENBQUMsZ0JBQWdCLEtBQUssU0FBUyxDQUFDLENBQUM7WUFDekssZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsc0JBQXNCLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxhQUFhLEtBQUssYUFBYSxJQUFJLGtCQUFrQixDQUFDLGdCQUFnQixLQUFLLFlBQVksQ0FBQyxDQUFDO1lBQzFLLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLG9CQUFvQixDQUFDLEVBQUUsa0JBQWtCLENBQUMsYUFBYSxLQUFLLGFBQWEsSUFBSSxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssWUFBWSxDQUFDLENBQUM7WUFFdEssZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsMkJBQTJCLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxhQUFhLEtBQUssYUFBYSxJQUFJLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxRQUFRLENBQUMsQ0FBQztZQUVqSyxlQUFlLENB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QUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0IsS0FBSyxZQUFZLENBQUMsQ0FBQyxDQUFDO1lBQzlELHNCQUFzQixDQUFDLFNBQVMsR0FBRyxPQUFPLENBQUM7UUFDL0MsQ0FBQztRQUNELHNCQUFzQixDQUFDLFNBQVMsR0FBRyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN0RCxzQkFBc0IsQ0FBQyxlQUFlLEdBQUc7WUFDckMsTUFBTSxFQUFFO2dCQUNKLFNBQVMsRUFBRSxHQUFHLGFBQWEsV0FBVzthQUN6QztTQUNKLENBQUM7UUFFRixNQUFNLFlBQVksR0FBRyxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLGFBQWEsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUU3SyxLQUFLLENBQUMsSUFBSSxDQUFDLG9CQUFvQix1QkFBVSxDQUFDLE1BQU0sQ0FBQyxzQkFBc0IsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUM1RSxLQUFLLENBQUMsSUFBSSxDQUFDLG9DQUFvQyxZQUFZLEtBQUssQ0FBQyxDQUFDO1FBQ2xFLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDO0lBQ3hELENBQUM7O0FBNUVjLG9CQUFRLEdBQVcsY0FBYyxDQUFDO0FBRHJELGtDQThFQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2UyZVRlc3RSdW5uZXIvd2ViZHJpdmVySW8uanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2UyZVRlc3RSdW5uZXIvd2ViZHJpdmVySW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBOztHQUVHO0FBQ0gsMEVBQXVFO0FBSXZFLDhHQUEyRztBQUMzRyxnRkFBNkU7QUFHN0UsaUJBQXlCLFNBQVEsK0NBQXNCO0lBR3RDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ25JLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLGFBQWE7Z0JBQ2Isb0JBQW9CO2dCQUNwQixzQkFBc0I7Z0JBQ3RCLGNBQWM7Z0JBQ2QscUJBQXFCO2dCQUNyQixvQkFBb0IsQ0FBQyxFQUN0QixrQkFBa0IsQ0FBQyxhQUFhLEtBQUssYUFBYSxDQUFDLENBQUM7WUFFeEYsZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsd0JBQXdCLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxhQUFhLEtBQUssYUFBYSxJQUFJLGtCQUFrQixDQUFDLGdCQUFnQixLQUFLLFNBQVMsQ0FBQyxDQUFDO1lBQ3pLLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLHNCQUFzQixDQUFDLEVBQUUsa0JBQWtCLENBQUMsYUFBYSxLQUFLLGFBQWEsSUFBSSxrQkFBa0IsQ0FBQyxnQkFBZ0IsS0FBSyxZQUFZLENBQUMsQ0FBQztZQUMxSyxlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxvQkFBb0IsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLGFBQWEsS0FBSyxhQUFhLElBQUksa0JBQWtCLENBQUMsY0FBYyxLQUFLLFlBQVksQ0FBQyxDQUFDO1lBRXRLLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLDJCQUEyQixDQUFDLEVBQUUsa0JBQWtCLENBQUMsYUFBYSxLQUFLLGFBQWEsSUFBSSxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssUUFBUSxDQUFDLENBQUM7WUFFakssZUFBZSxDQUFDLFdBQVcsQ0FB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SyxZQUFZLENBQUMsQ0FBQyxDQUFDO1lBQzlELHNCQUFzQixDQUFDLFNBQVMsR0FBRyxPQUFPLENBQUM7UUFDL0MsQ0FBQztRQUNELHNCQUFzQixDQUFDLFNBQVMsR0FBRyxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN0RCxzQkFBc0IsQ0FBQyxlQUFlLEdBQUc7WUFDckMsTUFBTSxFQUFFO2dCQUNKLFNBQVMsRUFBRSxHQUFHLGFBQWEsV0FBVzthQUN6QztTQUNKLENBQUM7UUFFRixNQUFNLFlBQVksR0FBRyxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLGFBQWEsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUU3SyxLQUFLLENBQUMsSUFBSSxDQUFDLG9CQUFvQix1QkFBVSxDQUFDLE1BQU0sQ0FBQyxzQkFBc0IsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUM1RSxLQUFLLENBQUMsSUFBSSxDQUFDLG9DQUFvQyxZQUFZLEtBQUssQ0FBQyxDQUFDO1FBQ2xFLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDO0lBQ3hELENBQUM7O0FBNUVjLG9CQUFRLEdBQVcsY0FBYyxDQUFDO0FBRHJELGtDQThFQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2UyZVRlc3RSdW5uZXIvd2ViZHJpdmVySW8uanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/language/babel.d.ts b/dist/pipelineSteps/language/babel.d.ts index 5df2029e..5fc7cdc2 100644 --- a/dist/pipelineSteps/language/babel.d.ts +++ b/dist/pipelineSteps/language/babel.d.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate babel configuration. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,6 +8,6 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class Babel extends EnginePipelineStepBase { private static FILENAME; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; private generateConfig(fileSystem, uniteConfiguration, engineVariables, existing); } diff --git a/dist/pipelineSteps/language/babel.js b/dist/pipelineSteps/language/babel.js index b576e706..f2eea1d5 100644 --- a/dist/pipelineSteps/language/babel.js +++ b/dist/pipelineSteps/language/babel.js @@ -11,13 +11,13 @@ Object.defineProperty(exports, "__esModule", { value: true }); const babelConfiguration_1 = require("../../configuration/models/babel/babelConfiguration"); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class Babel extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["babel-core", "babel-preset-es2015"], uniteConfiguration.sourceLanguage === "JavaScript"); if (uniteConfiguration.sourceLanguage === "JavaScript") { try { - _super("log").call(this, logger, display, `Generating ${Babel.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); + logger.info(`Generating ${Babel.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); let existing; try { const exists = yield fileSystem.fileExists(engineVariables.wwwFolder, Babel.FILENAME); @@ -26,7 +26,7 @@ class Babel extends enginePipelineStepBase_1.EnginePipelineStepBase { } } catch (err) { - _super("error").call(this, logger, display, `Reading existing ${Babel.FILENAME} failed`, err); + logger.error(`Reading existing ${Babel.FILENAME} failed`, err); return 1; } const config = this.generateConfig(fileSystem, uniteConfiguration, engineVariables, existing); @@ -34,12 +34,12 @@ class Babel extends enginePipelineStepBase_1.EnginePipelineStepBase { return 0; } catch (err) { - _super("error").call(this, logger, display, `Generating ${Babel.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Generating ${Babel.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); return 1; } } else { - return yield _super("deleteFile").call(this, logger, display, fileSystem, engineVariables.wwwFolder, Babel.FILENAME); + return yield _super("deleteFile").call(this, logger, fileSystem, engineVariables.wwwFolder, Babel.FILENAME); } }); } @@ -89,4 +89,4 @@ class Babel extends enginePipelineStepBase_1.EnginePipelineStepBase { Babel.FILENAME = ".babelrc"; exports.Babel = Babel; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2xhbmd1YWdlL2JhYmVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFNQSw0RkFBeUY7QUFFekYsZ0ZBQTZFO0FBRzdFLFdBQW1CLFNBQVEsK0NBQXNCO0lBR2hDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsT0FBaUIsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOzs7WUFDdEosZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsWUFBWSxFQUFFLHFCQUFxQixDQUFDLEVBQUUsa0JBQWtCLENBQUMsY0FBYyxLQUFLLFlBQVksQ0FBQyxDQUFDO1lBRS9ILEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLGNBQWMsS0FBSyxZQUFZLENBQUMsQ0FBQyxDQUFDO2dCQUNyRCxJQUFJLENBQUM7b0JBQ0QsYUFBUyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsY0FBYyxLQUFLLENBQUMsUUFBUSxFQUFFLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxFQUFFO29CQUVyRyxJQUFJLFFBQVEsQ0FBQztvQkFDYixJQUFJLENBQUM7d0JBQ0QsTUFBTSxNQUFNLEdBQUcsTUFBTSxVQUFVLENBQUMsVUFBVSxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO3dCQUN0RixFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDOzRCQUNULFFBQVEsR0FBRyxNQUFNLFVBQVUsQ0FBQyxZQUFZLENBQXFCLGVBQWUsQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO3dCQUM1RyxDQUFDO29CQUNMLENBQUM7b0JBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQzt3QkFDWCxlQUFXLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxvQkFBb0IsS0FBSyxDQUFDLFFBQVEsU0FBUyxFQUFFLEdBQUcsRUFBRTt3QkFDL0UsTUFBTSxDQUFDLENBQUMsQ0FBQztvQkFDYixDQUFDO29CQUVELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsVUFBVSxFQUFFLGtCQUFrQixFQUFFLGVBQWUsRUFBRSxRQUFRLENBQUMsQ0FBQztvQkFDOUYsTUFBTSxVQUFVLENBQUMsYUFBYSxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztvQkFFbEYsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsZUFBVyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsY0FBYyxLQUFLLENBQUMsUUFBUSxTQUFTLEVBQUUsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsRUFBRTtvQkFDbkgsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO1lBQ0wsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLE1BQU0sQ0FBQyxNQUFNLG9CQUFnQixZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQzFHLENBQUM7UUFDTCxDQUFDO0tBQUE7SUFFTyxjQUFjLENBQUMsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQyxFQUFFLFFBQXdDO1FBQzlKLE1BQU0sTUFBTSxHQUFHLElBQUksdUNBQWtCLEVBQUUsQ0FBQztRQUN4QyxNQUFNLENBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztRQUVwQixFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1lBQ1gsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDcEMsQ0FBQztRQUVELElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQztRQUNqQixFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxVQUFVLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQztZQUMxQyxPQUFPLEdBQUcsS0FBSyxDQUFDO1FBQ3BCLENBQUM7UUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsVUFBVSxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUM7WUFDdEQsT0FBTyxHQUFHLFVBQVUsQ0FBQztRQUN6QixDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixPQUFPLEdBQUcsVUFBVSxDQUFDO1FBQ3pCLENBQUM7UUFFRCxJQUFJLFlBQVksR0FBRyxLQUFLLENBQUM7UUFDekIsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTTtZQUN6QixFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDN0MsRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7b0JBQ3pCLFlBQVksR0FBRyxJQUFJLENBQUM7Z0JBQ3hCLENBQUM7WUFDTCxDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUM7UUFFSCxFQUFFLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7WUFDaEIsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDakQsQ0FBQztRQUVELEdBQUcsQ0FBQyxDQUFDLE1BQU0sR0FBRyxJQUFJLGVBQWUsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUM7WUFDakQsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDeEMsRUFBRSxDQUFDLENBQUMsZUFBZSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDeEMsRUFBRSxDQUFDLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ1YsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQzdCLENBQUM7WUFDTCxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ0osRUFBRSxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO2dCQUNsQyxDQUFDO1lBQ0wsQ0FBQztRQUNMLENBQUM7UUFFRCxNQUFNLENBQUMsTUFBTSxDQUFDO0lBQ2xCLENBQUM7O0FBN0VjLGNBQVEsR0FBVyxVQUFVLENBQUM7QUFEakQsc0JBK0VDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvbGFuZ3VhZ2UvYmFiZWwuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2xhbmd1YWdlL2JhYmVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFLQSw0RkFBeUY7QUFFekYsZ0ZBQTZFO0FBRzdFLFdBQW1CLFNBQVEsK0NBQXNCO0lBR2hDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ25JLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLFlBQVksRUFBRSxxQkFBcUIsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLGNBQWMsS0FBSyxZQUFZLENBQUMsQ0FBQztZQUUvSCxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssWUFBWSxDQUFDLENBQUMsQ0FBQztnQkFDckQsSUFBSSxDQUFDO29CQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxLQUFLLENBQUMsUUFBUSxFQUFFLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7b0JBRXRGLElBQUksUUFBUSxDQUFDO29CQUNiLElBQUksQ0FBQzt3QkFDRCxNQUFNLE1BQU0sR0FBRyxNQUFNLFVBQVUsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7d0JBQ3RGLEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7NEJBQ1QsUUFBUSxHQUFHLE1BQU0sVUFBVSxDQUFDLFlBQVksQ0FBcUIsZUFBZSxDQUFDLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7d0JBQzVHLENBQUM7b0JBQ0wsQ0FBQztvQkFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO3dCQUNYLE1BQU0sQ0FBQyxLQUFLLENBQUMsb0JBQW9CLEtBQUssQ0FBQyxRQUFRLFNBQVMsRUFBRSxHQUFHLENBQUMsQ0FBQzt3QkFDL0QsTUFBTSxDQUFDLENBQUMsQ0FBQztvQkFDYixDQUFDO29CQUVELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsVUFBVSxFQUFFLGtCQUFrQixFQUFFLGVBQWUsRUFBRSxRQUFRLENBQUMsQ0FBQztvQkFDOUYsTUFBTSxVQUFVLENBQUMsYUFBYSxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztvQkFFbEYsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQyxjQUFjLEtBQUssQ0FBQyxRQUFRLFNBQVMsRUFBRSxHQUFHLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7b0JBQ25HLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDSixNQUFNLENBQUMsTUFBTSxvQkFBZ0IsWUFBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ2pHLENBQUM7UUFDTCxDQUFDO0tBQUE7SUFFTyxjQUFjLENBQUMsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQyxFQUFFLFFBQXdDO1FBQzlKLE1BQU0sTUFBTSxHQUFHLElBQUksdUNBQWtCLEVBQUUsQ0FBQztRQUN4QyxNQUFNLENBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztRQUVwQixFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1lBQ1gsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDcEMsQ0FBQztRQUVELElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQztRQUNqQixFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxVQUFVLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQztZQUMxQyxPQUFPLEdBQUcsS0FBSyxDQUFDO1FBQ3BCLENBQUM7UUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsVUFBVSxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUM7WUFDdEQsT0FBTyxHQUFHLFVBQVUsQ0FBQztRQUN6QixDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixPQUFPLEdBQUcsVUFBVSxDQUFDO1FBQ3pCLENBQUM7UUFFRCxJQUFJLFlBQVksR0FBRyxLQUFLLENBQUM7UUFDekIsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTTtZQUN6QixFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDN0MsRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7b0JBQ3pCLFlBQVksR0FBRyxJQUFJLENBQUM7Z0JBQ3hCLENBQUM7WUFDTCxDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUM7UUFFSCxFQUFFLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7WUFDaEIsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDakQsQ0FBQztRQUVELEdBQUcsQ0FBQyxDQUFDLE1BQU0sR0FBRyxJQUFJLGVBQWUsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUM7WUFDakQsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDeEMsRUFBRSxDQUFDLENBQUMsZUFBZSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDeEMsRUFBRSxDQUFDLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ1YsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQzdCLENBQUM7WUFDTCxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ0osRUFBRSxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO2dCQUNsQyxDQUFDO1lBQ0wsQ0FBQztRQUNMLENBQUM7UUFFRCxNQUFNLENBQUMsTUFBTSxDQUFDO0lBQ2xCLENBQUM7O0FBN0VjLGNBQVEsR0FBVyxVQUFVLENBQUM7QUFEakQsc0JBK0VDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvbGFuZ3VhZ2UvYmFiZWwuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/language/typeScript.d.ts b/dist/pipelineSteps/language/typeScript.d.ts index c2f599e9..3205ff53 100644 --- a/dist/pipelineSteps/language/typeScript.d.ts +++ b/dist/pipelineSteps/language/typeScript.d.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate TypeScript configuration. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,5 +8,5 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class TypeScript extends EnginePipelineStepBase { private static FILENAME; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/language/typeScript.js b/dist/pipelineSteps/language/typeScript.js index ea1b3673..96ab9f9f 100644 --- a/dist/pipelineSteps/language/typeScript.js +++ b/dist/pipelineSteps/language/typeScript.js @@ -12,13 +12,13 @@ const typeScriptCompilerOptions_1 = require("../../configuration/models/typeScri const typeScriptConfiguration_1 = require("../../configuration/models/typeScript/typeScriptConfiguration"); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class TypeScript extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["typescript"], uniteConfiguration.sourceLanguage === "TypeScript"); if (uniteConfiguration.sourceLanguage === "TypeScript") { try { - _super("log").call(this, logger, display, `Generating ${TypeScript.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); + logger.info(`Generating ${TypeScript.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); const typeScriptConfiguration = new typeScriptConfiguration_1.TypeScriptConfiguration(); typeScriptConfiguration.compilerOptions = new typeScriptCompilerOptions_1.TypeScriptCompilerOptions(); typeScriptConfiguration.compilerOptions.target = "es5"; @@ -47,12 +47,12 @@ class TypeScript extends enginePipelineStepBase_1.EnginePipelineStepBase { return 0; } catch (err) { - _super("error").call(this, logger, display, `Generating ${TypeScript.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Generating ${TypeScript.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); return 1; } } else { - return yield _super("deleteFile").call(this, logger, display, fileSystem, engineVariables.wwwFolder, TypeScript.FILENAME); + return yield _super("deleteFile").call(this, logger, fileSystem, engineVariables.wwwFolder, TypeScript.FILENAME); } }); } @@ -60,4 +60,4 @@ class TypeScript extends enginePipelineStepBase_1.EnginePipelineStepBase { TypeScript.FILENAME = "tsconfig.json"; exports.TypeScript = TypeScript; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2xhbmd1YWdlL3R5cGVTY3JpcHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU1BLCtHQUE0RztBQUM1RywyR0FBd0c7QUFFeEcsZ0ZBQTZFO0FBRzdFLGdCQUF3QixTQUFRLCtDQUFzQjtJQUdyQyxPQUFPLENBQUMsTUFBZSxFQUFFLE9BQWlCLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ3RKLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLFlBQVksQ0FBQyxFQUFFLGtCQUFrQixDQUFDLGNBQWMsS0FBSyxZQUFZLENBQUMsQ0FBQztZQUV4RyxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssWUFBWSxDQUFDLENBQUMsQ0FBQztnQkFDckQsSUFBSSxDQUFDO29CQUNELGFBQVMsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLGNBQWMsVUFBVSxDQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsRUFBRTtvQkFFMUcsTUFBTSx1QkFBdUIsR0FBRyxJQUFJLGlEQUF1QixFQUFFLENBQUM7b0JBQzlELHVCQUF1QixDQUFDLGVBQWUsR0FBRyxJQUFJLHFEQUF5QixFQUFFLENBQUM7b0JBRTFFLHVCQUF1QixDQUFDLGVBQWUsQ0FBQyxNQUFNLEdBQUcsS0FBSyxDQUFDO29CQUN2RCx1QkFBdUIsQ0FBQyxlQUFlLENBQUMsZ0JBQWdCLEdBQUcsTUFBTSxDQUFDO29CQUNsRSx1QkFBdUIsQ0FBQyxlQUFlLENBQUMsYUFBYSxHQUFHLElBQUksQ0FBQztvQkFDN0QsdUJBQXVCLENBQUMsZUFBZSxDQUFDLGNBQWMsR0FBRyxJQUFJLENBQUM7b0JBQzlELHVCQUF1QixDQUFDLGVBQWUsQ0FBQyxpQkFBaUIsR0FBRyxJQUFJLENBQUM7b0JBRWpFLHVCQUF1QixDQUFDLGVBQWUsQ0FBQyxHQUFHLEdBQUcsQ0FBQyxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUM7b0JBRWhFLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLFVBQVUsS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDO3dCQUMxQyx1QkFBdUIsQ0FBQyxlQUFlLENBQUMsTUFBTSxHQUFHLEtBQUssQ0FBQztvQkFDM0QsQ0FBQztvQkFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsVUFBVSxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUM7d0JBQ3RELHVCQUF1QixDQUFDLGVBQWUsQ0FBQyxNQUFNLEdBQUcsUUFBUSxDQUFDO29CQUM5RCxDQUFDO29CQUFDLElBQUksQ0FBQyxDQUFDO3dCQUNKLHVCQUF1QixDQUFDLGVBQWUsQ0FBQyxNQUFNLEdBQUcsVUFBVSxDQUFDO29CQUNoRSxDQUFDO29CQUVELE1BQU0sVUFBVSxHQUF5QixFQUFFLENBQUM7b0JBQzVDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sR0FBRyxJQUFJLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLENBQUM7d0JBQ3BELEVBQUUsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxHQUFHLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDOzRCQUNwRCxVQUFVLENBQUMsR0FBRyxDQUFDLEdBQUcsZUFBZSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQzt3QkFDdEUsQ0FBQztvQkFDTCxDQUFDO29CQUNELE1BQU0sQ0FBQyxNQUFNLENBQUMsdUJBQXVCLENBQUMsZUFBZSxFQUFFLFVBQVUsQ0FBQyxDQUFDO29CQUVuRSxNQUFNLFVBQVUsQ0FBQyxhQUFhLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUMsUUFBUSxFQUFFLHVCQUF1QixDQUFDLENBQUM7b0JBRXhHLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztnQkFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUNYLGVBQVcsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLGNBQWMsVUFBVSxDQUFDLFFBQVEsU0FBUyxFQUFFLEdBQUcsRUFBRSxFQUFFLFNBQVMsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLEVBQUU7b0JBQ3hILE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDSixNQUFNLENBQUMsTUFBTSxvQkFBZ0IsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUMvRyxDQUFDO1FBQ0wsQ0FBQztLQUFBOztBQTlDYyxtQkFBUSxHQUFXLGVBQWUsQ0FBQztBQUR0RCxnQ0FnREMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9sYW5ndWFnZS90eXBlU2NyaXB0LmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2xhbmd1YWdlL3R5cGVTY3JpcHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUtBLCtHQUE0RztBQUM1RywyR0FBd0c7QUFFeEcsZ0ZBQTZFO0FBRzdFLGdCQUF3QixTQUFRLCtDQUFzQjtJQUdyQyxPQUFPLENBQUMsTUFBZSxFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUNuSSxlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxZQUFZLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssWUFBWSxDQUFDLENBQUM7WUFFeEcsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsY0FBYyxLQUFLLFlBQVksQ0FBQyxDQUFDLENBQUM7Z0JBQ3JELElBQUksQ0FBQztvQkFDRCxNQUFNLENBQUMsSUFBSSxDQUFDLGNBQWMsVUFBVSxDQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDO29CQUUzRixNQUFNLHVCQUF1QixHQUFHLElBQUksaURBQXVCLEVBQUUsQ0FBQztvQkFDOUQsdUJBQXVCLENBQUMsZUFBZSxHQUFHLElBQUkscURBQXlCLEVBQUUsQ0FBQztvQkFFMUUsdUJBQXVCLENBQUMsZUFBZSxDQUFDLE1BQU0sR0FBRyxLQUFLLENBQUM7b0JBQ3ZELHVCQUF1QixDQUFDLGVBQWUsQ0FBQyxnQkFBZ0IsR0FBRyxNQUFNLENBQUM7b0JBQ2xFLHVCQUF1QixDQUFDLGVBQWUsQ0FBQyxhQUFhLEdBQUcsSUFBSSxDQUFDO29CQUM3RCx1QkFBdUIsQ0FBQyxlQUFlLENBQUMsY0FBYyxHQUFHLElBQUksQ0FBQztvQkFDOUQsdUJBQXVCLENBQUMsZUFBZSxDQUFDLGlCQUFpQixHQUFHLElBQUksQ0FBQztvQkFFakUsdUJBQXVCLENBQUMsZUFBZSxDQUFDLEdBQUcsR0FBRyxDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQztvQkFFaEUsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsVUFBVSxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUM7d0JBQzFDLHVCQUF1QixDQUFDLGVBQWUsQ0FBQyxNQUFNLEdBQUcsS0FBSyxDQUFDO29CQUMzRCxDQUFDO29CQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxVQUFVLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQzt3QkFDdEQsdUJBQXVCLENBQUMsZUFBZSxDQUFDLE1BQU0sR0FBRyxRQUFRLENBQUM7b0JBQzlELENBQUM7b0JBQUMsSUFBSSxDQUFDLENBQUM7d0JBQ0osdUJBQXVCLENBQUMsZUFBZSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUM7b0JBQ2hFLENBQUM7b0JBRUQsTUFBTSxVQUFVLEdBQXlCLEVBQUUsQ0FBQztvQkFDNUMsR0FBRyxDQUFDLENBQUMsTUFBTSxHQUFHLElBQUksZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsQ0FBQzt3QkFDcEQsRUFBRSxDQUFDLENBQUMsZUFBZSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7NEJBQ3BELFVBQVUsQ0FBQyxHQUFHLENBQUMsR0FBRyxlQUFlLENBQUMsbUJBQW1CLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDO3dCQUN0RSxDQUFDO29CQUNMLENBQUM7b0JBQ0QsTUFBTSxDQUFDLE1BQU0sQ0FBQyx1QkFBdUIsQ0FBQyxlQUFlLEVBQUUsVUFBVSxDQUFDLENBQUM7b0JBRW5FLE1BQU0sVUFBVSxDQUFDLGFBQWEsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxRQUFRLEVBQUUsdUJBQXVCLENBQUMsQ0FBQztvQkFFeEcsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQyxjQUFjLFVBQVUsQ0FBQyxRQUFRLFNBQVMsRUFBRSxHQUFHLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7b0JBQ3hHLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDSixNQUFNLENBQUMsTUFBTSxvQkFBZ0IsWUFBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ3RHLENBQUM7UUFDTCxDQUFDO0tBQUE7O0FBOUNjLG1CQUFRLEdBQVcsZUFBZSxDQUFDO0FBRHRELGdDQWdEQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2xhbmd1YWdlL3R5cGVTY3JpcHQuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/lint/esLint.d.ts b/dist/pipelineSteps/lint/esLint.d.ts index 7f66de6b..0ac7808f 100644 --- a/dist/pipelineSteps/lint/esLint.d.ts +++ b/dist/pipelineSteps/lint/esLint.d.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate eslint configuration. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -10,7 +9,7 @@ import { EngineVariables } from "../../engine/engineVariables"; export declare class EsLint extends EnginePipelineStepBase { private static FILENAME; private static FILENAME2; - prerequisites(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + prerequisites(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; private generateConfig(fileSystem, uniteConfiguration, engineVariables, existing); } diff --git a/dist/pipelineSteps/lint/esLint.js b/dist/pipelineSteps/lint/esLint.js index 3b096c5d..e47bd76e 100644 --- a/dist/pipelineSteps/lint/esLint.js +++ b/dist/pipelineSteps/lint/esLint.js @@ -12,25 +12,24 @@ const esLintConfiguration_1 = require("../../configuration/models/eslint/esLintC const esLintParserOptions_1 = require("../../configuration/models/eslint/esLintParserOptions"); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class EsLint extends enginePipelineStepBase_1.EnginePipelineStepBase { - prerequisites(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + prerequisites(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { if (uniteConfiguration.linter === "ESLint") { if (uniteConfiguration.sourceLanguage !== "JavaScript") { - _super("error").call(this, logger, display, "You can only use ESLint when the source language is JavaScript"); + logger.error("You can only use ESLint when the source language is JavaScript"); return 1; } } return 0; }); } - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["eslint"], uniteConfiguration.linter === "ESLint"); if (uniteConfiguration.linter === "ESLint") { try { - _super("log").call(this, logger, display, `Generating ${EsLint.FILENAME}`); + logger.info(`Generating ${EsLint.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); let existing; try { const exists = yield fileSystem.fileExists(engineVariables.wwwFolder, EsLint.FILENAME); @@ -39,20 +38,20 @@ class EsLint extends enginePipelineStepBase_1.EnginePipelineStepBase { } } catch (err) { - _super("error").call(this, logger, display, `Reading existing ${EsLint.FILENAME} failed`, err); + logger.error(`Reading existing ${EsLint.FILENAME} failed`, err); return 1; } const config = this.generateConfig(fileSystem, uniteConfiguration, engineVariables, existing); yield fileSystem.fileWriteJson(engineVariables.wwwFolder, EsLint.FILENAME, config); } catch (err) { - _super("error").call(this, logger, display, `Generating ${EsLint.FILENAME} failed`, err); + logger.error(`Generating ${EsLint.FILENAME} failed`, err); return 1; } try { const hasGeneratedMarker = yield _super("fileHasGeneratedMarker").call(this, fileSystem, engineVariables.wwwFolder, EsLint.FILENAME2); if (hasGeneratedMarker) { - _super("log").call(this, logger, display, `Generating ${EsLint.FILENAME2} Configuration`); + logger.info(`Generating ${EsLint.FILENAME2} Configuration`, { wwwFolder: engineVariables.wwwFolder }); const lines = []; lines.push("dist/*"); lines.push("build/*"); @@ -62,19 +61,19 @@ class EsLint extends enginePipelineStepBase_1.EnginePipelineStepBase { yield fileSystem.fileWriteLines(engineVariables.wwwFolder, EsLint.FILENAME2, lines); } else { - _super("log").call(this, logger, display, `Skipping ${EsLint.FILENAME2} as it has no generated marker`); + logger.info(`Skipping ${EsLint.FILENAME2} as it has no generated marker`); } return 0; } catch (err) { - _super("error").call(this, logger, display, `Generating ${EsLint.FILENAME2} failed`, err); + logger.error(`Generating ${EsLint.FILENAME2} failed`, err); return 1; } } else { - let ret = yield _super("deleteFile").call(this, logger, display, fileSystem, engineVariables.wwwFolder, EsLint.FILENAME); + let ret = yield _super("deleteFile").call(this, logger, fileSystem, engineVariables.wwwFolder, EsLint.FILENAME); if (ret === 0) { - ret = yield _super("deleteFile").call(this, logger, display, fileSystem, engineVariables.wwwFolder, EsLint.FILENAME2); + ret = yield _super("deleteFile").call(this, logger, fileSystem, engineVariables.wwwFolder, EsLint.FILENAME2); } return ret; } @@ -160,4 +159,4 @@ EsLint.FILENAME = ".eslintrc.json"; EsLint.FILENAME2 = ".eslintignore"; exports.EsLint = EsLint; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2xpbnQvZXNMaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFNQSwrRkFBNEY7QUFDNUYsK0ZBQTRGO0FBRTVGLGdGQUE2RTtBQUc3RSxZQUFvQixTQUFRLCtDQUFzQjtJQUlqQyxhQUFhLENBQUMsTUFBZSxFQUNmLE9BQWlCLEVBQ2pCLFVBQXVCLEVBQ3ZCLGtCQUFzQyxFQUN0QyxlQUFnQzs7O1lBQ3ZELEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDO2dCQUN6QyxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssWUFBWSxDQUFDLENBQUMsQ0FBQztvQkFDckQsZUFBVyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsZ0VBQWdFLEVBQUU7b0JBQy9GLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFDRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0lBRVksT0FBTyxDQUFDLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUN0SixlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxRQUFRLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssUUFBUSxDQUFDLENBQUM7WUFFeEYsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsTUFBTSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7Z0JBQ3pDLElBQUksQ0FBQztvQkFDRCxhQUFTLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxjQUFjLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRTtvQkFFNUQsSUFBSSxRQUFRLENBQUM7b0JBQ2IsSUFBSSxDQUFDO3dCQUNELE1BQU0sTUFBTSxHQUFHLE1BQU0sVUFBVSxDQUFDLFVBQVUsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLE1B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V0FBVyxDQUFDLENBQUMsQ0FBQztZQUM1QyxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUN4QyxFQUFFLENBQUMsQ0FBQyxlQUFlLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDbkMsRUFBRSxDQUFDLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ1YsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQzdCLENBQUM7WUFDTCxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ0osRUFBRSxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO2dCQUNsQyxDQUFDO1lBQ0wsQ0FBQztRQUNMLENBQUM7UUFFRCxHQUFHLENBQUMsQ0FBQyxNQUFNLEdBQUcsSUFBSSxlQUFlLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztZQUN4QyxFQUFFLENBQUMsQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDL0IsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUM7WUFDM0IsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUNsQixPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQzNCLENBQUM7WUFDTCxDQUFDO1FBQ0wsQ0FBQztRQUVELEdBQUcsQ0FBQyxDQUFDLE1BQU0sR0FBRyxJQUFJLGVBQWUsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDO1lBQzVDLEVBQUUsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUNuQyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQztZQUMvQixDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ0osRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ3RCLE9BQU8sTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztnQkFDL0IsQ0FBQztZQUNMLENBQUM7UUFDTCxDQUFDO1FBRUQsTUFBTSxDQUFDLE1BQU0sQ0FBQztJQUNsQixDQUFDOztBQTNKYyxlQUFRLEdBQVcsZ0JBQWdCLENBQUM7QUFDcEMsZ0JBQVMsR0FBVyxlQUFlLENBQUM7QUFGdkQsd0JBNkpDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvbGludC9lc0xpbnQuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2xpbnQvZXNMaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFLQSwrRkFBNEY7QUFDNUYsK0ZBQTRGO0FBRTVGLGdGQUE2RTtBQUc3RSxZQUFvQixTQUFRLCtDQUFzQjtJQUlqQyxhQUFhLENBQUMsTUFBZSxFQUNmLFVBQXVCLEVBQ3ZCLGtCQUFzQyxFQUN0QyxlQUFnQzs7WUFDdkQsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsTUFBTSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7Z0JBQ3pDLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLGNBQWMsS0FBSyxZQUFZLENBQUMsQ0FBQyxDQUFDO29CQUNyRCxNQUFNLENBQUMsS0FBSyxDQUFDLGdFQUFnRSxDQUFDLENBQUM7b0JBQy9FLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFDRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0lBRVksT0FBTyxDQUFDLE1BQWUsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOzs7WUFDbkksZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsUUFBUSxDQUFDLEVBQUUsa0JBQWtCLENBQUMsTUFBTSxLQUFLLFFBQVEsQ0FBQyxDQUFDO1lBRXhGLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDO2dCQUN6QyxJQUFJLENBQUM7b0JBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLFNBQVMsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFDLENBQUMsQ0FBQztvQkFFdEYsSUFBSSxRQUFRLENBQUM7b0JBQ2IsSUFBSSxDQUFDO3dCQUNELE1BQU0sTUFBTSxHQUFHLE1BQU0sVUFBVSxDQUFDLFVBQVUsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQzt3QkFDdkYsRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQzs0QkFDVCxRQUFRLEdBQUcsTUFBTSxVQUFVLENBQUMsWUFBWSxDQUFzQixlQUFlLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQzt3QkFDOUcsQ0FBQztvQkFDTCxDQUFDO29CQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7d0JBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQyxvQkFBb0IsTUFBTSxDQUFDLFFBQVEsU0FBUyxFQUFFLEdBQUcsQ0FBQyxDQUFDO3dCQUNoRSxNQUFNLENBQUMsQ0FBQyxDQUFDO29CQUNiLENBQUM7b0JBRUQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLGNBQWMsQ0FBQyxVQUFVLEVBQUUsa0JBQWtCLEVBQUUsZUFBZSxFQUFFLFFBQVEsQ0FBQyxDQUFDO29CQUM5RixNQUFNLFVBQVUsQ0FBQyxhQUFhLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFDO2dCQUN2RixDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQyxjQUFjLE1BQU0sQ0FBQyxRQUFRLFNBQVMsRUFBRSxHQUFHLENBQUMsQ0FBQztvQkFDMUQsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUNELElBQUksQ0FBQztvQkFDRCxNQUFNLGtCQUFrQixHQUFHLE1BQU0sZ0NBQTRCLFlBQUMsVUFBVSxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDO29CQUV2SCxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7d0JBQ3JCLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxNQUFNLENBQUMsU0FBUyxnQkFBZ0IsRUFBRSxFQUFFLFNBQVMsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFDLENBQUMsQ0FBQzt3QkFFckcsTUFBTSxLQUFLLEdBQWEsRUFBRSxDQUFDO3dCQUUzQixLQUFLLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO3dCQUNyQixLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO3dCQUN0QixLQUFLLENBQUMsSUFBSSxDQUFDLDZCQUE2QixDQUFDLENBQUM7d0JBQzFDLEtBQUssQ0FBQyxJQUFJLENBQUMsaUNBQWlDLENBQUMsQ0FBQzt3QkFDOUMsS0FBSyxDQUFDLElBQUksQ0FBQyw2QkFBeUIsWUFBQyxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUM7d0JBRWhELE1BQU0sVUFBVSxDQUFDLGNBQWMsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLENBQUM7b0JBQ3hGLENBQUM7b0JBQUMsSUFBSSxDQUFDLENBQUM7d0JBQ0osTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLE1BQU0sQ0FBQyxTQUFTLGdDQUFnQyxDQUFDLENBQUM7b0JBQzlFLENBQUM7b0JBRUQsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQyxjQUFjLE1BQU0sQ0FBQyxTQUFTLFNBQVMsRUFBRSxHQUFHLENBQUMsQ0FBQztvQkFDM0QsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO1lBQ0wsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLElBQUksR0FBRyxHQUFHLE1BQU0sb0JBQWdCLFlBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQztnQkFDakcsRUFBRSxDQUFDLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ1osR0FBRyxHQUFHLE1BQU0sb0JBQWdCLFlBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQztnQkFDbEcsQ0FBQztnQkFFRCxNQUFNLENBQUMsR0FBRyxDQUFDO1lBQ2YsQ0FBQztRQUNMLENBQUM7S0FBQTtJQUVPLGNBQWMsQ0FBQyxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDLEVBQUUsUUFBeUM7UUFDL0osTUFBTSxNQUFNLEdBQUcsSUFBSSx5Q0FBbUIsRUFBRSxDQUFDO1FBRXpDLGVBQWUsQ0FBQyxXQUFXLENBQUMsb0JBQW9CLENBQUMsR0FBRyxJQUFJLENBQUM7UUFDekQsZUFBZSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDO1FBQ3ZDLGVBQWUsQ0FBQyxXQUFXLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQztRQUUzQyxNQUFNLENBQUMsYUFBYSxHQUFHLElBQUkseUNBQW1CLEVBQUUsQ0FBQztRQUVqRCxNQUFNLENBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztRQUNwQixNQUFNLENBQUMsR0FBRyxHQUFHLEVBQUUsQ0FBQztRQUNoQixNQUFNLENBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztRQUNwQixNQUFNLENBQUMsS0FBSyxHQUFHLEVBQUUsQ0FBQztRQUNsQixNQUFNLENBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztRQUVwQixFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1lBQ1gsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDcEMsQ0FBQztRQUVELE1BQU0sQ0FBQyxhQUFhLENBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQztRQUNyQyxNQUFNLENBQUMsYUFBYSxDQUFDLFVBQVUsR0FBRyxRQUFRLENBQUM7UUFDM0MsTUFBTSxDQUFDLGFBQWEsQ0FBQyxZQUFZLEdBQUcsRUFBRSxDQUFDO1FBRXZDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sR0FBRyxJQUFJLGVBQWUsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO1lBQzdDLEVBQUUsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztnQkFDN0MsTUFBTSxDQUFDLGFBQWEsQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLEdBQUcsZUFBZSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUM7WUFDdEYsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztvQkFDekMsT0FBTyxNQUFNLENBQUMsYUFBYSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQztnQkFDbEQsQ0FBQztZQUNMLENBQUM7UUFDTCxDQUFDO1FBRUQsR0FBRyxDQUFDLENBQUMsTUFBTSxHQUFHLElBQUksZUFBZSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7WUFDNUMsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDeEMsRUFBRSxDQUFDLENBQUMsZUFBZSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ25DLEVBQUUsQ0FBQyxDQUFDLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUNWLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUM3QixDQUFDO1lBQ0wsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLEVBQUUsQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUNYLE1BQU0sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQztnQkFDbEMsQ0FBQztZQUNMLENBQUM7UUFDTCxDQUFDO1FBRUQsR0FBRyxDQUFDLENBQUMsTUFBTSxHQUFHLElBQUksZUFBZSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7WUFDNUMsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDeEMsRUFBRSxDQUFDLENBQUMsZUFBZSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ25DLEVBQUUsQ0FBQyxDQUFDLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUNWLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUM3QixDQUFDO1lBQ0wsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLEVBQUUsQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUNYLE1BQU0sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQztnQkFDbEMsQ0FBQztZQUNMLENBQUM7UUFDTCxDQUFDO1FBRUQsR0FBRyxDQUFDLENBQUMsTUFBTSxHQUFHLElBQUksZUFBZSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7WUFDeEMsRUFBRSxDQUFDLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQy9CLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDO1lBQzNCLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDSixFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztvQkFDbEIsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUMzQixDQUFDO1lBQ0wsQ0FBQztRQUNMLENBQUM7UUFFRCxHQUFHLENBQUMsQ0FBQyxNQUFNLEdBQUcsSUFBSSxlQUFlLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQztZQUM1QyxFQUFFLENBQUMsQ0FBQyxlQUFlLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDbkMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUM7WUFDL0IsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNKLEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUN0QixPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQy9CLENBQUM7WUFDTCxDQUFDO1FBQ0wsQ0FBQztRQUVELE1BQU0sQ0FBQyxNQUFNLENBQUM7SUFDbEIsQ0FBQzs7QUExSmMsZUFBUSxHQUFXLGdCQUFnQixDQUFDO0FBQ3BDLGdCQUFTLEdBQVcsZUFBZSxDQUFDO0FBRnZELHdCQTRKQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL2xpbnQvZXNMaW50LmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 diff --git a/dist/pipelineSteps/lint/tsLint.d.ts b/dist/pipelineSteps/lint/tsLint.d.ts index 42f5db6e..3a0c3bde 100644 --- a/dist/pipelineSteps/lint/tsLint.d.ts +++ b/dist/pipelineSteps/lint/tsLint.d.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate tslint configuration. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,7 +8,7 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class TsLint extends EnginePipelineStepBase { private static FILENAME; - prerequisites(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + prerequisites(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; private generateConfig(fileSystem, uniteConfiguration, engineVariables, existing); } diff --git a/dist/pipelineSteps/lint/tsLint.js b/dist/pipelineSteps/lint/tsLint.js index f365ffe0..53c209f8 100644 --- a/dist/pipelineSteps/lint/tsLint.js +++ b/dist/pipelineSteps/lint/tsLint.js @@ -11,25 +11,24 @@ Object.defineProperty(exports, "__esModule", { value: true }); const tsLintConfiguration_1 = require("../../configuration/models/tslint/tsLintConfiguration"); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class TsLint extends enginePipelineStepBase_1.EnginePipelineStepBase { - prerequisites(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + prerequisites(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { if (uniteConfiguration.linter === "TSLint") { if (uniteConfiguration.sourceLanguage !== "TypeScript") { - _super("error").call(this, logger, display, "You can only use TSLint when the source language is TypeScript"); + logger.error("You can only use TSLint when the source language is TypeScript"); return 1; } } return 0; }); } - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["tslint"], uniteConfiguration.linter === "TSLint"); if (uniteConfiguration.linter === "TSLint") { try { - _super("log").call(this, logger, display, `Generating ${TsLint.FILENAME}`); + logger.info(`Generating ${TsLint.FILENAME}`); let existing; try { const exists = yield fileSystem.fileExists(engineVariables.wwwFolder, TsLint.FILENAME); @@ -38,7 +37,7 @@ class TsLint extends enginePipelineStepBase_1.EnginePipelineStepBase { } } catch (err) { - _super("error").call(this, logger, display, `Reading existing ${TsLint.FILENAME} failed`, err); + logger.error(`Reading existing ${TsLint.FILENAME} failed`, err); return 1; } const config = this.generateConfig(fileSystem, uniteConfiguration, engineVariables, existing); @@ -46,12 +45,12 @@ class TsLint extends enginePipelineStepBase_1.EnginePipelineStepBase { return 0; } catch (err) { - _super("error").call(this, logger, display, `Generating ${TsLint.FILENAME} failed`, err); + logger.error(`Generating ${TsLint.FILENAME} failed`, err); return 1; } } else { - return yield _super("deleteFile").call(this, logger, display, fileSystem, engineVariables.wwwFolder, TsLint.FILENAME); + return yield _super("deleteFile").call(this, logger, fileSystem, engineVariables.wwwFolder, TsLint.FILENAME); } }); } @@ -87,4 +86,4 @@ class TsLint extends enginePipelineStepBase_1.EnginePipelineStepBase { TsLint.FILENAME = "tslint.json"; exports.TsLint = TsLint; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2xpbnQvdHNMaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFNQSwrRkFBNEY7QUFFNUYsZ0ZBQTZFO0FBRzdFLFlBQW9CLFNBQVEsK0NBQXNCO0lBR2pDLGFBQWEsQ0FBQyxNQUFlLEVBQ2YsT0FBaUIsRUFDakIsVUFBdUIsRUFDdkIsa0JBQXNDLEVBQ3RDLGVBQWdDOzs7WUFDdkQsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsTUFBTSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7Z0JBQ3pDLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLGNBQWMsS0FBSyxZQUFZLENBQUMsQ0FBQyxDQUFDO29CQUNyRCxlQUFXLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxnRUFBZ0UsRUFBRTtvQkFDL0YsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO1lBQ0wsQ0FBQztZQUNELE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7SUFFWSxPQUFPLENBQUMsTUFBZSxFQUFFLE9BQWlCLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ3RKLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxRQUFRLENBQUMsQ0FBQztZQUV4RixFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztnQkFDekMsSUFBSSxDQUFDO29CQUNELGFBQVMsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLGNBQWMsTUFBTSxDQUFDLFFBQVEsRUFBRSxFQUFFO29CQUU1RCxJQUFJLFFBQVEsQ0FBQztvQkFDYixJQUFJLENBQUM7d0JBQ0QsTUFBTSxNQUFNLEdBQUcsTUFBTSxVQUFVLENBQUMsVUFBVSxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsTUFBTSxDQUFDLFFBQVEs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 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL2xpbnQvdHNMaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFLQSwrRkFBNEY7QUFFNUYsZ0ZBQTZFO0FBRzdFLFlBQW9CLFNBQVEsK0NBQXNCO0lBR2pDLGFBQWEsQ0FBQyxNQUFlLEVBQ2YsVUFBdUIsRUFDdkIsa0JBQXNDLEVBQ3RDLGVBQWdDOztZQUN2RCxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztnQkFDekMsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsY0FBYyxLQUFLLFlBQVksQ0FBQyxDQUFDLENBQUM7b0JBQ3JELE1BQU0sQ0FBQyxLQUFLLENBQUMsZ0VBQWdFLENBQUMsQ0FBQztvQkFDL0UsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO1lBQ0wsQ0FBQztZQUNELE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7SUFFWSxPQUFPLENBQUMsTUFBZSxFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUNuSSxlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxRQUFRLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssUUFBUSxDQUFDLENBQUM7WUFFeEYsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsTUFBTSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7Z0JBQ3pDLElBQUksQ0FBQztvQkFDRCxNQUFNLENBQUMsSUFBSSxDQUFDLGNBQWMsTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7b0JBRTdDLElBQUksUUFBUSxDQUFDO29CQUNiLElBQUksQ0FBQzt3QkFDRCxNQUFNLE1BQU0sR0FBRyxNQUFNLFVBQVUsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7d0JBQ3ZGLEVBQUUsQ0FBQyxDQUFDLE1B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 diff --git a/dist/pipelineSteps/moduleType/amd.d.ts b/dist/pipelineSteps/moduleType/amd.d.ts index 5505ecaa..d1f082c3 100644 --- a/dist/pipelineSteps/moduleType/amd.d.ts +++ b/dist/pipelineSteps/moduleType/amd.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate configuration for amd modules. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class Amd extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/moduleType/amd.js b/dist/pipelineSteps/moduleType/amd.js index 7e266932..85424c3b 100644 --- a/dist/pipelineSteps/moduleType/amd.js +++ b/dist/pipelineSteps/moduleType/amd.js @@ -10,14 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class Amd extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleClientPackage("requirejs", "require.js", "", false, "app", false, uniteConfiguration.moduleType === "AMD"); engineVariables.toggleClientPackage("text", "text.js", "", false, "both", false, uniteConfiguration.moduleType === "AMD"); if (uniteConfiguration.moduleType === "AMD") { try { - _super("log").call(this, logger, display, "Generating Module Loader Scaffold", {}); + logger.info("Generating Module Loader Scaffold", {}); engineVariables.htmlNoBundle.scriptIncludes.push("requirejs/require.js"); uniteConfiguration.srcDistReplace = "(define)*?(..\/src\/)"; uniteConfiguration.srcDistReplaceWith = "../dist/"; @@ -34,7 +33,7 @@ class Amd extends enginePipelineStepBase_1.EnginePipelineStepBase { return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating Module Loader Scaffold failed", err); + logger.error("Generating Module Loader Scaffold failed", err); return 1; } } @@ -44,4 +43,4 @@ class Amd extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.Amd = Amd; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL21vZHVsZVR5cGUvYW1kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFPQSxnRkFBNkU7QUFHN0UsU0FBaUIsU0FBUSwrQ0FBc0I7SUFDOUIsT0FBTyxDQUFDLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUN0SixlQUFlLENBQUMsbUJBQW1CLENBQy9CLFdBQVcsRUFDWCxZQUFZLEVBQ1osRUFBRSxFQUNGLEtBQUssRUFDTCxLQUFLLEVBQ0wsS0FBSyxFQUNMLGtCQUFrQixDQUFDLFVBQVUsS0FBSyxLQUFLLENBQUMsQ0FBQztZQUU3QyxlQUFlLENBQUMsbUJBQW1CLENBQy9CLE1BQU0sRUFDTixTQUFTLEVBQ1QsRUFBRSxFQUNGLEtBQUssRUFDTCxNQUFNLEVBQ04sS0FBSyxFQUNMLGtCQUFrQixDQUFDLFVBQVUsS0FBSyxLQUFLLENBQUMsQ0FBQztZQUU3QyxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxVQUFVLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQztnQkFDMUMsSUFBSSxDQUFDO29CQUNELGFBQVMsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLG1DQUFtQyxFQUFFLEVBQUUsRUFBRTtvQkFFcEUsZUFBZSxDQUFDLFlBQVksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLENBQUM7b0JBRXpFLGtCQUFrQixDQUFDLGNBQWMsR0FBRyx1QkFBdUIsQ0FBQztvQkFDNUQsa0JBQWtCLENBQUMsa0JBQWtCLEdBQUcsVUFBVSxDQUFDO29CQUVuRCxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsdURBQXVELENBQUMsQ0FBQztvQkFDaEcsZUFBZSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO29CQUNuRCxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsc0NBQXNDLENBQUMsQ0FBQztvQkFDL0UsZUFBZSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLENBQUM7b0JBQzVELGVBQWUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxtQ0FBbUMsQ0FBQyxDQUFDO29CQUM1RSxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7b0JBQzlDLGVBQWUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztvQkFFcEQsZUFBZSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLDhEQUE4RCxDQUFDLENBQUM7b0JBQ3JHLGVBQWUsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO29CQUN2RSxlQUFlLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsMkRBQTJELENBQUMsQ0FBQztvQkFFbEcsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsZUFBVyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsMENBQTBDLEVBQUUsR0FBRyxFQUFFO29CQUM5RSxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7WUFDTCxDQUFDO1lBQ0QsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtDQUNKO0FBakRELGtCQWlEQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL21vZHVsZVR5cGUvYW1kLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL21vZHVsZVR5cGUvYW1kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFNQSxnRkFBNkU7QUFHN0UsU0FBaUIsU0FBUSwrQ0FBc0I7SUFDOUIsT0FBTyxDQUFDLE1BQWUsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOztZQUNuSSxlQUFlLENBQUMsbUJBQW1CLENBQy9CLFdBQVcsRUFDWCxZQUFZLEVBQ1osRUFBRSxFQUNGLEtBQUssRUFDTCxLQUFLLEVBQ0wsS0FBSyxFQUNMLGtCQUFrQixDQUFDLFVBQVUsS0FBSyxLQUFLLENBQUMsQ0FBQztZQUU3QyxlQUFlLENBQUMsbUJBQW1CLENBQy9CLE1BQU0sRUFDTixTQUFTLEVBQ1QsRUFBRSxFQUNGLEtBQUssRUFDTCxNQUFNLEVBQ04sS0FBSyxFQUNMLGtCQUFrQixDQUFDLFVBQVUsS0FBSyxLQUFLLENBQUMsQ0FBQztZQUU3QyxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxVQUFVLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQztnQkFDMUMsSUFBSSxDQUFDO29CQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsbUNBQW1DLEVBQUUsRUFBRSxDQUFDLENBQUM7b0JBRXJELGVBQWUsQ0FBQyxZQUFZLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO29CQUV6RSxrQkFBa0IsQ0FBQyxjQUFjLEdBQUcsdUJBQXVCLENBQUM7b0JBQzVELGtCQUFrQixDQUFDLGtCQUFrQixHQUFHLFVBQVUsQ0FBQztvQkFFbkQsZUFBZSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLHVEQUF1RCxDQUFDLENBQUM7b0JBQ2hHLGVBQWUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztvQkFDbkQsZUFBZSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLHNDQUFzQyxDQUFDLENBQUM7b0JBQy9FLGVBQWUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO29CQUM1RCxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsbUNBQW1DLENBQUMsQ0FBQztvQkFDNUUsZUFBZSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO29CQUM5QyxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7b0JBRXBELGVBQWUsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyw4REFBOEQsQ0FBQyxDQUFDO29CQUNyRyxlQUFlLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsZ0NBQWdDLENBQUMsQ0FBQztvQkFDdkUsZUFBZSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLDJEQUEyRCxDQUFDLENBQUM7b0JBRWxHLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztnQkFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUNYLE1BQU0sQ0FBQyxLQUFLLENBQUMsMENBQTBDLEVBQUUsR0FBRyxDQUFDLENBQUM7b0JBQzlELE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFDRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0NBQ0o7QUFqREQsa0JBaURDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvbW9kdWxlVHlwZS9hbWQuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/moduleType/commonJs.d.ts b/dist/pipelineSteps/moduleType/commonJs.d.ts index 244f21f3..37f78b3d 100644 --- a/dist/pipelineSteps/moduleType/commonJs.d.ts +++ b/dist/pipelineSteps/moduleType/commonJs.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate configuration for commonjs. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class CommonJs extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/moduleType/commonJs.js b/dist/pipelineSteps/moduleType/commonJs.js index 99c12edb..5b6ee223 100644 --- a/dist/pipelineSteps/moduleType/commonJs.js +++ b/dist/pipelineSteps/moduleType/commonJs.js @@ -10,14 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class CommonJs extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { // We use SystemJS to load cjs modules for the unbundled version of the project and unit testing engineVariables.toggleClientPackage("systemjs", "dist/system.src.js", "dist/system.js", false, "app", false, uniteConfiguration.moduleType === "CommonJS"); if (uniteConfiguration.moduleType === "CommonJS") { try { - _super("log").call(this, logger, display, "Generating Module Loader Scaffold", {}); + logger.info("Generating Module Loader Scaffold"); engineVariables.htmlNoBundle.scriptIncludes.push("systemjs/dist/system.js"); uniteConfiguration.srcDistReplace = "(require)*?(..\/src\/)"; uniteConfiguration.srcDistReplaceWith = "../dist/"; @@ -35,7 +34,7 @@ class CommonJs extends enginePipelineStepBase_1.EnginePipelineStepBase { return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating Module Loader Scaffold failed", err); + logger.error("Generating Module Loader Scaffold failed", err); return 1; } } @@ -45,4 +44,4 @@ class CommonJs extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.CommonJs = CommonJs; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL21vZHVsZVR5cGUvY29tbW9uSnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU9BLGdGQUE2RTtBQUc3RSxjQUFzQixTQUFRLCtDQUFzQjtJQUNuQyxPQUFPLENBQUMsTUFBZSxFQUFFLE9BQWlCLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ3RKLGdHQUFnRztZQUNoRyxlQUFlLENBQUMsbUJBQW1CLENBQy9CLFVBQVUsRUFDVixvQkFBb0IsRUFDcEIsZ0JBQWdCLEVBQ2hCLEtBQUssRUFDTCxLQUFLLEVBQ0wsS0FBSyxFQUNMLGtCQUFrQixDQUFDLFVBQVUsS0FBSyxVQUFVLENBQUMsQ0FBQztZQUVsRCxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxVQUFVLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQztnQkFDL0MsSUFBSSxDQUFDO29CQUNELGFBQVMsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLG1DQUFtQyxFQUFFLEVBQUcsRUFBRTtvQkFFckUsZUFBZSxDQUFDLFlBQVksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLHlCQUF5QixDQUFDLENBQUM7b0JBRTVFLGtCQUFrQixDQUFDLGNBQWMsR0FBRyx3QkFBd0IsQ0FBQztvQkFDN0Qsa0JBQWtCLENBQUMsa0JBQWtCLEdBQUcsVUFBVSxDQUFDO29CQUVuRCxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsdURBQXVELENBQUMsQ0FBQztvQkFDaEcsZUFBZSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO29CQUNuRCxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsdUZBQXVGLENBQUMsQ0FBQztvQkFDaEksZUFBZSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLHdCQUF3QixDQUFDLENBQUM7b0JBQ2pFLGVBQWUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO29CQUNoRSxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsNkNBQTZDLENBQUMsQ0FBQztvQkFDdEYsZUFBZSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO29CQUNsRCxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7b0JBRXBELGVBQWUsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyw4REFBOEQsQ0FBQyxDQUFDO29CQUNyRyxlQUFlLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsZ0NBQWdDLENBQUMsQ0FBQztvQkFDdkUsZUFBZSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLDJEQUEyRCxDQUFDLENBQUM7b0JBRWxHLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztnQkFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUNYLGVBQVcsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLDBDQUEwQyxFQUFFLEdBQUcsRUFBRTtvQkFDOUUsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO1lBQ0wsQ0FBQztZQUNELE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7Q0FDSjtBQTFDRCw0QkEwQ0MiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9tb2R1bGVUeXBlL2NvbW1vbkpzLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL21vZHVsZVR5cGUvY29tbW9uSnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU1BLGdGQUE2RTtBQUc3RSxjQUFzQixTQUFRLCtDQUFzQjtJQUNuQyxPQUFPLENBQUMsTUFBZSxFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7O1lBQ25JLGdHQUFnRztZQUNoRyxlQUFlLENBQUMsbUJBQW1CLENBQy9CLFVBQVUsRUFDVixvQkFBb0IsRUFDcEIsZ0JBQWdCLEVBQ2hCLEtBQUssRUFDTCxLQUFLLEVBQ0wsS0FBSyxFQUNMLGtCQUFrQixDQUFDLFVBQVUsS0FBSyxVQUFVLENBQUMsQ0FBQztZQUVsRCxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxVQUFVLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQztnQkFDL0MsSUFBSSxDQUFDO29CQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsbUNBQW1DLENBQUMsQ0FBQztvQkFFakQsZUFBZSxDQUFDLFlBQVksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLHlCQUF5QixDQUFDLENBQUM7b0JBRTVFLGtCQUFrQixDQUFDLGNBQWMsR0FBRyx3QkFBd0IsQ0FBQztvQkFDN0Qsa0JBQWtCLENBQUMsa0JBQWtCLEdBQUcsVUFBVSxDQUFDO29CQUVuRCxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsdURBQXVELENBQUMsQ0FBQztvQkFDaEcsZUFBZSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO29CQUNuRCxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsdUZBQXVGLENBQUMsQ0FBQztvQkFDaEksZUFBZSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLHdCQUF3QixDQUFDLENBQUM7b0JBQ2pFLGVBQWUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO29CQUNoRSxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsNkNBQTZDLENBQUMsQ0FBQztvQkFDdEYsZUFBZSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO29CQUNsRCxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7b0JBRXBELGVBQWUsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyw4REFBOEQsQ0FBQyxDQUFDO29CQUNyRyxlQUFlLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsZ0NBQWdDLENBQUMsQ0FBQztvQkFDdkUsZUFBZSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLDJEQUEyRCxDQUFDLENBQUM7b0JBRWxHLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztnQkFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUNYLE1BQU0sQ0FBQyxLQUFLLENBQUMsMENBQTBDLEVBQUUsR0FBRyxDQUFDLENBQUM7b0JBQzlELE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFDRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0NBQ0o7QUExQ0QsNEJBMENDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvbW9kdWxlVHlwZS9jb21tb25Kcy5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== diff --git a/dist/pipelineSteps/moduleType/systemJs.d.ts b/dist/pipelineSteps/moduleType/systemJs.d.ts index 06aec79d..6a815831 100644 --- a/dist/pipelineSteps/moduleType/systemJs.d.ts +++ b/dist/pipelineSteps/moduleType/systemJs.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate configuration for systemjs. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class SystemJs extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/moduleType/systemJs.js b/dist/pipelineSteps/moduleType/systemJs.js index deccad30..42d913f2 100644 --- a/dist/pipelineSteps/moduleType/systemJs.js +++ b/dist/pipelineSteps/moduleType/systemJs.js @@ -10,14 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class SystemJs extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleClientPackage("systemjs", "dist/system.src.js", "dist/system.js", false, "app", false, uniteConfiguration.moduleType === "SystemJS"); engineVariables.toggleClientPackage("systemjs-plugin-text", "text.js", undefined, false, "both", false, uniteConfiguration.moduleType === "SystemJS"); if (uniteConfiguration.moduleType === "SystemJS") { try { - _super("log").call(this, logger, display, "Generating Module Loader Scaffold", {}); + logger.info("Generating Module Loader Scaffold"); engineVariables.htmlNoBundle.scriptIncludes.push("systemjs/dist/system.js"); uniteConfiguration.srcDistReplace = "(System.register)*?(..\/src\/)"; uniteConfiguration.srcDistReplaceWith = "../dist/"; @@ -35,7 +34,7 @@ class SystemJs extends enginePipelineStepBase_1.EnginePipelineStepBase { return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating Module Loader Scaffold failed", err); + logger.error("Generating Module Loader Scaffold failed", err); return 1; } } @@ -45,4 +44,4 @@ class SystemJs extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.SystemJs = SystemJs; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL21vZHVsZVR5cGUvc3lzdGVtSnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU9BLGdGQUE2RTtBQUc3RSxjQUFzQixTQUFRLCtDQUFzQjtJQUNuQyxPQUFPLENBQUMsTUFBZSxFQUFFLE9BQWlCLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ3RKLGVBQWUsQ0FBQyxtQkFBbUIsQ0FDL0IsVUFBVSxFQUNWLG9CQUFvQixFQUNwQixnQkFBZ0IsRUFDaEIsS0FBSyxFQUNMLEtBQUssRUFDTCxLQUFLLEVBQ0wsa0JBQWtCLENBQUMsVUFBVSxLQUFLLFVBQVUsQ0FBQyxDQUFDO1lBRWxELGVBQWUsQ0FBQyxtQkFBbUIsQ0FDL0Isc0JBQXNCLEVBQ3RCLFNBQVMsRUFDVCxTQUFTLEVBQ1QsS0FBSyxFQUNMLE1BQU0sRUFDTixLQUFLLEVBQ0wsa0JBQWtCLENBQUMsVUFBVSxLQUFLLFVBQVUsQ0FBQyxDQUFDO1lBRWxELEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLFVBQVUsS0FBSyxVQUFVLENBQUMsQ0FBQyxDQUFDO2dCQUMvQyxJQUFJLENBQUM7b0JBQ0QsYUFBUyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsbUNBQW1DLEVBQUUsRUFBRyxFQUFFO29CQUVyRSxlQUFlLENBQUMsWUFBWSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMseUJBQXlCLENBQUMsQ0FBQztvQkFFNUUsa0JBQWtCLENBQUMsY0FBYyxHQUFHLGdDQUFnQyxDQUFDO29CQUNyRSxrQkFBa0IsQ0FBQyxrQkFBa0IsR0FBRyxVQUFVLENBQUM7b0JBRW5ELGVBQWUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyx1REFBdUQsQ0FBQyxDQUFDO29CQUNoRyxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7b0JBQ25ELGVBQWUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyx1RkFBdUYsQ0FBQyxDQUFDO29CQUNoSSxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsd0JBQXdCLENBQUMsQ0FBQztvQkFDakUsZUFBZSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLHVCQUF1QixDQUFDLENBQUM7b0JBQ2hFLGVBQWUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyw2Q0FBNkMsQ0FBQyxDQUFDO29CQUN0RixlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7b0JBQ2xELGVBQWUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztvQkFFcEQsZUFBZSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLDhEQUE4RCxDQUFDLENBQUM7b0JBQ3JHLGVBQWUsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO29CQUN2RSxlQUFlLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsMkRBQTJELENBQUMsQ0FBQztvQkFFbEcsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsZUFBVyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsMENBQTBDLEVBQUUsR0FBRyxFQUFFO29CQUM5RSxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7WUFDTCxDQUFDO1lBQ0QsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtDQUNKO0FBbERELDRCQWtEQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL21vZHVsZVR5cGUvc3lzdGVtSnMuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL21vZHVsZVR5cGUvc3lzdGVtSnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU1BLGdGQUE2RTtBQUc3RSxjQUFzQixTQUFRLCtDQUFzQjtJQUNuQyxPQUFPLENBQUMsTUFBZSxFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7O1lBQ25JLGVBQWUsQ0FBQyxtQkFBbUIsQ0FDL0IsVUFBVSxFQUNWLG9CQUFvQixFQUNwQixnQkFBZ0IsRUFDaEIsS0FBSyxFQUNMLEtBQUssRUFDTCxLQUFLLEVBQ0wsa0JBQWtCLENBQUMsVUFBVSxLQUFLLFVBQVUsQ0FBQyxDQUFDO1lBRWxELGVBQWUsQ0FBQyxtQkFBbUIsQ0FDL0Isc0JBQXNCLEVBQ3RCLFNBQVMsRUFDVCxTQUFTLEVBQ1QsS0FBSyxFQUNMLE1BQU0sRUFDTixLQUFLLEVBQ0wsa0JBQWtCLENBQUMsVUFBVSxLQUFLLFVBQVUsQ0FBQyxDQUFDO1lBRWxELEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLFVBQVUsS0FBSyxVQUFVLENBQUMsQ0FBQyxDQUFDO2dCQUMvQyxJQUFJLENBQUM7b0JBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxtQ0FBbUMsQ0FBQyxDQUFDO29CQUVqRCxlQUFlLENBQUMsWUFBWSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMseUJBQXlCLENBQUMsQ0FBQztvQkFFNUUsa0JBQWtCLENBQUMsY0FBYyxHQUFHLGdDQUFnQyxDQUFDO29CQUNyRSxrQkFBa0IsQ0FBQyxrQkFBa0IsR0FBRyxVQUFVLENBQUM7b0JBRW5ELGVBQWUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyx1REFBdUQsQ0FBQyxDQUFDO29CQUNoRyxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7b0JBQ25ELGVBQWUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyx1RkFBdUYsQ0FBQyxDQUFDO29CQUNoSSxlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsd0JBQXdCLENBQUMsQ0FBQztvQkFDakUsZUFBZSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLHVCQUF1QixDQUFDLENBQUM7b0JBQ2hFLGVBQWUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyw2Q0FBNkMsQ0FBQyxDQUFDO29CQUN0RixlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7b0JBQ2xELGVBQWUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztvQkFFcEQsZUFBZSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLDhEQUE4RCxDQUFDLENBQUM7b0JBQ3JHLGVBQWUsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO29CQUN2RSxlQUFlLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsMkRBQTJELENBQUMsQ0FBQztvQkFFbEcsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQywwQ0FBMEMsRUFBRSxHQUFHLENBQUMsQ0FBQztvQkFDOUQsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO1lBQ0wsQ0FBQztZQUNELE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7Q0FDSjtBQWxERCw0QkFrREMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9tb2R1bGVUeXBlL3N5c3RlbUpzLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 diff --git a/dist/pipelineSteps/scaffold/appScaffold.d.ts b/dist/pipelineSteps/scaffold/appScaffold.d.ts index a3623b33..97f45ad9 100644 --- a/dist/pipelineSteps/scaffold/appScaffold.d.ts +++ b/dist/pipelineSteps/scaffold/appScaffold.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate scaffolding for app. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class AppScaffold extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/scaffold/appScaffold.js b/dist/pipelineSteps/scaffold/appScaffold.js index 8fe78b7d..9bcb7d8b 100644 --- a/dist/pipelineSteps/scaffold/appScaffold.js +++ b/dist/pipelineSteps/scaffold/appScaffold.js @@ -10,16 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class AppScaffold extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { try { - _super("log").call(this, logger, display, "Creating App Source Directory", { appSourceFolder: engineVariables.srcFolder }); + logger.info("Creating App Source Directory", { appSourceFolder: engineVariables.srcFolder }); yield fileSystem.directoryCreate(engineVariables.srcFolder); return 0; } catch (err) { - _super("error").call(this, logger, display, "Creating App Source Directory failed", err, { appSourceFolder: engineVariables.srcFolder }); + logger.error("Creating App Source Directory failed", err, { appSourceFolder: engineVariables.srcFolder }); return 1; } }); @@ -27,4 +26,4 @@ class AppScaffold extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.AppScaffold = AppScaffold; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NjYWZmb2xkL2FwcFNjYWZmb2xkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFPQSxnRkFBNkU7QUFHN0UsaUJBQXlCLFNBQVEsK0NBQXNCO0lBQ3RDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsT0FBaUIsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOzs7WUFDdEosSUFBSSxDQUFDO2dCQUNELGFBQVMsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLCtCQUErQixFQUFFLEVBQUUsZUFBZSxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsRUFBRTtnQkFDNUcsTUFBTSxVQUFVLENBQUMsZUFBZSxDQUFDLGVBQWUsQ0FBQyxTQUFTLENBQUMsQ0FBQztnQkFDNUQsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7WUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNYLGVBQVcsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLHNDQUFzQyxFQUFFLEdBQUcsRUFBRSxFQUFFLGVBQWUsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLEVBQUU7Z0JBQzFILE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDYixDQUFDO1FBQ0wsQ0FBQztLQUFBO0NBQ0o7QUFYRCxrQ0FXQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL3NjYWZmb2xkL2FwcFNjYWZmb2xkLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NjYWZmb2xkL2FwcFNjYWZmb2xkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFNQSxnRkFBNkU7QUFHN0UsaUJBQXlCLFNBQVEsK0NBQXNCO0lBQ3RDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7WUFDbkksSUFBSSxDQUFDO2dCQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsK0JBQStCLEVBQUUsRUFBRSxlQUFlLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7Z0JBQzdGLE1BQU0sVUFBVSxDQUFDLGVBQWUsQ0FBQyxlQUFlLENBQUMsU0FBUyxDQUFDLENBQUM7Z0JBQzVELE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDYixDQUFDO1lBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFDWCxNQUFNLENBQUMsS0FBSyxDQUFDLHNDQUFzQyxFQUFFLEdBQUcsRUFBRSxFQUFFLGVBQWUsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQztnQkFDMUcsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7UUFDTCxDQUFDO0tBQUE7Q0FDSjtBQVhELGtDQVdDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvc2NhZmZvbGQvYXBwU2NhZmZvbGQuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/scaffold/e2eTestScaffold.d.ts b/dist/pipelineSteps/scaffold/e2eTestScaffold.d.ts index d1f697bc..33c86c16 100644 --- a/dist/pipelineSteps/scaffold/e2eTestScaffold.d.ts +++ b/dist/pipelineSteps/scaffold/e2eTestScaffold.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate scaffolding for e2e tests. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class E2eTestScaffold extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/scaffold/e2eTestScaffold.js b/dist/pipelineSteps/scaffold/e2eTestScaffold.js index 97eb3df7..dd0aa42f 100644 --- a/dist/pipelineSteps/scaffold/e2eTestScaffold.js +++ b/dist/pipelineSteps/scaffold/e2eTestScaffold.js @@ -10,17 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class E2eTestScaffold extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { if (uniteConfiguration.e2eTestRunner !== "None") { try { - _super("log").call(this, logger, display, "Creating E2E Test Directory", { e2eTestSrcFolder: engineVariables.e2eTestSrcFolder }); + logger.info("Creating E2E Test Directory", { e2eTestSrcFolder: engineVariables.e2eTestSrcFolder }); yield fileSystem.directoryCreate(engineVariables.e2eTestSrcFolder); return 0; } catch (err) { - _super("error").call(this, logger, display, "Creating E2E Test Directory failed", err, { e2eTestSrcFolder: engineVariables.e2eTestSrcFolder }); + logger.error("Creating E2E Test Directory failed", err, { e2eTestSrcFolder: engineVariables.e2eTestSrcFolder }); return 1; } } @@ -30,4 +29,4 @@ class E2eTestScaffold extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.E2eTestScaffold = E2eTestScaffold; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NjYWZmb2xkL2UyZVRlc3RTY2FmZm9sZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBT0EsZ0ZBQTZFO0FBRzdFLHFCQUE2QixTQUFRLCtDQUFzQjtJQUMxQyxPQUFPLENBQUMsTUFBZSxFQUFFLE9BQWlCLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ3RKLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLGFBQWEsS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUM5QyxJQUFJLENBQUM7b0JBQ0QsYUFBUyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsRUFBRSxnQkFBZ0IsRUFBRSxlQUFlLENBQUMsZ0JBQWdCLEVBQUUsRUFBRTtvQkFDbEgsTUFBTSxVQUFVLENBQUMsZUFBZSxDQUFDLGVBQWUsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO29CQUNuRSxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7Z0JBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztvQkFDWCxlQUFXLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxvQ0FBb0MsRUFBRSxHQUFHLEVBQUUsRUFBRSxnQkFBZ0IsRUFBRSxlQUFlLENBQUMsZ0JBQWdCLEVBQUUsRUFBRTtvQkFDaEksTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO1lBQ0wsQ0FBQztZQUVELE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7Q0FDSjtBQWZELDBDQWVDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvc2NhZmZvbGQvZTJlVGVzdFNjYWZmb2xkLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NjYWZmb2xkL2UyZVRlc3RTY2FmZm9sZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBTUEsZ0ZBQTZFO0FBRzdFLHFCQUE2QixTQUFRLCtDQUFzQjtJQUMxQyxPQUFPLENBQUMsTUFBZSxFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7O1lBQ25JLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLGFBQWEsS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUM5QyxJQUFJLENBQUM7b0JBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyw2QkFBNkIsRUFBRSxFQUFFLGdCQUFnQixFQUFFLGVBQWUsQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLENBQUM7b0JBQ25HLE1BQU0sVUFBVSxDQUFDLGVBQWUsQ0FBQyxlQUFlLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztvQkFDbkUsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQyxvQ0FBb0MsRUFBRSxHQUFHLEVBQUUsRUFBRSxnQkFBZ0IsRUFBRSxlQUFlLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDO29CQUNoSCxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7WUFDTCxDQUFDO1lBRUQsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtDQUNKO0FBZkQsMENBZUMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9zY2FmZm9sZC9lMmVUZXN0U2NhZmZvbGQuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/scaffold/outputDirectory.d.ts b/dist/pipelineSteps/scaffold/outputDirectory.d.ts index d05d585a..8355452b 100644 --- a/dist/pipelineSteps/scaffold/outputDirectory.d.ts +++ b/dist/pipelineSteps/scaffold/outputDirectory.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to create output directory. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class OutputDirectory extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/scaffold/outputDirectory.js b/dist/pipelineSteps/scaffold/outputDirectory.js index e76dc74c..a3ecc434 100644 --- a/dist/pipelineSteps/scaffold/outputDirectory.js +++ b/dist/pipelineSteps/scaffold/outputDirectory.js @@ -10,24 +10,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class OutputDirectory extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { try { - _super("log").call(this, logger, display, "Creating Root Directory", { rootFolder: engineVariables.rootFolder }); + logger.info("Creating Root Directory", { rootFolder: engineVariables.rootFolder }); yield fileSystem.directoryCreate(engineVariables.rootFolder); } catch (err) { - _super("error").call(this, logger, display, "Creating Root Directory failed", err, { wwwFolder: engineVariables.rootFolder }); + logger.error("Creating Root Directory failed", err, { wwwFolder: engineVariables.rootFolder }); return 1; } try { - _super("log").call(this, logger, display, "Creating WWW Directory", { wwwFolder: engineVariables.wwwFolder }); + logger.info("Creating WWW Directory", { wwwFolder: engineVariables.wwwFolder }); yield fileSystem.directoryCreate(engineVariables.wwwFolder); return 0; } catch (err) { - _super("error").call(this, logger, display, "Creating WWW Directory failed", err, { wwwFolder: engineVariables.wwwFolder }); + logger.error("Creating WWW Directory failed", err, { wwwFolder: engineVariables.wwwFolder }); return 1; } }); @@ -35,4 +34,4 @@ class OutputDirectory extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.OutputDirectory = OutputDirectory; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NjYWZmb2xkL291dHB1dERpcmVjdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBT0EsZ0ZBQTZFO0FBRzdFLHFCQUE2QixTQUFRLCtDQUFzQjtJQUMxQyxPQUFPLENBQUMsTUFBZSxFQUFFLE9BQWlCLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ3RKLElBQUksQ0FBQztnQkFDRCxhQUFTLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsVUFBVSxFQUFFLEVBQUU7Z0JBQ2xHLE1BQU0sVUFBVSxDQUFDLGVBQWUsQ0FBQyxlQUFlLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDakUsQ0FBQztZQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ1gsZUFBVyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsZ0NBQWdDLEVBQUUsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxVQUFVLEVBQUUsRUFBRTtnQkFDL0csTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7WUFFRCxJQUFJLENBQUM7Z0JBQ0QsYUFBUyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxFQUFFO2dCQUMvRixNQUFNLFVBQVUsQ0FBQyxlQUFlLENBQUMsZUFBZSxDQUFDLFNBQVMsQ0FBQyxDQUFDO2dCQUM1RCxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztZQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ1gsZUFBVyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsK0JBQStCLEVBQUUsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsRUFBRTtnQkFDN0csTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7UUFDTCxDQUFDO0tBQUE7Q0FDSjtBQW5CRCwwQ0FtQkMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9zY2FmZm9sZC9vdXRwdXREaXJlY3RvcnkuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NjYWZmb2xkL291dHB1dERpcmVjdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBTUEsZ0ZBQTZFO0FBRzdFLHFCQUE2QixTQUFRLCtDQUFzQjtJQUMxQyxPQUFPLENBQUMsTUFBZSxFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7O1lBQ25JLElBQUksQ0FBQztnQkFDRCxNQUFNLENBQUMsSUFBSSxDQUFDLHlCQUF5QixFQUFFLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDO2dCQUNuRixNQUFNLFVBQVUsQ0FBQyxlQUFlLENBQUMsZUFBZSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQ2pFLENBQUM7WUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNYLE1BQU0sQ0FBQyxLQUFLLENBQUMsZ0NBQWdDLEVBQUUsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDO2dCQUMvRixNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztZQUVELElBQUksQ0FBQztnQkFDRCxNQUFNLENBQUMsSUFBSSxDQUFDLHdCQUF3QixFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDO2dCQUNoRixNQUFNLFVBQVUsQ0FBQyxlQUFlLENBQUMsZUFBZSxDQUFDLFNBQVMsQ0FBQyxDQUFDO2dCQUM1RCxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztZQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQywrQkFBK0IsRUFBRSxHQUFHLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7Z0JBQzdGLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDYixDQUFDO1FBQ0wsQ0FBQztLQUFBO0NBQ0o7QUFuQkQsMENBbUJDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvc2NhZmZvbGQvb3V0cHV0RGlyZWN0b3J5LmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 diff --git a/dist/pipelineSteps/scaffold/unitTestScaffold.d.ts b/dist/pipelineSteps/scaffold/unitTestScaffold.d.ts index 6b0c7084..6495e6c5 100644 --- a/dist/pipelineSteps/scaffold/unitTestScaffold.d.ts +++ b/dist/pipelineSteps/scaffold/unitTestScaffold.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate scaffolding for unit tests. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class UnitTestScaffold extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/scaffold/unitTestScaffold.js b/dist/pipelineSteps/scaffold/unitTestScaffold.js index 257b174b..a66ed4df 100644 --- a/dist/pipelineSteps/scaffold/unitTestScaffold.js +++ b/dist/pipelineSteps/scaffold/unitTestScaffold.js @@ -10,16 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class UnitTestScaffold extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { if (uniteConfiguration.unitTestRunner !== "None") { try { - _super("log").call(this, logger, display, "Creating Unit Test Directory", { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); + logger.info("Creating Unit Test Directory", { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); yield fileSystem.directoryCreate(engineVariables.unitTestSrcFolder); } catch (err) { - _super("error").call(this, logger, display, "Creating Unit Test Directory failed", err, { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); + logger.error("Creating Unit Test Directory failed", err, { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); return 1; } } @@ -29,4 +28,4 @@ class UnitTestScaffold extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.UnitTestScaffold = UnitTestScaffold; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NjYWZmb2xkL3VuaXRUZXN0U2NhZmZvbGQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU9BLGdGQUE2RTtBQUc3RSxzQkFBOEIsU0FBUSwrQ0FBc0I7SUFDM0MsT0FBTyxDQUFDLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUN0SixFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDL0MsSUFBSSxDQUFDO29CQUNELGFBQVMsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLDhCQUE4QixFQUFFLEVBQUUsaUJBQWlCLEVBQUUsZUFBZSxDQUFDLGlCQUFpQixFQUFFLEVBQUU7b0JBQ3JILE1BQU0sVUFBVSxDQUFDLGVBQWUsQ0FBQyxlQUFlLENBQUMsaUJBQWlCLENBQUMsQ0FBQztnQkFDeEUsQ0FBQztnQkFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUNYLGVBQVcsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLHFDQUFxQyxFQUFFLEdBQUcsRUFBRSxFQUFFLGlCQUFpQixFQUFFLGVBQWUsQ0FBQyxpQkFBaUIsRUFBRSxFQUFFO29CQUNuSSxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7WUFDTCxDQUFDO1lBRUQsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtDQUNKO0FBZEQsNENBY0MiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9zY2FmZm9sZC91bml0VGVzdFNjYWZmb2xkLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NjYWZmb2xkL3VuaXRUZXN0U2NhZmZvbGQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU1BLGdGQUE2RTtBQUc3RSxzQkFBOEIsU0FBUSwrQ0FBc0I7SUFDM0MsT0FBTyxDQUFDLE1BQWUsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOztZQUNuSSxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDL0MsSUFBSSxDQUFDO29CQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsOEJBQThCLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxlQUFlLENBQUMsaUJBQWlCLEVBQUUsQ0FBQyxDQUFDO29CQUN0RyxNQUFNLFVBQVUsQ0FBQyxlQUFlLENBQUMsZUFBZSxDQUFDLGlCQUFpQixDQUFDLENBQUM7Z0JBQ3hFLENBQUM7Z0JBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztvQkFDWCxNQUFNLENBQUMsS0FBSyxDQUFDLHFDQUFxQyxFQUFFLEdBQUcsRUFBRSxFQUFFLGlCQUFpQixFQUFFLGVBQWUsQ0FBQyxpQkFBaUIsRUFBRSxDQUFDLENBQUM7b0JBQ25ILE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFFRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0NBQ0o7QUFkRCw0Q0FjQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL3NjYWZmb2xkL3VuaXRUZXN0U2NhZmZvbGQuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/scaffold/uniteConfigurationDirectories.d.ts b/dist/pipelineSteps/scaffold/uniteConfigurationDirectories.d.ts index 07aca776..59035fd4 100644 --- a/dist/pipelineSteps/scaffold/uniteConfigurationDirectories.d.ts +++ b/dist/pipelineSteps/scaffold/uniteConfigurationDirectories.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate unite.json. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class UniteConfigurationDirectories extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/scaffold/uniteConfigurationDirectories.js b/dist/pipelineSteps/scaffold/uniteConfigurationDirectories.js index 433f5fcd..7fb9b4f3 100644 --- a/dist/pipelineSteps/scaffold/uniteConfigurationDirectories.js +++ b/dist/pipelineSteps/scaffold/uniteConfigurationDirectories.js @@ -11,11 +11,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); const uniteDirectories_1 = require("../../configuration/models/unite/uniteDirectories"); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class UniteConfigurationDirectories extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { try { - _super("log").call(this, logger, display, "Generating directories configuration", { wwwFolder: engineVariables.wwwFolder }); + logger.info("Generating directories configuration", { wwwFolder: engineVariables.wwwFolder }); uniteConfiguration.directories = new uniteDirectories_1.UniteDirectories(); uniteConfiguration.directories.src = fileSystem.pathToWeb(fileSystem.pathDirectoryRelative(engineVariables.wwwFolder, engineVariables.srcFolder)); uniteConfiguration.directories.dist = fileSystem.pathToWeb(fileSystem.pathDirectoryRelative(engineVariables.wwwFolder, engineVariables.distFolder)); @@ -37,7 +36,7 @@ class UniteConfigurationDirectories extends enginePipelineStepBase_1.EnginePipel return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating directories configuration failed", err, { wwwFolder: engineVariables.wwwFolder }); + logger.error("Generating directories configuration failed", err, { wwwFolder: engineVariables.wwwFolder }); return 1; } }); @@ -45,4 +44,4 @@ class UniteConfigurationDirectories extends enginePipelineStepBase_1.EnginePipel } exports.UniteConfigurationDirectories = UniteConfigurationDirectories; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NjYWZmb2xkL3VuaXRlQ29uZmlndXJhdGlvbkRpcmVjdG9yaWVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFPQSx3RkFBcUY7QUFDckYsZ0ZBQTZFO0FBRzdFLG1DQUEyQyxTQUFRLCtDQUFzQjtJQUN4RCxPQUFPLENBQUMsTUFBZSxFQUFFLE9BQWlCLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ3RKLElBQUksQ0FBQztnQkFDRCxhQUFTLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxzQ0FBc0MsRUFBRSxFQUFFLFNBQVMsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLEVBQUU7Z0JBRTdHLGtCQUFrQixDQUFDLFdBQVcsR0FBRyxJQUFJLG1DQUFnQixFQUFFLENBQUM7Z0JBQ3hELGtCQUFrQixDQUFDLFdBQVcsQ0FBQyxHQUFHLEdBQUcsVUFBVSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMscUJBQXFCLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxlQUFlLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztnQkFDbEosa0JBQWtCLENBQUMsV0FBVyxDQUFDLElBQUksR0FBRyxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxxQkFBcUIsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLGVBQWUsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO2dCQUVwSixFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssTUFBTSxDQUFDLENBQUMsQ0FBQztvQkFDL0Msa0JBQWtCLENBQUMsV0FBVyxDQUFDLFFBQVEsR0FBRyxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxxQkFBcUIsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDO29CQUM1SixrQkFBa0IsQ0FBQyxXQUFXLENBQUMsV0FBVyxHQUFHLFVBQVUsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLHFCQUFxQixDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsZUFBZSxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQztvQkFDbEssa0JBQWtCLENBQUMsV0FBVyxDQUFDLFlBQVksR0FBRyxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxxQkFBcUIsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLGVBQWUsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7Z0JBQ3hLLENBQUM7Z0JBRUQsa0JBQWtCLENBQUMsV0FBVyxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxxQkFBcUIsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLGVBQWUsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO2dCQUN4SixrQkFBa0IsQ0FBQyxXQUFXLENBQUMsT0FBTyxHQUFHLFVBQVUsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLHFCQUFxQixDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsZUFBZSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7Z0JBRTFKLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLGFBQWEsS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFDO29CQUM5QyxrQkFBa0IsQ0FBQyxXQUFXLENBQUMsT0FBTyxHQUFHLFVBQVUsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLHFCQUFxQixDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsZUFBZSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7b0JBQzFKLGtCQUFrQixDQUFDLFdBQVcsQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMscUJBQXFCLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxlQUFlLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO29CQUNoSyxrQkFBa0IsQ0FBQyxXQUFXLENBQUMsV0FBVyxHQUFHLFVBQVUsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLHFCQUFxQixDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsZUFBZSxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQztnQkFDdEssQ0FBQztnQkFFRCxrQkFBa0IsQ0FBQyxXQUFXLENBQUMsT0FBTyxHQUFHLFVBQVUsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLHFCQUFxQixDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsZUFBZSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7Z0JBRTFKLGtCQUFrQixDQUFDLFdBQVcsQ0FBQyxNQUFNLEdBQUcsVUFBVSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMscUJBQXFCLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxlQUFlLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQztnQkFDeEosa0JBQWtCLENBQUMsV0FBVyxDQUFDLFlBQVksR0FBRyxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxxQkFBcUIsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLGVBQWUsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7Z0JBQ3BLLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDYixDQUFDO1lBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFDWCxlQUFXLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSw2Q0FBNkMsRUFBRSxHQUFHLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxFQUFFO2dCQUMzSCxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztRQUNMLENBQUM7S0FBQTtDQUNKO0FBbENELHNFQWtDQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL3NjYWZmb2xkL3VuaXRlQ29uZmlndXJhdGlvbkRpcmVjdG9yaWVzLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NjYWZmb2xkL3VuaXRlQ29uZmlndXJhdGlvbkRpcmVjdG9yaWVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFNQSx3RkFBcUY7QUFDckYsZ0ZBQTZFO0FBRzdFLG1DQUEyQyxTQUFRLCtDQUFzQjtJQUN4RCxPQUFPLENBQUMsTUFBZSxFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7O1lBQ25JLElBQUksQ0FBQztnQkFDRCxNQUFNLENBQUMsSUFBSSxDQUFDLHNDQUFzQyxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDO2dCQUU5RixrQkFBa0IsQ0FBQyxXQUFXLEdBQUcsSUFBSSxtQ0FBZ0IsRUFBRSxDQUFDO2dCQUN4RCxrQkFBa0IsQ0FBQyxXQUFXLENBQUMsR0FBRyxHQUFHLFVBQVUsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLHFCQUFxQixDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7Z0JBQ2xKLGtCQUFrQixDQUFDLFdBQVcsQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMscUJBQXFCLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxlQUFlLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztnQkFFcEosRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsY0FBYyxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUM7b0JBQy9DLGtCQUFrQixDQUFDLFdBQVcsQ0FBQyxRQUFRLEdBQUcsVUFBVSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMscUJBQXFCLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxlQUFlLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztvQkFDNUosa0JBQWtCLENBQUMsV0FBVyxDQUFDLFdBQVcsR0FBRyxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxxQkFBcUIsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLGVBQWUsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLENBQUM7b0JBQ2xLLGtCQUFrQixDQUFDLFdBQVcsQ0FBQyxZQUFZLEdBQUcsVUFBVSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMscUJBQXFCLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxlQUFlLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDO2dCQUN4SyxDQUFDO2dCQUVELGtCQUFrQixDQUFDLFdBQVcsQ0FBQyxNQUFNLEdBQUcsVUFBVSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMscUJBQXFCLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxlQUFlLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQztnQkFDeEosa0JBQWtCLENBQUMsV0FBVyxDQUFDLE9BQU8sR0FBRyxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxxQkFBcUIsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLGVBQWUsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO2dCQUUxSixFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxhQUFhLEtBQUssTUFBTSxDQUFDLENBQUMsQ0FBQztvQkFDOUMsa0JBQWtCLENBQUMsV0FBVyxDQUFDLE9BQU8sR0FBRyxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxxQkFBcUIsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLGVBQWUsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO29CQUMxSixrQkFBa0IsQ0FBQyxXQUFXLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLHFCQUFxQixDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsZUFBZSxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQztvQkFDaEssa0JBQWtCLENBQUMsV0FBVyxDQUFDLFdBQVcsR0FBRyxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxxQkFBcUIsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLGVBQWUsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLENBQUM7Z0JBQ3RLLENBQUM7Z0JBRUQsa0JBQWtCLENBQUMsV0FBVyxDQUFDLE9BQU8sR0FBRyxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxxQkFBcUIsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLGVBQWUsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO2dCQUUxSixrQkFBa0IsQ0FBQyxXQUFXLENBQUMsTUFBTSxHQUFHLFVBQVUsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLHFCQUFxQixDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsZUFBZSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7Z0JBQ3hKLGtCQUFrQixDQUFDLFdBQVcsQ0FBQyxZQUFZLEdBQUcsVUFBVSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMscUJBQXFCLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxlQUFlLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDO2dCQUNwSyxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztZQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ1gsTUFBTSxDQUFDLEtBQUssQ0FBQyw2Q0FBNkMsRUFBRSxHQUFHLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7Z0JBQzNHLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDYixDQUFDO1FBQ0wsQ0FBQztLQUFBO0NBQ0o7QUFsQ0Qsc0VBa0NDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvc2NhZmZvbGQvdW5pdGVDb25maWd1cmF0aW9uRGlyZWN0b3JpZXMuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/scaffold/uniteConfigurationJson.d.ts b/dist/pipelineSteps/scaffold/uniteConfigurationJson.d.ts index fb47584c..3f946bea 100644 --- a/dist/pipelineSteps/scaffold/uniteConfigurationJson.d.ts +++ b/dist/pipelineSteps/scaffold/uniteConfigurationJson.d.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate unite.json. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,5 +8,5 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class UniteConfigurationJson extends EnginePipelineStepBase { private static FILENAME; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/scaffold/uniteConfigurationJson.js b/dist/pipelineSteps/scaffold/uniteConfigurationJson.js index 539c5ecb..650ceedd 100644 --- a/dist/pipelineSteps/scaffold/uniteConfigurationJson.js +++ b/dist/pipelineSteps/scaffold/uniteConfigurationJson.js @@ -10,16 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class UniteConfigurationJson extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { try { - _super("log").call(this, logger, display, `Generating ${UniteConfigurationJson.FILENAME} in`, { wwwFolder: engineVariables.wwwFolder }); - yield fileSystem.fileWriteJson(engineVariables.wwwFolder, UniteConfigurationJson.FILENAME, uniteConfiguration); + logger.info(`Generating ${UniteConfigurationJson.FILENAME} in`, { rootFolder: engineVariables.rootFolder }); + yield fileSystem.fileWriteJson(engineVariables.rootFolder, UniteConfigurationJson.FILENAME, uniteConfiguration); return 0; } catch (err) { - _super("error").call(this, logger, display, `Generating ${UniteConfigurationJson.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Generating ${UniteConfigurationJson.FILENAME} failed`, err, { rootFolder: engineVariables.rootFolder }); return 1; } }); @@ -28,4 +27,4 @@ class UniteConfigurationJson extends enginePipelineStepBase_1.EnginePipelineStep UniteConfigurationJson.FILENAME = "unite.json"; exports.UniteConfigurationJson = UniteConfigurationJson; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NjYWZmb2xkL3VuaXRlQ29uZmlndXJhdGlvbkpzb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU9BLGdGQUE2RTtBQUc3RSw0QkFBb0MsU0FBUSwrQ0FBc0I7SUFHakQsT0FBTyxDQUFDLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUN0SixJQUFJLENBQUM7Z0JBQ0QsYUFBUyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsY0FBYyxzQkFBc0IsQ0FBQyxRQUFRLEtBQUssRUFBRSxFQUFFLFNBQVMsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLEVBQUU7Z0JBRXpILE1BQU0sVUFBVSxDQUFDLGFBQWEsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLHNCQUFzQixDQUFDLFFBQVEsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO2dCQUMvRyxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztZQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ1gsZUFBVyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsY0FBYyxzQkFBc0IsQ0FBQyxRQUFRLFNBQVMsRUFBRSxHQUFHLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBRSxFQUFFO2dCQUNwSSxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztRQUNMLENBQUM7S0FBQTs7QUFaYywrQkFBUSxHQUFXLFlBQVksQ0FBQztBQURuRCx3REFjQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL3NjYWZmb2xkL3VuaXRlQ29uZmlndXJhdGlvbkpzb24uanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NjYWZmb2xkL3VuaXRlQ29uZmlndXJhdGlvbkpzb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQU1BLGdGQUE2RTtBQUc3RSw0QkFBb0MsU0FBUSwrQ0FBc0I7SUFHakQsT0FBTyxDQUFDLE1BQWUsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOztZQUNuSSxJQUFJLENBQUM7Z0JBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLHNCQUFzQixDQUFDLFFBQVEsS0FBSyxFQUFFLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDO2dCQUU1RyxNQUFNLFVBQVUsQ0FBQyxhQUFhLENBQUMsZUFBZSxDQUFDLFVBQVUsRUFBRSxzQkFBc0IsQ0FBQyxRQUFRLEVBQUUsa0JBQWtCLENBQUMsQ0FBQztnQkFDaEgsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7WUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNYLE1BQU0sQ0FBQyxLQUFLLENBQUMsY0FBYyxzQkFBc0IsQ0FBQyxRQUFRLFNBQVMsRUFBRSxHQUFHLEVBQUUsRUFBRSxVQUFVLEVBQUUsZUFBZSxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUM7Z0JBQ3RILE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDYixDQUFDO1FBQ0wsQ0FBQztLQUFBOztBQVpjLCtCQUFRLEdBQVcsWUFBWSxDQUFDO0FBRG5ELHdEQWNDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvc2NhZmZvbGQvdW5pdGVDb25maWd1cmF0aW9uSnNvbi5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== diff --git a/dist/pipelineSteps/scaffold/uniteThemeConfigurationJson.d.ts b/dist/pipelineSteps/scaffold/uniteThemeConfigurationJson.d.ts index 2322a9fd..1c8032fd 100644 --- a/dist/pipelineSteps/scaffold/uniteThemeConfigurationJson.d.ts +++ b/dist/pipelineSteps/scaffold/uniteThemeConfigurationJson.d.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate unite-theme.json. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,6 +8,6 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class UniteThemeConfigurationJson extends EnginePipelineStepBase { private static FILENAME; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; private generateConfig(fileSystem, uniteConfiguration, engineVariables, existing); } diff --git a/dist/pipelineSteps/scaffold/uniteThemeConfigurationJson.js b/dist/pipelineSteps/scaffold/uniteThemeConfigurationJson.js index db90d3c3..81fbf1ef 100644 --- a/dist/pipelineSteps/scaffold/uniteThemeConfigurationJson.js +++ b/dist/pipelineSteps/scaffold/uniteThemeConfigurationJson.js @@ -11,11 +11,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); const uniteThemeConfiguration_1 = require("../../configuration/models/uniteTheme/uniteThemeConfiguration"); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class UniteThemeConfigurationJson extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { try { - _super("log").call(this, logger, display, `Generating ${UniteThemeConfigurationJson.FILENAME}`); + logger.info(`Generating ${UniteThemeConfigurationJson.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); const sourceThemeFolder = fileSystem.pathCombine(engineVariables.assetsSourceFolder, "theme/"); let existing; try { @@ -25,7 +24,7 @@ class UniteThemeConfigurationJson extends enginePipelineStepBase_1.EnginePipelin } } catch (err) { - _super("error").call(this, logger, display, `Reading existing ${UniteThemeConfigurationJson.FILENAME} failed`, err); + logger.error(`Reading existing ${UniteThemeConfigurationJson.FILENAME} failed`, err); return 1; } const config = this.generateConfig(fileSystem, uniteConfiguration, engineVariables, existing); @@ -33,7 +32,7 @@ class UniteThemeConfigurationJson extends enginePipelineStepBase_1.EnginePipelin return 0; } catch (err) { - _super("error").call(this, logger, display, `Generating ${UniteThemeConfigurationJson.FILENAME} failed`, err); + logger.error(`Generating ${UniteThemeConfigurationJson.FILENAME} failed`, err); return 1; } }); @@ -56,4 +55,4 @@ class UniteThemeConfigurationJson extends enginePipelineStepBase_1.EnginePipelin UniteThemeConfigurationJson.FILENAME = "unite-theme.json"; exports.UniteThemeConfigurationJson = UniteThemeConfigurationJson; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NjYWZmb2xkL3VuaXRlVGhlbWVDb25maWd1cmF0aW9uSnNvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBT0EsMkdBQXdHO0FBQ3hHLGdGQUE2RTtBQUc3RSxpQ0FBeUMsU0FBUSwrQ0FBc0I7SUFHdEQsT0FBTyxDQUFDLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUN0SixJQUFJLENBQUM7Z0JBQ0QsYUFBUyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsY0FBYywyQkFBMkIsQ0FBQyxRQUFRLEVBQUUsRUFBRTtnQkFFakYsTUFBTSxpQkFBaUIsR0FBRyxVQUFVLENBQUMsV0FBVyxDQUFDLGVBQWUsQ0FBQyxrQkFBa0IsRUFBRSxRQUFRLENBQUMsQ0FBQztnQkFFL0YsSUFBSSxRQUFRLENBQUM7Z0JBQ2IsSUFBSSxDQUFDO29CQUNELE1BQU0sTUFBTSxHQUFHLE1BQU0sVUFBVSxDQUFDLFVBQVUsQ0FBQyxpQkFBaUIsRUFBRSwyQkFBMkIsQ0FBQyxRQUFRLENBQUMsQ0FBQztvQkFDcEcsRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQzt3QkFDVCxRQUFRLEdBQUcsTUFBTSxVQUFVLENBQUMsWUFBWSxDQUEwQixpQkFBaUIsRUFBRSwyQkFBMkIsQ0FBQyxRQUFRLENBQUMsQ0FBQztvQkFDL0gsQ0FBQztnQkFDTCxDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsZUFBVyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsb0JBQW9CLDJCQUEyQixDQUFDLFFBQVEsU0FBUyxFQUFFLEdBQUcsRUFBRTtvQkFDckcsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUVELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsVUFBVSxFQUFFLGtCQUFrQixFQUFFLGVBQWUsRUFBRSxRQUFRLENBQUMsQ0FBQztnQkFDOUYsTUFBTSxVQUFVLENBQUMsYUFBYSxDQUFDLGlCQUFpQixFQUFFLDJCQUEyQixDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztnQkFFaEcsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7WUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNYLGVBQVcsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLGNBQWMsMkJBQTJCLENBQUMsUUFBUSxTQUFTLEVBQUUsR0FBRyxFQUFFO2dCQUMvRixNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2IsQ0FBQztRQUNMLENBQUM7S0FBQTtJQUVPLGNBQWMsQ0FBQyxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDLEVBQUUsUUFBNkM7UUFDbkssTUFBTSxNQUFNLEdBQUcsSUFBSSxpREFBdUIsRUFBRSxDQUFDO1FBRTdDLE1BQU0sQ0FBQyxlQUFlLEdBQUcsa0JBQWtCLENBQUMsS0FBSyxDQUFDO1FBQ2xELE1BQU0sQ0FBQyxZQUFZLEdBQUcsa0JBQWtCLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUMxRCxNQUFNLENBQUMsVUFBVSxHQUFHLEVBQUUsQ0FBQztRQUN2QixNQUFNLENBQUMsYUFBYSxHQUFHLEVBQUUsQ0FBQztRQUMxQixNQUFNLENBQUMsWUFBWSxHQUFHLEVBQUUsQ0FBQztRQUN6QixNQUFNLENBQUMsZUFBZSxHQUFHLFNBQVMsQ0FBQztRQUNuQyxNQUFNLENBQUMsVUFBVSxHQUFHLFNBQVMsQ0FBQztRQUU5QixFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1lBQ1gsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDcEMsQ0FBQztRQUVELE1BQU0sQ0FBQyxNQUFNLENBQUM7SUFDbEIsQ0FBQzs7QUE3Q2Msb0NBQVEsR0FBVyxrQkFBa0IsQ0FBQztBQUR6RCxrRUErQ0MiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy9zY2FmZm9sZC91bml0ZVRoZW1lQ29uZmlndXJhdGlvbkpzb24uanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NjYWZmb2xkL3VuaXRlVGhlbWVDb25maWd1cmF0aW9uSnNvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBTUEsMkdBQXdHO0FBQ3hHLGdGQUE2RTtBQUc3RSxpQ0FBeUMsU0FBUSwrQ0FBc0I7SUFHdEQsT0FBTyxDQUFDLE1BQWUsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOztZQUNuSSxJQUFJLENBQUM7Z0JBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLDJCQUEyQixDQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUMsQ0FBQyxDQUFDO2dCQUUzRyxNQUFNLGlCQUFpQixHQUFHLFVBQVUsQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLGtCQUFrQixFQUFFLFFBQVEsQ0FBQyxDQUFDO2dCQUUvRixJQUFJLFFBQVEsQ0FBQztnQkFDYixJQUFJLENBQUM7b0JBQ0QsTUFBTSxNQUFNLEdBQUcsTUFBTSxVQUFVLENBQUMsVUFBVSxDQUFDLGlCQUFpQixFQUFFLDJCQUEyQixDQUFDLFFBQVEsQ0FBQyxDQUFDO29CQUNwRyxFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO3dCQUNULFFBQVEsR0FBRyxNQUFNLFVBQVUsQ0FBQyxZQUFZLENBQTBCLGlCQUFpQixFQUFFLDJCQUEyQixDQUFDLFFBQVEsQ0FBQyxDQUFDO29CQUMvSCxDQUFDO2dCQUNMLENBQUM7Z0JBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztvQkFDWCxNQUFNLENBQUMsS0FBSyxDQUFDLG9CQUFvQiwyQkFBMkIsQ0FBQyxRQUFRLFNBQVMsRUFBRSxHQUFHLENBQUMsQ0FBQztvQkFDckYsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUVELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsVUFBVSxFQUFFLGtCQUFrQixFQUFFLGVBQWUsRUFBRSxRQUFRLENBQUMsQ0FBQztnQkFDOUYsTUFBTSxVQUFVLENBQUMsYUFBYSxDQUFDLGlCQUFpQixFQUFFLDJCQUEyQixDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztnQkFFaEcsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7WUFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNYLE1BQU0sQ0FBQyxLQUFLLENBQUMsY0FBYywyQkFBMkIsQ0FBQyxRQUFRLFNBQVMsRUFBRSxHQUFHLENBQUMsQ0FBQztnQkFDL0UsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUNiLENBQUM7UUFDTCxDQUFDO0tBQUE7SUFFTyxjQUFjLENBQUMsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQyxFQUFFLFFBQTZDO1FBQ25LLE1BQU0sTUFBTSxHQUFHLElBQUksaURBQXVCLEVBQUUsQ0FBQztRQUU3QyxNQUFNLENBQUMsZUFBZSxHQUFHLGtCQUFrQixDQUFDLEtBQUssQ0FBQztRQUNsRCxNQUFNLENBQUMsWUFBWSxHQUFHLGtCQUFrQixDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDMUQsTUFBTSxDQUFDLFVBQVUsR0FBRyxFQUFFLENBQUM7UUFDdkIsTUFBTSxDQUFDLGFBQWEsR0FBRyxFQUFFLENBQUM7UUFDMUIsTUFBTSxDQUFDLFlBQVksR0FBRyxFQUFFLENBQUM7UUFDekIsTUFBTSxDQUFDLGVBQWUsR0FBRyxTQUFTLENBQUM7UUFDbkMsTUFBTSxDQUFDLFVBQVUsR0FBRyxTQUFTLENBQUM7UUFFOUIsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztZQUNYLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQ3BDLENBQUM7UUFFRCxNQUFNLENBQUMsTUFBTSxDQUFDO0lBQ2xCLENBQUM7O0FBN0NjLG9DQUFRLEdBQVcsa0JBQWtCLENBQUM7QUFEekQsa0VBK0NDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvc2NhZmZvbGQvdW5pdGVUaGVtZUNvbmZpZ3VyYXRpb25Kc29uLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 diff --git a/dist/pipelineSteps/server/browserSync.d.ts b/dist/pipelineSteps/server/browserSync.d.ts index 0e86b988..9acd6a57 100644 --- a/dist/pipelineSteps/server/browserSync.d.ts +++ b/dist/pipelineSteps/server/browserSync.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate browsersync configuration. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class BrowserSync extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/server/browserSync.js b/dist/pipelineSteps/server/browserSync.js index 210bb6dc..6fc426ee 100644 --- a/dist/pipelineSteps/server/browserSync.js +++ b/dist/pipelineSteps/server/browserSync.js @@ -10,17 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class BrowserSync extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["browser-sync"], uniteConfiguration.server === "BrowserSync"); if (uniteConfiguration.server === "BrowserSync") { try { - _super("log").call(this, logger, display, "Generating BrowserSync Configuration"); + logger.info("Generating BrowserSync Configuration", { wwwFolder: engineVariables.wwwFolder }); return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating BrowserSync configuration failed", err); + logger.error("Generating BrowserSync configuration failed", err); return 1; } } @@ -30,4 +29,4 @@ class BrowserSync extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.BrowserSync = BrowserSync; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NlcnZlci9icm93c2VyU3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBT0EsZ0ZBQTZFO0FBRzdFLGlCQUF5QixTQUFRLCtDQUFzQjtJQUN0QyxPQUFPLENBQUMsTUFBZSxFQUFFLE9BQWlCLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ3RKLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxhQUFhLENBQUMsQ0FBQztZQUVuRyxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssYUFBYSxDQUFDLENBQUMsQ0FBQztnQkFDOUMsSUFBSSxDQUFDO29CQUNELGFBQVMsWUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLHNDQUFzQyxFQUFFO29CQUVuRSxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7Z0JBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztvQkFDWCxlQUFXLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSw2Q0FBNkMsRUFBRSxHQUFHLEVBQUU7b0JBQ2pGLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFFRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0NBQ0o7QUFqQkQsa0NBaUJDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvc2VydmVyL2Jyb3dzZXJTeW5jLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3NlcnZlci9icm93c2VyU3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBTUEsZ0ZBQTZFO0FBRzdFLGlCQUF5QixTQUFRLCtDQUFzQjtJQUN0QyxPQUFPLENBQUMsTUFBZSxFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7O1lBQ25JLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxhQUFhLENBQUMsQ0FBQztZQUVuRyxFQUFFLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssYUFBYSxDQUFDLENBQUMsQ0FBQztnQkFDOUMsSUFBSSxDQUFDO29CQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsc0NBQXNDLEVBQUUsRUFBRSxTQUFTLEVBQUUsZUFBZSxDQUFDLFNBQVMsRUFBQyxDQUFDLENBQUM7b0JBRTdGLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztnQkFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUNYLE1BQU0sQ0FBQyxLQUFLLENBQUMsNkNBQTZDLEVBQUUsR0FBRyxDQUFDLENBQUM7b0JBQ2pFLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFFRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0NBQ0o7QUFqQkQsa0NBaUJDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvc2VydmVyL2Jyb3dzZXJTeW5jLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 diff --git a/dist/pipelineSteps/taskManager/gulp.d.ts b/dist/pipelineSteps/taskManager/gulp.d.ts index afab246e..3e51b48e 100644 --- a/dist/pipelineSteps/taskManager/gulp.d.ts +++ b/dist/pipelineSteps/taskManager/gulp.d.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate configuration for gulp. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,11 +8,11 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class Gulp extends EnginePipelineStepBase { private static FILENAME; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; - generateBuildTasks(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; - private generateUnitTasks(logger, display, fileSystem, uniteConfiguration, engineVariables); - private generateE2eTasks(logger, display, fileSystem, uniteConfiguration, engineVariables); - private generateServeTasks(logger, display, fileSystem, uniteConfiguration, engineVariables); - private generateThemeTasks(logger, display, fileSystem, uniteConfiguration, engineVariables); - private generateUtils(logger, display, fileSystem, uniteConfiguration, engineVariables); + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + generateBuildTasks(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + private generateUnitTasks(logger, fileSystem, uniteConfiguration, engineVariables); + private generateE2eTasks(logger, fileSystem, uniteConfiguration, engineVariables); + private generateServeTasks(logger, fileSystem, uniteConfiguration, engineVariables); + private generateThemeTasks(logger, fileSystem, uniteConfiguration, engineVariables); + private generateUtils(logger, fileSystem, uniteConfiguration, engineVariables); } diff --git a/dist/pipelineSteps/taskManager/gulp.js b/dist/pipelineSteps/taskManager/gulp.js index a09f224e..4ce0909b 100644 --- a/dist/pipelineSteps/taskManager/gulp.js +++ b/dist/pipelineSteps/taskManager/gulp.js @@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class Gulp extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["gulp", @@ -26,75 +26,75 @@ class Gulp extends enginePipelineStepBase_1.EnginePipelineStepBase { try { const hasGeneratedMarker = yield _super("fileHasGeneratedMarker").call(this, fileSystem, engineVariables.wwwFolder, Gulp.FILENAME); if (hasGeneratedMarker) { - _super("log").call(this, logger, display, `Generating ${Gulp.FILENAME} in`, { wwwFolder: engineVariables.wwwFolder }); + logger.info(`Generating ${Gulp.FILENAME} in`, { wwwFolder: engineVariables.wwwFolder }); const lines = []; lines.push("require('require-dir')('build/tasks');"); lines.push(_super("wrapGeneratedMarker").call(this, "/* ", " */")); yield fileSystem.fileWriteLines(engineVariables.wwwFolder, Gulp.FILENAME, lines); } else { - _super("log").call(this, logger, display, `Skipping ${Gulp.FILENAME} at it has no generated marker`); + logger.info(`Skipping ${Gulp.FILENAME} at it has no generated marker`); } } catch (err) { - _super("error").call(this, logger, display, `Generating ${Gulp.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Generating ${Gulp.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); return 1; } try { - _super("log").call(this, logger, display, "Creating Gulp Build Directory", { gulpBuildFolder: engineVariables.gulpBuildFolder }); + logger.info("Creating Gulp Build Directory", { gulpBuildFolder: engineVariables.gulpBuildFolder }); yield fileSystem.directoryCreate(engineVariables.gulpBuildFolder); } catch (err) { - _super("error").call(this, logger, display, "Creating Gulp Build Directory failed", err, { gulpBuildFolder: engineVariables.gulpBuildFolder }); + logger.error("Creating Gulp Build Directory failed", err, { gulpBuildFolder: engineVariables.gulpBuildFolder }); return 1; } engineVariables.gulpTasksFolder = fileSystem.pathCombine(engineVariables.gulpBuildFolder, "tasks"); try { - _super("log").call(this, logger, display, "Creating Gulp Tasks Directory", { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.info("Creating Gulp Tasks Directory", { gulpTasksFolder: engineVariables.gulpTasksFolder }); yield fileSystem.directoryCreate(engineVariables.gulpTasksFolder); } catch (err) { - _super("error").call(this, logger, display, "Creating Gulp Tasks Directory failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.error("Creating Gulp Tasks Directory failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); return 1; } engineVariables.gulpUtilFolder = fileSystem.pathCombine(engineVariables.gulpTasksFolder, "util"); try { - _super("log").call(this, logger, display, "Creating Gulp Util Directory", { gulpUtilFolder: engineVariables.gulpUtilFolder }); + logger.info("Creating Gulp Util Directory", { gulpUtilFolder: engineVariables.gulpUtilFolder }); yield fileSystem.directoryCreate(engineVariables.gulpUtilFolder); } catch (err) { - _super("error").call(this, logger, display, "Creating Gulp Util Directory failed", err, { gulpUtilFolder: engineVariables.gulpUtilFolder }); + logger.error("Creating Gulp Util Directory failed", err, { gulpUtilFolder: engineVariables.gulpUtilFolder }); return 1; } } else { try { - _super("log").call(this, logger, display, "Deleting Gulp Build Directory", { gulpBuildFolder: engineVariables.gulpBuildFolder }); + logger.info("Deleting Gulp Build Directory", { gulpBuildFolder: engineVariables.gulpBuildFolder }); const exists = yield fileSystem.directoryExists(engineVariables.wwwFolder); if (exists) { yield fileSystem.directoryDelete(engineVariables.gulpBuildFolder); } } catch (err) { - _super("error").call(this, logger, display, "Deleting Gulp Build Directory failed", err, { gulpBuildFolder: engineVariables.gulpBuildFolder }); + logger.error("Deleting Gulp Build Directory failed", err, { gulpBuildFolder: engineVariables.gulpBuildFolder }); return 1; } - const ret2 = yield _super("deleteFile").call(this, logger, display, fileSystem, engineVariables.wwwFolder, Gulp.FILENAME); + const ret2 = yield _super("deleteFile").call(this, logger, fileSystem, engineVariables.wwwFolder, Gulp.FILENAME); if (ret2 !== 0) { return ret2; } } - let ret = yield this.generateBuildTasks(logger, display, fileSystem, uniteConfiguration, engineVariables); + let ret = yield this.generateBuildTasks(logger, fileSystem, uniteConfiguration, engineVariables); if (ret === 0) { - ret = yield this.generateUnitTasks(logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = yield this.generateUnitTasks(logger, fileSystem, uniteConfiguration, engineVariables); if (ret === 0) { - ret = yield this.generateE2eTasks(logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = yield this.generateE2eTasks(logger, fileSystem, uniteConfiguration, engineVariables); if (ret === 0) { - ret = yield this.generateServeTasks(logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = yield this.generateServeTasks(logger, fileSystem, uniteConfiguration, engineVariables); if (ret === 0) { - ret = yield this.generateThemeTasks(logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = yield this.generateThemeTasks(logger, fileSystem, uniteConfiguration, engineVariables); if (ret === 0) { - ret = yield this.generateUtils(logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = yield this.generateUtils(logger, fileSystem, uniteConfiguration, engineVariables); } } } @@ -103,8 +103,7 @@ class Gulp extends enginePipelineStepBase_1.EnginePipelineStepBase { return ret; }); } - generateBuildTasks(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + generateBuildTasks(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["del", "delete-empty", "run-sequence", "gulp-sourcemaps", "gulp-concat", "gulp-insert", "gulp-htmlmin", "html-minifier", "node-glob"], uniteConfiguration.taskManager === "Gulp"); engineVariables.toggleDevDependency(["gulp-babel"], uniteConfiguration.taskManager === "Gulp" && uniteConfiguration.sourceLanguage === "JavaScript"); @@ -119,141 +118,136 @@ class Gulp extends enginePipelineStepBase_1.EnginePipelineStepBase { engineVariables.toggleDevDependency(["gulp-postcss"], uniteConfiguration.taskManager === "Gulp" && uniteConfiguration.cssPost === "PostCss"); if (uniteConfiguration.taskManager === "Gulp") { try { - _super("log").call(this, logger, display, "Generating gulp tasks for build in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.info("Generating gulp tasks for build in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); const assetTasks = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, "gulp/tasks/"); const assetTasksLanguage = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/sourceLanguage/${uniteConfiguration.sourceLanguage.toLowerCase()}/`); const assetTasksBundler = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/bundler/${uniteConfiguration.bundler.toLowerCase()}/`); const assetTasksLinter = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/linter/${uniteConfiguration.linter.toLowerCase()}/`); const assetTasksCssPre = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/cssPre/${uniteConfiguration.cssPre.toLowerCase()}/`); const assetTasksCssPost = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/cssPost/${uniteConfiguration.cssPost.toLowerCase()}/`); - yield this.copyFile(logger, display, fileSystem, assetTasksLanguage, "build-transpile.js", engineVariables.gulpTasksFolder, "build-transpile.js"); - yield this.copyFile(logger, display, fileSystem, assetTasksBundler, "build-bundle-app.js", engineVariables.gulpTasksFolder, "build-bundle-app.js"); - yield this.copyFile(logger, display, fileSystem, assetTasksBundler, "build-bundle-vendor.js", engineVariables.gulpTasksFolder, "build-bundle-vendor.js"); - yield this.copyFile(logger, display, fileSystem, assetTasksLinter, "build-lint.js", engineVariables.gulpTasksFolder, "build-lint.js"); - yield this.copyFile(logger, display, fileSystem, assetTasksCssPre, "build-css-app.js", engineVariables.gulpTasksFolder, "build-css-app.js"); - yield this.copyFile(logger, display, fileSystem, assetTasksCssPre, "build-css-components.js", engineVariables.gulpTasksFolder, "build-css-components.js"); - yield this.copyFile(logger, display, fileSystem, assetTasksCssPost, "build-css-post-app.js", engineVariables.gulpTasksFolder, "build-css-post-app.js"); - yield this.copyFile(logger, display, fileSystem, assetTasksCssPost, "build-css-post-components.js", engineVariables.gulpTasksFolder, "build-css-post-components.js"); - yield this.copyFile(logger, display, fileSystem, assetTasks, "build.js", engineVariables.gulpTasksFolder, "build.js"); + yield this.copyFile(logger, fileSystem, assetTasksLanguage, "build-transpile.js", engineVariables.gulpTasksFolder, "build-transpile.js"); + yield this.copyFile(logger, fileSystem, assetTasksBundler, "build-bundle-app.js", engineVariables.gulpTasksFolder, "build-bundle-app.js"); + yield this.copyFile(logger, fileSystem, assetTasksBundler, "build-bundle-vendor.js", engineVariables.gulpTasksFolder, "build-bundle-vendor.js"); + yield this.copyFile(logger, fileSystem, assetTasksLinter, "build-lint.js", engineVariables.gulpTasksFolder, "build-lint.js"); + yield this.copyFile(logger, fileSystem, assetTasksCssPre, "build-css-app.js", engineVariables.gulpTasksFolder, "build-css-app.js"); + yield this.copyFile(logger, fileSystem, assetTasksCssPre, "build-css-components.js", engineVariables.gulpTasksFolder, "build-css-components.js"); + yield this.copyFile(logger, fileSystem, assetTasksCssPost, "build-css-post-app.js", engineVariables.gulpTasksFolder, "build-css-post-app.js"); + yield this.copyFile(logger, fileSystem, assetTasksCssPost, "build-css-post-components.js", engineVariables.gulpTasksFolder, "build-css-post-components.js"); + yield this.copyFile(logger, fileSystem, assetTasks, "build.js", engineVariables.gulpTasksFolder, "build.js"); return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating gulp tasks for build failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.error("Generating gulp tasks for build failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); return 1; } } return 0; }); } - generateUnitTasks(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + generateUnitTasks(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["gulp-karma-runner"], uniteConfiguration.taskManager === "Gulp" && uniteConfiguration.unitTestRunner === "Karma"); if (uniteConfiguration.taskManager === "Gulp" && uniteConfiguration.unitTestRunner !== "None") { try { - _super("log").call(this, logger, display, "Generating gulp tasks for unit in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.info("Generating gulp tasks for unit in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); const assetUnitTest = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, "gulp/tasks/"); const assetUnitTestLanguage = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/sourceLanguage/${uniteConfiguration.sourceLanguage.toLowerCase()}/`); const assetLinter = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/linter/${uniteConfiguration.linter.toLowerCase()}/`); const assetUnitTestRunner = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/unitTestRunner/${uniteConfiguration.unitTestRunner.toLowerCase()}/`); - yield this.copyFile(logger, display, fileSystem, assetUnitTest, "unit.js", engineVariables.gulpTasksFolder, "unit.js"); - yield this.copyFile(logger, display, fileSystem, assetUnitTestLanguage, "unit-transpile.js", engineVariables.gulpTasksFolder, "unit-transpile.js"); - yield this.copyFile(logger, display, fileSystem, assetLinter, "unit-lint.js", engineVariables.gulpTasksFolder, "unit-lint.js"); - yield this.copyFile(logger, display, fileSystem, assetUnitTestRunner, "unit-runner.js", engineVariables.gulpTasksFolder, "unit-runner.js"); + yield this.copyFile(logger, fileSystem, assetUnitTest, "unit.js", engineVariables.gulpTasksFolder, "unit.js"); + yield this.copyFile(logger, fileSystem, assetUnitTestLanguage, "unit-transpile.js", engineVariables.gulpTasksFolder, "unit-transpile.js"); + yield this.copyFile(logger, fileSystem, assetLinter, "unit-lint.js", engineVariables.gulpTasksFolder, "unit-lint.js"); + yield this.copyFile(logger, fileSystem, assetUnitTestRunner, "unit-runner.js", engineVariables.gulpTasksFolder, "unit-runner.js"); return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating gulp tasks for unit failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.error("Generating gulp tasks for unit failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); return 1; } } return 0; }); } - generateE2eTasks(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + generateE2eTasks(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["gulp-webdriver", "browser-sync"], uniteConfiguration.taskManager === "Gulp" && uniteConfiguration.e2eTestRunner === "WebdriverIO"); engineVariables.toggleDevDependency(["browser-sync"], uniteConfiguration.taskManager === "Gulp" && uniteConfiguration.e2eTestRunner === "Protractor"); if (uniteConfiguration.taskManager === "Gulp" && uniteConfiguration.e2eTestRunner !== "None") { try { - _super("log").call(this, logger, display, "Generating gulp tasks for e2e in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.info("Generating gulp tasks for e2e in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); const assetE2eTest = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, "gulp/tasks/"); const assetUnitTestLanguage = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/sourceLanguage/${uniteConfiguration.sourceLanguage.toLowerCase()}/`); const assetLinter = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/linter/${uniteConfiguration.linter.toLowerCase()}/`); const assetE2eTestRunner = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/e2eTestRunner/${uniteConfiguration.e2eTestRunner.toLowerCase()}/`); - yield this.copyFile(logger, display, fileSystem, assetE2eTest, "e2e.js", engineVariables.gulpTasksFolder, "e2e.js"); - yield this.copyFile(logger, display, fileSystem, assetUnitTestLanguage, "e2e-transpile.js", engineVariables.gulpTasksFolder, "e2e-transpile.js"); - yield this.copyFile(logger, display, fileSystem, assetLinter, "e2e-lint.js", engineVariables.gulpTasksFolder, "e2e-lint.js"); - yield this.copyFile(logger, display, fileSystem, assetE2eTestRunner, "e2e-runner.js", engineVariables.gulpTasksFolder, "e2e-runner.js"); - yield this.copyFile(logger, display, fileSystem, assetE2eTestRunner, "e2e-install.js", engineVariables.gulpTasksFolder, "e2e-install.js"); + yield this.copyFile(logger, fileSystem, assetE2eTest, "e2e.js", engineVariables.gulpTasksFolder, "e2e.js"); + yield this.copyFile(logger, fileSystem, assetUnitTestLanguage, "e2e-transpile.js", engineVariables.gulpTasksFolder, "e2e-transpile.js"); + yield this.copyFile(logger, fileSystem, assetLinter, "e2e-lint.js", engineVariables.gulpTasksFolder, "e2e-lint.js"); + yield this.copyFile(logger, fileSystem, assetE2eTestRunner, "e2e-runner.js", engineVariables.gulpTasksFolder, "e2e-runner.js"); + yield this.copyFile(logger, fileSystem, assetE2eTestRunner, "e2e-install.js", engineVariables.gulpTasksFolder, "e2e-install.js"); return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating gulp tasks for e2e failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.error("Generating gulp tasks for e2e failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); return 1; } } return 0; }); } - generateServeTasks(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + generateServeTasks(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { if (uniteConfiguration.taskManager === "Gulp") { try { - _super("log").call(this, logger, display, "Generating gulp tasks serve in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.info("Generating gulp tasks serve in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); const assetTasksServer = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/server/${uniteConfiguration.server.toLowerCase()}`); - yield this.copyFile(logger, display, fileSystem, assetTasksServer, "serve.js", engineVariables.gulpTasksFolder, "serve.js"); + yield this.copyFile(logger, fileSystem, assetTasksServer, "serve.js", engineVariables.gulpTasksFolder, "serve.js"); return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating gulp tasks serve failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.error("Generating gulp tasks serve failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); return 1; } } return 0; }); } - generateThemeTasks(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + generateThemeTasks(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { if (uniteConfiguration.taskManager === "Gulp") { try { - _super("log").call(this, logger, display, "Generating gulp tasks theme in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.info("Generating gulp tasks theme in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); const assetTasksTheme = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, "gulp/tasks/"); - yield this.copyFile(logger, display, fileSystem, assetTasksTheme, "theme.js", engineVariables.gulpTasksFolder, "theme.js"); + yield this.copyFile(logger, fileSystem, assetTasksTheme, "theme.js", engineVariables.gulpTasksFolder, "theme.js"); return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating gulp tasks serve failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.error("Generating gulp tasks serve failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); return 1; } } return 0; }); } - generateUtils(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + generateUtils(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["gulp-util", "gulp-rename"], uniteConfiguration.taskManager === "Gulp"); if (uniteConfiguration.taskManager === "Gulp") { try { - _super("log").call(this, logger, display, "Generating gulp tasks utils in", { gulpUtilFolder: engineVariables.gulpUtilFolder }); + logger.info("Generating gulp tasks utils in", { gulpUtilFolder: engineVariables.gulpUtilFolder }); const assetUtils = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, "gulp/tasks/util/"); const assetUtilModuleType = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/moduleType/${uniteConfiguration.moduleType.toLowerCase()}/util/`); - yield this.copyFile(logger, display, fileSystem, assetUtils, "async-util.js", engineVariables.gulpUtilFolder, "async-util.js"); - yield this.copyFile(logger, display, fileSystem, assetUtils, "bundle.js", engineVariables.gulpUtilFolder, "bundle.js"); - yield this.copyFile(logger, display, fileSystem, assetUtils, "client-packages.js", engineVariables.gulpUtilFolder, "client-packages.js"); - yield this.copyFile(logger, display, fileSystem, assetUtils, "display.js", engineVariables.gulpUtilFolder, "display.js"); - yield this.copyFile(logger, display, fileSystem, assetUtils, "exec.js", engineVariables.gulpUtilFolder, "exec.js"); - yield this.copyFile(logger, display, fileSystem, assetUtils, "theme-utils.js", engineVariables.gulpUtilFolder, "theme-utils.js"); - yield this.copyFile(logger, display, fileSystem, assetUtils, "unite-config.js", engineVariables.gulpUtilFolder, "unite-config.js"); - yield this.copyFile(logger, display, fileSystem, assetUtilModuleType, "module-config.js", engineVariables.gulpUtilFolder, "module-config.js"); + yield this.copyFile(logger, fileSystem, assetUtils, "async-util.js", engineVariables.gulpUtilFolder, "async-util.js"); + yield this.copyFile(logger, fileSystem, assetUtils, "bundle.js", engineVariables.gulpUtilFolder, "bundle.js"); + yield this.copyFile(logger, fileSystem, assetUtils, "client-packages.js", engineVariables.gulpUtilFolder, "client-packages.js"); + yield this.copyFile(logger, fileSystem, assetUtils, "display.js", engineVariables.gulpUtilFolder, "display.js"); + yield this.copyFile(logger, fileSystem, assetUtils, "exec.js", engineVariables.gulpUtilFolder, "exec.js"); + yield this.copyFile(logger, fileSystem, assetUtils, "theme-utils.js", engineVariables.gulpUtilFolder, "theme-utils.js"); + yield this.copyFile(logger, fileSystem, assetUtils, "unite-config.js", engineVariables.gulpUtilFolder, "unite-config.js"); + yield this.copyFile(logger, fileSystem, assetUtilModuleType, "module-config.js", engineVariables.gulpUtilFolder, "module-config.js"); return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating gulp tasks utils failed", err, { gulpUtilFolder: engineVariables.gulpUtilFolder }); + logger.error("Generating gulp tasks utils failed", err, { gulpUtilFolder: engineVariables.gulpUtilFolder }); return 1; } } @@ -264,4 +258,4 @@ class Gulp extends enginePipelineStepBase_1.EnginePipelineStepBase { Gulp.FILENAME = "gulpfile.js"; exports.Gulp = Gulp; -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../../src/pipelineSteps/taskManager/gulp.ts"],"names":[],"mappings":"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","file":"pipelineSteps/taskManager/gulp.js","sourceRoot":"../src"} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../../src/pipelineSteps/taskManager/gulp.ts"],"names":[],"mappings":"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","file":"pipelineSteps/taskManager/gulp.js","sourceRoot":"../src"} diff --git a/dist/pipelineSteps/testFramework/jasmine.d.ts b/dist/pipelineSteps/testFramework/jasmine.d.ts index d9b64dbc..bc77601f 100644 --- a/dist/pipelineSteps/testFramework/jasmine.d.ts +++ b/dist/pipelineSteps/testFramework/jasmine.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate jasmine configuration. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class Jasmine extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/testFramework/jasmine.js b/dist/pipelineSteps/testFramework/jasmine.js index d3bfd705..542ca01b 100644 --- a/dist/pipelineSteps/testFramework/jasmine.js +++ b/dist/pipelineSteps/testFramework/jasmine.js @@ -10,8 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class Jasmine extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["jasmine-core"], uniteConfiguration.unitTestFramework === "Jasmine" || uniteConfiguration.e2eTestFramework === "Jasmine"); engineVariables.toggleDevDependency(["@types/jasmine"], (uniteConfiguration.unitTestFramework === "Jasmine" || uniteConfiguration.e2eTestFramework === "Jasmine") @@ -19,11 +18,11 @@ class Jasmine extends enginePipelineStepBase_1.EnginePipelineStepBase { engineVariables.lintEnv.jasmine = uniteConfiguration.linter === "ESLint" && (uniteConfiguration.unitTestFramework === "Jasmine" || uniteConfiguration.e2eTestFramework === "Jasmine"); if (uniteConfiguration.unitTestFramework === "Jasmine" || uniteConfiguration.e2eTestFramework === "Jasmine") { try { - _super("log").call(this, logger, display, "Generating Jasmine Configuration"); + logger.info("Generating Jasmine Configuration"); return 0; } catch (err) { - _super("error").call(this, logger, display, "Generating Jasmine Configuration failed", err); + logger.error("Generating Jasmine Configuration failed", err); return 1; } } @@ -33,4 +32,4 @@ class Jasmine extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.Jasmine = Jasmine; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3Rlc3RGcmFtZXdvcmsvamFzbWluZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBT0EsZ0ZBQTZFO0FBRzdFLGFBQXFCLFNBQVEsK0NBQXNCO0lBQ2xDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsT0FBaUIsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOzs7WUFDdEosZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsY0FBYyxDQUFDLEVBQUUsa0JBQWtCLENBQUMsaUJBQWlCLEtBQUssU0FBUyxJQUFJLGtCQUFrQixDQUFDLGdCQUFnQixLQUFLLFNBQVMsQ0FBQyxDQUFDO1lBQy9KLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLEVBQ2xCLENBQUMsa0JBQWtCLENBQUMsaUJBQWlCLEtBQUssU0FBUyxJQUFJLGtCQUFrQixDQUFDLGdCQUFnQixLQUFLLFNBQVMsQ0FBQzttQkFDdEcsa0JBQWtCLENBQUMsY0FBYyxLQUFLLFlBQVksQ0FBQyxDQUFDO1lBRTNGLGVBQWUsQ0FBQyxPQUFPLENBQUMsT0FBTyxHQUFHLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxRQUFRLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxpQkFBaUIsS0FBSyxTQUFTLElBQUksa0JBQWtCLENBQUMsZ0JBQWdCLEtBQUssU0FBUyxDQUFDLENBQUM7WUFFdEwsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsaUJBQWlCLEtBQUssU0FBUyxJQUFJLGtCQUFrQixDQUFDLGdCQUFnQixLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUM7Z0JBQzFHLElBQUksQ0FBQztvQkFDRCxhQUFTLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxrQ0FBa0MsRUFBRTtvQkFFL0QsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7b0JBQ1gsZUFBVyxZQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUseUNBQXlDLEVBQUUsR0FBRyxFQUFFO29CQUM3RSxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7WUFDTCxDQUFDO1lBRUQsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNiLENBQUM7S0FBQTtDQUNKO0FBdEJELDBCQXNCQyIsImZpbGUiOiJwaXBlbGluZVN0ZXBzL3Rlc3RGcmFtZXdvcmsvamFzbWluZS5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3Rlc3RGcmFtZXdvcmsvamFzbWluZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBTUEsZ0ZBQTZFO0FBRzdFLGFBQXFCLFNBQVEsK0NBQXNCO0lBQ2xDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7WUFDbkksZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsY0FBYyxDQUFDLEVBQUUsa0JBQWtCLENBQUMsaUJBQWlCLEtBQUssU0FBUyxJQUFJLGtCQUFrQixDQUFDLGdCQUFnQixLQUFLLFNBQVMsQ0FBQyxDQUFDO1lBQy9KLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLEVBQ2xCLENBQUMsa0JBQWtCLENBQUMsaUJBQWlCLEtBQUssU0FBUyxJQUFJLGtCQUFrQixDQUFDLGdCQUFnQixLQUFLLFNBQVMsQ0FBQzttQkFDdEcsa0JBQWtCLENBQUMsY0FBYyxLQUFLLFlBQVksQ0FBQyxDQUFDO1lBRTNGLGVBQWUsQ0FBQyxPQUFPLENBQUMsT0FBTyxHQUFHLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxRQUFRLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxpQkFBaUIsS0FBSyxTQUFTLElBQUksa0JBQWtCLENBQUMsZ0JBQWdCLEtBQUssU0FBUyxDQUFDLENBQUM7WUFFdEwsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsaUJBQWlCLEtBQUssU0FBUyxJQUFJLGtCQUFrQixDQUFDLGdCQUFnQixLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUM7Z0JBQzFHLElBQUksQ0FBQztvQkFDRCxNQUFNLENBQUMsSUFBSSxDQUFDLGtDQUFrQyxDQUFDLENBQUM7b0JBRWhELE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztnQkFBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUNYLE1BQU0sQ0FBQyxLQUFLLENBQUMseUNBQXlDLEVBQUUsR0FBRyxDQUFDLENBQUM7b0JBQzdELE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsQ0FBQztZQUNMLENBQUM7WUFFRCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0NBQ0o7QUF0QkQsMEJBc0JDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvdGVzdEZyYW1ld29yay9qYXNtaW5lLmpzIiwic291cmNlUm9vdCI6Ii4uL3NyYyJ9 diff --git a/dist/pipelineSteps/testFramework/mochaChai.d.ts b/dist/pipelineSteps/testFramework/mochaChai.d.ts index 4cc230ab..135720ec 100644 --- a/dist/pipelineSteps/testFramework/mochaChai.d.ts +++ b/dist/pipelineSteps/testFramework/mochaChai.d.ts @@ -1,12 +1,11 @@ /** * Pipeline step to generate mocha configuration. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class MochaChai extends EnginePipelineStepBase { - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; } diff --git a/dist/pipelineSteps/testFramework/mochaChai.js b/dist/pipelineSteps/testFramework/mochaChai.js index 9996dc6f..07e9c833 100644 --- a/dist/pipelineSteps/testFramework/mochaChai.js +++ b/dist/pipelineSteps/testFramework/mochaChai.js @@ -10,10 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", { value: true }); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class MochaChai extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { - const _super = name => super[name]; + process(logger, fileSystem, uniteConfiguration, engineVariables) { return __awaiter(this, void 0, void 0, function* () { - _super("log").call(this, logger, display, "Generating Mocha-Chai Configuration"); + logger.info("Generating Mocha-Chai Configuration"); engineVariables.toggleDevDependency(["mocha"], uniteConfiguration.unitTestFramework === "Mocha-Chai" || uniteConfiguration.e2eTestFramework === "Mocha-Chai"); engineVariables.toggleDevDependency(["@types/mocha", "@types/chai"], (uniteConfiguration.unitTestFramework === "Mocha-Chai" || uniteConfiguration.e2eTestFramework === "Mocha-Chai") && uniteConfiguration.sourceLanguage === "TypeScript"); @@ -25,4 +24,4 @@ class MochaChai extends enginePipelineStepBase_1.EnginePipelineStepBase { } exports.MochaChai = MochaChai; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3Rlc3RGcmFtZXdvcmsvbW9jaGFDaGFpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFPQSxnRkFBNkU7QUFHN0UsZUFBdUIsU0FBUSwrQ0FBc0I7SUFDcEMsT0FBTyxDQUFDLE1BQWUsRUFBRSxPQUFpQixFQUFFLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0M7OztZQUN0SixhQUFTLFlBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxxQ0FBcUMsRUFBRTtZQUVsRSxlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxPQUFPLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxpQkFBaUIsS0FBSyxZQUFZLElBQUksa0JBQWtCLENBQUMsZ0JBQWdCLEtBQUssWUFBWSxDQUFDLENBQUM7WUFDOUosZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsY0FBYyxFQUFFLGFBQWEsQ0FBQyxFQUMvQixDQUFDLGtCQUFrQixDQUFDLGlCQUFpQixLQUFLLFlBQVksSUFBSSxrQkFBa0IsQ0FBQyxnQkFBZ0IsS0FBSyxZQUFZLENBQUM7bUJBQzNHLGtCQUFrQixDQUFDLGNBQWMsS0FBSyxZQUFZLENBQUMsQ0FBQztZQUU1RixlQUFlLENBQUMsbUJBQW1CLENBQy9CLE1BQU0sRUFDTixTQUFTLEVBQ1QsU0FBUyxFQUNULElBQUksRUFDSixNQUFNLEVBQ04sS0FBSyxFQUNMLGtCQUFrQixDQUFDLGlCQUFpQixLQUFLLFlBQVksSUFBSSxrQkFBa0IsQ0FBQyxnQkFBZ0IsS0FBSyxZQUFZLENBQUMsQ0FBQztZQUVuSCxlQUFlLENBQUMsT0FBTyxDQUFDLEtBQUssR0FBRyxrQkFBa0IsQ0FBQyxNQUFNLEtBQUssUUFBUSxJQUFJLENBQUMsa0JBQWtCLENBQUMsaUJBQWlCLEtBQUssWUFBWSxJQUFJLGtCQUFrQixDQUFDLGdCQUFnQixLQUFLLFlBQVksQ0FBQyxDQUFDO1lBRTFMLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDYixDQUFDO0tBQUE7Q0FDSjtBQXRCRCw4QkFzQkMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy90ZXN0RnJhbWV3b3JrL21vY2hhQ2hhaS5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3Rlc3RGcmFtZXdvcmsvbW9jaGFDaGFpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFNQSxnRkFBNkU7QUFHN0UsZUFBdUIsU0FBUSwrQ0FBc0I7SUFDcEMsT0FBTyxDQUFDLE1BQWUsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOztZQUNuSSxNQUFNLENBQUMsSUFBSSxDQUFDLHFDQUFxQyxDQUFDLENBQUM7WUFFbkQsZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsT0FBTyxDQUFDLEVBQUUsa0JBQWtCLENBQUMsaUJBQWlCLEtBQUssWUFBWSxJQUFJLGtCQUFrQixDQUFDLGdCQUFnQixLQUFLLFlBQVksQ0FBQyxDQUFDO1lBQzlKLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLGNBQWMsRUFBRSxhQUFhLENBQUMsRUFDL0IsQ0FBQyxrQkFBa0IsQ0FBQyxpQkFBaUIsS0FBSyxZQUFZLElBQUksa0JBQWtCLENBQUMsZ0JBQWdCLEtBQUssWUFBWSxDQUFDO21CQUMzRyxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssWUFBWSxDQUFDLENBQUM7WUFFNUYsZUFBZSxDQUFDLG1CQUFtQixDQUMvQixNQUFNLEVBQ04sU0FBUyxFQUNULFNBQVMsRUFDVCxJQUFJLEVBQ0osTUFBTSxFQUNOLEtBQUssRUFDTCxrQkFBa0IsQ0FBQyxpQkFBaUIsS0FBSyxZQUFZLElBQUksa0JBQWtCLENBQUMsZ0JBQWdCLEtBQUssWUFBWSxDQUFDLENBQUM7WUFFbkgsZUFBZSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEdBQUcsa0JBQWtCLENBQUMsTUFBTSxLQUFLLFFBQVEsSUFBSSxDQUFDLGtCQUFrQixDQUFDLGlCQUFpQixLQUFLLFlBQVksSUFBSSxrQkFBa0IsQ0FBQyxnQkFBZ0IsS0FBSyxZQUFZLENBQUMsQ0FBQztZQUUxTCxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2IsQ0FBQztLQUFBO0NBQ0o7QUF0QkQsOEJBc0JDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvdGVzdEZyYW1ld29yay9tb2NoYUNoYWkuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/dist/pipelineSteps/unitTestRunner/karma.d.ts b/dist/pipelineSteps/unitTestRunner/karma.d.ts index 4072e74f..d872f82f 100644 --- a/dist/pipelineSteps/unitTestRunner/karma.d.ts +++ b/dist/pipelineSteps/unitTestRunner/karma.d.ts @@ -1,4 +1,3 @@ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -6,6 +5,6 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export declare class Karma extends EnginePipelineStepBase { private static FILENAME; - process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; + process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; private generateConfig(fileSystem, uniteConfiguration, engineVariables, lines); } diff --git a/dist/pipelineSteps/unitTestRunner/karma.js b/dist/pipelineSteps/unitTestRunner/karma.js index 834dfde3..aa8f7989 100644 --- a/dist/pipelineSteps/unitTestRunner/karma.js +++ b/dist/pipelineSteps/unitTestRunner/karma.js @@ -15,7 +15,7 @@ const jsonHelper_1 = require("unitejs-framework/dist/helpers/jsonHelper"); const karmaConfiguration_1 = require("../../configuration/models/karma/karmaConfiguration"); const enginePipelineStepBase_1 = require("../../engine/enginePipelineStepBase"); class Karma extends enginePipelineStepBase_1.EnginePipelineStepBase { - process(logger, display, fileSystem, uniteConfiguration, engineVariables) { + process(logger, fileSystem, uniteConfiguration, engineVariables) { const _super = name => super[name]; return __awaiter(this, void 0, void 0, function* () { engineVariables.toggleDevDependency(["karma", @@ -39,30 +39,30 @@ class Karma extends enginePipelineStepBase_1.EnginePipelineStepBase { try { const hasGeneratedMarker = yield _super("fileHasGeneratedMarker").call(this, fileSystem, engineVariables.wwwFolder, Karma.FILENAME); if (hasGeneratedMarker) { - _super("log").call(this, logger, display, `Generating ${Karma.FILENAME}`); + logger.info(`Generating ${Karma.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); const lines = []; this.generateConfig(fileSystem, uniteConfiguration, engineVariables, lines); yield fileSystem.fileWriteLines(engineVariables.wwwFolder, Karma.FILENAME, lines); } else { - _super("log").call(this, logger, display, `Skipping ${Karma.FILENAME} as it has no generated marker`); + logger.info(`Skipping ${Karma.FILENAME} as it has no generated marker`); } return 0; } catch (err) { - _super("error").call(this, logger, display, `Generating ${Karma.FILENAME} failed`, err); + logger.error(`Generating ${Karma.FILENAME} failed`, err); return 1; } } else { - return yield _super("deleteFile").call(this, logger, display, fileSystem, engineVariables.wwwFolder, Karma.FILENAME); + return yield _super("deleteFile").call(this, logger, fileSystem, engineVariables.wwwFolder, Karma.FILENAME); } }); } generateConfig(fileSystem, uniteConfiguration, engineVariables, lines) { const testFrameworks = []; const testIncludes = []; - testIncludes.push({ pattern: "./unite.json", included: false }); + testIncludes.push({ pattern: "../unite.json", included: false }); testIncludes.push({ pattern: "./node_modules/bluebird/js/browser/bluebird.js", included: true }); if (uniteConfiguration.moduleType === "AMD") { testIncludes.push({ pattern: "./node_modules/requirejs/require.js", included: true }); @@ -140,4 +140,4 @@ class Karma extends enginePipelineStepBase_1.EnginePipelineStepBase { Karma.FILENAME = "karma.conf.js"; exports.Karma = Karma; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3VuaXRUZXN0UnVubmVyL2thcm1hLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQTs7R0FFRztBQUNILDBFQUF1RTtBQUl2RSw0RkFBeUY7QUFFekYsZ0ZBQTZFO0FBRzdFLFdBQW1CLFNBQVEsK0NBQXNCO0lBR2hDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsT0FBaUIsRUFBRSxVQUF1QixFQUFFLGtCQUFzQyxFQUFFLGVBQWdDOzs7WUFDdEosZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsT0FBTztnQkFDUCx1QkFBdUI7Z0JBQ3ZCLDBCQUEwQjtnQkFDMUIsc0JBQXNCO2dCQUN0QixxQkFBcUI7Z0JBQ3JCLGdCQUFnQjtnQkFDaEIsd0JBQXdCO2dCQUN4QixzQkFBc0I7Z0JBQ3RCLGdCQUFnQjtnQkFDaEIsVUFBVTthQUNWLEVBQ0Qsa0JBQWtCLENBQUMsY0FBYyxLQUFLLE9BQU8sQ0FBQyxDQUFDO1lBRW5GLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxFQUFFLGtCQUFrQixDQUFDLGNBQWMsS0FBSyxPQUFPLElBQUksa0JBQWtCLENBQUMsVUFBVSxLQUFLLEtBQUssQ0FBQyxDQUFDO1lBQzdJLHFGQUFxRjtZQUNyRixlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxVQUFVLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssT0FBTztnQkFDM0QsQ0FBQyxrQkFBa0IsQ0FBQyxVQUFVLEtBQUssVUFBVSxJQUFJLGtCQUFrQixDQUFDLFVBQVUsS0FBSyxVQUFVLENBQUMsQ0FBQyxDQUFDO1lBRXBJLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLGFBQWEsRUFBRSxZQUFZLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssT0FBTyxJQUFJLGtCQUFrQixDQUFDLGlCQUFpQixLQUFLLFlBQVksQ0FBQyxDQUFDO1lBQzNLLGVBQWUsQ0FBQyxtQkFBbUIs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VSxFQUFFLE1BQU07U0FDckIsQ0FBQztRQUVGLGtCQUFrQixDQUFDLHFCQUFxQixHQUFHO1lBQ3ZDLE9BQU8sRUFBRTtnQkFDTCxJQUFJLEVBQUUsR0FBRyxhQUFhLGdCQUFnQjtnQkFDdEMsSUFBSSxFQUFFLEdBQUcsYUFBYSxXQUFXO2dCQUNqQyxjQUFjLEVBQUUsRUFBRTthQUNyQjtTQUNKLENBQUM7UUFFRixrQkFBa0IsQ0FBQyxhQUFhLEdBQUcsRUFBRSxDQUFDO1FBQ3RDLEVBQUUsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7WUFDYixrQkFBa0IsQ0FBQyxhQUFhLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxXQUFXLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFDN0UsQ0FBQztRQUNELGtCQUFrQixDQUFDLEtBQUssR0FBRyxZQUFZLENBQUM7UUFFeEMsS0FBSyxDQUFDLElBQUksQ0FBQyxxQ0FBcUMsQ0FBQyxDQUFDO1FBQ2xELEtBQUssQ0FBQyxJQUFJLENBQUMsa0JBQWtCLHVCQUFVLENBQUMsTUFBTSxDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3hFLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDakIsS0FBSyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsbUJBQW1CLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUM7SUFDeEQsQ0FBQzs7QUF6SWMsY0FBUSxHQUFXLGVBQWUsQ0FBQztBQUR0RCxzQkEySUMiLCJmaWxlIjoicGlwZWxpbmVTdGVwcy91bml0VGVzdFJ1bm5lci9rYXJtYS5qcyIsInNvdXJjZVJvb3QiOiIuLi9zcmMifQ== +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9waXBlbGluZVN0ZXBzL3VuaXRUZXN0UnVubmVyL2thcm1hLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQTs7R0FFRztBQUNILDBFQUF1RTtBQUd2RSw0RkFBeUY7QUFFekYsZ0ZBQTZFO0FBRzdFLFdBQW1CLFNBQVEsK0NBQXNCO0lBR2hDLE9BQU8sQ0FBQyxNQUFlLEVBQUUsVUFBdUIsRUFBRSxrQkFBc0MsRUFBRSxlQUFnQzs7O1lBQ25JLGVBQWUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLE9BQU87Z0JBQ1AsdUJBQXVCO2dCQUN2QiwwQkFBMEI7Z0JBQzFCLHNCQUFzQjtnQkFDdEIscUJBQXFCO2dCQUNyQixnQkFBZ0I7Z0JBQ2hCLHdCQUF3QjtnQkFDeEIsc0JBQXNCO2dCQUN0QixnQkFBZ0I7Z0JBQ2hCLFVBQVU7YUFDVixFQUNELGtCQUFrQixDQUFDLGNBQWMsS0FBSyxPQUFPLENBQUMsQ0FBQztZQUVuRixlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxXQUFXLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssT0FBTyxJQUFJLGtCQUFrQixDQUFDLFVBQVUsS0FBSyxLQUFLLENBQUMsQ0FBQztZQUM3SSxxRkFBcUY7WUFDckYsZUFBZSxDQUFDLG1CQUFtQixDQUFDLENBQUMsVUFBVSxDQUFDLEVBQUUsa0JBQWtCLENBQUMsY0FBYyxLQUFLLE9BQU87Z0JBQzNELENBQUMsa0JBQWtCLENBQUMsVUFBVSxLQUFLLFVBQVUsSUFBSSxrQkFBa0IsQ0FBQyxVQUFVLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQztZQUVwSSxlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxhQUFhLEVBQUUsWUFBWSxDQUFDLEVBQUUsa0JBQWtCLENBQUMsY0FBYyxLQUFLLE9BQU8sSUFBSSxrQkFBa0IsQ0FBQyxpQkFBaUIsS0FBSyxZQUFZLENBQUMsQ0FBQztZQUMzSyxlQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxlQUFlLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxjQUFjLEtBQUssT0FBTyxJQUFJLGtCQUFrQixDQUFDLGlCQUFpQixLQUFLLFNBQVMsQ0FBQyxDQUFDO1lBRTVKLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLGNBQWMsS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDO2dCQUNoRCxJQUFJLENBQUM7b0JBQ0QsTUFBTSxrQkFBa0IsR0FBRyxNQUFNLGdDQUE0QixZQUFDLFVBQVUsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQztvQkFFckgsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDO3dCQUNyQixNQUFNLENBQUMsSUFBSSxDQUFDLGNBQWMsS0FBSyxDQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsU0FBUyxFQUFFLGVBQWUsQ0FBQyxTQUFTLEVBQUMsQ0FBQyxDQUFDO3dCQUVyRixNQUFNLEtBQUssR0FBYSxFQUFFLENBQUM7d0JBQzNCLElBQUksQ0FBQyxjQUFjLENBQUMsVUFBVSxFQUFFLGtCQUFrQixFQUFFLGVBQWUsRUFBRSxLQUFLLENBQUMsQ0FBQzt3QkFDNUUsTUFBTSxVQUFVLENBQUMsY0FBYyxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsQ0FBQztvQkFDdEYsQ0FBQztvQkFBQyxJQUFJLENBQUMsQ0FBQzt3QkFDSixNQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksS0FBSyxDQUFDLFFBQVEsZ0NBQWdDLENBQUMsQ0FBQztvQkFDNUUsQ0FBQztvQkFFRCxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7Z0JBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztvQkFDWCxNQUFNLENBQUMsS0FBSyxDQUFDLGNBQWMsS0FBSyxDQUFDLFFBQVEsU0FBUyxFQUFFLEdBQUcsQ0FBQyxDQUFDO29CQUN6RCxNQUFNLENBQUMsQ0FBQyxDQUFDO2dCQUNiLENBQUM7WUFDTCxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ0osTUFBTSxDQUFDLE1BQU0sb0JBQWdCLFlBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUNqRyxDQUFDO1FBQ0wsQ0FBQztLQUFBO0lBRU8sY0FBYyxDQUFDLFVBQXVCLEVBQUUsa0JBQXNDLEVBQUUsZUFBZ0MsRUFBRSxLQUFlO1FBQ3JJLE1BQU0sY0FBYyxHQUFhLEVBQUUsQ0FBQztRQUVwQyxNQUFNLFlBQVksR0FBNkMsRUFBRSxDQUFDO1FBRWxFLFlBQVksQ0FBQyxJQUFJLENBQUMsRUFBRSxPQUFPLEVBQUUsZUFBZSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO1FBQ2pFLFlBQVksQ0FBQyxJQUFJLENBQUMsRUFBRSxPQUFPLEVBQUUsZ0RBQWdELEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFFakcsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsVUFBVSxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUM7WUFDMUMsWUFBWSxDQUFDLElBQUksQ0FBQyxFQUFFLE9BQU8sRUFBRSxxQ0FBcUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUMxRixDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLFVBQVUsS0FBSyxVQUFVLElBQUksa0JBQWtCLENBQUMsVUFBVSxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUM7WUFDdEcscUZBQXFGO1lBQ3JGLFlBQVksQ0FBQyxJQUFJLENBQUMsRUFBRSxPQUFPLEVBQUUsd0NBQXdDLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDN0YsQ0FBQztRQUVELE1BQU0sV0FBVyxHQUFHLGVBQWUsQ0FBQyxxQkFBcUIsRUFBRSxDQUFDO1FBQzVELFdBQVcsQ0FBQyxPQUFPLENBQUMsR0FBRztZQUNuQixZQUFZLENBQUMsSUFBSSxDQUFDLEVBQUUsT0FBTyxFQUFFLGtCQUFrQixHQUFHLE9BQU8sRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztRQUNsRixDQUFDLENBQUMsQ0FBQztRQUVILEVBQUUsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLGlCQUFpQixLQUFLLFlBQVksQ0FBQyxDQUFDLENBQUM7WUFDeEQsY0FBYyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUM3QixjQUFjLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ2hDLENBQUM7UUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsa0JBQWtCLENBQUMsaUJBQWlCLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQztZQUM1RCxjQUFjLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ25DLENBQUM7UUFFRCxNQUFNLFVBQVUsR0FBRyxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLFVBQVUsRUFBRSw4QkFBOEIsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNwTCxZQUFZLENBQUMsSUFBSSxDQUFDO1lBQ2QsT0FBTyxFQUFFLFVBQVU7WUFDbkIsUUFBUSxFQUFFLEtBQUs7U0FDbEIsQ0FBQyxDQUFDO1FBRUgsWUFBWSxDQUFDLElBQUksQ0FBQztZQUNkLE9BQU8sRUFBRSxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLGtCQUFrQixFQUFFLGNBQWMsQ0FBQyxDQUFDLENBQUM7WUFDakssUUFBUSxFQUFFLEtBQUs7U0FDbEIsQ0FBQyxDQUFDO1FBRUgsWUFBWSxDQUFDLElBQUksQ0FBQztZQUNkLE9BQU8sRUFBRSxVQUFVLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxlQUFlLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLGtCQUFrQixFQUFFLDBCQUEwQixDQUFDLENBQUMsQ0FBQztZQUM3SyxRQUFRLEVBQUUsSUFBSTtTQUNqQixDQUFDLENBQUM7UUFFSCxZQUFZLENBQUMsSUFBSSxDQUFDO1lBQ2QsT0FBTyxFQUFFLFVBQVUsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLGdCQUFnQixDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsVUFBVSxDQUFDLFdBQVcsQ0FBQyxlQUFlLENBQUMsa0JBQWtCLEVBQUUsc0JBQXNCLENBQUMsQ0FBQyxDQUFDO1lBQ3pLLFFBQVEsRUFBRSxJQUFJO1NBQ2pCLENBQUMsQ0FBQztRQUVILE1BQU0sYUFBYSxHQUFHLFVBQVUsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLGdCQUFnQixDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsZUFBZSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7UUFFbEksTUFBTSxrQkFBa0IsR0FBRyxJQUFJLHVDQUFrQixFQUFFLENBQUM7UUFDcEQsa0JBQWtCLENBQUMsUUFBUSxHQUFHLFdBQVcsQ0FBQztRQUMxQyxrQkFBa0IsQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDO1FBQ3BDLGtCQUFrQixDQUFDLFVBQVUsR0FBRyxjQUFjLENBQUM7UUFDL0Msa0JBQWtCLENBQUMsU0FBUyxHQUFHLENBQUMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsc0JBQXNCLENBQUMsQ0FBQztRQUNyRixrQkFBa0IsQ0FBQyxRQUFRLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUM1QyxrQkFBa0IsQ0FBQyxnQkFBZ0IsR0FBRztZQUNsQyxTQUFTLEVBQUU7Z0JBQ1A7b0JBQ0ksSUFBSSxFQUFFLE1BQU07b0JBQ1osR0FBRyxFQUFFLGFBQWE7b0JBQ2xCLE1BQU0sRUFBRSxHQUFHO2lCQUNkO2FBQ0o7U0FDSixDQUFDO1FBRUYsa0JBQWtCLENBQUMsWUFBWSxHQUFHO1lBQzlCLFNBQVMsRUFBRSxhQUFhO1lBQ3hCLFVBQVUsRUFBRSxNQUFNO1NBQ3JCLENBQUM7UUFFRixrQkFBa0IsQ0FBQyxxQkFBcUIsR0FBRztZQUN2QyxPQUFPLEVBQUU7Z0JBQ0wsSUFBSSxFQUFFLEdBQUcsYUFBYSxnQkFBZ0I7Z0JBQ3RDLElBQUksRUFBRSxHQUFHLGFBQWEsV0FBVztnQkFDakMsY0FBYyxFQUFFLEVBQUU7YUFDckI7U0FDSixDQUFDO1FBRUYsa0JBQWtCLENBQUMsYUFBYSxHQUFHLEVBQUUsQ0FBQztRQUN0QyxFQUFFLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1lBQ2Isa0JBQWtCLENBQUMsYUFBYSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBQzdFLENBQUM7UUFDRCxrQkFBa0IsQ0FBQyxLQUFLLEdBQUcsWUFBWSxDQUFDO1FBRXhDLEtBQUssQ0FBQyxJQUFJLENBQUMscUNBQXFDLENBQUMsQ0FBQztRQUNsRCxLQUFLLENBQUMsSUFBSSxDQUFDLGtCQUFrQix1QkFBVSxDQUFDLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN4RSxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2pCLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDO0lBQ3hELENBQUM7O0FBekljLGNBQVEsR0FBVyxlQUFlLENBQUM7QUFEdEQsc0JBMklDIiwiZmlsZSI6InBpcGVsaW5lU3RlcHMvdW5pdFRlc3RSdW5uZXIva2FybWEuanMiLCJzb3VyY2VSb290IjoiLi4vc3JjIn0= diff --git a/package.json b/package.json index ade810b3..7a2779e6 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { - "name": "unitejs-core", - "version": "0.7.0", - "description": "Core of the UniteJS JavaScript framework management tool.", + "name": "unitejs-engine", + "version": "0.7.1", + "description": "Engine of the UniteJS JavaScript framework management tool.", "repository": { "type": "git", - "url": "https://github.com/unitejs/core.git" + "url": "https://github.com/unitejs/engine.git" }, "keywords": [ "unite", @@ -40,9 +40,9 @@ "author": "martyn@unitejs.com", "license": "MIT", "bugs": { - "url": "https://github.com/unitejs/core/issues" + "url": "https://github.com/unitejs/engine/issues" }, - "homepage": "https://github.com/unitejs/core#readme", + "homepage": "https://github.com/unitejs/engine#readme", "devDependencies": { "@types/chai": "^4.0.1", "@types/mocha": "^2.2.41", @@ -64,7 +64,7 @@ "typescript": "^2.4.1" }, "dependencies": { - "unitejs-framework": "^0.6.2", + "unitejs-framework": "^0.7.1", "npm": "^5.0.3", "yarn": "^0.27.5" }, diff --git a/src/engine/engine.ts b/src/engine/engine.ts index 32f1a267..98e8ce93 100644 --- a/src/engine/engine.ts +++ b/src/engine/engine.ts @@ -2,7 +2,6 @@ * Main engine */ import { ParameterValidation } from "unitejs-framework/dist/helpers/parameterValidation"; -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { PackageConfiguration } from "../configuration/models/packages/packageConfiguration"; @@ -74,14 +73,12 @@ import { EngineVariables } from "./engineVariables"; export class Engine implements IEngine { private _logger: ILogger; - private _display: IDisplay; private _fileSystem: IFileSystem; private _coreRoot: string; private _assetsFolder: string; - constructor(logger: ILogger, display: IDisplay, fileSystem: IFileSystem) { + constructor(logger: ILogger, fileSystem: IFileSystem) { this._logger = logger; - this._display = display; this._fileSystem = fileSystem; this._coreRoot = fileSystem.pathCombine(__dirname, "../../"); this._assetsFolder = fileSystem.pathCombine(this._coreRoot, "/assets/"); @@ -129,17 +126,17 @@ export class Engine implements IEngine { uniteConfiguration.cssPost = cssPost || uniteConfiguration.cssPost; uniteConfiguration.buildConfigurations = uniteConfiguration.buildConfigurations || {}; - if (!ParameterValidation.checkPackageName(this._display, "packageName", uniteConfiguration.packageName)) { + if (!ParameterValidation.checkPackageName(this._logger, "packageName", uniteConfiguration.packageName)) { return 1; } - if (!ParameterValidation.notEmpty(this._display, "title", uniteConfiguration.title)) { + if (!ParameterValidation.notEmpty(this._logger, "title", uniteConfiguration.title)) { return 1; } let spdxLicense: ISpdxLicense; try { const licenseData = await this._fileSystem.fileReadJson(this._assetsFolder, "spdx-full.json"); - if (!ParameterValidation.contains(this._display, + if (!ParameterValidation.contains(this._logger, "license", Object.keys(licenseData), uniteConfiguration.license, @@ -149,52 +146,52 @@ export class Engine implements IEngine { spdxLicense = licenseData[uniteConfiguration.license]; } } catch (e) { - this._display.error("There was a problem reading the spdx-full.json file", e); + this._logger.error("There was a problem reading the spdx-full.json file", e); return 1; } - if (!ParameterValidation.checkOneOf(this._display, "sourceLanguage", uniteConfiguration.sourceLanguage, ["JavaScript", "TypeScript"])) { + if (!ParameterValidation.checkOneOf(this._logger, "sourceLanguage", uniteConfiguration.sourceLanguage, ["JavaScript", "TypeScript"])) { return 1; } - if (!ParameterValidation.checkOneOf(this._display, "moduleType", uniteConfiguration.moduleType, ["AMD", "CommonJS", "SystemJS"])) { + if (!ParameterValidation.checkOneOf(this._logger, "moduleType", uniteConfiguration.moduleType, ["AMD", "CommonJS", "SystemJS"])) { return 1; } - if (!ParameterValidation.checkOneOf(this._display, "bundler", uniteConfiguration.bundler, ["Browserify", "RequireJS", "SystemJSBuilder", "Webpack"])) { + if (!ParameterValidation.checkOneOf(this._logger, "bundler", uniteConfiguration.bundler, ["Browserify", "RequireJS", "SystemJSBuilder", "Webpack"])) { return 1; } - if (!ParameterValidation.checkOneOf(this._display, "unitTestRunner", uniteConfiguration.unitTestRunner, ["None", "Karma"])) { + if (!ParameterValidation.checkOneOf(this._logger, "unitTestRunner", uniteConfiguration.unitTestRunner, ["None", "Karma"])) { return 1; } if (unitTestRunner !== "None") { - if (!ParameterValidation.checkOneOf(this._display, "unitTestFramework", uniteConfiguration.unitTestFramework, ["Mocha-Chai", "Jasmine"])) { + if (!ParameterValidation.checkOneOf(this._logger, "unitTestFramework", uniteConfiguration.unitTestFramework, ["Mocha-Chai", "Jasmine"])) { return 1; } } - if (!ParameterValidation.checkOneOf(this._display, "e2eTestRunner", uniteConfiguration.e2eTestRunner, ["None", "WebdriverIO", "Protractor"])) { + if (!ParameterValidation.checkOneOf(this._logger, "e2eTestRunner", uniteConfiguration.e2eTestRunner, ["None", "WebdriverIO", "Protractor"])) { return 1; } if (e2eTestRunner !== "None") { - if (!ParameterValidation.checkOneOf(this._display, "e2eTestFramework", uniteConfiguration.e2eTestFramework, ["Mocha-Chai", "Jasmine"])) { + if (!ParameterValidation.checkOneOf(this._logger, "e2eTestFramework", uniteConfiguration.e2eTestFramework, ["Mocha-Chai", "Jasmine"])) { return 1; } } - if (!ParameterValidation.checkOneOf(this._display, "linter", uniteConfiguration.linter, ["None", "ESLint", "TSLint"])) { + if (!ParameterValidation.checkOneOf(this._logger, "linter", uniteConfiguration.linter, ["None", "ESLint", "TSLint"])) { return 1; } - if (!ParameterValidation.checkOneOf(this._display, "cssPre", uniteConfiguration.cssPre, ["Css", "Less", "Sass", "Stylus"])) { + if (!ParameterValidation.checkOneOf(this._logger, "cssPre", uniteConfiguration.cssPre, ["Css", "Less", "Sass", "Stylus"])) { return 1; } - if (!ParameterValidation.checkOneOf(this._display, "cssPost", uniteConfiguration.cssPost, ["None", "PostCss"])) { + if (!ParameterValidation.checkOneOf(this._logger, "cssPost", uniteConfiguration.cssPost, ["None", "PostCss"])) { return 1; } - if (!ParameterValidation.checkOneOf(this._display, "packageManager", uniteConfiguration.packageManager, ["Npm", "Yarn"])) { + if (!ParameterValidation.checkOneOf(this._logger, "packageManager", uniteConfiguration.packageManager, ["Npm", "Yarn"])) { return 1; } - if (!ParameterValidation.checkOneOf(this._display, "applicationFramework", uniteConfiguration.applicationFramework, ["PlainApp", "Aurelia", "React"])) { + if (!ParameterValidation.checkOneOf(this._logger, "applicationFramework", uniteConfiguration.applicationFramework, ["PlainApp", "Aurelia", "React"])) { return 1; } - this._display.log(""); + this._logger.info(""); return this.configureRun(outputDirectory, uniteConfiguration, spdxLicense); } @@ -218,24 +215,24 @@ export class Engine implements IEngine { } if (!uniteConfiguration) { - this._display.error("There is no unite.json to configure."); + this._logger.error("There is no unite.json to configure."); return 1; } else { uniteConfiguration.clientPackages = uniteConfiguration.clientPackages || {}; uniteConfiguration.packageManager = packageManager || uniteConfiguration.packageManager || "Npm"; } - if (!ParameterValidation.checkOneOf(this._display, "operation", operation, ["add", "remove"])) { + if (!ParameterValidation.checkOneOf(this._logger, "operation", operation, ["add", "remove"])) { return 1; } - if (!ParameterValidation.notEmpty(this._display, "packageName", packageName)) { + if (!ParameterValidation.notEmpty(this._logger, "packageName", packageName)) { return 1; } - if (!ParameterValidation.checkOneOf(this._display, "packageManager", uniteConfiguration.packageManager, ["Npm", "Yarn"])) { + if (!ParameterValidation.checkOneOf(this._logger, "packageManager", uniteConfiguration.packageManager, ["Npm", "Yarn"])) { return 1; } - this._display.log(""); + this._logger.info(""); if (operation === "add") { return await this.clientPackageAdd(packageName, version, preload, includeMode, main, mainMinified, isPackage, wrapAssets, outputDirectory, uniteConfiguration); @@ -256,20 +253,20 @@ export class Engine implements IEngine { const uniteConfiguration = await this.loadConfiguration(outputDirectory); if (!uniteConfiguration) { - this._display.error("There is no unite.json to configure."); + this._logger.error("There is no unite.json to configure."); return 1; } else { uniteConfiguration.buildConfigurations = uniteConfiguration.buildConfigurations || {}; } - if (!ParameterValidation.checkOneOf(this._display, "operation", operation, ["add", "remove"])) { + if (!ParameterValidation.checkOneOf(this._logger, "operation", operation, ["add", "remove"])) { return 1; } - if (!ParameterValidation.notEmpty(this._display, "configurationName", configurationName)) { + if (!ParameterValidation.notEmpty(this._logger, "configurationName", configurationName)) { return 1; } - this._display.log(""); + this._logger.info(""); if (operation === "add") { return await this.buildConfigurationAdd(configurationName, bundle, minify, sourcemaps, outputDirectory, uniteConfiguration); @@ -288,11 +285,6 @@ export class Engine implements IEngine { outputDirectory = this._fileSystem.pathFormat(outputDirectory); } - // if the user has specified the www folder then move one up - outputDirectory = this._fileSystem.pathFormat(outputDirectory); - if (outputDirectory.endsWith("www")) { - outputDirectory = this._fileSystem.pathFormat(this._fileSystem.pathCombine(outputDirectory, "../")); - } return outputDirectory; } @@ -301,22 +293,18 @@ export class Engine implements IEngine { // check if there is a unite.json we can load for default options try { - const wwwFolder = this._fileSystem.pathCombine(outputDirectory, "www"); - - const exists = await this._fileSystem.fileExists(wwwFolder, "unite.json"); + const exists = await this._fileSystem.fileExists(outputDirectory, "unite.json"); if (exists) { - uniteConfiguration = await this._fileSystem.fileReadJson(wwwFolder, "unite.json"); + uniteConfiguration = await this._fileSystem.fileReadJson(outputDirectory, "unite.json"); } } catch (e) { - // we can ignore any failures here + this._logger.error("Reading existing unite.json", e); } return uniteConfiguration; } private async configureRun(outputDirectory: string, uniteConfiguration: UniteConfiguration, license: ISpdxLicense): Promise { - this._logger.info("Engine::init", { outputDirectory, uniteConfiguration }); - const engineVariables = new EngineVariables(); let ret = await this.createEngineVariables(outputDirectory, uniteConfiguration, engineVariables); if (ret === 0) { @@ -381,8 +369,8 @@ export class Engine implements IEngine { ret = await this.runPipeline(pipelineSteps, uniteConfiguration, engineVariables); if (ret === 0) { - this._display.banner("You should probably run npm install / yarn install before running any gulp commands."); - this._display.banner("Successfully Completed."); + this._logger.warning("You should probably run npm install / yarn install before running any gulp commands."); + this._logger.banner("Successfully Completed."); } } @@ -399,12 +387,12 @@ export class Engine implements IEngine { wrapAssets: string | undefined | null, outputDirectory: string, uniteConfiguration: UniteConfiguration): Promise { - if (!ParameterValidation.checkOneOf(this._display, "includeMode", includeMode, ["app", "test", "both"])) { + if (!ParameterValidation.checkOneOf(this._logger, "includeMode", includeMode, ["app", "test", "both"])) { return 1; } if (uniteConfiguration.clientPackages[packageName]) { - this._display.error("Package has already been added."); + this._logger.error("Package has already been added."); return 1; } @@ -463,7 +451,7 @@ export class Engine implements IEngine { ret = await this.runPipeline(pipelineSteps, uniteConfiguration, engineVariables); if (ret === 0) { - this._display.banner("Successfully Completed."); + this._logger.banner("Successfully Completed."); } } @@ -472,7 +460,7 @@ export class Engine implements IEngine { private async clientPackageRemove(packageName: string, outputDirectory: string, uniteConfiguration: UniteConfiguration): Promise { if (!uniteConfiguration.clientPackages[packageName]) { - this._display.error("Package has not been added."); + this._logger.error("Package has not been added."); return 1; } @@ -501,7 +489,7 @@ export class Engine implements IEngine { ret = await this.runPipeline(pipelineSteps, uniteConfiguration, engineVariables); if (ret === 0) { - this._display.banner("Successfully Completed."); + this._logger.banner("Successfully Completed."); } } @@ -529,7 +517,7 @@ export class Engine implements IEngine { ret = await this.runPipeline(pipelineSteps, uniteConfiguration, engineVariables); if (ret === 0) { - this._display.banner("Successfully Completed."); + this._logger.banner("Successfully Completed."); } } @@ -550,7 +538,7 @@ export class Engine implements IEngine { pipelineSteps.push(new UniteConfigurationJson()); ret = await this.runPipeline(pipelineSteps, uniteConfiguration, engineVariables); if (ret === 0) { - this._display.banner("Successfully Completed."); + this._logger.banner("Successfully Completed."); } } @@ -558,6 +546,16 @@ export class Engine implements IEngine { } private async createEngineVariables(outputDirectory: string, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + try { + this._logger.info("Loading dependencies", { core: this._coreRoot, dependenciesFile: "package.json" }); + + engineVariables.corePackageJson = await this._fileSystem.fileReadJson(this._coreRoot, "package.json"); + uniteConfiguration.uniteVersion = engineVariables.corePackageJson.version; + } catch (err) { + this._logger.error("Loading dependencies failed", err, { core: this._coreRoot, dependenciesFile: "package.json" }); + return 1; + } + engineVariables.coreFolder = this._coreRoot; engineVariables.rootFolder = outputDirectory; engineVariables.wwwFolder = this._fileSystem.pathCombine(engineVariables.rootFolder, "www"); @@ -582,9 +580,9 @@ export class Engine implements IEngine { engineVariables.gitIgnore = []; if (uniteConfiguration.packageManager === "Npm") { - engineVariables.packageManager = new NpmPackageManager(this._logger, this._display, this._fileSystem); + engineVariables.packageManager = new NpmPackageManager(this._logger, this._fileSystem); } else if (uniteConfiguration.packageManager === "Yarn") { - engineVariables.packageManager = new YarnPackageManager(this._logger, this._display, this._fileSystem); + engineVariables.packageManager = new YarnPackageManager(this._logger, this._fileSystem); } uniteConfiguration.buildConfigurations = uniteConfiguration.buildConfigurations || {}; @@ -621,29 +619,19 @@ export class Engine implements IEngine { engineVariables.transpileProperties = {}; - try { - this._logger.log("Loading dependencies", { core: engineVariables.coreFolder, dependenciesFile: "package.json" }); - - engineVariables.corePackageJson = await this._fileSystem.fileReadJson(engineVariables.coreFolder, "package.json"); - uniteConfiguration.uniteVersion = engineVariables.corePackageJson.version; - } catch (err) { - this._logger.error("Loading dependencies failed", err, { core: engineVariables.coreFolder, dependenciesFile: "package.json" }); - return 1; - } - return 0; } private async runPipeline(pipelineSteps: IEnginePipelineStep[], uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { for (const pipelineStep of pipelineSteps) { - const ret = await pipelineStep.prerequisites(this._logger, this._display, this._fileSystem, uniteConfiguration, engineVariables); + const ret = await pipelineStep.prerequisites(this._logger, this._fileSystem, uniteConfiguration, engineVariables); if (ret !== 0) { return ret; } } for (const pipelineStep of pipelineSteps) { - const ret = await pipelineStep.process(this._logger, this._display, this._fileSystem, uniteConfiguration, engineVariables); + const ret = await pipelineStep.process(this._logger, this._fileSystem, uniteConfiguration, engineVariables); if (ret !== 0) { return ret; } diff --git a/src/engine/enginePipelineStepBase.ts b/src/engine/enginePipelineStepBase.ts index 0caf80f2..adc8fbe0 100644 --- a/src/engine/enginePipelineStepBase.ts +++ b/src/engine/enginePipelineStepBase.ts @@ -1,7 +1,6 @@ /** * Base implementation of engine pipeline step. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../configuration/models/unite/uniteConfiguration"; @@ -12,7 +11,6 @@ export abstract class EnginePipelineStepBase implements IEnginePipelineStep { public static MARKER: string = "Generated by UniteJS"; public async prerequisites(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { @@ -20,23 +18,11 @@ export abstract class EnginePipelineStepBase implements IEnginePipelineStep { } public abstract process(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; - public log(logger: ILogger, display: IDisplay, message: string, args?: { [id: string]: any}): void { - display.log(message, args); - logger.log(message, args); - } - - public error(logger: ILogger, display: IDisplay, message: string, err?: any, args?: { [id: string]: any}): void { - display.error(message, err, args); - logger.error(message, args); - } - public async copyFile(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, sourceFolder: string, sourceFilename: string, @@ -45,7 +31,7 @@ export abstract class EnginePipelineStepBase implements IEnginePipelineStep { const hasGeneratedMarker = await this.fileHasGeneratedMarker(fileSystem, destFolder, destFilename); if (hasGeneratedMarker) { - this.log(logger, display, `Copying ${sourceFilename}`, { from: sourceFolder, to: destFolder }); + logger.info(`Copying ${sourceFilename}`, { from: sourceFolder, to: destFolder }); const folderWithFile = fileSystem.pathCombine(destFolder, destFilename); const folderOnly = fileSystem.pathGetDirectory(folderWithFile); @@ -57,30 +43,29 @@ export abstract class EnginePipelineStepBase implements IEnginePipelineStep { const lines = await fileSystem.fileReadLines(sourceFolder, sourceFilename); await fileSystem.fileWriteLines(destFolder, destFilename, lines); } else { - this.log(logger, display, `Skipping ${sourceFilename} as it has no generated marker`, - { from: sourceFolder, to: destFolder }); + logger.info(`Skipping ${sourceFilename} as it has no generated marker`, + { from: sourceFolder, to: destFolder }); } } - public async deleteFile(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, + public async deleteFile(logger: ILogger, fileSystem: IFileSystem, folder: string, filename: string): Promise { const hasGeneratedMarker = await this.fileHasGeneratedMarker(fileSystem, folder, filename); if (hasGeneratedMarker) { - this.log(logger, display, `Deleting ${filename}`, { from: folder }); - try { const exists = await fileSystem.fileExists(filename, folder); if (exists) { + logger.info(`Deleting ${filename}`, { from: folder }); await fileSystem.fileDelete(filename, folder); } return 0; } catch (err) { - this.error(logger, display, `Deleting ${filename} failed`, err); + logger.error(`Deleting ${filename} failed`, err); return 1; } } else { - this.log(logger, display, `Skipping Delete of ${filename} as it has no generated marker`, { from: folder }); + logger.info(`Skipping Delete of ${filename} as it has no generated marker`, { from: folder }); return 0; } } diff --git a/src/interfaces/IEnginePipelineStep.ts b/src/interfaces/IEnginePipelineStep.ts index 7d246f52..d305b552 100644 --- a/src/interfaces/IEnginePipelineStep.ts +++ b/src/interfaces/IEnginePipelineStep.ts @@ -1,7 +1,6 @@ /** * Interface for pipeline steps. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../configuration/models/unite/uniteConfiguration"; @@ -9,13 +8,11 @@ import { EngineVariables } from "../engine/engineVariables"; export interface IEnginePipelineStep { prerequisites(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; process(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise; diff --git a/src/packageManagers/npmPackageManager.ts b/src/packageManagers/npmPackageManager.ts index 841b3754..a06fd20a 100644 --- a/src/packageManagers/npmPackageManager.ts +++ b/src/packageManagers/npmPackageManager.ts @@ -2,7 +2,6 @@ * NPM Package Manager class. */ import * as npm from "npm"; -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { PackageConfiguration } from "../configuration/models/packages/packageConfiguration"; @@ -10,17 +9,15 @@ import { IPackageManager } from "../interfaces/IPackageManager"; export class NpmPackageManager implements IPackageManager { private _logger: ILogger; - private _display: IDisplay; private _fileSystem: IFileSystem; - constructor(logger: ILogger, display: IDisplay, fileSystem: IFileSystem) { + constructor(logger: ILogger, fileSystem: IFileSystem) { this._logger = logger; - this._display = display; this._fileSystem = fileSystem; } public async info(packageName: string): Promise { - this._display.info("Looking up package info..."); + this._logger.info("Looking up package info..."); return new Promise((resolve, reject) => { npm.load({json: true}, (err, result) => { if (err) { @@ -44,7 +41,7 @@ export class NpmPackageManager implements IPackageManager { } public async add(workingDirectory: string, packageName: string, version: string, isDev: boolean): Promise { - this._display.info("Adding package..."); + this._logger.info("Adding package..."); return new Promise((resolve, reject) => { const config: { [id: string]: any } = {}; config.prefix = this._fileSystem.pathFormat(workingDirectory); @@ -70,7 +67,7 @@ export class NpmPackageManager implements IPackageManager { } public async remove(workingDirectory: string, packageName: string, isDev: boolean): Promise { - this._display.info("Removing package..."); + this._logger.info("Removing package..."); return new Promise((resolve, reject) => { const config: { [id: string]: any } = {}; config.prefix = this._fileSystem.pathFormat(workingDirectory); diff --git a/src/packageManagers/yarnPackageManager.ts b/src/packageManagers/yarnPackageManager.ts index e2e19718..04cff7f4 100644 --- a/src/packageManagers/yarnPackageManager.ts +++ b/src/packageManagers/yarnPackageManager.ts @@ -3,7 +3,6 @@ */ import * as child from "child_process"; import * as npm from "npm"; -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { PackageConfiguration } from "../configuration/models/packages/packageConfiguration"; @@ -11,18 +10,16 @@ import { IPackageManager } from "../interfaces/IPackageManager"; export class YarnPackageManager implements IPackageManager { private _logger: ILogger; - private _display: IDisplay; private _fileSystem: IFileSystem; - constructor(logger: ILogger, display: IDisplay, fileSystem: IFileSystem) { + constructor(logger: ILogger, fileSystem: IFileSystem) { this._logger = logger; - this._display = display; this._fileSystem = fileSystem; } public async info(packageName: string): Promise { // We still use NPM for this as yarn doesn't have this facility yet - this._display.info("Looking up package info..."); + this._logger.info("Looking up package info..."); return new Promise((resolve, reject) => { npm.load({json: true}, (err, result) => { if (err) { @@ -46,7 +43,7 @@ export class YarnPackageManager implements IPackageManager { } public async add(workingDirectory: string, packageName: string, version: string, isDev: boolean): Promise { - this._display.info("Adding package..."); + this._logger.info("Adding package..."); const args = ["add", `${packageName}@${version}`]; if (isDev) { @@ -57,7 +54,7 @@ export class YarnPackageManager implements IPackageManager { } public async remove(workingDirectory: string, packageName: string, isDev: boolean): Promise { - this._display.info("Removing package..."); + this._logger.info("Removing package..."); const args = ["remove", packageName]; if (isDev) { @@ -74,15 +71,15 @@ export class YarnPackageManager implements IPackageManager { const spawnProcess = child.spawn(`yarn${isWin ? ".cmd" : ""}`, args, { cwd: this._fileSystem.pathFormat(workingDirectory) }); spawnProcess.stdout.on("data", (data) => { - this._display.log((data ? data.toString() : "").replace(/\n/g, "")); + this._logger.info((data ? data.toString() : "").replace(/\n/g, "")); }); spawnProcess.stderr.on("data", (data) => { const error = (data ? data.toString() : "").replace(/\n/g, ""); if (error.startsWith("warning")) { - this._display.info(error); + this._logger.info(error); } else { - this._display.error(error); + this._logger.error(error); } }); diff --git a/src/pipelineSteps/applicationFramework/aurelia.ts b/src/pipelineSteps/applicationFramework/aurelia.ts index a6603885..6b1aa21e 100644 --- a/src/pipelineSteps/applicationFramework/aurelia.ts +++ b/src/pipelineSteps/applicationFramework/aurelia.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate scaffolding for Aurelia application. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -10,42 +9,41 @@ import { SharedAppFramework } from "./sharedAppFramework"; export class Aurelia extends SharedAppFramework { public async prerequisites(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { if (uniteConfiguration.applicationFramework === "Aurelia") { if (uniteConfiguration.bundler === "Browserify" || uniteConfiguration.bundler === "Webpack") { - super.error(logger, display, `Aurelia does not currently support bundling with ${uniteConfiguration.bundler}`); + logger.error(`Aurelia does not currently support bundling with ${uniteConfiguration.bundler}`); return 1; } } return 0; } - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["aurelia-protractor-plugin"], uniteConfiguration.applicationFramework === "Aurelia" && uniteConfiguration.e2eTestRunner === "Protractor"); engineVariables.protractorPlugins["aurelia-protractor-plugin"] = uniteConfiguration.applicationFramework === "Aurelia" && uniteConfiguration.e2eTestRunner === "Protractor"; this.toggleAllPackages(uniteConfiguration, engineVariables); if (uniteConfiguration.applicationFramework === "Aurelia") { - let ret = await this.generateAppSource(logger, display, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper", "entryPoint", "child/child"]); + let ret = await this.generateAppSource(logger, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper", "entryPoint", "child/child"]); if (ret === 0) { - ret = await super.generateAppHtml(logger, display, fileSystem, uniteConfiguration, engineVariables, ["app", "child/child"]); + ret = await super.generateAppHtml(logger, fileSystem, uniteConfiguration, engineVariables, ["app", "child/child"]); if (ret === 0) { - ret = await super.generateAppCss(logger, display, fileSystem, uniteConfiguration, engineVariables, ["child/child"]); + ret = await super.generateAppCss(logger, fileSystem, uniteConfiguration, engineVariables, ["child/child"]); if (ret === 0) { - ret = await super.generateE2eTest(logger, display, fileSystem, uniteConfiguration, engineVariables, ["app"]); + ret = await super.generateE2eTest(logger, fileSystem, uniteConfiguration, engineVariables, ["app"]); if (ret === 0) { - ret = await this.generateUnitTest(logger, display, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper"]); + ret = await this.generateUnitTest(logger, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper"]); if (ret === 0) { - ret = await super.generateCss(logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = await super.generateCss(logger, fileSystem, uniteConfiguration, engineVariables); } } } diff --git a/src/pipelineSteps/applicationFramework/plainApp.ts b/src/pipelineSteps/applicationFramework/plainApp.ts index 77c91028..c21d2d1d 100644 --- a/src/pipelineSteps/applicationFramework/plainApp.ts +++ b/src/pipelineSteps/applicationFramework/plainApp.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate scaffolding for plain application. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,18 +8,18 @@ import { EngineVariables } from "../../engine/engineVariables"; import { SharedAppFramework } from "./sharedAppFramework"; export class PlainApp extends SharedAppFramework { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { if (uniteConfiguration.applicationFramework === "PlainApp") { - let ret = await this.generateAppSource(logger, display, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper", "entryPoint"]); + let ret = await this.generateAppSource(logger, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper", "entryPoint"]); if (ret === 0) { - ret = await super.generateE2eTest(logger, display, fileSystem, uniteConfiguration, engineVariables, ["app"]); + ret = await super.generateE2eTest(logger, fileSystem, uniteConfiguration, engineVariables, ["app"]); if (ret === 0) { - ret = await this.generateUnitTest(logger, display, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper"]); + ret = await this.generateUnitTest(logger, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper"]); if (ret === 0) { - ret = await super.generateCss(logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = await super.generateCss(logger, fileSystem, uniteConfiguration, engineVariables); } } } diff --git a/src/pipelineSteps/applicationFramework/react.ts b/src/pipelineSteps/applicationFramework/react.ts index b44b905f..27956117 100644 --- a/src/pipelineSteps/applicationFramework/react.ts +++ b/src/pipelineSteps/applicationFramework/react.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate scaffolding for React application. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,7 +8,7 @@ import { EngineVariables } from "../../engine/engineVariables"; import { SharedAppFramework } from "./sharedAppFramework"; export class React extends SharedAppFramework { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["babel-preset-react"], uniteConfiguration.applicationFramework === "React" && uniteConfiguration.sourceLanguage === "JavaScript"); engineVariables.toggleDevDependency(["eslint-plugin-react"], uniteConfiguration.applicationFramework === "React" && uniteConfiguration.linter === "ESLint"); @@ -52,20 +51,20 @@ export class React extends SharedAppFramework { if (uniteConfiguration.applicationFramework === "React") { const codeExtension = uniteConfiguration.sourceLanguage === "JavaScript" ? "!jsx" : "!tsx"; - let ret = await this.generateAppSource(logger, display, fileSystem, uniteConfiguration, engineVariables, [ + let ret = await this.generateAppSource(logger, fileSystem, uniteConfiguration, engineVariables, [ `app${codeExtension}`, `child/child${codeExtension}`, "bootstrapper", "entryPoint"]); if (ret === 0) { - ret = await super.generateE2eTest(logger, display, fileSystem, uniteConfiguration, engineVariables, ["app"]); + ret = await super.generateE2eTest(logger, fileSystem, uniteConfiguration, engineVariables, ["app"]); if (ret === 0) { - ret = await this.generateUnitTest(logger, display, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper"]); + ret = await this.generateUnitTest(logger, fileSystem, uniteConfiguration, engineVariables, ["app", "bootstrapper"]); if (ret === 0) { - ret = await super.generateCss(logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = await super.generateCss(logger, fileSystem, uniteConfiguration, engineVariables); } } } diff --git a/src/pipelineSteps/applicationFramework/sharedAppFramework.ts b/src/pipelineSteps/applicationFramework/sharedAppFramework.ts index 7e948b28..2e44095c 100644 --- a/src/pipelineSteps/applicationFramework/sharedAppFramework.ts +++ b/src/pipelineSteps/applicationFramework/sharedAppFramework.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate scaffolding for shared application. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -10,7 +9,6 @@ import { EngineVariables } from "../../engine/engineVariables"; export abstract class SharedAppFramework extends EnginePipelineStepBase { protected async generateAppSource(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, @@ -19,7 +17,7 @@ export abstract class SharedAppFramework extends EnginePipelineStepBase { `appFramework/${uniteConfiguration.applicationFramework.toLowerCase()}/src/${uniteConfiguration.sourceLanguage.toLowerCase()}`); try { - super.log(logger, display, "Generating App Source in", { appSourceFolder: engineVariables.srcFolder }); + logger.info("Generating App Source in", { appSourceFolder: engineVariables.srcFolder }); for (let file of files) { if (file.indexOf("!") >= 0) { @@ -27,7 +25,7 @@ export abstract class SharedAppFramework extends EnginePipelineStepBase { } else { file += `.${engineVariables.sourceLanguageExt}`; } - await this.copyFile(logger, display, fileSystem, + await this.copyFile(logger, fileSystem, scaffoldFolder, file, engineVariables.srcFolder, @@ -36,13 +34,12 @@ export abstract class SharedAppFramework extends EnginePipelineStepBase { return 0; } catch (err) { - super.error(logger, display, "Generating App Source failed", err, { appSourceFolder: engineVariables.srcFolder }); + logger.error("Generating App Source failed", err, { appSourceFolder: engineVariables.srcFolder }); return 1; } } protected async generateAppHtml(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, @@ -50,10 +47,10 @@ export abstract class SharedAppFramework extends EnginePipelineStepBase { const scaffoldFolder = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `appFramework/${uniteConfiguration.applicationFramework.toLowerCase()}/src/html/`); try { - super.log(logger, display, "Generating App HTML in", { appSourceFolder: engineVariables.srcFolder }); + logger.info("Generating App HTML in", { appSourceFolder: engineVariables.srcFolder }); for (const htmlFile of htmlFiles) { - await this.copyFile(logger, display, fileSystem, + await this.copyFile(logger, fileSystem, scaffoldFolder, `${htmlFile}.html`, engineVariables.srcFolder, @@ -62,13 +59,12 @@ export abstract class SharedAppFramework extends EnginePipelineStepBase { return 0; } catch (err) { - super.error(logger, display, "Generating App HTML failed", err, { appSourceFolder: engineVariables.srcFolder }); + logger.error("Generating App HTML failed", err, { appSourceFolder: engineVariables.srcFolder }); return 1; } } protected async generateAppCss(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, @@ -77,10 +73,10 @@ export abstract class SharedAppFramework extends EnginePipelineStepBase { `appFramework/${uniteConfiguration.applicationFramework.toLowerCase()}/src/css/${uniteConfiguration.cssPre.toLowerCase()}/`); try { - super.log(logger, display, "Generating App CSS in", { appSourceFolder: engineVariables.srcFolder }); + logger.info("Generating App CSS in", { appSourceFolder: engineVariables.srcFolder }); for (const cssFile of cssFiles) { - await this.copyFile(logger, display, fileSystem, + await this.copyFile(logger, fileSystem, scaffoldFolder, `${cssFile}.${engineVariables.styleLanguageExt}`, engineVariables.srcFolder, @@ -89,20 +85,19 @@ export abstract class SharedAppFramework extends EnginePipelineStepBase { return 0; } catch (err) { - super.error(logger, display, "Generating CSS HTML failed", err, { appSourceFolder: engineVariables.srcFolder }); + logger.error("Generating CSS HTML failed", err, { appSourceFolder: engineVariables.srcFolder }); return 1; } } protected async generateUnitTest(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, specs: string[]): Promise { if (uniteConfiguration.unitTestRunner !== "None") { try { - super.log(logger, display, "Generating unit test scaffold shared", { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); + logger.info("Generating unit test scaffold shared", { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); const unitTestsScaffold = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `appFramework/shared/test/unit/src/sourceLanguage/${uniteConfiguration.sourceLanguage.toLowerCase()}/` + @@ -112,20 +107,20 @@ export abstract class SharedAppFramework extends EnginePipelineStepBase { `appFramework/shared/test/unit/moduleType/${uniteConfiguration.moduleType.toLowerCase()}/`); for (const spec of specs) { - await this.copyFile(logger, display, fileSystem, unitTestsScaffold, + await this.copyFile(logger, fileSystem, unitTestsScaffold, `${spec}.spec.${engineVariables.sourceLanguageExt}`, engineVariables.unitTestSrcFolder, `${spec}.spec.${engineVariables.sourceLanguageExt}`); } - await this.copyFile(logger, display, fileSystem, unitTestsScaffoldModuleType, + await this.copyFile(logger, fileSystem, unitTestsScaffoldModuleType, "unit-bootstrap.js", engineVariables.unitTestFolder, "unit-bootstrap.js"); return 0; } catch (err) { - super.error(logger, display, "Generating application unit test failed", err, { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); + logger.error("Generating application unit test failed", err, { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); return 1; } } else { @@ -134,14 +129,13 @@ export abstract class SharedAppFramework extends EnginePipelineStepBase { } protected async generateE2eTest(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, specs: string[]): Promise { if (uniteConfiguration.e2eTestRunner !== "None") { try { - super.log(logger, display, "Generating e2e test scaffold shared", { unitTestSrcFolder: engineVariables.e2eTestSrcFolder }); + logger.info("Generating e2e test scaffold shared", { unitTestSrcFolder: engineVariables.e2eTestSrcFolder }); const e2eTestsScaffold = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `appFramework/${uniteConfiguration.applicationFramework.toLowerCase()}/test/e2e/src/e2eTestRunner/` + @@ -153,26 +147,26 @@ export abstract class SharedAppFramework extends EnginePipelineStepBase { `test/e2e/e2eTestRunner/${uniteConfiguration.e2eTestRunner.toLowerCase()}`); for (const spec of specs) { - await this.copyFile(logger, display, fileSystem, e2eTestsScaffold, + await this.copyFile(logger, fileSystem, e2eTestsScaffold, `${spec}.spec.${engineVariables.sourceLanguageExt}`, engineVariables.e2eTestSrcFolder, `${spec}.spec.${engineVariables.sourceLanguageExt}`); } - await this.copyFile(logger, display, fileSystem, e2eTestsScaffoldRunner, + await this.copyFile(logger, fileSystem, e2eTestsScaffoldRunner, "e2e-bootstrap.js", engineVariables.e2eTestFolder, "e2e-bootstrap.js"); if (uniteConfiguration.sourceLanguage === "TypeScript") { - await this.copyFile(logger, display, fileSystem, e2eTestsScaffoldRunner, + await this.copyFile(logger, fileSystem, e2eTestsScaffoldRunner, "e2e-bootstrap.d.ts", engineVariables.e2eTestFolder, "e2e-bootstrap.d.ts"); } return 0; } catch (err) { - super.error(logger, display, "Generating application e2e test failed", err, { unitTestSrcFolder: engineVariables.e2eTestSrcFolder }); + logger.error("Generating application e2e test failed", err, { unitTestSrcFolder: engineVariables.e2eTestSrcFolder }); return 1; } } else { @@ -180,19 +174,19 @@ export abstract class SharedAppFramework extends EnginePipelineStepBase { } } - protected async generateCss(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + protected async generateCss(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { try { - super.log(logger, display, "Generating application css scaffold shared"); + logger.info("Generating application css scaffold shared", { cssSrcFolder: engineVariables.cssSrcFolder }); const assetCssFolder = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `appFramework/shared/css/${uniteConfiguration.cssPre.toLowerCase()}`); - await super.copyFile(logger, display, fileSystem, assetCssFolder, `app.${engineVariables.styleLanguageExt}`, engineVariables.cssSrcFolder, `app.${engineVariables.styleLanguageExt}`); - await super.copyFile(logger, display, fileSystem, assetCssFolder, `main.${engineVariables.styleLanguageExt}`, engineVariables.cssSrcFolder, `main.${engineVariables.styleLanguageExt}`); - await super.copyFile(logger, display, fileSystem, assetCssFolder, `reset.${engineVariables.styleLanguageExt}`, engineVariables.cssSrcFolder, `reset.${engineVariables.styleLanguageExt}`); + await super.copyFile(logger, fileSystem, assetCssFolder, `app.${engineVariables.styleLanguageExt}`, engineVariables.cssSrcFolder, `app.${engineVariables.styleLanguageExt}`); + await super.copyFile(logger, fileSystem, assetCssFolder, `main.${engineVariables.styleLanguageExt}`, engineVariables.cssSrcFolder, `main.${engineVariables.styleLanguageExt}`); + await super.copyFile(logger, fileSystem, assetCssFolder, `reset.${engineVariables.styleLanguageExt}`, engineVariables.cssSrcFolder, `reset.${engineVariables.styleLanguageExt}`); return 0; } catch (err) { - super.error(logger, display, "Generating application css failed", err); + logger.error("Generating application css failed", err); return 1; } } diff --git a/src/pipelineSteps/bundler/browserify.ts b/src/pipelineSteps/bundler/browserify.ts index 7e0cc1b1..62c20738 100644 --- a/src/pipelineSteps/bundler/browserify.ts +++ b/src/pipelineSteps/bundler/browserify.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate configuration for browserify. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -10,20 +9,19 @@ import { EngineVariables } from "../../engine/engineVariables"; export class Browserify extends EnginePipelineStepBase { public async prerequisites(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { if (uniteConfiguration.bundler === "Browserify") { if (uniteConfiguration.moduleType !== "CommonJS") { - super.error(logger, display, "You can only use CommonJS modules with Browserify"); + logger.error("You can only use CommonJS modules with Browserify"); return 1; } } return 0; } - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["browserify"], uniteConfiguration.bundler === "Browserify"); return 0; diff --git a/src/pipelineSteps/bundler/requireJs.ts b/src/pipelineSteps/bundler/requireJs.ts index 96c36a63..af55b816 100644 --- a/src/pipelineSteps/bundler/requireJs.ts +++ b/src/pipelineSteps/bundler/requireJs.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate configuration for requirejs optimizer. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -10,20 +9,19 @@ import { EngineVariables } from "../../engine/engineVariables"; export class RequireJs extends EnginePipelineStepBase { public async prerequisites(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { if (uniteConfiguration.bundler === "RequireJS") { if (uniteConfiguration.moduleType !== "AMD") { - super.error(logger, display, "You can only use AMD modules with RequireJS"); + logger.error("You can only use AMD modules with RequireJS"); return 1; } } return 0; } - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["requirejs"], uniteConfiguration.bundler === "RequireJS"); return 0; diff --git a/src/pipelineSteps/bundler/systemJsBuilder.ts b/src/pipelineSteps/bundler/systemJsBuilder.ts index fc550940..5d379ee9 100644 --- a/src/pipelineSteps/bundler/systemJsBuilder.ts +++ b/src/pipelineSteps/bundler/systemJsBuilder.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate configuration for systemjs builder. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -10,20 +9,19 @@ import { EngineVariables } from "../../engine/engineVariables"; export class SystemJsBuilder extends EnginePipelineStepBase { public async prerequisites(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { if (uniteConfiguration.bundler === "SystemJSBuilder") { if (uniteConfiguration.moduleType !== "SystemJS") { - super.error(logger, display, "You can only use SystemJS modules with SystemJSBuilder"); + logger.error("You can only use SystemJS modules with SystemJSBuilder"); return 1; } } return 0; } - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["systemjs-builder"], uniteConfiguration.bundler === "SystemJSBuilder"); return 0; diff --git a/src/pipelineSteps/bundler/webpack.ts b/src/pipelineSteps/bundler/webpack.ts index b95cda7c..6f85f6b6 100644 --- a/src/pipelineSteps/bundler/webpack.ts +++ b/src/pipelineSteps/bundler/webpack.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate configuration for webpack. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -10,20 +9,19 @@ import { EngineVariables } from "../../engine/engineVariables"; export class Webpack extends EnginePipelineStepBase { public async prerequisites(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { if (uniteConfiguration.bundler === "Webpack") { if (uniteConfiguration.moduleType !== "CommonJS") { - super.error(logger, display, "You can only use CommonJS modules with Webpack"); + logger.error("You can only use CommonJS modules with Webpack"); return 1; } } return 0; } - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["webpack", "source-map-loader", "uglifyjs-webpack-plugin"], uniteConfiguration.bundler === "Webpack"); return 0; diff --git a/src/pipelineSteps/content/assetsSource.ts b/src/pipelineSteps/content/assetsSource.ts index 1b99ef31..76be730c 100644 --- a/src/pipelineSteps/content/assetsSource.ts +++ b/src/pipelineSteps/content/assetsSource.ts @@ -1,7 +1,6 @@ /** * Pipeline step to create asset sources. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -12,25 +11,25 @@ export class AssetsSource extends EnginePipelineStepBase { private static FILENAME: string = "logo-tile.svg"; private static FILENAME2: string = "logo-transparent.svg"; - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["unitejs-image-cli"], true); try { - super.log(logger, display, "Creating Directory", { assetsSourceFolder: engineVariables.assetsSourceFolder }); + logger.info("Creating Directory", { assetsSourceFolder: engineVariables.assetsSourceFolder }); await fileSystem.directoryCreate(engineVariables.assetsSourceFolder); } catch (err) { - super.error(logger, display, "Creating Assets Source folder failed", err); + logger.error("Creating Assets Source folder failed", err); return 1; } try { - super.log(logger, display, "Creating Directory", { assetsFolder: engineVariables.assetsFolder }); + logger.info("Creating Directory", { assetsFolder: engineVariables.assetsFolder }); await fileSystem.directoryCreate(engineVariables.assetsFolder); } catch (err) { - super.error(logger, display, "Creating Assets folder failed", err); + logger.error("Creating Assets folder failed", err); return 1; } @@ -38,12 +37,12 @@ export class AssetsSource extends EnginePipelineStepBase { const sourceThemeFolder = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, "assetsSource/theme/"); const destThemeFolder = fileSystem.pathCombine(engineVariables.assetsSourceFolder, "theme/"); - await super.copyFile(logger, display, fileSystem, sourceThemeFolder, AssetsSource.FILENAME, destThemeFolder, AssetsSource.FILENAME); - await super.copyFile(logger, display, fileSystem, sourceThemeFolder, AssetsSource.FILENAME2, destThemeFolder, AssetsSource.FILENAME2); + await super.copyFile(logger, fileSystem, sourceThemeFolder, AssetsSource.FILENAME, destThemeFolder, AssetsSource.FILENAME); + await super.copyFile(logger, fileSystem, sourceThemeFolder, AssetsSource.FILENAME2, destThemeFolder, AssetsSource.FILENAME2); return 0; } catch (err) { - super.error(logger, display, "Copy Assets failed", err); + logger.error("Copy Assets failed", err); return 1; } } diff --git a/src/pipelineSteps/content/gitIgnore.ts b/src/pipelineSteps/content/gitIgnore.ts index a8d009cc..5c156369 100644 --- a/src/pipelineSteps/content/gitIgnore.ts +++ b/src/pipelineSteps/content/gitIgnore.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate .gitignore. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -11,24 +10,24 @@ import { EngineVariables } from "../../engine/engineVariables"; export class GitIgnore extends EnginePipelineStepBase { private static FILENAME: string = ".gitignore"; - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { try { const hasGeneratedMarker = await super.fileHasGeneratedMarker(fileSystem, engineVariables.wwwFolder, GitIgnore.FILENAME); if (hasGeneratedMarker) { - super.log(logger, display, `Writing ${GitIgnore.FILENAME}`); + logger.info(`Generating ${GitIgnore.FILENAME}`, { wwwFolder: engineVariables.wwwFolder}); engineVariables.gitIgnore.push("node_modules"); engineVariables.gitIgnore.push(super.wrapGeneratedMarker("# ", "")); await fileSystem.fileWriteLines(engineVariables.wwwFolder, GitIgnore.FILENAME, engineVariables.gitIgnore); } else { - super.log(logger, display, `Skipping ${GitIgnore.FILENAME} as it has no generated marker`); + logger.info(`Skipping ${GitIgnore.FILENAME} as it has no generated marker`); } return 0; } catch (err) { - super.error(logger, display, `Writing ${GitIgnore.FILENAME} failed`, err); + logger.error(`Generating ${GitIgnore.FILENAME} failed`, err); return 1; } } diff --git a/src/pipelineSteps/content/htmlTemplate.ts b/src/pipelineSteps/content/htmlTemplate.ts index 3d5ce49e..aa029859 100644 --- a/src/pipelineSteps/content/htmlTemplate.ts +++ b/src/pipelineSteps/content/htmlTemplate.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate html template. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -13,18 +12,17 @@ export class HtmlTemplate extends EnginePipelineStepBase { private static FILENAME_NO_BUNDLE: string = "index-no-bundle.html"; private static FILENAME_BUNDLE: string = "index-bundle.html"; - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { - let ret = await this.createTemplate(logger, display, fileSystem, uniteConfiguration, engineVariables, HtmlTemplate.FILENAME_NO_BUNDLE, engineVariables.htmlNoBundle); + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + let ret = await this.createTemplate(logger, fileSystem, uniteConfiguration, engineVariables, HtmlTemplate.FILENAME_NO_BUNDLE, engineVariables.htmlNoBundle); if (ret === 0) { - ret = await this.createTemplate(logger, display, fileSystem, uniteConfiguration, engineVariables, HtmlTemplate.FILENAME_BUNDLE, engineVariables.htmlBundle); + ret = await this.createTemplate(logger, fileSystem, uniteConfiguration, engineVariables, HtmlTemplate.FILENAME_BUNDLE, engineVariables.htmlBundle); } return ret; } public async createTemplate(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables, @@ -34,7 +32,7 @@ export class HtmlTemplate extends EnginePipelineStepBase { const hasGeneratedMarker = await super.fileHasGeneratedMarker(fileSystem, engineVariables.wwwFolder, filename); if (hasGeneratedMarker) { - super.log(logger, display, `Generating ${filename}`, { wwwFolder: engineVariables.wwwFolder }); + logger.info(`Generating ${filename}`, { wwwFolder: engineVariables.wwwFolder }); const lines: string[] = []; let indent = 0; @@ -76,12 +74,12 @@ export class HtmlTemplate extends EnginePipelineStepBase { await fileSystem.fileWriteLines(engineVariables.wwwFolder, filename, lines); } else { - super.log(logger, display, `Skipping ${filename} as it has no generated marker`, { wwwFolder: engineVariables.wwwFolder }); + logger.info(`Skipping ${filename} as it has no generated marker`, { wwwFolder: engineVariables.wwwFolder }); } return 0; } catch (err) { - super.error(logger, display, `Generating ${filename} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Generating ${filename} failed`, err, { wwwFolder: engineVariables.wwwFolder }); return 1; } } diff --git a/src/pipelineSteps/content/license.ts b/src/pipelineSteps/content/license.ts index 157ea808..47bcaa83 100644 --- a/src/pipelineSteps/content/license.ts +++ b/src/pipelineSteps/content/license.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate LICENSE. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -11,15 +10,15 @@ import { EngineVariables } from "../../engine/engineVariables"; export class License extends EnginePipelineStepBase { private static FILENAME: string = "LICENSE"; - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { try { - super.log(logger, display, `Writing ${License.FILENAME}`); + logger.info(`Generating ${License.FILENAME}`, { wwwFolder: engineVariables.wwwFolder}); await fileSystem.fileWriteLines(engineVariables.wwwFolder, License.FILENAME, engineVariables.license.licenseText.split("\n")); return 0; } catch (err) { - super.error(logger, display, `Writing ${License.FILENAME} failed`, err); + logger.error(`Generating ${License.FILENAME} failed`, err); return 1; } } diff --git a/src/pipelineSteps/content/packageJson.ts b/src/pipelineSteps/content/packageJson.ts index 72109eb3..4ff15cf0 100644 --- a/src/pipelineSteps/content/packageJson.ts +++ b/src/pipelineSteps/content/packageJson.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate package.json. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { PackageConfiguration } from "../../configuration/models/packages/packageConfiguration"; @@ -12,23 +11,23 @@ import { EngineVariables } from "../../engine/engineVariables"; export class PackageJson extends EnginePipelineStepBase { private static FILENAME: string = "package.json"; - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { try { let existingPackageJson: PackageConfiguration | undefined; try { const exists = await fileSystem.fileExists(engineVariables.wwwFolder, PackageJson.FILENAME); if (exists) { - super.log(logger, display, `Loading existing ${PackageJson.FILENAME}`, { core: engineVariables.wwwFolder, dependenciesFile: PackageJson.FILENAME }); + logger.info(`Loading existing ${PackageJson.FILENAME}`, { core: engineVariables.wwwFolder, dependenciesFile: PackageJson.FILENAME }); existingPackageJson = await fileSystem.fileReadJson(engineVariables.wwwFolder, PackageJson.FILENAME); } } catch (err) { - super.error(logger, display, `Loading existing ${PackageJson.FILENAME} failed`, err, { core: engineVariables.wwwFolder, dependenciesFile: PackageJson.FILENAME }); + logger.error(`Loading existing ${PackageJson.FILENAME} failed`, err, { core: engineVariables.wwwFolder, dependenciesFile: PackageJson.FILENAME }); return 1; } - super.log(logger, display, `Generating ${PackageJson.FILENAME} in`, { wwwFolder: engineVariables.wwwFolder }); + logger.info(`Generating ${PackageJson.FILENAME} in`, { wwwFolder: engineVariables.wwwFolder }); const packageJson = existingPackageJson || new PackageConfiguration(); packageJson.name = uniteConfiguration.packageName; @@ -47,7 +46,7 @@ export class PackageJson extends EnginePipelineStepBase { await fileSystem.fileWriteJson(engineVariables.wwwFolder, PackageJson.FILENAME, packageJson); return 0; } catch (err) { - super.error(logger, display, `Generating ${PackageJson.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Generating ${PackageJson.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); return 1; } } diff --git a/src/pipelineSteps/content/readMe.ts b/src/pipelineSteps/content/readMe.ts index 5e53f778..f6900f33 100644 --- a/src/pipelineSteps/content/readMe.ts +++ b/src/pipelineSteps/content/readMe.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate README.md. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -11,12 +10,12 @@ import { EngineVariables } from "../../engine/engineVariables"; export class ReadMe extends EnginePipelineStepBase { private static FILENAME: string = "README.md"; - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { try { const hasGeneratedMarker = await super.fileHasGeneratedMarker(fileSystem, engineVariables.wwwFolder, ReadMe.FILENAME); if (hasGeneratedMarker) { - super.log(logger, display, `Writing ${ReadMe.FILENAME}`); + logger.info(`Generating ${ReadMe.FILENAME}`, { wwwFolder: engineVariables.wwwFolder}); const lines = await fileSystem.fileReadLines(engineVariables.packageAssetsDirectory, ReadMe.FILENAME); @@ -28,12 +27,12 @@ export class ReadMe extends EnginePipelineStepBase { await fileSystem.fileWriteLines(engineVariables.wwwFolder, ReadMe.FILENAME, lines); } else { - super.log(logger, display, `Skipping ${ReadMe.FILENAME} as it has no generated marker`); + logger.info(`Skipping ${ReadMe.FILENAME} as it has no generated marker`); } return 0; } catch (err) { - super.error(logger, display, `Writing ${ReadMe.FILENAME} failed`, err); + logger.error(`Generating ${ReadMe.FILENAME} failed`, err); return 1; } } diff --git a/src/pipelineSteps/cssPostProcessor/postCss.ts b/src/pipelineSteps/cssPostProcessor/postCss.ts index 2a4e0e16..725815ca 100644 --- a/src/pipelineSteps/cssPostProcessor/postCss.ts +++ b/src/pipelineSteps/cssPostProcessor/postCss.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate handle postCss styling. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { PostCssConfiguration } from "../../configuration/models/postcss/postCssConfiguration"; @@ -12,12 +11,12 @@ import { EngineVariables } from "../../engine/engineVariables"; export class PostCss extends EnginePipelineStepBase { private static FILENAME: string = ".postcssrc.json"; - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["postcss", "postcss-import", "autoprefixer", "cssnano"], uniteConfiguration.cssPost === "PostCss"); if (uniteConfiguration.cssPost === "PostCss") { try { - super.log(logger, display, `Generating ${PostCss.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); + logger.info(`Generating ${PostCss.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); let existing; @@ -29,7 +28,7 @@ export class PostCss extends EnginePipelineStepBase { } } catch (err) { - super.error(logger, display, `Loading existing ${PostCss.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Loading existing ${PostCss.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); return 1; } @@ -38,11 +37,11 @@ export class PostCss extends EnginePipelineStepBase { await fileSystem.fileWriteJson(engineVariables.wwwFolder, ".postcssrc.json", config); return 0; } catch (err) { - super.error(logger, display, `Generating ${PostCss.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Generating ${PostCss.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); return 1; } } else { - return await super.deleteFile(logger, display, fileSystem, engineVariables.wwwFolder, PostCss.FILENAME); + return await super.deleteFile(logger, fileSystem, engineVariables.wwwFolder, PostCss.FILENAME); } } diff --git a/src/pipelineSteps/cssPostProcessor/postCssNone.ts b/src/pipelineSteps/cssPostProcessor/postCssNone.ts index 5ccca7aa..75b7400e 100644 --- a/src/pipelineSteps/cssPostProcessor/postCssNone.ts +++ b/src/pipelineSteps/cssPostProcessor/postCssNone.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate handle none post css styling. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,7 +8,7 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class PostCssNone extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["cssnano", "gulp-cssnano"], uniteConfiguration.cssPost === "None"); return 0; diff --git a/src/pipelineSteps/cssPreProcessor/css.ts b/src/pipelineSteps/cssPreProcessor/css.ts index 02bd6a06..ecbbb289 100644 --- a/src/pipelineSteps/cssPreProcessor/css.ts +++ b/src/pipelineSteps/cssPreProcessor/css.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate handle css styling. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,12 +8,13 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class Css extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { if (uniteConfiguration.cssPre === "Css") { try { - super.log(logger, display, "Creating cssSrc folder", { cssSrcFolder: engineVariables.cssSrcFolder }); - engineVariables.cssSrcFolder = fileSystem.pathCombine(engineVariables.wwwFolder, "cssSrc"); + + logger.info("Creating cssSrc folder", { cssSrcFolder: engineVariables.cssSrcFolder }); + engineVariables.styleLanguageExt = "css"; await fileSystem.directoryCreate(engineVariables.cssSrcFolder); @@ -22,7 +22,7 @@ export class Css extends EnginePipelineStepBase { return 0; } catch (err) { - super.error(logger, display, "Generating css folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); + logger.error("Generating css folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); return 1; } } diff --git a/src/pipelineSteps/cssPreProcessor/less.ts b/src/pipelineSteps/cssPreProcessor/less.ts index 882d8253..fd079865 100644 --- a/src/pipelineSteps/cssPreProcessor/less.ts +++ b/src/pipelineSteps/cssPreProcessor/less.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate handle less styling. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,14 +8,15 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class Less extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["less"], uniteConfiguration.cssPre === "Less"); if (uniteConfiguration.cssPre === "Less") { try { - super.log(logger, display, "Creating Less folder", { cssSrcFolder: engineVariables.cssSrcFolder }); - engineVariables.cssSrcFolder = fileSystem.pathCombine(engineVariables.wwwFolder, "less"); + + logger.info("Creating Less folder", { cssSrcFolder: engineVariables.cssSrcFolder }); + engineVariables.styleLanguageExt = "less"; await fileSystem.directoryCreate(engineVariables.cssSrcFolder); @@ -24,7 +24,7 @@ export class Less extends EnginePipelineStepBase { return 0; } catch (err) { - super.error(logger, display, "Generating Less folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); + logger.error("Generating Less folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); return 1; } } diff --git a/src/pipelineSteps/cssPreProcessor/sass.ts b/src/pipelineSteps/cssPreProcessor/sass.ts index c669f1a4..5d818b69 100644 --- a/src/pipelineSteps/cssPreProcessor/sass.ts +++ b/src/pipelineSteps/cssPreProcessor/sass.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate handle sass styling. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,14 +8,15 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class Sass extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["node-sass"], uniteConfiguration.cssPre === "Sass"); if (uniteConfiguration.cssPre === "Sass") { try { - super.log(logger, display, "Creating Sass folder", { cssSrcFolder: engineVariables.cssSrcFolder }); - engineVariables.cssSrcFolder = fileSystem.pathCombine(engineVariables.wwwFolder, "sass"); + + logger.info("Creating Sass folder", { cssSrcFolder: engineVariables.cssSrcFolder }); + engineVariables.styleLanguageExt = "scss"; await fileSystem.directoryCreate(engineVariables.cssSrcFolder); @@ -24,7 +24,7 @@ export class Sass extends EnginePipelineStepBase { return 0; } catch (err) { - super.error(logger, display, "Generating Sass folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); + logger.error("Generating Sass folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); return 1; } } diff --git a/src/pipelineSteps/cssPreProcessor/stylus.ts b/src/pipelineSteps/cssPreProcessor/stylus.ts index da40ae8d..dd9de866 100644 --- a/src/pipelineSteps/cssPreProcessor/stylus.ts +++ b/src/pipelineSteps/cssPreProcessor/stylus.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate handle stylus styling. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,14 +8,15 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class Stylus extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["stylus"], uniteConfiguration.cssPre === "Stylus"); if (uniteConfiguration.cssPre === "Stylus") { try { - super.log(logger, display, "Creating Stylus folder", { cssSrcFolder: engineVariables.cssSrcFolder }); - engineVariables.cssSrcFolder = fileSystem.pathCombine(engineVariables.wwwFolder, "stylus"); + + logger.info("Creating Stylus folder", { cssSrcFolder: engineVariables.cssSrcFolder }); + engineVariables.styleLanguageExt = "styl"; await fileSystem.directoryCreate(engineVariables.cssSrcFolder); @@ -24,7 +24,7 @@ export class Stylus extends EnginePipelineStepBase { return 0; } catch (err) { - super.error(logger, display, "Generating Stylus folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); + logger.error("Generating Stylus folder failed", err, { cssSrcFolder: engineVariables.cssSrcFolder }); return 1; } } diff --git a/src/pipelineSteps/e2eTestRunner/protractor.ts b/src/pipelineSteps/e2eTestRunner/protractor.ts index ba561012..b57d7de0 100644 --- a/src/pipelineSteps/e2eTestRunner/protractor.ts +++ b/src/pipelineSteps/e2eTestRunner/protractor.ts @@ -2,7 +2,6 @@ * Pipeline step to generate Protractor configuration. */ import { JsonHelper } from "unitejs-framework/dist/helpers/jsonHelper"; -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { ProtractorConfiguration } from "../../configuration/models/protractor/protractorConfiguration"; @@ -13,7 +12,7 @@ import { EngineVariables } from "../../engine/engineVariables"; export class Protractor extends EnginePipelineStepBase { private static FILENAME: string = "protractor.conf.js"; - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["protractor", "browser-sync"], uniteConfiguration.e2eTestRunner === "Protractor"); engineVariables.toggleDevDependency(["protractor-jasmine2-html-reporter", "jasmine-spec-reporter"], uniteConfiguration.e2eTestRunner === "Protractor" && uniteConfiguration.e2eTestFramework === "Jasmine"); @@ -28,22 +27,22 @@ export class Protractor extends EnginePipelineStepBase { const hasGeneratedMarker = await super.fileHasGeneratedMarker(fileSystem, engineVariables.wwwFolder, Protractor.FILENAME); if (hasGeneratedMarker) { - super.log(logger, display, `Generating ${Protractor.FILENAME}`); + logger.info(`Generating ${Protractor.FILENAME}`, { wwwFolder: engineVariables.wwwFolder}); const lines: string[] = []; this.generateConfig(fileSystem, uniteConfiguration, engineVariables, lines); await fileSystem.fileWriteLines(engineVariables.wwwFolder, Protractor.FILENAME, lines); } else { - super.log(logger, display, `Skipping ${Protractor.FILENAME} as it has no generated marker`); + logger.info(`Skipping ${Protractor.FILENAME} as it has no generated marker`); } return 0; } catch (err) { - super.error(logger, display, `Generating ${Protractor.FILENAME} failed`, err); + logger.error(`Generating ${Protractor.FILENAME} failed`, err); return 1; } } else { - return await super.deleteFile(logger, display, fileSystem, engineVariables.wwwFolder, Protractor.FILENAME); + return await super.deleteFile(logger, fileSystem, engineVariables.wwwFolder, Protractor.FILENAME); } } diff --git a/src/pipelineSteps/e2eTestRunner/webdriverIo.ts b/src/pipelineSteps/e2eTestRunner/webdriverIo.ts index 13bd46f5..10a11054 100644 --- a/src/pipelineSteps/e2eTestRunner/webdriverIo.ts +++ b/src/pipelineSteps/e2eTestRunner/webdriverIo.ts @@ -2,7 +2,6 @@ * Pipeline step to generate WebdriverIO configuration. */ import { JsonHelper } from "unitejs-framework/dist/helpers/jsonHelper"; -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -13,7 +12,7 @@ import { EngineVariables } from "../../engine/engineVariables"; export class WebdriverIo extends EnginePipelineStepBase { private static FILENAME: string = "wdio.conf.js"; - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["webdriverio", "wdio-spec-reporter", "wdio-allure-reporter", @@ -36,22 +35,22 @@ export class WebdriverIo extends EnginePipelineStepBase { const hasGeneratedMarker = await super.fileHasGeneratedMarker(fileSystem, engineVariables.wwwFolder, WebdriverIo.FILENAME); if (hasGeneratedMarker) { - super.log(logger, display, `Generating ${WebdriverIo.FILENAME}`); + logger.info(`Generating ${WebdriverIo.FILENAME}`); const lines: string[] = []; this.generateConfig(fileSystem, uniteConfiguration, engineVariables, lines); await fileSystem.fileWriteLines(engineVariables.wwwFolder, WebdriverIo.FILENAME, lines); } else { - super.log(logger, display, `Skipping ${WebdriverIo.FILENAME} as it has no generated marker`); + logger.info(`Skipping ${WebdriverIo.FILENAME} as it has no generated marker`); } return 0; } catch (err) { - super.error(logger, display, `Generating ${WebdriverIo.FILENAME} failed`, err); + logger.error(`Generating ${WebdriverIo.FILENAME} failed`, err); return 1; } } else { - return await super.deleteFile(logger, display, fileSystem, engineVariables.wwwFolder, WebdriverIo.FILENAME); + return await super.deleteFile(logger, fileSystem, engineVariables.wwwFolder, WebdriverIo.FILENAME); } } diff --git a/src/pipelineSteps/language/babel.ts b/src/pipelineSteps/language/babel.ts index 00f5e55b..d0c0d2c0 100644 --- a/src/pipelineSteps/language/babel.ts +++ b/src/pipelineSteps/language/babel.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate babel configuration. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { BabelConfiguration } from "../../configuration/models/babel/babelConfiguration"; @@ -12,12 +11,12 @@ import { EngineVariables } from "../../engine/engineVariables"; export class Babel extends EnginePipelineStepBase { private static FILENAME: string = ".babelrc"; - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["babel-core", "babel-preset-es2015"], uniteConfiguration.sourceLanguage === "JavaScript"); if (uniteConfiguration.sourceLanguage === "JavaScript") { try { - super.log(logger, display, `Generating ${Babel.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); + logger.info(`Generating ${Babel.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); let existing; try { @@ -26,7 +25,7 @@ export class Babel extends EnginePipelineStepBase { existing = await fileSystem.fileReadJson(engineVariables.wwwFolder, Babel.FILENAME); } } catch (err) { - super.error(logger, display, `Reading existing ${Babel.FILENAME} failed`, err); + logger.error(`Reading existing ${Babel.FILENAME} failed`, err); return 1; } @@ -35,11 +34,11 @@ export class Babel extends EnginePipelineStepBase { return 0; } catch (err) { - super.error(logger, display, `Generating ${Babel.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Generating ${Babel.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); return 1; } } else { - return await super.deleteFile(logger, display, fileSystem, engineVariables.wwwFolder, Babel.FILENAME); + return await super.deleteFile(logger, fileSystem, engineVariables.wwwFolder, Babel.FILENAME); } } diff --git a/src/pipelineSteps/language/typeScript.ts b/src/pipelineSteps/language/typeScript.ts index 72636d52..038fc9c2 100644 --- a/src/pipelineSteps/language/typeScript.ts +++ b/src/pipelineSteps/language/typeScript.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate TypeScript configuration. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { TypeScriptCompilerOptions } from "../../configuration/models/typeScript/typeScriptCompilerOptions"; @@ -13,12 +12,12 @@ import { EngineVariables } from "../../engine/engineVariables"; export class TypeScript extends EnginePipelineStepBase { private static FILENAME: string = "tsconfig.json"; - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["typescript"], uniteConfiguration.sourceLanguage === "TypeScript"); if (uniteConfiguration.sourceLanguage === "TypeScript") { try { - super.log(logger, display, `Generating ${TypeScript.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); + logger.info(`Generating ${TypeScript.FILENAME}`, { wwwFolder: engineVariables.wwwFolder }); const typeScriptConfiguration = new TypeScriptConfiguration(); typeScriptConfiguration.compilerOptions = new TypeScriptCompilerOptions(); @@ -51,11 +50,11 @@ export class TypeScript extends EnginePipelineStepBase { return 0; } catch (err) { - super.error(logger, display, `Generating ${TypeScript.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Generating ${TypeScript.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); return 1; } } else { - return await super.deleteFile(logger, display, fileSystem, engineVariables.wwwFolder, TypeScript.FILENAME); + return await super.deleteFile(logger, fileSystem, engineVariables.wwwFolder, TypeScript.FILENAME); } } } diff --git a/src/pipelineSteps/lint/esLint.ts b/src/pipelineSteps/lint/esLint.ts index 02363194..7fc8bd3c 100644 --- a/src/pipelineSteps/lint/esLint.ts +++ b/src/pipelineSteps/lint/esLint.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate eslint configuration. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { EsLintConfiguration } from "../../configuration/models/eslint/esLintConfiguration"; @@ -15,25 +14,24 @@ export class EsLint extends EnginePipelineStepBase { private static FILENAME2: string = ".eslintignore"; public async prerequisites(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { if (uniteConfiguration.linter === "ESLint") { if (uniteConfiguration.sourceLanguage !== "JavaScript") { - super.error(logger, display, "You can only use ESLint when the source language is JavaScript"); + logger.error("You can only use ESLint when the source language is JavaScript"); return 1; } } return 0; } - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["eslint"], uniteConfiguration.linter === "ESLint"); if (uniteConfiguration.linter === "ESLint") { try { - super.log(logger, display, `Generating ${EsLint.FILENAME}`); + logger.info(`Generating ${EsLint.FILENAME}`, { wwwFolder: engineVariables.wwwFolder}); let existing; try { @@ -42,21 +40,21 @@ export class EsLint extends EnginePipelineStepBase { existing = await fileSystem.fileReadJson(engineVariables.wwwFolder, EsLint.FILENAME); } } catch (err) { - super.error(logger, display, `Reading existing ${EsLint.FILENAME} failed`, err); + logger.error(`Reading existing ${EsLint.FILENAME} failed`, err); return 1; } const config = this.generateConfig(fileSystem, uniteConfiguration, engineVariables, existing); await fileSystem.fileWriteJson(engineVariables.wwwFolder, EsLint.FILENAME, config); } catch (err) { - super.error(logger, display, `Generating ${EsLint.FILENAME} failed`, err); + logger.error(`Generating ${EsLint.FILENAME} failed`, err); return 1; } try { const hasGeneratedMarker = await super.fileHasGeneratedMarker(fileSystem, engineVariables.wwwFolder, EsLint.FILENAME2); if (hasGeneratedMarker) { - super.log(logger, display, `Generating ${EsLint.FILENAME2} Configuration`); + logger.info(`Generating ${EsLint.FILENAME2} Configuration`, { wwwFolder: engineVariables.wwwFolder}); const lines: string[] = []; @@ -68,18 +66,18 @@ export class EsLint extends EnginePipelineStepBase { await fileSystem.fileWriteLines(engineVariables.wwwFolder, EsLint.FILENAME2, lines); } else { - super.log(logger, display, `Skipping ${EsLint.FILENAME2} as it has no generated marker`); + logger.info(`Skipping ${EsLint.FILENAME2} as it has no generated marker`); } return 0; } catch (err) { - super.error(logger, display, `Generating ${EsLint.FILENAME2} failed`, err); + logger.error(`Generating ${EsLint.FILENAME2} failed`, err); return 1; } } else { - let ret = await super.deleteFile(logger, display, fileSystem, engineVariables.wwwFolder, EsLint.FILENAME); + let ret = await super.deleteFile(logger, fileSystem, engineVariables.wwwFolder, EsLint.FILENAME); if (ret === 0) { - ret = await super.deleteFile(logger, display, fileSystem, engineVariables.wwwFolder, EsLint.FILENAME2); + ret = await super.deleteFile(logger, fileSystem, engineVariables.wwwFolder, EsLint.FILENAME2); } return ret; diff --git a/src/pipelineSteps/lint/tsLint.ts b/src/pipelineSteps/lint/tsLint.ts index a949da5b..8248d707 100644 --- a/src/pipelineSteps/lint/tsLint.ts +++ b/src/pipelineSteps/lint/tsLint.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate tslint configuration. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { TsLintConfiguration } from "../../configuration/models/tslint/tsLintConfiguration"; @@ -13,25 +12,24 @@ export class TsLint extends EnginePipelineStepBase { private static FILENAME: string = "tslint.json"; public async prerequisites(logger: ILogger, - display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { if (uniteConfiguration.linter === "TSLint") { if (uniteConfiguration.sourceLanguage !== "TypeScript") { - super.error(logger, display, "You can only use TSLint when the source language is TypeScript"); + logger.error("You can only use TSLint when the source language is TypeScript"); return 1; } } return 0; } - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["tslint"], uniteConfiguration.linter === "TSLint"); if (uniteConfiguration.linter === "TSLint") { try { - super.log(logger, display, `Generating ${TsLint.FILENAME}`); + logger.info(`Generating ${TsLint.FILENAME}`); let existing; try { @@ -40,7 +38,7 @@ export class TsLint extends EnginePipelineStepBase { existing = await fileSystem.fileReadJson(engineVariables.wwwFolder, TsLint.FILENAME); } } catch (err) { - super.error(logger, display, `Reading existing ${TsLint.FILENAME} failed`, err); + logger.error(`Reading existing ${TsLint.FILENAME} failed`, err); return 1; } @@ -49,11 +47,11 @@ export class TsLint extends EnginePipelineStepBase { return 0; } catch (err) { - super.error(logger, display, `Generating ${TsLint.FILENAME} failed`, err); + logger.error(`Generating ${TsLint.FILENAME} failed`, err); return 1; } } else { - return await super.deleteFile(logger, display, fileSystem, engineVariables.wwwFolder, TsLint.FILENAME); + return await super.deleteFile(logger, fileSystem, engineVariables.wwwFolder, TsLint.FILENAME); } } diff --git a/src/pipelineSteps/moduleType/amd.ts b/src/pipelineSteps/moduleType/amd.ts index 9668daae..f5bf4bf5 100644 --- a/src/pipelineSteps/moduleType/amd.ts +++ b/src/pipelineSteps/moduleType/amd.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate configuration for amd modules. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,7 +8,7 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class Amd extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleClientPackage( "requirejs", "require.js", @@ -30,7 +29,7 @@ export class Amd extends EnginePipelineStepBase { if (uniteConfiguration.moduleType === "AMD") { try { - super.log(logger, display, "Generating Module Loader Scaffold", {}); + logger.info("Generating Module Loader Scaffold", {}); engineVariables.htmlNoBundle.scriptIncludes.push("requirejs/require.js"); @@ -51,7 +50,7 @@ export class Amd extends EnginePipelineStepBase { return 0; } catch (err) { - super.error(logger, display, "Generating Module Loader Scaffold failed", err); + logger.error("Generating Module Loader Scaffold failed", err); return 1; } } diff --git a/src/pipelineSteps/moduleType/commonJs.ts b/src/pipelineSteps/moduleType/commonJs.ts index bc5362e7..6a3121d7 100644 --- a/src/pipelineSteps/moduleType/commonJs.ts +++ b/src/pipelineSteps/moduleType/commonJs.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate configuration for commonjs. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,7 +8,7 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class CommonJs extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { // We use SystemJS to load cjs modules for the unbundled version of the project and unit testing engineVariables.toggleClientPackage( "systemjs", @@ -22,7 +21,7 @@ export class CommonJs extends EnginePipelineStepBase { if (uniteConfiguration.moduleType === "CommonJS") { try { - super.log(logger, display, "Generating Module Loader Scaffold", { }); + logger.info("Generating Module Loader Scaffold"); engineVariables.htmlNoBundle.scriptIncludes.push("systemjs/dist/system.js"); @@ -44,7 +43,7 @@ export class CommonJs extends EnginePipelineStepBase { return 0; } catch (err) { - super.error(logger, display, "Generating Module Loader Scaffold failed", err); + logger.error("Generating Module Loader Scaffold failed", err); return 1; } } diff --git a/src/pipelineSteps/moduleType/systemJs.ts b/src/pipelineSteps/moduleType/systemJs.ts index 13c99e33..92f95ef5 100644 --- a/src/pipelineSteps/moduleType/systemJs.ts +++ b/src/pipelineSteps/moduleType/systemJs.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate configuration for systemjs. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,7 +8,7 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class SystemJs extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleClientPackage( "systemjs", "dist/system.src.js", @@ -30,7 +29,7 @@ export class SystemJs extends EnginePipelineStepBase { if (uniteConfiguration.moduleType === "SystemJS") { try { - super.log(logger, display, "Generating Module Loader Scaffold", { }); + logger.info("Generating Module Loader Scaffold"); engineVariables.htmlNoBundle.scriptIncludes.push("systemjs/dist/system.js"); @@ -52,7 +51,7 @@ export class SystemJs extends EnginePipelineStepBase { return 0; } catch (err) { - super.error(logger, display, "Generating Module Loader Scaffold failed", err); + logger.error("Generating Module Loader Scaffold failed", err); return 1; } } diff --git a/src/pipelineSteps/scaffold/appScaffold.ts b/src/pipelineSteps/scaffold/appScaffold.ts index 0ae9a2dc..ceea2d13 100644 --- a/src/pipelineSteps/scaffold/appScaffold.ts +++ b/src/pipelineSteps/scaffold/appScaffold.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate scaffolding for app. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,13 +8,13 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class AppScaffold extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { try { - super.log(logger, display, "Creating App Source Directory", { appSourceFolder: engineVariables.srcFolder }); + logger.info("Creating App Source Directory", { appSourceFolder: engineVariables.srcFolder }); await fileSystem.directoryCreate(engineVariables.srcFolder); return 0; } catch (err) { - super.error(logger, display, "Creating App Source Directory failed", err, { appSourceFolder: engineVariables.srcFolder }); + logger.error("Creating App Source Directory failed", err, { appSourceFolder: engineVariables.srcFolder }); return 1; } } diff --git a/src/pipelineSteps/scaffold/e2eTestScaffold.ts b/src/pipelineSteps/scaffold/e2eTestScaffold.ts index 4c0430e6..a9bc2f33 100644 --- a/src/pipelineSteps/scaffold/e2eTestScaffold.ts +++ b/src/pipelineSteps/scaffold/e2eTestScaffold.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate scaffolding for e2e tests. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,14 +8,14 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class E2eTestScaffold extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { if (uniteConfiguration.e2eTestRunner !== "None") { try { - super.log(logger, display, "Creating E2E Test Directory", { e2eTestSrcFolder: engineVariables.e2eTestSrcFolder }); + logger.info("Creating E2E Test Directory", { e2eTestSrcFolder: engineVariables.e2eTestSrcFolder }); await fileSystem.directoryCreate(engineVariables.e2eTestSrcFolder); return 0; } catch (err) { - super.error(logger, display, "Creating E2E Test Directory failed", err, { e2eTestSrcFolder: engineVariables.e2eTestSrcFolder }); + logger.error("Creating E2E Test Directory failed", err, { e2eTestSrcFolder: engineVariables.e2eTestSrcFolder }); return 1; } } diff --git a/src/pipelineSteps/scaffold/outputDirectory.ts b/src/pipelineSteps/scaffold/outputDirectory.ts index 38872b2e..5f3eb470 100644 --- a/src/pipelineSteps/scaffold/outputDirectory.ts +++ b/src/pipelineSteps/scaffold/outputDirectory.ts @@ -1,7 +1,6 @@ /** * Pipeline step to create output directory. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,21 +8,21 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class OutputDirectory extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { try { - super.log(logger, display, "Creating Root Directory", { rootFolder: engineVariables.rootFolder }); + logger.info("Creating Root Directory", { rootFolder: engineVariables.rootFolder }); await fileSystem.directoryCreate(engineVariables.rootFolder); } catch (err) { - super.error(logger, display, "Creating Root Directory failed", err, { wwwFolder: engineVariables.rootFolder }); + logger.error("Creating Root Directory failed", err, { wwwFolder: engineVariables.rootFolder }); return 1; } try { - super.log(logger, display, "Creating WWW Directory", { wwwFolder: engineVariables.wwwFolder }); + logger.info("Creating WWW Directory", { wwwFolder: engineVariables.wwwFolder }); await fileSystem.directoryCreate(engineVariables.wwwFolder); return 0; } catch (err) { - super.error(logger, display, "Creating WWW Directory failed", err, { wwwFolder: engineVariables.wwwFolder }); + logger.error("Creating WWW Directory failed", err, { wwwFolder: engineVariables.wwwFolder }); return 1; } } diff --git a/src/pipelineSteps/scaffold/unitTestScaffold.ts b/src/pipelineSteps/scaffold/unitTestScaffold.ts index c11eed3e..39fd1cfa 100644 --- a/src/pipelineSteps/scaffold/unitTestScaffold.ts +++ b/src/pipelineSteps/scaffold/unitTestScaffold.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate scaffolding for unit tests. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,13 +8,13 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class UnitTestScaffold extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { if (uniteConfiguration.unitTestRunner !== "None") { try { - super.log(logger, display, "Creating Unit Test Directory", { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); + logger.info("Creating Unit Test Directory", { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); await fileSystem.directoryCreate(engineVariables.unitTestSrcFolder); } catch (err) { - super.error(logger, display, "Creating Unit Test Directory failed", err, { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); + logger.error("Creating Unit Test Directory failed", err, { unitTestSrcFolder: engineVariables.unitTestSrcFolder }); return 1; } } diff --git a/src/pipelineSteps/scaffold/uniteConfigurationDirectories.ts b/src/pipelineSteps/scaffold/uniteConfigurationDirectories.ts index d199447f..b0b7080e 100644 --- a/src/pipelineSteps/scaffold/uniteConfigurationDirectories.ts +++ b/src/pipelineSteps/scaffold/uniteConfigurationDirectories.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate unite.json. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -10,9 +9,9 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class UniteConfigurationDirectories extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { try { - super.log(logger, display, "Generating directories configuration", { wwwFolder: engineVariables.wwwFolder }); + logger.info("Generating directories configuration", { wwwFolder: engineVariables.wwwFolder }); uniteConfiguration.directories = new UniteDirectories(); uniteConfiguration.directories.src = fileSystem.pathToWeb(fileSystem.pathDirectoryRelative(engineVariables.wwwFolder, engineVariables.srcFolder)); @@ -39,7 +38,7 @@ export class UniteConfigurationDirectories extends EnginePipelineStepBase { uniteConfiguration.directories.assetsSource = fileSystem.pathToWeb(fileSystem.pathDirectoryRelative(engineVariables.wwwFolder, engineVariables.assetsSourceFolder)); return 0; } catch (err) { - super.error(logger, display, "Generating directories configuration failed", err, { wwwFolder: engineVariables.wwwFolder }); + logger.error("Generating directories configuration failed", err, { wwwFolder: engineVariables.wwwFolder }); return 1; } } diff --git a/src/pipelineSteps/scaffold/uniteConfigurationJson.ts b/src/pipelineSteps/scaffold/uniteConfigurationJson.ts index 83815a64..2b4bc77e 100644 --- a/src/pipelineSteps/scaffold/uniteConfigurationJson.ts +++ b/src/pipelineSteps/scaffold/uniteConfigurationJson.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate unite.json. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -11,14 +10,14 @@ import { EngineVariables } from "../../engine/engineVariables"; export class UniteConfigurationJson extends EnginePipelineStepBase { private static FILENAME: string = "unite.json"; - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { try { - super.log(logger, display, `Generating ${UniteConfigurationJson.FILENAME} in`, { wwwFolder: engineVariables.wwwFolder }); + logger.info(`Generating ${UniteConfigurationJson.FILENAME} in`, { rootFolder: engineVariables.rootFolder }); - await fileSystem.fileWriteJson(engineVariables.wwwFolder, UniteConfigurationJson.FILENAME, uniteConfiguration); + await fileSystem.fileWriteJson(engineVariables.rootFolder, UniteConfigurationJson.FILENAME, uniteConfiguration); return 0; } catch (err) { - super.error(logger, display, `Generating ${UniteConfigurationJson.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Generating ${UniteConfigurationJson.FILENAME} failed`, err, { rootFolder: engineVariables.rootFolder }); return 1; } } diff --git a/src/pipelineSteps/scaffold/uniteThemeConfigurationJson.ts b/src/pipelineSteps/scaffold/uniteThemeConfigurationJson.ts index c0851770..d88c9da9 100644 --- a/src/pipelineSteps/scaffold/uniteThemeConfigurationJson.ts +++ b/src/pipelineSteps/scaffold/uniteThemeConfigurationJson.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate unite-theme.json. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -12,9 +11,9 @@ import { EngineVariables } from "../../engine/engineVariables"; export class UniteThemeConfigurationJson extends EnginePipelineStepBase { private static FILENAME: string = "unite-theme.json"; - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { try { - super.log(logger, display, `Generating ${UniteThemeConfigurationJson.FILENAME}`); + logger.info(`Generating ${UniteThemeConfigurationJson.FILENAME}`, { wwwFolder: engineVariables.wwwFolder}); const sourceThemeFolder = fileSystem.pathCombine(engineVariables.assetsSourceFolder, "theme/"); @@ -25,7 +24,7 @@ export class UniteThemeConfigurationJson extends EnginePipelineStepBase { existing = await fileSystem.fileReadJson(sourceThemeFolder, UniteThemeConfigurationJson.FILENAME); } } catch (err) { - super.error(logger, display, `Reading existing ${UniteThemeConfigurationJson.FILENAME} failed`, err); + logger.error(`Reading existing ${UniteThemeConfigurationJson.FILENAME} failed`, err); return 1; } @@ -34,7 +33,7 @@ export class UniteThemeConfigurationJson extends EnginePipelineStepBase { return 0; } catch (err) { - super.error(logger, display, `Generating ${UniteThemeConfigurationJson.FILENAME} failed`, err); + logger.error(`Generating ${UniteThemeConfigurationJson.FILENAME} failed`, err); return 1; } } diff --git a/src/pipelineSteps/server/browserSync.ts b/src/pipelineSteps/server/browserSync.ts index 0816eb65..eba66697 100644 --- a/src/pipelineSteps/server/browserSync.ts +++ b/src/pipelineSteps/server/browserSync.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate browsersync configuration. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,16 +8,16 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class BrowserSync extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["browser-sync"], uniteConfiguration.server === "BrowserSync"); if (uniteConfiguration.server === "BrowserSync") { try { - super.log(logger, display, "Generating BrowserSync Configuration"); + logger.info("Generating BrowserSync Configuration", { wwwFolder: engineVariables.wwwFolder}); return 0; } catch (err) { - super.error(logger, display, "Generating BrowserSync configuration failed", err); + logger.error("Generating BrowserSync configuration failed", err); return 1; } } diff --git a/src/pipelineSteps/taskManager/gulp.ts b/src/pipelineSteps/taskManager/gulp.ts index 13497bcd..52d1684b 100644 --- a/src/pipelineSteps/taskManager/gulp.ts +++ b/src/pipelineSteps/taskManager/gulp.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate configuration for gulp. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -11,7 +10,7 @@ import { EngineVariables } from "../../engine/engineVariables"; export class Gulp extends EnginePipelineStepBase { private static FILENAME: string = "gulpfile.js"; - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["gulp", "bluebird", "require-dir", @@ -28,7 +27,7 @@ export class Gulp extends EnginePipelineStepBase { const hasGeneratedMarker = await super.fileHasGeneratedMarker(fileSystem, engineVariables.wwwFolder, Gulp.FILENAME); if (hasGeneratedMarker) { - super.log(logger, display, `Generating ${Gulp.FILENAME} in`, { wwwFolder: engineVariables.wwwFolder }); + logger.info(`Generating ${Gulp.FILENAME} in`, { wwwFolder: engineVariables.wwwFolder }); const lines: string[] = []; lines.push("require('require-dir')('build/tasks');"); @@ -36,68 +35,68 @@ export class Gulp extends EnginePipelineStepBase { await fileSystem.fileWriteLines(engineVariables.wwwFolder, Gulp.FILENAME, lines); } else { - super.log(logger, display, `Skipping ${Gulp.FILENAME} at it has no generated marker`); + logger.info(`Skipping ${Gulp.FILENAME} at it has no generated marker`); } } catch (err) { - super.error(logger, display, `Generating ${Gulp.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); + logger.error(`Generating ${Gulp.FILENAME} failed`, err, { wwwFolder: engineVariables.wwwFolder }); return 1; } try { - super.log(logger, display, "Creating Gulp Build Directory", { gulpBuildFolder: engineVariables.gulpBuildFolder }); + logger.info("Creating Gulp Build Directory", { gulpBuildFolder: engineVariables.gulpBuildFolder }); await fileSystem.directoryCreate(engineVariables.gulpBuildFolder); } catch (err) { - super.error(logger, display, "Creating Gulp Build Directory failed", err, { gulpBuildFolder: engineVariables.gulpBuildFolder }); + logger.error("Creating Gulp Build Directory failed", err, { gulpBuildFolder: engineVariables.gulpBuildFolder }); return 1; } engineVariables.gulpTasksFolder = fileSystem.pathCombine(engineVariables.gulpBuildFolder, "tasks"); try { - super.log(logger, display, "Creating Gulp Tasks Directory", { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.info("Creating Gulp Tasks Directory", { gulpTasksFolder: engineVariables.gulpTasksFolder }); await fileSystem.directoryCreate(engineVariables.gulpTasksFolder); } catch (err) { - super.error(logger, display, "Creating Gulp Tasks Directory failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.error("Creating Gulp Tasks Directory failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); return 1; } engineVariables.gulpUtilFolder = fileSystem.pathCombine(engineVariables.gulpTasksFolder, "util"); try { - super.log(logger, display, "Creating Gulp Util Directory", { gulpUtilFolder: engineVariables.gulpUtilFolder }); + logger.info("Creating Gulp Util Directory", { gulpUtilFolder: engineVariables.gulpUtilFolder }); await fileSystem.directoryCreate(engineVariables.gulpUtilFolder); } catch (err) { - super.error(logger, display, "Creating Gulp Util Directory failed", err, { gulpUtilFolder: engineVariables.gulpUtilFolder }); + logger.error("Creating Gulp Util Directory failed", err, { gulpUtilFolder: engineVariables.gulpUtilFolder }); return 1; } } else { try { - super.log(logger, display, "Deleting Gulp Build Directory", { gulpBuildFolder: engineVariables.gulpBuildFolder }); + logger.info("Deleting Gulp Build Directory", { gulpBuildFolder: engineVariables.gulpBuildFolder }); const exists = await fileSystem.directoryExists(engineVariables.wwwFolder); if (exists) { await fileSystem.directoryDelete(engineVariables.gulpBuildFolder); } } catch (err) { - super.error(logger, display, "Deleting Gulp Build Directory failed", err, { gulpBuildFolder: engineVariables.gulpBuildFolder }); + logger.error("Deleting Gulp Build Directory failed", err, { gulpBuildFolder: engineVariables.gulpBuildFolder }); return 1; } - const ret2 = await super.deleteFile(logger, display, fileSystem, engineVariables.wwwFolder, Gulp.FILENAME); + const ret2 = await super.deleteFile(logger, fileSystem, engineVariables.wwwFolder, Gulp.FILENAME); if (ret2 !== 0) { return ret2; } } - let ret = await this.generateBuildTasks(logger, display, fileSystem, uniteConfiguration, engineVariables); + let ret = await this.generateBuildTasks(logger, fileSystem, uniteConfiguration, engineVariables); if (ret === 0) { - ret = await this.generateUnitTasks(logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = await this.generateUnitTasks(logger, fileSystem, uniteConfiguration, engineVariables); if (ret === 0) { - ret = await this.generateE2eTasks(logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = await this.generateE2eTasks(logger, fileSystem, uniteConfiguration, engineVariables); if (ret === 0) { - ret = await this.generateServeTasks(logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = await this.generateServeTasks(logger, fileSystem, uniteConfiguration, engineVariables); if (ret === 0) { - ret = await this.generateThemeTasks(logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = await this.generateThemeTasks(logger, fileSystem, uniteConfiguration, engineVariables); if (ret === 0) { - ret = await this.generateUtils(logger, display, fileSystem, uniteConfiguration, engineVariables); + ret = await this.generateUtils(logger, fileSystem, uniteConfiguration, engineVariables); } } } @@ -106,7 +105,7 @@ export class Gulp extends EnginePipelineStepBase { return ret; } - public async generateBuildTasks(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async generateBuildTasks(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["del", "delete-empty", "run-sequence", "gulp-sourcemaps", "gulp-concat", "gulp-insert", "gulp-htmlmin", "html-minifier", "node-glob"], uniteConfiguration.taskManager === "Gulp"); engineVariables.toggleDevDependency(["gulp-babel"], uniteConfiguration.taskManager === "Gulp" && uniteConfiguration.sourceLanguage === "JavaScript"); @@ -122,7 +121,7 @@ export class Gulp extends EnginePipelineStepBase { if (uniteConfiguration.taskManager === "Gulp") { try { - super.log(logger, display, "Generating gulp tasks for build in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.info("Generating gulp tasks for build in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); const assetTasks = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, "gulp/tasks/"); const assetTasksLanguage = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/sourceLanguage/${uniteConfiguration.sourceLanguage.toLowerCase()}/`); @@ -131,20 +130,20 @@ export class Gulp extends EnginePipelineStepBase { const assetTasksCssPre = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/cssPre/${uniteConfiguration.cssPre.toLowerCase()}/`); const assetTasksCssPost = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/cssPost/${uniteConfiguration.cssPost.toLowerCase()}/`); - await this.copyFile(logger, display, fileSystem, assetTasksLanguage, "build-transpile.js", engineVariables.gulpTasksFolder, "build-transpile.js"); - await this.copyFile(logger, display, fileSystem, assetTasksBundler, "build-bundle-app.js", engineVariables.gulpTasksFolder, "build-bundle-app.js"); - await this.copyFile(logger, display, fileSystem, assetTasksBundler, "build-bundle-vendor.js", engineVariables.gulpTasksFolder, "build-bundle-vendor.js"); - await this.copyFile(logger, display, fileSystem, assetTasksLinter, "build-lint.js", engineVariables.gulpTasksFolder, "build-lint.js"); - await this.copyFile(logger, display, fileSystem, assetTasksCssPre, "build-css-app.js", engineVariables.gulpTasksFolder, "build-css-app.js"); - await this.copyFile(logger, display, fileSystem, assetTasksCssPre, "build-css-components.js", engineVariables.gulpTasksFolder, "build-css-components.js"); - await this.copyFile(logger, display, fileSystem, assetTasksCssPost, "build-css-post-app.js", engineVariables.gulpTasksFolder, "build-css-post-app.js"); - await this.copyFile(logger, display, fileSystem, assetTasksCssPost, "build-css-post-components.js", engineVariables.gulpTasksFolder, "build-css-post-components.js"); + await this.copyFile(logger, fileSystem, assetTasksLanguage, "build-transpile.js", engineVariables.gulpTasksFolder, "build-transpile.js"); + await this.copyFile(logger, fileSystem, assetTasksBundler, "build-bundle-app.js", engineVariables.gulpTasksFolder, "build-bundle-app.js"); + await this.copyFile(logger, fileSystem, assetTasksBundler, "build-bundle-vendor.js", engineVariables.gulpTasksFolder, "build-bundle-vendor.js"); + await this.copyFile(logger, fileSystem, assetTasksLinter, "build-lint.js", engineVariables.gulpTasksFolder, "build-lint.js"); + await this.copyFile(logger, fileSystem, assetTasksCssPre, "build-css-app.js", engineVariables.gulpTasksFolder, "build-css-app.js"); + await this.copyFile(logger, fileSystem, assetTasksCssPre, "build-css-components.js", engineVariables.gulpTasksFolder, "build-css-components.js"); + await this.copyFile(logger, fileSystem, assetTasksCssPost, "build-css-post-app.js", engineVariables.gulpTasksFolder, "build-css-post-app.js"); + await this.copyFile(logger, fileSystem, assetTasksCssPost, "build-css-post-components.js", engineVariables.gulpTasksFolder, "build-css-post-components.js"); - await this.copyFile(logger, display, fileSystem, assetTasks, "build.js", engineVariables.gulpTasksFolder, "build.js"); + await this.copyFile(logger, fileSystem, assetTasks, "build.js", engineVariables.gulpTasksFolder, "build.js"); return 0; } catch (err) { - super.error(logger, display, "Generating gulp tasks for build failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.error("Generating gulp tasks for build failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); return 1; } } @@ -152,12 +151,12 @@ export class Gulp extends EnginePipelineStepBase { return 0; } - private async generateUnitTasks(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + private async generateUnitTasks(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["gulp-karma-runner"], uniteConfiguration.taskManager === "Gulp" && uniteConfiguration.unitTestRunner === "Karma"); if (uniteConfiguration.taskManager === "Gulp" && uniteConfiguration.unitTestRunner !== "None") { try { - super.log(logger, display, "Generating gulp tasks for unit in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.info("Generating gulp tasks for unit in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); const assetUnitTest = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, "gulp/tasks/"); @@ -170,14 +169,14 @@ export class Gulp extends EnginePipelineStepBase { const assetUnitTestRunner = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/unitTestRunner/${uniteConfiguration.unitTestRunner.toLowerCase()}/`); - await this.copyFile(logger, display, fileSystem, assetUnitTest, "unit.js", engineVariables.gulpTasksFolder, "unit.js"); - await this.copyFile(logger, display, fileSystem, assetUnitTestLanguage, "unit-transpile.js", engineVariables.gulpTasksFolder, "unit-transpile.js"); - await this.copyFile(logger, display, fileSystem, assetLinter, "unit-lint.js", engineVariables.gulpTasksFolder, "unit-lint.js"); - await this.copyFile(logger, display, fileSystem, assetUnitTestRunner, "unit-runner.js", engineVariables.gulpTasksFolder, "unit-runner.js"); + await this.copyFile(logger, fileSystem, assetUnitTest, "unit.js", engineVariables.gulpTasksFolder, "unit.js"); + await this.copyFile(logger, fileSystem, assetUnitTestLanguage, "unit-transpile.js", engineVariables.gulpTasksFolder, "unit-transpile.js"); + await this.copyFile(logger, fileSystem, assetLinter, "unit-lint.js", engineVariables.gulpTasksFolder, "unit-lint.js"); + await this.copyFile(logger, fileSystem, assetUnitTestRunner, "unit-runner.js", engineVariables.gulpTasksFolder, "unit-runner.js"); return 0; } catch (err) { - super.error(logger, display, "Generating gulp tasks for unit failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.error("Generating gulp tasks for unit failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); return 1; } } @@ -185,13 +184,13 @@ export class Gulp extends EnginePipelineStepBase { return 0; } - private async generateE2eTasks(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + private async generateE2eTasks(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["gulp-webdriver", "browser-sync"], uniteConfiguration.taskManager === "Gulp" && uniteConfiguration.e2eTestRunner === "WebdriverIO"); engineVariables.toggleDevDependency(["browser-sync"], uniteConfiguration.taskManager === "Gulp" && uniteConfiguration.e2eTestRunner === "Protractor"); if (uniteConfiguration.taskManager === "Gulp" && uniteConfiguration.e2eTestRunner !== "None") { try { - super.log(logger, display, "Generating gulp tasks for e2e in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.info("Generating gulp tasks for e2e in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); const assetE2eTest = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, "gulp/tasks/"); @@ -204,15 +203,15 @@ export class Gulp extends EnginePipelineStepBase { const assetE2eTestRunner = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/e2eTestRunner/${uniteConfiguration.e2eTestRunner.toLowerCase()}/`); - await this.copyFile(logger, display, fileSystem, assetE2eTest, "e2e.js", engineVariables.gulpTasksFolder, "e2e.js"); - await this.copyFile(logger, display, fileSystem, assetUnitTestLanguage, "e2e-transpile.js", engineVariables.gulpTasksFolder, "e2e-transpile.js"); - await this.copyFile(logger, display, fileSystem, assetLinter, "e2e-lint.js", engineVariables.gulpTasksFolder, "e2e-lint.js"); - await this.copyFile(logger, display, fileSystem, assetE2eTestRunner, "e2e-runner.js", engineVariables.gulpTasksFolder, "e2e-runner.js"); - await this.copyFile(logger, display, fileSystem, assetE2eTestRunner, "e2e-install.js", engineVariables.gulpTasksFolder, "e2e-install.js"); + await this.copyFile(logger, fileSystem, assetE2eTest, "e2e.js", engineVariables.gulpTasksFolder, "e2e.js"); + await this.copyFile(logger, fileSystem, assetUnitTestLanguage, "e2e-transpile.js", engineVariables.gulpTasksFolder, "e2e-transpile.js"); + await this.copyFile(logger, fileSystem, assetLinter, "e2e-lint.js", engineVariables.gulpTasksFolder, "e2e-lint.js"); + await this.copyFile(logger, fileSystem, assetE2eTestRunner, "e2e-runner.js", engineVariables.gulpTasksFolder, "e2e-runner.js"); + await this.copyFile(logger, fileSystem, assetE2eTestRunner, "e2e-install.js", engineVariables.gulpTasksFolder, "e2e-install.js"); return 0; } catch (err) { - super.error(logger, display, "Generating gulp tasks for e2e failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.error("Generating gulp tasks for e2e failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); return 1; } } @@ -220,19 +219,19 @@ export class Gulp extends EnginePipelineStepBase { return 0; } - private async generateServeTasks(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + private async generateServeTasks(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { if (uniteConfiguration.taskManager === "Gulp") { try { - super.log(logger, display, "Generating gulp tasks serve in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.info("Generating gulp tasks serve in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); const assetTasksServer = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/server/${uniteConfiguration.server.toLowerCase()}`); - await this.copyFile(logger, display, fileSystem, assetTasksServer, "serve.js", engineVariables.gulpTasksFolder, "serve.js"); + await this.copyFile(logger, fileSystem, assetTasksServer, "serve.js", engineVariables.gulpTasksFolder, "serve.js"); return 0; } catch (err) { - super.error(logger, display, "Generating gulp tasks serve failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.error("Generating gulp tasks serve failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); return 1; } } @@ -240,19 +239,19 @@ export class Gulp extends EnginePipelineStepBase { return 0; } - private async generateThemeTasks(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + private async generateThemeTasks(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { if (uniteConfiguration.taskManager === "Gulp") { try { - super.log(logger, display, "Generating gulp tasks theme in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.info("Generating gulp tasks theme in", { gulpTasksFolder: engineVariables.gulpTasksFolder }); const assetTasksTheme = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, "gulp/tasks/"); - await this.copyFile(logger, display, fileSystem, assetTasksTheme, "theme.js", engineVariables.gulpTasksFolder, "theme.js"); + await this.copyFile(logger, fileSystem, assetTasksTheme, "theme.js", engineVariables.gulpTasksFolder, "theme.js"); return 0; } catch (err) { - super.error(logger, display, "Generating gulp tasks serve failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); + logger.error("Generating gulp tasks serve failed", err, { gulpTasksFolder: engineVariables.gulpTasksFolder }); return 1; } } @@ -260,29 +259,29 @@ export class Gulp extends EnginePipelineStepBase { return 0; } - private async generateUtils(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + private async generateUtils(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["gulp-util", "gulp-rename"], uniteConfiguration.taskManager === "Gulp"); if (uniteConfiguration.taskManager === "Gulp") { try { - super.log(logger, display, "Generating gulp tasks utils in", { gulpUtilFolder: engineVariables.gulpUtilFolder }); + logger.info("Generating gulp tasks utils in", { gulpUtilFolder: engineVariables.gulpUtilFolder }); const assetUtils = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, "gulp/tasks/util/"); const assetUtilModuleType = fileSystem.pathCombine(engineVariables.packageAssetsDirectory, `gulp/tasks/moduleType/${uniteConfiguration.moduleType.toLowerCase()}/util/`); - await this.copyFile(logger, display, fileSystem, assetUtils, "async-util.js", engineVariables.gulpUtilFolder, "async-util.js"); - await this.copyFile(logger, display, fileSystem, assetUtils, "bundle.js", engineVariables.gulpUtilFolder, "bundle.js"); - await this.copyFile(logger, display, fileSystem, assetUtils, "client-packages.js", engineVariables.gulpUtilFolder, "client-packages.js"); - await this.copyFile(logger, display, fileSystem, assetUtils, "display.js", engineVariables.gulpUtilFolder, "display.js"); - await this.copyFile(logger, display, fileSystem, assetUtils, "exec.js", engineVariables.gulpUtilFolder, "exec.js"); - await this.copyFile(logger, display, fileSystem, assetUtils, "theme-utils.js", engineVariables.gulpUtilFolder, "theme-utils.js"); - await this.copyFile(logger, display, fileSystem, assetUtils, "unite-config.js", engineVariables.gulpUtilFolder, "unite-config.js"); + await this.copyFile(logger, fileSystem, assetUtils, "async-util.js", engineVariables.gulpUtilFolder, "async-util.js"); + await this.copyFile(logger, fileSystem, assetUtils, "bundle.js", engineVariables.gulpUtilFolder, "bundle.js"); + await this.copyFile(logger, fileSystem, assetUtils, "client-packages.js", engineVariables.gulpUtilFolder, "client-packages.js"); + await this.copyFile(logger, fileSystem, assetUtils, "display.js", engineVariables.gulpUtilFolder, "display.js"); + await this.copyFile(logger, fileSystem, assetUtils, "exec.js", engineVariables.gulpUtilFolder, "exec.js"); + await this.copyFile(logger, fileSystem, assetUtils, "theme-utils.js", engineVariables.gulpUtilFolder, "theme-utils.js"); + await this.copyFile(logger, fileSystem, assetUtils, "unite-config.js", engineVariables.gulpUtilFolder, "unite-config.js"); - await this.copyFile(logger, display, fileSystem, assetUtilModuleType, "module-config.js", engineVariables.gulpUtilFolder, "module-config.js"); + await this.copyFile(logger, fileSystem, assetUtilModuleType, "module-config.js", engineVariables.gulpUtilFolder, "module-config.js"); return 0; } catch (err) { - super.error(logger, display, "Generating gulp tasks utils failed", err, { gulpUtilFolder: engineVariables.gulpUtilFolder }); + logger.error("Generating gulp tasks utils failed", err, { gulpUtilFolder: engineVariables.gulpUtilFolder }); return 1; } } diff --git a/src/pipelineSteps/testFramework/jasmine.ts b/src/pipelineSteps/testFramework/jasmine.ts index daca2038..5843cb56 100644 --- a/src/pipelineSteps/testFramework/jasmine.ts +++ b/src/pipelineSteps/testFramework/jasmine.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate jasmine configuration. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,7 +8,7 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class Jasmine extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["jasmine-core"], uniteConfiguration.unitTestFramework === "Jasmine" || uniteConfiguration.e2eTestFramework === "Jasmine"); engineVariables.toggleDevDependency(["@types/jasmine"], (uniteConfiguration.unitTestFramework === "Jasmine" || uniteConfiguration.e2eTestFramework === "Jasmine") @@ -19,11 +18,11 @@ export class Jasmine extends EnginePipelineStepBase { if (uniteConfiguration.unitTestFramework === "Jasmine" || uniteConfiguration.e2eTestFramework === "Jasmine") { try { - super.log(logger, display, "Generating Jasmine Configuration"); + logger.info("Generating Jasmine Configuration"); return 0; } catch (err) { - super.error(logger, display, "Generating Jasmine Configuration failed", err); + logger.error("Generating Jasmine Configuration failed", err); return 1; } } diff --git a/src/pipelineSteps/testFramework/mochaChai.ts b/src/pipelineSteps/testFramework/mochaChai.ts index 0a80011c..0d1a5546 100644 --- a/src/pipelineSteps/testFramework/mochaChai.ts +++ b/src/pipelineSteps/testFramework/mochaChai.ts @@ -1,7 +1,6 @@ /** * Pipeline step to generate mocha configuration. */ -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { UniteConfiguration } from "../../configuration/models/unite/uniteConfiguration"; @@ -9,8 +8,8 @@ import { EnginePipelineStepBase } from "../../engine/enginePipelineStepBase"; import { EngineVariables } from "../../engine/engineVariables"; export class MochaChai extends EnginePipelineStepBase { - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { - super.log(logger, display, "Generating Mocha-Chai Configuration"); + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + logger.info("Generating Mocha-Chai Configuration"); engineVariables.toggleDevDependency(["mocha"], uniteConfiguration.unitTestFramework === "Mocha-Chai" || uniteConfiguration.e2eTestFramework === "Mocha-Chai"); engineVariables.toggleDevDependency(["@types/mocha", "@types/chai"], diff --git a/src/pipelineSteps/unitTestRunner/karma.ts b/src/pipelineSteps/unitTestRunner/karma.ts index 2be46074..571337b2 100644 --- a/src/pipelineSteps/unitTestRunner/karma.ts +++ b/src/pipelineSteps/unitTestRunner/karma.ts @@ -2,7 +2,6 @@ * Pipeline step to generate karma configuration. */ import { JsonHelper } from "unitejs-framework/dist/helpers/jsonHelper"; -import { IDisplay } from "unitejs-framework/dist/interfaces/IDisplay"; import { IFileSystem } from "unitejs-framework/dist/interfaces/IFileSystem"; import { ILogger } from "unitejs-framework/dist/interfaces/ILogger"; import { KarmaConfiguration } from "../../configuration/models/karma/karmaConfiguration"; @@ -13,7 +12,7 @@ import { EngineVariables } from "../../engine/engineVariables"; export class Karma extends EnginePipelineStepBase { private static FILENAME: string = "karma.conf.js"; - public async process(logger: ILogger, display: IDisplay, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { + public async process(logger: ILogger, fileSystem: IFileSystem, uniteConfiguration: UniteConfiguration, engineVariables: EngineVariables): Promise { engineVariables.toggleDevDependency(["karma", "karma-chrome-launcher", "karma-phantomjs-launcher", @@ -40,22 +39,22 @@ export class Karma extends EnginePipelineStepBase { const hasGeneratedMarker = await super.fileHasGeneratedMarker(fileSystem, engineVariables.wwwFolder, Karma.FILENAME); if (hasGeneratedMarker) { - super.log(logger, display, `Generating ${Karma.FILENAME}`); + logger.info(`Generating ${Karma.FILENAME}`, { wwwFolder: engineVariables.wwwFolder}); const lines: string[] = []; this.generateConfig(fileSystem, uniteConfiguration, engineVariables, lines); await fileSystem.fileWriteLines(engineVariables.wwwFolder, Karma.FILENAME, lines); } else { - super.log(logger, display, `Skipping ${Karma.FILENAME} as it has no generated marker`); + logger.info(`Skipping ${Karma.FILENAME} as it has no generated marker`); } return 0; } catch (err) { - super.error(logger, display, `Generating ${Karma.FILENAME} failed`, err); + logger.error(`Generating ${Karma.FILENAME} failed`, err); return 1; } } else { - return await super.deleteFile(logger, display, fileSystem, engineVariables.wwwFolder, Karma.FILENAME); + return await super.deleteFile(logger, fileSystem, engineVariables.wwwFolder, Karma.FILENAME); } } @@ -64,7 +63,7 @@ export class Karma extends EnginePipelineStepBase { const testIncludes: { pattern: string; included: boolean }[] = []; - testIncludes.push({ pattern: "./unite.json", included: false }); + testIncludes.push({ pattern: "../unite.json", included: false }); testIncludes.push({ pattern: "./node_modules/bluebird/js/browser/bluebird.js", included: true }); if (uniteConfiguration.moduleType === "AMD") {