Skip to content

Commit 0fe9aff

Browse files
committed
fix styles and bump @embroider/addon-dev & babel-plugin-ember-template-compilation
1 parent 8018520 commit 0fe9aff

File tree

7 files changed

+181
-171
lines changed

7 files changed

+181
-171
lines changed

addon/babel.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
],
1111
"@embroider/addon-dev/template-colocation-plugin",
1212
[
13-
"babel-plugin-ember-template-compilation",
13+
"module:babel-plugin-ember-template-compilation",
1414
{
1515
"targetFormat": "hbs",
1616
"transforms": []

addon/eslint.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* npx eslint --inspect-config
1313
*
1414
*/
15-
import babelParser from '@babel/eslint-parser';
15+
import babelParser from '@babel/eslint-parser/experimental-worker';
1616
import js from '@eslint/js';
1717
import prettier from 'eslint-config-prettier';
1818
import ember from 'eslint-plugin-ember/recommended';

addon/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"@babel/eslint-parser": "^7.27.5",
6666
"@babel/plugin-transform-typescript": "^7.27.1",
6767
"@babel/runtime": "^7.27.6",
68-
"@embroider/addon-dev": "^7.1.4",
68+
"@embroider/addon-dev": "^8.1.0",
6969
"@eslint/js": "^9.29.0",
7070
"@glimmer/component": "^2.0.0",
7171
"@glint/core": "^1.5.2",
@@ -74,7 +74,7 @@
7474
"@glint/template": "^1.5.2",
7575
"@rollup/plugin-babel": "^6.0.4",
7676
"@tsconfig/ember": "^3.0.10",
77-
"babel-plugin-ember-template-compilation": "^2.4.1",
77+
"babel-plugin-ember-template-compilation": "^3.0.0",
7878
"concurrently": "^9.1.2",
7979
"ember-source": "^6.5.0",
8080
"ember-template-lint": "^7.9.1",
@@ -88,10 +88,11 @@
8888
"prettier-plugin-ember-template-tag": "^2.0.6",
8989
"rollup": "^4.43.0",
9090
"rollup-plugin-copy": "^3.5.0",
91+
"rollup-plugin-import-css": "^4.0.1",
9192
"stylelint": "^16.20.0",
9293
"stylelint-config-standard": "^38.0.0",
9394
"typescript": "~5.8.3",
94-
"typescript-eslint": "^8.34.0"
95+
"typescript-eslint": "^8.34.1"
9596
},
9697
"ember": {
9798
"edition": "octane"
@@ -104,4 +105,4 @@
104105
"type": "addon",
105106
"version": 2
106107
}
107-
}
108+
}

addon/rollup.config.mjs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Addon } from '@embroider/addon-dev/rollup';
22
import { babel } from '@rollup/plugin-babel';
33
import copy from 'rollup-plugin-copy';
4+
import css from 'rollup-plugin-import-css';
45

56
const addon = new Addon({
67
srcDir: 'src',
@@ -59,7 +60,13 @@ export default {
5960

6061
// addons are allowed to contain imports of .css files, which we want rollup
6162
// to leave alone and keep in the published output.
62-
addon.keepAssets(['**/*.css']),
63+
// addon.keepAssets(['**/*.css']),
64+
65+
css({
66+
output: 'styles/navigation-narrator.css',
67+
preserveImports: true,
68+
minify: true,
69+
}),
6370

6471
// Remove leftover build artifacts when starting a new build.
6572
addon.clean(),

addon/src/components/navigation-narrator.gts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { on } from '@ember/modifier';
55
import { registerDestructor } from '@ember/destroyable';
66
import { schedule, cancel } from '@ember/runloop';
77

8+
import '../styles/navigation-narrator.css';
89
import { defaultValidator } from '../utils/validators.js';
910

1011
import type RouterService from '@ember/routing/router-service';
@@ -36,7 +37,6 @@ export interface NavigationNarratorSignature {
3637
Element: HTMLElement;
3738
}
3839

39-
4040
/**
4141
* 🎧 NavigationNarrator
4242
*

0 commit comments

Comments
 (0)