From 2216b88781563b123300d327a863b6444af18c7c Mon Sep 17 00:00:00 2001 From: Craig Spence Date: Thu, 28 Jan 2021 02:08:54 +0100 Subject: [PATCH] =?UTF-8?q?build(betterer=20=F0=9F=94=A8):=20fix=20test=20?= =?UTF-8?q?debug,=20logger=20references,=20lock=20versions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jest-debug.config.js | 11 ----------- package.json | 11 ++++++----- packages/betterer/package.json | 2 +- packages/betterer/src/reporters/loader.ts | 2 +- packages/logger/tsconfig.json | 3 ++- test/__snapshots__/betterer-debug.spec.ts.snap | 2 +- test/betterer-debug.spec.ts | 2 +- test/betterer-same.spec.ts | 2 +- test/betterer-silent.spec.ts | 2 +- tsconfig.json | 15 ++++++++------- tsconfig.test-debug.json | 6 ------ yarn.lock | 8 ++++---- 12 files changed, 26 insertions(+), 40 deletions(-) delete mode 100644 jest-debug.config.js delete mode 100644 tsconfig.test-debug.json diff --git a/jest-debug.config.js b/jest-debug.config.js deleted file mode 100644 index 014efcb77..000000000 --- a/jest-debug.config.js +++ /dev/null @@ -1,11 +0,0 @@ -const config = require('./jest.config'); - -module.exports = { - ...config, - globals: { - 'ts-jest': { - tsconfig: './tsconfig.test-debug.json' - } - }, - collectCoverage: false -}; diff --git a/package.json b/package.json index 321069c4c..9539280ff 100644 --- a/package.json +++ b/package.json @@ -37,11 +37,12 @@ }, "types": "test/betterer-public-api.d.ts", "devDependencies": { - "@betterer/cli": "*", - "@betterer/eslint": "*", - "@betterer/logger": "*", - "@betterer/regexp": "*", - "@betterer/tsquery": "*", + "@betterer/cli": "^3.1.2", + "@betterer/errors": "^3.1.1", + "@betterer/eslint": "^3.1.2", + "@betterer/logger": "^3.1.0", + "@betterer/regexp": "^3.1.2", + "@betterer/tsquery": "^3.1.2", "@commitlint/cli": "^11.0.0", "@commitlint/config-conventional": "^11.0.0", "@phenomnomnominal/commitlint-plugin": "^1.1.1", diff --git a/packages/betterer/package.json b/packages/betterer/package.json index f8520fe1e..56c1587f6 100644 --- a/packages/betterer/package.json +++ b/packages/betterer/package.json @@ -33,7 +33,7 @@ "@betterer/logger": "^3.1.1", "@betterer/reporter": "^3.1.2", "@betterer/watch-reporter": "^3.1.2", - "@phenomnomnominal/debug": "^0.2.0", + "@phenomnomnominal/debug": "^0.2.4", "callsite": "^1.0.0", "chokidar": "^3.3.1", "djb2a": "^1.2.0", diff --git a/packages/betterer/src/reporters/loader.ts b/packages/betterer/src/reporters/loader.ts index e5493f550..aaa80a271 100644 --- a/packages/betterer/src/reporters/loader.ts +++ b/packages/betterer/src/reporters/loader.ts @@ -7,7 +7,7 @@ import { BettererReporter, BettererReporterModule, BettererReporterNames } from export const DEFAULT_REPORTER = '@betterer/reporter'; export const WATCH_REPORTER = '@betterer/watch-reporter'; -const HOOK_NAMES = Object.keys(BettererReporterĪ©.prototype) as ReadonlyArray; +const HOOK_NAMES = Object.getOwnPropertyNames(BettererReporterĪ©.prototype) as ReadonlyArray; export function loadReporters(reporterNames: BettererReporterNames): BettererReporterĪ© { const reporters: Array = reporterNames.map((name) => { diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json index 4010ec9d0..9a6cd95e2 100644 --- a/packages/logger/tsconfig.json +++ b/packages/logger/tsconfig.json @@ -5,5 +5,6 @@ "rootDir": "./src" }, "include": ["./src/**/*.ts", "./src/**/*.tsx"], - "exclude": ["../node_modules/*", "./node_modules/*", "./dist/*"] + "exclude": ["../node_modules/*", "./node_modules/*", "./dist/*"], + "references": [{ "path": "../errors" }] } diff --git a/test/__snapshots__/betterer-debug.spec.ts.snap b/test/__snapshots__/betterer-debug.spec.ts.snap index 91132a2a1..04053aa85 100644 --- a/test/__snapshots__/betterer-debug.spec.ts.snap +++ b/test/__snapshots__/betterer-debug.spec.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`betterer should doesn't break in debug mode 1`] = ` +exports[`betterer doesn't break in debug mode 1`] = ` Array [ "betterer starting 0 ", diff --git a/test/betterer-debug.spec.ts b/test/betterer-debug.spec.ts index 7e09cc08f..fd5af8358 100644 --- a/test/betterer-debug.spec.ts +++ b/test/betterer-debug.spec.ts @@ -3,7 +3,7 @@ import { betterer } from '@betterer/betterer'; import { createFixture } from './fixture'; describe('betterer', () => { - it(`should doesn't break in debug mode`, async () => { + it(`doesn't break in debug mode`, async () => { const { logs, paths, cleanup } = await createFixture('test-betterer-debug', { '.betterer.js': ` const { smaller, bigger } = require('@betterer/constraints'); diff --git a/test/betterer-same.spec.ts b/test/betterer-same.spec.ts index 028e4463c..ad6094b13 100644 --- a/test/betterer-same.spec.ts +++ b/test/betterer-same.spec.ts @@ -108,7 +108,7 @@ export default { it('should stay the same when an issue moves line', async () => { const { paths, logs, cleanup, resolve, readFile, writeFile, runNames } = await createFixture( - 'test-betterer-same-move', + 'test-betterer-same-move-line', { 'src/index.ts': ` const a = 'a'; diff --git a/test/betterer-silent.spec.ts b/test/betterer-silent.spec.ts index c7747eba3..a018752fc 100644 --- a/test/betterer-silent.spec.ts +++ b/test/betterer-silent.spec.ts @@ -31,7 +31,7 @@ module.exports = { }); it('should be possible to unsilence a subsequent run', async () => { - const { logs, paths, cleanup } = await createFixture('test-betterer-silent-then-not-silen', { + const { logs, paths, cleanup } = await createFixture('test-betterer-silent-then-not-silent', { '.betterer.js': ` const { smaller } = require('@betterer/constraints'); diff --git a/tsconfig.json b/tsconfig.json index 2dc79aa85..2510f59c6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,10 +1,16 @@ { "compilerOptions": { "alwaysStrict": true, + "composite": true, "declaration": true, + "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "importHelpers": true, + "incremental": true, + "jsx": "react", + "resolveJsonModule": true, "lib": ["esnext"], + "module": "CommonJS", "moduleResolution": "node", "noEmitOnError": true, "noUnusedLocals": true, @@ -14,13 +20,8 @@ "pretty": true, "sourceMap": true, "strict": true, - "target": "ES5", + "target": "ES2017", "outDir": "./dist", - "typeRoots": ["./node_modules/@types/"], - "resolveJsonModule": true, - "composite": true, - "incremental": true, - "jsx": "react", - "esModuleInterop": true + "typeRoots": ["./node_modules/@types"] } } diff --git a/tsconfig.test-debug.json b/tsconfig.test-debug.json deleted file mode 100644 index a3b93538a..000000000 --- a/tsconfig.test-debug.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "target": "ESNext" - } -} diff --git a/yarn.lock b/yarn.lock index bcd6ae7ff..229ee2488 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1675,10 +1675,10 @@ resolved "https://registry.npmjs.org/@phenomnomnominal/commitlint-plugin/-/commitlint-plugin-1.1.1.tgz#ea96cfc07488efba06d4bd028ebeb14d92da6b85" integrity sha512-r5eWiv3SScWGe1a790sHczz4XIjuZ9hFWNu4JCUuZ/5K8LkvfiN8fA+AyoqPd4/mGIgw/6rKDNgi0K0ddVrlig== -"@phenomnomnominal/debug@^0.2.0": - version "0.2.0" - resolved "https://registry.npmjs.org/@phenomnomnominal/debug/-/debug-0.2.0.tgz#a2c206e395adc8ccb37466872980816682baddc1" - integrity sha512-poh7bUQjIm3vTWCxZRoLZ5wj5TZpTy69YAEGie//aobwYrsLxciy9NsT8yClt2dsx7RHvMtXgl4DivHnbL7RGw== +"@phenomnomnominal/debug@^0.2.4": + version "0.2.4" + resolved "https://registry.npmjs.org/@phenomnomnominal/debug/-/debug-0.2.4.tgz#c4a2b0c264762fa44e3c99cb6e7561b9f3ada607" + integrity sha512-wpDufADI3AxSAPR19y4CgtWDUDNam47Gm+yTNbIBAKNf8MwAr37riYC+3Jf6QFVE5+jvuHVPJsidEbP7TeHPgA== dependencies: esprima "^4.0.1" esquery "^1.3.1"