From 8d2daf9ccf6d03934a6d8090ecce9d8761de5b3f Mon Sep 17 00:00:00 2001 From: Dan Freeman Date: Tue, 15 Jun 2021 15:17:32 +0200 Subject: [PATCH 1/3] Use published ansi-to-html types --- package.json | 2 +- ts/types/ansi-to-html/index.d.ts | 5 ----- yarn.lock | 12 ++++++++++++ 3 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 ts/types/ansi-to-html/index.d.ts diff --git a/package.json b/package.json index c1c81285e..011ca89e3 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "postpublish": "rimraf js" }, "dependencies": { - "ansi-to-html": "^0.6.6", + "ansi-to-html": "^0.6.15", "broccoli-stew": "^3.0.0", "debug": "^4.0.0", "execa": "^4.0.0", diff --git a/ts/types/ansi-to-html/index.d.ts b/ts/types/ansi-to-html/index.d.ts deleted file mode 100644 index ea3eb4b45..000000000 --- a/ts/types/ansi-to-html/index.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -declare module 'ansi-to-html' { - export default class ANSIConverter { - toHtml(text: string): string; - } -} diff --git a/yarn.lock b/yarn.lock index 363c15f99..e6ba40d93 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1808,6 +1808,13 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: "@types/color-name" "^1.1.1" color-convert "^2.0.1" +ansi-to-html@^0.6.15: + version "0.6.15" + resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.15.tgz#ac6ad4798a00f6aa045535d7f6a9cb9294eebea7" + integrity sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ== + dependencies: + entities "^2.0.0" + ansi-to-html@^0.6.6: version "0.6.14" resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.14.tgz#65fe6d08bba5dd9db33f44a20aec331e0010dad8" @@ -5419,6 +5426,11 @@ entities@^1.1.2, entities@~1.1.1: resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== +entities@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== + entities@~2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f" From edaf6885234e92ec933a2ddf90f0332f32a9f799 Mon Sep 17 00:00:00 2001 From: Dan Freeman Date: Tue, 15 Jun 2021 15:25:12 +0200 Subject: [PATCH 2/3] Update code to be typescript@next strict-friendly --- ts/lib/commands/precompile.ts | 2 +- ts/tests/acceptance/build-test.ts | 2 +- ts/tests/helpers/skeleton-app.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ts/lib/commands/precompile.ts b/ts/lib/commands/precompile.ts index fa27293c2..587cca9ae 100644 --- a/ts/lib/commands/precompile.ts +++ b/ts/lib/commands/precompile.ts @@ -40,7 +40,7 @@ export default command({ // Capture a string with stdout and stderr interleaved for error reporting all: true, }); - } catch (e) { + } catch (e: any) { fs.removeSync(outDir); console.error(`\n${e.all}\n`); throw e; diff --git a/ts/tests/acceptance/build-test.ts b/ts/tests/acceptance/build-test.ts index fd23f2cc7..1a75a7c22 100644 --- a/ts/tests/acceptance/build-test.ts +++ b/ts/tests/acceptance/build-test.ts @@ -101,7 +101,7 @@ describe('Acceptance: build', function () { try { await app.build(); expect.fail('Build should have failed'); - } catch (error) { + } catch (error: any) { expect(error.all).to.include(`Cannot find module 'nonexistent'`); } }); diff --git a/ts/tests/helpers/skeleton-app.ts b/ts/tests/helpers/skeleton-app.ts index f94009cb5..6c92d3a64 100644 --- a/ts/tests/helpers/skeleton-app.ts +++ b/ts/tests/helpers/skeleton-app.ts @@ -15,7 +15,7 @@ const getEmberPort = (() => { interface EmberCliOptions { args?: string[]; - env?: Record; + env?: Record | undefined; } export default class SkeletonApp { @@ -77,7 +77,7 @@ export default class SkeletonApp { process.off('beforeExit', this.cleanupTempDir); } - _ember({ args, env }: EmberCliOptions) { + _ember({ args, env = {} }: EmberCliOptions) { let ember = require.resolve('ember-cli/bin/ember'); return execa.node(ember, args, { cwd: this.root, all: true, env }); } From e0c30c015a22f3e2b667b4566d249c421dec6ee6 Mon Sep 17 00:00:00 2001 From: Dan Freeman Date: Tue, 15 Jun 2021 15:33:39 +0200 Subject: [PATCH 3/3] Don't fast-fail the matrix since cli@latest is a required check --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10e6b83a3..f3e2a1d29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,6 +90,7 @@ jobs: runs-on: ubuntu-latest needs: [test-locked-deps] strategy: + fail-fast: false matrix: deps: - ember-cli@latest