diff --git a/packages/embark-utils/index.d.ts b/packages/embark-utils/index.d.ts new file mode 100644 index 000000000..17ee6e7d3 --- /dev/null +++ b/packages/embark-utils/index.d.ts @@ -0,0 +1 @@ +declare module "embark-utils"; diff --git a/packages/embark-utils/package.json b/packages/embark-utils/package.json index fa246bd52..b0113579b 100644 --- a/packages/embark-utils/package.json +++ b/packages/embark-utils/package.json @@ -31,22 +31,22 @@ "clean": "npm run reset", "lint": "npm-run-all lint:*", "lint:js": "eslint src/", - "// lint:ts": "tslint -c tslint.json \"src/**/*.ts\"", + "lint:ts": "tslint -c tslint.json \"src/**/*.ts\"", "package": "npm pack", - "// qa": "npm-run-all lint typecheck build package", - "qa": "npm-run-all lint build package", + "qa": "npm-run-all lint typecheck build package", "reset": "npx rimraf dist embark-*.tgz package", "start": "npm run watch", - "// typecheck": "tsc", + "typecheck": "tsc", "watch": "run-p watch:*", "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "eslintConfig": { "extends": "../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1" + "@babel/runtime-corejs2": "7.3.1", + "follow-redirects": "1.5.7" }, "devDependencies": { "@babel/cli": "7.2.3", diff --git a/packages/embark/src/lib/modules/api/index.ts b/packages/embark/src/lib/modules/api/index.ts index b087557d4..0c7a1a796 100644 --- a/packages/embark/src/lib/modules/api/index.ts +++ b/packages/embark/src/lib/modules/api/index.ts @@ -1,10 +1,10 @@ import {Embark} from "embark"; import {__} from "i18n"; -import {dockerHostSwap} from "../../utils/host.js"; import {findNextPort} from "../../utils/network"; import Server from "./server"; const utils = require("../../utils/utils.js"); +import {dockerHostSwap} from "embark-utils"; const DEFAULT_PORT = 55555; const DEFAULT_HOSTNAME = "localhost";