Skip to content

Commit

Permalink
Rationalised logging/display interfaces
Browse files Browse the repository at this point in the history
  • Loading branch information
obany committed Aug 7, 2017
1 parent 8aa1655 commit 4fbdfd5
Show file tree
Hide file tree
Showing 164 changed files with 806 additions and 997 deletions.
5 changes: 5 additions & 0 deletions 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
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -4,7 +4,7 @@
/// <reference path="../e2e-bootstrap.d.ts" />
describe("App", () => {
it("the title is set", () => {
const uniteJson = require("../../../unite.json");
const uniteJson = require("../../../../unite.json");
return browser
.url("/")
.getTitle()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -4,7 +4,7 @@
/// <reference path="../e2e-bootstrap.d.ts" />
describe("App", () => {
it("the title is set", () => {
const uniteJson = require("../../../unite.json");
const uniteJson = require("../../../../unite.json");
return browser
.url("/")
.getTitle()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -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()
Expand Down
Expand Up @@ -4,7 +4,7 @@
/// <reference path="../e2e-bootstrap.d.ts" />
describe("App", () => {
it("the title is set", () => {
const uniteJson = require("../../../unite.json");
const uniteJson = require("../../../../unite.json");
return browser
.url("/")
.getTitle()
Expand Down
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion assets/gulp/tasks/util/unite-config.js
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions 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";
Expand All @@ -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<number>;
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<number>;
buildConfiguration(operation: BuildConfigurationOperation | undefined | null, configurationName: string | undefined | null, bundle: boolean, minify: boolean, sourcemaps: boolean, outputDirectory: string | undefined | null): Promise<number>;
Expand Down

0 comments on commit 4fbdfd5

Please sign in to comment.