From 9a2a275e6547a6ab147bf46e7a2b3c442e688759 Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Fri, 15 Sep 2023 15:01:31 -0400 Subject: [PATCH] bump min ts version to 4.4 to match definitelytyped at time of writing (#2063) * bump min ts version to 4.4 to match definitelytyped at time of writing * update lockfile * fix a bit of noise in test failures, also addressed by #2009, sneaking it in here to quiet the CI on other PRs * Sneak in improvement to assertion logging --- .github/workflows/continuous-integration.yml | 4 +-- package.json | 4 +-- src/test/esm-loader.spec.ts | 4 ++- src/test/remove-env-var-force-color.js | 2 ++ yarn.lock | 31 ++++++++++---------- 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index a1d7fb7d6..9354e1420 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -74,8 +74,8 @@ jobs: - flavor: 2 node: 16 nodeFlag: 16 - typescript: 4.2 - typescriptFlag: 4_2 + typescript: 4.4 + typescriptFlag: 4_4 # Node 18 - flavor: 3 node: 18 diff --git a/package.json b/package.json index c55deb400..7cc9f4ab9 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "homepage": "https://typestrong.org/ts-node", "devDependencies": { "@TypeStrong/fs-fixture-builder": "https://github.com/Typestrong/fs-fixture-builder.git#3099e53621daf99db971af29c96145dc115693cd", - "@cspotcode/ava-lib": "https://github.com/cspotcode/ava-lib#bbbed83f393342b51dc6caf2ddf775a3e89371d8", + "@cspotcode/ava-lib": "https://github.com/cspotcode/ava-lib#805aab17b2b89c388596b6dc2b4eece403c5fb87", "@cspotcode/expect-stream": "https://github.com/cspotcode/node-expect-stream#4e425ff1eef240003af8716291e80fbaf3e3ae8f", "@microsoft/api-extractor": "^7.19.4", "@swc/core": "1.3.32", @@ -148,7 +148,7 @@ "@swc/core": ">=1.2.50", "@swc/wasm": ">=1.2.50", "@types/node": "*", - "typescript": ">=4.2" + "typescript": ">=4.4" }, "peerDependenciesMeta": { "@swc/core": { diff --git a/src/test/esm-loader.spec.ts b/src/test/esm-loader.spec.ts index 942533e67..e0372a830 100644 --- a/src/test/esm-loader.spec.ts +++ b/src/test/esm-loader.spec.ts @@ -95,7 +95,9 @@ test.suite('esm', (test) => { }); expect(r.err).not.toBe(null); // expect error from node's default resolver - expect(r.stderr).toMatch(/Error \[ERR_UNSUPPORTED_ESM_URL_SCHEME\]:.*(?:\n.*){0,2}\n *at defaultResolve/); + expect(r.stderr).toMatch( + /Error \[ERR_UNSUPPORTED_ESM_URL_SCHEME\]:.*(?:\n.*){0,2}\n *at (defaultResolve|defaultLoad)/ + ); }); test('should bypass import cache when changing search params', async () => { diff --git a/src/test/remove-env-var-force-color.js b/src/test/remove-env-var-force-color.js index ebbb349b3..43b07a669 100644 --- a/src/test/remove-env-var-force-color.js +++ b/src/test/remove-env-var-force-color.js @@ -1 +1,3 @@ +// Eagerly load `expect` so it picks up the env var +require('expect'); delete process.env.FORCE_COLOR; diff --git a/yarn.lock b/yarn.lock index 035ecbe33..ccd9029ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -241,16 +241,17 @@ __metadata: languageName: node linkType: hard -"@cspotcode/ava-lib@https://github.com/cspotcode/ava-lib#bbbed83f393342b51dc6caf2ddf775a3e89371d8": +"@cspotcode/ava-lib@https://github.com/cspotcode/ava-lib#805aab17b2b89c388596b6dc2b4eece403c5fb87": version: 0.0.1 - resolution: "@cspotcode/ava-lib@https://github.com/cspotcode/ava-lib.git#commit=bbbed83f393342b51dc6caf2ddf775a3e89371d8" + resolution: "@cspotcode/ava-lib@https://github.com/cspotcode/ava-lib.git#commit=805aab17b2b89c388596b6dc2b4eece403c5fb87" dependencies: "@types/node": "*" + chalk: 4.1.2 throat: ^6.0.1 peerDependencies: ava: "*" expect: "*" - checksum: 3ca30bbfe81abb537e1e96addd272b34daf19ecba56f13a5785115bc3433dc5309e733ab8440384531b7a74b88f58eb11c9151e62b75c5c219eccc7dd8b058ec + checksum: 3b453c2f1dd64eeb531a8b6da4cd4d9b24364b31b6692aca5d646d40479e46db56acc4141d93871732f33ab86e91b4c6a08674d1bcf49fc8c8ff8dab9f005742 languageName: node linkType: hard @@ -1257,6 +1258,16 @@ __metadata: languageName: node linkType: hard +"chalk@npm:4.1.2, chalk@npm:^4.0.0": + version: 4.1.2 + resolution: "chalk@npm:4.1.2" + dependencies: + ansi-styles: ^4.1.0 + supports-color: ^7.1.0 + checksum: fe75c9d5c76a7a98d45495b91b2172fa3b7a09e0cc9370e5c8feb1c567b85c4288e2b3fded7cfdd7359ac28d6b3844feb8b82b8686842e93d23c827c417e83fc + languageName: node + linkType: hard + "chalk@npm:^2.0.0": version: 2.4.2 resolution: "chalk@npm:2.4.2" @@ -1268,16 +1279,6 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^4.0.0": - version: 4.1.2 - resolution: "chalk@npm:4.1.2" - dependencies: - ansi-styles: ^4.1.0 - supports-color: ^7.1.0 - checksum: fe75c9d5c76a7a98d45495b91b2172fa3b7a09e0cc9370e5c8feb1c567b85c4288e2b3fded7cfdd7359ac28d6b3844feb8b82b8686842e93d23c827c417e83fc - languageName: node - linkType: hard - "chalk@npm:^5.2.0": version: 5.2.0 resolution: "chalk@npm:5.2.0" @@ -3810,7 +3811,7 @@ __metadata: resolution: "ts-node@workspace:." dependencies: "@TypeStrong/fs-fixture-builder": "https://github.com/Typestrong/fs-fixture-builder.git#3099e53621daf99db971af29c96145dc115693cd" - "@cspotcode/ava-lib": "https://github.com/cspotcode/ava-lib#bbbed83f393342b51dc6caf2ddf775a3e89371d8" + "@cspotcode/ava-lib": "https://github.com/cspotcode/ava-lib#805aab17b2b89c388596b6dc2b4eece403c5fb87" "@cspotcode/expect-stream": "https://github.com/cspotcode/node-expect-stream#4e425ff1eef240003af8716291e80fbaf3e3ae8f" "@cspotcode/source-map-support": ^0.8.0 "@microsoft/api-extractor": ^7.19.4 @@ -3855,7 +3856,7 @@ __metadata: "@swc/core": ">=1.2.50" "@swc/wasm": ">=1.2.50" "@types/node": "*" - typescript: ">=4.2" + typescript: ">=4.4" peerDependenciesMeta: "@swc/core": optional: true