Skip to content

Commit 89096de

Browse files
NullVoxPopuliclaude
andcommitted
Add ember-styleguide v2 from PR branch, fix macros in dev builds
- Add ember-styleguide from git ref (NullVoxPopuli-ai-agent/ember-styleguide#convert-to-v2-addon) - Register ember-styleguide services (navbar, progress) in app.js - Restore EsHeader/EsFooter in application.hbs - Add @ember/test-waiters and ember-concurrency as dependencies - Fix babel filter to use function-based ID matching for pnpm deep paths (regex-based exclude doesn't work with pnpm's nested node_modules) - Process @ember/test-waiters through babel for macros compilation - All @embroider/macros compiled away in both production AND development builds Tests: 68/205 pass (remaining failures from removed v1 addons like ember-leaflet, ember-responsive-image, and percy) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 31e8782 commit 89096de

6 files changed

Lines changed: 325 additions & 11 deletions

File tree

app/app.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import Application from 'ember-strict-application-resolver';
22
import PageTitleService from 'ember-page-title/services/page-title';
3+
import NavbarService from 'ember-styleguide/services/navbar';
4+
import ProgressService from 'ember-styleguide/services/progress';
35

46
import Router from './router.js';
57

@@ -9,6 +11,8 @@ export default class App extends Application {
911

1012
// v2 addon services
1113
'./services/page-title': PageTitleService,
14+
'./services/navbar': NavbarService,
15+
'./services/progress': ProgressService,
1216

1317
// app modules
1418
...import.meta.glob('./adapters/*.js', { eager: true }),

app/controllers/application.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import Controller from '@ember/controller';
2-
3-
// TODO: Restore once ember-styleguide v2 conversion targets ember-source 5.12
4-
// The v2 addon dist uses @ember/template-compiler which requires ember-source 6.x+
5-
// import { infoLinks } from 'ember-styleguide/constants/es-footer';
6-
// import headerLinks from 'ember-styleguide/constants/links';
7-
// import replaceLinks from 'ember-website/utils/replace-links';
2+
import { infoLinks } from 'ember-styleguide/constants/es-footer';
3+
import headerLinks from 'ember-styleguide/constants/links';
4+
import replaceLinks from 'ember-website/utils/replace-links';
85

96
export default class ApplicationController extends Controller {
107
queryParams = ['uwu'];
11-
links = [];
12-
infoLinks = [];
8+
links = replaceLinks(headerLinks);
9+
infoLinks = replaceLinks(infoLinks);
1310
}

app/templates/application.hbs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,16 @@
99
</LinkTo>
1010
</CalloutBanner>
1111

12-
{{!-- TODO: Restore EsHeader/EsFooter once ember-styleguide v2 is compatible with ember-source 5.12 --}}
12+
<EsHeader
13+
@home="/"
14+
@links={{this.links}}
15+
/>
1316

1417
<main>
1518
{{outlet}}
1619
</main>
20+
21+
<EsFooter
22+
@contributeLink="https://github.com/ember-learn/ember-website"
23+
@infoLinks={{this.infoLinks}}
24+
/>

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"@babel/plugin-transform-runtime": "^7.29.0",
3131
"@ember/string": "^4.0.1",
3232
"@ember/test-helpers": "^5.4.1",
33+
"@ember/test-waiters": "^4.1.1",
3334
"@embroider/core": "^4.4.3",
3435
"@embroider/macros": "^1.20.2",
3536
"@embroider/router": "^3.0.6",
@@ -46,6 +47,7 @@
4647
"decorator-transforms": "^2.3.1",
4748
"deepmerge": "^4.0.0",
4849
"ember-a11y-testing": "^8.0.0",
50+
"ember-concurrency": "^5.2.0",
4951
"ember-data": "~5.8.1",
5052
"ember-inflector": "^6.0.0",
5153
"ember-load-initializers": "^3.0.1",
@@ -56,6 +58,7 @@
5658
"ember-resolver": "^13.1.1",
5759
"ember-source": "~5.12.0",
5860
"ember-strict-application-resolver": "^0.1.1",
61+
"ember-styleguide": "github:NullVoxPopuli-ai-agent/ember-styleguide#convert-to-v2-addon",
5962
"ember-template-lint": "^6.0.0",
6063
"ember-truth-helpers": "^3.0.0",
6164
"eslint": "^8.57.1",

0 commit comments

Comments
 (0)