Skip to content

Commit 330a552

Browse files
authored
Allow @ember/test-helpers v5.x and update ember-cli to 6.1 (#944)
* Update addon blueprint to 4 * Update docs to ember-cli v6.1.0 * Readd removed devDependencies from cli * Update packages and fix prettier errors * Fix / disable ts error * Fix ts / lint errors * Fix workflows * Fix workflows
1 parent c510ec4 commit 330a552

49 files changed

Lines changed: 11903 additions & 9554 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ jobs:
1919

2020
steps:
2121
- uses: actions/checkout@v4
22-
23-
- uses: pnpm/action-setup@v3
24-
with:
25-
version: 8
22+
- uses: pnpm/action-setup@v4
2623

2724
- uses: actions/setup-node@v4
2825
with:
@@ -44,10 +41,7 @@ jobs:
4441

4542
steps:
4643
- uses: actions/checkout@v4
47-
48-
- uses: pnpm/action-setup@v3
49-
with:
50-
version: 8
44+
- uses: pnpm/action-setup@v4
5145

5246
- name: Install Node
5347
uses: actions/setup-node@v4
@@ -71,10 +65,7 @@ jobs:
7165

7266
steps:
7367
- uses: actions/checkout@v4
74-
75-
- uses: pnpm/action-setup@v3
76-
with:
77-
version: 8
68+
- uses: pnpm/action-setup@v4
7869

7970
- name: Install Node
8071
uses: actions/setup-node@v4
@@ -98,10 +89,7 @@ jobs:
9889

9990
steps:
10091
- uses: actions/checkout@v4
101-
102-
- uses: pnpm/action-setup@v3
103-
with:
104-
version: 8
92+
- uses: pnpm/action-setup@v4
10593

10694
- uses: actions/setup-node@v4
10795
with:
@@ -143,10 +131,7 @@ jobs:
143131

144132
steps:
145133
- uses: actions/checkout@v4
146-
147-
- uses: pnpm/action-setup@v3
148-
with:
149-
version: 8
134+
- uses: pnpm/action-setup@v4
150135

151136
- name: Install Node
152137
uses: actions/setup-node@v4

.github/workflows/docs.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- uses: actions/checkout@v4
22-
23-
- uses: pnpm/action-setup@v3
24-
with:
25-
version: 8
22+
- uses: pnpm/action-setup@v4
2623

2724
- uses: actions/setup-node@v4
2825
with:
@@ -45,10 +42,7 @@ jobs:
4542

4643
steps:
4744
- uses: actions/checkout@v4
48-
49-
- uses: pnpm/action-setup@v3
50-
with:
51-
version: 8
45+
- uses: pnpm/action-setup@v4
5246

5347
- name: Install Node
5448
uses: actions/setup-node@v4
@@ -73,10 +67,7 @@ jobs:
7367
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/master'))
7468
steps:
7569
- uses: actions/checkout@v4
76-
77-
- uses: pnpm/action-setup@v3
78-
with:
79-
version: 8
70+
- uses: pnpm/action-setup@v4
8071

8172
- name: Install Node
8273
uses: actions/setup-node@v4

.github/workflows/push-dist.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ jobs:
1919

2020
steps:
2121
- uses: actions/checkout@v4
22-
- uses: pnpm/action-setup@v3
23-
with:
24-
version: 8
22+
- uses: pnpm/action-setup@v4
23+
2524
- uses: actions/setup-node@v4
2625
with:
2726
node-version: 18

config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"packages": [
55
{
66
"name": "@embroider/addon-blueprint",
7-
"version": "2.18.0",
7+
"version": "4.0.0",
88
"blueprints": [
99
{
1010
"name": "@embroider/addon-blueprint",

docs/.eslintignore

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

docs/.eslintrc.js

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

docs/.prettierrc.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
'use strict';
22

33
module.exports = {
4+
plugins: ['prettier-plugin-ember-template-tag'],
45
overrides: [
56
{
6-
files: '*.{js,ts}',
7+
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
78
options: {
89
singleQuote: true,
910
},
1011
},
12+
{
13+
files: '*.{gjs,gts}',
14+
options: {
15+
singleQuote: true,
16+
templateSingleQuote: false,
17+
},
18+
},
1119
],
1220
};

docs/app/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import Application from '@ember/application';
22
import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from 'docs/config/environment';
5-
// @ts-expect-error no types shipped from prismjs
65
import Prism from 'prismjs';
76
import 'prismjs/plugins/normalize-whitespace/prism-normalize-whitespace';
87
import 'prismjs/components/prism-css';
@@ -15,6 +14,7 @@ import { setup } from 'prismjs-glimmer';
1514

1615
import 'prismjs/themes/prism.css';
1716

17+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
1818
setup(Prism);
1919

2020
export default class App extends Application {

docs/app/components/code-inline.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ import { modifier } from 'ember-modifier';
33
import { htmlSafe, type SafeString } from '@ember/template';
44
import { tracked } from '@glimmer/tracking';
55
import { assert } from '@ember/debug';
6-
7-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
8-
declare const Prism: any;
6+
import Prism from 'prismjs';
97

108
interface CodeInlineSignature {
119
Element: HTMLElement;
@@ -25,8 +23,9 @@ export default class CodeInline extends Component<CodeInlineSignature> {
2523
"ember-prism's <CodeBlock/> and <CodeInline/> components require a `code` parameter to be passed in.",
2624
code !== undefined,
2725
);
28-
if (Prism?.plugins?.NormalizeWhitespace) {
29-
return Prism.plugins.NormalizeWhitespace.normalize(code);
26+
if (Prism?.plugins['NormalizeWhitespace']) {
27+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
28+
return Prism.plugins['NormalizeWhitespace'].normalize(code) as string;
3029
}
3130

3231
return code;

docs/config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "5.12.0",
6+
"version": "6.1.0",
77
"blueprints": [
88
{
99
"name": "app",

0 commit comments

Comments
 (0)