Skip to content

Commit

Permalink
Allow @ember/test-helpers v5.x and update ember-cli to 6.1 (#1867)
Browse files Browse the repository at this point in the history
* Update addon blueprint to 4

* Update docs to ember-cli v6.1.0

* Readd ember/test-helpers, update ember-source & fix ts errors

* Run formatter

* Add ts ignore rules

* Fix lint in docs

* Fix lint in test app

* Readd ember try one

* Update packages to latest
  • Loading branch information
mkszepp authored Jan 27, 2025
1 parent 5bd17f8 commit 5028149
Show file tree
Hide file tree
Showing 70 changed files with 18,474 additions and 12,561 deletions.
20 changes: 4 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ jobs:

steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8
- uses: pnpm/action-setup@v4

- uses: actions/setup-node@v4
with:
Expand All @@ -44,10 +41,7 @@ jobs:

steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8
- uses: pnpm/action-setup@v4

- name: Install Node
uses: actions/setup-node@v4
Expand All @@ -71,10 +65,7 @@ jobs:

steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8
- uses: pnpm/action-setup@v4

- uses: actions/setup-node@v4
with:
Expand Down Expand Up @@ -115,10 +106,7 @@ jobs:

steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8
- uses: pnpm/action-setup@v4

- name: Install Node
uses: actions/setup-node@v4
Expand Down
15 changes: 3 additions & 12 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8
- uses: pnpm/action-setup@v4

- uses: actions/setup-node@v4
with:
Expand All @@ -45,10 +42,7 @@ jobs:

steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8
- uses: pnpm/action-setup@v4

- name: Install Node
uses: actions/setup-node@v4
Expand All @@ -73,10 +67,7 @@ jobs:
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/master'))
steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8
- uses: pnpm/action-setup@v4

- name: Install Node
uses: actions/setup-node@v4
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/push-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v3
with:
version: 8
- uses: pnpm/action-setup@v4

- uses: actions/setup-node@v4
with:
node-version: 18
Expand Down
2 changes: 1 addition & 1 deletion config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"packages": [
{
"name": "@embroider/addon-blueprint",
"version": "2.18.0",
"version": "4.0.0",
"blueprints": [
{
"name": "@embroider/addon-blueprint",
Expand Down
17 changes: 0 additions & 17 deletions docs/.eslintignore

This file was deleted.

58 changes: 0 additions & 58 deletions docs/.eslintrc.js

This file was deleted.

10 changes: 9 additions & 1 deletion docs/.prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
'use strict';

module.exports = {
plugins: ['prettier-plugin-ember-template-tag'],
overrides: [
{
files: '*.{js,ts}',
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
options: {
singleQuote: true,
},
},
{
files: '*.{gjs,gts}',
options: {
singleQuote: true,
templateSingleQuote: false,
},
},
],
};
1 change: 0 additions & 1 deletion docs/app/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import Application from '@ember/application';
import Resolver from 'ember-resolver';
import loadInitializers from 'ember-load-initializers';
import config from 'docs/config/environment';
// @ts-expect-error no types shipped from prismjs
import Prism from 'prismjs';
import 'prismjs/plugins/normalize-whitespace/prism-normalize-whitespace';
import 'prismjs/components/prism-css';
Expand Down
8 changes: 3 additions & 5 deletions docs/app/components/code-inline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ import { modifier } from 'ember-modifier';
import { htmlSafe, type SafeString } from '@ember/template';
import { tracked } from '@glimmer/tracking';
import { assert } from '@ember/debug';

// eslint-disable-next-line @typescript-eslint/no-explicit-any
declare const Prism: any;
import Prism from 'prismjs';

interface CodeInlineSignature {
Element: HTMLElement;
Expand All @@ -25,8 +23,8 @@ export default class CodeInline extends Component<CodeInlineSignature> {
"ember-prism's <CodeBlock/> and <CodeInline/> components require a `code` parameter to be passed in.",
code !== undefined,
);
if (Prism?.plugins?.NormalizeWhitespace) {
return Prism.plugins.NormalizeWhitespace.normalize(code);
if (Prism?.plugins['NormalizeWhitespace']) {
return Prism.plugins['NormalizeWhitespace'].normalize(code) as string;
}

return code;
Expand Down
2 changes: 1 addition & 1 deletion docs/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "5.12.0",
"version": "6.1.0",
"blueprints": [
{
"name": "app",
Expand Down
Loading

0 comments on commit 5028149

Please sign in to comment.