From 83c5684491ef02aa01128ab71fcde775398a52e8 Mon Sep 17 00:00:00 2001 From: Pagan Gazzard Date: Thu, 6 Feb 2020 18:19:00 +0000 Subject: [PATCH 1/3] Remove duplicate type checking of automation code Change-type: patch --- package.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index edd20fd9..ab8bd1c9 100644 --- a/package.json +++ b/package.json @@ -42,17 +42,18 @@ "postinstall": "patch-package", "prebuild": "rimraf build/ build-bin/", "build": "npm run build:src && npm run catch-uncommitted", - "build:src": "npm run prettify && npm run lint && npm run build:fast && npm run build:doc", + "build:src": "npm run prettify && npm run lint && npm run build:automation && npm run build:fast && npm run build:doc", "build:fast": "gulp build && tsc", - "build:doc": "mkdirp doc/ && ts-node --type-check -P automation/tsconfig.json automation/capitanodoc/index.ts > doc/cli.markdown", - "build:standalone": "ts-node --type-check -P automation/tsconfig.json automation/run.ts build:standalone", - "build:installer": "ts-node --type-check -P automation/tsconfig.json automation/run.ts build:installer", + "build:automation": "tsc -P automation/tsconfig.json --noEmit", + "build:doc": "mkdirp doc/ && ts-node --transpile-only -P automation/tsconfig.json automation/capitanodoc/index.ts > doc/cli.markdown", + "build:standalone": "ts-node --transpile-only -P automation/tsconfig.json automation/run.ts build:standalone", + "build:installer": "ts-node --transpile-only -P automation/tsconfig.json automation/run.ts build:installer", "package": "npm run build:fast && npm run build:standalone && npm run build:installer", - "release": "ts-node --type-check -P automation/tsconfig.json automation/run.ts release", + "release": "ts-node --transpile-only -P automation/tsconfig.json automation/run.ts release", "pretest": "npm run build", "test": "mocha --timeout 6000 -r ts-node/register \"tests/**/*.spec.ts\"", "test:fast": "npm run build:fast && npm run test", - "catch-uncommitted": "ts-node --type-check -P automation/tsconfig.json automation/run.ts catch-uncommitted", + "catch-uncommitted": "ts-node --transpile-only -P automation/tsconfig.json automation/run.ts catch-uncommitted", "ci": "npm run test && catch-uncommitted", "watch": "gulp watch", "prettify": "resin-lint --typescript --fix automation/ lib/ typings/ tests/ && prettier --write \"{lib,tests,automation,typings}/**/*.js\" --config ./node_modules/resin-lint/config/.prettierrc", From 85aaf77e44c9f85fbc0c459a8cedac2975f9f469 Mon Sep 17 00:00:00 2001 From: Pagan Gazzard Date: Thu, 6 Feb 2020 18:19:48 +0000 Subject: [PATCH 2/3] Remove redundant type checking of tests Change-type: patch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ab8bd1c9..d3cbc29d 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "package": "npm run build:fast && npm run build:standalone && npm run build:installer", "release": "ts-node --transpile-only -P automation/tsconfig.json automation/run.ts release", "pretest": "npm run build", - "test": "mocha --timeout 6000 -r ts-node/register \"tests/**/*.spec.ts\"", + "test": "mocha --timeout 6000 -r ts-node/register/transpile-only \"tests/**/*.spec.ts\"", "test:fast": "npm run build:fast && npm run test", "catch-uncommitted": "ts-node --transpile-only -P automation/tsconfig.json automation/run.ts catch-uncommitted", "ci": "npm run test && catch-uncommitted", From 6d543b79ff423a8288195aa850051d5fa9c914f5 Mon Sep 17 00:00:00 2001 From: Pagan Gazzard Date: Thu, 6 Feb 2020 18:20:54 +0000 Subject: [PATCH 3/3] Merge resin-lint linting and fixing steps into one Change-type: patch --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d3cbc29d..1288711e 100644 --- a/package.json +++ b/package.json @@ -56,8 +56,8 @@ "catch-uncommitted": "ts-node --transpile-only -P automation/tsconfig.json automation/run.ts catch-uncommitted", "ci": "npm run test && catch-uncommitted", "watch": "gulp watch", - "prettify": "resin-lint --typescript --fix automation/ lib/ typings/ tests/ && prettier --write \"{lib,tests,automation,typings}/**/*.js\" --config ./node_modules/resin-lint/config/.prettierrc", - "lint": "resin-lint lib/ tests/ && resin-lint --typescript automation/ lib/ typings/ tests/", + "prettify": "prettier --write \"{lib,tests,automation,typings}/**/*.js\" --config ./node_modules/resin-lint/config/.prettierrc", + "lint": "resin-lint lib/ tests/ && resin-lint --typescript --fix automation/ lib/ typings/ tests/", "prepublishOnly": "npm run build" }, "keywords": [