Skip to content

Commit 1acbd58

Browse files
authored
Merge pull request #1434 from typed-ember/ci-cleanup
2 parents 5752265 + e0c30c0 commit 1acbd58

File tree

7 files changed

+18
-10
lines changed

7 files changed

+18
-10
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ jobs:
9090
runs-on: ubuntu-latest
9191
needs: [test-locked-deps]
9292
strategy:
93+
fail-fast: false
9394
matrix:
9495
deps:
9596
- ember-cli@latest

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"postpublish": "rimraf js"
3939
},
4040
"dependencies": {
41-
"ansi-to-html": "^0.6.6",
41+
"ansi-to-html": "^0.6.15",
4242
"broccoli-stew": "^3.0.0",
4343
"debug": "^4.0.0",
4444
"execa": "^4.0.0",

ts/lib/commands/precompile.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export default command({
4040
// Capture a string with stdout and stderr interleaved for error reporting
4141
all: true,
4242
});
43-
} catch (e) {
43+
} catch (e: any) {
4444
fs.removeSync(outDir);
4545
console.error(`\n${e.all}\n`);
4646
throw e;

ts/tests/acceptance/build-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ describe('Acceptance: build', function () {
101101
try {
102102
await app.build();
103103
expect.fail('Build should have failed');
104-
} catch (error) {
104+
} catch (error: any) {
105105
expect(error.all).to.include(`Cannot find module 'nonexistent'`);
106106
}
107107
});

ts/tests/helpers/skeleton-app.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const getEmberPort = (() => {
1515

1616
interface EmberCliOptions {
1717
args?: string[];
18-
env?: Record<string, string>;
18+
env?: Record<string, string> | undefined;
1919
}
2020

2121
export default class SkeletonApp {
@@ -77,7 +77,7 @@ export default class SkeletonApp {
7777
process.off('beforeExit', this.cleanupTempDir);
7878
}
7979

80-
_ember({ args, env }: EmberCliOptions) {
80+
_ember({ args, env = {} }: EmberCliOptions) {
8181
let ember = require.resolve('ember-cli/bin/ember');
8282
return execa.node(ember, args, { cwd: this.root, all: true, env });
8383
}

ts/types/ansi-to-html/index.d.ts

Lines changed: 0 additions & 5 deletions
This file was deleted.

yarn.lock

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,6 +1808,13 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
18081808
"@types/color-name" "^1.1.1"
18091809
color-convert "^2.0.1"
18101810

1811+
ansi-to-html@^0.6.15:
1812+
version "0.6.15"
1813+
resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.15.tgz#ac6ad4798a00f6aa045535d7f6a9cb9294eebea7"
1814+
integrity sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==
1815+
dependencies:
1816+
entities "^2.0.0"
1817+
18111818
ansi-to-html@^0.6.6:
18121819
version "0.6.14"
18131820
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:
54195426
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
54205427
integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
54215428

5429+
entities@^2.0.0:
5430+
version "2.2.0"
5431+
resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
5432+
integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
5433+
54225434
entities@~2.0.0:
54235435
version "2.0.3"
54245436
resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"

0 commit comments

Comments
 (0)