diff --git a/core/index.ts b/core/index.ts index 963984cb8..83e685131 100644 --- a/core/index.ts +++ b/core/index.ts @@ -2,8 +2,8 @@ import { compile as compiler } from "df/core/compilers"; import { main } from "df/core/main"; import { Session } from "df/core/session"; import { version } from "df/core/version"; -import { dataform } from "df/protos/ts"; import { readWorkflowSettings } from "df/core/workflow_settings"; +import { dataform } from "df/protos/ts"; // Create static session object. // This hack just enforces the singleton session object to diff --git a/core/main.ts b/core/main.ts index 2e7bb475e..91076c188 100644 --- a/core/main.ts +++ b/core/main.ts @@ -1,8 +1,8 @@ import { decode64, encode64 } from "df/common/protos"; import { Session } from "df/core/session"; import * as utils from "df/core/utils"; -import { dataform } from "df/protos/ts"; import { readWorkflowSettings } from "df/core/workflow_settings"; +import { dataform } from "df/protos/ts"; /** * This is the main entry point into the user space code that should be invoked by the compilation wrapper sandbox. diff --git a/core/main_test.ts b/core/main_test.ts index ca574765a..58bf866cb 100644 --- a/core/main_test.ts +++ b/core/main_test.ts @@ -1,13 +1,13 @@ -import { suite, test } from "df/testing"; -import { dataform } from "df/protos/ts"; -import * as path from "path"; -import * as fs from "fs-extra"; -import * as main from "df/core/main"; -import { compile } from "df/core/compilers"; -import { TmpDirFixture } from "df/testing/fixtures"; import { expect } from "chai"; +import * as fs from "fs-extra"; +import * as path from "path"; import { CompilerFunction, NodeVM } from "vm2"; + import { decode64, encode64 } from "df/common/protos"; +import { compile } from "df/core/compilers"; +import { dataform } from "df/protos/ts"; +import { suite, test } from "df/testing"; +import { TmpDirFixture } from "df/testing/fixtures"; import { asPlainObject } from "df/tests/utils"; const VALID_WORKFLOW_SETTINGS_YAML = ` @@ -22,7 +22,8 @@ const VALID_DATAFORM_JSON = ` } `; -suite("@dataform/core", ({ beforeEach, afterEach }) => { +// tslint:disable: detect-non-literal-fs-filename +suite("@dataform/core", ({ afterEach }) => { const tmpDirFixture = new TmpDirFixture(afterEach); suite("workflow settings", () => { diff --git a/core/workflow_settings.ts b/core/workflow_settings.ts index 4277f7793..134bfdde2 100644 --- a/core/workflow_settings.ts +++ b/core/workflow_settings.ts @@ -35,6 +35,7 @@ function verifyWorkflowSettingsAsJson(workflowSettingsAsJson?: object) { function maybeRequire(file: string): any { try { + // tslint:disable-next-line: tsr-detect-non-literal-require return require(file); } catch (e) { if (e instanceof SyntaxError) {