ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-01-22 12:28:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #804 from balena-io/remove-ts-node

Browse Source 
Remove ts-node from testing procedure
This commit is contained in:
CameronDiver 2018-11-06 13:20:24 +01:00 committed by GitHub
commit 05b210306d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package.json
View File

@ -15,10 +15,10 @@
"lint:coffee": "resin-lint src/ test/", "lint:coffee": "resin-lint src/ test/",
"lint:typescript": "resin-lint --typescript src/ test/ typings/ && tsc --noEmit", "lint:typescript": "resin-lint --typescript src/ test/ typings/ && tsc --noEmit",
"lint": "npm run lint:coffee && npm run lint:typescript", "lint": "npm run lint:coffee && npm run lint:typescript",
"test": "npm run lint && JUNIT_REPORT_PATH=report.xml mocha --exit -r ts-node/register/transpile-only -r coffee-script/register -r register-coffee-coverage test/*.{js,coffee} && npm run coverage", "test": "npm run lint && npm run test:build && JUNIT_REPORT_PATH=report.xml istanbul cover _mocha && npm run coverage",
"test:fast": "mocha --exit -r ts-node/register/transpile-only -r coffee-script/register test/*.{js,coffee}", "test:fast": "npm run test:build && mocha",
"test:build": "tsc && coffee -m -c -o build . && cp -r test/data build/test/ && cp -r src/migrations build/src && cp package.json build", "test:build": "tsc && coffee -m -c -o build . && cp -r test/data build/test/ && cp -r src/migrations build/src && cp package.json build",
"test:debug": "npm run test:build && mocha --inspect-brk build/test/*.js", "test:debug": "npm run test:build && mocha --inspect-brk",
"coverage": "istanbul report text && istanbul report html" "coverage": "istanbul report text && istanbul report html"
}, },
"private": "true", "private": "true",
@ -85,7 +85,6 @@
"semver-regex": "^1.0.0", "semver-regex": "^1.0.0",
"shell-quote": "^1.6.1", "shell-quote": "^1.6.1",
"ts-loader": "^3.5.0", "ts-loader": "^3.5.0",
"ts-node": "^7.0.1",
"typed-error": "^2.0.0", "typed-error": "^2.0.0",
"typescript": "^3.1.6", "typescript": "^3.1.6",
"uglifyjs-webpack-plugin": "^1.0.1", "uglifyjs-webpack-plugin": "^1.0.1",

20
src/compose/types/service.ts
View File

@ -19,6 +19,15 @@ export interface ServiceHealthcheck {
retries?: number; retries?: number;
} }
export interface ServiceNetworkDictionary {
[networkName: string]: {
aliases?: string[];
ipv4Address?: string;
ipv6Address?: string;
linkLocalIps?: string[];
};
}
// This is the config directly from the compose file (after running it // This is the config directly from the compose file (after running it
// through _.camelCase) // through _.camelCase)
export interface ServiceComposeConfig { export interface ServiceComposeConfig {
@ -47,16 +56,7 @@ export interface ServiceComposeConfig {
labels?: { [labelName: string]: string }; labels?: { [labelName: string]: string };
running: boolean; running: boolean;
networkMode?: string; networkMode?: string;
networks?: networks?: string[] | ServiceNetworkDictionary;
| string[]
| {
[networkName: string]: {
aliases?: string[];
ipv4Address?: string;
ipv6Address?: string;
linkLocalIps?: string[];
};
};
pid?: string; pid?: string;
pidsLimit?: number; pidsLimit?: number;
ports?: string[]; ports?: string[];

2
test/mocha.opts Normal file
View File

@ -0,0 +1,2 @@
--exit
build/test/*.js